From ec8ee156aeb0baaf06e8ac29610c49ebfe887c85 Mon Sep 17 00:00:00 2001
From: "HUOJIN\\92525" <925258474@qq.com>
Date: Thu, 1 Aug 2024 18:15:49 +0800
Subject: [PATCH] no message

---
 src/views/business-data/inventory/index.vue | 6 +++---
 src/views/business-data/pick/index.vue      | 2 ++
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/views/business-data/inventory/index.vue b/src/views/business-data/inventory/index.vue
index e32befa..9d509a2 100644
--- a/src/views/business-data/inventory/index.vue
+++ b/src/views/business-data/inventory/index.vue
@@ -124,13 +124,13 @@
           </template>
         </el-table-column>
         <el-table-column prop="createTime" label="创建时间"/>
-        <el-table-column v-if="checkPer(['admin','fileManagement:edit','fileManagement:del'])" label="操作"
+        <el-table-column v-if="checkPer(['admin','fileManagement:edit','fileManagement:del']) && false " label="操作"
                          width="150px" align="center" fixed="right">
           <template slot-scope="scope">
-<!--            <el-popconfirm title="确定删除吗？"
+            <el-popconfirm title="确定删除吗？"
                            @confirm="deleteDataM(scope.row.id)">
               <el-button slot="reference" type="danger">删除</el-button>
-            </el-popconfirm>-->
+            </el-popconfirm>
           </template>
         </el-table-column>
       </el-table>
diff --git a/src/views/business-data/pick/index.vue b/src/views/business-data/pick/index.vue
index a062709..cb6c0b2 100644
--- a/src/views/business-data/pick/index.vue
+++ b/src/views/business-data/pick/index.vue
@@ -126,6 +126,8 @@
         <el-table-column prop="cpCodeOrDpCode" label="成品代码/单品代码"/>
         <el-table-column prop="station" label="需求工位"/>
         <el-table-column prop="point.code" label="翻包点位"/>
+        <el-table-column prop="stock.code" label="翻包容器"/>
+        <el-table-column prop="callPoint.code" label="叫料点位"/>
         <el-table-column prop="createTime" label="创建时间"/>
         <el-table-column v-if="checkPer(['admin','pick:edit','pick:del'])" label="操作" align="center">
           <template slot-scope="scope">