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" /> + + +