From b07da0cfa6e2659e56db4bfecbcb89fd4f0e0c03 Mon Sep 17 00:00:00 2001
From: zhaoxiao <zhaoxiao@syxysoft.com>
Date: Fri, 22 Apr 2022 16:12:25 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E5=B7=A5=E4=BD=9C=E7=BB=84=E6=88=90?=
 =?UTF-8?q?=E5=91=98--=E4=BC=81=E4=B8=9A=E8=81=94=E7=B3=BB=E4=BA=BA?=
 =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E5=8A=A0=E5=88=B0=E5=8D=81=E4=B8=AA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/ProjectDetailModal.vue         | 173 +++-----
 src/components/company/SelectContacts.vue     |   1 +
 .../modules/WorkingGroupMemberUnitModule.vue  | 384 +++++++++++-------
 3 files changed, 292 insertions(+), 266 deletions(-)

diff --git a/src/components/ProjectDetailModal.vue b/src/components/ProjectDetailModal.vue
index 81c0c4a..2f23c56 100644
--- a/src/components/ProjectDetailModal.vue
+++ b/src/components/ProjectDetailModal.vue
@@ -113,140 +113,91 @@
     <!--    企业联系人信息start-->
     <section>
       <h3 class="title">企业联系人信息</h3>
-      <a-row :gutter="24">
-        <a-col :span="12">
-          <label>企业联系人：</label>
-          <span>{{ basicInfo.name }}</span>
-        </a-col>
-        <!--        企业联系人1的备注，只有工作组成员需要这个字段-->
-        <a-col :span="12" class="detail-item"
-               v-if="basicInfo.projectType === 2 && basicInfo.remarksOne && basicInfo.remarksOne !== ''">
-          <label>企业联系人备注：</label>
-          <span><j-ellipsis :value="basicInfo.remarksOne" :length="16"></j-ellipsis></span>
-        </a-col>
-      </a-row>
-      <a-row :gutter="24">
-        <a-col :span="12">
-          <label>企业联系人性别：</label>
-          <span>{{ basicInfo.gender_dictText }}</span>
-        </a-col>
-        <a-col :span="12" class="detail-item">
-          <label>企业联系人职务：</label>
-          <span><j-ellipsis :value="basicInfo.post" :length="17"></j-ellipsis></span>
-        </a-col>
-      </a-row>
-      <a-row :gutter="24">
-        <a-col :span="12" class="detail-item">
-          <label>企业联系人电话：</label>
-          <span>{{ basicInfo.phone }}</span>
-        </a-col>
-        <a-col :span="12" class="detail-item">
-          <label>企业联系人邮箱：</label>
-          <span>{{ basicInfo.email }}</span>
-        </a-col>
-      </a-row>
-      <a-row :gutter="24">
-        <a-col :span="12" class="detail-item">
-          <label>企业联系人邮编：</label>
-          <span>{{ basicInfo.postalCodeContacts }}</span>
-        </a-col>
-        <a-col :span="12" class="detail-item">
-          <label>企业联系人地址：</label>
-          <span><j-ellipsis :value="basicInfo.contactAddress" :length="17"></j-ellipsis></span>
-        </a-col>
-      </a-row>
-      <!--      工作组项目有企业联系人2、3-->
-      <template v-if="basicInfo.projectType===2">
-        <a-divider/>
-        <!--        企业联系人2-->
-        <template v-if="basicInfo.nameTwo">
+      <!--      项目类型不是工作组。正常显示一个企业联系人的信息-->
+      <template v-if="basicInfo.projectType !== 2">
+        <a-row :gutter="24">
+          <a-col :span="12">
+            <label>企业联系人：</label>
+            <span>{{ basicInfo.name }}</span>
+          </a-col>
+        </a-row>
+        <a-row :gutter="24">
+          <a-col :span="12">
+            <label>企业联系人性别：</label>
+            <span>{{ basicInfo.gender_dictText }}</span>
+          </a-col>
+          <a-col :span="12" class="detail-item">
+            <label>企业联系人职务：</label>
+            <span><j-ellipsis :value="basicInfo.post" :length="17"></j-ellipsis></span>
+          </a-col>
+        </a-row>
+        <a-row :gutter="24">
+          <a-col :span="12" class="detail-item">
+            <label>企业联系人电话：</label>
+            <span>{{ basicInfo.phone }}</span>
+          </a-col>
+          <a-col :span="12" class="detail-item">
+            <label>企业联系人邮箱：</label>
+            <span>{{ basicInfo.email }}</span>
+          </a-col>
+        </a-row>
+        <a-row :gutter="24">
+          <a-col :span="12" class="detail-item">
+            <label>企业联系人邮编：</label>
+            <span>{{ basicInfo.postalCodeContacts }}</span>
+          </a-col>
+          <a-col :span="12" class="detail-item">
+            <label>企业联系人地址：</label>
+            <span><j-ellipsis :value="basicInfo.contactAddress" :length="17"></j-ellipsis></span>
+          </a-col>
+        </a-row>
+      </template>
+      <!--      工作组项目使用循环显示出联系人信息-->
+      <template v-if="basicInfo.projectType === 2 && basicInfo.payWorkingGroupSubItemContactsList && basicInfo.payWorkingGroupSubItemContactsList.length > 0">
+        <div v-for="(item, index) in basicInfo.payWorkingGroupSubItemContactsList" :key="index + ''">
           <a-row :gutter="24">
             <a-col :span="12" class="detail-item">
