From 6186d0a2a061d78659126ba5dda6591786a64fce Mon Sep 17 00:00:00 2001
From: fengachen <373943794@qq.com>
Date: Thu, 21 Oct 2021 14:14:50 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90bug=E3=80=91=20=E4=BC=9A=E8=AE=AE?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=20=E4=B8=8A=E4=BC=A0=E5=87=AD=E8=AF=81?=
 =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=80=A7=E5=88=AB=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/MessagePage/MeetingDetailModal.vue  | 178 ++++++++++++++++--
 .../UploadMeetingCertificateModal.vue         |   8 +-
 2 files changed, 165 insertions(+), 21 deletions(-)

diff --git a/src/views/MessagePage/MeetingDetailModal.vue b/src/views/MessagePage/MeetingDetailModal.vue
index fd0a3fd..a5e5afa 100644
--- a/src/views/MessagePage/MeetingDetailModal.vue
+++ b/src/views/MessagePage/MeetingDetailModal.vue
@@ -78,20 +78,21 @@
         </a-col>
       </a-row>
       <a-row :gutter="24">
-        <a-col :span="12">
-          <label>性别：</label>
-          <span>{{genderTest}}</span>
-        </a-col>
+<!--        需求沟通去掉性别-->
+<!--        <a-col :span="12">-->
+<!--          <label>性别：</label>-->
+<!--          <span>{{genderTest}}</span>-->
+<!--        </a-col>-->
         <a-col :span="12">
           <label>手机号：</label>
           <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="situationInfo.payMode_dictText" :length="20"></j-ellipsis></span>
         </a-col>
+      </a-row>
+      <a-row :gutter="24">
         <a-col :span="12">
           <label>需要发票：</label>
           <span><j-ellipsis :value="situationInfo.needInvoice_dictText" :length="20"></j-ellipsis></span>
@@ -121,12 +122,41 @@
     </section>
     <!--会议资料end-->
     <!--开票邮寄信息begin-->
-    <section class="base-info">
+    <section class="payment-info">
+      <h3 class="title">付款信息</h3>
+      <div class="payment-info-box">
+        <section class="payment-info-title">付款信息</section>
+        <template v-if="paymentInfoList && paymentInfoList.length > 0">
+          <div class="payment-info-content" v-for="item of paymentInfoList" :key="item.id">
+            {{ item.paymentDate }}付款{{ item.amountReceived }}元
+          </div>
+        </template>
+        <a-list v-else :data-source="[]"/>
+      </div>
+    </section>
+    <!--到账信息end-->
+    <!--开票邮寄信息begin-->
+    <section class="logistics-info">
       <h3 class="title">开票邮寄信息</h3>
-      <a-row :gutter="24">
-        <a-col :span="12">
-        </a-col>
-      </a-row>
+      <div class="wrap-table">
+        <a-table
+          ref="table"
+          size="middle"
+          rowKey="id"
+          :scroll="{x:true}"
+          :pagination="false"
+          :columns="columns"
+          :dataSource="logisticsInfoList"
+          class="j-table-force-nowrap"
+        >
+        <span slot="action" slot-scope="record" class="action-span-cell">
+          <a @click="lookLogistics(record)" v-if="record.postStatus === 1">查看物流</a>
+        </span>
+          <!--          <p slot="expandedRowRender" slot-scope="record" style="margin: 0">-->
+          <!--            {{ record.sendDate }}-->
+          <!--          </p>-->
+        </a-table>
+      </div>
     </section>
     <!--开票邮寄信息end-->
 
@@ -139,9 +169,57 @@
 <script>
 import PreviewFile from '@comp/jero/PreviewFile'
 import JEllipsis from '@comp/jero/JEllipsis'
-import {getMeetInfoById} from '@api/incomePaymentsApi'
+import {getMeetInfoById, queryCommonProjectById} from '@api/incomePaymentsApi'
 import {getSingUpUserInfo} from '@api/incomePaymentsApi'
