From 349119b77c4489e201e4d9436010f436bed3b0cd Mon Sep 17 00:00:00 2001 From: yangyuanshuai Date: Tue, 12 Nov 2024 21:09:01 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96,=E5=AE=BD=E5=BA=A6=E4=BF=9D?= =?UTF-8?q?=E6=8C=81=E4=B8=80=E8=87=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SqlRule/components/BasicInfo.vue | 11 +++- src/views/dataset/CodeRepItem/CodeRepItem.vue | 1 + .../dataset/CodeRepItem/components/Write.vue | 63 ++++++++++++------- src/views/dataset/CodeRepItem/constants.ts | 11 ++++ .../CodeRepTarget/components/Write.vue | 48 ++++++++------ src/views/dataset/CodeRepTarget/constants.ts | 11 ++++ .../dataset/RepDataModel/components/Write.vue | 7 ++- .../dataset/RepIndexSet/components/Write.vue | 38 ++++++----- .../dataset/RepStore/components/Write.vue | 32 +++++----- .../RepStoreMapping/components/Write.vue | 7 ++- .../dataset/RepStoreMapping/constants.ts | 2 +- .../RepStoreParameter/components/Write.vue | 2 +- .../RepTemplate/components/Write.vue | 8 ++- .../RepVariableManagement.vue | 4 +- .../components/Write.vue | 2 +- 15 files changed, 165 insertions(+), 82 deletions(-) diff --git a/src/views/IndexProcess/SqlRule/components/BasicInfo.vue b/src/views/IndexProcess/SqlRule/components/BasicInfo.vue index 00bcd82..fd06f7c 100644 --- a/src/views/IndexProcess/SqlRule/components/BasicInfo.vue +++ b/src/views/IndexProcess/SqlRule/components/BasicInfo.vue @@ -68,7 +68,10 @@ const formSchema = reactive([ label: '规则周期', component: 'Select', componentProps:{ - options: RULE_CYCLE_LIST + options: RULE_CYCLE_LIST, + style: { + width: '100%' + } } }, { @@ -76,7 +79,10 @@ const formSchema = reactive([ label: '是否有效', component: 'Select', componentProps:{ - options: RULE_IS_VALID_LIST + options: RULE_IS_VALID_LIST, + style: { + width: '100%' + } } }, { @@ -99,6 +105,7 @@ const rules = reactive({ failDate:[required()], ruleCycle:[required()], ruleStatus:[required()], + dscode:[required()], }) const { formRegister, formMethods } = useForm() diff --git a/src/views/dataset/CodeRepItem/CodeRepItem.vue b/src/views/dataset/CodeRepItem/CodeRepItem.vue index 41cff95..7a310c1 100644 --- a/src/views/dataset/CodeRepItem/CodeRepItem.vue +++ b/src/views/dataset/CodeRepItem/CodeRepItem.vue @@ -28,6 +28,7 @@ import RepSetRuleWrite from '@/views/dataset/RepSetRule/components/Write.vue' import { RULE_TYPE_LIST } from '@/views/IndexProcess/constants' import { getIndexType } from '@/api/dataset/RepIndexSet' import { transfDictList } from '@/utils'; +import { Alignment } from 'element-plus/es/components/table-v2/src/constants' const route = useRoute(); const pageQuery = ref(route || null); diff --git a/src/views/dataset/CodeRepItem/components/Write.vue b/src/views/dataset/CodeRepItem/components/Write.vue index bb1e7be..27efaa2 100644 --- a/src/views/dataset/CodeRepItem/components/Write.vue +++ b/src/views/dataset/CodeRepItem/components/Write.vue @@ -3,9 +3,10 @@ import { Form, FormSchema } from '@/components/Form' import { useForm } from '@/hooks/web/useForm' import { PropType, reactive, watch } from 'vue' import { useValidator } from '@/hooks/web/useValidator' -import { getIndexSetTreeApi, getIndexType } from '@/api/dataset/RepIndexSet'; +import { getIndexType } from '@/api/dataset/RepIndexSet'; import { transfDictList } from '@/utils'; import { getIndexCategoryTreeApi } from '@/api/dataset/IndexCategory'; +import { ITEM_STATUS_LIST } from '../constants'; const { required } = useValidator() @@ -40,7 +41,7 @@ const formSchema = reactive([ }, { field: 'code', - label: '科目编码', + label: '指标代码', component: 'Input', componentProps: { @@ -66,7 +67,7 @@ const formSchema = reactive([ }, { field: 'itemName', - label: '科目名称', + label: '指标名称', component: 'Input', componentProps: { @@ -88,7 +89,10 @@ const formSchema = reactive([ return transfDictList(res.body.result); }, value: '1', - component: 'Select' + component: 'Select', + componentProps:{ + style:{width:'100%'} + } }, { field: 'isOrgCollect', @@ -104,8 +108,10 @@ const formSchema = reactive([ label: '状态', component: 'Select', componentProps: { - + options:ITEM_STATUS_LIST, + style:{width:'100%'}, }, + value:'1' }, { field: 'conCode', @@ -118,7 +124,6 @@ const formSchema = reactive([ { field: 'itemType1', label: '业务类型1', - colProps: { span: 100 }, componentProps: { checkStrictly: true, nodeKey: 'id', @@ -126,8 +131,9 @@ const formSchema = reactive([ filterable: true, collapseTags: true, showCheckbox: true, - style: { minWidth: '200px' }, - checkOnClickNode: true + style: { width:'100%' }, + checkOnClickNode: true, + }, component: 'TreeSelect', optionApi: async () => { @@ -139,7 +145,6 @@ const formSchema = reactive([ { field: 'itemType2', label: '业务类型2', - colProps: { span: 100 }, componentProps: { checkStrictly: true, nodeKey: 'id', @@ -147,7 +152,7 @@ const formSchema = reactive([ filterable: true, collapseTags: true, showCheckbox: true, - style: { minWidth: '200px' }, + style: { width:'100%' }, checkOnClickNode: true }, component: 'TreeSelect', @@ -160,7 +165,6 @@ const formSchema = reactive([ { field: 'itemType3', label: '业务类型3', - colProps: { span: 100 }, componentProps: { checkStrictly: true, nodeKey: 'id', @@ -168,7 +172,7 @@ const formSchema = reactive([ filterable: true, collapseTags: true, showCheckbox: true, - style: { minWidth: '200px' }, + style: { width:'100%' }, checkOnClickNode: true }, component: 'TreeSelect', @@ -181,7 +185,6 @@ const formSchema = reactive([ { field: 'itemType4', label: '业务类型4', - colProps: { span: 100 }, componentProps: { checkStrictly: true, nodeKey: 'id', @@ -189,7 +192,7 @@ const formSchema = reactive([ filterable: true, collapseTags: true, showCheckbox: true, - style: { minWidth: '200px' }, + style:{width:'100%'}, checkOnClickNode: true }, component: 'TreeSelect', @@ -203,21 +206,22 @@ const formSchema = reactive([ field: 'itemType5', label: '业务类型5', component: 'TreeSelect', - colProps: { span: 100 }, componentProps: { - - }, + style:{width:'100%'} + } }, { field: 'indexType', label: '指标类型', - colProps: { span: 100 }, optionApi: async () => { const indexType = await getIndexType({ paramName: 'indexType_param', systemCode: 'ordb' }); return transfDictList(indexType.body.result); }, value: '1', - component: 'Select' + component: 'Select', + componentProps: { + style:{width:'100%'} + } }, { field: 'indexcalType', @@ -227,18 +231,23 @@ const formSchema = reactive([ return transfDictList(indexCalType.body.result); }, value: '1', - component: 'Select' + component: 'Select', + componentProps: { + style:{width:'100%'} + } }, { field: 'indexdataType', label: '指标数据类型', - colProps: { span: 100 }, optionApi: async () => { const indexDataType = await getIndexType({ paramName: 'indexDataType_param', systemCode: 'ordb' }); return transfDictList(indexDataType.body.result); }, value: '1', - component: 'Select' + component: 'Select', + componentProps: { + style:{width:'100%'} + } }, { field: 'indexdataPrecision', @@ -248,7 +257,10 @@ const formSchema = reactive([ return transfDictList(indexDataPrecision.body.result); }, value: '1', - component: 'Select' + component: 'Select', + componentProps: { + style:{width:'100%'} + } }, { field: 'indexdataUnit', @@ -258,7 +270,10 @@ const formSchema = reactive([ return transfDictList(indexDataUnit.body.result); }, value: '1', - component: 'Select' + component: 'Select', + componentProps: { + style:{width:'100%'} + } } ]) diff --git a/src/views/dataset/CodeRepItem/constants.ts b/src/views/dataset/CodeRepItem/constants.ts index e69de29..7024701 100644 --- a/src/views/dataset/CodeRepItem/constants.ts +++ b/src/views/dataset/CodeRepItem/constants.ts @@ -0,0 +1,11 @@ +//指标定义状态列表 +export const ITEM_STATUS_LIST = [ + { + value:"1", + label:"启用" + }, + { + value:"0", + label:"停用" + }, +] \ No newline at end of file diff --git a/src/views/dataset/CodeRepTarget/components/Write.vue b/src/views/dataset/CodeRepTarget/components/Write.vue index bf15efa..f90a080 100644 --- a/src/views/dataset/CodeRepTarget/components/Write.vue +++ b/src/views/dataset/CodeRepTarget/components/Write.vue @@ -3,6 +3,7 @@ import { Form, FormSchema } from '@/components/Form' import { useForm } from '@/hooks/web/useForm' import { PropType, reactive, watch } from 'vue' import { useValidator } from '@/hooks/web/useValidator' +import { TARGET_STATUS_LIST } from '../constants'; const { required } = useValidator() @@ -36,48 +37,52 @@ const formSchema = reactive([ }, { field: 'targetCode', - label: '栏编码', + label: '指标属性编码', component: 'Input', componentProps: { }, }, { - field: 'beginDate', - label: '开始日期', + field: 'targetName', + label: '指标属性名称', component: 'Input', componentProps: { }, }, { - field: 'endDate', - label: '结束日期', - component: 'Input', + field: 'status', + label: '状态', + component: 'Select', componentProps: { - + options:TARGET_STATUS_LIST, + style:{width:'100%'}, }, + value:1 }, { - field: 'targetName', - label: '栏名称', - component: 'Input', + field: 'beginDate', + label: '开始日期', + component: 'DatePicker', componentProps: { - + valueFormat: 'YYYYMMDD', + style:{width:'100%'} }, }, { - field: 'targetOrder', - label: '排序', - component: 'Input', + field: 'endDate', + label: '结束日期', + component: 'DatePicker', componentProps: { - + valueFormat: 'YYYYMMDD', + style:{width:'100%'} }, }, { - field: 'status', - label: '状态', - component: 'Select', + field: 'targetOrder', + label: '排序', + component: 'Input', componentProps: { }, @@ -86,6 +91,7 @@ const formSchema = reactive([ field: 'isOrgCollect', label: '是否机构汇总', component: 'Select', + hidden:true, componentProps: { }, @@ -93,7 +99,11 @@ const formSchema = reactive([ ]) const rules = reactive({ - + indexsetCode: [required()], + targetCode: [required()], + targetName: [required()], + beginDate: [required()], + endDate: [required()], }) const submit = async () => { diff --git a/src/views/dataset/CodeRepTarget/constants.ts b/src/views/dataset/CodeRepTarget/constants.ts index e69de29..83701da 100644 --- a/src/views/dataset/CodeRepTarget/constants.ts +++ b/src/views/dataset/CodeRepTarget/constants.ts @@ -0,0 +1,11 @@ +//指标属性定义状态列表 +export const TARGET_STATUS_LIST = [ + { + value:1, + label:"启用" + }, + { + value:0, + label:"停用" + }, +] \ No newline at end of file diff --git a/src/views/dataset/RepDataModel/components/Write.vue b/src/views/dataset/RepDataModel/components/Write.vue index 9914938..0bf731b 100644 --- a/src/views/dataset/RepDataModel/components/Write.vue +++ b/src/views/dataset/RepDataModel/components/Write.vue @@ -43,14 +43,16 @@ const formSchema = reactive([ field: 'description', label: '描述', component: 'Input', + colProps:{span:24}, componentProps: { - + type: 'textarea', }, }, { field: 'organCode', label: '用户所属机构', component: 'Select', + hidden:true, componentProps: { }, @@ -59,6 +61,7 @@ const formSchema = reactive([ field: 'createUser', label: '登录用户', component: 'Input', + hidden:true, componentProps: { }, @@ -67,6 +70,7 @@ const formSchema = reactive([ field: 'createDate', label: '创建日期', component: 'DatePicker', + hidden:true, componentProps: { }, @@ -75,6 +79,7 @@ const formSchema = reactive([ const rules = reactive({ modelCode: [required()], + modelName: [required()], }) const submit = async () => { diff --git a/src/views/dataset/RepIndexSet/components/Write.vue b/src/views/dataset/RepIndexSet/components/Write.vue index 036f9b1..969a518 100644 --- a/src/views/dataset/RepIndexSet/components/Write.vue +++ b/src/views/dataset/RepIndexSet/components/Write.vue @@ -36,29 +36,33 @@ const formSchema = reactive([ }, }, { - field: 'beginDate', - label: '开始日期', + field: 'indexsetName', + label: '指标集名称', component: 'Input', componentProps: { }, }, { - field: 'endDate', - label: '结束日期', - component: 'Input', + field: 'beginDate', + label: '开始日期', + component: 'DatePicker', componentProps: { - + valueFormat: 'YYYYMMDD', + style:{width:'100%'} }, + }, { - field: 'indexsetName', - label: '指标集名称', - component: 'Input', + field: 'endDate', + label: '结束日期', + component: 'DatePicker', componentProps: { - + valueFormat: 'YYYYMMDD', + style:{width:'100%'} }, }, + { field: 'organCode', label: '机构编码', @@ -76,7 +80,10 @@ const formSchema = reactive([ return transfDictList(res.body.result); }, value: '1', - component: 'Select' + component: 'Select', + componentProps:{ + style:{width:'100%'} + } }, { field: 'indexsetType', @@ -88,8 +95,8 @@ const formSchema = reactive([ filterable: true, // multiple: true, collapseTags: true, - // showCheckbox: true, - style: { minWidth: '200px' }, + showCheckbox: true, + style:{width:'100%'}, checkOnClickNode: true, }, component: 'TreeSelect', @@ -129,15 +136,18 @@ const formSchema = reactive([ label: '描述', component: 'Input', componentProps: { - }, }, ]) const rules = reactive({ indexsetCode: [required()], + indexsetName: [required()], beginDate: [required()], endDate: [required()], + frequency: [required()], + indexsetType: [required()], + modelCode: [required()] }) const submit = async () => { diff --git a/src/views/dataset/RepStore/components/Write.vue b/src/views/dataset/RepStore/components/Write.vue index 6f4aa43..a47ff0b 100644 --- a/src/views/dataset/RepStore/components/Write.vue +++ b/src/views/dataset/RepStore/components/Write.vue @@ -31,19 +31,29 @@ const formSchema = reactive([ }, }, { - field: 'beginDate', - label: '开始日期', + field: 'ruleId', + label: '存储规则id', component: 'Input', componentProps: { }, }, + { + field: 'beginDate', + label: '开始日期', + component: 'DatePicker', + componentProps: { + valueFormat: 'YYYYMMDD', + style:{width:'100%'} + }, + }, { field: 'endDate', label: '结束日期', - component: 'Input', + component: 'DatePicker', componentProps: { - + valueFormat: 'YYYYMMDD', + style:{width:'100%'} }, }, { @@ -59,7 +69,8 @@ const formSchema = reactive([ label: '规则类型', component: 'Select', componentProps: { - options:RULE_TYPE_LIST + options:RULE_TYPE_LIST, + style:{width:'100%'}, }, value:'1' }, @@ -76,18 +87,11 @@ const formSchema = reactive([ label: '操作类型', component: 'Select', componentProps: { - options:OPERATION_TYPE_LIST + options:OPERATION_TYPE_LIST, + style:{width:'100%'}, }, value:'1' }, - { - field: 'ruleId', - label: '存储规则id', - component: 'Input', - componentProps: { - - }, - }, { field: 'schema', label: '数据库用户', diff --git a/src/views/dataset/RepStoreMapping/components/Write.vue b/src/views/dataset/RepStoreMapping/components/Write.vue index e881857..c089e2d 100644 --- a/src/views/dataset/RepStoreMapping/components/Write.vue +++ b/src/views/dataset/RepStoreMapping/components/Write.vue @@ -98,10 +98,12 @@ const formSchema = reactive([ }, { field: 'primarykey', - label: '组成联合主键', + label: '联合主键', component: 'Select', componentProps: { - options:WHETHER_UNITEDKEY_LIST + options:WHETHER_UNITEDKEY_LIST, + style:{width:'100%'} + }, value:'0', formItemProps: { @@ -121,6 +123,7 @@ const formSchema = reactive([ label: '标识是否为uuid', component: 'Select', componentProps: { + style:{width:'100%'}, options:WHETHER_UUID_LIST }, value:'0', diff --git a/src/views/dataset/RepStoreMapping/constants.ts b/src/views/dataset/RepStoreMapping/constants.ts index 5b6e744..840e28b 100644 --- a/src/views/dataset/RepStoreMapping/constants.ts +++ b/src/views/dataset/RepStoreMapping/constants.ts @@ -1,7 +1,7 @@ export const WHETHER_UUID_LIST = [//标识是否是uuid，0不是，1是 { value:"0", - label:"不是" + label:"否" }, { value:"1", diff --git a/src/views/dataset/RepStoreParameter/components/Write.vue b/src/views/dataset/RepStoreParameter/components/Write.vue index 5206ba4..06c6dda 100644 --- a/src/views/dataset/RepStoreParameter/components/Write.vue +++ b/src/views/dataset/RepStoreParameter/components/Write.vue @@ -74,7 +74,7 @@ const formSchema = reactive([ label: '参数类型', component: 'Select', componentProps: { - + style:{width:'100%'} }, } ]) diff --git a/src/views/reporting/RepTemplate/components/Write.vue b/src/views/reporting/RepTemplate/components/Write.vue index 75d59b6..42e84d9 100644 --- a/src/views/reporting/RepTemplate/components/Write.vue +++ b/src/views/reporting/RepTemplate/components/Write.vue @@ -41,6 +41,9 @@ const formSchema = reactive([ field: 'tCategory', label: '报告分类', component: 'Select', + componentProps:{ + style:{width:'100%'} + }, optionApi: async () => { const res = await getCategory({ paramName: 'reportingType_param', systemCode: 'ordb' }); return transfDictList(res.body.result); @@ -77,8 +80,11 @@ const formSchema = reactive([ label: '报告状态', component: 'Select', componentProps: { - options:REPORTING_STATUS_LIST + options:REPORTING_STATUS_LIST, + style:{width:'100%'} + }, + value:'1', formItemProps: { rules: [required()], diff --git a/src/views/reporting/RepVariableManagement/RepVariableManagement.vue b/src/views/reporting/RepVariableManagement/RepVariableManagement.vue index f2f9efc..746aaa4 100644 --- a/src/views/reporting/RepVariableManagement/RepVariableManagement.vue +++ b/src/views/reporting/RepVariableManagement/RepVariableManagement.vue @@ -62,7 +62,7 @@ const tableColumns = reactive([ }, { field: 'indexCode', - label: '指标编码' + label: '指标代码' }, { field: 'indexName', @@ -122,7 +122,7 @@ const searchSchema = reactive([ }, { field: 'indexCode', - label: '指标编码', + label: '指标代码', componentProps: {}, component: 'Input' }, diff --git a/src/views/reporting/RepVariableManagement/components/Write.vue b/src/views/reporting/RepVariableManagement/components/Write.vue index 9496fb0..8f39e89 100644 --- a/src/views/reporting/RepVariableManagement/components/Write.vue +++ b/src/views/reporting/RepVariableManagement/components/Write.vue @@ -50,7 +50,7 @@ const formSchema = reactive([ }, { field: 'indexCode', - label: '指标编码', + label: '指标代码', component: 'Input', componentProps: {