-              <label>企业联系人2：</label>
-              <span><j-ellipsis :value="basicInfo.nameTwo" :length="16"></j-ellipsis></span>
+              <label>企业联系人{{ index + 1 }}：</label>
+              <span><j-ellipsis :value="item.contactsTemporaryName" :length="16"></j-ellipsis></span>
             </a-col>
             <a-col :span="12" class="detail-item">
-              <label>企业联系人2备注：</label>
-              <span><j-ellipsis :value="basicInfo.remarksTwo" :length="16"></j-ellipsis></span>
+              <label>企业联系人{{ index + 1 }}备注：</label>
+              <span><j-ellipsis :value="item.remarks" :length="16"></j-ellipsis></span>
             </a-col>
           </a-row>
           <a-row :gutter="24">
             <a-col :span="12">
-              <label>企业联系人2性别：</label>
-              <span>{{ basicInfo.genderTwo_dictText }}</span>
+              <label>企业联系人{{ index + 1 }}性别：</label>
+              <span>{{ item.gender_dictText }}</span>
             </a-col>
             <a-col :span="12" class="detail-item">
-              <label>企业联系人2职务：</label>
-              <span><j-ellipsis :value="basicInfo.postTwo" :length="16"></j-ellipsis></span>
+              <label>企业联系人{{ index + 1 }}职务：</label>
+              <span><j-ellipsis :value="item.post" :length="16"></j-ellipsis></span>
             </a-col>
           </a-row>
           <a-row :gutter="24">
             <a-col :span="12" class="detail-item">
-              <label>企业联系人2电话：</label>
-              <span>{{ basicInfo.phoneTwo }}</span>
+              <label>企业联系人{{ index + 1 }}电话：</label>
+              <span>{{ item.phone }}</span>
             </a-col>
             <a-col :span="12" class="detail-item">
-              <label>企业联系人2邮箱：</label>
-              <span>{{ basicInfo.emailTwo }}</span>
+              <label>企业联系人{{ index + 1 }}邮箱：</label>
+              <span>{{ item.email }}</span>
             </a-col>
           </a-row>
           <a-row :gutter="24">
             <a-col :span="12" class="detail-item">
-              <label>企业联系人2邮编：</label>
-              <span>{{ basicInfo.postalCodeContactsTwo }}</span>
+              <label>企业联系人{{ index + 1 }}邮编：</label>
+              <span>{{ item.postalCodeContacts }}</span>
             </a-col>
             <a-col :span="12" class="detail-item">
-              <label>企业联系人2地址：</label>
-              <span><j-ellipsis :value="basicInfo.contactAddressTwo" :length="16"></j-ellipsis></span>
+              <label>企业联系人{{ index + 1 }}地址：</label>
+              <span><j-ellipsis :value="item.contactAddress" :length="16"></j-ellipsis></span>
             </a-col>
           </a-row>
