收入合同新增项目回显联系人、邮寄联系人；图标修改

src/views/contractManagement/revenueContract/modules/RevenueContractModule.vue

@@ -264,6 +264,7 @@
                            :contract-id="model.id"
                            :project-type="projectType"
                            :default-contract-num="contractNum"
+                           :signed-contact-id="signedContactId"
                            :default-charge-company="selectedCompany"></select-project-module>
     <!--    工作组项目选择-->
     <select-working-group-project-module ref="selectWorkingGroupProjectModule"

src/views/projectManagement/modules/GeneralProjectModule.vue

@@ -227,6 +227,12 @@ export default {
       type: Boolean,
       required: false,
       default: false
+    },
+    // 企业的签订联系人id，收入合同新增企业联系人、邮寄联系人默认为签订联系人
+    signedContactId: {
+      type: String,
+      required: false,
+      default: undefined
     }
   },
   data() {
@@ -338,8 +344,10 @@ export default {
           companyName: record.chargeCompanyTemporaryName
         }
       }
-      record.contactsId = record.contactsTemporaryId
+      // 是否存在从收入合同传入的签订联系人id
-      record.mailContactsId = record.mailContactsTemporaryId
+      console.log(record, this.signedContactId)
+      record.contactsId = this.signedContactId || record.contactsTemporaryId || undefined
+      record.mailContactsId = this.signedContactId || record.mailContactsTemporaryId || undefined
       // 回显选中的企业
       this.selectedCompany = record.chargeCompany
       this.form.resetFields()

src/views/projectManagement/modules/WorkingGroupMemberUnitModule.vue

@@ -251,6 +251,12 @@ export default {
       type: Boolean,
       required: false,
       default: false
+    },
+    // 企业的签订联系人id，收入合同新增企业联系人、邮寄联系人默认为签订联系人
+    signedContactId: {
+      type: String,
+      required: false,
+      default: undefined
     }
   },
   data() {
@@ -352,6 +358,9 @@ export default {
         })
       }
     },
+    /**
+     * 获取工作组列表
+     */
     loadWorkingGroupList() {
       let param = {
         companyId: this.defaultChargeCompany.id
@@ -379,12 +388,16 @@ export default {
       }
       // 回显选中的企业
       this.selectedCompany = record.chargeCompany
+      this.companyChange(this.selectedCompany)
       this.form.resetFields()
       this.model = Object.assign({}, record)
-      this.model.contactsIdOne = this.model.contactsTemporaryIdOne || undefined
+      console.log(this.signedContactId)
+      // 是否存在从收入合同传入的签订联系人id
+      this.model.contactsIdOne = this.signedContactId || this.model.contactsTemporaryIdOne || undefined
       this.model.contactsIdTwo = this.model.contactsTemporaryIdTwo || undefined
       this.model.contactsIdThree = this.model.contactsTemporaryIdThree || undefined
-      this.model.mailContactsId = this.model.mailContactsTemporaryId || undefined
+      // 是否存在从收入合同传入的签订联系人id
+      this.model.mailContactsId = this.signedContactId || this.model.mailContactsTemporaryId || undefined
       if (this.model.id) {
         this.selectedContact1 = {
           id: this.model.contactsTemporaryIdOne,
@@ -483,7 +496,7 @@ export default {
       this.pickChargeNoticeType(chargeNoticeNo)
     },
     /**
-     * 匹配显隐
+     * 匹配收费通知显隐
      * @param value
      */
     pickChargeNoticeType(value) {