From 527bb2f59311ddfe8fbaa18f2765ec3899a77988 Mon Sep 17 00:00:00 2001
From: fengachen <373943794@qq.com>
Date: Tue, 7 Sep 2021 14:46:20 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=82=E4=BC=9A=E6=83=85=E5=86=B5=20?=
 =?UTF-8?q?=E4=BC=9A=E8=AE=AE=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/jero/JModal/index.vue          |   1 -
 .../meetManage/AddOrDetailMeet.vue            |   4 +-
 .../incomePayments/meetManage/Attendance.vue  | 186 ++++++++++++++----
 .../meetManage/MeetManageList.vue             |   4 -
 4 files changed, 151 insertions(+), 44 deletions(-)

diff --git a/src/components/jero/JModal/index.vue b/src/components/jero/JModal/index.vue
index 81cab0f..6a3a70d 100644
--- a/src/components/jero/JModal/index.vue
+++ b/src/components/jero/JModal/index.vue
@@ -107,7 +107,6 @@
         return Object.keys(this.$slots).filter(key => !this.usedSlots.includes(key))
       },
       scopedSlotsKeys() {
-        console.log(this.$scopedSlots,'-----------------------------------')
         return Object.keys(this.$scopedSlots).filter(key => !this.usedSlots.includes(key))
       },
       allSlotsKeys() {
diff --git a/src/views/incomePayments/meetManage/AddOrDetailMeet.vue b/src/views/incomePayments/meetManage/AddOrDetailMeet.vue
index 580d8a5..061cf19 100644
--- a/src/views/incomePayments/meetManage/AddOrDetailMeet.vue
+++ b/src/views/incomePayments/meetManage/AddOrDetailMeet.vue
@@ -419,7 +419,7 @@ export default {
       }
     },
   },
