[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()
     }
   }
 }

src/components/customField/Search.vue

@@ -85,6 +85,22 @@
                        v-model="queryParam[item.dbFieldName]"></a-input>
             </a-form-item>
           </template>
+          <!--   组织机构选择  -->
+          <template v-if="[FieldType.ORGAN_SINGLE.value, FieldType.ORGAN_MORE.value].includes(item.fieldShowType)">
+            <a-form-item :label="item.dbFieldTxt" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-tree-select
+                tree-node-filter-prop="title"
+                v-model="queryParam[item.dbFieldName]"
+                :maxTagCount="1"
+                :show-search="true"
+                :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                class="box-input"
+                style="width: 100%"
+                :tree-data="categoryTreeList"
+                :placeholder="$t('pleaseSelect') + item.dbFieldTxt"
+              />
+            </a-form-item>
+          </template>
           <!--   日期区间选择器  -->
           <template v-else-if="[FieldType.DATE_SINGLE.value, FieldType.DATE_MORE.value].includes(item.fieldShowType)">
             <a-form-item :label="item.dbFieldTxt" :labelCol="labelCol" :wrapperCol="wrapperCol">
@@ -120,6 +136,7 @@
 import JDictSelectTag from '../dict/JDictSelectTag'
 import { FieldType } from '../../enums/commonEnums'
 import eventBus from '@/common/event'
+import { queryDepartTreeList } from '../../api/api'
 
 export default {
   name: 'Search',
@@ -158,6 +175,7 @@ export default {
   data () {
     return {
       FieldType,
+      categoryTreeList: [], // 组织机构下拉框数据
       queryParam: {},
       toggleSearchStatus: false,
       searchList: [],
@@ -170,6 +188,7 @@ export default {
     }
   },
   mounted () {
+    this.getSysCategoryTree()
     this.getSearch()
     // this.searchList = [
     //   {
@@ -240,6 +259,16 @@ export default {
       this.$emit('reset', JSON.parse(JSON.stringify(this.queryParam)))
       eventBus.$emit('searchQuery', JSON.parse(JSON.stringify(this.queryParam)))
     },
+    // 获取组织机构树
+    getSysCategoryTree () {
+      queryDepartTreeList().then((res) => {
+        if (res.success) {
+          this.categoryTreeList = res.result
+        } else {
+          this.categoryTreeList = []
+        }
+      })
+    },
     // 获取查询条件列表
     getSearch () {
       console.log(this.getQueryConditionFunc)

src/components/selection/StandardSelection.vue

@@ -57,13 +57,13 @@ export default {
   display: flex;
   .box-input {
     display: inline-block;
-    height: 38px;
+    //height: 38px;
     width: 100%;
   }
   .button-box {
     margin-left: 10px;
-    height: 38px;
-    line-height: 38px;
+    //height: 38px;
+    //line-height: 38px;
   }
 }
 </style>