From b76f9d153dd40cef8864cecd168242850679047d Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期五, 18 八月 2023 20:29:36 +0800
Subject: [PATCH] bug修复
---
src/views/sales/salesReturn/index.vue | 242 ++++++++++++++++++++++++++++++++++++++----------
1 files changed, 192 insertions(+), 50 deletions(-)
diff --git a/src/views/sales/salesReturn/index.vue b/src/views/sales/salesReturn/index.vue
index f0fa6f1..cd9f47f 100644
--- a/src/views/sales/salesReturn/index.vue
+++ b/src/views/sales/salesReturn/index.vue
@@ -1,32 +1,79 @@
<template>
<div class="sales-return">
- <SearchCommonView ref="searchCommonView" :query-class-options="queryClassOptions" :search-options="searchOptions" />
- <div class="btn-pager">
- <PublicFunctionBtnView :receive="false" :import-button="false" receive:operates-list="operatesList" />
- <PagerView class="page" />
+ <div v-if="isDetail" class="detail-top">
+ <DetailListCommonBtn :query-class-options="queryClassOptions" />
+ <PagerView class="page" :pager-options="pagerOptions" v-on="pagerEvents" />
</div>
- <TableCommonView ref="tableListRef" :table-list="tableList">
+ <div v-else class="top">
+ <SearchCommonView
+ ref="searchCommonView"
+ :query-class-options="queryClassOptions"
+ :search-options="searchOptions"
+ @searchClick="searchClick"
+ @resetClick="resetClick"
+ :search-sel="searchSel"
+ />
+ <div class="btn-pager">
+ <PublicFunctionBtnView
+ :receive="false"
+ :import-button="false"
+ receive:operates-list="operatesList"
+ @batchDelete="delClick"
+ />
+ <PagerView class="page" :pager-options="pagerOptions" v-on="pagerEvents" />
+ </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="60">
+ <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> -->
</template>
</el-table-column>
</template>
</TableCommonView>
<!-- 鏂板缓/缂栬緫 -->
<AddSalesReturnDialog v-if="editConfig.visible" :edit-common-config="editConfig" />
+ <!-- 閿�鍞��璐у崟璇︽儏 -->
+ <DetailReturn v-if="returnDetail.visible" :return-detail="returnDetail" />
+ <!-- 瀹㈡埛璇︽儏 -->
+ <DetailClientManage v-if="clientDeail.visible" :client-manage-detail="clientDeail" />
</div>
</template>
<script>
import AddSalesReturnDialog from "@/views/sales/salesReturn/AddSalesReturnDialog"
+import { getSalesReturnList, getDelSalesReturn } from "@/api/sales/salesReturn"
+import pageMixin from "@/components/makepager/pager/mixin/pageMixin"
+import DetailReturn from "@/views/sales/salesReturn/DetailReturn"
export default {
name: "SalesReturn",
- props: {},
+ props: {
+ isDetail: {
+ type: Boolean,
+ default: false
+ },
+ addConfig: {
+ type: Object,
+ default: () => {
+ return {}
+ }
+ }
+ },
+ mixins: [pageMixin],
components: {
- AddSalesReturnDialog
+ AddSalesReturnDialog,
+ DetailReturn,
+ DetailClientManage: () => import("@/views/client/client/DetailClientManage")
},
computed: {
searchCommonHeight() {
@@ -58,76 +105,162 @@
visible: false,
title: "鏂板缓",
infomation: {}
- }
+ },
+ returnDetail: {
+ visible: false,
+ infomation: {}
+ },
+ clientDeail: {
+ visible: false,
+ infomation: {}
+ },
+ selValueList: [],
+ 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: {
setTable() {
this.tableList = {
- tableInfomation: [
- {
- salesReturnOrderNo: "THD20230607-44",
- customName: "娆у厠绉戞妧鑲′唤鏈夐檺鍏徃",
- returnDate: "2023-06-07",
- state: "鏈叆搴�",
- returnWarehouse: "鎬讳粨",
- refundabe: "锟�9,499.00",
- refunded: "锟�1,499.00",
- salesHead: "绯荤粺绠＄悊鍛�",
- modifyTime: "2023-06-07 11:10:25"
- }
- ],
+ tableInfomation: [],
tableColumn: [
- { label: "閿�鍞��璐у崟缂栧彿", prop: "salesReturnOrderNo", min: 120 },
- { label: "瀹㈡埛鍚嶇О", prop: "customName", min: 90 },
- { label: "閫�璐ф棩鏈�", prop: "returnDate", min: 100 },
- { label: "鐘舵��", prop: "state" },
- { label: "閫�鍏ヤ粨搴�", prop: "returnWarehouse" },
+ { label: "閿�鍞��璐у崟缂栧彿", prop: "number", min: 120, isCommonClick: true },
+ { 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: "閿�鍞礋璐ｄ汉", prop: "salesHead" },
- { label: "淇敼鏃堕棿", prop: "modifyTime" }
+ { label: "閿�鍞礋璐ｄ汉", 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({
+ keyword: this.keyword,
+ keywordType: this.keywordType,
+ page: this.pagerOptions.currPage,
+ pageSize: this.pagerOptions.pageSize
+ })
+ .then((res) => {
+ console.log(res)
+ if (res.code === 200) {
+ if (res.data.list && res.data.list.length > 0) {
+ const list = res.data.list.map((item) => {
+ return {
+ ...item,
+ member_name: item.Member.username,
+ salesReturnStatus_name: item.SalesReturnStatus.name,
+ client_name: item.client.name
+ }
+ })
+ this.tableList.tableInfomation = list || []
+ this.pagerOptions.totalCount = res.data.count
+ } else {
+ this.tableList.tableInfomation = []
+ }
+ } else {
+ this.tableList.tableInfomation = []
+ }
+ this.loading = false
+ })
+ .catch((err) => {
+ console.log(err)
+ this.tableList.tableInfomation = []
+ this.loading = false
+ })
+ },
+ // 鎼滅储
+ searchClick(val, content) {
+ this.keyword = content
+ this.keywordType = val.label
+ this.getData()
+ },
+ resetClick() {
+ this.keyword = ""
+ this.keywordType = ""
+ this.getData()
},
// 鏂板缓
addBtnClick() {
this.editConfig.visible = true
this.editConfig.title = "鏂板缓"
- this.editConfig.infomation = {
- customName: "",
- salesReturnOrderNo: "THD20230521-11",
- selSourceOrder: "1",
- returnWarehouse: "1",
- salesHead: "5",
- returnDate: "",
- state: "",
- returnReason: ""
- }
+ this.editConfig.infomation = { currency: "浜烘皯甯�" }
},
// 缂栬緫
handleClick(row) {
console.log(row)
this.editConfig.visible = true
this.editConfig.title = "缂栬緫"
- this.editConfig.infomation = {
- customName: "",
- salesReturnOrderNo: "THD20230521-11",
- selSourceOrder: "",
- returnWarehouse: "",
- salesHead: "",
- returnDate: "",
- state: "",
- returnReason: ""
+ this.editConfig.infomation = { ...row, currency: "浜烘皯甯�" }
+ },
+ // 鍒犻櫎
+ delClick() {
+ if (this.selValueList && this.selValueList.length > 0) {
+ this.$confirm("鏄惁纭鍒犻櫎?", "璀﹀憡", {
+ confirmButtonText: "纭畾",
+ cancelButtonText: "鍙栨秷",
+ type: "warning"
+ })
+ .then(() => {
+ getDelSalesReturn({ 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_name: row.name }
+ },
+ // 鑱旂郴浜鸿鎯�
+ selCommonClick(row) {
+ console.log(row)
+ this.returnDetail.visible = true
+ this.returnDetail.infomation = { ...row }
}
}
}
@@ -136,7 +269,16 @@
<!-- Add "scoped" attribute to limit CSS to this component only -->
<style lang="scss" scoped>
.sales-return {
- .btn-pager {
+ .top {
+ margin-bottom: 20px;
+ .btn-pager {
+ display: flex;
+ .page {
+ margin-left: auto;
+ }
+ }
+ }
+ .detail-top {
display: flex;
.page {
margin-left: auto;
--
Gitblit v1.8.0