From de97364b9228ab54520c66bcf8151120ce68c607 Mon Sep 17 00:00:00 2001
From: fengachen <373943794@qq.com>
Date: Thu, 23 Sep 2021 14:53:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=9A=E8=AE=AE=E7=BC=96=E8=BE=91=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../incomePayments/meetManage/AddOrDetailMeet.vue  |  8 ++++----
 src/views/incomePayments/meetManage/Attendance.vue | 14 ++++++++++++++
 .../incomePayments/meetManage/OtherMeetingForm.vue |  4 +++-
 3 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/src/views/incomePayments/meetManage/AddOrDetailMeet.vue b/src/views/incomePayments/meetManage/AddOrDetailMeet.vue
index d7556bd..8098157 100644
--- a/src/views/incomePayments/meetManage/AddOrDetailMeet.vue
+++ b/src/views/incomePayments/meetManage/AddOrDetailMeet.vue
@@ -320,7 +320,7 @@
                   <a-textarea
                     placeholder="请输入通知正文"
                     :auto-size="{ minRows: 3, maxRows: 6 }"
-                    v-decorator="['remark']"
+                    v-decorator="['notice']"
                     :maxLength='200'
                     @change="e => {e.target.value = (e.target.value + '').trim()}"/>
                   <span style="color:#999">仅用于发送邮件使用</span>
@@ -535,7 +535,7 @@ export default {
       this.$nextTick(() => {
         // 加定时器是因为有可能赋值不成功
         setTimeout(() => {
-          this.form.setFieldsValue(pick(this.model, 'meetingName', 'meetingType', 'convokeTime', 'particularYear', 'estimatedNumber', 'meetingFiles', 'registerDeadline', 'meetingContent', 'convokeLocale', 'address', 'meetingCosts', 'directorId', 'remark', 'directorPhone')), 200
+          this.form.setFieldsValue(pick(this.model,'notice','meetingName', 'meetingType', 'convokeTime', 'particularYear', 'estimatedNumber', 'meetingFiles', 'registerDeadline', 'meetingContent', 'convokeLocale', 'address', 'meetingCosts', 'directorId', 'remark', 'directorPhone')), 200
         })
         // 如果是标协会议则回显 标协会议的字段
         if (this.meetingType === '2') {
@@ -571,8 +571,8 @@ export default {
           }
           let placeName = values.convokeLocale
           const formData = Object.assign(this.model, values, {venue: this.getPcaText(placeName)})
-          // 添加会议需要增加会议类型
-          formData.meetingType = this.$route.query.meetingType
+          // 添加编辑会议需要增加会议类型
+          formData.meetingType = this.meetingType
           // 如果是工作会议维护跳转的需要加上会议类型为工作组会议和工作组id
           if (this.isWorkGroupMeetType) {
             formData.meetingType = '1'
diff --git a/src/views/incomePayments/meetManage/Attendance.vue b/src/views/incomePayments/meetManage/Attendance.vue
index 0a0e661..fc66fef 100644
--- a/src/views/incomePayments/meetManage/Attendance.vue
+++ b/src/views/incomePayments/meetManage/Attendance.vue
@@ -201,6 +201,10 @@
             <div class="primary-color" @click="openDetailModal(record)">{{ text }}</div>
           </template>
 
+          <template slot="person" slot-scope="text,record">
+            <div class="primary-color" @click="toSignUpDetail(record)">{{ text }}</div>
+          </template>
+
           <template slot="text" slot-scope="text">
             <j-ellipsis v-if="text" :value="text" :length="20"></j-ellipsis>
             <span v-else></span>
@@ -299,6 +303,7 @@ export default {
           align: 'center',
           dataIndex: 'companyContactName',
           width: 100,
+          scopedSlots: {customRender: 'person'},
         },
         {
           title: '应收金额',
@@ -609,6 +614,15 @@ export default {
       })
     },
     /*
+    * 去报名详情
+    * */
+    toSignUpDetail(record){
+      this.$router.push({
+        path:'/incomePayments/meetManage/SignUpInfoDetail',
+        query:{meetingId:record.meetingid}
+      })
+    },
+    /*
     * 复制地址
     * */
     copy(data) {
diff --git a/src/views/incomePayments/meetManage/OtherMeetingForm.vue b/src/views/incomePayments/meetManage/OtherMeetingForm.vue
index aaa003b..7981061 100644
--- a/src/views/incomePayments/meetManage/OtherMeetingForm.vue
+++ b/src/views/incomePayments/meetManage/OtherMeetingForm.vue
@@ -271,7 +271,9 @@ export default {
           'postContactAddress',
           'payMode',
           'needInvoice',
-          'paymentRecord'
+          'paymentRecord',
+          'orderCode',
+          'postCode'
         ))
       })