From a905376c8ded5eccad108ba448ec6ac1008ae08e Mon Sep 17 00:00:00 2001 From: fengchenchen Date: Fri, 8 Apr 2022 18:22:30 +0800 Subject: [PATCH] =?UTF-8?q?[=E8=BF=90=E7=BB=B4]=20-=E5=90=88=E5=90=8C?= =?UTF-8?q?=E5=90=8C=E6=AD=A5=E6=95=B0=E6=8D=AE-=E5=8C=B9=E9=85=8D?= =?UTF-8?q?=E8=B4=9F=E8=B4=A3=E4=BA=BA=E6=97=B6=E5=A2=9E=E5=8A=A0=E5=91=98?= =?UTF-8?q?=E5=B7=A5=E5=8F=B7=EF=BC=9B=E6=89=93=E5=8D=B0=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BC=82=E5=B8=B8=E7=9A=84=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/company/SelectPrincipal.vue | 2 +- .../expenditureContract/modules/ExpenditureContractModule.vue | 3 ++- .../contractManagement/revenueContract/modules/ContractData.js | 1 + .../revenueContract/modules/RevenueContractModule.vue | 3 ++- src/views/mailManagement/PrintPage.vue | 1 + 5 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/components/company/SelectPrincipal.vue b/src/components/company/SelectPrincipal.vue index 9f5f12c..e88f789 100644 --- a/src/components/company/SelectPrincipal.vue +++ b/src/components/company/SelectPrincipal.vue @@ -59,7 +59,7 @@ export default { }, // 通过其他的信息 赋值，如 姓名、部门、员工号 setValueByOtherInfo(otherInfo) { - let ele = this.userList.find(tt => tt.realname === otherInfo.realname && tt.orgCodeTxt === otherInfo.orgCodeTxt) + let ele = this.userList.find(tt => tt.realname === otherInfo.realname && tt.orgCodeTxt === otherInfo.orgCodeTxt && tt.workNo === otherInfo.workNo) if( ele) { this.$emit('change', ele.id) } diff --git a/src/views/contractManagement/expenditureContract/modules/ExpenditureContractModule.vue b/src/views/contractManagement/expenditureContract/modules/ExpenditureContractModule.vue index 51fe434..bf8598a 100644 --- a/src/views/contractManagement/expenditureContract/modules/ExpenditureContractModule.vue +++ b/src/views/contractManagement/expenditureContract/modules/ExpenditureContractModule.vue @@ -805,7 +805,8 @@ export default { // 负责人信息的处理 todo 需要增加员工号的判断 let userInfo = { realname: obj.realname, // 申请人 - orgCodeTxt: obj.orgCodeTxt // 申请部门 + orgCodeTxt: obj.orgCodeTxt, // 申请部门 + workNo: obj.workNo // 申请人工号 } this.$refs.selectPrincipal.setValueByOtherInfo(userInfo) // 签订单位信息的处理 diff --git a/src/views/contractManagement/revenueContract/modules/ContractData.js b/src/views/contractManagement/revenueContract/modules/ContractData.js index 079a3c1..c479f2a 100644 --- a/src/views/contractManagement/revenueContract/modules/ContractData.js +++ b/src/views/contractManagement/revenueContract/modules/ContractData.js @@ -244,4 +244,5 @@ let ConnectionKey = { 'contractAmount': 'contAmountLc', //签订合同总金额 --合同金额（人民币） 'rate': 'taxRate', //税率--税率 'noTaxAmount': 'contUntaxAmountLc', //未税金额--未税金额（人民币） + 'workNo': 'userno', //申请人工号 } diff --git a/src/views/contractManagement/revenueContract/modules/RevenueContractModule.vue b/src/views/contractManagement/revenueContract/modules/RevenueContractModule.vue index 6fe3424..be6f2af 100644 --- a/src/views/contractManagement/revenueContract/modules/RevenueContractModule.vue +++ b/src/views/contractManagement/revenueContract/modules/RevenueContractModule.vue @@ -953,7 +953,8 @@ export default { // 负责人信息的处理 todo 需要增加员工号的判断 let userInfo = { realname: obj.realname, // 申请人 - orgCodeTxt: obj.orgCodeTxt // 申请部门 + orgCodeTxt: obj.orgCodeTxt, // 申请部门 + workNo: obj.workNo // 申请人工号 } this.$refs.selectPrincipal.setValueByOtherInfo(userInfo) diff --git a/src/views/mailManagement/PrintPage.vue b/src/views/mailManagement/PrintPage.vue index a504497..116ade7 100644 --- a/src/views/mailManagement/PrintPage.vue +++ b/src/views/mailManagement/PrintPage.vue @@ -82,6 +82,7 @@ export default { getPostContactDetail(id) { getPrintPostContactByMailId({ id: id }).then(res => { console.log(res) + res.result = res.result || {} this.mailDetail.contactAddress = res.result.contactAddress this.mailDetail.postalCode = res.result.postalCode console.log(this.mailDetail)