From 6be75d9f734ca3cfe1056fbe2b5556b7cf142cf9 Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期三, 28 二月 2024 14:51:43 +0800
Subject: [PATCH] 销售明细单 选择了销售报价单之后带出对应的产品列表，切换或者清空操作的时候清空产品管理，并修改
---
src/views/other/commonDialog/SelectCommonDialog.vue | 149 +++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 131 insertions(+), 18 deletions(-)
diff --git a/src/views/other/commonDialog/SelectCommonDialog.vue b/src/views/other/commonDialog/SelectCommonDialog.vue
index 0f44348..3603f67 100644
--- a/src/views/other/commonDialog/SelectCommonDialog.vue
+++ b/src/views/other/commonDialog/SelectCommonDialog.vue
@@ -29,11 +29,14 @@
</div>
</div>
<TableCommonView
+ class="bg-list"
ref="tableListRef"
:table-list="tableList"
- :select-box="false"
+ :select-box="editCommonConfig.isSelectBox"
+ :selectBoxList="selectBoxList"
@selCommonClick="selNameClick"
@selTableCol="selTableCol"
+ @getSelectArray="getSelectArray"
>
</TableCommonView>
<div slot="footer" class="dialog-footer">
@@ -42,6 +45,10 @@
<PagerView class="page" :pager-options="pagerOptions" v-on="pagerEvents" />
</div>
</div>
+ </div>
+ <div slot="footer" class="dialog-footer" v-if="editCommonConfig.isSelectBox">
+ <el-button type="primary" size="small" @click="saveClick()">纭畾</el-button>
+ <el-button size="small" @click="editConfig.editVisible = false">鍙栨秷</el-button>
</div>
</el-dialog>
</div>
@@ -55,6 +62,7 @@
import { getServiceOrderList } from "@/api/serviceManage/clientServiceOrder"
import { getProductList } from "@/api/common/other"
import { getSalesReturnList } from "@/api/sales/salesReturn"
+import { getSubOrderList } from "@/api/sales/subOrder"
import pageMixin from "@/components/makepager/pager/mixin/pageMixin"
export default {
name: "EditSelCommonDialog",
@@ -65,10 +73,23 @@
default: () => {
return {
editVisible: false,
+ isSelectBox: false,
title: "",
+ clientId: 0,
+ isRequest: true,
+ client_name: "",
tableInfomation: []
}
}
+ },
+ // 鏍规嵁鎶ヤ环鍗曟煡璇骇鍝�
+ quotationNumber: {
+ type: [String, Number],
+ default: ""
+ },
+ selectBoxList: {
+ type: Array,
+ default: () => []
}
},
components: {},
@@ -89,10 +110,16 @@
keyword: "",
keywordType: "",
tableColumn: [],
- showCol: []
+ showCol: [],
+ selectArray: []
}
},
created() {
+ this.search_map = {
+ client_id: this.editConfig.clientId
+ }
+ this.keyword = this.editConfig.client_name
+ this.keywordType = "瀹㈡埛鍚嶇О"
this.setTable()
this.getData()
},
@@ -150,11 +177,17 @@
} else if (this.editConfig.title === "鎶ヤ环鍗�") {
this.tableColumn = [
{ label: "鎶ヤ环鍗曞彿", prop: "number", isClick: true, default: true }, // 鎶ヤ环鍗曞彿
- { label: "閿�鍞礋璐ｄ汉", prop: "member_name" } // 閿�鍞礋璐ｄ汉
+ { label: "鎶ヤ环鍚嶇О", prop: "quotationName" },
+ { label: "閿�鍞礋璐ｄ汉", prop: "member_name" }, // 閿�鍞礋璐ｄ汉
+ { label: "瀹㈡埛鍚嶇О", prop: "client_name" },
+ { label: "鎵�灞炰笟鍔℃満浼�", prop: "sale_chance_name" },
+ { label: "鎶ヤ环鍗曠姸鎬�", prop: "quotationStatus" },
+ { label: "鍚堣", prop: "amountTotal" }
]
- this.showCol = ["鎶ヤ环鍗曞彿", "閿�鍞礋璐ｄ汉"]
+ this.showCol = ["鎶ヤ环鍗曞彿", "鎶ヤ环鍚嶇О", "閿�鍞礋璐ｄ汉", "瀹㈡埛鍚嶇О", "鎵�灞炰笟鍔℃満浼�", "鎶ヤ环鍗曠姸鎬�", "鍚堣"]
this.tableList = {
selectIndex: true,
+
tableInfomation: [],
allcol: [],
showcol: this.showCol,
@@ -182,10 +215,14 @@
this.searchSel = { value: "serviceNumber", label: "鏈嶅姟鍗曠紪鍙�" }
} else if (this.editConfig.title === "浜у搧鍚嶇О") {
this.tableColumn = [
- { label: "浜у搧鍚嶇О", prop: "name", isClick: true, default: true }, // 浜у搧鍚嶇О
- { label: "浜у搧缂栧彿", prop: "number" }
+ { label: "浜у搧鍚嶇О", prop: "name", isClick: this.editCommonConfig.isSelectBox ? false : true, default: true }, // 浜у搧鍚嶇О
+ { label: "浜у搧缂栧彿", prop: "number" },
+ { label: "閿�鍞崟浠�", prop: "price" },
+ { label: "鍗曚綅", prop: "unit" },
+ { label: "浜у搧瑙勬牸", prop: "specs" },
+ { label: "鍨嬪彿", prop: "type" }
]
- this.showCol = ["浜у搧鍚嶇О", "浜у搧缂栧彿"]
+ this.showCol = ["浜у搧鍚嶇О", "浜у搧缂栧彿", "閿�鍞崟浠�", "鍗曚綅", "浜у搧瑙勬牸", "鍨嬪彿"]
this.tableList = {
selectIndex: true,
tableInfomation: [],
@@ -210,6 +247,20 @@
tableColumn: this.setColumnVisible(this.showCol)
}
this.searchSel = { value: "number", label: "閿�鍞��璐у崟缂栧彿" }
+ } else if (this.editConfig.title === "閿�鍞瓙鍗�") {
+ this.tableColumn = [
+ { label: "鍗曟嵁缂栧彿", prop: "number", isClick: true, default: true }, // 鍗曟嵁缂栧彿
+ { label: "璐熻矗浜�", prop: "member_name" } // 璐熻矗浜�
+ ]
+ this.showCol = ["鍗曟嵁缂栧彿", "璐熻矗浜�"]
+ this.tableList = {
+ selectIndex: true,
+ tableInfomation: [],
+ allcol: [],
+ showcol: this.showCol,
+ tableColumn: this.setColumnVisible(this.showCol)
+ }
+ this.searchSel = { value: "number", label: "鍗曟嵁缂栧彿" }
}
this.tableList.allcol = this.tableList.tableColumn.filter((ele) => !ele.default).map((ele) => ele.label)
this.searchOptions = []
@@ -231,6 +282,14 @@
this.showcol = val
this.tableList.tableColumn = this.setColumnVisible(val)
},
+ // 鍒楄〃澶氶��
+ getSelectArray(val) {
+ this.selectArray = val
+ },
+ saveClick() {
+ this.$emit("getSelectArray", this.selectArray)
+ this.editConfig.editVisible = false
+ },
// 璇锋眰鏁版嵁
async getData() {
this.loading = true
@@ -248,6 +307,8 @@
this.getProductList()
} else if (this.editConfig.title === "閿�鍞��璐у崟") {
this.getSalesReturnList()
+ } else if (this.editConfig.title === "閿�鍞瓙鍗�") {
+ this.getSubOrderList()
}
},
// 閿�鍞�诲崟
@@ -303,6 +364,19 @@
},
// 鎶ヤ环鍗�
async getQuotationList() {
+ if (!this.editConfig.isRequest) {
+ this.tableList.tableInfomation = this.editConfig.tableInfomation.map((item) => {
+ return {
+ ...item,
+ client_name: item.client.name,
+ sale_chance_name: item.sale_chance.name,
+ member_name: item.member.username,
+ quotationStatus: item.quotation_status.name
+ }
+ })
+ this.pagerOptions.totalCount = this.editConfig.count ? this.editConfig.count : 0
+ return true
+ }
await getQuotationList({
search_map: this.search_map,
page: this.pagerOptions.currPage,
@@ -313,7 +387,10 @@
const list = res.data.list.map((item) => {
return {
...item,
- member_name: item.member.username
+ client_name: item.client.name,
+ sale_chance_name: item.sale_chance.name,
+ member_name: item.member.username,
+ quotationStatus: item.quotation_status.name
}
})
this.tableList.tableInfomation = list || []
@@ -328,8 +405,7 @@
// 閿�鍞槑缁嗗崟
async getSalesDetailsList() {
await getSalesDetailsList({
- keyword: this.keyword,
- keywordType: this.keywordType,
+ clientId: Number(this.editCommonConfig.clientId),
page: this.pagerOptions.currPage,
pageSize: this.pagerOptions.pageSize
}).then((res) => {
@@ -384,22 +460,27 @@
},
// 浜у搧鍚嶇О
async getProductList() {
- await getProductList({
+ let params = {
productName: this.keywordType === "浜у搧鍚嶇О" ? this.keyword : "",
productNumber: this.keywordType === "浜у搧缂栧彿" ? this.keyword : "",
page: this.pagerOptions.currPage,
pageSize: this.pagerOptions.pageSize
- }).then((res) => {
+ }
+ // 鏍规嵁鎶ヤ环鍗曟煡璇骇鍝�
+ if (this.quotationNumber) {
+ params.quotationNumber = this.quotationNumber
+ }
+ await getProductList(params).then((res) => {
console.log(res.data)
- if (res.data.code === 200) {
- if (res.data.data.data && res.data.data.data.length > 0) {
- const list = res.data.data.data.map((item) => {
+ if (res.code === 200) {
+ if (res.data.data && res.data.data.length > 0) {
+ const list = res.data.data.map((item) => {
return {
...item
}
})
this.tableList.tableInfomation = list || []
- this.pagerOptions.totalCount = res.data.data.count
+ this.pagerOptions.totalCount = res.data.count
} else {
this.tableList.tableInfomation = []
}
@@ -409,8 +490,7 @@
},
async getSalesReturnList() {
await getSalesReturnList({
- keyword: this.keyword,
- keywordType: this.keywordType,
+ clientId: Number(this.editCommonConfig.clientId),
page: this.pagerOptions.currPage,
pageSize: this.pagerOptions.pageSize
}).then((res) => {
@@ -431,10 +511,37 @@
this.loading = false
})
},
+ // 閿�鍞瓙鍗�
+ async getSubOrderList() {
+ await getSubOrderList({
+ search_map: this.search_map,
+ page: this.pagerOptions.currPage,
+ pageSize: this.pagerOptions.pageSize
+ }).then((res) => {
+ if (res.code === 200) {
+ if (res.data.list && res.data.list.length > 0) {
+ const list = res.data.list.map((item) => {
+ return {
+ ...item,
+ member_name: item.member.username
+ }
+ })
+ this.tableList.tableInfomation = list || []
+ this.pagerOptions.totalCount = res.data.count
+ } else {
+ this.tableList.tableInfomation = []
+ }
+ }
+ this.loading = false
+ })
+ },
handleClose() {
this.editConfig.editVisible = false
},
selNameClick(row) {
+ if (this.editCommonConfig.isSelectBox) {
+ return true
+ }
this.editConfig.editVisible = false
if (this.editConfig.title === "閿�鍞�诲崟") {
this.$emit("selClient", row, "master")
@@ -450,6 +557,8 @@
this.$emit("selClient", row, "productName")
} else if (this.editConfig.title === "閿�鍞��璐у崟") {
this.$emit("selClient", row, "salesReturn")
+ } else if (this.editConfig.title === "閿�鍞瓙鍗�") {
+ this.$emit("selClient", row, "subbill")
}
},
// 鎼滅储
@@ -476,6 +585,9 @@
<style lang="scss" scoped>
.bg-view {
margin: 10px;
+ .bg-list {
+ min-height: 370px;
+ }
.query-bg {
margin-left: -20px;
margin-bottom: 10px;
@@ -487,6 +599,7 @@
width: 100px;
}
}
+
.btn {
float: right;
}
--
Gitblit v1.8.0