diff --git a/src/enums/commonEnums.js b/src/enums/commonEnums.js
index 1402fb6a..22e0e245 100644
--- a/src/enums/commonEnums.js
+++ b/src/enums/commonEnums.js
@@ -18,7 +18,9 @@ export const FieldType = {
FILE_UP: { text: '上传文件', value: '8' },
TEXT_BOX: { text: '文本框', value: '9' },
OPTION_SINGLE: { text: '下拉单选', value: '10' },
- OPTION_MORE: { text: '下拉多选', value: '11' }
+ OPTION_MORE: { text: '下拉多选', value: '11' },
+ TREE: { text: '树形结构', value: '12' },
+ TEXT_LINK: { text: '输入框(链接)', value: '13' }
}
export const TagsTypeEnums = new EsEnums({
diff --git a/src/views/system/modules/DictItemModal.vue b/src/views/system/modules/DictItemModal.vue
index 001c12fa..5d64c03f 100644
--- a/src/views/system/modules/DictItemModal.vue
+++ b/src/views/system/modules/DictItemModal.vue
@@ -133,12 +133,18 @@ export default {
this.model.description = (this.model.description || '').trim()
this.model.status = this.status
let obj
+ // 数据字典
if (!this.model.id) {
- obj = addDictItem(this.model)
+ obj = addDictItem
} else {
- obj = editDictItem(this.model)
+ obj = editDictItem
}
- obj.then((res) => {
+ const params = Object.assign({}, this.model, {
+ dictId: this.dictId, // 数据字典的id
+ isTagDict: 0, // 是否为标签管理的表示
+ delFlag: 0 // 是否删除的标识,新的接口必须增加这一个字段,可以联系后端沟通,否则不能查看
+ })
+ obj(params).then((res) => {
if (res.success) {
that.$message.success(res.message)
that.$emit('ok')
diff --git a/src/views/system/tags/modules/AreaFormModal.vue b/src/views/system/tags/modules/AreaFormModal.vue
index 2b9b0a06..eb8043b3 100644
--- a/src/views/system/tags/modules/AreaFormModal.vue
+++ b/src/views/system/tags/modules/AreaFormModal.vue
@@ -104,7 +104,7 @@ export default {
{ min: 1, max: 50, message: this.$t('charactersLength'), trigger: 'blur' }
],
sort: [
- { required: true, message: this.$t('enterSortingNumber'), trigger: 'change' }
+ { required: false, message: this.$t('enterSortingNumber'), trigger: 'change' }
]
},
moduleArr: TagsTypeEnums.getItemList()
diff --git a/src/views/system/tags/modules/AreaModal.vue b/src/views/system/tags/modules/AreaModal.vue
index b867f4c3..375adc29 100644
--- a/src/views/system/tags/modules/AreaModal.vue
+++ b/src/views/system/tags/modules/AreaModal.vue
@@ -18,11 +18,16 @@