diff --git a/src/views/warehouse/IOCheckErrOrder.vue b/src/views/warehouse/IOCheckErrOrder.vue
index ad59b63..58ebe71 100644
--- a/src/views/warehouse/IOCheckErrOrder.vue
+++ b/src/views/warehouse/IOCheckErrOrder.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" width="120">
                 </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/warehouse/IONewOrder.vue b/src/views/warehouse/IONewOrder.vue
index 13edd7d..423bf8d 100644
--- a/src/views/warehouse/IONewOrder.vue
+++ b/src/views/warehouse/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,10 @@
                 <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>
diff --git a/src/views/warehouse/IOSearchOrder.vue b/src/views/warehouse/IOSearchOrder.vue
index 793ffad..6927063 100644
--- a/src/views/warehouse/IOSearchOrder.vue
+++ b/src/views/warehouse/IOSearchOrder.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/warehouse/IOWaitOrder.vue b/src/views/warehouse/IOWaitOrder.vue
index ff3769f..f847023 100644
--- a/src/views/warehouse/IOWaitOrder.vue
+++ b/src/views/warehouse/IOWaitOrder.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/warehouse/stockHospOrderNew.vue b/src/views/warehouse/stockHospOrderNew.vue
index bccccae..c257710 100644
--- a/src/views/warehouse/stockHospOrderNew.vue
+++ b/src/views/warehouse/stockHospOrderNew.vue
@@ -140,6 +140,7 @@
                             </el-select>
 
                             <el-select v-model="formData.fromSubInvCode" placeholder="请选择分库" clearable="true"
+                                       :disabled="codeArray.length>0"
                             >
                                 <el-option
                                     v-for="item in fromSubStorageOptions"
@@ -1242,7 +1243,7 @@ export default {
         locInChange() {
             this.$forceUpdate();
             // this.getBusType();
-            // this.invChange();
+            this.invChange();
             this.findStorageMethod();
         },
 
diff --git a/src/views/warehouse/stockOrder.vue b/src/views/warehouse/stockOrder.vue
index 872e3de..26b56a5 100644
--- a/src/views/warehouse/stockOrder.vue
+++ b/src/views/warehouse/stockOrder.vue
@@ -122,21 +122,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/warehouse/stockOrderDelSearch.vue b/src/views/warehouse/stockOrderDelSearch.vue
index bed36e1..8bb09f6 100644
--- a/src/views/warehouse/stockOrderDelSearch.vue
+++ b/src/views/warehouse/stockOrderDelSearch.vue
@@ -99,13 +99,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/warehouse/stockOrderEditor.vue b/src/views/warehouse/stockOrderEditor.vue
index a148d79..0d1d2c8 100644
--- a/src/views/warehouse/stockOrderEditor.vue
+++ b/src/views/warehouse/stockOrderEditor.vue
@@ -99,22 +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="120">
-                    <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/warehouse/stockOrderNew.vue b/src/views/warehouse/stockOrderNew.vue
index d3a9cab..96ecae6 100644
--- a/src/views/warehouse/stockOrderNew.vue
+++ b/src/views/warehouse/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/warehouse/stockOrderSearch.vue b/src/views/warehouse/stockOrderSearch.vue
index cfbb5b3..f6f4a32 100644
--- a/src/views/warehouse/stockOrderSearch.vue
+++ b/src/views/warehouse/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/warehouse/stockOrderWaitCheck.vue b/src/views/warehouse/stockOrderWaitCheck.vue
index 075cc3f..a1b7a3a 100644
--- a/src/views/warehouse/stockOrderWaitCheck.vue
+++ b/src/views/warehouse/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">-->