From aa3460de4db8ff863a4034a4db06d7b3dd6a6523 Mon Sep 17 00:00:00 2001
From: anthonyywj2 <353682448@qq.com>
Date: Thu, 14 Jul 2022 10:37:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E5=8D=95=E6=8D=AE=E6=89=AB?=
 =?UTF-8?q?=E7=A0=81=E5=8D=95=E6=8D=AE=E4=BD=BF=E7=94=A8=E5=90=8E=E7=AB=AF?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E=E7=9A=84=E5=8D=95=E6=8D=AE=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0=EF=BC=8C=E4=BB=93=E5=BA=93=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/business/stockOrder.vue             | 16 +++----------
 src/views/business/stockOrderDelSearch.vue    | 11 ++++-----
 src/views/business/stockOrderEditor.vue       | 23 +++++--------------
 src/views/business/stockOrderNew.vue          | 18 +++------------
 .../business/stockOrderNewDistribution.vue    | 11 +++++----
 src/views/business/stockOrderSearch.vue       | 11 ++++-----
 src/views/business/stockOrderWaitCheck.vue    | 16 +++----------
 src/views/inout/IOCheckErrorOrder.vue         | 15 +++---------
 src/views/inout/IOCheckWaitOrder.vue          | 15 +++---------
 src/views/inout/IOFinishOrder.vue             | 15 +++---------
 src/views/inout/IONewOrder.vue                | 16 +++----------
 11 files changed, 44 insertions(+), 123 deletions(-)

diff --git a/src/views/business/stockOrder.vue b/src/views/business/stockOrder.vue
index 0debc94..75ccf78 100644
--- a/src/views/business/stockOrder.vue
+++ b/src/views/business/stockOrder.vue
@@ -114,21 +114,11 @@
                         {{ scope.row.status | statusFilterName }}
                     </template>
                 </el-table-column>
-                <el-table-column label="业务类型" prop="billType">
-                    <template slot-scope="scope">
-                        <span>{{ getActionName(scope.row.billType) }}</span>
-                    </template>
+                <el-table-column label="业务类型" prop="billTypeName" width="150">
                 </el-table-column>
-
-                <el-table-column label="当前仓库" prop="locStorageCode" width="150">
-                    <template slot-scope="scope">
-                        <span>{{ getStorageName(scope.row.locStorageCode) }}</span>
-                    </template>
+                <el-table-column label="当前仓库" prop="invName" width="150">
                 </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 label="当前分库" prop="subInvName" width="120">
                 </el-table-column>
                 <!--                <el-table-column label="采购类型">-->
                 <!--                    <template slot-scope="scope">-->
diff --git a/src/views/business/stockOrderDelSearch.vue b/src/views/business/stockOrderDelSearch.vue
index f1e3fdd..895b9dc 100644
--- a/src/views/business/stockOrderDelSearch.vue
+++ b/src/views/business/stockOrderDelSearch.vue
@@ -98,13 +98,12 @@
                         {{ scope.row.status | statusFilterName }}
                     </template>
                 </el-table-column>
-                <el-table-column label="业务类型" prop="billType">
-                    <template slot-scope="scope">
-                        <span>{{ getActionName(scope.row.billType) }}</span>
-                    </template>
+                <el-table-column label="业务类型" prop="billTypeName" width="150">
+                </el-table-column>
+                <el-table-column label="当前仓库" prop="invName" width="150">
+                </el-table-column>
+                <el-table-column label="当前分库" prop="subInvName" width="120">
                 </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/stockOrderEditor.vue b/src/views/business/stockOrderEditor.vue
index 7dbcc2d..6352319 100644
--- a/src/views/business/stockOrderEditor.vue
+++ b/src/views/business/stockOrderEditor.vue
@@ -100,23 +100,12 @@
                         {{ scope.row.status | statusFilterName }}
                     </template>
                 </el-table-column>
-                <el-table-column label="业务类型" prop="billType">
-                    <template slot-scope="scope">
-                        <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="billTypeName" width="150">
+              </el-table-column>
+              <el-table-column label="当前仓库" prop="invName" width="150">
+              </el-table-column>
+              <el-table-column label="当前分库" prop="subInvName" width="120">
+              </el-table-column>
                 <!--                <el-table-column label="采购类型">-->
                 <!--                    <template slot-scope="scope">-->
                 <!--                        {{ scope.row.type | typeFilterName }}-->
