From 441f8436a70c22fba6f25154f2f38a072c85b76b Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期二, 27 二月 2024 18:45:02 +0800
Subject: [PATCH] 公共选择产品弹窗相关页面修改
---
src/views/other/commonDialog/SelectCommonDialog.vue | 70 ++++++++++++++++++++++++++++-------
1 files changed, 56 insertions(+), 14 deletions(-)
diff --git a/src/views/other/commonDialog/SelectCommonDialog.vue b/src/views/other/commonDialog/SelectCommonDialog.vue
index aad1584..4158cc9 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>
@@ -66,18 +73,24 @@
default: () => {
return {
editVisible: false,
+ isSelectBox: false,
title: "",
clientId: 0,
+ isRequest: true,
client_name: "",
tableInfomation: []
}
}
},
// 鏍规嵁鎶ヤ环鍗曟煡璇骇鍝�
- quotationNumber:{
- type:[String,Number],
- default:''
+ quotationNumber: {
+ type: [String, Number],
+ default: ""
},
+ selectBoxList: {
+ type: Array,
+ default: () => []
+ }
},
components: {},
computed: {},
@@ -97,7 +110,8 @@
keyword: "",
keywordType: "",
tableColumn: [],
- showCol: []
+ showCol: [],
+ selectArray: []
}
},
created() {
@@ -168,6 +182,7 @@
this.showCol = ["鎶ヤ环鍗曞彿", "閿�鍞礋璐ｄ汉"]
this.tableList = {
selectIndex: true,
+
tableInfomation: [],
allcol: [],
showcol: this.showCol,
@@ -195,10 +210,12 @@
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: "specs" },
+ { label: "鍨嬪彿", prop: "type" }
]
- this.showCol = ["浜у搧鍚嶇О", "浜у搧缂栧彿"]
+ this.showCol = ["浜у搧鍚嶇О", "浜у搧缂栧彿", "瑙勬牸", "鍨嬪彿"]
this.tableList = {
selectIndex: true,
tableInfomation: [],
@@ -257,6 +274,14 @@
selTableCol(val) {
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() {
@@ -332,6 +357,16 @@
},
// 鎶ヤ环鍗�
async getQuotationList() {
+ if (!this.editConfig.isRequest) {
+ this.tableList.tableInfomation = this.editConfig.tableInfomation.map((item) => {
+ return {
+ ...item,
+ member_name: item.member.username
+ }
+ })
+ this.pagerOptions.totalCount = this.editConfig.count ? this.editConfig.count : 0
+ return true
+ }
await getQuotationList({
search_map: this.search_map,
page: this.pagerOptions.currPage,
@@ -357,7 +392,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) => {
@@ -412,15 +447,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)
@@ -442,7 +477,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) => {
@@ -491,6 +526,9 @@
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")
@@ -534,6 +572,9 @@
<style lang="scss" scoped>
.bg-view {
margin: 10px;
+ .bg-list {
+ min-height: 370px;
+ }
.query-bg {
margin-left: -20px;
margin-bottom: 10px;
@@ -545,6 +586,7 @@
width: 100px;
}
}
+
.btn {
float: right;
}
--
Gitblit v1.8.0