From 6928254cda861b50fd5499f1708b445c6af82d1a Mon Sep 17 00:00:00 2001
From: fengachen <373943794@qq.com>
Date: Sat, 9 Oct 2021 19:13:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BC=9A=E8=AE=AE=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/tools/DynamicNotice.vue        |  2 +-
 src/views/MessagePage/MeetingDetailModal.vue  | 88 +++++++++++++------
 .../UploadMeetingCertificateModal.vue         | 25 ++++--
 src/views/meetingActivity/MeetingActivity.vue |  2 +-
 src/views/system/UserAnnouncementList.vue     |  6 +-
 5 files changed, 87 insertions(+), 36 deletions(-)

diff --git a/src/components/tools/DynamicNotice.vue b/src/components/tools/DynamicNotice.vue
index 19263c7..b86d32c 100644
--- a/src/components/tools/DynamicNotice.vue
+++ b/src/components/tools/DynamicNotice.vue
@@ -28,7 +28,7 @@
       detail () {
         setTimeout(() => {
           if(this.path){
-            this.$refs.compModel.view(this.formData);
+            this.$refs.compModel.open(this.formData);
           }
         }, 200)
       },
diff --git a/src/views/MessagePage/MeetingDetailModal.vue b/src/views/MessagePage/MeetingDetailModal.vue
index e42b4f4..7d7d92d 100644
--- a/src/views/MessagePage/MeetingDetailModal.vue
+++ b/src/views/MessagePage/MeetingDetailModal.vue
@@ -12,47 +12,47 @@
       <a-row :gutter="24">
         <a-col :span="12">
           <label>会议名称：</label>
-          <span><j-ellipsis :value="meetingInfo.meetingName" :length="20"></j-ellipsis></span>
+          <span><j-ellipsis :value="model.meetingName" :length="20"></j-ellipsis></span>
         </a-col>
         <a-col :span="12">
           <label>会议类型：</label>
-          <span><j-ellipsis :value="generateMeetingType(meetingInfo.meetingType)" :length="20"></j-ellipsis></span>
+          <span><j-ellipsis :value="generateMeetingType(model.meetingType)" :length="20"></j-ellipsis></span>
         </a-col>
       </a-row>
       <a-row :gutter="24">
         <a-col :span="12">
           <label>召开时间：</label>
-          <span>{{meetingInfo.startTime + '~' + meetingInfo.endTime}}</span>
+          <span>{{model.startTime + '~' + model.endTime}}</span>
         </a-col>
         <a-col :span="12">
           <label>年份：</label>
-          <span><j-ellipsis :value="meetingInfo.particularYear" :length="20"></j-ellipsis></span>
+          <span><j-ellipsis :value="model.particularYear" :length="20"></j-ellipsis></span>
         </a-col>
       </a-row>
       <a-row :gutter="24">
         <a-col :span="12">
           <label>召开地点：</label>
-          <span><j-ellipsis :value="meetingInfo.venue + '/' + meetingInfo.address"></j-ellipsis></span>
+          <span><j-ellipsis :value="model.venue + '/' + model.address"></j-ellipsis></span>
         </a-col>
         <a-col :span="12">
           <label>负责人：</label>
-          <span><j-ellipsis :value="meetingInfo.directorName" :length="20"></j-ellipsis></span>
+          <span><j-ellipsis :value="model.directorName" :length="20"></j-ellipsis></span>
         </a-col>
       </a-row>
       <a-row :gutter="24">
         <a-col :span="12">
           <label>报名截止时间：</label>
-          <span><j-ellipsis :value="meetingInfo.registerDeadline" :length="20"></j-ellipsis></span>
+          <span><j-ellipsis :value="model.registerDeadline" :length="20"></j-ellipsis></span>
         </a-col>
         <a-col :span="12">
           <label>会议通知：</label>
-          <span><preview-file :file-id="meetingInfo.meetingFiles"></preview-file></span>
+          <span><preview-file :file-id="model.meetingFiles"></preview-file></span>
         </a-col>
       </a-row>
       <a-row :gutter="24">
         <a-col :span="24">
           <label>会议内容：</label>
-          <span><j-ellipsis :value="meetingInfo.meetingContent" :length="20"></j-ellipsis></span>
+          <span><j-ellipsis :value="model.meetingContent" :length="20"></j-ellipsis></span>
         </a-col>
       </a-row>
     </section>
@@ -63,48 +63,48 @@
       <a-row :gutter="24">
         <a-col :span="12">
           <label>参会单位：</label>
-          <span><j-ellipsis :value="model.principalName" :length="20"></j-ellipsis></span>
+          <span><j-ellipsis :value="situationInfo.companyName" :length="20"></j-ellipsis></span>
         </a-col>
 
       </a-row>
       <a-row :gutter="24">
         <a-col :span="12">
           <label>参会人：</label>
