From 286f085ac78146874665ffa71209adc19eebd2fd Mon Sep 17 00:00:00 2001 From: zhaoxiao Date: Thu, 23 Dec 2021 15:16:13 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=B6=E5=85=A5=E5=90=88=E5=90=8C=E5=A4=84?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=99=AE=E9=80=9A=E9=A1=B9=E7=9B=AE=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E8=B4=9F=E8=B4=A3=E4=BA=BA=E6=94=B9=E4=B8=BA=E6=94=B6?= =?UTF-8?q?=E5=85=A5=E5=90=88=E5=90=8C=E8=B4=9F=E8=B4=A3=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../revenueContract/modules/SelectProjectModule.vue | 1 + .../modules/GeneralProjectModule.vue | 12 +++++++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/views/contractManagement/revenueContract/modules/SelectProjectModule.vue b/src/views/contractManagement/revenueContract/modules/SelectProjectModule.vue index 6fa9fe3..be359d5 100644 --- a/src/views/contractManagement/revenueContract/modules/SelectProjectModule.vue +++ b/src/views/contractManagement/revenueContract/modules/SelectProjectModule.vue @@ -105,6 +105,7 @@ :default-charge-way="2" :is-contract-num-disabled="true" :flag="1" + :default-principal="principal" @ok="selectProjectOk"> diff --git a/src/views/projectManagement/modules/GeneralProjectModule.vue b/src/views/projectManagement/modules/GeneralProjectModule.vue index e66ab43..331294b 100644 --- a/src/views/projectManagement/modules/GeneralProjectModule.vue +++ b/src/views/projectManagement/modules/GeneralProjectModule.vue @@ -244,7 +244,13 @@ export default { // 收入合同新增时为1 flag: { type: Number, - requirded: false, + required: false, + default: null + }, + // 默认的负责人，收入合同处新增为当前合同的负责人 + defaultPrincipal: { + type: [String, Number], + required: false, default: null } }, @@ -389,8 +395,8 @@ export default { } else { // 新增默认运行年份为当年 this.model.year = new Date().getFullYear().toString() - // 新增默认负责人为当前用户 - this.model.principalId = Vue.ls.get(USER_INFO).id + // 新增默认负责人为当前用户（收入合同处新增为合同负责人） + this.model.principalId = this.defaultPrincipal ? this.defaultPrincipal : Vue.ls.get(USER_INFO).id // 新增默认来款方式为无 this.model.chargeWay = 1 }