-
+import '@/assets/less/TableExpand.less'
+const columns = [
+  {
+    title: '开票人',
+    align: 'center',
+    dataIndex: 'realName'
+  },
+  {
+    title: '日期',
+    align: 'center',
+    dataIndex: 'billDate'
+  },
+  {
+    title: '金额(元)',
+    align: 'center',
+    dataIndex: 'invoiceAmount'
+  },
+  {
+    title: '票号',
+    align: 'center',
+    dataIndex: 'billNo'
+  },
+  {
+    title: '项目',
+    align: 'center',
+    dataIndex: 'projectName'
+  },
+  {
+    title: '邮寄人',
+    align: 'center',
+    dataIndex: 'mailName'
+  },
+  {
+    title: '快递',
+    align: 'center',
+    dataIndex: 'sendMethod_dictText'
+  },
+  {
+    title: '快递单号',
+    align: 'center',
+    dataIndex: 'postNo'
+  },
+  {
+    title: '操作',
+    align: 'center',
+    dataIndex: '',
+    scopedSlots: { customRender: 'action' }
+  }
+]
 export default {
   name: 'MeetingDetailModal',
   components:{
@@ -165,7 +243,12 @@ export default {
       // 会议信息
       meetingInfo:{},
       // 参会人信息
-      situationInfo:{}
+      situationInfo:{},
+      columns,
+      // 到账信息
+      paymentInfoList:[],
+      // 开票邮寄信息
+      logisticsInfoList:[]
     }
   },
   computed:{
@@ -182,6 +265,18 @@ export default {
   methods: {
     open(param) {
       this.visible = true
+      // 通过id查询项目详情
+      queryCommonProjectById({ id: param.situationId }).then(res => {
+        if (res.success) {
+          console.log(res.result, 'res.result')
+          // 到账信息
+          this.paymentInfoList = res.result.paymentRecord
+          // 开票邮寄信息
+          this.logisticsInfoList = res.result.mailBill
+        } else {
+          console.log('未查到相应的信息')
+        }
+      })
 
       if(param && !this.isMeetingBool){
         // 消息进来的获取会议的详情
@@ -197,6 +292,7 @@ export default {
           }
         })
 
+
       }else {
         // 会议进来查询的会议信息
         this.model = Object.assign({},param)
@@ -215,6 +311,30 @@ export default {
     handleCancel() {
       this.close()
     },
+
+    /*
+* 生成每一个开票信息
+* */
+    createItemInfo(item) {
+      let porjectItem = ''
+      if (item.projects.length > 0) {
+        item.projects.forEach((val, index) => {
+          if (index === item.projects.length - 1) {
+            porjectItem += val
+          } else {
+            porjectItem += val + '、'
+          }
+        })
+      }
+      return `${ item.person }于${ item.time }开票，金额为:${ item.money }元,票号:${ item.piaoNo },项目:${ porjectItem }`
+    },
+    /*
+    *  查看物流
+    * */
+    lookLogistics(record) {
+      const com = Number(record.sendMethod) === 1 && 'ems' || 'shunfeng'
+      window.open(`https://www.kuaidi100.com/chaxun?com=${ com }&nu=${ record.postNo }`)
+    },
     /*
     * 通过会议id获取会议性情
     * */
@@ -278,7 +398,7 @@ h3.title::before {
   left: -10px;
   content: "";
   height: 20px;
-  width: 2px;
+  width: 3px;
   background: #069f99;
 }
 
@@ -307,7 +427,35 @@ h3.title::before {
 
 
 }
+/* 到账信息 */
+.payment-info {
+  margin-bottom: 14px;
 
+  &-box {
+    border: 1px solid #ccc;
+  }
+
+  &-title {
+    text-align: center;
+    font-size: 14px;
+    height: 35px;
+    line-height: 35px;
+    letter-spacing: 1px;
+    color: #fff;
+    background: #a2e6e4;
+  }
+
+  &-content {
+    color: #424242;
+    //background: #efefef;
+    padding: 5px;
+    padding-left: 10px;
+    //border: 1px solid #ccc;
+    border-top: none;
+  }
+
+
+}
 /*  开票邮寄信息 */
 .wrap-table {
   border: 1px solid #ccc;
diff --git a/src/views/MessagePage/UploadMeetingCertificateModal.vue b/src/views/MessagePage/UploadMeetingCertificateModal.vue
index f4207c8..f3a792d 100644
--- a/src/views/MessagePage/UploadMeetingCertificateModal.vue
+++ b/src/views/MessagePage/UploadMeetingCertificateModal.vue
@@ -36,8 +36,8 @@
         </a-row>
         <a-row :gutter="24">
           <a-col :span="12">
-            <label>性别：</label>
-            <span>{{genderTest}}</span>
+            <label>付款方式：</label>
+            <span><j-ellipsis :value="model.payMode_dictText " :length="20"></j-ellipsis></span>
           </a-col>
           <a-col :span="12">
             <label>手机号：</label>
@@ -45,10 +45,6 @@
           </a-col>
         </a-row>
         <a-row :gutter="24">
-          <a-col :span="12">
-            <label>付款方式：</label>
-            <span><j-ellipsis :value="model.payMode_dictText " :length="20"></j-ellipsis></span>
-          </a-col>
           <a-col :span="12">
             <label>需要发票：</label>
             <span><j-ellipsis :value="model.needInvoice_dictText" :length="20"></j-ellipsis></span>