-        </template>
-        <!--        企业联系人3-->
-        <template v-if="basicInfo.nameThree">
-          <a-divider/>
-          <a-row :gutter="24">
-            <a-col :span="12" class="detail-item">
-              <label>企业联系人3：</label>
-              <span><j-ellipsis :value="basicInfo.nameThree" :length="16"></j-ellipsis></span>
-            </a-col>
-            <a-col :span="12" class="detail-item">
-              <label>企业联系人3备注：</label>
-              <span><j-ellipsis :value="basicInfo.remarksThree" :length="16"></j-ellipsis></span>
-            </a-col>
-          </a-row>
-          <a-row :gutter="24">
-            <a-col :span="12">
-              <label>企业联系人3性别：</label>
-              <span>{{ basicInfo.genderThree_dictText }}</span>
-            </a-col>
-            <a-col :span="12" class="detail-item">
-              <label>企业联系人3职务：</label>
-              <span><j-ellipsis :value="basicInfo.postThree" :length="16"></j-ellipsis></span>
-            </a-col>
-          </a-row>
-          <a-row :gutter="24">
-            <a-col :span="12" class="detail-item">
-              <label>企业联系人3电话：</label>
-              <span>{{ basicInfo.phoneThree }}</span>
-            </a-col>
-            <a-col :span="12" class="detail-item">
-              <label>企业联系人3邮箱：</label>
-              <span>{{ basicInfo.emailThree }}</span>
-            </a-col>
-          </a-row>
-          <a-row :gutter="24">
-            <a-col :span="12" class="detail-item">
-              <label>企业联系人3邮编：</label>
-              <span>{{ basicInfo.postalCodeContactsThree }}</span>
-            </a-col>
-            <a-col :span="12" class="detail-item">
-              <label>企业联系人3地址：</label>
-              <span><j-ellipsis :value="basicInfo.contactAddressThree" :length="16"></j-ellipsis></span>
-            </a-col>
-          </a-row>
-        </template>
+          <a-divider v-if="index + 1 !== basicInfo.payWorkingGroupSubItemContactsList.length"/>
+        </div>
       </template>
-      <!--      工作组项目有企业联系人2、3-->
     </section>
     <!--    企业联系人信息end-->
     <!--到账信息begin-->
@@ -428,14 +379,14 @@ export default {
           }
         })
       }
