From 75e27a973b76fa78ff12b96b503487c3d7e33688 Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期三, 27 十二月 2023 16:06:13 +0800
Subject: [PATCH] Merge branch 'wn' of http://192.168.5.5:10010/r/web/crm-web into dev
---
src/views/other/commonDialog/SelectCommonDialog.vue | 104 +++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 90 insertions(+), 14 deletions(-)
diff --git a/src/views/other/commonDialog/SelectCommonDialog.vue b/src/views/other/commonDialog/SelectCommonDialog.vue
index 0f44348..4da1e9c 100644
--- a/src/views/other/commonDialog/SelectCommonDialog.vue
+++ b/src/views/other/commonDialog/SelectCommonDialog.vue
@@ -31,9 +31,10 @@
<TableCommonView
ref="tableListRef"
:table-list="tableList"
- :select-box="false"
+ :select-box="editCommonConfig.isSelectBox"
@selCommonClick="selNameClick"
@selTableCol="selTableCol"
+ @getSelectArray="getSelectArray"
>
</TableCommonView>
<div slot="footer" class="dialog-footer">
@@ -42,6 +43,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 +60,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,11 +71,19 @@
default: () => {
return {
editVisible: false,
+ isSelectBox:false,
title: "",
+ clientId: 0,
+ client_name: "",
tableInfomation: []
}
}
- }
+ },
+ // 鏍规嵁鎶ヤ环鍗曟煡璇骇鍝�
+ quotationNumber:{
+ type:[String,Number],
+ default:''
+ },
},
components: {},
computed: {},
@@ -89,10 +103,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()
},
@@ -182,7 +202,7 @@
this.searchSel = { value: "serviceNumber", label: "鏈嶅姟鍗曠紪鍙�" }
} else if (this.editConfig.title === "浜у搧鍚嶇О") {
this.tableColumn = [
- { label: "浜у搧鍚嶇О", prop: "name", isClick: true, default: true }, // 浜у搧鍚嶇О
+ { label: "浜у搧鍚嶇О", prop: "name", isClick: this.editCommonConfig.isSelectBox?false:true, default: true }, // 浜у搧鍚嶇О
{ label: "浜у搧缂栧彿", prop: "number" }
]
this.showCol = ["浜у搧鍚嶇О", "浜у搧缂栧彿"]
@@ -210,6 +230,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 +265,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 +290,8 @@
this.getProductList()
} else if (this.editConfig.title === "閿�鍞��璐у崟") {
this.getSalesReturnList()
+ } else if (this.editConfig.title === "閿�鍞瓙鍗�") {
+ this.getSubOrderList()
}
},
// 閿�鍞�诲崟
@@ -328,8 +372,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 +427,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 +457,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 +478,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 +524,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")
}
},
// 鎼滅储
--
Gitblit v1.8.0