From 01cea4bc73210e43f748d82a02a432cce615be2d Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期二, 24 十月 2023 17:52:04 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.5.5:10010/r/web/crm-web into wn
---
src/views/sales/subOrder/index.vue | 88 +++++++++++++++++++++++++++++--------------
1 files changed, 59 insertions(+), 29 deletions(-)
diff --git a/src/views/sales/subOrder/index.vue b/src/views/sales/subOrder/index.vue
index f2dff7f..b85a61d 100644
--- a/src/views/sales/subOrder/index.vue
+++ b/src/views/sales/subOrder/index.vue
@@ -8,15 +8,13 @@
<div class="filter-card">
<CommonSearch
:show-add="false"
- :show-download="false"
:amount-view="false"
- :show-action-btn="false"
placeholder="璇疯緭鍏ュ崟鎹紪鍙�"
@searchClick="onFilterSearch"
>
<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>
@@ -29,17 +27,17 @@
ref="tableListRef"
:table-list="tableList"
:show-summary="showSummary"
- :select-box="!isDetail"
@selClientClick="selClientClick"
@selMasterClick="selMasterClick"
@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="deleteItem(scope.row.id)" type="text" size="small">鍒犻櫎</el-button>
</template>
</el-table-column>
</template>
@@ -121,7 +119,7 @@
infomation: {}
},
showSummary: {
- show: true,
+ show: false,
sumProp: ["productAmount"],
mergeNumber: 6
},
@@ -142,7 +140,17 @@
searchSel: {
value: "number",
label: "鍗曟嵁缂栧彿"
- }
+ },
+ tableColumn: [
+ { label: "鍗曟嵁缂栧彿", prop: "number", min: 120, isCommonClick: true,default: true }, // 鍗曟嵁缂栧彿
+ { label: "瀹㈡埛鍚嶇О", prop: "client_name", min: 120, isClientClick: true }, // 瀹㈡埛鍚嶇О
+ { label: "閿�鍞�诲崟", prop: "master_order_number", min: 90, isMasterClick: true }, // 閿�鍞�诲崟
+ { label: "璐熻矗浜�", prop: "member_name" }, // 璐熻矗浜�
+ // { label: "瀹℃壒鐘舵��", prop: "approvalStatus" }, // 瀹℃壒鐘舵��
+ { label: "浜у搧鍚嶇О", prop: "productName", isProductName: true }, // 浜у搧鍚嶇О
+ { label: "鏁伴噺", prop: "productAmount", isProductAmount: true } // 鏁伴噺
+ ],
+ showCol:["鍗曟嵁缂栧彿", "瀹㈡埛鍚嶇О", "閿�鍞�诲崟", "璐熻矗浜�", "浜у搧鍚嶇О", "鏁伴噺"]
}
},
created() {
@@ -159,23 +167,31 @@
methods: {
setTable() {
this.tableList = {
+ selectIndex:true,
tableInfomation: [],
- tableColumn: [
- { label: "鍗曟嵁缂栧彿", prop: "number", min: 120, isCommonClick: true }, // 鍗曟嵁缂栧彿
- { label: "瀹㈡埛鍚嶇О", prop: "client_name", min: 120, isClientClick: true }, // 瀹㈡埛鍚嶇О
- { label: "閿�鍞�诲崟", prop: "master_order_number", min: 90, isMasterClick: true }, // 閿�鍞�诲崟
- { label: "璐熻矗浜�", prop: "member_name" }, // 璐熻矗浜�
- // { label: "瀹℃壒鐘舵��", prop: "approvalStatus" }, // 瀹℃壒鐘舵��
- { label: "浜у搧鍚嶇О", prop: "productName", isProductName: true }, // 浜у搧鍚嶇О
- { label: "鏁伴噺", prop: "productAmount", isProductAmount: true } // 鏁伴噺
- ]
+ 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() {
@@ -266,6 +282,33 @@
this.$message.warning("璇疯嚦灏戦�夋嫨涓�鏉¤褰�")
}
},
+ /**
+ * 鍗曚釜鍒犻櫎
+ * @param id 閿�鍞瓙鍗昳d
+ */
+ deleteItem(id) {
+ this.$confirm("鏄惁纭鍒犻櫎?", "璀﹀憡", {
+ confirmButtonText: "纭畾",
+ cancelButtonText: "鍙栨秷",
+ type: "warning"
+ })
+ .then(() => {
+ getDelSubOrder({ids: [id]}).then((response) => {
+ if (response.code === 200) {
+ this.$message.success("鍒犻櫎鎴愬姛")
+ this.getData()
+ } else {
+ this.$message.warning("鍒犻櫎澶辫触")
+ }
+ })
+ })
+ .catch((err) => {
+ if (err !== 'cancel') {
+ console.error(err)
+ this.$message.warning("鍒犻櫎澶辫触")
+ }
+ })
+ },
getSelectArray(val) {
console.log(val)
this.selValueList = []
@@ -308,10 +351,6 @@
.el-table .el-table__cell {
padding: 0;
}
- .el-table__header tr,
- .el-table__header th {
- height: 48px;
- }
.el-table__footer-wrapper tbody td.el-table__cell {
height: 48px;
}
@@ -346,15 +385,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