From c356ebfc46d6f98afb6eebc252db2db6718e25f2 Mon Sep 17 00:00:00 2001
From: zuozhengqing <a13193816592@163.com>
Date: 星期六, 28 十月 2023 15:58:18 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.5.5:10010/r/web/WMS into dev

---
 src/views/reportForm/locationReport/index.vue |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/views/reportForm/locationReport/index.vue b/src/views/reportForm/locationReport/index.vue
index 1313a7f..6efd9ed 100644
--- a/src/views/reportForm/locationReport/index.vue
+++ b/src/views/reportForm/locationReport/index.vue
@@ -60,7 +60,7 @@
   data() {
     return {
       tableList: {},
-      showcol: ["浜у搧绫诲埆","浠峰��",],
+      showcol: ["瀛樺偍绫诲埆", "浜у搧绫诲埆", "棰勭暀鏁伴噺", "浠峰��"],
       // countcol: [
       //   { label: "鍦ㄥ簱鏁伴噺", unit: "" },
       //   { label: "棰勭暀鏁伴噺", unit: "" },
@@ -171,8 +171,8 @@
         {
           label: "棰勭暀鏁伴噺",
           prop: "availableStore",
-          default: false,
-          isShowColumn: showcol.includes("棰勭暀鏁伴噺"),
+          isShowColumn: true,
+          default: true,
           unit: "",
           textAlign:"right"
         },
@@ -186,6 +186,7 @@
         {
           label: "浠峰��",
           prop: "value",
+          width: 120,
           default: false,
           isShowColumn: showcol.includes("浠峰��"),
           textAlign:"right",

--
Gitblit v1.8.0