From 99cce1342e08baf832edd0e92c941cb64669af5e Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期四, 28 三月 2024 15:57:50 +0800
Subject: [PATCH] 6215、6216出入库增加来源和销售明细单
---
src/views/overview/OverviewListView.vue | 64 +++++++++++++++++++-------------
1 files changed, 38 insertions(+), 26 deletions(-)
diff --git a/src/views/overview/OverviewListView.vue b/src/views/overview/OverviewListView.vue
index 36c3d35..7a67288 100644
--- a/src/views/overview/OverviewListView.vue
+++ b/src/views/overview/OverviewListView.vue
@@ -95,18 +95,9 @@
mixins: [pageMixin],
computed: {},
data() {
- // 浜у搧淇℃伅
- const productColumn = [
- { label: "浜у搧缂栧彿", prop: "id", default: true },
- { label: "浜у搧鍚嶇О", prop: "productName" },
- { label: "浜у搧瑙勬牸", prop: "specs" },
- { label: "浜у搧鍨嬪彿", prop: "model" },
- { label: "璁￠噺鍗曚綅", prop: "unit" },
- { label: "鏁伴噺", prop: "amount" }
- ]
return {
tableList: {},
- showcol: ["浠撳簱浣嶇疆", "璋冨嚭浣嶇疆", "璋冨叆浣嶇疆", "鑱旂郴浜�", "鏃ユ湡", "鏉ユ簮鍗曟嵁", "鐘舵��"],
+ showcol: ["浠撳簱浣嶇疆", "璋冨嚭浣嶇疆", "璋冨叆浣嶇疆", "鑱旂郴浜�", "鏃ユ湡", "鏉ユ簮", "鏉ユ簮鍗曟嵁", "閿�鍞槑缁嗗崟", "鐘舵��"],
searchOptions: [],
commonDetail: {
visible: false,
@@ -129,9 +120,27 @@
numberLabel: "鍗曞彿",
TabsIndex: "0",
productTableList: {},
- showBottomCol: ["浜у搧缂栧彿", "浜у搧鍚嶇О", "浜у搧瑙勬牸", "浜у搧鍨嬪彿", "璁￠噺鍗曚綅", "鏁伴噺"],
- tableBottomColumn: productColumn,
- selectRow: {}
+ showBottomCol: ["浜у搧缂栧彿", "浜у搧鍚嶇О", "浜у搧瑙勬牸", "浜у搧鍨嬪彿", "璁￠噺鍗曚綅", "璋冨嚭浣嶇疆", "璋冨叆浣嶇疆", "鏁伴噺"],
+ tableBottomColumn: [],
+ selectRow: {},
+ productColumn: [
+ { label: "浜у搧缂栧彿", prop: "id", default: true },
+ { label: "浜у搧鍚嶇О", prop: "productName" },
+ { label: "浜у搧瑙勬牸", prop: "specs" },
+ { label: "浜у搧鍨嬪彿", prop: "model" },
+ { label: "璁￠噺鍗曚綅", prop: "unit" },
+ { label: "鏁伴噺", prop: "amount" }
+ ],
+ allotProductColumn: [
+ { label: "浜у搧缂栧彿", prop: "id", default: true },
+ { label: "浜у搧鍚嶇О", prop: "productName" },
+ { label: "浜у搧瑙勬牸", prop: "specs" },
+ { label: "浜у搧鍨嬪彿", prop: "model" },
+ { label: "璁￠噺鍗曚綅", prop: "unit" },
+ { label: "璋冨嚭浣嶇疆", prop: "location" },
+ { label: "璋冨叆浣嶇疆", prop: "toLocation" },
+ { label: "鏁伴噺", prop: "amount" }
+ ]
}
},
created() {
@@ -188,6 +197,7 @@
}
}
this.tableList.allcol = allcol
+ this.tableBottomColumn = this.workType == 3 ? this.allotProductColumn : this.productColumn
this.setBottomList()
},
setTableColumn(showcol) {
@@ -229,12 +239,12 @@
default: false,
date: true
},
- // {
- // label: "浜у搧鍙敤鎬�",
- // prop: "status",
- // isShowColumn: showcol.includes("浜у搧鍙敤鎬�"),
- // default: false
- // },
+ {
+ label: "鏉ユ簮",
+ prop: "sourceType",
+ isShowColumn: showcol.includes("鏉ユ簮"),
+ default: false
+ },
// {
// label: "鎴鏃ユ湡",
// prop: "faultTime",
@@ -253,12 +263,12 @@
isShowColumn: showcol.includes("鏉ユ簮鍗曟嵁"),
default: false
},
- // {
- // label: "娆犲崟",
- // prop: "status",
- // isShowColumn: showcol.includes("娆犲崟"),
- // default: false
- // },
+ {
+ label: "閿�鍞槑缁嗗崟",
+ prop: "salesDetailsNumber",
+ isShowColumn: showcol.includes("閿�鍞槑缁嗗崟"),
+ default: false
+ },
{
label: "鍏ュ簱绫诲瀷",
prop: "operationTypeName",
@@ -316,7 +326,9 @@
return {
...item,
productName: item.product.name,
- unit: item.product.unit
+ unit: item.product.unit,
+ location: arr.location.name,
+ toLocation: arr.toLocation.name
}
})
this.productTableList.tableInfomation = list
--
Gitblit v1.8.0