update 收入合同+支出合同，有邮寄的可以查看邮寄详情

src/api/incomePaymentsApi.js

@@ -103,6 +103,8 @@ const getLastProofInfo = (param) => getAction('/paymentCheck/payPaymentCheck/get
 const getStanderMemberLastProofInfo = (param) => getAction('/paymentCheck/payPaymentCheck/getTbMemberProject', param)
 // 到账开票审核缴费凭证时获取最新一条缴费信息（标协证书）
 const getCertificateLastProofInfo = (param) => getAction('/paymentCheck/payPaymentCheck/getTbCertificatePayment', param)
+// 通过合同邮寄表id获取邮寄详情
+const queryMailDetailById = (param) => getAction('/payMailContract/payMailContract/queryById', param)
 
 export {
   getWorkingGroupById,
@@ -155,5 +157,6 @@ export {
   cancellationExpenditureContract,
   getLastProofInfo,
   getStanderMemberLastProofInfo,
-  getCertificateLastProofInfo
+  getCertificateLastProofInfo,
+  queryMailDetailById
 }

src/views/contractManagement/expenditureContract/ExpenditureContractList.vue

@@ -137,12 +137,14 @@
             <!--            待存档、已存档-->
             <a v-if="record.status === 3 || record.status === 5" @click="handleCancellation(record)"
                v-has="'expenditureContract:cancellation'">作废</a>
+            <a v-if="record.postStatus === 1" @click="handleReviewMailDetail(record)" v-has="'expenditureContract:mailDetail'">查看邮寄详情</a>
           </span>
         </a-table>
       </div>
     </a-card>
 
     <revenue-contract-aduit-module ref="aduitForm" @ok="modalFormOk"></revenue-contract-aduit-module>
+    <mail-detail-modal ref="mailDetail" @ok="modalFormOk"></mail-detail-modal>
   </div>
 </template>
 
@@ -154,10 +156,11 @@ import { RangeDateMixin } from '../../../mixins/RangeDateMixin'
 import JDate from '../../../components/tools/JDate'
 import { archiveExpenditureContract, cancellationExpenditureContract } from '../../../api/incomePaymentsApi'
 import RevenueContractAduitModule from '../revenueContract/modules/RevenueContractAduitModule'
+import MailDetailModal from '../modules/MailDetailModal'
 
 export default {
   name: 'ExpenditureContractList',
-  components: { PageHeaderTitle, JDate, RevenueContractAduitModule },
+  components: { PageHeaderTitle, JDate, RevenueContractAduitModule, MailDetailModal },
   mixins: [JeroListMixin, RangeDateMixin],
   computed: {
     importExcelUrl: function () {
@@ -353,6 +356,13 @@ export default {
           })
         }
       })
+    },
+    /**
+     * 查看邮寄详情
+     * @param record
+     */
+    handleReviewMailDetail(record) {
+      this.$refs.mailDetail.open(record)
     }
   }
 }

src/views/contractManagement/modules/MailDetailModal.vue

