From 58bbf892a8c04c22018221d0fa18982c9b0ef44b Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Fri, 24 Jun 2022 22:39:41 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E5=BA=93=E5=8A=9F=E8=83=BDbug?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/config.json                            |    4 +-
 src/api/warehouse/order.js                    |    8 +
 src/views/basic/invWarehouse.vue              |   25 +-
 src/views/inventory/invPreInProducts.vue      |    2 +
 src/views/inventory/invPreProducts.vue        |    2 +
 src/views/warehouse/AdditionalOrder.vue       |   30 +
 src/views/warehouse/IOCheckErrOrder.vue       |   15 +-
 src/views/warehouse/IOErrorOrder.vue          |    5 +-
 src/views/warehouse/IONewOrder.vue            |   18 +-
 src/views/warehouse/IOSearchOrder.vue         |   15 +-
 src/views/warehouse/IOWaitOrder.vue           |   15 +-
 src/views/warehouse/stockHospOrderNew.vue     |    1 +
 src/views/warehouse/stockOrder.vue            |   16 +
 src/views/warehouse/stockOrderDelSearch.vue   |   16 +-
 .../warehouse/stockOrderEditDistribution.vue  |   31 -
 src/views/warehouse/stockOrderEditor.vue      | 1900 +++++++++--------
 src/views/warehouse/stockOrderNew.vue         |   14 +
 .../warehouse/stockOrderNewDistribution.vue   |    1 +
 src/views/warehouse/stockOrderSearch.vue      |   15 +-
 src/views/warehouse/stockOrderWaitCheck.vue   |   16 +-
 20 files changed, 1156 insertions(+), 993 deletions(-)

diff --git a/public/config.json b/public/config.json
index 61112ea..5c4341b 100644
--- a/public/config.json
+++ b/public/config.json
@@ -1,5 +1,5 @@
 {
-    "BASE_URL": "http://192.168.0.109:9996",
-    "SERVER_IP": "http://192.168.0.109:9996",
+    "BASE_URL": "http://192.168.1.2:9996",
+    "SERVER_IP": "http://192.168.1.2:9996",
     "hosp_name": "诏安县总医院（测试）"
 }
diff --git a/src/api/warehouse/order.js b/src/api/warehouse/order.js
index a0de0f1..13fcfd2 100644
--- a/src/api/warehouse/order.js
+++ b/src/api/warehouse/order.js
@@ -197,6 +197,14 @@ export function commitOrder(query) {
     });
 }
 
