From d3c0cce8e77ea1986b2cd0c82135d926f1e2137a Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期二, 17 十月 2023 10:39:34 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.5.5:10010/r/web/crm-web into zhengwenfeng/modify-style
---
src/views/sales/quotation/AddQuotationDialog.vue | 5 +++--
src/views/client/client/DetailClientManage.vue | 2 +-
src/views/sales/salesDetails/AddSalesDetailsDialog.vue | 3 ++-
src/views/other/commonDialog/SelectCommonDialog.vue | 10 ++++++----
src/views/sales/salesReturn/AddSalesReturnDialog.vue | 4 +++-
src/views/sales/refundForm/AddRefundFormDialog.vue | 4 +++-
src/views/sales/quotation/index.vue | 2 +-
src/views/sales/salesDetails/index.vue | 2 +-
8 files changed, 20 insertions(+), 12 deletions(-)
diff --git a/src/views/client/client/DetailClientManage.vue b/src/views/client/client/DetailClientManage.vue
index 3184063..5f31ccf 100644
--- a/src/views/client/client/DetailClientManage.vue
+++ b/src/views/client/client/DetailClientManage.vue
@@ -269,7 +269,7 @@
this.getContactList()
this.setData(this.detailConfig.infomation)
this.addConfig = {
- id_name: "client_name",
+ id_name: "client_id",
keywordType: "瀹㈡埛鍚嶇О",
keyword: this.detailConfig.infomation.name,
id: this.detailConfig.infomation.id,
diff --git a/src/views/other/commonDialog/SelectCommonDialog.vue b/src/views/other/commonDialog/SelectCommonDialog.vue
index e829aa8..4e6e01e 100644
--- a/src/views/other/commonDialog/SelectCommonDialog.vue
+++ b/src/views/other/commonDialog/SelectCommonDialog.vue
@@ -352,8 +352,9 @@
// 閿�鍞槑缁嗗崟
async getSalesDetailsList() {
await getSalesDetailsList({
- keyword: this.keyword,
- keywordType: this.keywordType,
+ // keyword: this.keyword,
+ // keywordType: this.keywordType,
+ clientId:this.editCommonConfig.clientId,
page: this.pagerOptions.currPage,
pageSize: this.pagerOptions.pageSize
}).then((res) => {
@@ -433,8 +434,9 @@
},
async getSalesReturnList() {
await getSalesReturnList({
- keyword: this.keyword,
- keywordType: this.keywordType,
+ // keyword: this.keyword,
+ // keywordType: this.keywordType,
+ clientId:this.editCommonConfig.clientId,
page: this.pagerOptions.currPage,
pageSize: this.pagerOptions.pageSize
}).then((res) => {
diff --git a/src/views/sales/quotation/AddQuotationDialog.vue b/src/views/sales/quotation/AddQuotationDialog.vue
index bb91971..871458c 100644
--- a/src/views/sales/quotation/AddQuotationDialog.vue
+++ b/src/views/sales/quotation/AddQuotationDialog.vue
@@ -358,7 +358,7 @@
number: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
quotationName: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
quotation_status_id: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
- sale_chance_name: [{ required: true, validator: this.checkChance, trigger: "blur" }],
+ sale_chance_name: [{ required: true, validator: this.checkChance, trigger: "change" }],
member_id: [{ required: true, message: "璇烽�夋嫨璐熻矗浜�", trigger: "change" }]
},
memberOptions: [],
@@ -506,7 +506,8 @@
validity_date: data.validity_date || "",
products: this.tableData,
codeStandID: data.ID,
- codeRule: this.codeRule
+ codeRule: this.codeRule,
+ client_id: this.clientId || 0,
}
return params
},
diff --git a/src/views/sales/quotation/index.vue b/src/views/sales/quotation/index.vue
index 38ae9fc..c07c880 100644
--- a/src/views/sales/quotation/index.vue
+++ b/src/views/sales/quotation/index.vue
@@ -224,9 +224,9 @@
},
// 鏂板缓
addBtnClick() {
- this.editConfig.visible = true
this.editConfig.title = "鏂板缓"
this.editConfig.infomation = { ...this.addConfig, currency: "浜烘皯甯�" }
+ this.editConfig.visible = true
},
// 缂栬緫
handleClick(row) {
diff --git a/src/views/sales/refundForm/AddRefundFormDialog.vue b/src/views/sales/refundForm/AddRefundFormDialog.vue
index 1211ce1..0402e2c 100644
--- a/src/views/sales/refundForm/AddRefundFormDialog.vue
+++ b/src/views/sales/refundForm/AddRefundFormDialog.vue
@@ -374,7 +374,8 @@
editSelCommonConfig: {
editVisible: false,
title: "",
- infomation: {}
+ infomation: {},
+ clientId:""
},
clientId: this.editCommonConfig.infomation.client_id,
sourceId: this.editCommonConfig.infomation.sourceId,
@@ -515,6 +516,7 @@
async handleSelectClient(value, item) {
if (value === "client") {
this.clientId = item.id
+ this.editSelCommonConfig.clientId=item.id
console.log("瀹㈡埛鍚嶇О",this.clientId,value,item)
await getSalesReturnList({
clientId:this.clientId
diff --git a/src/views/sales/salesDetails/AddSalesDetailsDialog.vue b/src/views/sales/salesDetails/AddSalesDetailsDialog.vue
index bb80f1f..ee35820 100644
--- a/src/views/sales/salesDetails/AddSalesDetailsDialog.vue
+++ b/src/views/sales/salesDetails/AddSalesDetailsDialog.vue
@@ -488,7 +488,8 @@
editSelectChanceConfig: {
editVisible: false,
title: "",
- infomation: {}
+ infomation: {},
+ search_map: {}
},
editSelCommonConfig: {
editVisible: false,
diff --git a/src/views/sales/salesDetails/index.vue b/src/views/sales/salesDetails/index.vue
index a9594e3..914a8bd 100644
--- a/src/views/sales/salesDetails/index.vue
+++ b/src/views/sales/salesDetails/index.vue
@@ -239,7 +239,7 @@
let params = {}
if (this.addConfig.id) {
params = {
- saleChanceId: this.addConfig.id,
+ clientId: this.addConfig.id,
page: this.pagerOptions.currPage,
pageSize: this.pagerOptions.pageSize
}
diff --git a/src/views/sales/salesReturn/AddSalesReturnDialog.vue b/src/views/sales/salesReturn/AddSalesReturnDialog.vue
index c09db0d..348e4f5 100644
--- a/src/views/sales/salesReturn/AddSalesReturnDialog.vue
+++ b/src/views/sales/salesReturn/AddSalesReturnDialog.vue
@@ -308,7 +308,8 @@
editSelCommonConfig: {
editVisible: false,
title: "",
- infomation: {}
+ infomation: {},
+ clientId:""
},
productId: 1,
isNoProduct: true,
@@ -459,6 +460,7 @@
async handleSelectClient(value, item) {
if (value === "client") {
this.clientId = item.id
+ this.editSelCommonConfig.clientId=item.id
await getSalesDetailsList({
clientId: this.clientId
}).then((res) => {
--
Gitblit v1.8.0