审核报名信息 标协会议新增

src/views/incomePayments/meetManage/AddOrDetailMeet.vue

@@ -458,17 +458,17 @@ export default {
     // 是否从工作组会议维护来的
     isWorkGroupMeetType() {
       if (this.$route.query.workingGroupProjectId) {
-        return false
-      } else {
         return true
+      } else {
+        return false
       }
     },
     // 是否从分标委会议维护来的
     isCaseCommitteeId() {
       if (this.$route.query.caseCommitteeId) {
-        return false
-      } else {
         return true
+      } else {
+        return false
       }
     },
   },
@@ -571,13 +571,15 @@ export default {
           }
           let placeName = values.convokeLocale
           const formData = Object.assign(this.model, values, {venue: this.getPcaText(placeName)})
+          // 添加会议需要增加会议类型
+          formData.meetingType = this.$route.query.meetingType
           // 如果是工作会议维护跳转的需要加上会议类型为工作组会议和工作组id
-          if (!this.isWorkGroupMeetType) {
+          if (this.isWorkGroupMeetType) {
             formData.meetingType = '1'
             formData.workingGroupId = this.$route.query.workingGroupProjectId
           }
           // 如果是分标委会议需要加上分标委id与会议类型
-          if (!this.isCaseCommitteeId) {
+          if (this.isCaseCommitteeId) {
             formData.meetingType = '5'
             formData.caseCommitteeId = this.$route.query.caseCommitteeId
           }
@@ -599,6 +601,7 @@ export default {
               that.$message.warning(res.message)
             }
           }).finally(() => {
+            that.confirmLoading = false
           })
         }
       })

src/views/incomePayments/meetManage/Attendance.vue

@@ -219,7 +219,7 @@
             <!-- 只有缴费方式为汇款并且上传了汇款凭证的的才会有审核按钮-->
           <a @click="handleAudit(record)" v-if="record.payMode === 1 && record.paymentRecord">审核凭证</a>
             <!-- 只有工作组会议与分标委会议才有审核报名信息-->
-          <a @click="handleAuditSignUp(record)" v-show="currentMeetingInfo.meetingType === '1' || currentMeetingInfo.meetingType === '5' ">审核报名信息</a>
+          <a @click="handleAuditSignUp(record)" v-show="(currentMeetingInfo.meetingType === '1' || currentMeetingInfo.meetingType === '5') && record.registerCheckResult !== 1 ">审核报名信息</a>
           <a @click="handleEdit(record)">编辑</a>
             <!--删除参会人需要判断改参会人是否与合同关联-->
           <a @click="handleDelete(record.id)">删除</a>

src/views/incomePayments/meetManage/SignUpInfoEdit.vue

@@ -252,9 +252,6 @@ export default {
         id:this.model.companyContactTemporaryId,
         name:this.model.companyContactName
       }
-
-      console.log(this.$refs.formother,'=====================')
-
       //国际研讨会的嘉宾编辑回显值
       this.$nextTick(() => {
         // 普通会议的编辑回显值

src/views/incomePayments/meetManage/modules/AuditModal.vue

@@ -153,7 +153,7 @@ export default {
         // 审核凭证
         check: '/meeting/payMeetingSituation/check',
         // 审核报名信息
-        checkSignUp:''
+        checkSignUp:'/meeting/payMeetingSituation/checkRegister'
       },
       // 审核结果选择
       checkBool:false,
@@ -183,10 +183,10 @@ export default {
           let httpurl = ''
           if(that.checkSignBool){
             // 审核报名信息的接口
-           httpurl = this.url.check
+           httpurl = this.url.checkSignUp
           }else {
             // 审核凭证的接口
-            httpurl = this.url.checkSignUp
+            httpurl = this.url.check
           }
           let method = 'post'
           const formData = Object.assign({}, values)

src/views/incomePayments/memberManage/SafeguardStardsMemberList.vue

@@ -193,12 +193,6 @@ export default {
           dataIndex: 'paidAmount',
           scopedSlots: { customRender: 'text' },
         },
-        {
-          title: '注册时间',
-          align: 'center',
-          dataIndex: 'registerTime',
-          scopedSlots: { customRender: 'text' },
-        },
         {
           title: '打包',
           align: 'center',

src/views/projectManagement/CommitteeMeeting.vue

@@ -277,13 +277,24 @@ export default {
     * */
     handleAdd() {
       // 分表委的新增应该是需要分表委的id
-      this.$router.push({
-        path: '/incomePayments/meetManage/AddOrDetailMeet',
-        query: {
-          meetingType:this.meetingType,
-          caseCommitteeId:this.caseCommitteeId
-        }
-      })
+      if(this.meetingType === '5'){
+        this.$router.push({
+          path: '/incomePayments/meetManage/AddOrDetailMeet',
+          query: {
+            meetingType:this.meetingType,
+            caseCommitteeId:this.caseCommitteeId
+          }
+        })
+      }
+      // 标协会议新增
+      if(this.meetingType === '2'){
+        this.$router.push({
+          path: '/incomePayments/meetManage/AddOrDetailMeet',
+          query: {
+            meetingType:this.meetingType
+          }
+        })
+      }
     },
     /*
     * 编辑