From fd4ec6faea22d20bf88cb0c4fdfe9f64a8546ef9 Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期五, 29 三月 2024 10:27:34 +0800
Subject: [PATCH] 采购管理列表页增加销售明细单、添加产品弹窗增加供应商名称 销售单价改为采购单价
---
src/views/purchaseManage/purchase/index.vue | 20 ++++++++++++++++----
src/views/other/commonDialog/SelectCommonDialog.vue | 8 +++++---
2 files changed, 21 insertions(+), 7 deletions(-)
diff --git a/src/views/other/commonDialog/SelectCommonDialog.vue b/src/views/other/commonDialog/SelectCommonDialog.vue
index 74d664a..aa2a6a4 100644
--- a/src/views/other/commonDialog/SelectCommonDialog.vue
+++ b/src/views/other/commonDialog/SelectCommonDialog.vue
@@ -102,11 +102,12 @@
searchSel: {},
keyword: "",
keywordType: "",
- showProductCol: ["浜у搧鍚嶇О", "浜у搧缂栧彿", "閿�鍞崟浠�", "鍗曚綅", "浜у搧瑙勬牸", "鍨嬪彿"],
+ 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" }
@@ -183,7 +184,8 @@
if (res.data.list && res.data.list.length > 0) {
const list = res.data.list.map((item) => {
return {
- ...item
+ ...item,
+ supplierName: item.supplier.name
}
})
this.tableList.tableInfomation = list
diff --git a/src/views/purchaseManage/purchase/index.vue b/src/views/purchaseManage/purchase/index.vue
index 775a993..89747e6 100644
--- a/src/views/purchaseManage/purchase/index.vue
+++ b/src/views/purchaseManage/purchase/index.vue
@@ -9,7 +9,7 @@
:show-download="false"
:amount-view="false"
:show-action-btn="false"
- :placeholder="'璇疯緭鍏ヤ緵搴斿晢鍚嶇О/鐗╂枡鍚嶇О/閲囪喘鍗曞悕绉�'"
+ :placeholder="'璇疯緭鍏ヤ緵搴斿晢鍚嶇О/鐗╂枡鍚嶇О/閲囪喘鍗曞悕绉�/閿�鍞槑缁嗗崟绛�'"
@searchClick="onFilterSearch"
/>
</div>
@@ -246,6 +246,7 @@
tableColumn: [
{ label: "鍗曟嵁绫诲瀷", prop: "orderType", min: 130 },
{ label: "閲囪喘鍗曞彿", prop: "number", min: 150, isCommonClick: true, default: true },
+ { label: "閿�鍞槑缁嗗崟", prop: "salesDetailsNumber" },
{ label: "閲囪喘鍗曞悕绉�", prop: "name", min: 130, isCommonClick: true },
{ label: "渚涘簲鍟嗗悕绉�", prop: "supplierName", min: 130 },
{ label: "閲囪喘鏁伴噺", prop: "quantity", min: 130 },
@@ -253,7 +254,17 @@
{ label: "缁忓姙浜�", prop: "handledBy", min: 130 },
{ label: "鍒跺崟浜�", prop: "creator", min: 130 }
],
- showCol: ["閲囪喘鍗曞彿", "閲囪喘鍗曞悕绉�", "鍗曟嵁绫诲瀷", "渚涘簲鍟嗗悕绉�", "閲囪喘鏁伴噺", "鏀惰揣浠撳簱", "缁忓姙浜�", "鍒跺崟浜�"],
+ showCol: [
+ "閲囪喘鍗曞彿",
+ "閿�鍞槑缁嗗崟",
+ "閲囪喘鍗曞悕绉�",
+ "鍗曟嵁绫诲瀷",
+ "渚涘簲鍟嗗悕绉�",
+ "閲囪喘鏁伴噺",
+ "鏀惰揣浠撳簱",
+ "缁忓姙浜�",
+ "鍒跺崟浜�"
+ ],
tableBottomColumn: [],
showBottomCol: [],
TabsIndex: 0,
@@ -724,7 +735,7 @@
// this.$message.error(res.msg ? res.msg + "," : "" + "鑾峰彇淇℃伅澶辫触锛�")
// }
// })
- // } else
+ // } else
if (this.TabsIndex == 1 && row.status == 1) {
this.productTableList.tableInfomation = []
} else if (
@@ -742,7 +753,8 @@
this.$message.error(res.msg ? res.msg + "," : "" + "鑾峰彇淇℃伅澶辫触锛�")
}
})
- } else if (this.TabsIndex == 0||
+ } else if (
+ this.TabsIndex == 0 ||
(this.TabsIndex == 2 && row.status == 8) ||
(this.TabsIndex == 2 && row.status == 2) ||
(this.TabsIndex == 2 && row.status == 3)
--
Gitblit v1.8.0