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 | 24 +++++++++++++++++++++---
1 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/src/views/other/commonDialog/SelectCommonDialog.vue b/src/views/other/commonDialog/SelectCommonDialog.vue
index aad1584..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>
@@ -66,6 +71,7 @@
default: () => {
return {
editVisible: false,
+ isSelectBox:false,
title: "",
clientId: 0,
client_name: "",
@@ -97,7 +103,8 @@
keyword: "",
keywordType: "",
tableColumn: [],
- showCol: []
+ showCol: [],
+ selectArray:[],
}
},
created() {
@@ -195,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 = ["浜у搧鍚嶇О", "浜у搧缂栧彿"]
@@ -257,6 +264,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() {
@@ -491,6 +506,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")
--
Gitblit v1.8.0