From 393ddcd51f0d588d13c6f5adc20e866aad259775 Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期一, 16 十月 2023 19:02:42 +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 | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/src/views/service/serviceContract/index.vue b/src/views/service/serviceContract/index.vue
index c43c20c..7bc06b1 100644
--- a/src/views/service/serviceContract/index.vue
+++ b/src/views/service/serviceContract/index.vue
@@ -210,8 +210,13 @@
params = {
salesDetailsId: this.addConfig.id,
page: this.pagerOptions.currPage,
- pageSize: this.pagerOptions.pageSize,
- contactId: this.addConfig.client_id
+ pageSize: this.pagerOptions.pageSize
+ }
+ } else if (this.addConfig.id && this.addConfig.keywordType === "鎶ヤ环鍗�") {
+ params = {
+ quotationId: this.addConfig.id,
+ page: this.pagerOptions.currPage,
+ pageSize: this.pagerOptions.pageSize
}
} else {
params = {
@@ -284,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