From a63d71177a2899b01da37e5bfc2d498bec5f80be Mon Sep 17 00:00:00 2001 From: yangfeng <wanwan926_4@163.com> Date: 星期二, 17 十月 2023 15:10:13 +0800 Subject: [PATCH] Merge branch 'dev' of http://192.168.5.5:10010/r/web/crm-web into zhengwenfeng/modify-style --- src/views/service/serviceContract/index.vue | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/views/service/serviceContract/index.vue b/src/views/service/serviceContract/index.vue index 5e1974b..d56d3d6 100644 --- a/src/views/service/serviceContract/index.vue +++ b/src/views/service/serviceContract/index.vue @@ -271,9 +271,9 @@ this.editConfig.infomation = { ...this.addConfig, currency: "浜烘皯甯�", - client_name: "", + client_name: Object.keys(this.addConfig).length === 0 ? "" : this.addConfig.client_name, contact_name: "", - sale_chance_name: "", + sale_chance_name: Object.keys(this.addConfig).length === 0 ? "" : this.addConfig.sale_chance_name, contract_number: "", quotation_number: "" } @@ -289,7 +289,9 @@ quotation_number: row.quotation.number, currency: "浜烘皯甯�", sale_chance_name: row.SaleChance.name, - contact_name: row.contact.name + contact_name: row.contact.name, + serviceContractTypeId: row.serviceContractTypeId === 0 ? null : row.serviceContractTypeId, + serviceContractStatusId: row.serviceContractStatusId === 0 ? null : row.serviceContractStatusId } }, // 鍒犻櫎 -- Gitblit v1.8.0