diff --git a/src/views/business/stockOrderNew.vue b/src/views/business/stockOrderNew.vue
index b1cb71b..aac3a90 100644
--- a/src/views/business/stockOrderNew.vue
+++ b/src/views/business/stockOrderNew.vue
@@ -107,23 +107,11 @@
                         {{ scope.row.status | statusFilterName }}
                     </template>
                 </el-table-column>
-                <el-table-column label="业务类型" prop="billType" width="150">
-                    <template slot-scope="scope">
-                        <span>{{ getActionName(scope.row.billType) }}</span>
-                    </template>
+                <el-table-column label="业务类型" prop="billTypeName" width="150">
                 </el-table-column>
-
-
-                <el-table-column label="当前仓库" prop="locStorageCode" width="150">
-                    <template slot-scope="scope">
-                        <span>{{ getStorageName(scope.row.locStorageCode) }}</span>
-                    </template>
+                <el-table-column label="当前仓库" prop="invName" width="150">
                 </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 label="当前分库" prop="subInvName" width="120">
                 </el-table-column>
                 <!--                <el-table-column label="采购类别" width="150">-->
                 <!--                    <template slot-scope="scope">-->
diff --git a/src/views/business/stockOrderNewDistribution.vue b/src/views/business/stockOrderNewDistribution.vue
index 2a1e300..92265e8 100644
--- a/src/views/business/stockOrderNewDistribution.vue
+++ b/src/views/business/stockOrderNewDistribution.vue
@@ -1166,7 +1166,7 @@ export default {
                         this.curAction = this.getActionItem(this.formData.billType);
                         if (this.curAction != null) {
                         } else {
-                            this.curAction = {corpType:0,genUnit: false,changeEnable:false,};
+                            this.curAction = {corpType: 0, genUnit: false, changeEnable: false,};
                             this.formData.billType = null;
                         }
                     }
