update 工作组、起草组批量新增成员单位完善

src/views/projectManagement/modules/WorkingGroupMemberUnitModule.vue

@@ -28,14 +28,14 @@
           </a-col>
         </a-row>
         <!-- 批量添加时显示） -->
-        <template v-if="isBatchAdd && model.workingGroupIds && model.workingGroupIds.length > 0">
-          <a-row v-for="(_, index) in model.workingGroupIds" :key="index + ''">
+        <template v-if="isBatchAdd && model.workingGroupIdList && model.workingGroupIdList.length > 0">
+          <a-row v-for="(_, index) in model.workingGroupIdList" :key="index + ''">
             <a-col :xl="21" :sm="20">
               <a-form-item :label="`工作组${index + 1}`" :labelCol="remarksLabelCol" :wrapperCol="remarksWrapperCol">
                 <a-select
                   :placeholder="`请选择工作组项目${index + 1}`"
                   show-search
-                  v-decorator="[`workingGroupIds[${index}]`, {rules: [{ required: index === 0, validator: index === 0 ? validateWorkingGroupRequired : validateWorkingGroup }],validateTrigger: 'change'}]"
+                  v-decorator="[`workingGroupIdList[${index}]`, {rules: [{ required: index === 0, validator: index === 0 ? validateWorkingGroupRequired : validateWorkingGroup }],validateTrigger: 'change'}]"
                   :maxLength='50'
                   allowClear
                   :filter-option="filterOption"
@@ -604,7 +604,7 @@ export default {
         // 获取当前年的工作组列表
         this.loadCurrentYearWorkingGroupList()
         // 默认一个工作组
-        obj.workingGroupIds = [{}]
+        obj.workingGroupIdList = [undefined]
       }
       this.edit(obj)
       // 判断默认来款用途是否为合同（收入合同新增）
@@ -779,8 +779,10 @@ export default {
             values.workingGroupId = this.workingGroupId
           }
           // 批量添加
-          if (Array.isArray(values.workingGroupIds)) {
-            values.workingGroupIds = values.workingGroupIds.join(',')
+          if (Array.isArray(values.workingGroupIdList)) {
+            // 过滤空
+            values.workingGroupIdList = values.workingGroupIdList.filter(item => !!item)
+            values.workingGroupIds = values.workingGroupIdList.join(',')
           }
           // 企业联系人信息中将没有值的去掉
           let haveValueContactArr = values.payWorkingGroupSubItemContactsList.filter(tt => tt.contactsId)
@@ -970,8 +972,8 @@ export default {
      */
     validateWorkingGroup(rule, value, callback) {
       if (value) {
-        let workingGroupIds = this.form.getFieldValue('workingGroupIds')
-        let hasValueArr = workingGroupIds.filter(id => id === value)
+        let workingGroupIdList = this.form.getFieldValue('workingGroupIdList')
+        let hasValueArr = workingGroupIdList.filter(id => id === value)
         if (hasValueArr.length <= 1) {
           callback()
         }
@@ -1051,12 +1053,12 @@ export default {
      * @param index
      */
     handleAddWorkGroup (index) {
-      this.model.workingGroupIds.splice(index + 1, 0, '')
+      this.model.workingGroupIdList.splice(index + 1, 0, undefined)
       this.$forceUpdate()
-      let formData = this.form.getFieldValue('workingGroupIds')
-      formData.splice(index + 1, 0, '')
+      let formData = this.form.getFieldValue('workingGroupIdList')
+      formData.splice(index + 1, 0, undefined)
       this.$nextTick(() => {
-        this.form.setFieldsValue({ workingGroupIds: formData })
+        this.form.setFieldsValue({ workingGroupIdList: formData })
       })
     },
     /**
@@ -1064,15 +1066,15 @@ export default {
      * @param index
      */
     handleDelWorkGroup (index) {
-      if (this.model.workingGroupIds.length === 1) {
+      if (this.model.workingGroupIdList.length === 1) {
         this.$message.warn('最少需要一个工作组')
         return
       }
-      this.model.workingGroupIds.splice(index, 1)
-      let formData = this.form.getFieldValue('workingGroupIds')
+      this.model.workingGroupIdList.splice(index, 1)
+      let formData = this.form.getFieldValue('workingGroupIdList')
       formData.splice(index, 1)
       this.$nextTick(() => {
-        this.form.setFieldsValue({ workingGroupIds: formData })
+        this.form.setFieldsValue({ workingGroupIdList: formData })
       })
     },
     /**