-          <span><j-ellipsis :value="model.principalName" :length="20"></j-ellipsis></span>
+          <span><j-ellipsis :value="situationInfo.companyContactName" :length="20"></j-ellipsis></span>
         </a-col>
         <a-col :span="12">
           <label>身份：</label>
-          <span><j-ellipsis :value="model.receivableAmount" :length="20"></j-ellipsis></span>
+          <span><j-ellipsis :value="situationInfo.identity_dictText" :length="20"></j-ellipsis></span>
         </a-col>
       </a-row>
       <a-row :gutter="24">
         <a-col :span="12">
           <label>性别：</label>
-          <span><j-ellipsis :value="model.remarks" :length="20"></j-ellipsis></span>
+          <span>{{genderTest}}</span>
         </a-col>
         <a-col :span="12">
           <label>手机号：</label>
-          <span><j-ellipsis :value="model.remarks" :length="20"></j-ellipsis></span>
+          <span><j-ellipsis :value="situationInfo.phone" :length="20"></j-ellipsis></span>
         </a-col>
       </a-row>
       <a-row :gutter="24">
         <a-col :span="12">
           <label>付款方式：</label>
-          <span><j-ellipsis :value="model.remarks" :length="20"></j-ellipsis></span>
+          <span><j-ellipsis :value="situationInfo.payMode_dictText" :length="20"></j-ellipsis></span>
         </a-col>
         <a-col :span="12">
           <label>需要发票：</label>
-          <span><j-ellipsis :value="model.remarks" :length="20"></j-ellipsis></span>
+          <span><j-ellipsis :value="situationInfo.needInvoice_dictText" :length="20"></j-ellipsis></span>
         </a-col>
       </a-row>
       <a-row :gutter="24">
         <a-col :span="12">
           <label>发票邮寄地址：</label>
-          <span><j-ellipsis :value="model.remarks" :length="20"></j-ellipsis></span>
+          <span><j-ellipsis :value="model.postContactAddress" :length="20"></j-ellipsis></span>
         </a-col>
         <a-col :span="12">
           <label>邮编：</label>
-          <span><j-ellipsis :value="model.remarks" :length="20"></j-ellipsis></span>
+          <span><j-ellipsis :value="model.postCode" :length="20"></j-ellipsis></span>
         </a-col>
       </a-row>
     </section>
@@ -114,8 +114,8 @@
       <h3 class="title">会议资料</h3>
       <a-row :gutter="24">
         <a-col :span="12">
-          <label>参会单位：</label>
-          <span><j-ellipsis :value="model.principalName" :length="20"></j-ellipsis></span>
+          <label>会议资料：</label>
+          <span><preview-file :file-id="model.meetingData"></preview-file></span>
         </a-col>
       </a-row>
     </section>
@@ -125,8 +125,6 @@
       <h3 class="title">开票邮寄信息</h3>
       <a-row :gutter="24">
         <a-col :span="12">
-          <label>参会单位：</label>
-          <span><j-ellipsis :value="model.principalName" :length="20"></j-ellipsis></span>
         </a-col>
       </a-row>
     </section>
@@ -142,7 +140,7 @@
 import PreviewFile from '@comp/jero/PreviewFile'
 import JEllipsis from '@comp/jero/JEllipsis'
 import {getMeetInfoById} from '@api/incomePaymentsApi'
