From 5d0120d2e8a6e5cd2e1e95d4c5ffeecf5fc1c4a6 Mon Sep 17 00:00:00 2001
From: songshankun <songshankun@foxmail.com>
Date: 星期二, 10 十月 2023 15:35:58 +0800
Subject: [PATCH] Merge branch 'dev' into songshankun/adjust-style
---
src/views/sales/salesReturn/index.vue | 57 +++++++++++++++++++++++++++++++++------------------------
1 files changed, 33 insertions(+), 24 deletions(-)
diff --git a/src/views/sales/salesReturn/index.vue b/src/views/sales/salesReturn/index.vue
index 59630cb..83e3008 100644
--- a/src/views/sales/salesReturn/index.vue
+++ b/src/views/sales/salesReturn/index.vue
@@ -16,7 +16,7 @@
>
<template slot="leftButton">
<el-button size="small" type="primary" @click="addBtnClick">鏂板缓</el-button>
- <el-button size="small" @click="delClick">鍒犻櫎</el-button>
+ <!-- <el-button size="small" @click="delClick">鍒犻櫎</el-button> -->
</template>
</CommonSearch>
</div>
@@ -28,16 +28,16 @@
<TableCommonView
ref="tableListRef"
:table-list="tableList"
- :select-box="!isDetail"
@selClientClick="selClientClick"
@selCommonClick="selCommonClick"
@getSelectArray="getSelectArray"
+ @selTableCol="selTableCol"
>
<template slot="tableButton">
<el-table-column label="鎿嶄綔" width="90">
<template slot-scope="scope">
<el-button @click="handleClick(scope.row)" type="text" size="small">缂栬緫</el-button>
- <!-- <el-button @click="delClick(scope.row.id)" type="text" size="small">鍒犻櫎</el-button> -->
+ <el-button @click="delClick(scope.row.id)" type="text" size="small">鍒犻櫎</el-button>
</template>
</el-table-column>
</template>
@@ -129,7 +129,19 @@
label: "閿�鍞��璐у崟缂栧彿"
},
keyword: "",
- keywordType: ""
+ keywordType: "",
+ tableColumn: [
+ { label: "閿�鍞��璐у崟缂栧彿", prop: "number", min: 120, isCommonClick: true ,default:true },
+ { label: "瀹㈡埛鍚嶇О", prop: "client_name", min: 90, isClientClick: true },
+ { label: "閫�璐ф棩鏈�", prop: "returnDate", min: 130 },
+ { label: "鐘舵��", prop: "salesReturnStatus_name" },
+ { label: "閫�鍏ヤ粨搴�", prop: "repository" },
+ { label: "搴旈��娆�", prop: "refundabe" },
+ { label: "宸查��娆�", prop: "refunded" },
+ { label: "閿�鍞礋璐ｄ汉", prop: "member_name" }
+ // { label: "淇敼鏃堕棿", prop: "modifyTime", isTime: true, min: 130 }
+ ],
+ showCol:["閿�鍞��璐у崟缂栧彿", "瀹㈡埛鍚嶇О", "閫�璐ф棩鏈�", "鐘舵��", "閫�鍏ヤ粨搴�", "搴旈��娆�", "宸查��娆�", "閿�鍞礋璐ｄ汉"]
}
},
created() {
@@ -146,25 +158,31 @@
methods: {
setTable() {
this.tableList = {
+ selectIndex: true,
tableInfomation: [],
- tableColumn: [
- { label: "閿�鍞��璐у崟缂栧彿", prop: "number", min: 120, isCommonClick: true },
- { label: "瀹㈡埛鍚嶇О", prop: "client_name", min: 90, isClientClick: true },
- { label: "閫�璐ф棩鏈�", prop: "returnDate", min: 130 },
- { label: "鐘舵��", prop: "salesReturnStatus_name" },
- { label: "閫�鍏ヤ粨搴�", prop: "repository" },
- { label: "搴旈��娆�", prop: "refundabe" },
- { label: "宸查��娆�", prop: "refunded" },
- { label: "閿�鍞礋璐ｄ汉", prop: "member_name" }
- // { label: "淇敼鏃堕棿", prop: "modifyTime", isTime: true, min: 130 }
- ]
+ allcol: [],
+ showcol: this.showCol,
+ tableColumn:this.setColumnVisible(this.showCol)
}
+ this.tableList.allcol = this.tableList.tableColumn.filter(ele=>!ele.default).map(ele=>ele.label);
this.searchOptions = []
for (let i = 0; i < this.tableList.tableColumn.length; i++) {
const label = this.tableList.tableColumn[i].label
const value = this.tableList.tableColumn[i].prop
this.searchOptions.push({ value: value, label: label })
}
+ },
+ setColumnVisible(showCol){
+ return this.tableColumn.map(ele=>{
+ return {
+ ...ele,
+ isShowColumn:showCol.includes(ele.label)
+ }
+ })
+ },
+ selTableCol(val) {
+ this.showcol = val;
+ this.tableList.tableColumn = this.setColumnVisible(val);
},
// 璇锋眰鏁版嵁
async getData() {
@@ -307,15 +325,6 @@
border-radius: 12px;
height: 100%;
overflow: hidden;
- }
-
- .supplier-search {
- display: flex;
- align-items: center;
- .add-view {
- margin-left: auto;
- margin-right: 20px;
- }
}
.list-view {
height: calc(100% - 60px);
--
Gitblit v1.8.0