@@ -1228,13 +1228,16 @@ export default {
         actionChange(item) {
             this.curAction = this.getActionItem(item);
             this.formData.corpName = '';
-            // this.locInChange();
-            // this.findMethod();
+            if (this.$isNotBlank(this.formData.fromSubInvCode)) {
+                this.formData.fromSubInvCode = '';
+            }
+            this.locInChange();
+            this.findMethod();
         },
         locInChange() {
             this.$forceUpdate();
             // this.getBusType();
-            this.invChange();
+            // this.invChange();
             this.findStorageMethod();
         },
         subStorageChange() {
diff --git a/src/views/business/stockOrderSearch.vue b/src/views/business/stockOrderSearch.vue
index 5b728db..f48fc66 100644
--- a/src/views/business/stockOrderSearch.vue
+++ b/src/views/business/stockOrderSearch.vue
@@ -98,13 +98,12 @@
                         {{ scope.row.status | statusFilterName }}
                     </template>
                 </el-table-column>
-                <el-table-column label="业务类型" prop="billType" show-overflow-tooltip>
-                    <template slot-scope="scope">
-                        <span>{{ getActionName(scope.row.billType) }}</span>
-                    </template>
+                <el-table-column label="业务类型" prop="billTypeName" width="150">
+                </el-table-column>
+                <el-table-column label="当前仓库" prop="invName" width="150">
+                </el-table-column>
+                <el-table-column label="当前分库" prop="subInvName" width="120">
                 </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
diff --git a/src/views/business/stockOrderWaitCheck.vue b/src/views/business/stockOrderWaitCheck.vue
index 4b1be5f..76f25b0 100644
--- a/src/views/business/stockOrderWaitCheck.vue
+++ b/src/views/business/stockOrderWaitCheck.vue
@@ -99,21 +99,11 @@
                         {{ scope.row.status | statusFilterName }}
                     </template>
                 </el-table-column>
-                <el-table-column label="业务类型" prop="billType">
-                    <template slot-scope="scope">
-                        <span>{{ getActionName(scope.row.billType) }}</span>
-                    </template>
+                <el-table-column label="业务类型" prop="billTypeName" width="150">
                 </el-table-column>
-
-                <el-table-column label="当前仓库" prop="locStorageCode" width="150">
-                    <template slot-scope="scope">
-                        <span>{{ getStorageName(scope.row.locStorageCode) }}</span>
-                    </template>
+                <el-table-column label="当前仓库" prop="invName" width="150">
                 </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 label="当前分库" prop="subInvName" width="120">
                 </el-table-column>
                 <!--                <el-table-column label="采购类型">-->
                 <!--                    <template slot-scope="scope">-->
diff --git a/src/views/inout/IOCheckErrorOrder.vue b/src/views/inout/IOCheckErrorOrder.vue
index 129e775..914b0c8 100644
--- a/src/views/inout/IOCheckErrorOrder.vue
+++ b/src/views/inout/IOCheckErrorOrder.vue
@@ -95,10 +95,7 @@
             >
                 <!--                <el-table-column type="selection" width="55"></el-table-column>-->
                 <el-table-column label="序号" type="index"></el-table-column>
-                <el-table-column label="扫码单据类型" prop="action" width="120">
-                    <template slot-scope="scope">
-                        <span>{{ getActionName(scope.row.action) }}</span>
-                    </template>
+                <el-table-column label="扫码单据类型" prop="billTypeName">
                 </el-table-column>
                 <el-table-column
                     label="订单号"
@@ -118,15 +115,9 @@
                 </el-table-column>
                 <el-table-column label="往来单位" prop="fromCorp" width="250">
                 </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 label="当前仓库" prop="invName" width="120">
                 </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 label="当前分库" prop="subInvName" width="120">
                 </el-table-column>
                 <el-table-column
                     label="创建时间"
diff --git a/src/views/inout/IOCheckWaitOrder.vue b/src/views/inout/IOCheckWaitOrder.vue
index fe377c1..a2e0610 100644
--- a/src/views/inout/IOCheckWaitOrder.vue
+++ b/src/views/inout/IOCheckWaitOrder.vue
@@ -94,10 +94,7 @@
             >
                 <el-table-column type="selection" width="55"></el-table-column>
                 <el-table-column label="序号" type="index"></el-table-column>
-                <el-table-column label="扫码单据类型" prop="action">
-                    <template slot-scope="scope">
-                        <span>{{ getActionName(scope.row.action) }}</span>
-                    </template>
+                <el-table-column label="扫码单据类型" prop="billTypeName">
                 </el-table-column>
                 <el-table-column
                     label="订单号"
@@ -116,15 +113,9 @@
                 </el-table-column>
                 <el-table-column label="往来单位" prop="fromCorp" width="250">
                 </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 label="当前仓库" prop="invName" width="120">
                 </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 label="当前分库" prop="subInvName" width="120">
                 </el-table-column>
                 <el-table-column
                     label="创建时间"
diff --git a/src/views/inout/IOFinishOrder.vue b/src/views/inout/IOFinishOrder.vue
index 123094d..97612f5 100644
--- a/src/views/inout/IOFinishOrder.vue
+++ b/src/views/inout/IOFinishOrder.vue
@@ -95,10 +95,7 @@
             >
                 <el-table-column type="selection" width="55"></el-table-column>
                 <el-table-column label="序号" type="index"></el-table-column>
-                <el-table-column label="扫码单据类型" prop="action">
-                    <template slot-scope="scope">
-                        <span>{{ getActionName(scope.row.action) }}</span>
-                    </template>
+                <el-table-column label="扫码单据类型" prop="billTypeName">
                 </el-table-column>
                 <el-table-column
                     label="订单号"
@@ -115,15 +112,9 @@
                 </el-table-column>
                 <el-table-column label="往来单位" prop="fromCorp" width="250">
                 </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 label="当前仓库" prop="invName" width="120">
                 </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 label="当前分库" prop="subInvName" width="120">
                 </el-table-column>
                 <el-table-column
                     label="创建时间"
diff --git a/src/views/inout/IONewOrder.vue b/src/views/inout/IONewOrder.vue
index 66c3ab9..020ea21 100644
--- a/src/views/inout/IONewOrder.vue
+++ b/src/views/inout/IONewOrder.vue
@@ -86,10 +86,7 @@
                       @selection-change="handleSelectionChange">
                 <el-table-column type="selection" width="55"></el-table-column>
                 <el-table-column label="序号" type="index"></el-table-column>
-                <el-table-column label="扫码单据类型" prop="action">
-                    <template slot-scope="scope">
-                        <span>{{ getActionName(scope.row.action) }}</span>
-                    </template>
+                <el-table-column label="扫码单据类型" prop="billTypeName">
                 </el-table-column>
                 <el-table-column label="订单号" prop="id" show-overflow-tooltip></el-table-column>
                 <el-table-column label="来源订单号" prop="corpOrderId" show-overflow-tooltip></el-table-column>
@@ -102,16 +99,9 @@
                 <el-table-column label="往来单位" prop="fromCorp" width="220">
 
                 </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 label="当前仓库" prop="invName" width="120">
                 </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 label="当前分库" prop="subInvName" width="120">
                 </el-table-column>
 
                 <el-table-column label="创建时间" prop="actDate" show-overflow-tooltip>