From bd9f756e20b8d49851b9d598240d06b4d38aecac Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期五, 22 三月 2024 11:25:13 +0800
Subject: [PATCH] 调拨产品新增增加"调出位置", "调入位置",

---
 src/views/overview/OverviewListView.vue |   38 +++++++++++++++++++++++++-------------
 1 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/src/views/overview/OverviewListView.vue b/src/views/overview/OverviewListView.vue
index 36c3d35..54d800b 100644
--- a/src/views/overview/OverviewListView.vue
+++ b/src/views/overview/OverviewListView.vue
@@ -95,15 +95,6 @@
   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: ["浠撳簱浣嶇疆", "璋冨嚭浣嶇疆", "璋冨叆浣嶇疆", "鑱旂郴浜�", "鏃ユ湡", "鏉ユ簮鍗曟嵁", "鐘舵��"],
@@ -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) {
@@ -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