From 90943dd32237e9e1c9f0cd66e33b2145c26883ff Mon Sep 17 00:00:00 2001
From: songshankun <songshankun@foxmail.com>
Date: 星期一, 25 九月 2023 14:14:47 +0800
Subject: [PATCH] feat: 侧边栏样式调整; 表格组件样式调整; 新增搜索组件; 销售线索模块布局样式调整
---
src/views/sales/salesReturn/index.vue | 62 +++++++++++++++++++++++--------
1 files changed, 46 insertions(+), 16 deletions(-)
diff --git a/src/views/sales/salesReturn/index.vue b/src/views/sales/salesReturn/index.vue
index 9654087..93bf71e 100644
--- a/src/views/sales/salesReturn/index.vue
+++ b/src/views/sales/salesReturn/index.vue
@@ -11,6 +11,7 @@
:search-options="searchOptions"
@searchClick="searchClick"
@resetClick="resetClick"
+ :search-sel="searchSel"
/>
<div class="btn-pager">
<PublicFunctionBtnView
@@ -60,6 +61,12 @@
isDetail: {
type: Boolean,
default: false
+ },
+ addConfig: {
+ type: Object,
+ default: () => {
+ return {}
+ }
}
},
mixins: [pageMixin],
@@ -108,11 +115,24 @@
infomation: {}
},
selValueList: [],
- search_map: {}
+ search_map: {},
+ searchSel: {
+ value: "number",
+ label: "閿�鍞��璐у崟缂栧彿"
+ },
+ keyword: "",
+ keywordType: ""
}
},
created() {
this.setTable()
+ if (!this.isDetail) {
+ this.keyword = ""
+ this.keywordType = ""
+ } else {
+ this.keyword = this.addConfig.keyword
+ this.keywordType = this.addConfig.keywordType
+ }
this.getData()
},
methods: {
@@ -121,27 +141,29 @@
tableInfomation: [],
tableColumn: [
{ label: "閿�鍞��璐у崟缂栧彿", prop: "number", min: 120, isCommonClick: true },
- { label: "瀹㈡埛鍚嶇О", prop: "clientId", min: 90, isClientClick: true },
- { label: "閫�璐ф棩鏈�", prop: "returnDate", isTime: true, min: 130 },
- { label: "鐘舵��", prop: "status" },
+ { 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: "閿�鍞礋璐d汉", prop: "memberId" }
+ { label: "閿�鍞礋璐d汉", prop: "member_name" }
// { label: "淇敼鏃堕棿", prop: "modifyTime", isTime: true, min: 130 }
]
}
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 getSalesReturnList({
- search_map: this.search_map,
+ keyword: this.keyword,
+ keywordType: this.keywordType,
page: this.pagerOptions.currPage,
pageSize: this.pagerOptions.pageSize
})
@@ -151,7 +173,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,
+ salesReturnStatus_name: item.SalesReturnStatus.name,
+ client_name: item.client.name
}
})
this.tableList.tableInfomation = list || []
@@ -172,28 +197,27 @@
},
// 鎼滅储
searchClick(val, content) {
- console.log(val, content)
- this.search_map = {
- [val.value]: content
- }
+ this.keyword = content
+ this.keywordType = val.label
this.getData()
},
resetClick() {
- this.search_map = {}
+ this.keyword = ""
+ this.keywordType = ""
this.getData()
},
// 鏂板缓
addBtnClick() {
this.editConfig.visible = true
this.editConfig.title = "鏂板缓"
- this.editConfig.infomation = {}
+ this.editConfig.infomation = { currency: "浜烘皯甯�" }
},
// 缂栬緫
handleClick(row) {
console.log(row)
this.editConfig.visible = true
this.editConfig.title = "缂栬緫"
- this.editConfig.infomation = { ...row }
+ this.editConfig.infomation = { ...row, currency: "浜烘皯甯�", salesDetailNumber: row.Source.number }
},
// 鍒犻櫎
delClick() {
@@ -230,7 +254,13 @@
selClientClick(row) {
console.log(row)
this.clientDeail.visible = true
- this.clientDeail.infomation = { ...row, client_name: row.name }
+ this.clientDeail.infomation = {
+ ...row.client,
+ client_name: row.name,
+ member: row.Member,
+ client_level: row.client.client_level.name,
+ client_status: row.client.client_status.name
+ }
},
// 鑱旂郴浜鸿鎯�
selCommonClick(row) {
--
Gitblit v1.8.0