From 9ab49b4a00712a88f0bb9d0d26bd9963ebec4fb9 Mon Sep 17 00:00:00 2001
From: x_z <zrhdyxa@163.com>
Date: Wed, 29 Jun 2022 15:59:35 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=B7=B2=E9=AA=8C=E6=94=B6=E5=8D=95=E6=8D=AE?=
 =?UTF-8?q?=E5=92=8C=E6=9C=AA=E9=AA=8C=E6=94=B6=E5=8D=95=E6=8D=AE=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=88=97=E8=A1=A8=EF=BC=8C=E5=BD=93=E5=89=8D=E4=BB=93?=
 =?UTF-8?q?=E5=BA=93=E5=92=8C=E5=BD=93=E5=89=8D=E5=88=86=E5=BA=93=E4=BD=BF?=
 =?UTF-8?q?=E7=94=A8=E5=90=8E=E7=AB=AF=E8=BF=94=E5=9B=9E=E5=90=8D=E7=A7=B0?=
 =?UTF-8?q?=EF=BC=8C=E4=B8=8D=E5=86=8D=E4=BD=BF=E7=94=A8=E5=89=8D=E7=AB=AF?=
 =?UTF-8?q?=E5=8F=96=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/business/stockOrderDelSearch.vue | 13 ++-----------
 src/views/business/stockOrderSearch.vue    | 12 ++----------
 2 files changed, 4 insertions(+), 21 deletions(-)

diff --git a/src/views/business/stockOrderDelSearch.vue b/src/views/business/stockOrderDelSearch.vue
index 0198398..938f5a8 100644
--- a/src/views/business/stockOrderDelSearch.vue
+++ b/src/views/business/stockOrderDelSearch.vue
@@ -102,17 +102,8 @@
                         <span>{{ getActionName(scope.row.billType) }}</span>
                     </template>
                 </el-table-column>
-                <el-table-column label="当前仓库" prop="locStorageCode" width="120">
-                    <template slot-scope="scope">
-                        <span>{{ getStorageName(scope.row.locStorageCode) }}</span>
-                    </template>
-                </el-table-column>
-
-                <el-table-column label="当前分库" prop="invWarehouseCode" width="120">
-                    <template slot-scope="scope">
-                        <span>{{ getSubStorageName(scope.row.invWarehouseCode) }}</span>
-                    </template>
-                </el-table-column>
+                <el-table-column label="当前仓库" prop="locStorageName" width="120"></el-table-column>
+                <el-table-column label="当前分库" prop="invWarehouseName" width="120"></el-table-column>
                 <!--                <el-table-column label="采购类型">-->
                 <!--                    <template slot-scope="scope">-->
                 <!--                        {{ scope.row.type | typeFilterName }}-->
diff --git a/src/views/business/stockOrderSearch.vue b/src/views/business/stockOrderSearch.vue
index ba77161..9a8aa19 100644
--- a/src/views/business/stockOrderSearch.vue
+++ b/src/views/business/stockOrderSearch.vue
@@ -102,16 +102,8 @@
                         <span>{{ getActionName(scope.row.billType) }}</span>
                     </template>
                 </el-table-column>
-                <el-table-column label="当前仓库" prop="locStorageCode" width="120">
-                    <template slot-scope="scope">
-                        <span>{{ getStorageName(scope.row.locStorageCode) }}</span>
-                    </template>
-                </el-table-column>
-                <el-table-column label="当前分库" prop="invWarehouseCode" width="120">
-                    <template slot-scope="scope">
-                        <span>{{ getSubStorageName(scope.row.invWarehouseCode) }}</span>
-                    </template>
-                </el-table-column>
+                <el-table-column label="当前仓库" prop="locStorageName" width="120"></el-table-column>
+                <el-table-column label="当前分库" prop="invWarehouseName" width="120"></el-table-column>
                 <el-table-column label="操作" fixed="right" width="200">
                     <template slot-scope="scope">
                         <el-button