From fb20919d312b7f3bf81805eda670f42fa2d18e39 Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期三, 28 二月 2024 14:38:41 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/web/crm-web
---
src/views/other/commonDialog/SelectCommonDialog.vue | 87 +++++++++++++++++++++++--------------------
1 files changed, 47 insertions(+), 40 deletions(-)
diff --git a/src/views/other/commonDialog/SelectCommonDialog.vue b/src/views/other/commonDialog/SelectCommonDialog.vue
index 237f33b..3603f67 100644
--- a/src/views/other/commonDialog/SelectCommonDialog.vue
+++ b/src/views/other/commonDialog/SelectCommonDialog.vue
@@ -29,10 +29,11 @@
</div>
</div>
<TableCommonView
- class="bg-list"
+ class="bg-list"
ref="tableListRef"
:table-list="tableList"
:select-box="editCommonConfig.isSelectBox"
+ :selectBoxList="selectBoxList"
@selCommonClick="selNameClick"
@selTableCol="selTableCol"
@getSelectArray="getSelectArray"
@@ -72,20 +73,24 @@
default: () => {
return {
editVisible: false,
- isSelectBox:false,
+ isSelectBox: false,
title: "",
clientId: 0,
- isRequest:true,
+ isRequest: true,
client_name: "",
tableInfomation: []
}
}
},
// 鏍规嵁鎶ヤ环鍗曟煡璇骇鍝�
- quotationNumber:{
- type:[String,Number],
- default:''
+ quotationNumber: {
+ type: [String, Number],
+ default: ""
},
+ selectBoxList: {
+ type: Array,
+ default: () => []
+ }
},
components: {},
computed: {},
@@ -106,7 +111,7 @@
keywordType: "",
tableColumn: [],
showCol: [],
- selectArray:[],
+ selectArray: []
}
},
created() {
@@ -177,9 +182,9 @@
{ label: "瀹㈡埛鍚嶇О", prop: "client_name" },
{ label: "鎵�灞炰笟鍔℃満浼�", prop: "sale_chance_name" },
{ label: "鎶ヤ环鍗曠姸鎬�", prop: "quotationStatus" },
- { label: "鍚堣", prop: "amountTotal" },
+ { label: "鍚堣", prop: "amountTotal" }
]
- this.showCol = ["鎶ヤ环鍗曞彿","鎶ヤ环鍚嶇О","閿�鍞礋璐ｄ汉",'瀹㈡埛鍚嶇О','鎵�灞炰笟鍔℃満浼�','鎶ヤ环鍗曠姸鎬�','鍚堣']
+ this.showCol = ["鎶ヤ环鍗曞彿", "鎶ヤ环鍚嶇О", "閿�鍞礋璐ｄ汉", "瀹㈡埛鍚嶇О", "鎵�灞炰笟鍔℃満浼�", "鎶ヤ环鍗曠姸鎬�", "鍚堣"]
this.tableList = {
selectIndex: true,
@@ -210,12 +215,14 @@
this.searchSel = { value: "serviceNumber", label: "鏈嶅姟鍗曠紪鍙�" }
} else if (this.editConfig.title === "浜у搧鍚嶇О") {
this.tableColumn = [
- { label: "浜у搧鍚嶇О", prop: "name", isClick: this.editCommonConfig.isSelectBox?false:true, default: true }, // 浜у搧鍚嶇О
+ { label: "浜у搧鍚嶇О", prop: "name", isClick: this.editCommonConfig.isSelectBox ? false : true, default: true }, // 浜у搧鍚嶇О
{ label: "浜у搧缂栧彿", prop: "number" },
- { label: "瑙勬牸", prop: "specs" },
+ { label: "閿�鍞崟浠�", prop: "price" },
+ { label: "鍗曚綅", prop: "unit" },
+ { label: "浜у搧瑙勬牸", prop: "specs" },
{ label: "鍨嬪彿", prop: "type" }
]
- this.showCol = ["浜у搧鍚嶇О", "浜у搧缂栧彿",'瑙勬牸','鍨嬪彿']
+ this.showCol = ["浜у搧鍚嶇О", "浜у搧缂栧彿", "閿�鍞崟浠�", "鍗曚綅", "浜у搧瑙勬牸", "鍨嬪彿"]
this.tableList = {
selectIndex: true,
tableInfomation: [],
@@ -276,11 +283,11 @@
this.tableList.tableColumn = this.setColumnVisible(val)
},
// 鍒楄〃澶氶��
- getSelectArray(val){
- this.selectArray=val;
+ getSelectArray(val) {
+ this.selectArray = val
},
- saveClick(){
- this.$emit('getSelectArray',this.selectArray)
+ saveClick() {
+ this.$emit("getSelectArray", this.selectArray)
this.editConfig.editVisible = false
},
// 璇锋眰鏁版嵁
@@ -357,18 +364,18 @@
},
// 鎶ヤ环鍗�
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;
+ 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,
@@ -398,7 +405,7 @@
// 閿�鍞槑缁嗗崟
async getSalesDetailsList() {
await getSalesDetailsList({
- clientId:Number(this.editCommonConfig.clientId),
+ clientId: Number(this.editCommonConfig.clientId),
page: this.pagerOptions.currPage,
pageSize: this.pagerOptions.pageSize
}).then((res) => {
@@ -453,15 +460,15 @@
},
// 浜у搧鍚嶇О
async getProductList() {
- let params={
+ let params = {
productName: this.keywordType === "浜у搧鍚嶇О" ? this.keyword : "",
productNumber: this.keywordType === "浜у搧缂栧彿" ? this.keyword : "",
page: this.pagerOptions.currPage,
pageSize: this.pagerOptions.pageSize
}
- // 鏍规嵁鎶ヤ环鍗曟煡璇骇鍝�
- if(this.quotationNumber){
- params.quotationNumber=this.quotationNumber
+ // 鏍规嵁鎶ヤ环鍗曟煡璇骇鍝�
+ if (this.quotationNumber) {
+ params.quotationNumber = this.quotationNumber
}
await getProductList(params).then((res) => {
console.log(res.data)
@@ -483,7 +490,7 @@
},
async getSalesReturnList() {
await getSalesReturnList({
- clientId:Number(this.editCommonConfig.clientId),
+ clientId: Number(this.editCommonConfig.clientId),
page: this.pagerOptions.currPage,
pageSize: this.pagerOptions.pageSize
}).then((res) => {
@@ -532,8 +539,8 @@
this.editConfig.editVisible = false
},
selNameClick(row) {
- if(this.editCommonConfig.isSelectBox){
- return true;
+ if (this.editCommonConfig.isSelectBox) {
+ return true
}
this.editConfig.editVisible = false
if (this.editConfig.title === "閿�鍞�诲崟") {
@@ -578,9 +585,9 @@
<style lang="scss" scoped>
.bg-view {
margin: 10px;
- .bg-list{
- min-height:370px;
- }
+ .bg-list {
+ min-height: 370px;
+ }
.query-bg {
margin-left: -20px;
margin-bottom: 10px;
@@ -592,7 +599,7 @@
width: 100px;
}
}
-
+
.btn {
float: right;
}
--
Gitblit v1.8.0