From 91bea63c54be6e35adf1458b3caea6c7cbb58900 Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Sun, 13 Nov 2022 09:46:08 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E9=AA=8C=E6=94=B6bug=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/inventory/invPreInProducts.vue           | 9 +--------
 src/views/inventory/supInvPreInProducts.vue        | 9 +--------
 src/views/warehouse/stockOrderNewSelectProduct.vue | 5 +++++
 3 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/src/views/inventory/invPreInProducts.vue b/src/views/inventory/invPreInProducts.vue
index 7bd7d36..cbd2800 100644
--- a/src/views/inventory/invPreInProducts.vue
+++ b/src/views/inventory/invPreInProducts.vue
@@ -77,14 +77,7 @@
                 <el-table-column label="批次号" prop="batchNo" width="120"></el-table-column>
                 <el-table-column label="生产日期" prop="productionDate" width="120"></el-table-column>
                 <el-table-column label="失效日期" prop="expireDate" width="120"></el-table-column>
-                <el-table-column label="入库数量" prop="inCount" width="120"></el-table-column>
-                <el-table-column label="出库数量" prop="outCount" width="120"></el-table-column>
-
-                <el-table-column label="结余数量" prop="reCount" width="120">
-                    <template slot-scope="scope">
-                        {{ (scope.row.inCount - scope.row.outCount) }}
-                    </template>
-                </el-table-column>
+                <el-table-column label="数量" prop="inCount" width="120"></el-table-column>
                 <el-table-column label="生产厂家" prop="ylqxzcrbarmc" v-if="showSup" show-overflow-tooltip
                                  width="180"></el-table-column>
 
diff --git a/src/views/inventory/supInvPreInProducts.vue b/src/views/inventory/supInvPreInProducts.vue
index 0941ef2..f022cf0 100644
--- a/src/views/inventory/supInvPreInProducts.vue
+++ b/src/views/inventory/supInvPreInProducts.vue
@@ -80,14 +80,7 @@
                 <el-table-column label="批次号" prop="batchNo" width="120"></el-table-column>
                 <el-table-column label="生产日期" prop="productionDate" width="120"></el-table-column>
                 <el-table-column label="失效日期" prop="expireDate" width="120"></el-table-column>
-                <el-table-column label="入库数量" prop="inCount" width="120"></el-table-column>
-                <el-table-column label="出库数量" prop="outCount" width="120"></el-table-column>
-
-                <el-table-column label="结余数量" prop="reCount" width="120">
-                    <template slot-scope="scope">
-                        {{ (scope.row.inCount - scope.row.outCount) }}
-                    </template>
-                </el-table-column>
+                <el-table-column label="数量" prop="inCount" width="120"></el-table-column>
                 <el-table-column label="生产厂家" prop="ylqxzcrbarmc" v-if="showSup" show-overflow-tooltip
                                  width="120"></el-table-column>
 
diff --git a/src/views/warehouse/stockOrderNewSelectProduct.vue b/src/views/warehouse/stockOrderNewSelectProduct.vue
index 872ae51..01107d2 100644
--- a/src/views/warehouse/stockOrderNewSelectProduct.vue
+++ b/src/views/warehouse/stockOrderNewSelectProduct.vue
@@ -100,6 +100,11 @@
                         prop="qxlb"
                         show-overflow-tooltip
                     ></el-table-column>
+                    <el-table-column
+                        label="配送企业"
+                        prop="companyName"
+                        show-overflow-tooltip
+                    ></el-table-column>
                     <el-table-column label="操作" fixed="right" width="160">
                         <template slot-scope="scope">
                             <el-button