From 9df966965b402460f589a3ff41e1d916c6e914fb Mon Sep 17 00:00:00 2001
From: fengachen <373943794@qq.com>
Date: Thu, 28 Oct 2021 10:55:40 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90bug=E3=80=91=E7=BC=B4=E8=B4=B9?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E7=9A=84=E5=9B=9E=E6=98=BE=20=E6=B6=88?=
 =?UTF-8?q?=E6=81=AF=E8=BF=9B=E6=9D=A5=E7=9A=84=E5=AE=A1=E6=A0=B8=E4=B8=8D?=
 =?UTF-8?q?=E9=80=9A=E8=BF=87=E7=9A=84=E5=8F=82=E4=BC=9A=E4=BA=BA=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E4=B8=8D=E5=9B=9E=E6=98=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/MessagePage/MeetingDetailModal.vue  |   2 +-
 .../UploadMeetingCertificateModal.vue         | 115 +++++++++++++-----
 2 files changed, 85 insertions(+), 32 deletions(-)

diff --git a/src/views/MessagePage/MeetingDetailModal.vue b/src/views/MessagePage/MeetingDetailModal.vue
index 8e36e84..1dd02f3 100644
--- a/src/views/MessagePage/MeetingDetailModal.vue
+++ b/src/views/MessagePage/MeetingDetailModal.vue
@@ -46,7 +46,7 @@
         </a-col>
         <a-col :span="12">
           <label>会议通知：</label>
-          <span><preview-file :file-id="model.meetingFiles"></preview-file></span>
+          <span><preview-file style="display: inline-block" :file-id="model.meetingFiles"></preview-file></span>
         </a-col>
       </a-row>
       <a-row :gutter="24">
diff --git a/src/views/MessagePage/UploadMeetingCertificateModal.vue b/src/views/MessagePage/UploadMeetingCertificateModal.vue
index fa4da5f..15c3daf 100644
--- a/src/views/MessagePage/UploadMeetingCertificateModal.vue
+++ b/src/views/MessagePage/UploadMeetingCertificateModal.vue
@@ -9,22 +9,22 @@
     @cancel="handleCancel"
     cancelText="关闭">
     <a-spin :spinning="confirmLoading">
-      <a-row :gutter="24">
-        <a-col :span="12">
+      <a-row :gutter="24" class="flex-col">
+        <a-col :span="24">
           <label>会议名称：</label>
           <span>{{ meetingName || model.meetingName }}</span>
         </a-col>
       </a-row>
       <section class="base-info">
         <h3 class="title">报名信息</h3>
-        <a-row :gutter="24">
+        <a-row :gutter="24" class="flex-col">
           <a-col :span="12">
             <label>参会单位：</label>
             <span><j-ellipsis :value="model.companyName" :length="20"></j-ellipsis></span>
           </a-col>
 
         </a-row>
-        <a-row :gutter="24">
+        <a-row :gutter="24" class="flex-col">
           <a-col :span="12">
             <label>参会人：</label>
             <span><j-ellipsis :value="model.companyContactName" :length="20"></j-ellipsis></span>
@@ -34,7 +34,7 @@
             <span><j-ellipsis :value="model.identity_dictText" :length="20"></j-ellipsis></span>
           </a-col>
         </a-row>
-        <a-row :gutter="24">
+        <a-row :gutter="24" class="flex-col">
           <a-col :span="12">
             <label>付款方式：</label>
             <span><j-ellipsis :value="model.payMode_dictText " :length="20"></j-ellipsis></span>
@@ -44,14 +44,14 @@
             <span><j-ellipsis :value="model.phone" :length="20"></j-ellipsis></span>
           </a-col>
         </a-row>
-        <a-row :gutter="24">
+        <a-row :gutter="24" class="flex-col">
           <a-col :span="12">
             <label>需要发票：</label>
             <span><j-ellipsis :value="model.needInvoice_dictText" :length="20"></j-ellipsis></span>
           </a-col>
         </a-row>
-<!--        打包 或者不需要发票 不显示 邮寄信息 -->
-        <a-row :gutter="24" v-if="model.needInvoice !== 0">
+        <!--        打包 或者不需要发票 不显示 邮寄信息 -->
+        <a-row :gutter="24" v-if="model.needInvoice !== 0" class="flex-col">
           <a-col :span="12">
             <label>发票邮寄地址：</label>
             <span><j-ellipsis :value="model.postContactAddress" :length="20"></j-ellipsis></span>
@@ -64,9 +64,23 @@
       </section>
       <section class="base-info">
         <h3 class="title">付款凭证</h3>
+        <!--上传了付款凭证才显示 -->
+        <a-row :gutter="24" v-if="model.paymentRecord" class="flex-col">
+          <a-col :span="12">
+            <label>缴费状态：</label>
+            <span>{{ model.checkResult_dictText }}</span>
+          </a-col>
+        </a-row>
+        <a-row :gutter="24" v-if="model.paymentRecord" class="info-textarea flex-col">
+          <!--          驳回才显示驳回原因-->
+          <a-col :span="24" v-if="model.checkResult === 2 " >
+            <label>驳回原因：</label>
+            <span>{{model.checkRemark}}</span>
+          </a-col>
+        </a-row>
         <a-form :form="form">
