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 | 28 +++++++++++++++++++++-------
1 files changed, 21 insertions(+), 7 deletions(-)
diff --git a/src/views/service/serviceContract/index.vue b/src/views/service/serviceContract/index.vue
index a6d125c..d56d3d6 100644
--- a/src/views/service/serviceContract/index.vue
+++ b/src/views/service/serviceContract/index.vue
@@ -199,12 +199,24 @@
async getData() {
this.loading = true
let params = {}
- if (this.addConfig.id) {
+ console.log(this.addConfig)
+ if (this.addConfig.id && this.addConfig.keywordType === "閿�鍞満浼�") {
+ params = {
+ saleChanceId: this.addConfig.id,
+ page: this.pagerOptions.currPage,
+ pageSize: this.pagerOptions.pageSize
+ }
+ } else if (this.addConfig.id && this.addConfig.keywordType === "閿�鍞槑缁嗗崟") {
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 = {
@@ -212,7 +224,7 @@
keywordType: this.keywordType,
page: this.pagerOptions.currPage,
pageSize: this.pagerOptions.pageSize,
- contactId:this.addConfig.client_id
+ contactId: this.addConfig.client_id
}
}
await getServiceContractList(params)
@@ -259,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: ""
}
@@ -277,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