From da3dbb56388ae49097e50ded584ed2abb7f5022d Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期二, 17 十月 2023 14:16:25 +0800
Subject: [PATCH] bug修复（5243）
---
src/views/sales/salesDetails/index.vue | 207 ++++++++++++++++++++++++++++++++-------------------
1 files changed, 128 insertions(+), 79 deletions(-)
diff --git a/src/views/sales/salesDetails/index.vue b/src/views/sales/salesDetails/index.vue
index 891d1df..858ed5b 100644
--- a/src/views/sales/salesDetails/index.vue
+++ b/src/views/sales/salesDetails/index.vue
@@ -7,16 +7,16 @@
<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"
+ :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>
+ <el-button size="small" type="primary" @click="addBtnClick">鏂板缓</el-button>
+ <!-- <el-button size="small" @click="delClick">鍒犻櫎</el-button> -->
</template>
</CommonSearch>
</div>
@@ -26,19 +26,19 @@
<div class="body-card">
<div class="list-view">
<TableCommonView
- ref="tableListRef"
- :show-summary="showSummary"
- :table-list="tableList"
- :select-box="!isDetail"
- @selClientClick="selClientClick"
- @selCommonClick="selCommonClick"
- @getSelectArray="getSelectArray"
+ ref="tableListRef"
+ :show-summary="showSummary"
+ :table-list="tableList"
+ @selClientClick="selClientClick"
+ @selCommonClick="selCommonClick"
+ @getSelectArray="getSelectArray"
+ @selTableCol="selTableCol"
>
<template slot="tableButton">
<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> -->
+ <el-button @click="delClick(scope.row.id)" type="text" size="small">鍒犻櫎</el-button>
</template>
</el-table-column>
</template>
@@ -125,7 +125,7 @@
infomation: {}
},
showSummary: {
- show: true,
+ show: false,
sumProp: [
"receiveTotalAmount",
"total",
@@ -159,7 +159,38 @@
visible: false,
title: "鏂板缓",
infomation: {}
- }
+ },
+ tableColumn: [
+ { label: "璁㈠崟缂栧彿", prop: "number", isCommonClick: true, default: true },
+ { label: "瀹㈡埛鍚嶇О", prop: "client_name", isClientClick: true },
+ { label: "绛剧害鏃ユ湡", prop: "signTime", width: 150 },
+ { label: "閿�鍞礋璐ｄ汉", prop: "member_name" },
+ // { label: "鍑哄簱鐘舵��", prop: "outboundStatus" },
+ { label: "宸叉敹鎬婚", prop: "receiveTotalAmount", price: true },
+ { label: "鍚堣", prop: "total", price: true },
+ { label: "搴旀敹浣欓", prop: "amountReceivable", price: true },
+ { label: "宸插紑绁ㄩ噾棰�", prop: "invoicedAmount", price: true },
+ { label: "鏈紑绁ㄩ噾棰�", prop: "uninvoicedAmount", price: true },
+ { label: "浜у搧鍚嶇О", prop: "productName", isProductName: true },
+ { label: "鏁伴噺", prop: "productNumber", isProductAmount: true },
+ { label: "閿�鍞崟浠�", prop: "taxUnitPrice", isProductPrice: true },
+ { label: "浠风◣鍚堣", prop: "priceTax", isProductTotal: true }
+ ],
+ showCol: [
+ "璁㈠崟缂栧彿",
+ "瀹㈡埛鍚嶇О",
+ "绛剧害鏃ユ湡",
+ "閿�鍞礋璐ｄ汉",
+ "宸叉敹鎬婚",
+ "鍚堣",
+ "搴旀敹浣欓",
+ "宸插紑绁ㄩ噾棰�",
+ "鏈紑绁ㄩ噾棰�",
+ "浜у搧鍚嶇О",
+ "鏁伴噺",
+ "閿�鍞崟浠�",
+ "浠风◣鍚堣"
+ ]
}
},
created() {
@@ -176,24 +207,13 @@
methods: {
setTable() {
this.tableList = {
+ selectIndex: true,
tableInfomation: [],
- tableColumn: [
- { label: "璁㈠崟缂栧彿", prop: "number", isCommonClick: true },
- { label: "瀹㈡埛鍚嶇О", prop: "client_name", isClientClick: true },
- { label: "绛剧害鏃ユ湡", prop: "signTime", width: 150 },
- { label: "閿�鍞礋璐ｄ汉", prop: "member_name" },
- // { label: "鍑哄簱鐘舵��", prop: "outboundStatus" },
- { label: "宸叉敹鎬婚", prop: "receiveTotalAmount", price: true },
- { label: "鍚堣", prop: "total", price: true },
- { label: "搴旀敹浣欓", prop: "amountReceivable", price: true },
- { label: "宸插紑绁ㄩ噾棰�", prop: "invoicedAmount", price: true },
- { label: "鏈紑绁ㄩ噾棰�", prop: "uninvoicedAmount", price: true },
- { label: "浜у搧鍚嶇О", prop: "productName", isProductName: true },
- { label: "鏁伴噺", prop: "productNumber", isProductAmount: true },
- { label: "閿�鍞崟浠�", prop: "taxUnitPrice", isProductPrice: true },
- { label: "浠风◣鍚堣", prop: "priceTax", isProductTotal: true }
- ]
+ 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
@@ -201,15 +221,51 @@
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 getSalesDetailsList({
- keyword: this.keyword,
- keywordType: this.keywordType,
- page: this.pagerOptions.currPage,
- pageSize: this.pagerOptions.pageSize
- })
+ let params = {}
+ console.log("ssssssssssss")
+ console.log(this.addConfig)
+ if (this.addConfig.keywordType === "瀹㈡埛鍚嶇О") {
+ params = {
+ clientId: this.addConfig.client_id,
+ page: this.pagerOptions.currPage,
+ pageSize: this.pagerOptions.pageSize
+ }
+ } else if (this.addConfig.keywordType === "閿�鍞満浼�") {
+ params = {
+ saleChanceId: this.addConfig.sale_chance_id,
+ page: this.pagerOptions.currPage,
+ pageSize: this.pagerOptions.pageSize
+ }
+ } else if (this.addConfig.keywordType === "閿�鍞瓙鍗�") {
+ params = {
+ number: this.addConfig.subbill_name,
+ 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 getSalesDetailsList(params)
.then((res) => {
console.log(res)
if (res.code === 200) {
@@ -238,8 +294,8 @@
})
},
// 鎼滅储
- onFilterSearch(searchText){
- this.keyword = searchText ?? ''
+ onFilterSearch(searchText) {
+ this.keyword = searchText ?? ""
this.keywordType = "璁㈠崟缂栧彿"
this.pagerOptions.currPage = 1
this.getData()
@@ -248,7 +304,12 @@
addBtnClick() {
this.editConfig.visible = true
this.editConfig.title = "鏂板缓"
- this.editConfig.infomation = { ...this.addConfig, currency: "浜烘皯甯�" }
+ console.log(this.addConfig)
+ this.editConfig.infomation = {
+ ...this.addConfig,
+ currency: "浜烘皯甯�",
+ client_name: Object.keys(this.addConfig).length === 0 ? "" : this.addConfig.client_name
+ }
},
// 缂栬緫
handleClick(row) {
@@ -258,27 +319,28 @@
this.editConfig.infomation = { ...row, sale_chance_name: "", currency: "浜烘皯甯�" }
},
// 鍒犻櫎
- delClick() {
- if (this.selValueList && this.selValueList.length > 0) {
- this.$confirm("鏄惁纭鍒犻櫎?", "璀﹀憡", {
- confirmButtonText: "纭畾",
- cancelButtonText: "鍙栨秷",
- type: "warning"
- })
- .then(() => {
- getDelSalesDetails({ ids: this.selValueList }).then((response) => {
- if (response.code === 200) {
- this.$message.success("鍒犻櫎鎴愬姛")
- this.getData()
- } else {
- this.$message.warning("鍒犻櫎澶辫触")
- }
- })
+ delClick(rowID) {
+ console.log(rowID, "xxxxshanchu")
+ // if (this.selValueList && this.selValueList.length > 0) {
+ this.$confirm("鏄惁纭鍒犻櫎?", "璀﹀憡", {
+ confirmButtonText: "纭畾",
+ cancelButtonText: "鍙栨秷",
+ type: "warning"
+ })
+ .then(() => {
+ getDelSalesDetails({ 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)
@@ -322,10 +384,6 @@
.el-table .el-table__cell {
padding: 0;
}
- .el-table__header tr,
- .el-table__header th {
- height: 48px;
- }
.el-table__footer-wrapper tbody td.el-table__cell {
height: 48px;
}
@@ -334,12 +392,12 @@
.sales-details {
height: 100%;
overflow: hidden;
- .filter{
+ .filter {
height: 80px;
display: flex;
align-items: center;
padding: 12px 20px 0 20px;
- &-card{
+ &-card {
height: 80px;
display: flex;
align-items: center;
@@ -350,7 +408,7 @@
background-color: #fff;
}
}
- .body{
+ .body {
box-sizing: border-box;
padding: 10px 20px;
border-radius: 12px;
@@ -360,15 +418,6 @@
border-radius: 12px;
height: 100%;
overflow: hidden;
- }
-
- .supplier-search {
- display: flex;
- align-items: center;
- .add-view {
- margin-left: auto;
- margin-right: 20px;
- }
}
.list-view {
height: calc(100% - 60px);
--
Gitblit v1.8.0