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 | 172 +++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 124 insertions(+), 48 deletions(-)
diff --git a/src/views/sales/contractManage/index.vue b/src/views/sales/contractManage/index.vue
index f3e7225..001d21c 100644
--- a/src/views/sales/contractManage/index.vue
+++ b/src/views/sales/contractManage/index.vue
@@ -1,43 +1,61 @@
<template>
<div class="contract-manage">
- <SearchCommonView
- ref="searchCommonView"
- :label-search="true"
- :query-class-options="queryClassOptions"
- :search-options="searchOptions"
- />
- <div class="btn-pager">
- <PublicFunctionBtnView
- :receive="false"
- :submit-approval="true"
- ::statistics="true"
- :operates-list="operatesList"
+ <div class="top">
+ <SearchCommonView
+ ref="searchCommonView"
+ :label-search="true"
+ :query-class-options="queryClassOptions"
+ :search-options="searchOptions"
+ @searchClick="searchClick"
+ @resetClick="resetClick"
+ :search-sel="searchSel"
/>
- <PagerView class="page" />
+ <div class="btn-pager">
+ <PublicFunctionBtnView
+ :receive="false"
+ :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">
+ <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> -->
</template>
</el-table-column>
</template>
</TableCommonView>
<!-- 鏂板缓/缂栬緫 -->
<AddContractManageDialog v-if="editConfig.visible" :edit-common-config="editConfig" />
+ <!-- 鏈轰細璇︽儏 -->
+ <DetailContractManage v-if="contractDetail.visible" :contract-detail="contractDetail" />
</div>
</template>
<script>
import AddContractManageDialog from "@/views/sales/contractManage/AddContractManageDialog"
-import { getContractList } from "@/api/sales/contractManage"
+import { getContractList, getDelContract } from "@/api/sales/contractManage"
+import pageMixin from "@/components/makepager/pager/mixin/pageMixin"
+import DetailContractManage from "@/views/sales/contractManage/DetailContractManage"
export default {
name: "ContractManage",
props: {},
+ mixins: [pageMixin],
components: {
- AddContractManageDialog
+ AddContractManageDialog,
+ DetailContractManage
},
computed: {
searchCommonHeight() {
@@ -70,11 +88,28 @@
visible: false,
title: "鏂板缓",
infomation: {}
+ },
+ 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: {
@@ -82,33 +117,42 @@
this.tableList = {
tableInfomation: [],
tableColumn: [
- { label: "鍗曟嵁缂栧彿", prop: "number", min: 120 },
- { label: "璐熻矗浜�", prop: "memberId", min: 90 },
- { label: "瀹℃壒鐘舵��", prop: "approvalStatus" },
+ { label: "鍗曟嵁缂栧彿", prop: "number", min: 120, isCommonClick: true },
+ { 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()
+ await getContractList({
+ search_map: this.search_map,
+ 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
+ ...item,
+ member_name: item.member.username,
+ client_name: item.client.name,
+ quotation_number: item.quotation.number
}
})
this.tableList.tableInfomation = list || []
+ this.pagerOptions.totalCount = res.data.count
} else {
this.tableList.tableInfomation = []
}
@@ -123,38 +167,67 @@
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
this.editConfig.title = "鏂板缓"
- this.editConfig.infomation = {
- customName: "",
- documentNumber: "ZDYBD01-3",
- owner: "",
- contractStatus: "",
- salesQuotation: "",
- approvalWorkflow: "",
- approvalSteps: "",
- approvalPerson: "",
- approvalOpinion: ""
- }
+ this.editConfig.infomation = {}
},
// 缂栬緫
handleClick(row) {
console.log(row)
this.editConfig.visible = true
this.editConfig.title = "缂栬緫"
- this.editConfig.infomation = {
- customName: "",
- documentNumber: "TKD20230521-12",
- owner: "",
- contractStatus: "",
- salesQuotation: "",
- approvalWorkflow: "",
- approvalSteps: "",
- approvalPerson: "",
- approvalOpinion: ""
+ this.editConfig.infomation = { ...row }
+ },
+ // 鍒犻櫎
+ delClick() {
+ if (this.selValueList && this.selValueList.length > 0) {
+ this.$confirm("鏄惁纭鍒犻櫎?", "璀﹀憡", {
+ confirmButtonText: "纭畾",
+ cancelButtonText: "鍙栨秷",
+ type: "warning"
+ })
+ .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) {
+ console.log(row)
+ this.contractDetail.visible = true
+ this.contractDetail.infomation = { ...row }
}
}
}
@@ -163,10 +236,13 @@
<!-- Add "scoped" attribute to limit CSS to this component only -->
<style lang="scss" scoped>
.contract-manage {
- .btn-pager {
- display: flex;
- .page {
- margin-left: auto;
+ .top {
+ margin-bottom: 20px;
+ .btn-pager {
+ display: flex;
+ .page {
+ margin-left: auto;
+ }
}
}
}
--
Gitblit v1.8.0