-<!--          审核通过后 禁止上传 -->
-          <a-row :gutter="24">
+          <!-- 审核通过后 禁止上传 -->
+          <a-row :gutter="24" style="transform: translateX(-12px)">
             <a-col :xl="12" :sm="24">
               <a-form-item label="付款凭证" :labelCol="labelCol" :wrapperCol="wrapperCol">
                 <j-image-upload v-decorator="['paymentRecord',validatorRules.paymentRecord]" :disabled="checkBool"
@@ -75,8 +89,9 @@
             </a-col>
             <!-- 缴费方式线上缴费的需要订单后四位-->
             <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]"  :disabled="checkBool"
+              <a-form-item label="缴费订单后四位" :labelCol="labelColTemp" :wrapperCol="wrapperColTemp">
+                <a-input placeholder="请输入缴费订单后四位" :maxLength="4" v-decorator="['orderCode',validatorRules.orderCode]"
+                         :disabled="checkBool"
                          @change="(e) => {e.target.value = e.target.value.replace(/[^0-9A-Za-z]/g,'')}"></a-input>
               </a-form-item>
             </a-col>
@@ -85,6 +100,7 @@
         </a-form>
       </section>
     </a-spin>
+
     <template slot="footer">
       <a-button @click="handleCancel">关闭</a-button>
       <!-- 审核通过不显示确认按钮 -->
@@ -110,11 +126,19 @@ export default {
       model: {},
       labelCol: {
         xs: {span: 24},
-        sm: {span: 8}
+        sm: {span: 5}
       },
       wrapperCol: {
         xs: {span: 24},
-        sm: {span: 16}
+        sm: {span: 19}
+      },
+      labelColTemp: {
+        xs: {span: 24},
+        sm: {span: 9}
+      },
+      wrapperColTemp: {
+        xs: {span: 24},
+        sm: {span: 15}
       },
       validatorRules: {
         paymentRecord: {
@@ -122,7 +146,7 @@ export default {
           validateTrigger: 'change'
         },
         orderCode: {
-          rules: [{required: true, message: '请输入订单后四位'}],
+          rules: [{required: true, message: '请输入缴费订单后四位'}],
           validateTrigger: 'blur'
         },
       },
@@ -134,27 +158,28 @@ export default {
       // 是否是线上缴费方式
       payModeOnlineBool: false,
       // 审核是否通过
-      checkBool:false,
+      checkBool: false,
       // 参会人id
-      singUpPerosnId:''
+      singUpPerosnId: ''
     }
   },
   components: {
     JImageUpload
   },
-  computed:{
+  computed: {
     // eslint-disable-next-line
-    genderTest(){
-      if(this.$store.getters.userInfo.gender === 1){
-        return  '男'
-      }else if(this.$store.getters.userInfo.gender === 2){
-        return  '女'
+    genderTest() {
+      if (this.$store.getters.userInfo.gender === 1) {
+        return '男'
+      } else if (this.$store.getters.userInfo.gender === 2) {
+        return '女'
       }
     }
   },
   methods: {
     open(param) {
-      this.singUpPerosnId = param.situationId
+      // 判断是否是 消息进来的
+      this.singUpPerosnId = param.situationId ?param.situationId : param.id
       this.form.resetFields()
       this.visible = true
       this.meetingName = param.meetingName
@@ -162,21 +187,21 @@ export default {
       this.payModeOnlineBool = param.payMode === 2 || false
       if (param.id) {
         // 获取参会人信息
-        this.querySingUpUserInfo(param.situationId).then(res => {
+        this.querySingUpUserInfo(this.singUpPerosnId).then(res => {
           this.model = {}
           this.model = res
           // 如果缴费方式为汇款的并且上传了缴费凭证 回显缴费凭证
-          if(this.model.paymentRecord && this.model.payMode === 1 ){
-            this.form.setFieldsValue({'paymentRecord':this.model.paymentRecord})
+          if (this.model.paymentRecord && this.model.payMode === 1) {
+            this.form.setFieldsValue({'paymentRecord': this.model.paymentRecord})
           }
           // 如果缴费方式为线上缴费并且上传了缴费凭证和订单后四位 需要回显
-          if(this.model.paymentRecord && this.model.payMode === 2 ){
-            this.form.setFieldsValue({'paymentRecord':this.model.paymentRecord,'orderCode':this.model.orderCode})
+          if (this.model.paymentRecord && this.model.payMode === 2) {
+            this.form.setFieldsValue({'paymentRecord': this.model.paymentRecord, 'orderCode': this.model.orderCode})
           }
           // 审核通过以后不可在上传
-          if(this.model.checkResult === 1){
+          if (this.model.checkResult === 1) {
             this.checkBool = true
-          }else {
+          } else {
             this.checkBool = false
           }
 
@@ -237,6 +262,34 @@ export default {
 </script>
 
 <style scoped lang="less">
+
+.info {
+  .ant-col {
+    span {
+      display: inline-block;
+      word-break: keep-all;
+      white-space: nowrap;
+      max-width: calc(100% - 100px);
+      overflow: hidden;
+      text-overflow: ellipsis;
+    }
+  }
+}
+
+//会议内容、备注的样式
+.info-textarea {
+  display: flex;
+
+  label {
+    flex-shrink: 0;
+  }
+}
+
+.flex-col {
+  .ant-col {
+    display: flex;
+  }
+}
 .ant-row {
   margin: 12px;
 }