From c34779e717f1b1bbc7299c4f9b9a79470f04cc21 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A7=9A=E4=BA=9A=E7=94=B7?= <yaoyanan@syxysoft.com>
Date: Thu, 16 Sep 2021 11:21:14 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E7=89=A9=E6=B5=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/mailManagement/BillMail.vue     | 13 +++++++------
 src/views/mailManagement/ContractMail.vue | 15 ++++++++-------
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/src/views/mailManagement/BillMail.vue b/src/views/mailManagement/BillMail.vue
index 48ee1a6..70a2f5d 100644
--- a/src/views/mailManagement/BillMail.vue
+++ b/src/views/mailManagement/BillMail.vue
@@ -14,7 +14,7 @@
             </a-col>
             <a-col :xl="7" :lg="8" :md="8" :sm="24">
               <a-form-item label="项目负责人">
-                <select-principal v-model="queryParam.pricipalId" placeholder="请选择项目负责人"></select-principal>
+                <select-principal v-model="queryParam.principalId" placeholder="请选择项目负责人"></select-principal>
               </a-form-item>
             </a-col>
             <a-col :xl="7" :lg="8" :md="8" :sm="24">
@@ -81,12 +81,12 @@
           </template>
 
           <span slot="print" slot-scope="text, record" class="action-span-cell">
-            <a-button type="primary" :disabled="record.sendMethod === 1 ? true : false">打印</a-button>
+            <a-button type="primary" :disabled="record.sendMethod === 1 ? false : true">打印</a-button>
           </span>
           <span slot="action" slot-scope="text, record" class="action-span-cell">
             <a @click="handleAdd" v-if="record.postStatus === 0">邮寄</a>
             <a @click="handleEdit(record)" v-if="record.postStatus === 1">修改</a>
-            <a @click="goLogistics(record.id)" v-if="record.postStatus === 1">查看物流</a>
+            <a @click="goLogistics(record)" v-if="record.postStatus === 1">查看物流</a>
           </span>
         </a-table>
       </div>
@@ -151,7 +151,7 @@ export default {
         {
           title: '项目负责人',
           align: 'center',
-          dataIndex: 'pricipalName',
+          dataIndex: 'principalName',
         },
         {
           title: '来款单位',
@@ -195,8 +195,9 @@ export default {
   },
   methods: {
     //  查看物流
-    goLogistics(id) {
-
+    goLogistics(recor
+      const com = Number(record.sendMethod) === 1 && 'ems' || 'shunfeng'
+      window.open(`https://www.kuaidi100.com/chaxun?com=${com}&nu=${record.postNo}`)
     },
     handleAdd: function () {
       this.$refs.modalForm.add()
diff --git a/src/views/mailManagement/ContractMail.vue b/src/views/mailManagement/ContractMail.vue
index d7a77b0..aaa461b 100644
--- a/src/views/mailManagement/ContractMail.vue
+++ b/src/views/mailManagement/ContractMail.vue
@@ -24,7 +24,7 @@
             </a-col>
             <a-col :xl="5" :lg="8" :md="8" :sm="24">
               <a-form-item label="负责人">
-                <select-principal v-model="queryParam.pricipalId" placeholder="请选择负责人"></select-principal>
+                <select-principal v-model="queryParam.principalId" placeholder="请选择负责人"></select-principal>
               </a-form-item>
             </a-col>
             <a-col :xl="4" :lg="7" :md="8" :sm="24">
@@ -65,12 +65,12 @@
           </template>
 
           <span slot="print" slot-scope="text, record" class="action-span-cell">
-            <a-button type="primary" :disabled="record.sendMethod === 1 ? true : false">打印</a-button>
+            <a-button type="primary" :disabled="record.sendMethod === '1' ? false : true">打印</a-button>
           </span>
           <span slot="action" slot-scope="text, record" class="action-span-cell">
             <a @click="handleAdd" v-if="record.postStatus === '0'">邮寄</a>
-            <a @click="handleEdit(record)" v-if="record.postStatus !== '0'">修改</a>
-            <a @click="goLogistics(record.id)" v-if="record.postStatus !== '0'">查看物流</a>
+            <a @click="handleEdit(record)" v-if="record.postStatus === '1'">修改</a>
+            <a @click="goLogistics(record)" v-if="record.postStatus === '1'">查看物流</a>
           </span>
         </a-table>
       </div>
@@ -134,7 +134,7 @@ export default {
         {
           title: '负责人',
           align: 'center',
-          dataIndex: 'pricipalName',
+          dataIndex: 'principalName',
         },
         {
           title: '合同总金额',
@@ -178,8 +178,9 @@ export default {
   },
   methods: {
     //  查看物流
-    goLogistics(id) {
-
+    goLogistics(record) {
+      const com = Number(record.sendMethod) === 1 && 'ems' || 'shunfeng'
+      window.open(`https://www.kuaidi100.com/chaxun?com=${com}&nu=${record.postNo}`)
     },
     handleAdd: function () {
       this.$refs.modalForm.add()