+export function repeatCommitOrder(query) {
+    return axios({
+        url: "/warehouse/inout/repeatCommitOrder",
+        method: "post",
+        data: query
+    });
+}
+
 export function addCommitOrder(query) {
     return axios({
         url: "/warehouse/inout/addCommit",
diff --git a/src/views/basic/invWarehouse.vue b/src/views/basic/invWarehouse.vue
index d46d257..27c4460 100644
--- a/src/views/basic/invWarehouse.vue
+++ b/src/views/basic/invWarehouse.vue
@@ -227,13 +227,13 @@
                         min-width="30%"
                     >
                         <template slot-scope="scope">
-                            <el-button
-                                type="text"
-                                size="small"
-                                @click.native="updateDirector(scope.row)">
+<!--                            <el-button-->
+<!--                                type="text"-->
+<!--                                size="small"-->
+<!--                                @click.native="updateDirector(scope.row)">-->
 
-                                {{ directorMap[scope.row.director] }}
-                            </el-button>
+<!--                                {{ directorMap[scope.row.director] }}-->
+<!--                            </el-button>-->
                             <el-button
                                 type="text"
                                 size="small"
@@ -663,7 +663,7 @@ export default {
                 children: "children",
                 label: "name"
             },
-            setDictor: "设为主管",
+            // setDictor: "设为主管",
             fileList: [],
             pCodes: [],
             uploadData: {},
@@ -671,7 +671,7 @@ export default {
             index: null,
             formName: null,
             formMap: {
-                addTop: "添加仓库",
+                addTop: "添加分库",
                 add: "添加货位",
                 edit: "编辑"
             },
@@ -827,6 +827,7 @@ export default {
             if (formName === "edit") {
                 this.subData = data;
             } else if (formName === "add") {
+                this.subData = {};
                 this.subData.parentId = data.code;
             }
             ;
@@ -882,6 +883,11 @@ export default {
 
         //添加分库
         forSubSubmit() {
+
+            if (this.$isBlank(this.subData.name)) {
+                this.$message.error("分库名称不能为空！");
+                return;
+            }
             saveSubWarehouse(this.subData, this.subFromName).then((response) => {
                 if (response.code == 20000) {
                     this.loadSubData(this.subData.parentId);
@@ -1079,7 +1085,8 @@ export default {
 
         loadSubData(parentId) {
 
-
+            this.userData = [];
+            this.bussinessTypeData = [];
             let subQuery = {
                 parentId: parentId,
             }
diff --git a/src/views/inventory/invPreInProducts.vue b/src/views/inventory/invPreInProducts.vue
index 76dd8cf..10b3a16 100644
--- a/src/views/inventory/invPreInProducts.vue
+++ b/src/views/inventory/invPreInProducts.vue
@@ -92,6 +92,8 @@
                                  width="120"></el-table-column>
                 <el-table-column label="仓库" prop="invStorageName" v-if="showSup"
                                  show-overflow-tooltip width="120"></el-table-column>
+                <el-table-column label="分库" prop="invSubStorageName" v-if="showSup"
+                                 show-overflow-tooltip width="120"></el-table-column>
                 <el-table-column label="操作" width="120" fixed="right">
                     <template slot-scope="scope">
                         <el-button
diff --git a/src/views/inventory/invPreProducts.vue b/src/views/inventory/invPreProducts.vue
index c921375..25dc23f 100644
--- a/src/views/inventory/invPreProducts.vue
+++ b/src/views/inventory/invPreProducts.vue
@@ -100,6 +100,8 @@
                                  width="120"></el-table-column>
                 <el-table-column label="仓库" prop="invStorageName" v-if="showSup"
                                  show-overflow-tooltip width="120"></el-table-column>
+                <el-table-column label="分库" prop="invSubStorageName" v-if="showSup"
+                                 show-overflow-tooltip width="120"></el-table-column>
                 <el-table-column label="操作" width="120" fixed="right">
                     <template slot-scope="scope">
                         <el-button
diff --git a/src/views/warehouse/AdditionalOrder.vue b/src/views/warehouse/AdditionalOrder.vue
index 63c685a..602605c 100644
--- a/src/views/warehouse/AdditionalOrder.vue
+++ b/src/views/warehouse/AdditionalOrder.vue
@@ -27,6 +27,7 @@
                     </el-form-item>
                     <el-form-item class="query-form-item">
                         <el-select v-model="filterQuery.locStorageCode" placeholder="请选择当前仓库" clearable="true"
+                                   @change="invChange"
                                    size="mini">
                             <el-option
                                 v-for="item in storageList"
@@ -37,6 +38,18 @@
                             </el-option>
                         </el-select>
                     </el-form-item>
+                    <el-form-item class="query-form-item">
+                        <el-select v-model="filterQuery.invWarehouseCode" placeholder="请选择当前分库" clearable="true"
+                                   size="mini">
+                            <el-option
+                                v-for="item in subInvList"
+                                :key="item.name"
+                                :label="item.name"
+                                :value="item.code">
+                                <span style="float: left">{{ item.name }}</span>
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
                     <el-form-item>
                         <el-button-group>
                             <el-button
@@ -256,6 +269,7 @@ import {getBussinessType} from "../../api/basic/bussinessType";
 import {getBasicUnitMaintains} from "@/api/basic/basicUnitMaintain";
 import {filterAllByUser} from "@/api/basic/invWarehouse";
 import {getLocalJoinByUser} from "@/api/basic/busLocalType";
+import {filterSubByInv} from "@/api/basic/invSubWarehouse";
 
 const formJson = {
     site_id: "",
@@ -308,6 +322,7 @@ export default {
             },
             list: [],
             storageList: [],
+            subInvList: [],
             queryAdIdAsyncLoading: false,
             codeDetailVisible: false,
             total: 0,
@@ -509,6 +524,21 @@ export default {
                 .catch(() => {
                 });
         },
+
+        invChange() {
+            this.filterQuery.invWarehouseCode = "";
+            this.subInvList = [];
+            let query = {
+                pcode: this.filterQuery.locStorageCode
+            };
+            filterSubByInv(query)
+                .then((response) => {
+                    this.subInvList = response.data || [];
+                })
+                .catch(() => {
+                });
+        },
+
         getStorageName(code) {
             for (let i = 0; i < this.storageList.length; i++) {
                 if (this.storageList[i].code === code) {
diff --git a/src/views/warehouse/IOCheckErrOrder.vue b/src/views/warehouse/IOCheckErrOrder.vue
index 807332e..64cb0b7 100644
--- a/src/views/warehouse/IOCheckErrOrder.vue
+++ b/src/views/warehouse/IOCheckErrOrder.vue
@@ -117,11 +117,16 @@
                 </el-table-column>
                 <el-table-column label="往来单位" prop="fromCorp" width="250">
                 </el-table-column>
-                <el-table-column label="当前仓库" prop="locStorageCode" width="150">
+                <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="actDate"
@@ -831,6 +836,13 @@ export default {
                 }
             }
         },
+        getSubStorageName(code) {
+            for (let i = 0; i < this.subInvList.length; i++) {
+                if (this.subInvList[i].code === code) {
+                    return this.subInvList[i].name;
+                }
+            }
+        },
         repeatPrintCheckClick(row) {
             let tQuery = {
                 orderId: row.id,
@@ -1230,6 +1242,7 @@ export default {
         },
         invChange() {
             this.subInvList = [];
+            this.filterQuery.invWarehouseCode = "";
             let query = {
                 pcode: this.filterQuery.locStorageCode
             };
diff --git a/src/views/warehouse/IOErrorOrder.vue b/src/views/warehouse/IOErrorOrder.vue
index abe8b1a..d1543d2 100644
--- a/src/views/warehouse/IOErrorOrder.vue
+++ b/src/views/warehouse/IOErrorOrder.vue
@@ -269,7 +269,7 @@ import {
     filterOrder,
     deleteByOrderId,
     commitOrder,
-    updateUnit,
+    updateUnit, repeatCommitOrder,
 } from "../../api/warehouse/order";
 
 import draggable from "vuedraggable";
@@ -502,7 +502,7 @@ export default {
                 orderId: "",
             };
             idQuery.orderId = data;
-            commitOrder(idQuery)
+            repeatCommitOrder(idQuery)
                 .then((response) => {
                     if (response.code === 20000) {
                         this.$message.success(response.data);
@@ -570,6 +570,7 @@ export default {
         },
         invChange() {
             this.subInvList = [];
+            this.filterQuery.invWarehouseCode = "";
             let query = {
                 pcode: this.filterQuery.locStorageCode
             };
diff --git a/src/views/warehouse/IONewOrder.vue b/src/views/warehouse/IONewOrder.vue
index 474b85f..50c68db 100644
--- a/src/views/warehouse/IONewOrder.vue
+++ b/src/views/warehouse/IONewOrder.vue
@@ -100,11 +100,18 @@
                 <el-table-column label="往来单位" prop="fromCorp" width="220">
 
                 </el-table-column>
-                <el-table-column label="当前仓库" prop="locStorageCode" width="150">
+                <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="actDate" show-overflow-tooltip>
                     <template slot-scope="scope">
                         <i class="el-icon-time"></i>
@@ -456,6 +463,13 @@ export default {
                 }
             }
         },
+        getSubStorageName(code) {
+            for (let i = 0; i < this.subInvList.length; i++) {
+                if (this.subInvList[i].code === code) {
+                    return this.subInvList[i].name;
+                }
+            }
+        },
         addOrders(row) {
             console.log(row)
             this.idQuery.id = '';
@@ -633,6 +647,7 @@ export default {
             idQuery.orderId = data;
             commitOrder(idQuery)
                 .then((response) => {
+                    this.loading = false;
                     if (response.code == 20000) {
                         this.$message.success(response.data);
                         this.getList();
@@ -660,6 +675,7 @@ export default {
         },
         invChange() {
             this.subInvList = [];
+            this.filterQuery.invWarehouseCode = "";
             let query = {
                 pcode: this.filterQuery.locStorageCode
             };
diff --git a/src/views/warehouse/IOSearchOrder.vue b/src/views/warehouse/IOSearchOrder.vue
index 8d723a7..af4b14e 100644
--- a/src/views/warehouse/IOSearchOrder.vue
+++ b/src/views/warehouse/IOSearchOrder.vue
@@ -114,11 +114,16 @@
                 </el-table-column>
                 <el-table-column label="往来单位" prop="fromCorp" width="250">
                 </el-table-column>
-                <el-table-column label="当前仓库" prop="locStorageCode" width="150">
+                <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="actDate"
@@ -634,6 +639,13 @@ export default {
                 }
             }
         },
+        getSubStorageName(code) {
+            for (let i = 0; i < this.subInvList.length; i++) {
+                if (this.subInvList[i].code === code) {
+                    return this.subInvList[i].name;
+                }
+            }
+        },
         handleErrorDetail(poistion) {
             var mOrder = this.list[poistion];
             this.errorDetail = mOrder.remark;
@@ -943,6 +955,7 @@ export default {
             }
         },
         invChange() {
+            this.filterQuery.invWarehouseCode = "";
             this.subInvList = [];
             let query = {
                 pcode: this.filterQuery.locStorageCode
diff --git a/src/views/warehouse/IOWaitOrder.vue b/src/views/warehouse/IOWaitOrder.vue
index 29cbb5e..aefa0da 100644
--- a/src/views/warehouse/IOWaitOrder.vue
+++ b/src/views/warehouse/IOWaitOrder.vue
@@ -115,11 +115,16 @@
         </el-table-column>
         <el-table-column label="往来单位" prop="fromCorp" width="250">
         </el-table-column>
-        <el-table-column label="当前仓库" prop="locStorageCode" width="150">
+        <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="actDate"
@@ -636,6 +641,13 @@ export default {
         }
       }
     },
+      getSubStorageName(code) {
+          for (let i = 0; i < this.subInvList.length; i++) {
+              if (this.subInvList[i].code === code) {
+                  return this.subInvList[i].name;
+              }
+          }
+      },
     handleErrorDetail(poistion) {
       var mOrder = this.list[poistion];
       this.errorDetail = mOrder.remark;
@@ -995,6 +1007,7 @@ export default {
           });
     },
     invChange() {
+        this.filterQuery.invWarehouseCode = "";
       this.subInvList = [];
       let query = {
         pcode: this.filterQuery.locStorageCode
diff --git a/src/views/warehouse/stockHospOrderNew.vue b/src/views/warehouse/stockHospOrderNew.vue
index 2c3206f..54c9e1d 100644
--- a/src/views/warehouse/stockHospOrderNew.vue
+++ b/src/views/warehouse/stockHospOrderNew.vue
@@ -1180,6 +1180,7 @@ export default {
             this.findStorageMethod();
         },
         invChange() {
+            this.formData.invWarehouseCode = "";
             this.subInvList = [];
             let query = {
                 pcode: this.formData.locStorageCode
diff --git a/src/views/warehouse/stockOrder.vue b/src/views/warehouse/stockOrder.vue
index 5785793..1a6e635 100644
--- a/src/views/warehouse/stockOrder.vue
+++ b/src/views/warehouse/stockOrder.vue
@@ -131,6 +131,11 @@
                         <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="采购类型">-->
                 <!--                    <template slot-scope="scope">-->
                 <!--                        {{ scope.row.type | typeFilterName }}-->
@@ -783,6 +788,16 @@ export default {
                 }
             }
         },
+
+
+        getSubStorageName(code) {
+            for (let i = 0; i < this.subInvList.length; i++) {
+                if (this.subInvList[i].code === code) {
+                    return this.subInvList[i].name;
+                }
+            }
+        },
+
         getStorage() {
             this.storageList = [];
             filterAllByUser()
@@ -798,6 +813,7 @@ export default {
         },
 
         invChange() {
+            this.query.invWarehouseCode = "";
             this.subInvList = [];
             let query = {
                 pcode: this.query.locStorageCode
diff --git a/src/views/warehouse/stockOrderDelSearch.vue b/src/views/warehouse/stockOrderDelSearch.vue
index 1b4b44c..bba3471 100644
--- a/src/views/warehouse/stockOrderDelSearch.vue
+++ b/src/views/warehouse/stockOrderDelSearch.vue
@@ -102,11 +102,17 @@
                         <span>{{ getActionName(scope.row.billType) }}</span>
                     </template>
                 </el-table-column>
-                <el-table-column label="当前仓库" prop="locStorageCode" width="150">
+                <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="采购类型">-->
                 <!--                    <template slot-scope="scope">-->
                 <!--                        {{ scope.row.type | typeFilterName }}-->
@@ -837,6 +843,13 @@ export default {
                 }
             }
         },
+        getSubStorageName(code) {
+            for (let i = 0; i < this.subInvList.length; i++) {
+                if (this.subInvList[i].code === code) {
+                    return this.subInvList[i].name;
+                }
+            }
+        },
         getStorage() {
             this.storageList = [];
             filterAllByUser()
@@ -852,6 +865,7 @@ export default {
         },
 
         invChange() {
+            this.query.invWarehouseCode = "";
             this.subInvList = [];
             let query = {
                 pcode: this.query.locStorageCode
diff --git a/src/views/warehouse/stockOrderEditDistribution.vue b/src/views/warehouse/stockOrderEditDistribution.vue
index cf9278b..d7e5604 100644
--- a/src/views/warehouse/stockOrderEditDistribution.vue
+++ b/src/views/warehouse/stockOrderEditDistribution.vue
@@ -62,24 +62,6 @@
                     <el-col :span="7">
                         <el-form-item prop="corpName">
                             <el-input v-model="formData.corpName" auto-complete="off" :disabled="true"></el-input>
-                            <!--                            <el-select-->
-                            <!--                                style="width: 100%"-->
-                            <!--                                v-model="sValue"-->
-                            <!--                                :multiple="false"-->
-                            <!--                                filterable-->
-                            <!--                                remote-->
-                            <!--                                reserve-keyword-->
-                            <!--                                placeholder="请输入供应商名称"-->
-                            <!--                                :remote-method="remoteMethod"-->
-                            <!--                                :loading="sLoading"-->
-                            <!--                                @change="selectOne">-->
-                            <!--                                <el-option-->
-                            <!--                                    v-for="item in sOptions"-->
-                            <!--                                    :key="idx"-->
-                            <!--                                    :label="item.name"-->
-                            <!--                                    :value="item">-->
-                            <!--                                </el-option>-->
-                            <!--                        </el-select>-->
                         </el-form-item>
                     </el-col>
                     <el-col :span="3">
@@ -104,19 +86,6 @@
                 </el-row>
 
                 <el-row :gutter="20" style="margin-top: -10px;">
-                    <!--                    <el-col :span="3">-->
-                    <!--                        <div class="ao-text">-->
-                    <!--                            <span>采购类型：</span>-->
-                    <!--                        </div>-->
-                    <!--                    </el-col>-->
-                    <!--                    <el-col :span="7">-->
-                    <!--                        <el-form-item prop="type">-->
-                    <!--                            <el-select v-model="formData.type" style="width: 100%" placeholder="采购类型">-->
-                    <!--                                <el-option label="预入库" value="1"></el-option>-->
-                    <!--                                <el-option label="普通采购" value="2"></el-option>-->
-                    <!--                            </el-select>-->
-                    <!--                        </el-form-item>-->
-                    <!--                    </el-col>-->
                     <el-col :span="3">
                         <div class="ao-text">
                             <span>当前仓库：</span>
diff --git a/src/views/warehouse/stockOrderEditor.vue b/src/views/warehouse/stockOrderEditor.vue
index 2af037b..61d8838 100644
--- a/src/views/warehouse/stockOrderEditor.vue
+++ b/src/views/warehouse/stockOrderEditor.vue
@@ -1,501 +1,508 @@
 <template>
-  <div>
-    <el-card class="el-card">
-      <el-form
-          :inline="true"
-          :model="query"
-          class="query-form"
-          size="mini"
-      >
-        <el-row>
-          <el-form-item class="query-form-item">
-            <el-input v-model="query.billNo" placeholder="单据号" clearable></el-input>
-          </el-form-item>
-          <el-form-item class="query-form-item">
-            <el-select v-model="query.billType" placeholder="请选择业务类型" clearable="true" size="mini">
-              <el-option
-                  v-for="item in busTypes"
-                  :key="item.localName"
-                  :label="item.localName"
-                  :value="item.localAction">
-                <span style="float: left">{{ item.localName }}</span>
-              </el-option>
-            </el-select>
-          </el-form-item>
-
-          <el-form-item class="query-form-item" v-if="isSp ==110">
-            <el-input v-model="query.corpName" placeholder="往来单位" clearable></el-input>
-          </el-form-item>
-          <el-form-item class="query-form-item">
-            <el-select v-model="query.locStorageCode"
-                       @change="invChange"
-                       placeholder="请选择当前仓库" clearable="true" size="mini">
-              <el-option
-                  v-for="item in storageList"
-                  :key="item.name"
-                  :label="item.name"
-                  :value="item.code">
-                <span style="float: left">{{ item.name }}</span>
-              </el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item class="query-form-item">
-            <el-select v-model="query.invWarehouseCode" placeholder="请选择当前分库" clearable="true"
-                       size="mini">
-              <el-option
-                  v-for="item in subInvList"
-                  :key="item.name"
-                  :label="item.name"
-                  :value="item.code">
-                <span style="float: left">{{ item.name }}</span>
-              </el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item class="query-form-item">
-            <span style="color: #000; margin-left: 10px; margin-right: 6px">单据日期:</span>
-            <el-date-picker
-                :picker-options="pickerOptions"
-                v-model="actDateRange"
-                type="daterange"
-                format="yyyy 年 MM 月 dd 日"
-                value-format="yyyy-MM-dd"
-                range-separator="至"
-                start-placeholder="开始日期"
-                end-placeholder="结束日期"
+    <div>
+        <el-card class="el-card">
+            <el-form
+                :inline="true"
+                :model="query"
+                class="query-form"
+                size="mini"
             >
-            </el-date-picker>
-          </el-form-item>
+                <el-row>
+                    <el-form-item class="query-form-item">
+                        <el-input v-model="query.billNo" placeholder="单据号" clearable></el-input>
+                    </el-form-item>
+                    <el-form-item class="query-form-item">
+                        <el-select v-model="query.billType" placeholder="请选择业务类型" clearable="true" size="mini">
+                            <el-option
+                                v-for="item in busTypes"
+                                :key="item.localName"
+                                :label="item.localName"
+                                :value="item.localAction">
+                                <span style="float: left">{{ item.localName }}</span>
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
 
-          <el-form-item>
-            <el-button-group>
-              <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
-              <el-button type="primary" icon="search" @click="onSubmit">查询</el-button>
-              <el-button type="primary" icon="search" @click="selectThrOrderFunction()"
-                         :loading="loading">选入订单
-              </el-button>
-            </el-button-group>
-          </el-form-item>
-        </el-row>
-      </el-form>
-      <el-table v-loading="loading"
-                :data="list"
-                style="width: 100%; "
-                @row-click="getStockOrderDetailList" ref="multipleTable">
-        <el-table-column
-            type="selection"
-            width="55">
-        </el-table-column>
-        <el-table-column type="index" label="序号" width="50"></el-table-column>
-        <el-table-column label="单据号" prop="billNo" show-overflow-tooltip></el-table-column>
-        <el-table-column label="往来单位" prop="corpName" show-overflow-tooltip></el-table-column>
-        <el-table-column label="单据来源" prop="sourceType" width="150">
-          <template slot-scope="scope">
-            <span>{{ sourceMap[scope.row.sourceType] }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="单据日期" prop="billdate"></el-table-column>
-        <el-table-column label="单据状态">
-          <template slot-scope="scope">
-            {{ 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="150">
-          <template slot-scope="scope">
-            <span>{{ getStorageName(scope.row.locStorageCode) }}</span>
-          </template>
-        </el-table-column>
-        <!--                <el-table-column label="采购类型">-->
-        <!--                    <template slot-scope="scope">-->
-        <!--                        {{ scope.row.type | typeFilterName }}-->
-        <!--                    </template>-->
-        <!--                </el-table-column>-->
-        <el-table-column label="操作" fixed="right" width="250">
-          <template slot-scope="scope">
-            <el-button
-                type="text"
-                size="small"
-                @click.native="distributionForm(scope.$index, scope.row)"
-                v-if="!haveDistributionVisible"
-            >编辑
-            </el-button
-            >
-            <el-button
-                type="text"
-                size="small"
-                @click.native="deleteStockOrder(scope.row)"
-            >删除
-            </el-button
-            >
-            <el-button
-                type="text"
-                size="small"
-                @click.native="printOrder(scope.row)"
-            >单据打印
-            </el-button
-            >
+                    <el-form-item class="query-form-item" v-if="isSp ==110">
+                        <el-input v-model="query.corpName" placeholder="往来单位" clearable></el-input>
+                    </el-form-item>
+                    <el-form-item class="query-form-item">
+                        <el-select v-model="query.locStorageCode"
+                                   @change="invChange"
+                                   placeholder="请选择当前仓库" clearable="true" size="mini">
+                            <el-option
+                                v-for="item in storageList"
+                                :key="item.name"
+                                :label="item.name"
+                                :value="item.code">
+                                <span style="float: left">{{ item.name }}</span>
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item class="query-form-item">
+                        <el-select v-model="query.invWarehouseCode" placeholder="请选择当前分库" clearable="true"
+                                   size="mini">
+                            <el-option
+                                v-for="item in subInvList"
+                                :key="item.name"
+                                :label="item.name"
+                                :value="item.code">
+                                <span style="float: left">{{ item.name }}</span>
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item class="query-form-item">
+                        <span style="color: #000; margin-left: 10px; margin-right: 6px">单据日期:</span>
+                        <el-date-picker
+                            :picker-options="pickerOptions"
+                            v-model="actDateRange"
+                            type="daterange"
+                            format="yyyy 年 MM 月 dd 日"
+                            value-format="yyyy-MM-dd"
+                            range-separator="至"
+                            start-placeholder="开始日期"
+                            end-placeholder="结束日期"
+                        >
+                        </el-date-picker>
+                    </el-form-item>
 
+                    <el-form-item>
+                        <el-button-group>
+                            <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
+                            <el-button type="primary" icon="search" @click="onSubmit">查询</el-button>
+                            <el-button type="primary" icon="search" @click="selectThrOrderFunction()"
+                                       :loading="loading">选入订单
+                            </el-button>
+                        </el-button-group>
+                    </el-form-item>
+                </el-row>
+            </el-form>
+            <el-table v-loading="loading"
+                      :data="list"
+                      style="width: 100%; "
+                      @row-click="getStockOrderDetailList" ref="multipleTable">
+                <el-table-column
+                    type="selection"
+                    width="55">
+                </el-table-column>
+                <el-table-column type="index" label="序号" width="50"></el-table-column>
+                <el-table-column label="单据号" prop="billNo" show-overflow-tooltip></el-table-column>
+                <el-table-column label="往来单位" prop="corpName" show-overflow-tooltip></el-table-column>
+                <el-table-column label="单据来源" prop="sourceType" width="150">
+                    <template slot-scope="scope">
+                        <span>{{ sourceMap[scope.row.sourceType] }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column label="单据日期" prop="billdate"></el-table-column>
+                <el-table-column label="单据状态">
+                    <template slot-scope="scope">
+                        {{ 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>
 
-          </template>
-        </el-table-column>
-      </el-table>
-      <el-pagination
-          :page-size="query.limit"
-          @current-change="handleCurrentChange"
-          layout="prev, pager, next"
-          :total="total"
-      >
-      </el-pagination>
-    </el-card>
 
-    <el-card class="el-card">
-      <el-table v-loading="detailLoading"
-                :data="detailList"
-                style="width: 100%">
-        <el-table-column type="index" label="序号" width="50"></el-table-column>
-        <el-table-column label="产品通用名" width="150" prop="productName"></el-table-column>
-        <el-table-column label="规格型号" width="150" prop="spec"></el-table-column>
-        <el-table-column label="批次号" width="150" prop="batchNo"></el-table-column>
-        <el-table-column label="生产日期" width="150" prop="productDate"></el-table-column>
-        <el-table-column label="失效日期" width="150" prop="expireDate"></el-table-column>
-        <el-table-column label="实际数量" width="150" prop="reCount"></el-table-column>
-        <el-table-column label="单据数量" width="150" prop="count"></el-table-column>
-        <el-table-column label="价格" width="150" prop="price"></el-table-column>
-        <el-table-column label="生产厂家" width="150" prop="ylqxzcrbarmc"></el-table-column>
-        <el-table-column label="注册/备案凭证号" width="150" prop="zczbhhzbapzbh"></el-table-column>
-        <el-table-column label="操作" fixed="right" width="250">
-          <template slot-scope="scope" v-if="!haveDistributionVisible">
-            <el-button
-                type="text"
-                size="small"
-                @click.native="handleDetailForm(scope.$index, scope.row)"
-            >编辑
-            </el-button
-            >
-            <el-button
-                type="text"
-                size="small"
-                @click.native="copyDetail(scope.row)"
-            >复制
-            </el-button
-            >
-            <el-button
-                type="text"
-                size="small"
-                @click.native="deleteStockOrderDetail(scope.row)"
-            >删除
-            </el-button
+                <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="采购类型">-->
+                <!--                    <template slot-scope="scope">-->
+                <!--                        {{ scope.row.type | typeFilterName }}-->
+                <!--                    </template>-->
+                <!--                </el-table-column>-->
+                <el-table-column label="操作" fixed="right" width="250">
+                    <template slot-scope="scope">
+                        <el-button
+                            type="text"
+                            size="small"
+                            @click.native="distributionForm(scope.$index, scope.row)"
+                            v-if="!haveDistributionVisible"
+                        >编辑
+                        </el-button
+                        >
+                        <el-button
+                            type="text"
+                            size="small"
+                            @click.native="deleteStockOrder(scope.row)"
+                        >删除
+                        </el-button
+                        >
+                        <el-button
+                            type="text"
+                            size="small"
+                            @click.native="printOrder(scope.row)"
+                        >单据打印
+                        </el-button
+                        >
+
+
+                    </template>
+                </el-table-column>
+            </el-table>
+            <el-pagination
+                :page-size="query.limit"
+                @current-change="handleCurrentChange"
+                layout="prev, pager, next"
+                :total="total"
             >
-          </template>
-        </el-table-column>
-      </el-table>
+            </el-pagination>
+        </el-card>
 
-      <el-pagination
-          :page-size="detailQuery.limit"
-          @current-change="detailHandleCurrentChange"
-          layout="prev, pager, next"
-          :total="detailTotal"
-      >
-      </el-pagination>
-    </el-card>
-    <el-dialog
-        title="单据配货管理"
-        :visible.sync="distributionVisible"
-        width="80%"
-        v-if="distributionVisible"
-        @close='closeDialog'
-        :close-on-click-modal="false"
-        :close-on-press-escape="false"
-        :before-close="handleClose"
-    >
-      <stockOrderEditDistribution
-          :closeDialog="closeDialog"
-          :idQuery="idQuery"
-          :detailCountMax="detailCountMax"
+        <el-card class="el-card">
+            <el-table v-loading="detailLoading"
+                      :data="detailList"
+                      style="width: 100%">
+                <el-table-column type="index" label="序号" width="50"></el-table-column>
+                <el-table-column label="产品通用名" width="150" prop="productName"></el-table-column>
+                <el-table-column label="规格型号" width="150" prop="spec"></el-table-column>
+                <el-table-column label="批次号" width="150" prop="batchNo"></el-table-column>
+                <el-table-column label="生产日期" width="150" prop="productDate"></el-table-column>
+                <el-table-column label="失效日期" width="150" prop="expireDate"></el-table-column>
+                <el-table-column label="实际数量" width="150" prop="reCount"></el-table-column>
+                <el-table-column label="单据数量" width="150" prop="count"></el-table-column>
+                <el-table-column label="价格" width="150" prop="price"></el-table-column>
+                <el-table-column label="生产厂家" width="150" prop="ylqxzcrbarmc"></el-table-column>
+                <el-table-column label="注册/备案凭证号" width="150" prop="zczbhhzbapzbh"></el-table-column>
+                <el-table-column label="操作" fixed="right" width="250">
+                    <template slot-scope="scope" v-if="!haveDistributionVisible">
+                        <el-button
+                            type="text"
+                            size="small"
+                            @click.native="handleDetailForm(scope.$index, scope.row)"
+                        >编辑
+                        </el-button
+                        >
+                        <el-button
+                            type="text"
+                            size="small"
+                            @click.native="copyDetail(scope.row)"
+                        >复制
+                        </el-button
+                        >
+                        <el-button
+                            type="text"
+                            size="small"
+                            @click.native="deleteStockOrderDetail(scope.row)"
+                        >删除
+                        </el-button
+                        >
+                    </template>
+                </el-table-column>
+            </el-table>
 
-      ></stockOrderEditDistribution>
-    </el-dialog>
+            <el-pagination
+                :page-size="detailQuery.limit"
+                @current-change="detailHandleCurrentChange"
+                layout="prev, pager, next"
+                :total="detailTotal"
+            >
+            </el-pagination>
+        </el-card>
+        <el-dialog
+            title="单据配货管理"
+            :visible.sync="distributionVisible"
+            width="80%"
+            v-if="distributionVisible"
+            @close='closeDialog'
+            :close-on-click-modal="false"
+            :close-on-press-escape="false"
+            :before-close="handleClose"
+        >
+            <stockOrderEditDistribution
+                :closeDialog="closeDialog"
+                :idQuery="idQuery"
+                :detailCountMax="detailCountMax"
 
+            ></stockOrderEditDistribution>
+        </el-dialog>
 
-    <el-dialog
-        title="码管理"
-        :visible.sync="qrcodeExportVisible"
-        :close-on-click-modal="false"
-        :close-on-press-escape="false"
-        width="60%"
-        v-if="qrcodeExportVisible"
-        @close='closeQRCodeExportDialog'
-    >
-      <stockQRCodeExport
-          :closeDialog="closeQRCodeExportDialog"
-          :idQuery="idQuery"
-      ></stockQRCodeExport>
-    </el-dialog>
 
+        <el-dialog
+            title="码管理"
+            :visible.sync="qrcodeExportVisible"
+            :close-on-click-modal="false"
+            :close-on-press-escape="false"
+            width="60%"
+            v-if="qrcodeExportVisible"
+            @close='closeQRCodeExportDialog'
+        >
+            <stockQRCodeExport
+                :closeDialog="closeQRCodeExportDialog"
+                :idQuery="idQuery"
+            ></stockQRCodeExport>
+        </el-dialog>
 
-    <el-dialog
-        title="编辑"
-        :visible.sync="detailFormVisible"
-        :before-close="hideDetailForm"
-        :close-on-click-modal="false"
-        :close-on-press-escape="false"
-        width="85%"
-        top="5vh"
-    >
 
-      <el-form :model="detailFormData" :rules="detailFormRules" ref="dataForm">
+        <el-dialog
+            title="编辑"
+            :visible.sync="detailFormVisible"
+            :before-close="hideDetailForm"
+            :close-on-click-modal="false"
+            :close-on-press-escape="false"
+            width="85%"
+            top="5vh"
+        >
 
-        <el-row :gutter="20">
-          <el-col :span="3">
-            <div class="ao-text">
-              <span>单据号：</span>
-            </div>
-          </el-col>
-          <el-col :span="7">
-            <el-form-item prop="billNo">
-              <el-input v-model="formData.billNo" auto-complete="off" :disabled="true"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="3">
-            <div class="ao-text">
-              <span>单据状态：</span>
-            </div>
-          </el-col>
-          <el-col :span="7">
-            <el-form-item prop="status">
-              <el-input v-model="statusMap[formData.status]" auto-complete="off"
-                        :disabled="true"></el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
+            <el-form :model="detailFormData" :rules="detailFormRules" ref="dataForm">
 
-        <el-row :gutter="20">
-          <el-col :span="3">
-            <div class="ao-text">
-              <span>单据日期：</span>
-            </div>
-          </el-col>
-          <el-col :span="7">
-            <el-form-item prop="billdate">
-              <el-input v-model="formData.billdate" auto-complete="off" :disabled="true"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="3">
-            <div class="ao-text">
-              <span>往来单位：</span>
-            </div>
-          </el-col>
-          <el-col :span="7">
-            <el-form-item prop="corpName">
-              <el-input v-model="formData.corpName" auto-complete="off" :disabled="true"></el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
+                <el-row :gutter="20">
+                    <el-col :span="3">
+                        <div class="ao-text">
+                            <span>单据号：</span>
+                        </div>
+                    </el-col>
+                    <el-col :span="7">
+                        <el-form-item prop="billNo">
+                            <el-input v-model="formData.billNo" auto-complete="off" :disabled="true"></el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="3">
+                        <div class="ao-text">
+                            <span>单据状态：</span>
+                        </div>
+                    </el-col>
+                    <el-col :span="7">
+                        <el-form-item prop="status">
+                            <el-input v-model="statusMap[formData.status]" auto-complete="off"
+                                      :disabled="true"></el-input>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
 
-        <el-row :gutter="20">
-          <el-col :span="3">
-            <div class="ao-text">
-              <span>业务类型：</span>
-            </div>
-          </el-col>
-          <el-col :span="7">
-            <el-form-item prop="billType">
-              <el-select v-model="formData.billType" placeholder="请选择业务类型" clearable="true"
-                         disabled="true">
-                <el-option
-                    v-for="item in busTypes"
-                    :key="item.localName"
-                    :label="item.localName"
-                    :value="item.localAction">
-                  <span style="float: left">{{ item.localName }}</span>
-                  <!--<span style="float: right; color: #8492a6; font-size: 13px">{{ item.action }}</span>-->
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="3">
-            <div class="ao-text">
-              <span>采购类型：</span>
-            </div>
-          </el-col>
-          <el-col :span="7">
-            <el-form-item prop="type">
-              <el-input v-model="typeMap[formData.type]" auto-complete="off" :disabled="true"></el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
+                <el-row :gutter="20">
+                    <el-col :span="3">
+                        <div class="ao-text">
+                            <span>单据日期：</span>
+                        </div>
+                    </el-col>
+                    <el-col :span="7">
+                        <el-form-item prop="billdate">
+                            <el-input v-model="formData.billdate" auto-complete="off" :disabled="true"></el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="3">
+                        <div class="ao-text">
+                            <span>往来单位：</span>
+                        </div>
+                    </el-col>
+                    <el-col :span="7">
+                        <el-form-item prop="corpName">
+                            <el-input v-model="formData.corpName" auto-complete="off" :disabled="true"></el-input>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
 
-        <el-divider></el-divider>
+                <el-row :gutter="20">
+                    <el-col :span="3">
+                        <div class="ao-text">
+                            <span>业务类型：</span>
+                        </div>
+                    </el-col>
+                    <el-col :span="7">
+                        <el-form-item prop="billType">
+                            <el-select v-model="formData.billType" placeholder="请选择业务类型" clearable="true"
+                                       disabled="true">
+                                <el-option
+                                    v-for="item in busTypes"
+                                    :key="item.localName"
+                                    :label="item.localName"
+                                    :value="item.localAction">
+                                    <span style="float: left">{{ item.localName }}</span>
+                                    <!--<span style="float: right; color: #8492a6; font-size: 13px">{{ item.action }}</span>-->
+                                </el-option>
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="3">
+                        <div class="ao-text">
+                            <span>采购类型：</span>
+                        </div>
+                    </el-col>
+                    <el-col :span="7">
+                        <el-form-item prop="type">
+                            <el-input v-model="typeMap[formData.type]" auto-complete="off" :disabled="true"></el-input>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
 
-        <el-row :gutter="20">
-          <el-col :span="3">
-            <div class="ao-text">
-              <span>产品通用名：</span>
-            </div>
-          </el-col>
-          <el-col :span="7">
-            <el-form-item prop="productName">
-              <el-input v-model="detailFormData.productName" auto-complete="off"
-                        :disabled="true"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="3">
-            <div class="ao-text">
-              <span>包装规格：</span>
-            </div>
-          </el-col>
-          <el-col :span="7">
-            <el-form-item prop="spec">
-              <el-input v-model="detailFormData.spec" auto-complete="off" :disabled="true"></el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="3">
-            <div class="ao-text">
-              <span>单据数量：</span>
-            </div>
-          </el-col>
-          <el-col :span="7">
-            <el-form-item prop="count">
-              <el-input v-model="detailFormData.count" auto-complete="off" :disabled="true"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="3">
-            <div class="ao-text">
-              <span>实际数量：</span>
-            </div>
-          </el-col>
-          <el-col :span="7">
-            <el-form-item prop="reCount">
-              <el-input v-model="detailFormData.reCount" auto-complete="off"
-                        oninput="value=value.replace(/[^\d]/g,'')"></el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="3">
-            <div class="ao-text">
-              <span>生产日期：</span>
-            </div>
-          </el-col>
-          <el-col :span="7">
-            <el-form-item prop="productDate">
-              <!--              <el-input v-model="detailFormData.productDate" auto-complete="off"-->
-              <!--                        :disabled="false"></el-input>-->
-              <!--                            <el-date-picker-->
-              <!--                                type="date"-->
-              <!--                                size="small" v-model="detailFormData.productDate"-->
-              <!--                                placeholder="请选择生产日期" style="width: 80%"-->
-              <!--                                value-format="yyMMdd"-->
-              <!--                                format="yyyy-MM-dd"-->
-              <!--                            >-->
-              <!--                            </el-date-picker>-->
-              <el-input v-model="detailFormData.productDate" auto-complete="off"
-                        oninput="if(value.length>6)value=value.slice(0,6)"
-                        type="number"
-                        :disabled="false"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="3">
-            <div class="ao-text">
-              <span>失效日期：</span>
-            </div>
-          </el-col>
-          <el-col :span="7">
-            <el-form-item prop="expireDate">
-              <!--              <el-input v-model="detailFormData.expireDate" auto-complete="off"-->
-              <!--                        :disabled="false"></el-input>-->
-              <el-input v-model="detailFormData.expireDate" auto-complete="off"
-                        oninput="if(value.length>6)value=value.slice(0,6)"
-                        type="number"
-                        :disabled="false"></el-input>
+                <el-divider></el-divider>
 
+                <el-row :gutter="20">
+                    <el-col :span="3">
+                        <div class="ao-text">
+                            <span>产品通用名：</span>
+                        </div>
+                    </el-col>
+                    <el-col :span="7">
+                        <el-form-item prop="productName">
+                            <el-input v-model="detailFormData.productName" auto-complete="off"
+                                      :disabled="true"></el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="3">
+                        <div class="ao-text">
+                            <span>包装规格：</span>
+                        </div>
+                    </el-col>
+                    <el-col :span="7">
+                        <el-form-item prop="spec">
+                            <el-input v-model="detailFormData.spec" auto-complete="off" :disabled="true"></el-input>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-row :gutter="20">
+                    <el-col :span="3">
+                        <div class="ao-text">
+                            <span>单据数量：</span>
+                        </div>
+                    </el-col>
+                    <el-col :span="7">
+                        <el-form-item prop="count">
+                            <el-input v-model="detailFormData.count" auto-complete="off" :disabled="true"></el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="3">
+                        <div class="ao-text">
+                            <span>实际数量：</span>
+                        </div>
+                    </el-col>
+                    <el-col :span="7">
+                        <el-form-item prop="reCount">
+                            <el-input v-model="detailFormData.reCount" auto-complete="off"
+                                      oninput="value=value.replace(/[^\d]/g,'')"></el-input>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-row :gutter="20">
+                    <el-col :span="3">
+                        <div class="ao-text">
+                            <span>生产日期：</span>
+                        </div>
+                    </el-col>
+                    <el-col :span="7">
+                        <el-form-item prop="productDate">
+                            <!--              <el-input v-model="detailFormData.productDate" auto-complete="off"-->
+                            <!--                        :disabled="false"></el-input>-->
+                            <!--                            <el-date-picker-->
+                            <!--                                type="date"-->
+                            <!--                                size="small" v-model="detailFormData.productDate"-->
+                            <!--                                placeholder="请选择生产日期" style="width: 80%"-->
+                            <!--                                value-format="yyMMdd"-->
+                            <!--                                format="yyyy-MM-dd"-->
+                            <!--                            >-->
+                            <!--                            </el-date-picker>-->
+                            <el-input v-model="detailFormData.productDate" auto-complete="off"
+                                      oninput="if(value.length>6)value=value.slice(0,6)"
+                                      type="number"
+                                      :disabled="false"></el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="3">
+                        <div class="ao-text">
+                            <span>失效日期：</span>
+                        </div>
+                    </el-col>
+                    <el-col :span="7">
+                        <el-form-item prop="expireDate">
+                            <!--              <el-input v-model="detailFormData.expireDate" auto-complete="off"-->
+                            <!--                        :disabled="false"></el-input>-->
+                            <el-input v-model="detailFormData.expireDate" auto-complete="off"
+                                      oninput="if(value.length>6)value=value.slice(0,6)"
+                                      type="number"
+                                      :disabled="false"></el-input>
 
-              <!--                            <el-date-picker-->
-              <!--                                type="date"-->
-              <!--                                size="small" v-model="detailFormData.expireDate"-->
-              <!--                                placeholder="请选择失效日期" style="width: 80%"-->
-              <!--                                value-format="yyMMdd"-->
-              <!--                                format="yyyy-MM-dd"-->
-              <!--                            >-->
-              <!--                            </el-date-picker>-->
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="3">
-            <div class="ao-text">
-              <span>批次号：</span>
-            </div>
-          </el-col>
-          <el-col :span="7">
-            <el-form-item prop="batchNo">
-              <el-input v-model="detailFormData.batchNo" auto-complete="off" :disabled="false"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="3">
-            <div class="ao-text">
-              <span>价格：</span>
+
+                            <!--                            <el-date-picker-->
+                            <!--                                type="date"-->
+                            <!--                                size="small" v-model="detailFormData.expireDate"-->
+                            <!--                                placeholder="请选择失效日期" style="width: 80%"-->
+                            <!--                                value-format="yyMMdd"-->
+                            <!--                                format="yyyy-MM-dd"-->
+                            <!--                            >-->
+                            <!--                            </el-date-picker>-->
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-row :gutter="20">
+                    <el-col :span="3">
+                        <div class="ao-text">
+                            <span>批次号：</span>
+                        </div>
+                    </el-col>
+                    <el-col :span="7">
+                        <el-form-item prop="batchNo">
+                            <el-input v-model="detailFormData.batchNo" auto-complete="off" :disabled="false"></el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="3">
+                        <div class="ao-text">
+                            <span>价格：</span>
+                        </div>
+                    </el-col>
+                    <el-col :span="7">
+                        <el-form-item prop="price">
+                            <el-input v-model="detailFormData.price" auto-complete="off" :disabled="false"></el-input>
+                        </el-form-item>
+                    </el-col>
+                    <!--                    <el-col :span="3">-->
+                    <!--                        <div class="ao-text">-->
+                    <!--                            <span>扫码数量：</span>-->
+                    <!--                        </div>-->
+                    <!--                    </el-col>-->
+                    <!--                    <el-col :span="7">-->
+                    <!--                        <el-form-item prop="sweepCount">-->
+                    <!--                            <el-input v-model="detailFormData.sweepCount" auto-complete="off" :disabled="false"-->
+                    <!--                                      oninput="value=value.replace(/[^\d]/g,'')" ></el-input>-->
+                    <!--                        </el-form-item>-->
+                    <!--                    </el-col>-->
+                </el-row>
+            </el-form>
+            <div slot="footer" class="dialog-footer">
+                <el-button @click.native="hideDetailForm">取消</el-button>
+                <el-button
+                    type="primary"
+                    @click.native="submitUploadDetail()"
+                    :loading="detailFormLoading"
+                >提交
+                </el-button
+                >
             </div>
-          </el-col>
-          <el-col :span="7">
-            <el-form-item prop="price">
-              <el-input v-model="detailFormData.price" auto-complete="off" :disabled="false"></el-input>
-            </el-form-item>
-          </el-col>
-          <!--                    <el-col :span="3">-->
-          <!--                        <div class="ao-text">-->
-          <!--                            <span>扫码数量：</span>-->
-          <!--                        </div>-->
-          <!--                    </el-col>-->
-          <!--                    <el-col :span="7">-->
-          <!--                        <el-form-item prop="sweepCount">-->
-          <!--                            <el-input v-model="detailFormData.sweepCount" auto-complete="off" :disabled="false"-->
-          <!--                                      oninput="value=value.replace(/[^\d]/g,'')" ></el-input>-->
-          <!--                        </el-form-item>-->
-          <!--                    </el-col>-->
-        </el-row>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button @click.native="hideDetailForm">取消</el-button>
-        <el-button
-            type="primary"
-            @click.native="submitUploadDetail()"
-            :loading="detailFormLoading"
-        >提交
-        </el-button
-        >
-      </div>
-    </el-dialog>
+        </el-dialog>
 
-    <el-dialog
-        title="选入订单"
-        :visible.sync="selectThrOrderVisible"
-        :close-on-click-modal="false"
-        :close-on-press-escape="false"
-        width="85%"
-        v-if="selectThrOrderVisible"
-    >
-      <selectThrOrder
-          :closeDialog="closeDialog"
-          :data="thisData"
-      ></selectThrOrder>
-    </el-dialog>
-  </div>
+        <el-dialog
+            title="选入订单"
+            :visible.sync="selectThrOrderVisible"
+            :close-on-click-modal="false"
+            :close-on-press-escape="false"
+            width="85%"
+            v-if="selectThrOrderVisible"
+        >
+            <selectThrOrder
+                :closeDialog="closeDialog"
+                :data="thisData"
+            ></selectThrOrder>
+        </el-dialog>
+    </div>
 </template>
 
 <script>
 import {
-  stockOrderList, stockOrderDetail,
-  deleteStockOrderById, deleteStockOrderDetailById,
-  copyStockOrderDetail, submitStockOrder,
-  uploadStockOrderDetail, uploadStockOrderDetailCount,
-  generateStockOrderQRCodeText
+    stockOrderList, stockOrderDetail,
+    deleteStockOrderById, deleteStockOrderDetailById,
+    copyStockOrderDetail, submitStockOrder,
+    uploadStockOrderDetail, uploadStockOrderDetailCount,
+    generateStockOrderQRCodeText
 } from "../../api/warehouse/stockOrder";
 import {BASE_URL} from "../../config/app";
 import stockOrderDistribution from "./stockOrderDistribution";
@@ -513,496 +520,505 @@ import {filterAll, filterAllByUser} from "@/api/basic/invWarehouse";
 import {filterSubByInv} from "@/api/basic/invSubWarehouse";
 
 export default {
-  name: "stockOrderEditor",
-  data() {
-    return {
-      query: {
-        billType: null,
-        corpName: null,
-        locStorageCode: this.$store.getters.locInvCode,
-        invWarehouseCode: this.$store.getters.locSubInvCode,
-        billNo: "",
-        status: "2",
-        startTime: "",
-        endTime: "",
-        page: 1,
-        limit: 10
-      },
-      detailQuery: {
-        orderIdFk: "",
-        page: 1,
-        limit: 20
-      },
-      list: [],
-      storageList: [],
-      subInvList: [],
-      isSp: store.getters.customerId,
-      busTypes: [],
-      detailList: [],
-      total: 0,
-      detailTotal: 0,
-      loading: false,
-      detailLoading: false,
-      formData: {},
-      detailCountMax: false,
-      sourceMap: {
-        "1": "web端新增单据",
-        "2": "第三方系统",
-        "3": "扫码单据转换",
-      },
-      statusMap: {
-        "1": "草稿",
-        "2": "未配货",
-        "3": "待校验",
-      },
-      typeMap: {
-        1: "预入库",
-        2: "普通采购",
-      },
-      idQuery: {
-        id: "",
-      },
-      distributionVisible: false,
-      detailFormRules: {
-        batchNo: [
-          {required: true, message: "请输入批次号", trigger: "blur"}
-        ],
-        productDate: [
-          {required: true, message: "请输入生产日期", trigger: "blur"}
-        ],
-        expireDate: [
-          {required: true, message: "请输入失效日期", trigger: "blur"}
-        ],
-        sweepCount: [
-          {required: true, message: "请输入扫码数量", trigger: "blur"}
-        ]
-      },
-      detailFormVisible: false,
-      detailFormData: {},
-      detailFormLoading: false,
-      haveDistributionVisible: false,
-      qrcodeExportVisible: false,
-      filterUDIType: false,
-      selectThrOrderVisible: false,
-      thisData: {},
-      actDateRange: [],
-      pickerOptions: {
-        shortcuts: [
-          {
-            text: "最近一周",
-            onClick(picker) {
-              const end = new Date();
-              const start = new Date();
-              start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
-              picker.$emit("pick", [start, end]);
+    name: "stockOrderEditor",
+    data() {
+        return {
+            query: {
+                billType: null,
+                corpName: null,
+                locStorageCode: this.$store.getters.locInvCode,
+                invWarehouseCode: this.$store.getters.locSubInvCode,
+                billNo: "",
+                status: "2",
+                startTime: "",
+                endTime: "",
+                page: 1,
+                limit: 10
             },
-          },
-          {
-            text: "最近一个月",
-            onClick(picker) {
-              const end = new Date();
-              const start = new Date();
-              start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
-              picker.$emit("pick", [start, end]);
+            detailQuery: {
+                orderIdFk: "",
+                page: 1,
+                limit: 20
             },
-          },
-          {
-            text: "最近三个月",
-            onClick(picker) {
-              const end = new Date();
-              const start = new Date();
-              start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
-              picker.$emit("pick", [start, end]);
+            list: [],
+            storageList: [],
+            subInvList: [],
+            isSp: store.getters.customerId,
+            busTypes: [],
+            detailList: [],
+            total: 0,
+            detailTotal: 0,
+            loading: false,
+            detailLoading: false,
+            formData: {},
+            detailCountMax: false,
+            sourceMap: {
+                "1": "web端新增单据",
+                "2": "第三方系统",
+                "3": "扫码单据转换",
+            },
+            statusMap: {
+                "1": "草稿",
+                "2": "未配货",
+                "3": "待校验",
+            },
+            typeMap: {
+                1: "预入库",
+                2: "普通采购",
+            },
+            idQuery: {
+                id: "",
+            },
+            distributionVisible: false,
+            detailFormRules: {
+                batchNo: [
+                    {required: true, message: "请输入批次号", trigger: "blur"}
+                ],
+                productDate: [
+                    {required: true, message: "请输入生产日期", trigger: "blur"}
+                ],
+                expireDate: [
+                    {required: true, message: "请输入失效日期", trigger: "blur"}
+                ],
+                sweepCount: [
+                    {required: true, message: "请输入扫码数量", trigger: "blur"}
+                ]
+            },
+            detailFormVisible: false,
+            detailFormData: {},
+            detailFormLoading: false,
+            haveDistributionVisible: false,
+            qrcodeExportVisible: false,
+            filterUDIType: false,
+            selectThrOrderVisible: false,
+            thisData: {},
+            actDateRange: [],
+            pickerOptions: {
+                shortcuts: [
+                    {
+                        text: "最近一周",
+                        onClick(picker) {
+                            const end = new Date();
+                            const start = new Date();
+                            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+                            picker.$emit("pick", [start, end]);
+                        },
+                    },
+                    {
+                        text: "最近一个月",
+                        onClick(picker) {
+                            const end = new Date();
+                            const start = new Date();
+                            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+                            picker.$emit("pick", [start, end]);
+                        },
+                    },
+                    {
+                        text: "最近三个月",
+                        onClick(picker) {
+                            const end = new Date();
+                            const start = new Date();
+                            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+                            picker.$emit("pick", [start, end]);
+                        },
+                    },
+                ],
             },
-          },
-        ],
-      },
-    }
-  },
-  methods: {
-    onReset() {
-      this.$router.push({
-        path: ""
-      });
-      this.query = {
-        startTime: "",
-        endTime: "",
-        billNo: "",
-        status: "2",
-        page: 1,
-        limit: 10
-      };
-      this.getList();
-      this.detailList = [];
-      this.haveDistributionVisible = false;
-      this.actDateRange = [];
-    },
-    onSubmit() {
-      if (this.actDateRange !== null) {
-        this.query.startTime = this.actDateRange[0];
-        this.query.endTime = this.actDateRange[1];
-      } else {
-        this.query.startTime = null;
-        this.query.endTime = null;
-      }
-
-      this.getList();
-      if (this.query.status === "202") {
-        this.haveDistributionVisible = true;
-      } else {
-        this.haveDistributionVisible = false;
-      }
-    },
-    handleCurrentChange(val) {
-      this.query.page = val;
-      this.getList();
-    },
-    detailHandleCurrentChange(val) {
-      this.query.page = val;
-      this.getStockOrderDetailList();
-    },
-    // 刷新表单
-    resetForm() {
-      if (this.$refs["dataForm"]) {
-        // 清空验证信息表单
-        this.$refs["dataForm"].clearValidate();
-        // 刷新表单
-        this.$refs["dataForm"].resetFields();
-        this.getList();
-      }
-    },
-    getList() {
-      this.loading = true;
-      this.query.corpId = store.getters.customerId;
-      stockOrderList(this.query)
-          .then(response => {
-            this.loading = false;
-            this.list = response.data.list || [];
-            this.detailList = [];
-            this.total = response.data.total || 0;
-          })
-          .catch(() => {
-            this.loading = false;
-            this.list = [];
-            this.detailList = [];
-            this.total = 0;
-          });
-    },
-    distributionForm(index, row) {
-      this.idQuery.id = '';
-      console.log("row = " + row.id);
-      if (this.$isNotBlank(row.id)) {
-        this.idQuery.id = row.id;
-        this.idQuery.formData = row;
-        this.distributionVisible = true;
-      }
-    },
-    selectThrOrderFunction() {
-      this.selectThrOrderVisible = true;
-    },
-    closeDialog(type) {
-      this.distributionVisible = false;
-      this.selectThrOrderVisible = false;
-      this.getList();
-      if (this.$isNotBlank(type)) {
-        this.detailList = [];
-      }
-    },
-    exportQRCodeText(row) {
-      this.idQuery.id = '';
-      if (this.$isNotBlank(row.id)) {
-        this.idQuery.id = row.id;
-        this.idQuery.formData = row;
-        this.qrcodeExportVisible = true;
-      }
-    },
-    printOrder(row) {
-      let tQuery = {
-        queryId: row.id,
-        moduleId: 5,
-      }
-      this.loading = true;
-      inspectionStockOrderPDFFromTemplateFile(tQuery).then((response) => {
-        if (response.code === 20000) {
-          tQuery = {
-            id: row.id,
-            moduleId: 5,
-            orderName: "配货单",
-          }
-          stockOrderPDFFromTemplateFile(tQuery).then((response) => {
-            //将pdf文件转换为url。
-            const binaryData = [];
-            binaryData.push(response);
-            //获取blob链接。
-            let url = window.URL.createObjectURL(
-                new Blob(binaryData, {type: "application/pdf"})
-            );
-            this.loading = false;
-            window.open(url);//打开新标签页，预览pdf。
-          }).catch(() => {
-            this.loading = false;
-          });
-        } else {
-          this.loading = false;
-          this.$message.error(response.message);
         }
-      }).catch(() => {
-        this.loading = false;
-      });
-    },
-    closeQRCodeExportDialog() {
-      this.qrcodeExportVisible = false;
-      this.getList();
     },
-    getStockOrderDetailList(row) {
-      if (this.$isNotBlank(row)) {
-        this.detailQuery.orderIdFk = row.id;
-        this.formData = row;
-      }
-      this.detailLoading = true;
-      stockOrderDetail(this.detailQuery)
-          .then((response) => {
-            console.log(response)
-            this.detailLoading = false;
-            this.detailList = response.data.list || [];
-          })
-          .catch(() => {
-            this.detailLoading = false;
+    methods: {
+        onReset() {
+            this.$router.push({
+                path: ""
+            });
+            this.query = {
+                startTime: "",
+                endTime: "",
+                billNo: "",
+                status: "2",
+                page: 1,
+                limit: 10
+            };
+            this.getList();
             this.detailList = [];
-          });
-    },
-    deleteStockOrder(row) {
-      this.$confirm("此操作将永久删除该订单, 是否继续?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      }).then(() => {
-        this.loading = true;
-        deleteStockOrderById({id: row.id})
-            .then(response => {
-              this.loading = false;
-              if (response.code === 20000) {
-                this.$message.success(response.data);
+            this.haveDistributionVisible = false;
+            this.actDateRange = [];
+        },
+        onSubmit() {
+            if (this.actDateRange !== null) {
+                this.query.startTime = this.actDateRange[0];
+                this.query.endTime = this.actDateRange[1];
+            } else {
+                this.query.startTime = null;
+                this.query.endTime = null;
+            }
+
+            this.getList();
+            if (this.query.status === "202") {
+                this.haveDistributionVisible = true;
+            } else {
+                this.haveDistributionVisible = false;
+            }
+        },
+        handleCurrentChange(val) {
+            this.query.page = val;
+            this.getList();
+        },
+        detailHandleCurrentChange(val) {
+            this.query.page = val;
+            this.getStockOrderDetailList();
+        },
+        // 刷新表单
+        resetForm() {
+            if (this.$refs["dataForm"]) {
+                // 清空验证信息表单
+                this.$refs["dataForm"].clearValidate();
+                // 刷新表单
+                this.$refs["dataForm"].resetFields();
                 this.getList();
+            }
+        },
+        getList() {
+            this.loading = true;
+            this.query.corpId = store.getters.customerId;
+            stockOrderList(this.query)
+                .then(response => {
+                    this.loading = false;
+                    this.list = response.data.list || [];
+                    this.detailList = [];
+                    this.total = response.data.total || 0;
+                })
+                .catch(() => {
+                    this.loading = false;
+                    this.list = [];
+                    this.detailList = [];
+                    this.total = 0;
+                });
+        },
+        distributionForm(index, row) {
+            this.idQuery.id = '';
+            console.log("row = " + row.id);
+            if (this.$isNotBlank(row.id)) {
+                this.idQuery.id = row.id;
+                this.idQuery.formData = row;
+                this.distributionVisible = true;
+            }
+        },
+        selectThrOrderFunction() {
+            this.selectThrOrderVisible = true;
+        },
+        closeDialog(type) {
+            this.distributionVisible = false;
+            this.selectThrOrderVisible = false;
+            this.getList();
+            if (this.$isNotBlank(type)) {
                 this.detailList = [];
-              } else {
-                this.$message.error(response.message);
-              }
-            })
-            .catch(() => {
-              this.loading = false;
-            })
-      }).catch(() => {
+            }
+        },
+        exportQRCodeText(row) {
+            this.idQuery.id = '';
+            if (this.$isNotBlank(row.id)) {
+                this.idQuery.id = row.id;
+                this.idQuery.formData = row;
+                this.qrcodeExportVisible = true;
+            }
+        },
+        printOrder(row) {
+            let tQuery = {
+                queryId: row.id,
+                moduleId: 5,
+            }
+            this.loading = true;
+            inspectionStockOrderPDFFromTemplateFile(tQuery).then((response) => {
+                if (response.code === 20000) {
+                    tQuery = {
+                        id: row.id,
+                        moduleId: 5,
+                        orderName: "配货单",
+                    }
+                    stockOrderPDFFromTemplateFile(tQuery).then((response) => {
+                        //将pdf文件转换为url。
+                        const binaryData = [];
+                        binaryData.push(response);
+                        //获取blob链接。
+                        let url = window.URL.createObjectURL(
+                            new Blob(binaryData, {type: "application/pdf"})
+                        );
+                        this.loading = false;
+                        window.open(url);//打开新标签页，预览pdf。
+                    }).catch(() => {
+                        this.loading = false;
+                    });
+                } else {
+                    this.loading = false;
+                    this.$message.error(response.message);
+                }
+            }).catch(() => {
+                this.loading = false;
+            });
+        },
+        closeQRCodeExportDialog() {
+            this.qrcodeExportVisible = false;
+            this.getList();
+        },
+        getStockOrderDetailList(row) {
+            if (this.$isNotBlank(row)) {
+                this.detailQuery.orderIdFk = row.id;
+                this.formData = row;
+            }
+            this.detailLoading = true;
+            stockOrderDetail(this.detailQuery)
+                .then((response) => {
+                    console.log(response)
+                    this.detailLoading = false;
+                    this.detailList = response.data.list || [];
+                })
+                .catch(() => {
+                    this.detailLoading = false;
+                    this.detailList = [];
+                });
+        },
+        deleteStockOrder(row) {
+            this.$confirm("此操作将永久删除该订单, 是否继续?", "提示", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning",
+            }).then(() => {
+                this.loading = true;
+                deleteStockOrderById({id: row.id})
+                    .then(response => {
+                        this.loading = false;
+                        if (response.code === 20000) {
+                            this.$message.success(response.data);
+                            this.getList();
+                            this.detailList = [];
+                        } else {
+                            this.$message.error(response.message);
+                        }
+                    })
+                    .catch(() => {
+                        this.loading = false;
+                    })
+            }).catch(() => {
 
-      });
-    },
-    copyDetail(row) {
-      this.$confirm("是否复制该记录?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      }).then(() => {
-        let tQuery = {
-          id: row.id
-        }
-        this.detailLoading = true;
-        copyStockOrderDetail(tQuery)
-            .then((response) => {
-              this.detailLoading = false;
-              if (response.code === 20000) {
-                this.$message.success("复制成功");
-                this.getStockOrderDetailList();
-              } else {
-                this.$message.error(response.message);
-              }
             });
-      }).catch(() => {
-      });
-    },
-    deleteStockOrderDetail(row) {
-      this.$confirm("此操作将永久删除该数据, 是否继续?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      }).then(() => {
-        this.detailLoading = true;
-        deleteStockOrderDetailById({id: row.id})
-            .then(response => {
-              this.detailLoading = false;
-              if (response.code === 20000) {
-                this.$message.success(response.data);
-                this.getStockOrderDetailList();
-              } else {
-                this.$message.error(response.message);
-              }
-            })
-            .catch(() => {
-              this.detailLoading = false;
-            })
-      }).catch(() => {
+        },
+        copyDetail(row) {
+            this.$confirm("是否复制该记录?", "提示", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning",
+            }).then(() => {
+                let tQuery = {
+                    id: row.id
+                }
+                this.detailLoading = true;
+                copyStockOrderDetail(tQuery)
+                    .then((response) => {
+                        this.detailLoading = false;
+                        if (response.code === 20000) {
+                            this.$message.success("复制成功");
+                            this.getStockOrderDetailList();
+                        } else {
+                            this.$message.error(response.message);
+                        }
+                    });
+            }).catch(() => {
+            });
+        },
+        deleteStockOrderDetail(row) {
+            this.$confirm("此操作将永久删除该数据, 是否继续?", "提示", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning",
+            }).then(() => {
+                this.detailLoading = true;
+                deleteStockOrderDetailById({id: row.id})
+                    .then(response => {
+                        this.detailLoading = false;
+                        if (response.code === 20000) {
+                            this.$message.success(response.data);
+                            this.getStockOrderDetailList();
+                        } else {
+                            this.$message.error(response.message);
+                        }
+                    })
+                    .catch(() => {
+                        this.detailLoading = false;
+                    })
+            }).catch(() => {
 
-      });
-    },
-    // 显示表单
-    handleDetailForm(index, row) {
-      this.detailFormVisible = true;
-      this.detailFormData = {};
-      if (row !== null) {
-        this.detailFormData = Object.assign({}, row);
-      }
-    },
-    hideDetailForm() {
-      // 更改值
-      this.detailFormVisible = !this.detailFormVisible;
-      return true;
-    },
-    getActionName(action) {
-      for (let i = 0; i < this.busTypes.length; i++) {
-        if (this.busTypes[i].localAction === action) {
-          return this.busTypes[i].localName;
-        }
-      }
-    },
-    getBusType() {
-      let query = {
-        enabled: true,
-      };
-      getLocalJoinByUser(query)
-          .then((response) => {
-            this.busTypes = response.data.list || [];
-            this.filterQuery.billAction = this.busTypes[0].action;
-            // this.getList();
-          })
-          .catch(() => {
-          });
-    },
-    submitUploadDetail() {
-      this.$refs["dataForm"].validate(valid => {
-        if (valid) {
-          this.detailLoading = true;
-          let tQuery = this.detailFormData;
-          console.log(this.detailCountMax + "---" + this.detailFormData.count + "---" + this.detailFormData.reCount)
-          if (this.detailCountMax) {
-            if (this.detailFormData.count < this.detailFormData.reCount) {
-              this.$message.error("实际数量不能高于订单数量");
-              return;
+            });
+        },
+        // 显示表单
+        handleDetailForm(index, row) {
+            this.detailFormVisible = true;
+            this.detailFormData = {};
+            if (row !== null) {
+                this.detailFormData = Object.assign({}, row);
             }
-          }
-          // if (this.$isBlank(tQuery.batchNo)) {
-          //     if (!tQuery.allowNoBatch) {
-          //         return this.$message.error('批次号不能为空');
-          //     }
-          // }
-          if (this.$isBlank(tQuery.productDate) && this.$isBlank(tQuery.expireDate)) {
-            return this.$message.error('生产日期与失效日期不能全部为空');
-          }
-          uploadStockOrderDetail(tQuery).then((response) => {
-            this.detailLoading = false;
-            if (response.code === 20000) {
-              this.$message.success("修改完成");
-              this.hideDetailForm();
-              this.getStockOrderDetailList();
-            } else {
-              this.$alert(response.message, '提示', {
-                confirmButtonText: '确定',
-                type: 'warning',
-                closeOnClickModal: true,
-                callback: action => {
-                  this.$refs.inputRef.focus();
+        },
+        hideDetailForm() {
+            // 更改值
+            this.detailFormVisible = !this.detailFormVisible;
+            return true;
+        },
+        getActionName(action) {
+            for (let i = 0; i < this.busTypes.length; i++) {
+                if (this.busTypes[i].localAction === action) {
+                    return this.busTypes[i].localName;
                 }
-              });
             }
-          });
-        }
-      });
-    },
-    getSysParm() {
-      let query = {
-        paramKey: "stock_order_detail_count_max",
-      };
-      selectSysParamByKey(query).then((response) => {
-        if (response.code == 20000) {
-          if (response.data.paramValue == "1") {
-            this.detailCountMax = true;
-          } else
-            this.detailCountMax = false;
-        }
-      });
-    },
-    getStorageName(code) {
-      for (let i = 0; i < this.storageList.length; i++) {
-        if (this.storageList[i].code === code) {
-          return this.storageList[i].name;
-        }
-      }
-    },
-    getStorage() {
-      this.storageList = [];
-      filterAllByUser()
-          .then((response) => {
-            this.storageList = response.data || [];
-            if (this.storageList.length > 0) {
-              this.invChange();
-              this.getList();
+        },
+        getBusType() {
+            let query = {
+                enabled: true,
+            };
+            getLocalJoinByUser(query)
+                .then((response) => {
+                    this.busTypes = response.data.list || [];
+                    this.filterQuery.billAction = this.busTypes[0].action;
+                    // this.getList();
+                })
+                .catch(() => {
+                });
+        },
+        submitUploadDetail() {
+            this.$refs["dataForm"].validate(valid => {
+                if (valid) {
+                    this.detailLoading = true;
+                    let tQuery = this.detailFormData;
+                    console.log(this.detailCountMax + "---" + this.detailFormData.count + "---" + this.detailFormData.reCount)
+                    if (this.detailCountMax) {
+                        if (this.detailFormData.count < this.detailFormData.reCount) {
+                            this.$message.error("实际数量不能高于订单数量");
+                            return;
+                        }
+                    }
+                    // if (this.$isBlank(tQuery.batchNo)) {
+                    //     if (!tQuery.allowNoBatch) {
+                    //         return this.$message.error('批次号不能为空');
+                    //     }
+                    // }
+                    if (this.$isBlank(tQuery.productDate) && this.$isBlank(tQuery.expireDate)) {
+                        return this.$message.error('生产日期与失效日期不能全部为空');
+                    }
+                    uploadStockOrderDetail(tQuery).then((response) => {
+                        this.detailLoading = false;
+                        if (response.code === 20000) {
+                            this.$message.success("修改完成");
+                            this.hideDetailForm();
+                            this.getStockOrderDetailList();
+                        } else {
+                            this.$alert(response.message, '提示', {
+                                confirmButtonText: '确定',
+                                type: 'warning',
+                                closeOnClickModal: true,
+                                callback: action => {
+                                    this.$refs.inputRef.focus();
+                                }
+                            });
+                        }
+                    });
+                }
+            });
+        },
+        getSysParm() {
+            let query = {
+                paramKey: "stock_order_detail_count_max",
+            };
+            selectSysParamByKey(query).then((response) => {
+                if (response.code == 20000) {
+                    if (response.data.paramValue == "1") {
+                        this.detailCountMax = true;
+                    } else
+                        this.detailCountMax = false;
+                }
+            });
+        },
+        getStorageName(code) {
+            for (let i = 0; i < this.storageList.length; i++) {
+                if (this.storageList[i].code === code) {
+                    return this.storageList[i].name;
+                }
             }
-          })
-          .catch(() => {
-          });
-    },
-    invChange() {
-      this.subInvList = [];
-      let query = {
-        pcode: this.query.locStorageCode
-      };
-      filterSubByInv(query)
-          .then((response) => {
-            this.subInvList = response.data || [];
-          })
-          .catch(() => {
-          });
+        },
+
+        getSubStorageName(code) {
+            for (let i = 0; i < this.subInvList.length; i++) {
+                if (this.subInvList[i].code === code) {
+                    return this.subInvList[i].name;
+                }
+            }
+        },
+        getStorage() {
+            this.storageList = [];
+            filterAllByUser()
+                .then((response) => {
+                    this.storageList = response.data || [];
+                    if (this.storageList.length > 0) {
+                        this.invChange();
+                        this.getList();
+                    }
+                })
+                .catch(() => {
+                });
+        },
+        invChange() {
+            this.subInvList = [];
+            this.query.invWarehouseCode = "";
+            let query = {
+                pcode: this.query.locStorageCode
+            };
+            filterSubByInv(query)
+                .then((response) => {
+                    this.subInvList = response.data || [];
+                })
+                .catch(() => {
+                });
+        },
     },
-  },
-  components: {
-    draggable,
-    stockOrderDistribution,
-    stockQRCodeExport,
-    stockOrderEditDistribution,
-    selectThrOrder,
-  },
-  filters: {
-    statusFilterType(status) {
-      const statusMap = {
-        0: "gray",
-        1: "success"
-      };
-      return statusMap[status];
+    components: {
+        draggable,
+        stockOrderDistribution,
+        stockQRCodeExport,
+        stockOrderEditDistribution,
+        selectThrOrder,
     },
-    statusFilterName(status) {
-      const statusMap = {
-        "1": "草稿",
-        "2": "未配货",
-        "3": "待校验",
-      };
-      return statusMap[status];
+    filters: {
+        statusFilterType(status) {
+            const statusMap = {
+                0: "gray",
+                1: "success"
+            };
+            return statusMap[status];
+        },
+        statusFilterName(status) {
+            const statusMap = {
+                "1": "草稿",
+                "2": "未配货",
+                "3": "待校验",
+            };
+            return statusMap[status];
+        },
+        typeFilterName(type) {
+            const typeMap = {
+                1: "预入库",
+                2: "普通采购",
+            };
+            return typeMap[type];
+        }
     },
-    typeFilterName(type) {
-      const typeMap = {
-        1: "预入库",
-        2: "普通采购",
-      };
-      return typeMap[type];
+    created() {
+        this.getStorage();
+        this.getSysParm();
+        this.getBusType();
+        this.getList();
+        let end = new Date();
+        let start = new Date();
+        start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+        this.actDateRange = [start, end];
     }
-  },
-  created() {
-    this.getStorage();
-    this.getSysParm();
-    this.getBusType();
-    this.getList();
-    let end = new Date();
-    let start = new Date();
-    start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
-    this.actDateRange = [start, end];
-  }
 }
 </script>
 
diff --git a/src/views/warehouse/stockOrderNew.vue b/src/views/warehouse/stockOrderNew.vue
index d310901..e8d4917 100644
--- a/src/views/warehouse/stockOrderNew.vue
+++ b/src/views/warehouse/stockOrderNew.vue
@@ -118,6 +118,12 @@
                         <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="采购类别" width="150">-->
                 <!--                    <template slot-scope="scope">-->
                 <!--                        {{ scope.row.type | typeFilterName }}-->
@@ -857,6 +863,13 @@ export default {
                 }
             }
         },
+        getSubStorageName(code) {
+            for (let i = 0; i < this.subInvList.length; i++) {
+                if (this.subInvList[i].code === code) {
+                    return this.subInvList[i].name;
+                }
+            }
+        },
         getBusType() {
             let query = {
                 enabled: true,
@@ -923,6 +936,7 @@ export default {
                 });
         },
         invChange() {
+            this.query.invWarehouseCode = "";
             this.subInvList = [];
             let query = {
                 pcode: this.query.locStorageCode
diff --git a/src/views/warehouse/stockOrderNewDistribution.vue b/src/views/warehouse/stockOrderNewDistribution.vue
index 55fa222..b156a70 100644
--- a/src/views/warehouse/stockOrderNewDistribution.vue
+++ b/src/views/warehouse/stockOrderNewDistribution.vue
@@ -1119,6 +1119,7 @@ export default {
             }
         },
         invChange() {
+            this.formData.invWarehouseCode = "";
             this.subInvList = [];
             let query = {
                 pcode: this.formData.locStorageCode
diff --git a/src/views/warehouse/stockOrderSearch.vue b/src/views/warehouse/stockOrderSearch.vue
index 4af144f..b55561c 100644
--- a/src/views/warehouse/stockOrderSearch.vue
+++ b/src/views/warehouse/stockOrderSearch.vue
@@ -102,11 +102,16 @@
                         <span>{{ getActionName(scope.row.billType) }}</span>
                     </template>
                 </el-table-column>
-                <el-table-column label="当前仓库" prop="locStorageCode" width="150">
+                <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="操作" fixed="right" width="200">
                     <template slot-scope="scope">
                         <el-button
@@ -925,6 +930,13 @@ export default {
                 }
             }
         },
+        getSubStorageName(code) {
+            for (let i = 0; i < this.subInvList.length; i++) {
+                if (this.subInvList[i].code === code) {
+                    return this.subInvList[i].name;
+                }
+            }
+        },
         getStorage() {
             this.storageList = [];
             filterAllByUser()
@@ -939,6 +951,7 @@ export default {
                 });
         },
         invChange() {
+            this.query.invWarehouseCode = "";
             this.subInvList = [];
             let query = {
                 pcode: this.query.locStorageCode
diff --git a/src/views/warehouse/stockOrderWaitCheck.vue b/src/views/warehouse/stockOrderWaitCheck.vue
index 1254307..9f7af60 100644
--- a/src/views/warehouse/stockOrderWaitCheck.vue
+++ b/src/views/warehouse/stockOrderWaitCheck.vue
@@ -109,6 +109,11 @@
                         <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="采购类型">-->
                 <!--                    <template slot-scope="scope">-->
                 <!--                        {{ scope.row.type | typeFilterName }}-->
@@ -340,7 +345,6 @@
 import {
     stockOrderList, stockOrderDetail,
     deleteStockOrderById, deleteStockOrderDetailById,
-    copyStockOrderDetail, submitStockOrder,
     uploadStockOrderDetail, uploadStockOrderDetailCount,
     generateStockOrderQRCodeText, updateStockOrder
 } from "../../api/warehouse/stockOrder";
@@ -774,6 +778,15 @@ export default {
                 }
             }
         },
+
+        getSubStorageName(code) {
+            for (let i = 0; i < this.subInvList.length; i++) {
+                if (this.subInvList[i].code === code) {
+                    return this.subInvList[i].name;
+                }
+            }
+        },
+
         getStorage() {
             this.storageList = [];
             filterAllByUser()
@@ -789,6 +802,7 @@ export default {
                 });
         },
         invChange() {
+            this.query.invWarehouseCode = "";
             this.subInvList = [];
             let query = {
                 pcode: this.query.locStorageCode