diff --git a/src/views/dictionary/template/components/CriterionDictionary.vue b/src/views/dictionary/template/components/CriterionDictionary.vue
index a11ac2c0..d6f31fef 100644
--- a/src/views/dictionary/template/components/CriterionDictionary.vue
+++ b/src/views/dictionary/template/components/CriterionDictionary.vue
@@ -5,151 +5,81 @@
-
+
{{ $t('dictionary:template:criterionDictionary:button:config') }}
-
+
-
+
- {{scope.$index + 1}}
+ {{ scope.$index + 1 }}
-
+
-
+
-
+
-
+
-
+
-
+
{{ $t('dictionary:template:criterionDictionary:button:config') }}
-
+
{{ $t('common:button:delete') }}
-
-
+
+
-
+
-
- {{ $t('common:button:save')}}
+
+ {{ $t('common:button:save') }}
-
-
+
+
-
+
- {{ scope.$index + 1}}
+ {{ scope.$index + 1 }}
-
+
-
+
-
+
@@ -264,7 +194,7 @@ export default {
this.loading = true
// 是否确认删除
this.$confirm(this.$t('template:criterionDictionary:message:msg1')).then(() => {
- deleteSystemCriterionDictionary({Id: row.Id}).then(res => {
+ deleteSystemCriterionDictionary({ Id: row.Id }).then(res => {
this.$message.success(this.$t('common:message:deletedSuccessfully'))
this.loading = false
this.getList()
@@ -277,7 +207,7 @@ export default {
diff --git a/src/views/dictionary/template/components/CriterionDictionaryConfig.vue b/src/views/dictionary/template/components/CriterionDictionaryConfig.vue
index 62c7dbd3..950f0b87 100644
--- a/src/views/dictionary/template/components/CriterionDictionaryConfig.vue
+++ b/src/views/dictionary/template/components/CriterionDictionaryConfig.vue
@@ -4,134 +4,74 @@
-
+
{{ $t('dictionary:template:criterionDictionary:button:config') }}
-
-
+
+
- {{scope.$index + 1}}
+ {{ scope.$index + 1 }}
-
+
-
+
-
+
-
+
-
+
-
-
{crterionDictionaryGroupChange(v, scope.row)}" size="mini">
- {{item.label}}
+
+ { crterionDictionaryGroupChange(v, scope.row) }" size="mini">
+ {{
+ item.label }}
+ {{ $fd('CrterionDictionaryGroup', scope.row.CrterionDictionaryGroup) }}
-
+
-
- {{ $t('common:button:save')}}
+
+ {{ $t('common:button:save') }}
-
-
+
+
-
+
-
+
-
+
-
+
@@ -150,6 +90,10 @@ export default {
parentCode: {
type: String,
required: true
+ },
+ isCompleteConfig: {
+ type: Boolean,
+ default: false
}
},
data() {
@@ -178,7 +122,7 @@ export default {
this.loading = false
this.$message.success(this.$t('common:message:savedSuccessfully'))
this.getList()
- }).catch(() => {this.loading = false})
+ }).catch(() => { this.loading = false })
},
toggleSelection(rows) {
console.log(this.$refs.multipleTable)
@@ -240,7 +184,7 @@ export default {