From ef627d34dd44c51f693ab0fd8d1cd7a70a5f68db Mon Sep 17 00:00:00 2001
From: fengachen <373943794@qq.com>
Date: Fri, 17 Sep 2021 10:11:17 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=82=E4=BC=9A=E6=83=85=E5=86=B5=E5=AE=A1?=
 =?UTF-8?q?=E6=A0=B8=E6=8A=A5=E5=90=8D=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../meetManage/AddOrDetailMeet.vue            |  1 -
 .../incomePayments/meetManage/Attendance.vue  |  9 +++---
 .../meetManage/modules/AuditModal.vue         | 28 +++++++++++++++----
 3 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/src/views/incomePayments/meetManage/AddOrDetailMeet.vue b/src/views/incomePayments/meetManage/AddOrDetailMeet.vue
index ed0a154..778bd24 100644
--- a/src/views/incomePayments/meetManage/AddOrDetailMeet.vue
+++ b/src/views/incomePayments/meetManage/AddOrDetailMeet.vue
@@ -347,7 +347,6 @@ import {httpAction} from '@api/manage'
 import JDictSelectTag from '@comp/dict/JDictSelectTag'
 import JYearDate from '@comp/jero/JYearDate'
 import JUpload from '@comp/jero/JUpload'
-// import JDate from "@comp/tools/JDate";
 import JDate from '@comp/jero/JDate'
 import SelectPrincipal from '@comp/company/SelectPrincipal'
 import JAreaLinkage from '@comp/jero/JAreaLinkagePca'
diff --git a/src/views/incomePayments/meetManage/Attendance.vue b/src/views/incomePayments/meetManage/Attendance.vue
index 310e7e3..01efef8 100644
--- a/src/views/incomePayments/meetManage/Attendance.vue
+++ b/src/views/incomePayments/meetManage/Attendance.vue
@@ -175,7 +175,7 @@
         <a-button type="primary" icon="download" @click="handleExportXls('会员项目')">导出</a-button>
         <a-button type="danger" icon="delete" @click="batchDel">批量删除</a-button>
         <!--当会议费用为0不需要合并开票  -->
-        <!-- 变更将此从能添加到到账开票了 暂时注释 2021-09-16 -->
+        <!-- 变更将此功能添加到到账开票了 暂时注释 2021-09-16 -->
         <!-- <a-button type="primary" @click="batchInvoice" v-show="currentMeetingInfo.meetingCosts !== 0">合并开票</a-button>-->
         <!--只有国际研讨会才会有设置对接人-->
         <a-button type="primary" @click="batchSetDocker" v-if="currentMeetingInfo.meetingType === '3' ">设置对接人</a-button>
@@ -368,7 +368,7 @@ export default {
           title: '操作',
           align: 'center',
           fixed: 'right',
-          width: 160,
+          width: 300,
           scopedSlots: {customRender: 'action'}
         },
       ],
@@ -435,13 +435,14 @@ export default {
     *  审核
     * */
     handleAudit(record) {
-      this.$refs.auditModal.open(record)
+      this.$refs.auditModal.open(record,false)
     },
     /*
     * 审核报名信息
     * */
     handleAuditSignUp(record){
-      console.log('审核报名信息',record)
+      this.$refs.auditModal.title='审核报名信息'
+      this.$refs.auditModal.open(record,true)
     },
     /*
     * 导入参会人
diff --git a/src/views/incomePayments/meetManage/modules/AuditModal.vue b/src/views/incomePayments/meetManage/modules/AuditModal.vue
index 267ac1e..61fdc8f 100644
--- a/src/views/incomePayments/meetManage/modules/AuditModal.vue
+++ b/src/views/incomePayments/meetManage/modules/AuditModal.vue
@@ -29,11 +29,11 @@
           <a-col :span="12">
             <label>身份：</label>
             <span>{{model.identity_dictText}}</span></a-col>
-          <a-col :span="12">
-            <label>是否入住协议酒店：</label>
+          <a-col :span="12" v-show="checkSignBool">
+            <label>是否住酒店：</label>
             <span>{{model.checkInHotel_dictText}}</span></a-col>
         </a-row>
-        <a-row :gutter="24">
+        <a-row :gutter="24" v-show="checkSignBool">
           <a-col :span="12">
             <label>抵达时间：</label>
             <span>{{model.arrivalTime}}</span></a-col>
@@ -150,16 +150,23 @@ export default {
         }
       },
       url: {
+        // 审核凭证
         check: '/meeting/payMeetingSituation/check',
+        // 审核报名信息
+        checkSignUp:''
       },
       // 审核结果选择
-      checkBool:false
+      checkBool:false,
+      // 是否是审核报名信息
+      checkSignBool:false
     }
   },
   methods: {
-    open(record) {
+    open(record,signUp) {
       this.form.resetFields()
       this.visible = true
+      // 控制行程信息显示 审核凭证不显示
+      this.checkSignBool = signUp
       this.model = Object.assign({}, record)
       console.log(record)
     },
@@ -172,7 +179,15 @@ export default {
       // 触发表单验证
       this.form.validateFields((err, values) => {
         if (!err) {
-          let httpurl = this.url.check
+          that.confirmLoading = true
+          let httpurl = ''
+          if(that.checkSignBool){
+            // 审核报名信息的接口
+           httpurl = this.url.check
+          }else {
+            // 审核凭证的接口
+            httpurl = this.url.checkSignUp
+          }
           let method = 'post'
           const formData = Object.assign({}, values)
           formData.id = this.model.id
@@ -180,6 +195,7 @@ export default {
             if (res.success) {
               that.$message.success(res.message)
               that.$emit('ok')
+              that.confirmLoading = false
               that.close()
             } else {
               that.$message.warning(res.message)