From 5d0120d2e8a6e5cd2e1e95d4c5ffeecf5fc1c4a6 Mon Sep 17 00:00:00 2001
From: songshankun <songshankun@foxmail.com>
Date: 星期二, 10 十月 2023 15:35:58 +0800
Subject: [PATCH] Merge branch 'dev' into songshankun/adjust-style
---
src/views/sales/refundForm/index.vue | 265 +++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 208 insertions(+), 57 deletions(-)
diff --git a/src/views/sales/refundForm/index.vue b/src/views/sales/refundForm/index.vue
index 01da30f..99d71d9 100644
--- a/src/views/sales/refundForm/index.vue
+++ b/src/views/sales/refundForm/index.vue
@@ -1,28 +1,59 @@
<template>
<div class="refund-form">
- <div class="top">
- <SearchCommonView
- ref="searchCommonView"
- :query-class-options="queryClassOptions"
- :search-options="searchOptions"
- />
- <div class="btn-pager">
- <PublicFunctionBtnView :receive="false" :submit-approval="true" :operates-list="operatesList" />
- <PagerView class="page" :pager-options="pagerOptions" v-on="pagerEvents" />
+ <div v-if="isDetail" class="detail-top">
+ <DetailListCommonBtn :query-class-options="queryClassOptions" />
+ </div>
+
+ <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">
- <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" />
+ <!-- 閿�鍞��璐у崟璇︽儏 -->
+ <DetailRefundForm v-if="refundFormDetail.visible" :refund-form-detail="refundFormDetail" />
+ <!-- 瀹㈡埛璇︽儏 -->
+ <DetailClientManage v-if="clientDeail.visible" :client-manage-detail="clientDeail" />
</div>
</template>
@@ -30,13 +61,27 @@
import AddRefundFormDialog from "@/views/sales/refundForm/AddRefundFormDialog"
import { getSalesRefundList, getDelSalesRefund } from "@/api/sales/refundForm"
import pageMixin from "@/components/makepager/pager/mixin/pageMixin"
+import DetailRefundForm from "@/views/sales/refundForm/DetailRefundForm"
export default {
name: "RefundForm",
- props: {},
+ props: {
+ isDetail: {
+ type: Boolean,
+ default: false
+ },
+ addConfig: {
+ type: Object,
+ default: () => {
+ return {}
+ }
+ }
+ },
mixins: [pageMixin],
components: {
- AddRefundFormDialog
+ AddRefundFormDialog,
+ DetailRefundForm,
+ DetailClientManage: () => import("@/views/client/client/DetailClientManage")
},
computed: {
searchCommonHeight() {
@@ -67,40 +112,79 @@
visible: false,
title: "鏂板缓",
infomation: {}
- }
+ },
+ refundFormDetail: {
+ visible: false,
+ infomation: {}
+ },
+ clientDeail: {
+ visible: false,
+ infomation: {}
+ },
+ selValueList: [],
+ search_map: {},
+ keyword: "",
+ 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() {
this.setTable()
+ if (!this.isDetail) {
+ this.keyword = ""
+ this.keywordType = ""
+ } else {
+ this.keyword = this.addConfig.keyword
+ this.keywordType = this.addConfig.keywordType
+ }
this.getData()
},
methods: {
setTable() {
this.tableList = {
+ selectIndex: true,
tableInfomation: [],
- tableColumn: [
- { label: "閫�娆惧崟缂栧彿", prop: "number" },
- { label: "瀹㈡埛鍚嶇О", prop: "clientId", min: 120 },
- { label: "閫�娆炬棩鏈�", prop: "refundDate", isTime: true, min: 130 },
- { label: "璐︽埛", prop: "accountId" },
- { label: "鏄惁寮�绁�", prop: "isInvoice", min: 100 },
- { label: "浠樻鏂瑰紡", prop: "refundMethod" },
- { label: "閿�鍞礋璐ｄ汉", prop: "memberId" },
- // { label: "淇敼鏃堕棿", prop: "modifyTime" },
- { label: "浠风◣鍚堣", prop: "priceTax" }
- ]
+ 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
- this.searchOptions.push({ value: (i + 1).toString(), label: 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() {
this.loading = true
await getSalesRefundList({
- keyword: "",
+ keyword: this.keyword,
+ keywordType: this.keywordType,
page: this.pagerOptions.currPage,
pageSize: this.pagerOptions.pageSize
})
@@ -110,7 +194,11 @@
if (res.data.list && res.data.list.length > 0) {
const list = res.data.list.map((item) => {
return {
- ...item
+ ...item,
+ client_name: item.client.name,
+ member_name: item.member.username,
+ paymentType_name: item.paymentType.name,
+ bankAccount_name: item.bankAccount.name
}
})
this.tableList.tableInfomation = list || []
@@ -129,41 +217,72 @@
this.loading = false
})
},
+ // 鎼滅储
+ onFilterSearch(searchText){
+ this.keyword = searchText ?? ""
+ 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: "浜烘皯甯�", sale_return_nunber: row.Source.number }
},
// 鍒犻櫎
- delClick(id) {
- this.$confirm("鏄惁纭鍒犻櫎?", "璀﹀憡", {
- confirmButtonText: "纭畾",
- cancelButtonText: "鍙栨秷",
- type: "warning"
- })
- .then(function () {
- return getDelSalesRefund({ 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(() => {
+ getDelSalesRefund({ 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.client,
+ client_name: row.name,
+ client_level: row.client.client_level.name,
+ client_status: row.client.client_status.name
+ }
+ },
+ // 鑱旂郴浜鸿鎯�
+ selCommonClick(row) {
+ console.log(row)
+ this.refundFormDetail.visible = true
+ this.refundFormDetail.infomation = { ...row }
}
}
}
@@ -172,10 +291,42 @@
<!-- 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;
}
--
Gitblit v1.8.0