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/sales/salesDetails/AddSalesDetailsDialog.vue | 71 +++++++++++++++++++++--------------
1 files changed, 43 insertions(+), 28 deletions(-)
diff --git a/src/views/sales/salesDetails/AddSalesDetailsDialog.vue b/src/views/sales/salesDetails/AddSalesDetailsDialog.vue
index 6166496..53cf0eb 100644
--- a/src/views/sales/salesDetails/AddSalesDetailsDialog.vue
+++ b/src/views/sales/salesDetails/AddSalesDetailsDialog.vue
@@ -115,7 +115,7 @@
querySearchAsync(queryString, callback, 'subbill')
}
"
- value-key="name"
+ value-key="number"
@select="handleSelectClient('subbill', $event)"
:disabled="isNameChanceEdit"
></el-autocomplete>
@@ -488,7 +488,8 @@
editSelectChanceConfig: {
editVisible: false,
title: "",
- infomation: {}
+ infomation: {},
+ search_map: {}
},
editSelCommonConfig: {
editVisible: false,
@@ -496,7 +497,7 @@
infomation: {}
},
clientId: this.editCommonConfig.infomation.client_id,
- saleChanceId: this.editCommonConfig.infomation.saleChanceId,
+ saleChanceId: this.editCommonConfig.infomation.sale_chance_id,
subbillId: this.editCommonConfig.infomation.subbillId,
productId: 1,
isNoProduct: true,
@@ -547,7 +548,7 @@
getAllData()
.then((res) => {
this.memberOptions = res.data.member
- this.dataProcess()
+ // this.dataProcess()
})
.catch((err) => {
console.log(err)
@@ -563,6 +564,7 @@
// 淇濆瓨
saveClick(formName) {
this.$refs[formName].validate((valid) => {
+ this.validateFormNumber()
if (valid) {
console.log(this.editConfig.infomation)
for (let i = 0; i < this.tableData.length; i++) {
@@ -660,38 +662,49 @@
} else if (value === "subbill") {
restaurants = this.subOrderList
}
- var results = queryString ? restaurants.filter(this.createStateFilter(queryString)) : restaurants
+ var results = queryString ? restaurants.filter(this.createStateFilter(queryString, value)) : restaurants
cb(results)
},
- createStateFilter(queryString) {
+ createStateFilter(queryString, value) {
return (state) => {
- return state.name.toLowerCase().indexOf(queryString.toLowerCase()) === 0
+ if (value === "subbill") {
+ return state.number.toLowerCase().indexOf(queryString.toLowerCase()) === 0
+ } else {
+ return state.name.toLowerCase().indexOf(queryString.toLowerCase()) === 0
+ }
}
},
- async handleSelectClient(value, item) {
+ // 閿�鍞満浼氬垪琛�
+ async getSaleChanceList(item) {
+ await getSaleChanceList({
+ page: 1,
+ pageSize: 15,
+ search_map: {
+ client_id: item.id
+ }
+ }).then((res) => {
+ console.log(res)
+ this.saleChancelist = res.data.list
+ })
+ },
+ // 閿�鍞瓙鍗曞垪琛�
+ async getSubOrderList(item) {
+ await getSubOrderList({
+ page: 1,
+ pageSize: 15,
+ search_map: {
+ client_id: item.id
+ }
+ }).then((res) => {
+ this.subOrderList = res.data.list
+ })
+ },
+ handleSelectClient(value, item) {
if (value === "client") {
this.clientId = item.id
this.editConfig.infomation.client_name = item.name
- // 闇�瑕佷慨鏀�
- await getSaleChanceList({
- page: 1,
- pageSize: 15,
- search_map: {
- client_id: item.id
- }
- }).then((res) => {
- console.log(res)
- this.saleChancelist = res.data.list
- })
- await getSubOrderList({
- page: 1,
- pageSize: 15,
- search_map: {
- client_id: item.id
- }
- }).then((res) => {
- this.subOrderList = res.data.list
- })
+ this.getSaleChanceList(item)
+ this.getSubOrderList(item)
} else if (value === "chance") {
this.saleChanceId = item.id
this.editConfig.infomation.client_name = item.name
@@ -717,6 +730,8 @@
if (value === "client") {
this.editConfig.infomation.client_name = row.name
this.clientId = row.id
+ this.getSaleChanceList(row)
+ this.getSubOrderList(row)
} else if (value === "chance") {
this.editConfig.infomation.sale_chance_name = row.name
this.saleChanceId = row.id
--
Gitblit v1.8.0