From bc0b37e98ba17b8a4c97d853c87e2b12e447b012 Mon Sep 17 00:00:00 2001
From: zuozhengqing <a13193816592@163.com>
Date: 星期五, 29 三月 2024 18:10:34 +0800
Subject: [PATCH] 合并分支
---
src/views/other/commonDialog/SelectCommonDialog.vue | 24 +++++++++++++++++++-----
1 files changed, 19 insertions(+), 5 deletions(-)
diff --git a/src/views/other/commonDialog/SelectCommonDialog.vue b/src/views/other/commonDialog/SelectCommonDialog.vue
index 8b0fedd..afff0b0 100644
--- a/src/views/other/commonDialog/SelectCommonDialog.vue
+++ b/src/views/other/commonDialog/SelectCommonDialog.vue
@@ -103,11 +103,13 @@
searchSel: {},
keyword: "",
keywordType: "",
- showProductCol: ["浜у搧鍚嶇О", "浜у搧缂栧彿", "閿�鍞崟浠�", "鍗曚綅", "浜у搧瑙勬牸", "鍨嬪彿"],
+ showPurchaseCol: ["浜у搧鍚嶇О", "浜у搧缂栧彿", "渚涘簲鍟�", "閲囪喘鍗曚环", "鍗曚綅", "浜у搧瑙勬牸", "鍨嬪彿"],
+ showProductCol: ["浜у搧鍚嶇О", "浜у搧缂栧彿", "閲囪喘鍗曚环", "鍗曚綅", "浜у搧瑙勬牸", "鍨嬪彿"],
tableProductColumn: [
{ label: "浜у搧鍚嶇О", prop: "name", isClick: true },
{ label: "浜у搧缂栧彿", prop: "number" },
- { label: "閿�鍞崟浠�", prop: "purchasePrice" },
+ { label: "渚涘簲鍟�", prop: "supplierName" },
+ { label: "閲囪喘鍗曚环", prop: "purchasePrice" },
{ label: "鍗曚綅", prop: "unit" },
{ label: "浜у搧瑙勬牸", prop: "specifications" },
{ label: "鍨嬪彿", prop: "modelNumber" }
@@ -132,7 +134,12 @@
},
setTable() {
if (this.editConfig.title === "浜у搧鍚嶇О") {
- this.showCol = this.showProductCol
+ if (this.sign == "purchase") {
+ this.showCol = this.showPurchaseCol
+ } else {
+ this.showCol = this.showProductCol
+ }
+
this.tableColumn = this.tableProductColumn
}
this.tableList = {
@@ -184,8 +191,15 @@
if (res.code === 200) {
if (res.data.list && res.data.list.length > 0) {
const list = res.data.list.map((item) => {
- return {
- ...item
+ if (this.sign == "purchase") {
+ return {
+ ...item,
+ supplierName: item.supplier?.name
+ }
+ } else {
+ return {
+ ...item
+ }
}
})
this.tableList.tableInfomation = list
--
Gitblit v1.8.0