From 8e5ec095fc4ba9cac7c91b681b06846d3e4155ae Mon Sep 17 00:00:00 2001
From: zuozhengqing <a13193816592@163.com>
Date: 星期一, 16 十月 2023 21:17:29 +0800
Subject: [PATCH] 销售明细，退货单、退款单根据客户进行筛选
---
src/views/other/payment/receipt/addReceipt.vue | 9 +++++----
src/views/other/payment/receipt/index.vue | 13 ++++++-------
src/views/sales/quotation/AddQuotationDialog.vue | 5 +++--
src/views/client/client/DetailClientManage.vue | 2 +-
src/views/other/commonDialog/SelectCommonDialog.vue | 5 ++++-
src/views/sales/salesReturn/AddSalesReturnDialog.vue | 5 +++++
src/views/sales/quotation/index.vue | 2 +-
src/views/sales/salesDetails/index.vue | 2 +-
8 files changed, 26 insertions(+), 17 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 c983bd5..4e6e01e 100644
--- a/src/views/other/commonDialog/SelectCommonDialog.vue
+++ b/src/views/other/commonDialog/SelectCommonDialog.vue
@@ -68,7 +68,8 @@
editVisible: false,
title: "",
clientId: 0,
- tableInfomation: [],
+ client_name: "",
+ tableInfomation: []
}
}
}
@@ -98,6 +99,8 @@
this.search_map = {
client_id: this.editConfig.clientId
}
+ this.keyword = this.editConfig.client_name
+ this.keywordType = "瀹㈡埛鍚嶇О"
this.setTable()
this.getData()
},
diff --git a/src/views/other/payment/receipt/addReceipt.vue b/src/views/other/payment/receipt/addReceipt.vue
index da78aa7..ed5daa4 100644
--- a/src/views/other/payment/receipt/addReceipt.vue
+++ b/src/views/other/payment/receipt/addReceipt.vue
@@ -87,10 +87,10 @@
</el-form-item>
</el-col>
<el-col v-else :span="12">
- <el-form-item label="鍚堝悓璁㈠崟">
+ <el-form-item label="閿�鍞槑缁嗗崟" prop="saleDetailNumber">
<div class="custom-name">
<el-autocomplete
- v-model="editConfig.infomation.number"
+ v-model="editConfig.infomation.saleDetailNumber"
:fetch-suggestions="
(queryString, callback) => {
querySearchAsync(queryString, callback, 'contract')
@@ -104,7 +104,7 @@
<i class="el-icon-circle-plus-outline" title="閫夋嫨"></i>
</div>
<div
- v-if="editConfig.infomation.number && editConfig.infomation.number.length > 0"
+ v-if="editConfig.infomation.saleDetailNumber && editConfig.infomation.saleDetailNumber.length > 0"
class="common-select-btn"
@click="clearupClient('contract')"
>
@@ -359,7 +359,8 @@
rules: {
client_name: [{ required: true, message: "璇烽�夋嫨瀹㈡埛鍚嶇О", trigger: "change" }],
signTime: [{ required: true, message: "璇烽�夋嫨鏀舵鏃ユ湡", trigger: "change" }],
- memberId: [{ required: true, message: "璇烽�夋嫨閿�鍞礋璐ｄ汉", trigger: "change" }]
+ memberId: [{ required: true, message: "璇烽�夋嫨閿�鍞礋璐ｄ汉", trigger: "change" }],
+ saleDetailNumber: [{ required: true, message: "璇烽�夋嫨閿�鍞槑缁嗗崟", trigger: "change" }]
// approvalOpinion: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }]
},
memberOptions: [],
diff --git a/src/views/other/payment/receipt/index.vue b/src/views/other/payment/receipt/index.vue
index 3e8365e..3270ab7 100644
--- a/src/views/other/payment/receipt/index.vue
+++ b/src/views/other/payment/receipt/index.vue
@@ -146,8 +146,7 @@
}
this.getData()
},
- mounted() {
- },
+ mounted() {},
methods: {
setTable() {
this.tableList = {
@@ -188,7 +187,7 @@
sourceType: sourceTyle,
page: this.pagerOptions.currPage,
pageSize: this.pagerOptions.pageSize,
- client_id:this.addConfig.client_id,
+ client_id: this.addConfig.client_id
}
} else {
params = {
@@ -196,13 +195,13 @@
keywordType: this.keywordType,
page: this.pagerOptions.currPage,
pageSize: this.pagerOptions.pageSize,
- client_id:this.addConfig.client_id,
+ client_id: this.addConfig.client_id
}
}
await getReceiptList(params)
.then((res) => {
- if (res.data.code === 200) {
- const resList = res?.data?.data?.data ?? []
+ if (res.code === 200) {
+ const resList = res?.data?.data ?? []
if (resList.length > 0) {
const list = resList.map((item) => {
return {
@@ -213,7 +212,7 @@
}
})
this.tableList.tableInfomation = list || []
- this.pagerOptions.totalCount = res.data.data.count
+ this.pagerOptions.totalCount = res.data.count
} else {
this.tableList.tableInfomation = []
}
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/salesDetails/index.vue b/src/views/sales/salesDetails/index.vue
index 1bf349f..1183936 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 44eef53..348e4f5 100644
--- a/src/views/sales/salesReturn/AddSalesReturnDialog.vue
+++ b/src/views/sales/salesReturn/AddSalesReturnDialog.vue
@@ -480,6 +480,7 @@
} else if (value === "contract") {
this.editSelCommonConfig.title = "閿�鍞槑缁嗗崟"
this.editSelCommonConfig.editVisible = true
+ this.editSelCommonConfig.client_name = this.editConfig.infomation.client_name
}
},
selClient(row, value) {
@@ -490,6 +491,8 @@
} else if (value === "contract") {
this.editConfig.infomation.salesDetailNumber = row.number
this.SalesDetailsId = row.id
+ this.productTableList.tableData = row.products
+ this.tableData = row.products
}
},
// 娓呴櫎宸查�夋嫨鐢ㄦ埛
@@ -499,6 +502,8 @@
this.clientId = 0
} else if (value === "contract") {
this.editConfig.infomation.salesDetailNumber = ""
+ this.productTableList.tableData = []
+ this.tableData = []
this.SalesDetailsId = 0
}
},
--
Gitblit v1.8.0