[update] 修改企标新增

src/components/customField/AddForm.vue

@@ -215,6 +215,7 @@
                   :getPopupContainer="triggerNode=> triggerNode.parentNode"
                   style="width: 100%"
                   :tree-data="optionsData[item.dbFieldName]"
+                  :replaceFields="{children:'children', title:'name', key:'id', value: 'itemValue'}"
                   tree-checkable
                   treeCheckStrictly
                   :placeholder="$t('pleaseSelect')+item.dbFieldTxt"
@@ -359,33 +360,13 @@ export default {
       ruleList.forEach((res, index) => {
         const rule = []
         if (res.fieldMustInput === '1') {
-          if (res.fieldShowType === '1') {
+          if ((FieldType.TEXT_BOX.value, FieldType.TEXTAREA.value, FieldType.TEXT_LINK.value).includes(res.fieldShowType)) {
             rule.push({
               required: true,
               message: res.dbFieldTxt + this.$t('cannotEmpty'),
               trigger: 'blur'
             })
-          } else if (res.fieldShowType === '4' || res.fieldShowType === '6' ||
-            res.fieldShowType === '5' || res.fieldShowType === '7'
-          ) {
-            rule.push({
-              required: true,
-              message: res.dbFieldTxt + this.$t('cannotEmpty'),
-              trigger: 'change'
-            })
-          } else if (res.fieldShowType === '2') {
-            rule.push({
-              required: true,
-              message: res.dbFieldTxt + this.$t('cannotEmpty'),
-              trigger: 'blur'
-            })
-          } else if (res.fieldShowType === '8' || res.fieldShowType === '9' || res.fieldShowType === '10' || res.fieldShowType === '11') {
-            rule.push({
-              required: true,
-              message: res.dbFieldTxt + this.$t('cannotEmpty'),
-              trigger: 'blur'
-            })
-          } else if (res.fieldShowType === '3') {
+          } else {
             rule.push({
               required: true,
               message: res.dbFieldTxt + this.$t('cannotEmpty'),
@@ -434,7 +415,7 @@ export default {
       const attIdList = []
       if (data && data.length > 0) {
         data.map(item => {
-          attIdList.push(item.id || data.name)
+          attIdList.push(item.id)
         })
       }
       /** 赋值给当前对应的表单文件 */
@@ -456,7 +437,12 @@ export default {
           const formInline = JSON.parse(JSON.stringify(this.formInline))
           Object.keys(formInline).forEach(res => {
             if (formInline[res] instanceof Array) {
-              formInline[res] = formInline[res].join(',')
+              if (formInline[res][0] instanceof Object) {
+                // 说明是树选择
+                formInline[res] = formInline[res].map(item => item.value).join(',')
+              } else {
+                formInline[res] = formInline[res].join(',')
+              }
             }
           })
           this.$emit('submitFormData', formInline)
@@ -465,6 +451,9 @@ export default {
           return false
         }
       })
+    },
+    clearValidate () {
+      this.$refs.ruleForm.clearValidate()
     }
   }
 }