From 41227b0dcefb3e2a02a89755ee57d5b5343855b7 Mon Sep 17 00:00:00 2001
From: zhaoxiao <zhaoxiao@syxysoft.com>
Date: Thu, 14 Oct 2021 10:20:56 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/ProjectDetailModal.vue           |  9 +++++----
 src/components/tools/StatusSlot.vue             | 17 ++++++++++++-----
 .../projectManagement/CommitteeMeeting.vue      |  2 +-
 3 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/src/components/ProjectDetailModal.vue b/src/components/ProjectDetailModal.vue
index 2d48d00..525a3e8 100644
--- a/src/components/ProjectDetailModal.vue
+++ b/src/components/ProjectDetailModal.vue
@@ -142,7 +142,7 @@
           class="j-table-force-nowrap"
         >
         <span slot="action" class="action-span-cell" slot-scope="record">
-          <a @click="lookLogistics()" v-if="record.postStatus === 1">查看物流</a>
+          <a @click="lookLogistics(record)" v-if="record.postStatus === 1">查看物流</a>
         </span>
           <!--          <p slot="expandedRowRender" slot-scope="record" style="margin: 0">-->
           <!--            {{ record.sendDate }}-->
@@ -227,7 +227,7 @@ const columns = [
   {
     title: '快递',
     align: 'center',
-    dataIndex: 'sendMethod'
+    dataIndex: 'sendMethod_dictText'
   },
   {
     title: '快递单号',
@@ -324,8 +324,9 @@ export default {
     /*
     *  查看物流
     * */
-    lookLogistics() {
-      window.open('https://www.ems.com.cn/', '_blank')
+    lookLogistics(record) {
+      const com = Number(record.sendMethod) === 1 && 'ems' || 'shunfeng'
+      window.open(`https://www.kuaidi100.com/chaxun?com=${ com }&nu=${ record.postNo }`)
     },
     /*
     * 去合同详情 传入合同id
diff --git a/src/components/tools/StatusSlot.vue b/src/components/tools/StatusSlot.vue
index 72ed18b..0244431 100644
--- a/src/components/tools/StatusSlot.vue
+++ b/src/components/tools/StatusSlot.vue
@@ -1,9 +1,9 @@
 <template>
   <div>
     <template v-if="statusType && statusNo">
+<!--      placement="topLeft"-->
       <a-tooltip
         overlay-class-name="status-tooltip"
-        placement="topLeft"
         :title="currentTitle"
         arrow-point-at-center
         :mouse-enter-delay="0.1"
@@ -14,7 +14,6 @@
     <template v-else>
       <img :src="status" @click="s"/>
     </template>
-
   </div>
 </template>
 
@@ -147,6 +146,7 @@ export default {
     },
     /**
      * 显示的模板数据，即根据返回值怎么处理数据
+     * 判断是否存在一句话里所有变量为null，存在就不显示那句话了
      * @param item -传入的item的值
      * @return 返回一个模板字符串用于后续显示，可按照需求进行更改
      */
@@ -155,11 +155,17 @@ export default {
       console.log(item)
       // 来款
       if (this.statusKey === 'paymentRecord') {
-        result = `${ item.paymentDate }到账${ item.amountReceived }`
+        if (item.paymentDate || item.amountReceived) {
+          result = `${ item.paymentDate }到账${ item.amountReceived }`
+        }
       } else if (this.statusKey === 'bill') {
-        result = `${ item.billDate }新增发票，发票单号：${ item.billNo }`
+        if (item.billDate || item.billNo) {
+          result = `${ item.billDate }新增发票，发票单号：${ item.billNo }`
+        }
       } else if (this.statusKey === 'mail') {
-        result = `${ item.sendDate }新增邮寄信息，邮寄单号：${ item.postNo }`
+        if (item.sendDate || item.postNo) {
+          result = `${ item.sendDate }新增邮寄信息，邮寄单号：${ item.postNo }`
+        }
       }
       return result
     }
@@ -173,6 +179,7 @@ export default {
 <style>
 /* 自定义tooltip下样式问题*/
 .status-tooltip .ant-tooltip-inner {
+  width: 16rem;
   white-space: pre-wrap !important;
 }
 </style>
diff --git a/src/views/projectManagement/CommitteeMeeting.vue b/src/views/projectManagement/CommitteeMeeting.vue
index bb79a94..02b9e75 100644
--- a/src/views/projectManagement/CommitteeMeeting.vue
+++ b/src/views/projectManagement/CommitteeMeeting.vue
@@ -197,7 +197,7 @@ export default {
           align: 'center',
           dataIndex: 'startTime',
           width: 160,
-          customRender: (text, record) => (<j-ellipsis value={record.startTime  + record.endTime} length={20}></j-ellipsis>)
+          customRender: (text, record) => (<j-ellipsis value={record.startTime + '~' + record.endTime} length={20}></j-ellipsis>)
         },
         {
           title: '召开地点',