From 63743dbbc196a93f589d9feb02b41db054bf7d59 Mon Sep 17 00:00:00 2001 From: caiyiling <1321909229@qq.com> Date: Mon, 13 Jan 2025 15:49:46 +0800 Subject: [PATCH] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E9=98=85=E7=89=87=E6=A0=87?= =?UTF-8?q?=E5=87=86=E9=85=8D=E7=BD=AE=E6=9B=B4=E6=94=B9=E5=8F=8A=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E5=AF=BC=E5=87=BA=E9=85=8D=E7=BD=AE=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../template/components/AddCriterion.vue | 14 ++- .../template/components/CriterionsTmp.vue | 109 ++++++++++++++++-- .../components/configList.vue | 17 ++- 3 files changed, 129 insertions(+), 11 deletions(-) diff --git a/src/views/dictionary/template/components/AddCriterion.vue b/src/views/dictionary/template/components/AddCriterion.vue index 06e1ec76..5d7f4d57 100644 --- a/src/views/dictionary/template/components/AddCriterion.vue +++ b/src/views/dictionary/template/components/AddCriterion.vue @@ -24,6 +24,16 @@ /> + + + + + @@ -72,6 +82,7 @@ export default { Id: '', CriterionName: '', CriterionType: null, + CriterionGroup: null, IsEnable: true, IsCompleteConfig: false, ShowOrder: null, @@ -80,7 +91,8 @@ export default { }, rules: { CriterionName: [{ required: true, message: this.$t('common:ruleMessage:specify'), trigger: ['blur'] }], - CriterionType: [{ required: true, message: this.$t('common:ruleMessage:select'), trigger: ['blur'] }] + CriterionType: [{ required: true, message: this.$t('common:ruleMessage:select'), trigger: ['blur'] }], + CriterionGroup: [{ required: true, message: this.$t('common:ruleMessage:select'), trigger: ['blur'] }] }, loading: false, diff --git a/src/views/dictionary/template/components/CriterionsTmp.vue b/src/views/dictionary/template/components/CriterionsTmp.vue index f75e41d8..629d700b 100644 --- a/src/views/dictionary/template/components/CriterionsTmp.vue +++ b/src/views/dictionary/template/components/CriterionsTmp.vue @@ -8,6 +8,54 @@ > + + + + + + + + + + + + + + + + + + + + 重置 查询 @@ -25,6 +73,8 @@ stripe size="small" height="100" + @sort-change="handleSortByColumn" + ref="criterionsTbl" > @@ -32,20 +82,33 @@ prop="CriterionName" label="标准名称" show-overflow-tooltip + sortable="custom" /> + + +