-// import {getSingUpUserInfo} from '@api/incomePaymentsApi'
+import {getSingUpUserInfo} from '@api/incomePaymentsApi'
 
 export default {
   name: 'MeetingDetailModal',
@@ -150,6 +148,14 @@ export default {
     PreviewFile,
     JEllipsis
   },
+  props:{
+    // 是否是从会议点进来的  默认走消息
+    isMeetingBool:{
+      type:Boolean,
+      required:false,
+      default:false
+    }
+  },
   data() {
     return {
       title: '会议详情',
@@ -157,20 +163,50 @@ export default {
       visible: false,
       model: {},
       // 会议信息
-      meetingInfo:{}
+      meetingInfo:{},
+      // 参会人信息
+      situationInfo:{}
     }
   },
+  computed:{
+    // eslint-disable-next-line
+    genderTest(){
+      if(this.$store.getters.userInfo.gender === 1){
+        return  '男'
+      }else if(this.$store.getters.userInfo.gender === 2){
+        return  '女'
+      }
+    }
+
+  },
   methods: {
     open(param) {
       this.visible = true
-      this.meetingInfo = Object.assign({},param)
 
-      if(param){
+      if(param && !this.isMeetingBool){
+        // 消息进来的获取会议的详情
         this.queryMeetingInfoById(param.id).then(res => {
           // 会议详情
           this.model = Object.assign({},res)
           console.log(this.model,'this.model')
         })
+        // 查询参会人的信息
+        getSingUpUserInfo({id:param.situationId}).then(res => {
+          if(res.success){
+            this.situationInfo = res.result
+          }
+        })
+
+      }else {
+        // 会议进来查询的会议信息
+        this.model = Object.assign({},param)
+        // 会议进来的查询参会人信息
+
+        getSingUpUserInfo({id:param.id}).then(res => {
+          if(res.success){
+            this.situationInfo = res.result
+          }
+        })
       }
     },
     close() {
diff --git a/src/views/MessagePage/UploadMeetingCertificateModal.vue b/src/views/MessagePage/UploadMeetingCertificateModal.vue
index c8bc259..c7d1876 100644
--- a/src/views/MessagePage/UploadMeetingCertificateModal.vue
+++ b/src/views/MessagePage/UploadMeetingCertificateModal.vue
@@ -37,7 +37,7 @@
         <a-row :gutter="24">
           <a-col :span="12">
             <label>性别：</label>
-            <span><j-ellipsis :value="model.sex" :length="20"></j-ellipsis></span>
+            <span>{{genderTest}}</span>
           </a-col>
           <a-col :span="12">
             <label>手机号：</label>
@@ -76,7 +76,7 @@
               </a-form-item>
             </a-col>
             <!-- 缴费方式线上缴费的需要订单后四位-->
-            <a-col :xl="12" :sm="24" v-show="payModeOnlineBool">
+            <a-col :xl="12" :sm="24" v-if="payModeOnlineBool">
               <a-form-item label="订单后四位" :labelCol="labelCol" :wrapperCol="wrapperCol">
                 <a-input placeholder="请输入订单后四位" :maxLength="4" v-decorator="['orderCode',validatorRules.orderCode]"
                          @change="(e) => {e.target.value = e.target.value.replace(/[^0-9A-Za-z]/g,'')}"></a-input>
@@ -86,9 +86,11 @@
 
         </a-form>
       </section>
-
-
     </a-spin>
+    <template slot="footer">
+      <a-button @click="handleCancel">关闭</a-button>
+      <a-button @click="handleOk" type="primary" :disabled="confirmLoading">确定</a-button>
+    </template>
   </j-modal>
 </template>
 
@@ -126,7 +128,7 @@ export default {
         },
       },
       url: {
-        edit: '/meeting/payMeetingSituation/edit'
+        edit: '/meeting/payMeetingSituation/editTerminal'
       },
       // 会议名称
       meetingName: '',
@@ -137,8 +139,19 @@ export default {
   components: {
     JImageUpload
   },
+  computed:{
+    // eslint-disable-next-line
+    genderTest(){
+      if(this.$store.getters.userInfo.gender === 1){
+        return  '男'
+      }else if(this.$store.getters.userInfo.gender === 2){
+        return  '女'
+      }
+    }
+  },
   methods: {
     open(param) {
+      this.form.resetFields()
       this.visible = true
       this.meetingName = param.meetingName
       // 是否是线上缴费
@@ -146,9 +159,7 @@ export default {
       if (param.id) {
         this.querySingUpUserInfo(param.id).then(res => {
           this.model = {}
-          if (res.success) {
             this.model = res
-          }
         })
       }
     },
diff --git a/src/views/meetingActivity/MeetingActivity.vue b/src/views/meetingActivity/MeetingActivity.vue
index c0820ae..ef9f2ce 100644
--- a/src/views/meetingActivity/MeetingActivity.vue
+++ b/src/views/meetingActivity/MeetingActivity.vue
@@ -124,7 +124,7 @@
     <!--上传凭证-->
     <upload-meeting-certificate-modal ref="upload"></upload-meeting-certificate-modal>
 <!--    会议详情-->
-    <meeting-detail-modal ref="meetingDetail"></meeting-detail-modal>
+    <meeting-detail-modal ref="meetingDetail" :is-meeting-bool="true"></meeting-detail-modal>
   </div>
 </template>
 <script>
diff --git a/src/views/system/UserAnnouncementList.vue b/src/views/system/UserAnnouncementList.vue
index 022909f..86df9de 100644
--- a/src/views/system/UserAnnouncementList.vue
+++ b/src/views/system/UserAnnouncementList.vue
@@ -186,7 +186,11 @@ export default {
           path:record.openPage,
           query:param
         })
-      }else {
+      }else if(record.openType === 'href'){
+        let url = `${record.openPage}=${param.id}`
+        // 返回的是报名页面的链接 打开网址
+        window.open(url,'_blank')
+      } else {
         this.$refs.ShowAnnouncement.detail(record)
       }
     },