From 25e8b2e14604202f00800cc27b73bdf4fd6d0c18 Mon Sep 17 00:00:00 2001 From: lideqin <694785430@qq.com> Date: Tue, 25 Apr 2023 18:26:18 +0800 Subject: [PATCH] =?UTF-8?q?[update]=20=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E7=89=A9=E6=B5=81=E4=BF=A1=E6=81=AF=E4=B8=BA=E5=90=8E=E7=AB=AF?= =?UTF-8?q?=E6=9F=A5=EF=BC=8C=E4=B9=8B=E5=89=8D=E6=98=AF=E7=9B=B4=E6=8E=A5?= =?UTF-8?q?=E8=B7=B3=E5=BF=AB=E9=80=92100?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/development_address_config.js | 5 ++++- public/local_production_address_config.js | 5 ++++- public/production_address_config.js | 5 ++++- src/components/ProjectDetailModal.vue | 10 +++++++++- .../contractManagement/modules/MailDetailModal.vue | 10 +++++++++- src/views/mailManagement/BillMail.vue | 8 +++++++- src/views/mailManagement/ContractMail.vue | 8 +++++++- 7 files changed, 44 insertions(+), 7 deletions(-) diff --git a/public/development_address_config.js b/public/development_address_config.js index 9b6476a..bf76415 100644 --- a/public/development_address_config.js +++ b/public/development_address_config.js @@ -26,4 +26,7 @@ window._CONFIG["sendCompanyName"] = "中国汽车标准化研究院" // 票据打印--寄件人地址 window._CONFIG["sendAddress"] = "天津市东丽区先锋东路68号" // 票据打印--寄件人邮编 -window._CONFIG["sendPostCode"] = "300300" \ No newline at end of file +window._CONFIG["sendPostCode"] = "300300" + +// 查看物流信息-- 在企业端 +window._CONFIG["lookExpressDomainURL"] = "http://localhost:3001/lookExpressInfo"; \ No newline at end of file diff --git a/public/local_production_address_config.js b/public/local_production_address_config.js index 6b423ec..ecdfb01 100644 --- a/public/local_production_address_config.js +++ b/public/local_production_address_config.js @@ -24,4 +24,7 @@ window._CONFIG["sendCompanyName"] = "中国汽车标准化研究院" // 票据打印--寄件人地址 window._CONFIG["sendAddress"] = "天津市东丽区先锋东路68号" // 票据打印--寄件人邮编 -window._CONFIG["sendPostCode"] = "300300" \ No newline at end of file +window._CONFIG["sendPostCode"] = "300300" + +// 查看物流信息 +window._CONFIG["lookExpressDomainURL"] = "http://bxxt.hzwlsoft.com/lookexpressinfo"; \ No newline at end of file diff --git a/public/production_address_config.js b/public/production_address_config.js index 09b3f6e..155c19b 100644 --- a/public/production_address_config.js +++ b/public/production_address_config.js @@ -23,4 +23,7 @@ window._CONFIG["sendCompanyName"] = "中国汽车标准化研究院" // 票据打印--寄件人地址 window._CONFIG["sendAddress"] = "天津市东丽区先锋东路68号" // 票据打印--寄件人邮编 -window._CONFIG["sendPostCode"] = "300300" \ No newline at end of file +window._CONFIG["sendPostCode"] = "300300" + +// 查看物流信息 +window._CONFIG["lookExpressDomainURL"] = "http://cwp.catarc.org.cn/lookexpressinfo" \ No newline at end of file diff --git a/src/components/ProjectDetailModal.vue b/src/components/ProjectDetailModal.vue index 86cdf4e..5e96448 100644 --- a/src/components/ProjectDetailModal.vue +++ b/src/components/ProjectDetailModal.vue @@ -487,8 +487,16 @@ export default { * 查看物流 * */ lookLogistics(record) { + console.log(record) const com = Number(record.sendMethod) === 1 && 'ems' || 'shunfeng' - window.open(`https://www.kuaidi100.com/chaxun?com=${ com }&nu=${ record.postNo }`) + // window.open(`https://www.kuaidi100.com/chaxun?com=${ com }&nu=${ record.postNo }`) + let url = '' + if (com === 'shunfeng' && record.principalPhone) { + url = `${window._CONFIG['lookExpressDomainURL']}?com=${ com }&nu=${ record.postNo }&phone=${ record.principalPhone }` + } else { + url = `${window._CONFIG['lookExpressDomainURL']}?com=${ com }&nu=${ record.postNo }` + } + window.open(url, '_blank') }, /* * 去合同详情 传入合同id diff --git a/src/views/contractManagement/modules/MailDetailModal.vue b/src/views/contractManagement/modules/MailDetailModal.vue index 0019c75..46d01c3 100644 --- a/src/views/contractManagement/modules/MailDetailModal.vue +++ b/src/views/contractManagement/modules/MailDetailModal.vue @@ -90,8 +90,16 @@ export default { * @param record */ goLogistics() { + console.log(this.dataSource) const com = Number(this.dataSource.sendMethod) === 1 && 'ems' || 'shunfeng' - window.open(`https://www.kuaidi100.com/chaxun?com=${ com }&nu=${ this.dataSource.postNo }`) + let url = '' + if(com === 'shunfeng' && this.dataSource.mobile) { + url = `${window._CONFIG['lookExpressDomainURL']}?com=${ com }&nu=${ this.dataSource.postNo }&phone=${this.dataSource.mobile}` + } else { + url = `${window._CONFIG['lookExpressDomainURL']}?com=${ com }&nu=${ this.dataSource.postNo }` + } + + window.open(url, '_blank') }, } } diff --git a/src/views/mailManagement/BillMail.vue b/src/views/mailManagement/BillMail.vue index c6ad17c..f105029 100644 --- a/src/views/mailManagement/BillMail.vue +++ b/src/views/mailManagement/BillMail.vue @@ -231,7 +231,13 @@ export default { // 查看物流 goLogistics(record) { const com = Number(record.sendMethod) === 1 && 'ems' || 'shunfeng' - window.open(`https://www.kuaidi100.com/chaxun?com=${ com }&nu=${ record.postNo }`) + let url = '' + if (com === 'shunfeng' && record.principalPhone) { + url = `${window._CONFIG['lookExpressDomainURL']}?com=${ com }&nu=${ record.postNo }&phone=${ record.principalPhone }` + } else { + url = `${window._CONFIG['lookExpressDomainURL']}?com=${ com }&nu=${ record.postNo }` + } + window.open(url, '_blank') }, /** * 打印，新标签打开页面，打印页面 diff --git a/src/views/mailManagement/ContractMail.vue b/src/views/mailManagement/ContractMail.vue index f2e14bb..d5cbe4e 100644 --- a/src/views/mailManagement/ContractMail.vue +++ b/src/views/mailManagement/ContractMail.vue @@ -215,7 +215,13 @@ export default { // 查看物流 goLogistics(record) { const com = Number(record.sendMethod) === 1 && 'ems' || 'shunfeng' - window.open(`https://www.kuaidi100.com/chaxun?com=${ com }&nu=${ record.postNo }`) + let url = '' + if (com === 'shunfeng' && record.principalPhone) { + url = `${window._CONFIG['lookExpressDomainURL']}?com=${ com }&nu=${ record.postNo }&phone=${ record.principalPhone }` + } else { + url = `${window._CONFIG['lookExpressDomainURL']}?com=${ com }&nu=${ record.postNo }` + } + window.open(url, '_blank') }, /** * 打印，新标签打开页面，打印页面