From 46ed69e3b72658140a40127f4bae16bef9a02d56 Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期一, 21 八月 2023 11:23:34 +0800
Subject: [PATCH] bug修复
---
src/views/sales/masterOrder/index.vue | 107 +++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 79 insertions(+), 28 deletions(-)
diff --git a/src/views/sales/masterOrder/index.vue b/src/views/sales/masterOrder/index.vue
index 685e9e5..31a4af2 100644
--- a/src/views/sales/masterOrder/index.vue
+++ b/src/views/sales/masterOrder/index.vue
@@ -9,9 +9,12 @@
ref="searchCommonView"
:query-class-options="queryClassOptions"
:search-options="searchOptions"
+ @searchClick="searchClick"
+ @resetClick="resetClick"
+ :search-sel="searchSel"
/>
<div class="btn-pager">
- <PublicFunctionBtnView :operates-list="operatesList" />
+ <PublicFunctionBtnView :operates-list="operatesList" @batchDelete="delClick" />
<PagerView class="page" :pager-options="pagerOptions" v-on="pagerEvents" />
</div>
</div>
@@ -22,12 +25,13 @@
:select-box="!isDetail"
@selClientClick="selClientClick"
@selCommonClick="selCommonClick"
+ @getSelectArray="getSelectArray"
>
<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>
@@ -53,6 +57,12 @@
isDetail: {
type: Boolean,
default: false
+ },
+ addConfig: {
+ type: Object,
+ default: () => {
+ return {}
+ }
}
},
mixins: [pageMixin],
@@ -101,12 +111,25 @@
clientDeail: {
visible: false,
infomation: {}
+ },
+ selValueList: [],
+ search_map: {},
+ searchSel: {
+ value: "number",
+ label: "鍗曟嵁缂栧彿"
}
}
},
created() {
this.setTable()
- this.getData()
+ if (!this.isDetail) {
+ this.search_map = {}
+ } else {
+ this.search_map = {
+ [this.addConfig.id_name]: this.addConfig.client_name
+ }
+ }
+ this.getData(this.search_map)
},
methods: {
setTable() {
@@ -115,24 +138,25 @@
tableColumn: [
{ label: "鍗曟嵁缂栧彿", prop: "number", min: 100, isCommonClick: true }, // 鍗曟嵁缂栧彿
{ label: "瀹㈡埛鍚嶇О", prop: "client_name", min: 120, isClientClick: true }, // 瀹㈡埛鍚嶇О
- { label: "鏈嶅姟寮�濮嬫椂闂�", prop: "start_time", isTime: true }, // 鏈嶅姟寮�濮嬫椂闂�
- { label: "鏈嶅姟鎴鏃堕棿", prop: "end_time", isTime: true }, // 鏈嶅姟鎴鏃堕棿
+ { label: "鏈嶅姟寮�濮嬫椂闂�", prop: "start_time" }, // 鏈嶅姟寮�濮嬫椂闂�
+ { label: "鏈嶅姟鎴鏃堕棿", prop: "end_time" }, // 鏈嶅姟鎴鏃堕棿
{ label: "鍚堝悓閲戦", prop: "money" }, // 鍚堝悓閲戦
- { label: "璐熻矗浜�", prop: "member_id" } // 璐熻矗浜�
+ { label: "璐熻矗浜�", prop: "member_name" } // 璐熻矗浜�
// { label: "瀹℃壒鐘舵��", prop: "approvalStatus" } // 瀹℃壒鐘舵��
]
}
this.searchOptions = []
for (let i = 0; i < this.tableList.tableColumn.length; i++) {
const label = this.tableList.tableColumn[i].label
- this.searchOptions.push({ value: (i + 1).toString(), label: label })
+ const value = this.tableList.tableColumn[i].prop
+ this.searchOptions.push({ value: value, label: label })
}
},
// 璇锋眰鏁版嵁
async getData() {
this.loading = true
await getMasterOrderList({
- keyword: "",
+ search_map: this.search_map,
page: this.pagerOptions.currPage,
pageSize: this.pagerOptions.pageSize
})
@@ -143,7 +167,8 @@
const list = res.data.list.map((item) => {
return {
...item,
- client_name: item.client.name
+ client_name: item.client.name,
+ member_name: item.member.username
}
})
this.tableList.tableInfomation = list || []
@@ -162,11 +187,23 @@
this.loading = false
})
},
+ // 鎼滅储
+ searchClick(val, content) {
+ console.log(val, content)
+ this.search_map = {
+ [val.value]: content
+ }
+ this.getData()
+ },
+ resetClick() {
+ this.search_map = {}
+ this.getData()
+ },
// 鏂板缓
addBtnClick() {
this.editConfig.visible = true
this.editConfig.title = "鏂板缓"
- this.editConfig.infomation = {}
+ this.editConfig.infomation = { ...this.addConfig }
},
// 缂栬緫
handleClick(row) {
@@ -176,33 +213,47 @@
this.editConfig.infomation = { ...row }
},
// 鍒犻櫎
- delClick(id) {
- this.$confirm("鏄惁纭鍒犻櫎?", "璀﹀憡", {
- confirmButtonText: "纭畾",
- cancelButtonText: "鍙栨秷",
- type: "warning"
- })
- .then(function () {
- return getDelMasterOrder({ id: id })
+ delClick() {
+ if (this.selValueList && this.selValueList.length > 0) {
+ this.$confirm("鏄惁纭鍒犻櫎?", "璀﹀憡", {
+ confirmButtonText: "纭畾",
+ cancelButtonText: "鍙栨秷",
+ type: "warning"
})
- .then((response) => {
- if (response.code === 200) {
- this.$message.success("鍒犻櫎鎴愬姛")
- this.getData()
- } else {
- this.$message.warning("鍒犻櫎澶辫触")
- }
- })
- .catch(function () {})
+ .then(() => {
+ getDelMasterOrder({ ids: this.selValueList }).then((response) => {
+ if (response.code === 200) {
+ this.$message.success("鍒犻櫎鎴愬姛")
+ this.getData()
+ } else {
+ this.$message.warning("鍒犻櫎澶辫触")
+ }
+ })
+ })
+ .catch(() => {})
+ } else {
+ this.$message.warning("璇疯嚦灏戦�夋嫨涓�鏉¤褰�")
+ }
},
getSelectArray(val) {
console.log(val)
+ this.selValueList = []
+ const list = val.map((item) => {
+ return item.id
+ })
+ this.selValueList = list
},
// 瀹㈡埛鍚嶇О璇︽儏
selClientClick(row) {
console.log(row)
this.clientDeail.visible = true
- this.clientDeail.infomation = { ...row }
+ this.clientDeail.infomation = {
+ ...row.client,
+ client_name: row.client.name,
+ client_level: row.client.client_level.name,
+ client_status: row.client.client_status.name,
+ contact_name: row.name
+ }
},
// 鏈轰細鍚嶇О璇︽儏
selCommonClick(row) {
--
Gitblit v1.8.0