From e488da6b5ea26281d069abbd8dfaf44e116c1e62 Mon Sep 17 00:00:00 2001
From: fengachen <373943794@qq.com>
Date: Sat, 18 Sep 2021 18:16:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=94=B6=E5=85=A5=E5=90=88?=
 =?UTF-8?q?=E5=90=8C=E5=85=B3=E8=81=94=E9=A1=B9=E7=9B=AE=E6=96=B0=E5=A2=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../revenueContract/modules/AddMemberProject.vue       | 10 +---------
 .../revenueContract/modules/RevenueContractModule.vue  |  5 +++++
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/views/contractManagement/revenueContract/modules/AddMemberProject.vue b/src/views/contractManagement/revenueContract/modules/AddMemberProject.vue
index 04996c7..d75e194 100644
--- a/src/views/contractManagement/revenueContract/modules/AddMemberProject.vue
+++ b/src/views/contractManagement/revenueContract/modules/AddMemberProject.vue
@@ -37,7 +37,6 @@
             <a-form-item label="企业联系人" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <select-contacts placeholder="请选择企业联系人"
                                :selected-company="contractInfo.companyId"
-                               :init-contacts="selectContact"
                                v-decorator="['companyContactId',validatorRules.companyContactId]"></select-contacts>
             </a-form-item>
           </a-col>
@@ -47,7 +46,6 @@
             <a-form-item label="邮寄联系人" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <select-contacts placeholder="请选择邮寄联系人"
                                :selected-company="contractInfo.companyId"
-                               :init-contacts="selectContact"
                                v-decorator="['postContactId', validatorRules.postContactId]"></select-contacts>
             </a-form-item>
           </a-col>
@@ -195,8 +193,6 @@ export default {
       },
       // 合同信息
       contractInfo:{},
-      // 联系人回显
-      selectContact:null,
       // 不包含在列表的会员项目
       memberProjetList:[],
     }
@@ -210,7 +206,7 @@ export default {
       this.contractInfo = Object.assign({},record)
       // 会员企业的默认显示
       this.contractInfo.companyId = {
-        id:record.signedCompanyTemporaryId,
+        id:record.signedCompanyId,
         companyName:record.signedCompanyTemporaryName
       }
       // 查询会员项目的企业id
@@ -223,10 +219,6 @@ export default {
       this.contractInfo.postContactId = record.signedContactsId
       // 合同编号显示
       this.contractInfo.contractNo = record.contractNum
-      this.selectContact = {
-        id:record.signedContactsId,
-        name:record.signedContactsTemporaryName
-      }
      this.$nextTick( () => {
        this.form.setFieldsValue(pick(this.contractInfo,'companyId','companyContactId','postContactId','contractNo'))
      })
diff --git a/src/views/contractManagement/revenueContract/modules/RevenueContractModule.vue b/src/views/contractManagement/revenueContract/modules/RevenueContractModule.vue
index 1a09132..2c836c0 100644
--- a/src/views/contractManagement/revenueContract/modules/RevenueContractModule.vue
+++ b/src/views/contractManagement/revenueContract/modules/RevenueContractModule.vue
@@ -796,6 +796,11 @@ export default {
         // 会议项目
         case 3:
           // 传入合同信息
+          // 打包为是不能选择关联会议项目
+          if(this.newFormData.pack === 1){
+            this.$message.warn('打包不可选择会议项目')
+            return
+          }
           this.$refs.selectMeetingProjectModule.open(this.newFormData)
           break
         // 会员项目