From 64b308326338fe359eec3585045f086c81446e5d Mon Sep 17 00:00:00 2001
From: fengachen <373943794@qq.com>
Date: Wed, 20 Oct 2021 16:35:42 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90bug=E3=80=91=E8=B5=84=E6=96=99?=
 =?UTF-8?q?=E7=BD=91=E5=91=98=E6=88=90=E5=91=98=E6=B7=BB=E5=8A=A0=20?=
 =?UTF-8?q?=E5=B8=A6=E5=87=BA=E9=82=AE=E5=AF=84=E8=81=94=E7=B3=BB=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/SafeguardMemberModal.vue          | 32 ++++++++++++-------
 1 file changed, 20 insertions(+), 12 deletions(-)

diff --git a/src/views/incomePayments/memberManage/modules/SafeguardMemberModal.vue b/src/views/incomePayments/memberManage/modules/SafeguardMemberModal.vue
index 72277fd..8f63e73 100644
--- a/src/views/incomePayments/memberManage/modules/SafeguardMemberModal.vue
+++ b/src/views/incomePayments/memberManage/modules/SafeguardMemberModal.vue
@@ -39,12 +39,13 @@
                 :selected-company="selectedCompany"
                 :init-contacts="selectPerson"
                 placeholder="请选择企业联系人"
+                @change="changetPerson"
                 v-decorator="[
                   'companyContactId',
                   validatorRules.companyContactId,
                 ]"
                 :maxLength="50"
-                ref="selectMailContacts"
+                ref="selectContacts"
                 @ok="addContactsOk"
               ></select-contacts>
             </a-form-item>
@@ -203,11 +204,11 @@
         </a-row>
       </a-form>
     </a-spin>
-    <contact-management-module
-      ref="contactForm"
-      is-company-disabled
-      :selected-company="selectedCompany"
-    ></contact-management-module>
+<!--    <contact-management-module-->
+<!--      ref="contactForm"-->
+<!--      is-company-disabled-->
+<!--      :selected-company="selectedCompany"-->
+<!--    ></contact-management-module>-->
   </j-modal>
 </template>
 
@@ -216,7 +217,7 @@ import pick from 'lodash.pick'
 import { httpAction } from '@api/manage'
 import JUpload from '@comp/jero/JUpload'
 import CompanySelect from '@comp/company/CompanySelect'
-import ContactManagementModule from '@views/businessManagement/modules/ContactManagementModule'
+// import ContactManagementModule from '@views/businessManagement/modules/ContactManagementModule'
 import SelectContacts from '@comp/company/SelectContacts'
 import {addZero} from '@/utils/util'
 
@@ -225,7 +226,7 @@ export default {
   components: {
     JUpload,
     CompanySelect,
-    ContactManagementModule,
+    // ContactManagementModule,
     SelectContacts,
   },
   data() {
@@ -263,11 +264,11 @@ export default {
         },
         companyContactId: {
           rules: [{ required: true, message: '请选择企业联系人' }],
-          validateTrigger: 'blur',
+          validateTrigger: 'change',
         },
         postContactId: {
           rules: [{ required: true, message: '请选择邮寄联系人' }],
-          validateTrigger: 'blur',
+          validateTrigger: 'change',
         },
         paymentMethod: {
           rules: [{ required: true, message: '请选择来款方式' }],
@@ -365,6 +366,13 @@ export default {
         )
       })
     },
+    // 选择企业联系人 带出邮寄联系人
+    changetPerson(val){
+      // 只有邮寄联系人没有值的时候才去联动复制
+      if(this.form.getFieldValue('postContactId') === undefined ){
+        this.form.setFieldsValue({'postContactId':val})
+      }
+    },
     close() {
       this.incomePaysType = 3
       this.$emit('close')
@@ -413,10 +421,10 @@ export default {
      *  选择会员单位
      * */
     companyChange(val) {
-      this.selectedCompany = Object.assign({}, val, { companyName: val.name })
+      this.selectedCompany = Object.assign({}, val, )
     },
     handleCancel() {
-      this.selectedCompany = {}
+      this.selectedCompany = null
       this.close()
     },
     /*