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 @@ - 打印 + 打印 邮寄 @@ -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 @@
{{ sendAddress }}
-
{{ mailDetail.billNo }}
+
{{ sendPostCode }}
-
{{ mailDetail.contactName }}
-
{{ mailDetail.contactMobile }}
+
{{ isContract ? mailDetail.liaisonMan : mailDetail.contactName }}
+
{{ isContract ? mailDetail.mobile : mailDetail.contactMobile }}
-
{{ mailDetail.chargeCompanyName }}
+
{{ isContract ? mailDetail.signedCompanyTemporaryName : mailDetail.chargeCompanyName }}
-
{{ mailDetail.chargeCompanyName }}
+
{{ mailDetail.contactAddress }}
-
{{ mailDetail.postNo }}
+
{{ mailDetail.postalCode }}
@@ -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 @@ 授权 编辑 - 删除 + 删除