-      return `${item.person}于${item.time}开票，金额为:${item.money}元,票号:${item.piaoNo},项目:${porjectItem}`
+      return `${ item.person }于${ item.time }开票，金额为:${ item.money }元,票号:${ item.piaoNo },项目:${ porjectItem }`
     },
     /*
     *  查看物流
     * */
     lookLogistics(record) {
       const com = Number(record.sendMethod) === 1 && 'ems' || 'shunfeng'
-      window.open(`https://www.kuaidi100.com/chaxun?com=${com}&nu=${record.postNo}`)
+      window.open(`https://www.kuaidi100.com/chaxun?com=${ com }&nu=${ record.postNo }`)
     },
     /*
     * 去合同详情 传入合同id
diff --git a/src/components/company/SelectContacts.vue b/src/components/company/SelectContacts.vue
index 606019b..bf9e798 100644
--- a/src/components/company/SelectContacts.vue
+++ b/src/components/company/SelectContacts.vue
@@ -188,6 +188,7 @@ export default {
      * 第一次展开下拉，去掉和初始联系人一样的联系人
      */
     handleDropdownOpen() {
+      this.getContactsList()
       if (this.isFirstOpen && this.initContacts && this.initContacts.id) {
         this.contactsList.forEach((item, index) => {
           if (item.id === this.initContacts.id) {
diff --git a/src/views/projectManagement/modules/WorkingGroupMemberUnitModule.vue b/src/views/projectManagement/modules/WorkingGroupMemberUnitModule.vue
index 9fc941e..a144321 100644
--- a/src/views/projectManagement/modules/WorkingGroupMemberUnitModule.vue
+++ b/src/views/projectManagement/modules/WorkingGroupMemberUnitModule.vue
@@ -35,67 +35,96 @@
             </a-form-item>
           </a-col>
         </a-row>
+        <template v-if="model.payWorkingGroupSubItemContactsList && model.payWorkingGroupSubItemContactsList.length > 0">
+          <a-row v-for="(item, index) in model.payWorkingGroupSubItemContactsList" :key="index + ''">
+            <a-col :xl="12" :sm="24">
+              <a-form-item :label="`企业联系人${index + 1}`" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                <select-contacts :selected-company="selectedCompany"
+                                 :init-contacts="selectedContact1"
+                                 :placeholder="`请选择企业联系人${index + 1}`"
+                                 v-decorator="[`payWorkingGroupSubItemContactsList[${index}].contactsId`, {rules: [{ required: index === 0, validator: index === 0 ? validateContactRequired : validateContact }],validateTrigger: 'change'}]"
+                                 :maxLength='50'
+                                 :ref="`selectContacts${index}`"
+                                 @ok="addContactsOneOk"
+                                 @change="value => contactsChange(value, index)"></select-contacts>
+              </a-form-item>
+            </a-col>
+            <a-col :xl="9" :sm="20">
+              <!--            v-show="hasContactOne"-->
+              <a-form-item :label="`备注${index + 1}`" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                <a-input
+                  :placeholder="`请输入备注${index + 1}`"
+                  v-decorator="[`payWorkingGroupSubItemContactsList[${index}].remarks`]"
+                  :maxLength='50'
+                  @change="e => {e.target.value = (e.target.value + '').trim()}">
+                </a-input>
+              </a-form-item>
+            </a-col>
+            <a-col :xl="3" :sm="4">
+              <a-button type="link" class="contact-btn" @click="handleAddContact(index)">添加</a-button>
+              <a-button type="link" class="contact-btn del-btn" @click="handleDelContact(index)">删除</a-button>
+            </a-col>
+          </a-row>
+        </template>
+        <!--        <a-row>-->
+        <!--          <a-col :xl="12" :sm="24">-->
+        <!--            <a-form-item label="企业联系人2" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
+        <!--              <select-contacts :selected-company="selectedCompany"-->
+        <!--                               :init-contacts="selectedContact2"-->
+        <!--                               placeholder="请选择企业联系人2"-->
+        <!--                               v-decorator="['contactsIdTwo',validatorRules.contactsRepeat]"-->
+        <!--                               :maxLength='50'-->
+        <!--                               ref="selectContacts2"-->
+        <!--                               @change="contactsTwoChange"-->
+        <!--                               @ok="addContactsTwoOk"></select-contacts>-->
+        <!--            </a-form-item>-->
+        <!--          </a-col>-->
+        <!--          <a-col :xl="9" :sm="20">-->
+        <!--            &lt;!&ndash;            v-show="hasContactTwo"&ndash;&gt;-->
+        <!--            <a-form-item label="备注2" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
+        <!--              <a-input-->
+        <!--                placeholder="请输入备注2"-->
+        <!--                v-decorator="['remarksTwo']"-->
+        <!--                :maxLength='50'-->
+        <!--                @change="e => {e.target.value = (e.target.value + '').trim()}">-->
+        <!--              </a-input>-->
+        <!--            </a-form-item>-->
+        <!--          </a-col>-->
+        <!--          <a-col :xl="3" :sm="4">-->
+        <!--            <a-button type="link" class="contact-btn">添加</a-button>-->
+        <!--            <a-button type="link" class="contact-btn del-btn">删除</a-button>-->
+        <!--          </a-col>-->
+        <!--        </a-row>-->
+        <!--        <a-row>-->
+        <!--          <a-col :xl="12" :sm="24">-->
+        <!--            <a-form-item label="企业联系人3" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
+        <!--              <select-contacts :selected-company="selectedCompany"-->
+        <!--                               :init-contacts="selectedContact3"-->
+        <!--                               placeholder="请选择企业联系人3"-->
+        <!--                               v-decorator="['contactsIdThree',validatorRules.contactsRepeat]"-->
+        <!--                               :maxLength='50'-->
+        <!--                               ref="selectContacts3"-->
+        <!--                               @change="contactsThreeChange"-->
+        <!--                               @ok="addContactsThreeOk"></select-contacts>-->
+        <!--            </a-form-item>-->
+        <!--          </a-col>-->
+        <!--          <a-col :xl="9" :sm="20">-->
+        <!--            &lt;!&ndash;            v-show="hasContactThree"&ndash;&gt;-->
+        <!--            <a-form-item label="备注3" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
+        <!--              <a-input-->
+        <!--                placeholder="请输入备注3"-->
+        <!--                v-decorator="['remarksThree']"-->
+        <!--                :maxLength='50'-->
+        <!--                @change="e => {e.target.value = (e.target.value + '').trim()}">-->
+        <!--              </a-input>-->
+        <!--            </a-form-item>-->
+        <!--          </a-col>-->
+        <!--          <a-col :xl="3" :sm="4">-->
+        <!--            <a-button type="link" class="contact-btn">添加</a-button>-->
+        <!--            <a-button type="link" class="contact-btn del-btn">删除</a-button>-->
+        <!--          </a-col>-->
+        <!--        </a-row>-->
         <a-row>
-          <a-col :xl="12" :sm="24">
-            <a-form-item label="企业联系人1" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <select-contacts :selected-company="selectedCompany"
-                               :init-contacts="selectedContact1"
-                               placeholder="请选择企业联系人1"
-                               v-decorator="['contactsIdOne',validatorRules.contactsIdOne]"
-                               :maxLength='50'
-                               ref="selectContacts1"
-                               @ok="addContactsOneOk"
-                               @change="contactsChange"></select-contacts>
-            </a-form-item>
-          </a-col>
-          <a-col :xl="12" :sm="24">
-            <a-form-item label="企业联系人2" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <select-contacts :selected-company="selectedCompany"
-                               :init-contacts="selectedContact2"
-                               placeholder="请选择企业联系人2"
-                               v-decorator="['contactsIdTwo',validatorRules.contactsRepeat]"
-                               :maxLength='50'
-                               ref="selectContacts2"
-                               @change="contactsTwoChange"
-                               @ok="addContactsTwoOk"></select-contacts>
-            </a-form-item>
-          </a-col>
-        </a-row>
-        <a-row>
-          <a-col :xl="12" :sm="24">
-            <a-form-item label="备注1" :labelCol="labelCol" :wrapperCol="wrapperCol" v-show="hasContactOne">
-              <a-input
-                placeholder="请输入备注1"
-                v-decorator="['remarksOne']"
-                :maxLength='50'
-                @change="e => {e.target.value = (e.target.value + '').trim()}">
-              </a-input>
-            </a-form-item>
-          </a-col>
-          <a-col :xl="12" :sm="24">
-            <a-form-item label="备注2" :labelCol="labelCol" :wrapperCol="wrapperCol" v-show="hasContactTwo">
-              <a-input
-                placeholder="请输入备注2"
-                v-decorator="['remarksTwo']"
-                :maxLength='50'
-                @change="e => {e.target.value = (e.target.value + '').trim()}">
-              </a-input>
-            </a-form-item>
-          </a-col>
-        </a-row>
-        <a-row>
-          <a-col :xl="12" :sm="24">
-            <a-form-item label="企业联系人3" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <select-contacts :selected-company="selectedCompany"
-                               :init-contacts="selectedContact3"
-                               placeholder="请选择企业联系人3"
-                               v-decorator="['contactsIdThree',validatorRules.contactsRepeat]"
-                               :maxLength='50'
-                               ref="selectContacts3"
-                               @change="contactsThreeChange"
-                               @ok="addContactsThreeOk"></select-contacts>
-            </a-form-item>
-          </a-col>
           <a-col :xl="12" :sm="24">
             <a-form-item label="邮寄联系人" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <select-contacts :selected-company="selectedCompany"
@@ -103,20 +132,8 @@
                                placeholder="请选择邮寄联系人"
                                v-decorator="['mailContactsId',validatorRules.mailContactsId]"
                                :maxLength='50'
-                               ref="selectMailContacts"
-                               @ok="addMailContactsOk"></select-contacts>
-            </a-form-item>
-          </a-col>
-        </a-row>
-        <a-row>
-          <a-col :xl="12" :sm="24">
-            <a-form-item label="备注3" :labelCol="labelCol" :wrapperCol="wrapperCol" v-show="hasContactThree">
-              <a-input
-                placeholder="请输入备注3"
-                v-decorator="['remarksThree']"
-                :maxLength='50'
-                @change="e => {e.target.value = (e.target.value + '').trim()}">
-              </a-input>
+                               ref="selectMailContacts">
+              </select-contacts>
             </a-form-item>
           </a-col>
         </a-row>
@@ -400,12 +417,17 @@ export default {
       workingGroupList: [],
       disabledCompany: false, // 企业是否禁用
       isAssociatedContract: false, // 是否关联合同
-      hasContactOne: false, // 是否选择联系人1
-      hasContactTwo: false, // 是否选择联系人2
-      hasContactThree: false, // 是否选择联系人3
+      // hasContactOne: false, // 是否选择联系人1
+      // hasContactTwo: false, // 是否选择联系人2
+      // hasContactThree: false, // 是否选择联系人3
       url: {
         add: '/project/payWorkingGroupSubitem/add',
         edit: '/project/payWorkingGroupSubitem/edit'
+      },
+      // 默认的联系人数据
+      defaultPayWorkingGroupSubItemContact: {
+        contactsId: undefined,
+        remarks: null
       }
     }
   },
@@ -468,7 +490,7 @@ export default {
       this.companyChange(this.selectedCompany)
       this.form.resetFields()
       record.contractNum = record.contractNum || undefined
-      this.model = Object.assign({}, record)
+      this.model = Object.assign({}, JSON.parse(JSON.stringify(record)))
       // 是否存在从收入合同传入的签订联系人id
       this.model.contactsIdOne = this.signedContactId || this.model.contactsTemporaryIdOne || undefined
       this.model.contactsIdTwo = this.model.contactsTemporaryIdTwo || undefined
@@ -492,22 +514,28 @@ export default {
           id: this.model.mailContactsTemporaryId,
           name: this.model.mailContactsTemporaryName
         }
-        // 是否需要显示联系人备注信息
-        if (this.model.contactsTemporaryIdOne) {
-          this.hasContactOne = true
-        }
-        if (this.model.contactsTemporaryIdTwo) {
-          this.hasContactTwo = true
-        }
-        if (this.model.contactsTemporaryIdThree) {
-          this.hasContactThree = true
-        }
+        // // 是否需要显示联系人备注信息
+        // if (this.model.contactsTemporaryIdOne) {
+        //   this.hasContactOne = true
+        // }
+        // if (this.model.contactsTemporaryIdTwo) {
+        //   this.hasContactTwo = true
+        // }
+        // if (this.model.contactsTemporaryIdThree) {
+        //   this.hasContactThree = true
+        // }
+      } else {
+        // 新增处理默认显示的三个企业联系人
+        this.model.payWorkingGroupSubItemContactsList = []
+        this.model.payWorkingGroupSubItemContactsList.push(this.defaultPayWorkingGroupSubItemContact)
+        this.model.payWorkingGroupSubItemContactsList.push(this.defaultPayWorkingGroupSubItemContact)
+        this.model.payWorkingGroupSubItemContactsList.push(this.defaultPayWorkingGroupSubItemContact)
       }
       this.chargeWayType = record.chargeWay
       this.pickChargeNoticeType(record.charge, true)
       this.visible = true
       this.$nextTick(() => {
-        this.form.setFieldsValue(pick(this.model, 'chargeCompany', 'contactsIdOne', 'contactsIdTwo', 'contactsIdThree', 'mailContactsId', 'chargeWay', 'charge', 'receivableAmount', 'contractNum', 'receivableAmount', 'chargeNoticeId', 'needInvoice', 'remarks', 'remarksOne', 'remarksTwo', 'remarksThree'))
+        this.form.setFieldsValue(pick(this.model, 'chargeCompany', 'contactsIdOne', 'contactsIdTwo', 'contactsIdThree', 'mailContactsId', 'chargeWay', 'charge', 'receivableAmount', 'contractNum', 'receivableAmount', 'chargeNoticeId', 'needInvoice', 'remarks', 'remarksOne', 'remarksTwo', 'remarksThree', 'payWorkingGroupSubItemContactsList'))
       })
     },
     close() {
@@ -523,10 +551,12 @@ export default {
       this.isAssociatedContract = false
       this.disabledCompany = false
       // 清除联系人备注信息
-      this.hasContactOne = false
-      this.hasContactTwo = false
-      this.hasContactThree = false
+      // this.hasContactOne = false
+      // this.hasContactTwo = false
+      // this.hasContactThree = false
       this.visible = false
+      this.model = Object.assign({}, {})
+      this.form.resetFields()
     },
     handleOk() {
       if (this.confirmLoading) {
@@ -557,7 +587,12 @@ export default {
           if (this.workingGroupId) {
             values.workingGroupId = this.workingGroupId
           }
-          const formData = Object.assign(this.model, values)
+          // 企业联系人信息中将没有值的去掉
+          let haveValueContactArr = values.payWorkingGroupSubItemContactsList.filter(tt => tt.contactsId)
+          let obj = {
+            payWorkingGroupSubItemContactsList: haveValueContactArr
+          }
+          const formData = Object.assign(this.model, values, obj)
           console.log('表单提交数据', formData)
           httpAction(httpurl, formData, method).then((res) => {
             if (res.success) {
@@ -679,18 +714,6 @@ export default {
      * 在新增成功后重新获取联系人列表
      */
     addContactsOneOk() {
-      this.$refs.selectContacts2.getContactsList()
-      this.$refs.selectContacts3.getContactsList()
-      this.$refs.selectMailContacts.getContactsList()
-    },
-    addContactsTwoOk() {
-      this.$refs.selectContacts1.getContactsList()
-      this.$refs.selectContacts3.getContactsList()
-      this.$refs.selectMailContacts.getContactsList()
-    },
-    addContactsThreeOk() {
-      this.$refs.selectContacts1.getContactsList()
-      this.$refs.selectContacts2.getContactsList()
       this.$refs.selectMailContacts.getContactsList()
     },
     addMailContactsOk() {
@@ -698,6 +721,12 @@ export default {
       this.$refs.selectContacts2.getContactsList()
       this.$refs.selectContacts3.getContactsList()
     },
+    validateContactRequired(rule, value, callback) {
+      if (value) {
+        callback()
+      }
+      callback('请选择企业联系人1')
+    },
     /**
      * 校验企业联系人是否重复
      * @param rule
@@ -706,21 +735,12 @@ export default {
      */
     validateContact(rule, value, callback) {
       if (value) {
-        // 需要联动验证的字段
-        let fieldArr = ['contactsIdOne', 'contactsIdTwo', 'contactsIdThree']
-        // 去掉当前更改的字段
-        fieldArr = fieldArr.filter(tt => tt !== rule.field)
-        const contactObj = this.form.getFieldsValue(['contactsIdOne', 'contactsIdTwo', 'contactsIdThree'])
-        const contactArr = Object.values(contactObj)
-        contactArr.filter(tt => tt !== undefined)
-        if (isRepeat(contactArr)) {
-          callback('请选择不同的企业联系人')
-        } else {
-          // 进行其余两个联系人字段的重复校验
-          this.form.validateFields(fieldArr)
+        let contactsList = this.form.getFieldValue('payWorkingGroupSubItemContactsList')
+        let hasValueArr = contactsList.filter(tt => tt.contactsId === value)
+        if (hasValueArr.length <= 1) {
           callback()
         }
-        callback()
+        callback('请选择不同的联系人')
         return
       }
       callback()
@@ -728,58 +748,101 @@ export default {
     /**
      * 企业联系人1、邮寄联系人联动
      * @param value
+     * @param index
      */
-    contactsChange(value) {
+    contactsChange(value, index) {
+      let formData = this.form.getFieldValue('payWorkingGroupSubItemContactsList')
+      formData[index].contactsId = value
+      // 如果没有值，清空对应的备注
       if (!value) {
-        this.hasContactOne = false
-        this.form.setFieldsValue({ remarksOne: null })
-        return
-      }
-      this.hasContactOne = true
-      // 判断联系人是否和原来的一致，不一致则清空备注内容
-      if (value !== this.model.contactsTemporaryIdOne) {
-        this.form.setFieldsValue({ remarksOne: null })
-      }
-      let mailContact = Object.values(this.form.getFieldValue(['mailContactsId']))[0]
-      // 邮寄联系人非undefined时赋值
-      if (!mailContact) {
-        this.model.mailContactsId = value
-        this.$nextTick(() => {
-          this.form.setFieldsValue(pick(this.model, 'mailContactsId'))
-        })
+        formData[index].remarks = null
+      } else {
+        // 如果值和初始值不一致，则清除备注
+        if (this.model.payWorkingGroupSubItemContactsList[index].contactsId !== value) {
+          formData[index].remarks = null
+        }
+        let mailContact = Object.values(this.form.getFieldValue(['mailContactsId']))[0]
+        // 邮寄联系人非undefined时赋值
+        if (!mailContact && index === 0) {
+          this.model.mailContactsId = value
+          this.$nextTick(() => {
+            this.form.setFieldsValue(pick(this.model, 'mailContactsId'))
+          })
+        }
       }
+      this.$nextTick(() => {
+        this.form.setFieldsValue({ payWorkingGroupSubItemContactsList: formData })
+        this.form.validateFields(['payWorkingGroupSubItemContactsList'])
+      })
     },
     /**
      * 企业联系人2变化
      * @param value
      */
-    contactsTwoChange(value) {
-      if (!value) {
-        this.hasContactTwo = false
-        this.form.setFieldsValue({ remarksTwo: null })
-        return
-      }
-      this.hasContactTwo = true
-      // 判断联系人是否和原来的一致，不一致则清空备注内容
-      if (value !== this.model.contactsTemporaryIdTwo) {
-        this.form.setFieldsValue({ remarksTwo: null })
-      }
-    },
+    // contactsTwoChange(value) {
+    //   if (!value) {
+    //     this.hasContactTwo = false
+    //     this.form.setFieldsValue({ remarksTwo: null })
+    //     return
+    //   }
+    //   this.hasContactTwo = true
+    //   // 判断联系人是否和原来的一致，不一致则清空备注内容
+    //   if (value !== this.model.contactsTemporaryIdTwo) {
+    //     this.form.setFieldsValue({ remarksTwo: null })
+    //   }
+    // },
     /**
      * 企业联系人3变化
      * @param value
      */
-    contactsThreeChange(value) {
-      if (!value) {
-        this.hasContactThree = false
-        this.form.setFieldsValue({ remarksThree: null })
+    // contactsThreeChange(value) {
+    //   if (!value) {
+    //     this.hasContactThree = false
+    //     this.form.setFieldsValue({ remarksThree: null })
+    //     return
+    //   }
+    //   this.hasContactThree = true
+    //   // 判断联系人是否和原来的一致，不一致则清空备注内容
+    //   if (value !== this.model.contactsTemporaryIdThree) {
+    //     this.form.setFieldsValue({ remarksThree: null })
+    //   }
+    // },
+    /**
+     * 添加联系人
+     * @param index
+     */
+    handleAddContact(index) {
+      if (this.model.payWorkingGroupSubItemContactsList.length >= 10) {
+        this.$message.warn('最多添加十个企业联系人')
         return
       }
-      this.hasContactThree = true
-      // 判断联系人是否和原来的一致，不一致则清空备注内容
-      if (value !== this.model.contactsTemporaryIdThree) {
-        this.form.setFieldsValue({ remarksThree: null })
+      let obj = {
+        contactsId: undefined,
+        remarks: null
       }
+      this.model.payWorkingGroupSubItemContactsList.splice(index + 1, 0, obj)
+      this.$forceUpdate()
+      let formData = this.form.getFieldValue('payWorkingGroupSubItemContactsList')
+      formData.splice(index + 1, 0, obj)
+      this.$nextTick(() => {
+        this.form.setFieldsValue({ payWorkingGroupSubItemContactsList: formData })
+      })
+    },
+    /**
+     * 删除联系人
+     * @param index
+     */
+    handleDelContact(index) {
+      if (this.model.payWorkingGroupSubItemContactsList.length === 1) {
+        this.$message.warn('最少需要一个企业联系人')
+        return
+      }
+      this.model.payWorkingGroupSubItemContactsList.splice(index, 1)
+      let formData = this.form.getFieldValue('payWorkingGroupSubItemContactsList')
+      formData.splice(index, 1)
+      this.$nextTick(() => {
+        this.form.setFieldsValue({ payWorkingGroupSubItemContactsList: formData })
+      })
     }
   }
 }
@@ -808,4 +871,15 @@ export default {
     }
   }
 }
+
+.contact-btn {
+  display: inline-block;
+  margin: 0 8px;
+  padding: 0;
+  height: 40px;
+}
+
+.del-btn {
+  color: #ff4d4f
+}
 </style>
\ No newline at end of file