From 188620263ee93170f494a6a33e941af2f67616d0 Mon Sep 17 00:00:00 2001
From: zzg <zane0312@foxmail.com>
Date: Fri, 23 Aug 2024 10:24:09 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E5=8A=9F=E8=83=BD=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=E9=9A=90=E8=97=8F=20=E6=96=B0=E5=A2=9E=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/inout/receive/DialogNewReceive.vue   | 1 +
 src/views/inventory/count/InvCountOrderNew.vue | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/views/inout/receive/DialogNewReceive.vue b/src/views/inout/receive/DialogNewReceive.vue
index 7e53aa0d..a7e6b296 100644
--- a/src/views/inout/receive/DialogNewReceive.vue
+++ b/src/views/inout/receive/DialogNewReceive.vue
@@ -131,6 +131,7 @@
           <el-table-column label="DI/物资编码" prop="nameCode" width="160"></el-table-column>
           <el-table-column label="物资名称" prop="cpmctymc" width="180" show-overflow-tooltip="true"></el-table-column>
           <el-table-column label="规格型号" prop="ggxh" width="180" show-overflow-tooltip="true"></el-table-column>
+          <el-table-column label="包装规格" prop="bzgg" width="180" show-overflow-tooltip="true"></el-table-column>
           <el-table-column label="批次号" prop="batchNo" width="120" show-overflow-tooltip="true"></el-table-column>
           <el-table-column label="价格" prop="price" width="100" show-overflow-tooltip="true"></el-table-column>
           <el-table-column label="计量单位" prop="measname" show-overflow-tooltip="true" width="100"></el-table-column>
diff --git a/src/views/inventory/count/InvCountOrderNew.vue b/src/views/inventory/count/InvCountOrderNew.vue
index 36a0cb82..0635c6f1 100644
--- a/src/views/inventory/count/InvCountOrderNew.vue
+++ b/src/views/inventory/count/InvCountOrderNew.vue
@@ -128,8 +128,8 @@
           <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
           <el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
           <el-button type="primary" icon="el-icon-search" @click="onSubmit">查询</el-button>
-          <el-button type="primary" icon="el-icon-plus" @click="addCountOrder(0)">新增整库盘点</el-button>
-          <el-button type="primary" icon="el-icon-plus" @click="addCountOrder(1)">新增货位盘点</el-button>
+          <!-- <el-button type="primary" icon="el-icon-plus" @click="addCountOrder(0)">新增整库盘点</el-button> -->
+          <!-- <el-button type="primary" icon="el-icon-plus" @click="addCountOrder(1)">新增货位盘点</el-button> -->
           <el-button type="primary" icon="el-icon-plus" @click="addCountOrder(2)">新增部分盘点</el-button>
         </el-button-group>
       </div>