From 4a63f03516cc177ad60ebbe28a65e80587846b3e Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期四, 24 八月 2023 14:56:45 +0800
Subject: [PATCH] 新增销售退款单增加选择退货单及其他bug
---
src/views/sales/contractManage/index.vue | 96 +++++++++++++++++++++++++++++++++++------------
1 files changed, 71 insertions(+), 25 deletions(-)
diff --git a/src/views/sales/contractManage/index.vue b/src/views/sales/contractManage/index.vue
index 99243fa..001d21c 100644
--- a/src/views/sales/contractManage/index.vue
+++ b/src/views/sales/contractManage/index.vue
@@ -6,6 +6,9 @@
:label-search="true"
:query-class-options="queryClassOptions"
:search-options="searchOptions"
+ @searchClick="searchClick"
+ @resetClick="resetClick"
+ :search-sel="searchSel"
/>
<div class="btn-pager">
<PublicFunctionBtnView
@@ -13,16 +16,22 @@
:submit-approval="true"
::statistics="true"
:operates-list="operatesList"
+ @batchDelete="delClick"
/>
<PagerView class="page" :pager-options="pagerOptions" v-on="pagerEvents" />
</div>
</div>
- <TableCommonView ref="tableListRef" :table-list="tableList" @selCommonClick="selCommonClick">
+ <TableCommonView
+ ref="tableListRef"
+ :table-list="tableList"
+ @selCommonClick="selCommonClick"
+ @getSelectArray="getSelectArray"
+ >
<template slot="tableButton">
<el-table-column label="鎿嶄綔" width="100">
<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>
@@ -83,11 +92,24 @@
contractDetail: {
visible: false,
infomation: {}
+ },
+ selValueList: [],
+ search_map: {},
+ searchSel: {
+ value: "number",
+ label: "鍗曟嵁缂栧彿"
}
}
},
created() {
this.setTable()
+ if (!this.isDetail) {
+ this.search_map = {}
+ } else {
+ this.search_map = {
+ [this.addConfig.id_name]: this.addConfig.client_name
+ }
+ }
this.getData()
},
methods: {
@@ -96,23 +118,24 @@
tableInfomation: [],
tableColumn: [
{ label: "鍗曟嵁缂栧彿", prop: "number", min: 120, isCommonClick: true },
- { label: "璐熻矗浜�", prop: "memberId", min: 90 },
- { label: "瀹℃壒鐘舵��", prop: "approvalStatus" },
+ { label: "璐熻矗浜�", prop: "member_name", min: 90 },
+ // { label: "瀹℃壒鐘舵��", prop: "approvalStatus" },
{ label: "鍒涘缓浜�", prop: "creator", min: 100 },
- { label: "鍒涘缓鏃堕棿", prop: "createTime" }
+ { label: "鍒涘缓鏃堕棿", prop: "created_at" }
]
}
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 getContractList({
- keyword: "",
+ search_map: this.search_map,
page: this.pagerOptions.currPage,
pageSize: this.pagerOptions.pageSize
})
@@ -122,7 +145,10 @@
if (res.data.list && res.data.list.length > 0) {
const list = res.data.list.map((item) => {
return {
- ...item
+ ...item,
+ member_name: item.member.username,
+ client_name: item.client.name,
+ quotation_number: item.quotation.number
}
})
this.tableList.tableInfomation = list || []
@@ -141,6 +167,18 @@
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
@@ -155,27 +193,35 @@
this.editConfig.infomation = { ...row }
},
// 鍒犻櫎
- delClick(id) {
- this.$confirm("鏄惁纭鍒犻櫎?", "璀﹀憡", {
- confirmButtonText: "纭畾",
- cancelButtonText: "鍙栨秷",
- type: "warning"
- })
- .then(function () {
- return getDelContract({ 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(() => {
+ getDelContract({ 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
},
// 鍚堝悓绠$悊璇︽儏
selCommonClick(row) {
--
Gitblit v1.8.0