From ded9f2455ab4402d9d5902f25f2e447953b62725 Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期三, 03 一月 2024 10:29:23 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.5.5:10010/r/web/crm-web into dev
---
src/views/sales/subOrder/index.vue | 2 +-
src/views/client/followupRecords/index.vue | 2 +-
src/views/sales/salesOpportunity/index.vue | 2 +-
src/views/sales/masterOrder/index.vue | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/views/client/followupRecords/index.vue b/src/views/client/followupRecords/index.vue
index 4904afc..9a5954e 100644
--- a/src/views/client/followupRecords/index.vue
+++ b/src/views/client/followupRecords/index.vue
@@ -171,7 +171,7 @@
if (this.addConfig.keywordType === "閿�鍞満浼�") {
content = this.addConfig.id
} else {
- content = this.addConfig.common_name
+ content = this.addConfig.id
}
this.search_map = {
[this.addConfig.id_name]: content
diff --git a/src/views/sales/masterOrder/index.vue b/src/views/sales/masterOrder/index.vue
index 99aa01c..cfaa506 100644
--- a/src/views/sales/masterOrder/index.vue
+++ b/src/views/sales/masterOrder/index.vue
@@ -147,7 +147,7 @@
this.search_map = {}
} else {
this.search_map = {
- [this.addConfig.id_name]: this.addConfig.client_name
+ [this.addConfig.id_name]: this.addConfig.id
}
}
this.getData(this.search_map)
diff --git a/src/views/sales/salesOpportunity/index.vue b/src/views/sales/salesOpportunity/index.vue
index ef65de7..26cbea2 100644
--- a/src/views/sales/salesOpportunity/index.vue
+++ b/src/views/sales/salesOpportunity/index.vue
@@ -167,7 +167,7 @@
this.search_map = {}
} else {
this.search_map = {
- [this.addConfig.id_name]: this.addConfig.client_name
+ [this.addConfig.id_name]: this.addConfig.id
}
}
this.getData(this.search_map)
diff --git a/src/views/sales/subOrder/index.vue b/src/views/sales/subOrder/index.vue
index b85a61d..a26ce50 100644
--- a/src/views/sales/subOrder/index.vue
+++ b/src/views/sales/subOrder/index.vue
@@ -159,7 +159,7 @@
this.search_map = {}
} else {
this.search_map = {
- [this.addConfig.id_name]: this.addConfig.common_name
+ [this.addConfig.id_name]: this.addConfig.id
}
}
this.getData(this.search_map)
--
Gitblit v1.8.0