From 08b3ef03178af6716bdbc7801e21c4b87cdc22c7 Mon Sep 17 00:00:00 2001
From: fengachen <373943794@qq.com>
Date: Mon, 20 Dec 2021 13:52:56 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=BC=80=E5=8F=91=E3=80=91=E4=BC=9A?=
 =?UTF-8?q?=E8=AE=AE=E5=AE=A1=E6=A0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ArriveAndInvoivingList.vue                  | 10 ++++++++--
 .../meetManage/AddOrDetailMeet.vue              |  2 ++
 .../meetManage/modules/AuditModal.vue           | 17 +++++++++++++++--
 3 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue b/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue
index cc3fe1d..17ad3d0 100644
--- a/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue
+++ b/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue
@@ -160,7 +160,7 @@
     <!--    审核缴费凭证-->
     <audit-proof-module ref="auditProof" @ok="modalFormOk"></audit-proof-module>
     <!-- 会议审核的弹窗 -->
-    <audit-modal ref="auditModal" @ok="modalFormOk"></audit-modal>
+    <audit-modal ref="auditModal" :meeting-type="meetingType" :situation-id="situationId" @ok="modalFormOk"></audit-modal>
 
   </div>
 </template>
@@ -178,6 +178,7 @@ import ProjectDetailModal from '../../../components/ProjectDetailModal'
 import BatchInvoicingModule from '../../packManagement/modules/BatchInvoicingModule'
 import { isAllEqual } from '../../../utils/util'
 import AuditProofModule from './modules/AuditProofModule'
+// import AuditProofModule from "@views/financialManagement/arriveAndInvoicing/modules/AuditProofModule";
 import AuditModal from '@views/incomePayments/meetManage/modules/AuditModal'
 
 export default {
@@ -316,7 +317,10 @@ export default {
       selectedProject: [],
       batchInvoicingVisible: false,
       selectedCompany: {}, // 选中项目的企业信息
-      mailContactsId: null // 项目邮寄联系人id
+      mailContactsId: null ,// 项目邮寄联系人id
+      meetingType:undefined, // 会议项目的会议类型
+      situationId:undefined // 参会人id
+
     }
   },
   methods: {
@@ -434,6 +438,8 @@ export default {
       }
       // 会议项目使用原本会议缴费凭证的审核弹窗
       if (record.projectType === 3) {
+        this.meetingType = record.meetingType
+        this.situationId = record.situationId
         this.$refs.auditModal.title = '审核凭证'
         this.$refs.auditModal.open(record, false)
         return
diff --git a/src/views/incomePayments/meetManage/AddOrDetailMeet.vue b/src/views/incomePayments/meetManage/AddOrDetailMeet.vue
index b2cd990..d1d0ba9 100644
--- a/src/views/incomePayments/meetManage/AddOrDetailMeet.vue
+++ b/src/views/incomePayments/meetManage/AddOrDetailMeet.vue
@@ -239,6 +239,8 @@
                          v-decorator="['directorPhone']"></a-input>
               </a-form-item>
             </a-col>
+          </a-row>
+          <a-row :gutter="24">
             <a-col :xxl="8" :xl="12" :sm="24">
               <a-form-item label="酒店名称" :labelCol="labelCol" :wrapperCol="wrapperCol">
                 <a-input placeholder="请输入酒店名称"
diff --git a/src/views/incomePayments/meetManage/modules/AuditModal.vue b/src/views/incomePayments/meetManage/modules/AuditModal.vue
index 195ccb2..3990316 100644
--- a/src/views/incomePayments/meetManage/modules/AuditModal.vue
+++ b/src/views/incomePayments/meetManage/modules/AuditModal.vue
@@ -121,6 +121,18 @@ export default {
   components: {
     JImageUpload
   },
+  props:{
+    // 到账开票 与消息查看会用到 会议类型
+    meetingType:{
+      type:[String,Number],
+      required:false,
+    },
+    // 参会人id 到账开票 与消息查看会用到
+    situationId:{
+      type:String,
+      required:false
+    }
+  },
   data() {
     return {
       title: '审核凭证',
@@ -215,12 +227,13 @@ export default {
     open(record, signUp) {
       this.form.resetFields()
       this.visible = true
-      this.signUpPersonId = record.id
+      this.signUpPersonId = this.situationId ? this.situationId : record.id
       this.querySingUpUserInfo()
       // 控制行程信息显示 审核凭证不显示
       this.checkSignBool = signUp || false
+      let meetingType = this.meetingType ? this.meetingType+'' :this.$route.query.meetingType
       // 会议类型不同 url不同
-      this.url = Object.assign({}, this.createUrlByMeetingType(this.$route.query.meetingType))
+      this.url = Object.assign({}, this.createUrlByMeetingType(meetingType))
       console.log(record)
     },
     close() {