From 21a899dfa43866f862b14202d86353f4eae1ccd1 Mon Sep 17 00:00:00 2001
From: zhaoxiao <zhaoxiao@syxysoft.com>
Date: Wed, 3 Nov 2021 18:11:20 +0800
Subject: [PATCH] =?UTF-8?q?[bug]=20bug=E4=BF=AE=E6=94=B9=EF=BC=9B=E5=90=88?=
 =?UTF-8?q?=E5=90=8C=E6=89=93=E5=8D=B0=EF=BC=9B=E8=A7=92=E8=89=B2=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E9=99=90=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/ProjectDetailModal.vue     |  2 +-
 src/views/mailManagement/ContractMail.vue | 16 +++++++++++++++-
 src/views/mailManagement/PrintPage.vue    | 20 +++++++++++---------
 src/views/system/RoleUserList.vue         |  4 +++-
 4 files changed, 30 insertions(+), 12 deletions(-)

diff --git a/src/components/ProjectDetailModal.vue b/src/components/ProjectDetailModal.vue
index 6621a3a..e15202c 100644
--- a/src/components/ProjectDetailModal.vue
+++ b/src/components/ProjectDetailModal.vue
@@ -104,7 +104,7 @@
         <template>
           <a-row :gutter="24">
             <a-col :span="12" class="detail-item">
-              <label>企业联系人1备注：</label>
+              <label>企业联系人备注：</label>
               <span><j-ellipsis :value="basicInfo.remarksOne" :length="16"></j-ellipsis></span>
             </a-col>
           </a-row>
diff --git a/src/views/mailManagement/ContractMail.vue b/src/views/mailManagement/ContractMail.vue
index eab737d..43ee52a 100644
--- a/src/views/mailManagement/ContractMail.vue
+++ b/src/views/mailManagement/ContractMail.vue
@@ -69,7 +69,7 @@
           </template>
 
           <span slot="print" slot-scope="text, record" class="action-span-cell">
-            <a-button type="primary" :disabled="record.sendMethod === '1' ? false : true">打印</a-button>
+            <a-button type="primary" :disabled="record.sendMethod === '1' ? false : true" @click="goPrint(record)">打印</a-button>
           </span>
           <span slot="action" slot-scope="text, record" class="action-span-cell">
             <a @click="handleAdd(record.id)" v-if="record.postStatus === '0'" v-has="'contractMail:mail'">邮寄</a>
@@ -207,6 +207,20 @@ export default {
       const com = Number(record.sendMethod) === 1 && 'ems' || 'shunfeng'
       window.open(`https://www.kuaidi100.com/chaxun?com=${ com }&nu=${ record.postNo }`)
     },
+    /**
+     * 打印，新标签打开页面，打印页面
+     * @param record
+     */
+    goPrint(record) {
+      let routerUrl = this.$router.resolve({
+        path: '/mailManagement/PrintPage',
+        query: {
+          record: JSON.stringify(record),
+          type: 'contract'
+        }
+      })
+      window.open(routerUrl.href, '_blank')
+    },
     handleAdd (id) {
       let param = {
         id: id
diff --git a/src/views/mailManagement/PrintPage.vue b/src/views/mailManagement/PrintPage.vue
index 454f35a..ec4ce3a 100644
--- a/src/views/mailManagement/PrintPage.vue
+++ b/src/views/mailManagement/PrintPage.vue
@@ -11,20 +11,20 @@
 
         <div class="sendAddress">{{ sendAddress }}</div>
 
-        <div class="sendPostNo">{{ mailDetail.billNo }}</div>
+        <div class="sendPostNo"></div>
         <div class="sendPostCode">{{ sendPostCode }}</div>
 
 
-        <div class="arriveName">{{ mailDetail.contactName }}</div>
-        <div class="arrivePhone">{{ mailDetail.contactMobile }}</div>
+        <div class="arriveName">{{ isContract ? mailDetail.liaisonMan : mailDetail.contactName }}</div>
+        <div class="arrivePhone">{{ isContract ? mailDetail.mobile : mailDetail.contactMobile }}</div>
 
-        <div class="arriveCompanyName">{{ mailDetail.chargeCompanyName }}</div>
+        <div class="arriveCompanyName">{{ isContract ? mailDetail.signedCompanyTemporaryName : mailDetail.chargeCompanyName }}</div>
         <div class="arriveCode"></div>
 
-        <div class="arriveAddress">{{ mailDetail.chargeCompanyName }}</div>
+        <div class="arriveAddress">{{ mailDetail.contactAddress }}</div>
 
         <div class="arriveCity"></div>
-        <div class="arrivePostNo">{{ mailDetail.postNo }}</div>
+        <div class="arrivePostNo">{{ mailDetail.postalCode }}</div>
       </div>
     </div>
   </div>
@@ -44,10 +44,12 @@ export default {
       userInfo: {},
       sendCompanyName: '',
       sendAddress: '',
-      sendPostCode: ''
+      sendPostCode: '',
+      isContract: false, // 是否合同
     }
   },
   created() {
+    this.isContract = this.$route.query.type === 'contract'
     this.sendCompanyName = window._CONFIG['sendCompanyName']
     this.sendAddress = window._CONFIG['sendAddress']
     this.sendPostCode = window._CONFIG['sendPostCode']
@@ -140,7 +142,7 @@ export default {
 .sendPostCode {
   position: absolute;
   left: 218pt;
-  top: 134pt;
+  top: 138pt;
   font-size: 16px;
   letter-spacing: 9pt;
 }
@@ -193,7 +195,7 @@ export default {
 .arrivePostNo {
   position: absolute;
   left: 218pt;
-  top: 246pt;
+  top: 240pt;
   font-size: 16px;
   letter-spacing: 9pt;
 }
diff --git a/src/views/system/RoleUserList.vue b/src/views/system/RoleUserList.vue
index 19e3e66..2cdde4f 100644
--- a/src/views/system/RoleUserList.vue
+++ b/src/views/system/RoleUserList.vue
@@ -47,7 +47,9 @@
           <span slot="action" class="action-span-cell" slot-scope="text, record">
             <a @click="handlePerssion(record.id)" v-has="'sys:role:perssion'">授权</a>
             <a @click="handleEdit(record)" v-has="'sys:role:edit'">编辑</a>
-            <a @click="handleDelete(record.id)" v-has="'sys:role:del'">删除</a>
+            <a
+              v-if="record.roleCode !== 'admin' && record.roleCode !== 'cwry' && record.roleCode !== 'yjry' && record.roleCode !== 'dbry' && record.roleCode !== 'sld' && record.roleCode !== 'bmfzr' && record.roleCode !== 'qyry'  && record.roleCode !== 'xmfzr' && record.roleCode !== 'memberManageCode'"
+              @click="handleDelete(record.id)" v-has="'sys:role:del'">删除</a>
           </span>
           <template slot-scope="text" slot="text">
             <j-ellipsis v-if="text" :length="20" :value="text"></j-ellipsis>