From dc588204bb8e30528c79ae81d0abe028ad0bd532 Mon Sep 17 00:00:00 2001
From: fengachen <373943794@qq.com>
Date: Sun, 26 Sep 2021 21:19:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=9A=E8=AE=AE=E5=8F=91=E5=B8=83=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=20=E5=8F=91=E5=B8=83=E6=8F=90=E9=86=92=20=E5=9B=BD?=
 =?UTF-8?q?=E9=99=85=E7=A0=94=E8=AE=A8=E4=BC=9A=E6=8A=A5=E5=90=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../meetManage/AddOrDetailMeet.vue               |  4 ++--
 .../modules/PublishRemindModal.vue               | 12 ++++++++----
 src/views/signUp/SignUpPage.vue                  | 16 ++++++++++++++++
 3 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/src/views/incomePayments/meetManage/AddOrDetailMeet.vue b/src/views/incomePayments/meetManage/AddOrDetailMeet.vue
index 148e8d3..4ae514d 100644
--- a/src/views/incomePayments/meetManage/AddOrDetailMeet.vue
+++ b/src/views/incomePayments/meetManage/AddOrDetailMeet.vue
@@ -545,9 +545,9 @@ export default {
     * */
     handleOk() {
       const that = this
-      that.confirmLoading = true
       this.form.validateFields((err, values) => {
         if (!err) {
+          that.confirmLoading = true
           let httpurl = ''
           let method = 'post'
           if (that.model.id) {
@@ -648,7 +648,7 @@ export default {
       const keys = form.getFieldValue('hotelContactsList')
       // 增加数据后重新赋值
       this.model.hotelContactsList.splice(index + 1, 0, obj)
-      keys.splice(index + 1, 0, obj)
+      // keys.splice(index , 0, obj)
       this.$nextTick(() => {
         form.setFieldsValue({
           hotelContactsList: keys
diff --git a/src/views/projectManagement/modules/PublishRemindModal.vue b/src/views/projectManagement/modules/PublishRemindModal.vue
index 05bb6cc..0468214 100644
--- a/src/views/projectManagement/modules/PublishRemindModal.vue
+++ b/src/views/projectManagement/modules/PublishRemindModal.vue
@@ -30,7 +30,7 @@
       size="middle"
       bordered
       rowKey="id"
-      :columns="columns"
+      :columns="newColumns"
       :dataSource="dataSource"
       :pagination="ipagination"
       :loading="loading"
@@ -126,10 +126,12 @@ export default {
       },
       // 会议维护选中的会议
       selectedMetingList:[],
+      newColumns:[]
     }
   },
   methods: {
     open(meetingList) {
+      this.newColumns = [...this.columns]
       this.visible = true
       // 保存选中的会议
       this.selectedMetingList = [...meetingList]
@@ -137,10 +139,12 @@ export default {
       this.filters.workingGroupId = this.$route.query.workingGroupProjectId
       // 发布提醒需要会议id  只有选择一个会议的时候 才会有这个参数
       if(meetingList.length === 1) {
-        this.filters.workingGroupId = this.$route.query.workingGroupProjectId
+        this.filters.meetingId =  meetingList[0]
+      }
+      // 选择多个会议的时候不需要提醒字段  这样写是因为无法精准定位每一个人对应的每一个会议 这个人是否被提醒
+      if(meetingList.length > 1){
         // 去掉列表的提醒字段
-        let index = this.columns.findIndex(item => item.dataIndex === 'remind')
-        this.columns.splice(index,1)
+        this.newColumns = this.newColumns.filter( item => item.dataIndex !== 'remind')
       }
       this.searchReset()
     },
diff --git a/src/views/signUp/SignUpPage.vue b/src/views/signUp/SignUpPage.vue
index c5884c1..a61b985 100644
--- a/src/views/signUp/SignUpPage.vue
+++ b/src/views/signUp/SignUpPage.vue
@@ -340,6 +340,8 @@ export default {
       meetingCostBool: false,
       // 是否有邀请码
       inviteCodeBool: false,
+      // 邀请码错误状态
+      codeErrorBool:true,
       url: {
         add: '/meeting/payMeetingSituation/signUp'
       }
@@ -466,6 +468,10 @@ export default {
       }
       this.form.validateFields((err, values) => {
         if (!err) {
+          if(this.codeErrorBool){
+            this.$message.error('邀请码填写错误')
+            return
+          }
           this.confirmLoading = true
           let submitData = Object.assign({}, values, this.formData)
           submitData.companyId = values.companyId.id
@@ -473,6 +479,10 @@ export default {
           submitData.meetingId = this.meetingId
           // 会议类型
           submitData.meetingType = this.meetingType
+          // 身份
+          submitData.identity = values.identity || this.identifyType
+          // 嘉宾类型
+          submitData.guestType = values.guestType || this.guestType
           console.log(submitData)
           let url = this.url.add
           let method = 'post'
@@ -566,18 +576,22 @@ export default {
       switch (code) {
         // 合作伙伴
         case this.currentMeetingInfo.cooperativeInvitationCode:
+          this.identifyType = 1
           this.guestType = 4
           break
         // 演讲嘉宾
         case this.currentMeetingInfo.speakerInvitationCode:
+          this.identifyType = 1
           this.guestType = 2
           break
         // 特邀嘉宾
         case this.currentMeetingInfo.guestInvitationCode:
+          this.identifyType = 1
           this.guestType = 3
           break
         // vip
         case this.currentMeetingInfo.vipInvitationCode:
+          this.identifyType = 1
           this.guestType = 1
           break
         default :this.guestType = null
@@ -608,6 +622,8 @@ export default {
           break
         default : flag = false
       }
+      // 保存错误状态
+      this.codeErrorBool = !flag
       // 判断guestType 是否等于 null
       if(!flag){
         // 错误