From a0b97eb8e934ba28b9e51824d4cbbcc99cc70e17 Mon Sep 17 00:00:00 2001
From: charles <981744753@qq.com>
Date: 星期四, 18 七月 2024 23:08:00 +0800
Subject: [PATCH] fxi:解决发货bug
---
src/views/other/commonDialog/SelectCommonDialog.vue | 25 ++++++++++++++++++-------
1 files changed, 18 insertions(+), 7 deletions(-)
diff --git a/src/views/other/commonDialog/SelectCommonDialog.vue b/src/views/other/commonDialog/SelectCommonDialog.vue
index f7d6074..ab5186b 100644
--- a/src/views/other/commonDialog/SelectCommonDialog.vue
+++ b/src/views/other/commonDialog/SelectCommonDialog.vue
@@ -177,9 +177,14 @@
} else if (this.editConfig.title === "鎶ヤ环鍗�") {
this.tableColumn = [
{ label: "鎶ヤ环鍗曞彿", prop: "number", isClick: true, default: true }, // 鎶ヤ环鍗曞彿
- { label: "閿�鍞礋璐ｄ汉", prop: "member_name" } // 閿�鍞礋璐ｄ汉
+ { label: "鎶ヤ环鍚嶇О", prop: "quotationName" },
+ { label: "閿�鍞礋璐ｄ汉", prop: "member_name" }, // 閿�鍞礋璐ｄ汉
+ { label: "瀹㈡埛鍚嶇О", prop: "client_name" },
+ { label: "鎵�灞炰笟鍔℃満浼�", prop: "sale_chance_name" },
+ { label: "鎶ヤ环鍗曠姸鎬�", prop: "quotationStatus" },
+ { label: "鍚堣", prop: "amountTotal" }
]
- this.showCol = ["鎶ヤ环鍗曞彿", "閿�鍞礋璐ｄ汉"]
+ this.showCol = ["鎶ヤ环鍗曞彿", "鎶ヤ环鍚嶇О", "閿�鍞礋璐ｄ汉", "瀹㈡埛鍚嶇О", "鎵�灞炰笟鍔℃満浼�", "鎶ヤ环鍗曠姸鎬�", "鍚堣"]
this.tableList = {
selectIndex: true,
@@ -363,7 +368,10 @@
this.tableList.tableInfomation = this.editConfig.tableInfomation.map((item) => {
return {
...item,
- member_name: item.member.username
+ client_name: item.client.name,
+ sale_chance_name: item.sale_chance.name,
+ member_name: item.member.username,
+ quotationStatus: item.quotation_status.name
}
})
this.pagerOptions.totalCount = this.editConfig.count ? this.editConfig.count : 0
@@ -379,7 +387,10 @@
const list = res.data.list.map((item) => {
return {
...item,
- member_name: item.member.username
+ client_name: item.client.name,
+ sale_chance_name: item.sale_chance.name,
+ member_name: item.member.username,
+ quotationStatus: item.quotation_status.name
}
})
this.tableList.tableInfomation = list || []
@@ -456,9 +467,9 @@
pageSize: this.pagerOptions.pageSize
}
// 鏍规嵁鎶ヤ环鍗曟煡璇骇鍝�
- if (this.quotationNumber) {
- params.quotationNumber = this.quotationNumber
- }
+ // if (this.quotationNumber) {
+ // params.quotationNumber = this.quotationNumber
+ // }
await getProductList(params).then((res) => {
console.log(res.data)
if (res.code === 200) {
--
Gitblit v1.8.0