-  created() {
+  mounted() {
     this.pcaData = new AreaPca()
     // 编辑获取会议信息
     if (this.$route.query.id) {
@@ -474,7 +474,7 @@ export default {
         // 如果是标协会议则回显 标协会议的字段
         if(this.meetingType === '2'){
           console.log('this.model',this.model)
-          this.form.setFieldsValue(pick(this.model,'signInTime','tbMeetingType','meetingCostsVip','hotelName','hotelAddress' ))
+          this.form.setFieldsValue(pick(this.model,'signInTime','hotelContactsList','tbMeetingType','meetingCostsVip','hotelName','hotelAddress' ))
         }
         // 如果是工作组会议 赋值工作组
         if(this.meetingType === '1'){
diff --git a/src/views/incomePayments/meetManage/Attendance.vue b/src/views/incomePayments/meetManage/Attendance.vue
index 8398010..8e4ac2f 100644
--- a/src/views/incomePayments/meetManage/Attendance.vue
+++ b/src/views/incomePayments/meetManage/Attendance.vue
@@ -7,25 +7,64 @@
       </div>
       <a-row>
         <a-col :xxl="8" :xl="12" :sm="24">
-          <label>会议名称:</label><span></span>
+          <label class="label">会议名称:</label><span> {{ currentMeetingInfo.meetingName }}</span>
         </a-col>
         <a-col :xxl="8" :xl="12" :sm="24">
-          <label>会议类型:</label><span></span>
+          <label>会议类型:</label><span> {{ meetingType }}</span>
+        </a-col>
+        <!--标协会议类型-->
+        <a-col :xxl="8" :xl="12" :sm="24" v-show="currentMeetingInfo.meetingType === '2' ">
+          <label>标协会议类型:</label><span> {{ tbMeetingType }}</span>
         </a-col>
         <a-col :xxl="8" :xl="12" :sm="24">
-          <label>负责人:</label><span></span>
+          <label>负责人:</label><span> {{ currentMeetingInfo.directorName }}</span>
+        </a-col>
+        <!--工作组会议-->
+        <a-col :xxl="8" :xl="12" :sm="24" v-show="currentMeetingInfo.meetingType === '1' ">
+          <label>工作组:</label><span> {{ currentMeetingInfo.workingGroupName }}</span>
         </a-col>
         <a-col :xxl="8" :xl="12" :sm="24">
-          <label>召开时间:</label><span></span>
+          <label>手机号:</label><span> {{ currentMeetingInfo.directorPhone }}</span>
         </a-col>
         <a-col :xxl="8" :xl="12" :sm="24">
-          <label>召开地点:</label><span></span>
+          <label>召开时间:</label><span> {{ currentMeetingInfo.startTime + '~' + currentMeetingInfo.endTime }}</span>
         </a-col>
         <a-col :xxl="8" :xl="12" :sm="24">
-          <label>会议费用:</label><span></span>
+          <label>年份:</label><span> {{ currentMeetingInfo.particularYear }}</span>
         </a-col>
         <a-col :xxl="8" :xl="12" :sm="24">
-          <label>预计参加人数:</label><span></span>
+          <label>报名截止时间:</label><span> {{ currentMeetingInfo.registerDeadline }}</span>
+        </a-col>
+        <a-col :xxl="8" :xl="12" :sm="24">
+          <label>召开地点:</label><span> {{ currentMeetingInfo.venue + '/' + currentMeetingInfo.address }}</span>
+        </a-col>
+        <a-col :xxl="8" :xl="12" :sm="24">
+          <label>会议费用:</label><span> {{ currentMeetingInfo.meetingCosts }} 元/人</span>
+        </a-col>
+        <a-col :xxl="8" :xl="12" :sm="24" v-show="currentMeetingInfo.meetingType === '2' ">
+          <label>会议费用(标协会员):</label><span> {{ currentMeetingInfo.meetingCostsVip }} 元/人</span>
+        </a-col>
+        <a-col :xxl="8" :xl="12" :sm="24">
+          <label>预计参加人数:</label><span> {{ currentMeetingInfo.estimatedNumber }}</span>
+        </a-col>
+        <a-col :xxl="8" :xl="12" :sm="24"  v-show="currentMeetingInfo.meetingType === '2' ">
+          <label>酒店名称:</label><span> {{ currentMeetingInfo.hotelName }}</span>
+        </a-col>
+        <a-col :xxl="8" :xl="12" :sm="24" v-show="currentMeetingInfo.meetingType === '2' ">
+          <label>酒店地址:</label><span> {{ currentMeetingInfo.hotelAddress }}</span>
+        </a-col>
+        <!-- 国际研讨会的邀请码-->
+        <a-col :xxl="8" :xl="12" :sm="24" v-show="currentMeetingInfo.meetingType ==='3' ">
+          <label>VIP邀请码:</label><span> {{ currentMeetingInfo.vipInvitationCode }}</span>
+        </a-col>
+        <a-col :xxl="8" :xl="12" :sm="24" v-show="currentMeetingInfo.meetingType ==='3' ">
+          <label>演讲嘉宾邀请码:</label><span> {{ currentMeetingInfo.speakerInvitationCode }}</span>
+        </a-col>
+        <a-col :xxl="8" :xl="12" :sm="24" v-show="currentMeetingInfo.meetingType ==='3' ">
+          <label>特邀嘉宾邀请码:</label><span> {{ currentMeetingInfo.guestInvitationCode }}</span>
+        </a-col>
+        <a-col :xxl="8" :xl="12" :sm="24" v-show="currentMeetingInfo.meetingType ==='3' ">
+          <label>合作伙伴邀请码:</label><span> {{ currentMeetingInfo.cooperativeInvitationCode }}</span>
         </a-col>
         <a-col :xxl="8" :xl="12" :sm="24">
           <label>会议通知:</label><span></span>
@@ -34,17 +73,20 @@
           <label>报名链接:</label><span></span>
         </a-col>
         <a-col :xxl="8" :xl="12" :sm="24">
-          <label>报名二维码:</label><img alt="报名二维码" />
+          <label>报名二维码:</label><img alt="报名二维码"/>
         </a-col>
         <a-col :xxl="8" :xl="12" :sm="24">
-          <label>签到二维码:</label><img alt="签到二维码" />
+          <label>签到二维码:</label><img alt="签到二维码"/>
         </a-col>
       </a-row>
-      <a-row>
-        <label>会议内容:</label><span></span>
+      <a-row  v-show="currentMeetingInfo.meetingType === '2' ">
+          <label class="label">酒店联系人及手机号: </label><span class="content" v-for="(item,index) of currentMeetingInfo.hotelContactsList" :key="index">{{item.hotelContacts+':' + item.hotelContactsPhone + ' '}}</span>
       </a-row>
       <a-row>
-        <label>备注:</label><span></span>
+        <label class="label">会议内容: </label><span class="content"> {{ currentMeetingInfo.meetingContent }}</span>
+      </a-row>
+      <a-row>
+        <label class="label">备注: </label><span class="content"> {{ currentMeetingInfo.remark }}</span>
       </a-row>
       <div class="part-title">
         <div class="part-title-text">参会人员信息</div>
@@ -120,17 +162,17 @@
       <!-- table区域-begin -->
       <div>
         <a-table
-            ref="table"
-            size="middle"
-            bordered
-            rowKey="id"
-            :columns="columns"
-            :dataSource="dataSource"
-            :pagination="ipagination"
-            :loading="loading"
-            :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
-            class="j-table-force-nowrap"
-            @change="handleTableChange">
+          ref="table"
+          size="middle"
+          bordered
+          rowKey="id"
+          :columns="columns"
+          :dataSource="dataSource"
+          :pagination="ipagination"
+          :loading="loading"
+          :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+          class="j-table-force-nowrap"
+          @change="handleTableChange">
 
           <template slot="htmlSlot" slot-scope="text,record">
             <div class="primary-color" @click="openDetailModal(record)">参会单位</div>
@@ -159,6 +201,7 @@
 <script>
 import {JeroListMixin} from '@/mixins/JeroListMixin'
 import {mixinDevice} from '@/utils/mixin'
+import {getMeetInfoById} from '@api/incomeMeetingApi'
 import JYearDate from '@comp/jero/JYearDate'
 import JDictSelectTag from '@comp/dict/JDictSelectTag'
 import ImportParticipantModal from '@views/incomePayments/meetManage/modules/ImportParticipantModal'
@@ -270,6 +313,35 @@ export default {
         exportXlsUrl: '/jero/memberProject/exportXls',
         importExcelUrl: 'jero/memberProject/importExcel',
       },
+      // 当前的会议信息详情
+      currentMeetingInfo: {},
+      meetingType: '',
+    }
+  },
+  created() {
+    // 获取会议详情
+    const param = {
+      id: this.$route.query.id
+    }
+    getMeetInfoById(param).then(res => {
+      if (res.success) {
+        console.log(res.result)
+        this.currentMeetingInfo = Object.assign({}, res.result)
+        // 转化会议类型
+        this.meetingType = this.generateMeetingType(this.currentMeetingInfo.meetingType)
+      }
+    })
+  },
+  computed:{
+    tbMeetingType() {
+      if(this.currentMeetingInfo.tbMeetingType === '1'){
+        return '标准宣贯'
+      }
+      if(this.currentMeetingInfo.tbMeetingType === '2'){
+        return '学习培训'
+      }else {
+        return ''
+      }
     }
   },
   methods: {
@@ -289,36 +361,36 @@ export default {
     /*
     * 添加参会人
     * */
-    addParticipant(){
+    addParticipant() {
       this.$router.push({
-        path:'/incomePayments/meetManage/SignUpInfoEdit'
+        path: '/incomePayments/meetManage/SignUpInfoEdit'
       })
     },
     /*
     * 合并开票
     * */
-    batchInvoice(){
-      if(this.selectionRows.length === 0){
+    batchInvoice() {
+      if (this.selectionRows.length === 0) {
         this.$message.warn('请选择一条记录')
         return
       }
       // 只能选择相同的单位进行合并开票
-      if(this.selectionRows.length > 0){
+      if (this.selectionRows.length > 0) {
         // 一个数据不做判断
-        if(this.selectionRows.length === 1){
+        if (this.selectionRows.length === 1) {
           // 打开模态框
           this.$refs.batchInvoiceModal.open()
-        }else {
+        } else {
           let initName = this.selectionRows[0].name
           // 单位判重
           let flag = this.selectionRows.some(item => {
             return item.name !== initName
           })
-          if(flag){
+          if (flag) {
             // flag为true 说明有单位不一样
             this.$message.warn('请选择同一企业的参会人进行开票')
             return
-          }else {
+          } else {
             // 打开模态框  要传一个参数
             this.$refs.batchInvoiceModal.open()
           }
@@ -328,18 +400,18 @@ export default {
     /*
     * 设置对接人 只有研讨会 会议才可以设置
     * */
-    batchSetDocker(){
-      if(this.selectionRows.length === 0){
+    batchSetDocker() {
+      if (this.selectionRows.length === 0) {
         this.$message.warn('请选择一条记录')
         return
       }
       let flag = this.selectionRows.some(item => {
         return item.meetingType !== 3
       })
-      if(flag){
+      if (flag) {
         this.$message.warn('只有研讨会议才可设置对接人')
         return
-      }else {
+      } else {
         // 打开模态框
         this.$refs.batchSetDockerModal.open()
       }
@@ -347,8 +419,25 @@ export default {
     /*
     * 打开项目详情
     * */
-    openDetailModal(record){
+    openDetailModal(record) {
       this.$refs.projectDetailModal.open(record)
+    },
+    /*
+    * 会议类型 1 工作组会议 2 标协会议 3国际研讨会 4 其他会议
+    * */
+    generateMeetingType(val) {
+      switch (val) {
+        case '1':
+          return '工作组会议'
+        case '2':
+          return '标协会议'
+        case '3':
+          return '国际研讨会'
+        case '4':
+          return '其他会议'
+        default:
+          return '其他会议'
+      }
     }
   }
 }
@@ -356,4 +445,27 @@ export default {
 
 <style scoped lang="less">
 @import '~@assets/less/common.less';
+
+.ant-row {
+  line-height: 3;
+
+  .ant-col {
+    label {
+      color: #999;
+    }
+
+    span {
+      color: black;
+    }
+  }
+}
+
+.label {
+  color: #999999;
+}
+
+.content {
+  color: black;
+}
+
 </style>
diff --git a/src/views/incomePayments/meetManage/MeetManageList.vue b/src/views/incomePayments/meetManage/MeetManageList.vue
index 69b6aa8..6603769 100644
--- a/src/views/incomePayments/meetManage/MeetManageList.vue
+++ b/src/views/incomePayments/meetManage/MeetManageList.vue
@@ -70,10 +70,6 @@
         <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
         <a-button type="primary" icon="download" @click="handleExportXls('会议管理')">导出</a-button>
         <a-button type="danger" icon="delete" @click="batchDel">批量删除</a-button>
-        <!--      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl"-->
-        <!--                @change="handleImportExcel">-->
-        <!--        <a-button type="primary" icon="import">导入</a-button>-->
-        <!--      </a-upload>-->
       </div>
 
       <!-- table区域-begin -->