@@ -0,0 +1,117 @@
+<template>
+  <j-modal
+    :title="title"
+    :width="width"
+    :visible="visible"
+    :confirmLoading="confirmLoading"
+    switchFullscreen
+    @cancel="handleCancel"
+    cancelText="关闭">
+    <a-spin :spinning="confirmLoading">
+      <template v-if="dataSource && dataSource !== {}">
+        <div class="detail-line">
+          <label>快递公司：</label>
+          <span>{{ dataSource.sendMethod }}</span>
+        </div>
+        <div class="detail-operate">
+          <div class="detail-line">
+            <label>快递单号：</label>
+            <span>{{ dataSource.postNo }}</span>
+          </div>
+          <div class="logistic-btn" @click="goLogistics" v-if="dataSource.postNo">查看物流</div>
+        </div>
+
+        <div class="detail-line">
+          <label>邮寄时间：</label>
+          <span>{{ dataSource.sendDate }}</span>
+        </div>
+        <div class="detail-line">
+          <label>备注：</label>
+          <span>{{ dataSource.remark }}</span>
+        </div>
+      </template>
+     <a-empty v-else></a-empty>
+    </a-spin>
+  </j-modal>
+</template>
+
+<script>
+import { queryMailDetailById } from '../../../api/incomePaymentsApi'
+
+export default {
+  name: 'MailDetailModal',
+  data() {
+    return {
+      title: '查看邮寄详情',
+      width: 500,
+      visible: false,
+      confirmLoading: false,
+      labelCol: {
+        xs: { span: 24 },
+        sm: { span: 5 }
+      },
+      wrapperCol: {
+        xs: { span: 24 },
+        sm: { span: 17 }
+      },
+      dataSource: {}
+    }
+  },
+  methods: {
+    /**
+     * 打开弹窗
+     * @param record
+     */
+    open(record) {
+      this.visible = true
+      if (record.mailId) {
+        this.confirmLoading = true
+        queryMailDetailById({ id: record.mailId }).then(res => {
+          if (res.success) {
+            this.dataSource = Object.assign({}, res.result || {})
+          } else {
+            this.$message.warn(res.message)
+          }
+        }).finally(() => {
+          this.confirmLoading = false
+        })
+      }
+    },
+    handleCancel() {
+      this.visible = false
+      this.dataSource = Object.assign({}, {})
+    },
+    /**
+     * 查看物流
+     * @param record
+     */
+    goLogistics() {
+      const com = Number(this.dataSource.sendMethod) === 1 && 'ems' || 'shunfeng'
+      window.open(`https://www.kuaidi100.com/chaxun?com=${ com }&nu=${ this.dataSource.postNo }`)
+    },
+  }
+}
+</script>
+
+<style scoped lang="less">
+.detail-line {
+  padding: 8px 20px;
+  display: flex;
+  label {
+    flex-shrink: 0;
+  }
+}
+
+.logistic-btn {
+  cursor: pointer;
+  color: #069f99;
+  flex-shrink: 0;
+  padding-right: 20px;
+}
+
+.detail-operate {
+  display: flex;
+  justify-content: space-between;
+  align-items: baseline;
+}
+</style>

src/views/contractManagement/revenueContract/RevenueContractList.vue

@@ -156,11 +156,13 @@
             <!--            待存档、已存档-->
             <a v-if="record.status === 3 || record.status === 5" @click="handleCancellation(record)"
                v-has="'revenueContract:cancellation'">作废</a>
+            <a v-if="record.postStatus === 1" @click="handleReviewMailDetail(record)" v-has="'revenueContract:mailDetail'">查看邮寄详情</a>
           </span>
         </a-table>
       </div>
     </a-card>
     <revenue-contract-aduit-module ref="aduitForm" @ok="modalFormOk"></revenue-contract-aduit-module>
+    <mail-detail-modal ref="mailDetail" @ok="modalFormOk"></mail-detail-modal>
   </div>
 </template>
 
@@ -173,10 +175,11 @@ import JDate from '../../../components/tools/JDate'
 import { RangeDateMixin } from '../../../mixins/RangeDateMixin'
 import { archiveRevenueContract, cancellationContract } from '../../../api/incomePaymentsApi'
 import JYearDate from '../../../components/jero/JYearDate'
+import MailDetailModal from '../modules/MailDetailModal'
 
 export default {
   name: 'RevenueContractList',
-  components: { PageHeaderTitle, RevenueContractAduitModule, JDate, JYearDate },
+  components: { PageHeaderTitle, RevenueContractAduitModule, JDate, JYearDate, MailDetailModal },
   mixins: [JeroListMixin, RangeDateMixin],
   data() {
     return {
@@ -279,7 +282,7 @@ export default {
           dataIndex: 'action',
           align: 'center',
           fixed: 'right',
-          width: 170,
+          width: 200,
           scopedSlots: { customRender: 'action' }
         }
       ],
@@ -405,6 +408,13 @@ export default {
           })
         }
       })
+    },
+    /**
+     * 查看邮寄详情
+     * @param record
+     */
+    handleReviewMailDetail(record) {
+      this.$refs.mailDetail.open(record)
     }
   }
 }