From 70be631ebfb71616c0ac54854ad77dcc0ab987c7 Mon Sep 17 00:00:00 2001 From: zhangxiaodi1 Date: Sat, 16 Nov 2024 17:20:21 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8C=87=E6=A0=87=E9=9B=86?= =?UTF-8?q?=E5=92=8C=E6=8C=87=E6=A0=87=E7=AE=A1=E7=90=86=E9=83=A8=E5=88=86?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=90=8D=E7=A7=B0=20=E6=8C=87=E6=A0=87?= =?UTF-8?q?=E9=9B=86=E7=82=B9=E8=A7=84=E5=88=99=E9=85=8D=E7=BD=AE=E8=B7=B3?= =?UTF-8?q?=E8=BD=AC=E5=88=B0=E6=8C=87=E6=A0=87=E5=AE=9A=E4=B9=89=E5=92=8C?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=97=B6=EF=BC=8C=E8=87=AA=E5=8A=A8=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E6=8C=87=E6=A0=87=E9=9B=86=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/dataset/CodeRepItem/CodeRepItem.vue | 8 ++++++-- src/views/dataset/CodeRepItem/components/Detail.vue | 2 +- src/views/dataset/CodeRepItem/components/Write.vue | 5 +++-- src/views/dataset/CodeRepTarget/CodeRepTarget.vue | 4 ++-- src/views/dataset/CodeRepTarget/components/Detail.vue | 2 +- src/views/dataset/CodeRepTarget/components/Write.vue | 2 +- src/views/dataset/IndexClassMs/IndexClassMs.vue | 2 +- .../dataset/IndexSearchServiceMs/IndexSearchServiceMs.vue | 2 +- src/views/dataset/RepIndexSet/RepIndexSet.vue | 4 ++-- src/views/dataset/RepIndexSet/components/Detail.vue | 2 +- src/views/dataset/RepIndexSet/components/Write.vue | 2 +- src/views/dataset/RepSetRule/RepSetRule.vue | 2 +- 12 files changed, 21 insertions(+), 16 deletions(-) diff --git a/src/views/dataset/CodeRepItem/CodeRepItem.vue b/src/views/dataset/CodeRepItem/CodeRepItem.vue index 6971b82..031d2cd 100644 --- a/src/views/dataset/CodeRepItem/CodeRepItem.vue +++ b/src/views/dataset/CodeRepItem/CodeRepItem.vue @@ -89,7 +89,7 @@ const tableColumns = reactive([ }, { field: 'indexsetCode', - label: '指标集编码', + label: '指标集代码', hidden:true, }, @@ -264,8 +264,12 @@ const addRuleConfig = async () => { } } const AddAction = () => { + if(!indexsetCode){ + ElMessage.warning("指标集不能为空,新增失败！"); + return; + } dialogTitle.value = t('tableDemo.add') - currentRow.value = undefined + currentRow.value = {indexsetCode:indexsetCode} dialogVisible.value = true actionType.value = 'add' } diff --git a/src/views/dataset/CodeRepItem/components/Detail.vue b/src/views/dataset/CodeRepItem/components/Detail.vue index b61f862..0e4f760 100644 --- a/src/views/dataset/CodeRepItem/components/Detail.vue +++ b/src/views/dataset/CodeRepItem/components/Detail.vue @@ -6,7 +6,7 @@ import { Descriptions, DescriptionsSchema } from '@/components/Descriptions' const detailSchema = ref([ { field: 'indexsetCode', - label: '指标集编码' + label: '指标集代码' }, { field: 'code', diff --git a/src/views/dataset/CodeRepItem/components/Write.vue b/src/views/dataset/CodeRepItem/components/Write.vue index 2a8f79b..4cdd840 100644 --- a/src/views/dataset/CodeRepItem/components/Write.vue +++ b/src/views/dataset/CodeRepItem/components/Write.vue @@ -33,10 +33,11 @@ const formSchema = reactive([ }, { field: 'indexsetCode', - label: '指标集编码', + label: '指标集代码', component: 'Input', + value:"", componentProps: { - disabled:props.actionType == 'edit' + disabled:true }, }, { diff --git a/src/views/dataset/CodeRepTarget/CodeRepTarget.vue b/src/views/dataset/CodeRepTarget/CodeRepTarget.vue index 7ce7325..0e3c140 100644 --- a/src/views/dataset/CodeRepTarget/CodeRepTarget.vue +++ b/src/views/dataset/CodeRepTarget/CodeRepTarget.vue @@ -63,7 +63,7 @@ const tableColumns = reactive([ }, { field: 'indexsetCode', - label: '指标集编码', + label: '指标集代码', hidden:true }, { @@ -120,7 +120,7 @@ const tableColumns = reactive([ const searchSchema = reactive([ { field: 'indexsetCode', - label: '指标集编码', + label: '指标集代码', componentProps: {}, component: 'Input', hidden:true diff --git a/src/views/dataset/CodeRepTarget/components/Detail.vue b/src/views/dataset/CodeRepTarget/components/Detail.vue index 60d8280..fdf03c3 100644 --- a/src/views/dataset/CodeRepTarget/components/Detail.vue +++ b/src/views/dataset/CodeRepTarget/components/Detail.vue @@ -6,7 +6,7 @@ import { Descriptions, DescriptionsSchema } from '@/components/Descriptions' const detailSchema = ref([ { field: 'indexsetCode', - label: '指标集编码' + label: '指标集代码' }, { field: 'targetCode', diff --git a/src/views/dataset/CodeRepTarget/components/Write.vue b/src/views/dataset/CodeRepTarget/components/Write.vue index af136f2..c51b00d 100644 --- a/src/views/dataset/CodeRepTarget/components/Write.vue +++ b/src/views/dataset/CodeRepTarget/components/Write.vue @@ -29,7 +29,7 @@ const formSchema = reactive([ hidden: true },{ field: 'indexsetCode', - label: '指标集编码', + label: '指标集代码', component: 'Input', componentProps: { disabled:props.actionType == 'edit' diff --git a/src/views/dataset/IndexClassMs/IndexClassMs.vue b/src/views/dataset/IndexClassMs/IndexClassMs.vue index 422589d..55ffb85 100644 --- a/src/views/dataset/IndexClassMs/IndexClassMs.vue +++ b/src/views/dataset/IndexClassMs/IndexClassMs.vue @@ -91,7 +91,7 @@ const tableColumns = reactive([ }, { field: 'indexsetCode', - label: '指标集编码', + label: '指标集代码', width:100 }, { diff --git a/src/views/dataset/IndexSearchServiceMs/IndexSearchServiceMs.vue b/src/views/dataset/IndexSearchServiceMs/IndexSearchServiceMs.vue index 0e91a63..f7e0b3c 100644 --- a/src/views/dataset/IndexSearchServiceMs/IndexSearchServiceMs.vue +++ b/src/views/dataset/IndexSearchServiceMs/IndexSearchServiceMs.vue @@ -89,7 +89,7 @@ const tableColumns = reactive([ }, { field: 'indexSetCode', - label: '指标集编码', + label: '指标集代码', hidden: true }, { diff --git a/src/views/dataset/RepIndexSet/RepIndexSet.vue b/src/views/dataset/RepIndexSet/RepIndexSet.vue index 9df53d3..31bdd9f 100644 --- a/src/views/dataset/RepIndexSet/RepIndexSet.vue +++ b/src/views/dataset/RepIndexSet/RepIndexSet.vue @@ -76,7 +76,7 @@ const tableColumns = reactive([ }, { field: 'indexsetCode', - label: '指标集编码' + label: '指标集代码' }, { field: 'indexsetName', @@ -165,7 +165,7 @@ const tableColumns = reactive([ const searchSchema = reactive([ { field: 'indexsetCode', - label: '指标集编码', + label: '指标集代码', componentProps: {}, component: 'Input' }, diff --git a/src/views/dataset/RepIndexSet/components/Detail.vue b/src/views/dataset/RepIndexSet/components/Detail.vue index 36894b8..61a6a49 100644 --- a/src/views/dataset/RepIndexSet/components/Detail.vue +++ b/src/views/dataset/RepIndexSet/components/Detail.vue @@ -6,7 +6,7 @@ import { Descriptions, DescriptionsSchema } from '@/components/Descriptions' const detailSchema = ref([ { field: 'indexsetCode', - label: '指标集编码' + label: '指标集代码' }, { field: 'beginDate', diff --git a/src/views/dataset/RepIndexSet/components/Write.vue b/src/views/dataset/RepIndexSet/components/Write.vue index fddeeb4..887cf5a 100644 --- a/src/views/dataset/RepIndexSet/components/Write.vue +++ b/src/views/dataset/RepIndexSet/components/Write.vue @@ -29,7 +29,7 @@ const { setValues, getFormData, getElFormExpose } = formMethods const formSchema = reactive([ { field: 'indexsetCode', - label: '指标集编码', + label: '指标集代码', component: 'Input', componentProps: { disabled:props.actionType == 'edit' diff --git a/src/views/dataset/RepSetRule/RepSetRule.vue b/src/views/dataset/RepSetRule/RepSetRule.vue index 7c36697..90ae077 100644 --- a/src/views/dataset/RepSetRule/RepSetRule.vue +++ b/src/views/dataset/RepSetRule/RepSetRule.vue @@ -142,7 +142,7 @@ const tableColumns = reactive([ }, { field: 'indexCode', - label: '指标集编码', + label: '指标集代码', hidden:true }, {