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/refundForm/index.vue | 251 +++++++++++++++++++++++++++++++-------------------
1 files changed, 156 insertions(+), 95 deletions(-)
diff --git a/src/views/sales/refundForm/index.vue b/src/views/sales/refundForm/index.vue
index 15c4dda..f34499e 100644
--- a/src/views/sales/refundForm/index.vue
+++ b/src/views/sales/refundForm/index.vue
@@ -2,43 +2,52 @@
<div class="refund-form">
<div v-if="isDetail" class="detail-top">
<DetailListCommonBtn :query-class-options="queryClassOptions" />
- <PagerView class="page" :pager-options="pagerOptions" v-on="pagerEvents" />
</div>
- <div v-else class="top">
- <SearchCommonView
- ref="searchCommonView"
- :query-class-options="queryClassOptions"
- :search-options="searchOptions"
- @searchClick="searchClick"
- @resetClick="resetClick"
- />
- <div class="btn-pager">
- <PublicFunctionBtnView
- :receive="false"
- :submit-approval="true"
- :operates-list="operatesList"
- @batchDelete="delClick"
- />
- <PagerView class="page" :pager-options="pagerOptions" v-on="pagerEvents" />
+
+ <div v-else class="filter">
+ <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> -->
+ </template>
+ </CommonSearch>
</div>
</div>
- <TableCommonView
- ref="tableListRef"
- :table-list="tableList"
- :select-box="!isDetail"
- @selClientClick="selClientClick"
- @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> -->
- </template>
- </el-table-column>
- </template>
- </TableCommonView>
+
+ <div class="body">
+ <div class="body-card">
+ <div class="list-view">
+ <TableCommonView
+ ref="tableListRef"
+ :table-list="tableList"
+ @selClientClick="selClientClick"
+ @selCommonClick="selCommonClick"
+ @getSelectArray="getSelectArray"
+ @selTableCol="selTableCol"
+ >
+ <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>
+ </template>
+ </el-table-column>
+ </template>
+ </TableCommonView>
+ </div>
+ <div class="btn-pager">
+ <PagerView class="page" :pager-options="pagerOptions" v-on="pagerEvents" />
+ </div>
+ </div>
+ </div>
<!-- 鏂板缓/缂栬緫 -->
<AddRefundFormDialog v-if="editConfig.visible" :edit-common-config="editConfig" />
<!-- 閿�鍞��璐у崟璇︽儏 -->
@@ -115,7 +124,19 @@
selValueList: [],
search_map: {},
keyword: "",
- keywordType: ""
+ keywordType: "",
+ tableColumn: [
+ { label: "閫�娆惧崟缂栧彿", prop: "number", isCommonClick: true, default: true },
+ { label: "瀹㈡埛鍚嶇О", prop: "client_name", min: 120, isClientClick: true },
+ { label: "閫�娆炬棩鏈�", prop: "refundDate", min: 130 },
+ { label: "璐︽埛", prop: "bankAccount_name" },
+ { label: "鏄惁寮�绁�", prop: "isInvoice", min: 100 },
+ { label: "浠樻鏂瑰紡", prop: "paymentType_name" },
+ { label: "閿�鍞礋璐ｄ汉", prop: "member_name" },
+ // { label: "淇敼鏃堕棿", prop: "modifyTime" },
+ { label: "浠风◣鍚堣", prop: "amountTotal" }
+ ],
+ showCol: ["閫�娆惧崟缂栧彿", "瀹㈡埛鍚嶇О", "閫�娆炬棩鏈�", "璐︽埛", "鏄惁寮�绁�", "浠樻鏂瑰紡", "閿�鍞礋璐ｄ汉", "浠风◣鍚堣"]
}
},
created() {
@@ -132,19 +153,13 @@
methods: {
setTable() {
this.tableList = {
+ selectIndex: true,
tableInfomation: [],
- tableColumn: [
- { label: "閫�娆惧崟缂栧彿", prop: "number", isCommonClick: true },
- { label: "瀹㈡埛鍚嶇О", prop: "client_name", min: 120, isClientClick: true },
- { label: "閫�娆炬棩鏈�", prop: "refundDate", min: 130 },
- { label: "璐︽埛", prop: "bankAccount_name" },
- { label: "鏄惁寮�绁�", prop: "isInvoice", min: 100 },
- { label: "浠樻鏂瑰紡", prop: "paymentType_name" },
- { label: "閿�鍞礋璐ｄ汉", prop: "member_name" },
- // { label: "淇敼鏃堕棿", prop: "modifyTime" },
- { label: "浠风◣鍚堣", prop: "amountTotal" }
- ]
+ 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
@@ -152,15 +167,37 @@
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() {
this.loading = true
- await getSalesRefundList({
- keyword: this.keyword,
- keywordType: this.keywordType,
- page: this.pagerOptions.currPage,
- pageSize: this.pagerOptions.pageSize
- })
+ let params = {}
+ if (this.addConfig.id) {
+ params = {
+ sourceId: this.addConfig.id,
+ page: this.pagerOptions.currPage,
+ pageSize: this.pagerOptions.pageSize
+ }
+ } else {
+ params = {
+ keyword: this.keyword,
+ keywordType: this.keywordType,
+ page: this.pagerOptions.currPage,
+ pageSize: this.pagerOptions.pageSize
+ }
+ }
+ await getSalesRefundList(params)
.then((res) => {
console.log(res)
if (res.code === 200) {
@@ -191,52 +228,45 @@
})
},
// 鎼滅储
- searchClick(val, content) {
- console.log(val, content)
- this.keyword = content
- this.keywordType = val.label
- this.getData()
- },
- resetClick() {
- this.keyword = ""
- this.keywordType = ""
+ onFilterSearch(searchText) {
+ this.keyword = searchText ?? ""
+ this.keywordType = "閫�娆惧崟缂栧彿"
this.getData()
},
// 鏂板缓
addBtnClick() {
- this.editConfig.visible = true
this.editConfig.title = "鏂板缓"
- this.editConfig.infomation = { currency: "浜烘皯甯�" }
+ this.editConfig.infomation = { currency: "浜烘皯甯�", ...this.addConfig }
+ this.editConfig.visible = true
},
// 缂栬緫
handleClick(row) {
- console.log(row)
- this.editConfig.visible = true
this.editConfig.title = "缂栬緫"
- this.editConfig.infomation = { ...row, currency: "浜烘皯甯�", sale_return_nunber: row.Source.number }
+ this.editConfig.infomation = { ...row, currency: "浜烘皯甯�", sale_return_nunber: row.salesReturn.number }
+ this.editConfig.visible = true
},
// 鍒犻櫎
- delClick() {
- if (this.selValueList && this.selValueList.length > 0) {
- this.$confirm("鏄惁纭鍒犻櫎?", "璀﹀憡", {
- confirmButtonText: "纭畾",
- cancelButtonText: "鍙栨秷",
- type: "warning"
- })
- .then(() => {
- getDelSalesRefund({ ids: this.selValueList }).then((response) => {
- if (response.code === 200) {
- this.$message.success("鍒犻櫎鎴愬姛")
- this.getData()
- } else {
- this.$message.warning("鍒犻櫎澶辫触")
- }
- })
+ delClick(rowID) {
+ // if (this.selValueList && this.selValueList.length > 0) {
+ this.$confirm("鏄惁纭鍒犻櫎?", "璀﹀憡", {
+ confirmButtonText: "纭畾",
+ cancelButtonText: "鍙栨秷",
+ type: "warning"
+ })
+ .then(() => {
+ getDelSalesRefund({ ids: [rowID] }).then((response) => {
+ if (response.code === 200) {
+ this.$message.success("鍒犻櫎鎴愬姛")
+ this.getData()
+ } else {
+ this.$message.warning("鍒犻櫎澶辫触")
+ }
})
- .catch(() => {})
- } else {
- this.$message.warning("璇疯嚦灏戦�夋嫨涓�鏉¤褰�")
- }
+ })
+ .catch(() => {})
+ // } else {
+ // this.$message.warning("璇疯嚦灏戦�夋嫨涓�鏉¤褰�")
+ // }
},
getSelectArray(val) {
console.log(val)
@@ -250,7 +280,12 @@
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,
+ client_level: row.client.client_level.name,
+ client_status: row.client.client_status.name
+ }
},
// 鑱旂郴浜鸿鎯�
selCommonClick(row) {
@@ -265,19 +300,45 @@
<!-- Add "scoped" attribute to limit CSS to this component only -->
<style lang="scss" scoped>
.refund-form {
- .top {
- margin-bottom: 20px;
+ height: 100%;
+ overflow: hidden;
+ .filter {
+ height: 80px;
+ display: flex;
+ align-items: center;
+ padding: 12px 20px 0 20px;
+ &-card {
+ height: 80px;
+ display: flex;
+ align-items: center;
+ box-sizing: border-box;
+ padding: 10px 20px;
+ flex: 1;
+ border-radius: 12px;
+ background-color: #fff;
+ }
+ }
+ .body {
+ box-sizing: border-box;
+ padding: 10px 20px;
+ border-radius: 12px;
+ height: calc(100% - 92px);
+ .body-card {
+ background-color: #fff;
+ border-radius: 12px;
+ height: 100%;
+ overflow: hidden;
+ }
+ .list-view {
+ height: calc(100% - 60px);
+ overflow: hidden;
+ }
.btn-pager {
display: flex;
+ margin-top: 10px;
.page {
margin-left: auto;
}
- }
- }
- .detail-top {
- display: flex;
- .page {
- margin-left: auto;
}
}
}
--
Gitblit v1.8.0