From b182bb5f94738b76e160672e665f73f04c233eac Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期四, 25 一月 2024 18:55:37 +0800
Subject: [PATCH] +位置报表点击离职调整到库存操作的出入库明细带上该行的产品名称搜索条件

---
 src/views/operate/allot/index.vue |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/views/operate/allot/index.vue b/src/views/operate/allot/index.vue
index 7e8cc34..01b29bf 100644
--- a/src/views/operate/allot/index.vue
+++ b/src/views/operate/allot/index.vue
@@ -57,7 +57,7 @@
   data() {
     return {
       tableList: {},
-      showcol: ["浠�", "鑷�", "鑱旂郴浜�", "鏃ユ湡", "鏉ユ簮鍗曟嵁", "鍏徃", "鐘舵��"],
+      showcol: ["璋冨嚭浣嶇疆", "璋冨叆浣嶇疆", "鑱旂郴浜�", "鏃ユ湡", "鏉ユ簮鍗曟嵁", "鍏徃", "鐘舵��"],
       searchOptions: [],
       editConfig: {
         visible: false,
@@ -99,15 +99,15 @@
           default: true
         },
         {
-          label: "浠�",
+          label: "璋冨嚭浣嶇疆",
           prop: "from",
-          isShowColumn: showcol.includes("浠�"),
+          isShowColumn: showcol.includes("璋冨嚭浣嶇疆"),
           default: false
         },
         {
-          label: "鑷�",
+          label: "璋冨叆浣嶇疆",
           prop: "to",
-          isShowColumn: showcol.includes("鑷�"),
+          isShowColumn: showcol.includes("璋冨叆浣嶇疆"),
           default: false
         },
         {
@@ -230,8 +230,8 @@
           const list = res.data.map((item) => {
             return {
               ...item,
-              from: item.fromLocation.name,
-              to: item.toLocation.name
+              from: item.location.jointName,
+              // to: item.toLocation.name
             }
           })
           this.tableList.tableInfomation = list || []
@@ -260,7 +260,7 @@
     },
     // 鐘舵��
     getStatus(val) {
-      return val === 1 ? "鑽夌" : val === 3 ? "灏辩华" : "瀹屾垚"
+      return val === 1 ? "鑽夌" : val === 3 ? "灏辩华" :val===4? "瀹屾垚": "鍙栨秷"
     }
   }
 }

--
Gitblit v1.8.0