From 6c43899da9d03aba07c83f563ec46b3255400cae Mon Sep 17 00:00:00 2001
From: fengachen <373943794@qq.com>
Date: Tue, 14 Dec 2021 17:35:29 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91=20?=
 =?UTF-8?q?=E4=BC=9A=E8=AE=AE=E7=BC=96=E8=BE=91=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/incomePayments/meetManage/AddOrDetailMeet.vue | 4 ++--
 src/views/projectManagement/CommitteeMeeting.vue        | 8 +++++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/views/incomePayments/meetManage/AddOrDetailMeet.vue b/src/views/incomePayments/meetManage/AddOrDetailMeet.vue
index 6b8e593..085c2b3 100644
--- a/src/views/incomePayments/meetManage/AddOrDetailMeet.vue
+++ b/src/views/incomePayments/meetManage/AddOrDetailMeet.vue
@@ -537,12 +537,12 @@ export default {
       this.$nextTick(() => {
         // 加定时器是因为有可能赋值不成功
         setTimeout(() => {
-          this.form.setFieldsValue(pick(this.model, 'notice','hotelContactsList', 'paymentQrCode', 'meetingName', 'meetingType', 'convokeTime', 'particularYear', 'estimatedNumber', 'meetingFiles', 'registerDeadline', 'meetingContent', 'convokeLocale', 'address', 'meetingCosts', 'directorId', 'remark', 'directorPhone')), 200
+          this.form.setFieldsValue(pick(this.model, 'notice','hotelContactsList','hotelName', 'hotelAddress' ,'paymentQrCode', 'meetingName', 'meetingType', 'convokeTime', 'particularYear', 'estimatedNumber', 'meetingFiles', 'registerDeadline', 'meetingContent', 'convokeLocale', 'address', 'meetingCosts', 'directorId', 'remark', 'directorPhone')), 200
         })
         // 如果是标协会议则回显 标协会议的字段
         if (this.meetingType === '2') {
           console.log('this.model', this.model)
-          this.form.setFieldsValue(pick(this.model, 'signInTime', 'tbMeetingType', 'meetingCostsVip', 'hotelName', 'hotelAddress'))
+          this.form.setFieldsValue(pick(this.model, 'signInTime', 'tbMeetingType', 'meetingCostsVip' ))
         }
         // 如果是工作组会议 赋值工作组
         if (this.meetingType === '1') {
diff --git a/src/views/projectManagement/CommitteeMeeting.vue b/src/views/projectManagement/CommitteeMeeting.vue
index e560d7c..e4db891 100644
--- a/src/views/projectManagement/CommitteeMeeting.vue
+++ b/src/views/projectManagement/CommitteeMeeting.vue
@@ -285,9 +285,6 @@ export default {
     if (this.meetingType === '2') {
       this.authorCode = Object.assign({}, this.standardsMeetingAuthorCode)
     }
-    if(this.disableMixinCreated){
-      this.loadData(1)
-    }
     // 不是分标委会议去掉提醒字段
     if (this.meetingType !== '5') {
       this.newColumns = [...this.columns]
@@ -297,6 +294,11 @@ export default {
       this.newColumns = [...this.columns]
     }
   },
+  mounted() {
+    if(this.disableMixinCreated){
+      this.loadData(1)
+    }
+  },
   computed: {
     pageTitle() {
       return `${this.$route.query.title}`