From 3010f2ad3110fc43f5918f60a0dcea3e29ccaf0e Mon Sep 17 00:00:00 2001
From: zhengmingliang <hongtianzai@126.com>
Date: Wed, 23 Nov 2022 09:14:23 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E4=BB=93=E5=BA=93=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/basic/invSubWarehouse.js              |    7 +
 src/views/basic/BasicEntrutsReceModify.vue    |   59 +-
 src/views/basic/invWarehouse.vue              |  181 +-
 src/views/home/index.vue                      |   46 +-
 src/views/thrsys/ThrInvWarehouse.vue          |    4 +-
 src/views/thrsys/thrOrderNew.vue              | 1891 ++++++++---------
 src/views/warehouse/DialogcChangeNewOrder.vue |   58 +-
 src/views/warehouse/IOErrorOrder.vue          |   15 +-
 src/views/warehouse/IOWaitOrder.vue           |    7 +-
 src/views/warehouse/addHosOrder.vue           |   80 +-
 src/views/warehouse/addOrder.vue              |   34 +-
 src/views/warehouse/stockHospOrderNew.vue     |   68 +-
 .../warehouse/stockOrderEditDistribution.vue  |   25 +-
 .../warehouse/stockOrderNewDistribution.vue   |   24 +-
 14 files changed, 1047 insertions(+), 1452 deletions(-)

diff --git a/src/api/basic/invSubWarehouse.js b/src/api/basic/invSubWarehouse.js
index 8126712..ec9aa40 100644
--- a/src/api/basic/invSubWarehouse.js
+++ b/src/api/basic/invSubWarehouse.js
@@ -16,6 +16,13 @@ export function filterSubByInv(query) {
         params: query
     });
 }
+export function filterSub(query) {
+    return axios({
+        url: "/spms/sub/inv/warehouse/filterSub",
+        method: "get",
+        params: query
+    });
+}
 
 
 
diff --git a/src/views/basic/BasicEntrutsReceModify.vue b/src/views/basic/BasicEntrutsReceModify.vue
index 3baeccf..0488d96 100644
--- a/src/views/basic/BasicEntrutsReceModify.vue
+++ b/src/views/basic/BasicEntrutsReceModify.vue
@@ -1,36 +1,15 @@
 <template>
     <div>
         <el-form :model="inputQuery" :rules="formRules" ref="dataForm">
-
-
             <el-row :gutter="20" class="el-row" type="flex">
-                <el-col :span="10" class="el-col">
-                    <div class="text item">
-                        <div class="itemTag">
-                            <span>委托仓库:&nbsp;</span>
-                        </div>
-                        <el-select v-model="inputQuery.curInv" placeholder="当前仓库" @change="invChange" clearable>
-                            <el-option
-                                v-for="item in storageList"
-                                :key="item.code"
-                                :label="item.name"
-                                :value="item.code">
-                                <span style="float: left">{{ item.name }}</span>
-                            </el-option>
-
-                        </el-select>
-
-                    </div>
-                </el-col>
-
-
                 <el-col :span="10" class="el-col">
                     <div class="text item">
                         <div class="itemTag">
                             <span>当前分库:&nbsp;</span>
                         </div>
                         <el-select v-model="inputQuery.invWarehouseCode" placeholder="当前分库"
-                                   @change="subInvChange"
+                                   @change="entrustInvChange"
+                                   filterable
                                    clearable>
                             <el-option
                                 v-for="item in subInvList"
@@ -38,6 +17,7 @@
                                 :label="item.name"
                                 :value="item.code">
                                 <span style="float: left">{{ item.name }}</span>
+                                <span style="float: right; color: #8492a6; font-size: 13px">{{ item.warehouseName }}</span>
                             </el-option>
 
                         </el-select>
@@ -73,27 +53,6 @@
             </el-row>
 
             <el-row :gutter="20" class="el-row" type="flex">
-                <el-col :span="10" class="el-col">
-                    <div class="text item">
-                        <div class="itemTag">
-                            <span>接受委托仓库:&nbsp;</span>
-                        </div>
-                        <el-select v-model="inputQuery.entrustInv" placeholder="接受委托仓库" @change="entrustInvChange"
-                                   clearable>
-                            <el-option
-                                v-for="item in entrustStorageList"
-                                :key="item.code"
-                                :label="item.name"
-                                :value="item.code">
-                                <span style="float: left">{{ item.name }}</span>
-                            </el-option>
-
-                        </el-select>
-
-                    </div>
-                </el-col>
-
-
                 <el-col :span="10" class="el-col">
                     <div class="text item">
                         <div class="itemTag">
@@ -101,6 +60,7 @@
                         </div>
                         <el-select v-model="inputQuery.entrustSubInv" placeholder="接受委托分库"
                                    @change="entrustSubInvChange"
+                                   filterable
                                    clearable>
                             <el-option
                                 v-for="item in entrustSubInvList"
@@ -108,6 +68,7 @@
                                 :label="item.name"
                                 :value="item.code">
                                 <span style="float: left">{{ item.name }}</span>
+                                <span style="float: right; color: #8492a6; font-size: 13px">{{ item.warehouseName }}</span>
                             </el-option>
 
                         </el-select>
@@ -173,7 +134,7 @@ import {
 import {filterAll, filterNext, warehouseBussinessTypeList, warehouseUserList} from "@/api/basic/invWarehouse";
 import {getBasicUnitMaintains} from "@/api/basic/basicUnitMaintain";
 import {filterNoUseBusType} from "@/api/basic/EntrustRece";
-import {filterSubByInv} from "@/api/basic/invSubWarehouse";
+import {filterSubByInv,filterSub} from "@/api/basic/invSubWarehouse";
 
 
 export default {
@@ -268,12 +229,13 @@ export default {
 
 
         findEntrustSubInvByInv() {
+           
             this.entrustSubInvList = [];
             let query = {
-                pcode: this.inputQuery.entrustInv,
-                filter: 2,
+                code: this.inputQuery.invWarehouseCode,
+               
             };
-            filterSubByInv(query)
+            filterSub(query)
                 .then((response) => {
                     this.entrustSubInvList = response.data || [];
                     this.entrustSubInvChange();
@@ -295,6 +257,7 @@ export default {
                 });
         },
         getOrderType() {
+           
             let query = {
                 locSubInvCode: this.inputQuery.invWarehouseCode
             }
diff --git a/src/views/basic/invWarehouse.vue b/src/views/basic/invWarehouse.vue
index 09fb9f6..7f30c71 100644
--- a/src/views/basic/invWarehouse.vue
+++ b/src/views/basic/invWarehouse.vue
@@ -168,7 +168,7 @@
                         <el-button
                             type="text"
                             size="small" :disabled="!configParms.basicInv"
-                            @click.native.stop="selsectBussinessType(scope.row)"
+                            @click.native.stop="addBussinessType(scope.row)"
                         >管理单据类型
                         </el-button
                         >
@@ -332,6 +332,7 @@
                 <el-table-column label="单据类型编码" prop="action" fixed></el-table-column>
                 <el-table-column label="单据类型名称" prop="name" fixed></el-table-column>
             </el-table>
+
             <el-pagination
                 :page-size="bussinessTypeQuery.limit"
                 @current-change="getBussinessType"
@@ -339,7 +340,8 @@
                 :total="bussinessTypeTotal"
                 :current-page="bussinessTypeQuery.page"
             >
-</el-pagination>
+            </el-pagination>
+
             <div slot="footer" class="dialog-footer">
                 <el-button @click.native="bussinessTypeFormVisible = !bussinessTypeFormVisible"
                 >取消
@@ -353,53 +355,6 @@
             </div>
 
         </el-dialog>
-
-        <!--添加单据类型弹窗---->
- <!--添加单据类型弹窗-->
- <el-dialog
-            title="仓库关联单据类型"
-            :close-on-click-modal="false"
-            :close-on-press-escape="false"
-            :visible.sync="userBussinessTypeFormVisible"
-        >
-        <el-row type="flex" justify="end">
-                <el-button-group style="display: flex;margin-bottom: 15px; margin-right: 50px">
-                    <el-button
-                        type="primary"
-                        @click.native="addBussinessType()"
-                        :loading="loading"
-                    >选入
-                    </el-button
-                    >
-                </el-button-group>
-            </el-row>
-            <el-table v-loading="loading" :data="userBussinessTypeList" ref="typeList"
-                      style="width: 100%">
-                <el-table-column label="单据类型编码" prop="action" fixed></el-table-column>
-                <el-table-column label="单据类型名称" prop="name" fixed></el-table-column>
-                <el-table-column label="操作" fixed="right">
-                    <template slot-scope="scope">
-                        <el-button
-                            type="text"
-                            size="small"
-                            :disabled="!configParms.basicInv"
-                            @click.native.stop="delWarehouseBussinessType(scope.row.id)"
-                        >移除
-                        </el-button
-                        >
-                    </template>
-                 
-                </el-table-column>
-            </el-table>
-            <div slot="footer" class="dialog-footer">
-                <el-button @click.native="userBussinessTypeFormVisible = !userBussinessTypeFormVisible"
-                >取消
-                </el-button
-                >
-            </div>
-
-        </el-dialog>
-
         <!--表单界面-->
         <el-dialog
             :title="formMap[formName]"
@@ -782,7 +737,7 @@ import {
     warehouseUserList, saveWarehouseBussinessType,
     saveWarehouseUser, updateDirector, disableWarehouse,
     deleteWarehouseBussinessType,
-    bindThrWarehouse, unbindThrWarehouse, filterThridSubByInv, getThrsysDetail,delWarehouseBussinessType
+    bindThrWarehouse, unbindThrWarehouse, filterThridSubByInv, getThrsysDetail
 } from "../../api/basic/invWarehouse";
 import {
     filterSubAll, saveSubWarehouse, deleteSubWarehouse,
@@ -880,8 +835,6 @@ export default {
             selectUserList: [],
             selectBussinessTypeList: [],
             bussinessTypeFormVisible: false,
-            userBussinessTypeList:[],
-            userBussinessTypeFormVisible:false,
             thrWarehouseData: [],
             thrSubWarehouseData: [],
             currentId: null,
@@ -934,8 +887,7 @@ export default {
             bussinessTypeQuery: {
                 enabled: true,
                 page: 1,
-                limit: 10,
-                ids:""
+                limit: 10
             },
             bussinessTypeTotal: 0,
             curSeleUser: null,
@@ -1174,34 +1126,7 @@ export default {
                     });
             }
         },
-        //删除仓库关联单据
-        handleUserSubDel(row){
-            if (row.id) {
-                this.$confirm("确认移除单据吗?", "提示", {
-                    type: "warning",
-                })
-                    .then(() => {
-                        this.deleteLoading = true;
-                        let para = {id: row.id};
-                        deleteSubWarehouse(para)
-                            .then((response) => {
-                                this.deleteLoading = false;
-                                if (response.code !== 20000) {
-                                    this.$message.error(response.message);
-                                    return false;
-                                }
-                                this.$message.success("删除成功");
-                                this.loadSubData(row.parentId);
-                            })
-                            .catch(() => {
-                                this.deleteLoading = false;
-                            });
-                    })
-                    .catch(() => {
-                        this.$message.info("取消删除");
-                    });
-            }
-        },
+
 
         handleSubDel(row) {
             if (row.id) {
@@ -1447,15 +1372,10 @@ export default {
                 })
             });
         },
-        getBussinessType(val,obj) {
+        getBussinessType(val) {
             if (val != null) {
                 this.bussinessTypeQuery.page = val;
             }
-            if(obj!=undefined){
-                var action=obj.toString();
-                this.bussinessTypeQuery.ids=action;
-            }
-           
             this.bussinessTypeQuery.code=this.busQuery.code;
             getJoinBussinessType(this.bussinessTypeQuery).then((res) => {
                 this.selectBussinessTypeList = [];
@@ -1533,46 +1453,17 @@ export default {
                 });
             }
         },
-        // addBussinessType(row) {
-        //     this.currentCode = row.code;
-        //     this.currentRow = row;
-        //     this.loadLinkData(row);
-        //     if (this.currentCode == null || this.currentCode == '') {
-        //         this.$message.error('请先选择仓库');
-        //     } else if (this.currentCode != row.code) {
-        //         this.$message.error("请先选择当前分库！")
-        //     } else {
-        //         this.bussinessTypeFormVisible = true;
-        //         this.bussinessTypeQuery.page = 1;
-        //         this.getBussinessType();
-        //     }
-        // },
-           addBussinessType(row) {
-            var action=[];
-                for(var i=0;i<this.userBussinessTypeList.length;i++){
-                    action.push(this.userBussinessTypeList[i].action);
-                }
+        addBussinessType(row) {
+            this.currentCode = row.code;
+            this.currentRow = row;
+            this.loadLinkData(row);
+             if (this.currentCode != row.code) {
+                this.$message.error("请先选择当前分库！")
+            } else {
                 this.bussinessTypeFormVisible = true;
                 this.bussinessTypeQuery.page = 1;
-                this.getBussinessType(1,action);
-        },
-        selsectBussinessType(row){
-           
-        //    if(row==null || row==undefined){
-        //          this.$message.info("请先选择分库！");
-        //          return;
-        //    }
-            var busQuery = {
-                        code: row.code,
-                        page: 1,
-                        limit: 10000
-                    }
-            warehouseBussinessTypeList(busQuery).then((res) => {
-                    this.userBussinessTypeList = res.data.list;
-                }).catch((error) => {
-                    this.$message.error("单据类型数据加载失败")
-                });
-            this.userBussinessTypeFormVisible = true;
+                this.getBussinessType();
+            }
         },
         addBussinessTypeData() {
             // if (this.selectBussinessTypeList.length == 0) {
@@ -1584,6 +1475,7 @@ export default {
                 bussinessTypes: JSON.stringify(this.selectBussinessTypeList)
             };
             saveWarehouseBussinessType(query).then((res) => {
+
                 if (res.code == 20000) {
                     this.$message.success("修改成功！");
                     //重新加载数据表格
@@ -1599,29 +1491,15 @@ export default {
                         this.bussinessTypeData = [];
                         this.busTotal = 0;
                     });
-                 this.selectWhouseBussinessType();
-                    
-
                 } else {
                     this.$message.error(res.message);
                 }
-              
+
 
             }).catch((error) => {
             });
             // }
         },
-        selectWhouseBussinessType(){
-            var busQuery = {
-                        code: this.currentCode,
-                        page: 1,
-                        limit: 100000
-                    }
-                    warehouseBussinessTypeList(busQuery).then((res) => {
-                        this.userBussinessTypeList = res.data.list || [];
-                    }).catch((error) => {
-                    });
-        },
         updateDirector(row) {
             row.director = !row.director;
             updateDirector(row).then((res) => {
@@ -1650,21 +1528,14 @@ export default {
             deleteWarehouseBussinessType(params).then((res) => {
                 if (res.code == 20000) {
                     this.$message.success("已移除");
-                    this.bussinessTypeData = [];
-                    this.selectWhouseBussinessType();
-              var busQuerys = {
-                        code: this.currentCode,
-                        page: 1,
-                        limit: 10
-                    }
-            warehouseBussinessTypeList(busQuerys).then((res) => {
-                    this.bussinessTypeData = res.data.list;
-                }).catch((error) => {
-                    this.$message.error("单据类型数据加载失败")
-                });
-
+                    for (let i = 0; i < this.bussinessTypeData.length; i++) {
+                        if (this.bussinessTypeData[i].id == id) {
+                            this.bussinessTypeData.splice(i, 1);
+                            return;
+                        }
+                    }
                 } else {
-                    this.$message.error(res.message);
+                    this.$message.error("移除失败");
                 }
             }).catch((error) => {
                 this.$message.error("移除失败");
diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index 1b6d2be..aea9e80 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -205,30 +205,6 @@
             v-if="selInvVisible"
         >
             <el-form :model="userInfo">
-                <el-row :gutter="20">
-
-                    <el-col :span="4">
-                        <div class="ao-text">
-                            <span>仓库：</span>
-                        </div>
-                    </el-col>
-
-                    <el-col :span="16">
-                        <el-form-item prop="locStorageCode">
-                            <el-select v-model="userInfo.locInvCode" placeholder="仓库信息" clearable
-                                       @change="locCHange"
-                            >
-                                <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-col>
-                </el-row>
                 <el-row :gutter="20">
                     <el-col :span="4">
                         <div class="ao-text">
@@ -237,15 +213,15 @@
                     </el-col>
                     <el-col :span="16">
                         <el-form-item prop="locInvCode">
-                            <el-select v-model="userInfo.locSubInvCode" placeholder="分库信息" clearable
+                            <el-select v-model="userInfo.locSubInvCode"   filterable placeholder="分库信息" clearable
                             >
                                 <el-option
-
                                     v-for="item in subInvList"
                                     :key="item.name"
                                     :label="item.name"
                                     :value="item.code">
                                     <span style="float: left">{{ item.name }}</span>
+                                    <span style="float: right; color: #8492a6; font-size: 13px">{{ item.warehouseName }}</span>
                                 </el-option>
                             </el-select>
                         </el-form-item>
@@ -253,7 +229,7 @@
                 </el-row>
 
                 <div style="margin-top: 8px ;  color: #F71616;">
-                    <span>提示：进入系统前请选择您默认所在仓库与分库&nbsp;</span>
+                    <span>提示：进入系统前请选择您默认所在分库&nbsp;</span>
                 </div>
                 <div style='text-align: center; margin-bottom: 10px;margin-top: 18px ;'>
                     <el-button type="primary" @click="submitInv" style="width: 150px">提交</el-button>
@@ -449,14 +425,12 @@ export default {
 
         findSubInvByInv() {
             this.subInvList = [];
-            let query = {
-                pcode: this.userInfo.locInvCode
-            };
-            filterSubByInv(query)
+           
+            filterSubByInv()
                 .then((response) => {
                     this.subInvList = response.data || [];
                     if (this.subInvList != null && this.subInvList.length == 1) {
-                        this.userInfo.locSubInvCode = this.subInvList[0].code;
+                        this.userInfo.locSubInvCode = this.subInvList[subInvList.length].code;
                     }
                 })
                 .catch(() => {
@@ -476,7 +450,7 @@ export default {
                         }
 
 
-                        if (this.$isBlank(this.userInfo.locInvCode) || this.$isBlank(this.userInfo.locSubInvCode)) {
+                        if (this.$isBlank(this.userInfo.locSubInvCode)) {
                             this.selInvVisible = true;
                         } else {
                             this.$store.commit(types.RECEIVE_LOCINVCODE, this.userInfo.locInvCode);
@@ -505,11 +479,6 @@ export default {
         },
 
         submitInv() {
-
-            if (this.$isBlank(this.userInfo.locInvCode)) {
-                this.$message.error("仓库不能为空！");
-                return;
-            }
             if (this.$isBlank(this.userInfo.locSubInvCode)) {
                 this.$message.error("分库不能为空！");
                 return;
@@ -586,6 +555,7 @@ export default {
         // this.getStorage();
         // this.findSubInvByInv();
         this.getUserInfo();
+        this.locCHange();
         bus.$on("collapse-content", (msg) => {
             this.collapse = msg;
         });
diff --git a/src/views/thrsys/ThrInvWarehouse.vue b/src/views/thrsys/ThrInvWarehouse.vue
index 9692b76..abf762d 100644
--- a/src/views/thrsys/ThrInvWarehouse.vue
+++ b/src/views/thrsys/ThrInvWarehouse.vue
@@ -368,9 +368,7 @@ export default {
                 thirdSysFk: [
                     {required: true, message: "请选择第三方系统", trigger: "blur"}
                 ],
-                advanceType: [
-                    {required: true, message: "请选择仓库类型", trigger: "blur"}
-                ]
+               
             },
             pidData: {},
             deleteLoading: false,
diff --git a/src/views/thrsys/thrOrderNew.vue b/src/views/thrsys/thrOrderNew.vue
index 703d09a..913315c 100644
--- a/src/views/thrsys/thrOrderNew.vue
+++ b/src/views/thrsys/thrOrderNew.vue
@@ -1,331 +1,306 @@
 <template>
-    <div>
-
-        <el-form :model="formData" :rules="formRules" ref="dataForm">
-            <el-row type="flex" justify="end">
-                <el-button-group style="display: flex;margin-bottom: 15px; margin-right: 50px">
-                    <el-button
-                        type="primary"
-                        @click.native="saveOrder('1')"
-                        :loading="loading"
-                    >草稿保存
-                    </el-button
-                    >
-                    <el-button
-                        type="primary"
-                        @click.native="saveOrder('2')"
-                        :loading="loading"
-                    >提交单据
-                    </el-button
-                    >
-                </el-button-group>
-            </el-row>
-
-            <el-card style="margin-top: -5px;">
-                <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="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="billdate">
-                            <el-date-picker
-                                v-model="formData.billdate"
-                                type="datetime"
-                                placeholder="选择日期"
-                                style="width: 100%"
-                                :clearable="false"
-                                value-format="yyyy-MM-dd HH:mm:ss"
-                            >
-                            </el-date-picker>
-                        </el-form-item>
-                    </el-col>
-                </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="locStorageCode">
-                            <el-select v-model="formData.locStorageCode" style="width: 50%;" placeholder="当前仓库信息"
-                                       @change="locInChange"
-                                       clearable>
-                                <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-select v-model="formData.invWarehouseCode" placeholder="当前分库信息" style="width: 50%;"
-                                       clearable>
-                                <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-col>
-
-                    <el-col :span="3">
-                        <div class="ao-text">
-                            <span>往来信息：</span>
-                        </div>
-                    </el-col>
-                    <el-col :span="7">
-                        <el-form-item class="query-form-item" prop="fromCorp">
-                            <el-select
-                                v-model="formData.corpName"
-                                filterable
-                                remote
-                                style="width: 50%"
-                                clearable="true"
-                                reserve-keyword
-                                placeholder="请输入仓库信息"
-                                :remote-method="findStorageMethod"
-                                :loading="loading"
-                                @change="storageChange"
-                            >
-                                <el-option
-                                    v-for="item in fromStorageOptions"
-                                    :key="item.value"
-                                    :label="item.code"
-                                    :value="item">
-                                    <span style="float: left">{{ item.name }}</span>
-                                    <span style="float: right; color: #8492a6; font-size: 13px">{{
-                                            item.code
-                                        }}</span>
-                                </el-option>
-                            </el-select>
-                            <el-select v-model="formData.fromSubInvCode" placeholder="请选择分库" clearable="true"
-                                       style="width: 50%"
-                            >
-                                <el-option
-                                    v-for="item in fromSubStorageOptions"
-                                    :key="item.code"
-                                    :label="item.name"
-                                    :value="item.code">
-                                    <span style="float: left">{{ item.name }}</span>
-                                    <span style="float: right; color: #8492a6; font-size: 13px">{{ item.code }}</span>
-                                </el-option>
-                            </el-select>
-
-
-                        </el-form-item>
-                    </el-col>
-
-                </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="billType">
-                            <el-select v-model="formData.billType" placeholder="请选择领用类型" style="width: 100%"
-                                       clearable>
-                                <el-option
-                                    v-for="item in busTypes"
-                                    :key="item.originAction"
-                                    :label="item.originName"
-                                    :value="item.originAction">
-                                    <span style="float: left">{{ item.originName }}</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="remark">
-                            <el-input v-model="formData.remark" auto-complete="off"></el-input>
-                        </el-form-item>
-                    </el-col>
-
-                </el-row>
-            </el-card>
-
-            <el-card>
-                <el-button-group style="display: flex">
-                    <el-button
-                        type="primary"
-                        size="small"
-                        @click.native.stop="selectProductFunction()"
-                        style="margin: 0px 60px 10px auto; height: 35px"
-                        :loading="loading"
-                    >产品录入
-                    </el-button
-                    >
-                </el-button-group>
-
-                <el-table v-loading="loading" :data="codeArray" style="width: 100%;"
-                          :row-class-name="tableRowClassName"
-                          max-height="300" height="300" ref="multipleTable">
-                    <el-table-column label="序号" type="index" width="50"></el-table-column>
-                    <el-table-column width="150"
-                                     label="产品通用名"
-                                     prop="productName"
-                                     show-overflow-tooltip
-                    ></el-table-column>
-                    <el-table-column width="150"
-                                     label="规格型号"
-                                     prop="spec"
-                                     show-overflow-tooltip
-                    ></el-table-column>
-                    <el-table-column width="150" label="批次号">
-                        <template slot-scope="scope">
-                            <el-input size="small" v-model="scope.row.batchNo"
-                                      :disabled="scope.row.index !== selectedIndex"
-                                      @input="scope.row.batchNo =scope.row.batchNo.replace(/[\W]/g, '')"
-                                      ref='inputBatchNoRef'
-                                      placeholder="请输入批次号" style="width: 80%"></el-input>
-                        </template>
-                    </el-table-column>
-                    <el-table-column width="180" label="生产日期(yyMMdd)">
-                        <template slot-scope="scope">
-
-                            <el-input v-model="scope.row.productDate" auto-complete="off"
-                                      oninput="if(value.length>6)value=value.slice(0,6)"
-                                      :disabled="scope.row.index !== selectedIndex"
-                                      type="number"
-                            ></el-input>
-                        </template>
-                    </el-table-column>
-                    <el-table-column width="180" label="失效日期(yyMMdd)">
-                        <template slot-scope="scope">
-
-                            <el-input v-model="scope.row.expireDate" auto-complete="off"
-                                      oninput="if(value.length>6)value=value.slice(0,6)"
-                                      :disabled="scope.row.index !== selectedIndex"
-                                      type="number"
-                            ></el-input>
-                        </template>
-                    </el-table-column>
-                    <el-table-column width="150" label="单据数量">
-                        <template slot-scope="scope">
-                            <el-input size="small" v-model="scope.row.count"
-                                      placeholder="请输入数量" style="width: 80%"
-                                      type='number'
-                                      @change="tableCountChange(scope.row)"
-                                      :disabled="scope.row.index !== selectedIndex"
-                                      oninput="value=value.replace(/[^\d]/g,'')"></el-input>
-                        </template>
-                    </el-table-column>
-                    <el-table-column width="150" label="价格">
-                        <template slot-scope="scope">
-                            <el-input size="small" v-model="scope.row.price"
-                                      type='number'
-                                      :disabled="scope.row.index !== selectedIndex"
-                                      placeholder="请输入价格" style="width: 80%"
-                            ></el-input>
-                        </template>
-                    </el-table-column>
-
-                    <el-table-column width="150"
-                                     label="注册/备案凭证号"
-                                     prop="zczbhhzbapzbh"
-                                     show-overflow-tooltip
-                    ></el-table-column>
-                    <el-table-column width="150"
-                                     label="生产厂家"
-                                     prop="ylqxzcrbarmc"
-                                     show-overflow-tooltip
-                    ></el-table-column>
-                    <el-table-column label="操作" fixed="right" width="150">
-                        <template slot-scope="scope">
-
-                            <el-button
-                                type="text"
-                                size="small"
-                                :disabled="scope.row.index === selectedIndex"
-                                @click.stop="true"
-                                @click.native="rowChange(scope.row)"
-                            >编辑
-                            </el-button
-                            >
-                            <el-button
-                                type="text"
-                                size="small"
-                                @click.stop="true"
-                                @click.native="copyDetail(scope.row)"
-                            >复制
-                            </el-button
-                            >
-                            <el-button
-                                type="text"
-                                size="small"
-                                @click.stop="true"
-                                @click.native="deleteCodeArray(scope.$index, scope.row)"
-                            >删除
-                            </el-button
-                            >
-                        </template>
-                    </el-table-column>
-                </el-table>
-            </el-card>
-        </el-form>
-
-
-        <el-dialog
-            title="库存产品录入"
-            :visible.sync="selectInvProductVisible"
-            :close-on-click-modal="false"
-            :close-on-press-escape="false"
-            width="85%"
-            v-if="selectInvProductVisible"
-            :append-to-body='true'
-        >
-            <dialogInvProduct
-                :closeDialog="closeDialogC2"
-                :data="thisData"
-                :invQueryData="invQueryData"
-                :type="1"
-            ></dialogInvProduct>
-        </el-dialog>
-    </div>
+  <div>
+
+    <el-form :model="formData" :rules="formRules" ref="dataForm">
+      <el-row type="flex" justify="end">
+        <el-button-group style="display: flex;margin-bottom: 15px; margin-right: 50px">
+          <el-button
+              type="primary"
+              @click.native="saveOrder('1')"
+              :loading="loading"
+          >草稿保存
+          </el-button
+          >
+          <el-button
+              type="primary"
+              @click.native="saveOrder('2')"
+              :loading="loading"
+          >提交单据
+          </el-button
+          >
+        </el-button-group>
+      </el-row>
+
+      <el-card style="margin-top: -5px;">
+        <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="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="billdate">
+              <el-date-picker
+                  v-model="formData.billdate"
+                  type="datetime"
+                  placeholder="选择日期"
+                  style="width: 100%"
+                  :clearable="false"
+                  value-format="yyyy-MM-dd HH:mm:ss"
+              >
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+        </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="billType">
+              <el-select v-model="formData.billType" placeholder="请选择业务类型"
+                         @change="actionChange" clearable>
+                <el-option
+                    v-for="item in busTypes"
+                    :key="item.thirdAction"
+                    :label="item.thirdName"
+                    :value="item.thirdAction">
+                  <span style="float: left">{{ item.thirdName }}</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 class="query-form-item" prop="fromCorp">
+              <el-select
+                  v-model="formData.corpName"
+                  filterable
+                  remote
+                  clearable="true"
+                  reserve-keyword
+                  placeholder="请输入往来单位"
+                  :remote-method="findStorageMethod"
+                  :loading="loading"
+                  @change="storageChange"
+              >
+                <el-option
+                    v-for="item in fromStorageOptions"
+                    :key="item.value"
+                    :label="item.code"
+                    :value="item">
+                  <span style="float: left">{{ item.name }}</span>
+                  <span style="float: right; color: #8492a6; font-size: 13px">{{
+                      item.code
+                    }}</span>
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+
+        </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="invWarehouseCode">
+              <el-select v-model="formData.invWarehouseCode" placeholder="当前分库信息"
+                         clearable>
+                <el-option
+                    v-for="item in subInvList"
+                    :key="item.name"
+                    :label="item.name"
+                    :value="item.code">
+                  <span style="float: left">{{ item.name }}</span>
+                  <span style="float: right; color: #8492a6; font-size: 13px">{{ item.warehouseName }}</span>
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+
+        </el-row>
+      </el-card>
+
+      <el-card>
+        <el-button-group style="display: flex">
+          <el-button
+              type="primary"
+              size="small"
+              @click.native.stop="selectProductFunction()"
+              style="margin: 0px 60px 10px auto; height: 35px"
+              :loading="loading"
+          >产品录入
+          </el-button
+          >
+        </el-button-group>
+
+        <el-table v-loading="loading" :data="codeArray" style="width: 100%;"
+                  :row-class-name="tableRowClassName"
+                  max-height="300" height="300" ref="multipleTable">
+          <el-table-column label="序号" type="index" width="50"></el-table-column>
+          <el-table-column width="150"
+                           label="产品通用名"
+                           prop="productName"
+                           show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column width="150"
+                           label="规格型号"
+                           prop="spec"
+                           show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column width="150" label="批次号">
+            <template slot-scope="scope">
+              <el-input size="small" v-model="scope.row.batchNo"
+                        :disabled="scope.row.index !== selectedIndex"
+                        @input="scope.row.batchNo =scope.row.batchNo.replace(/[\W]/g, '')"
+                        ref='inputBatchNoRef'
+                        placeholder="请输入批次号" style="width: 80%"></el-input>
+            </template>
+          </el-table-column>
+          <el-table-column width="180" label="生产日期(yyMMdd)">
+            <template slot-scope="scope">
+
+              <el-input v-model="scope.row.productDate" auto-complete="off"
+                        oninput="if(value.length>6)value=value.slice(0,6)"
+                        :disabled="scope.row.index !== selectedIndex"
+                        type="number"
+              ></el-input>
+            </template>
+          </el-table-column>
+          <el-table-column width="180" label="失效日期(yyMMdd)">
+            <template slot-scope="scope">
+
+              <el-input v-model="scope.row.expireDate" auto-complete="off"
+                        oninput="if(value.length>6)value=value.slice(0,6)"
+                        :disabled="scope.row.index !== selectedIndex"
+                        type="number"
+              ></el-input>
+            </template>
+          </el-table-column>
+          <el-table-column width="150" label="单据数量">
+            <template slot-scope="scope">
+              <el-input size="small" v-model="scope.row.count"
+                        placeholder="请输入数量" style="width: 80%"
+                        type='number'
+                        @change="tableCountChange(scope.row)"
+                        :disabled="scope.row.index !== selectedIndex"
+                        oninput="value=value.replace(/[^\d]/g,'')"></el-input>
+            </template>
+          </el-table-column>
+          <el-table-column width="150" label="价格">
+            <template slot-scope="scope">
+              <el-input size="small" v-model="scope.row.price"
+                        type='number'
+                        :disabled="scope.row.index !== selectedIndex"
+                        placeholder="请输入价格" style="width: 80%"
+              ></el-input>
+            </template>
+          </el-table-column>
+
+          <el-table-column width="150"
+                           label="注册/备案凭证号"
+                           prop="zczbhhzbapzbh"
+                           show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column width="150"
+                           label="生产厂家"
+                           prop="ylqxzcrbarmc"
+                           show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column label="操作" fixed="right" width="150">
+            <template slot-scope="scope">
+
+              <el-button
+                  type="text"
+                  size="small"
+                  :disabled="scope.row.index === selectedIndex"
+                  @click.stop="true"
+                  @click.native="rowChange(scope.row)"
+              >编辑
+              </el-button
+              >
+              <el-button
+                  type="text"
+                  size="small"
+                  @click.stop="true"
+                  @click.native="copyDetail(scope.row)"
+              >复制
+              </el-button
+              >
+              <el-button
+                  type="text"
+                  size="small"
+                  @click.stop="true"
+                  @click.native="deleteCodeArray(scope.$index, scope.row)"
+              >删除
+              </el-button
+              >
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-card>
+    </el-form>
+
+    <el-dialog
+        title="产品录入"
+        :visible.sync="selectProductVisible"
+        :close-on-click-modal="false"
+        :close-on-press-escape="false"
+        width="85%"
+        v-if="selectProductVisible"
+        :append-to-body='true'
+    >
+      <stockOrderNewSelectProduct
+          :closeDialog="closeDialogC2"
+          :data="thisData"
+      ></stockOrderNewSelectProduct>
+    </el-dialog>
+
+    <el-dialog
+        title="库存产品录入"
+        :visible.sync="selectInvProductVisible"
+        :close-on-click-modal="false"
+        :close-on-press-escape="false"
+        width="85%"
+        v-if="selectInvProductVisible"
+        :append-to-body='true'
+    >
+      <dialogInvProduct
+          :closeDialog="closeDialogC2"
+          :data="thisData"
+          :invQueryData="invQueryData"
+      ></dialogInvProduct>
+    </el-dialog>
+  </div>
 </template>
 
 <script>
 import {
-    stockOrderDetail,
-    submitStockOrder,
-    stockOrderGenerateBillNo,
-    getStockOrderDetailInstrument,
-    insertStockOrderWeb,
-    deleteStockOrderDetailById,
-    addStockOrderDetailFromCode,
-    uploadStockOrderDetail,
-    stockOrderDetailQueryProduct,
-    getStockOrderDetailInstrumentById, stockOrderDetail2, generateBillNoInt
+  stockOrderDetail,
+  submitStockOrder,
+  stockOrderGenerateBillNo,
+  getStockOrderDetailInstrument,
+  insertStockOrderWeb,
+  deleteStockOrderDetailById,
+  addStockOrderDetailFromCode,
+  uploadStockOrderDetail,
+  stockOrderDetailQueryProduct,
+  getStockOrderDetailInstrumentById, stockOrderDetail2, generateBillNoInt
 } from "../../api/warehouse/stockOrder";
 import draggable from "vuedraggable";
 import {saveAs} from "file-saver";
@@ -337,678 +312,688 @@ import {getBussinessType} from "../../api/basic/bussinessType";
 import {getLocalBusType, getLocalJoinBusType, getLocalJoinByUser} from "../../api/basic/busLocalType";
 import {filterAll, filterAllByLoc, filterAllByUser} from "@/api/basic/invWarehouse";
 import dialogInvProduct from "../inventory/DialogInvProduct"
-import {getBusChange} from "@/api/basic/busTypeChange";
-import {inserThrOrderWeb, updateReceive} from "@/api/thrsys/thrOrderReceive";
+import {getOriginJoinBusType} from "@/api/basic/busOriginType";
+import {inserThrOrderWeb} from "@/api/thrsys/thrOrderReceive";
 import {getThrOrderDetails, delThrOrders, delOrderDetail} from "@/api/thrsys/thrOrder";
 import {filterSubByInv} from "@/api/basic/invSubWarehouse";
 
 export default {
-    name: "idQuery",
-    props: {
-        closeDialog: {
-            type: Function,
-            required: true,
-        },
-        idQuery: {
-            type: Object,
-            required: true,
-        },
-        closeConfirmFunction: {
-            type: Function,
-            required: true,
-        },
-        editType: {
-            type: Object,
-            required: true,
-        },
-    },
-    data() {
-        return {
-            code: "",
-            query: {
-                orderIdFk: "",
-                page: 1,
-                limit: 10,
-            },
-            formData: {
-                noInvOut: false,
-                locStorageCode: null,
-                invWarehouseCode: null,
-                fromSubInvCode: null,
-                billNo: null,
-                billdate: "",
-                billType: "",
-                type: null,
-                corpName: "",
-                corpId: "",
-            },
-            formRules: {
-                corpName: [
-                    {required: true, message: "请输入供应商", trigger: "blur"}
-                ],
-                billdate: [
-                    {required: true, message: "请输入单据日期", trigger: "blur"}
-                ],
-                billType: [
-                    {required: true, message: "请选择业务类型", trigger: "blur"}
-                ],
-                locStorageCode: [
-                    {required: true, message: "请选择当前仓库", trigger: "blur"}
-                ],
-                invWarehouseCode: [
-                    {required: true, message: "请选择当前分库", trigger: "blur"}
-                ],
-                // type: [
-                //     {required: true, message: "请选择采购类型", trigger: "blur"}
-                // ],
-            },
-            codeArray: [],
-            subInvList: [],
-            fromOptions: [],
-            fromStorageOptions: [],
-            fromSubStorageOptions: [],
-            total: 0,
-            loading: false,
-            index: null,
-            formLoading: false,
-            formVisible: false,
-            deleteLoading: false,
-            orderNo: null,
-            statusMap: {
-                101: "未处理",
-                102: "已处理",
-                201: "未配货",
-                202: "已配货",
-                301: "已打印",
-                401: "异常",
-                501: "未提交",
-                502: "已提交",
-            },
-            typeMap: {
-                1: "预入库",
-                2: "普通采购",
-            },
-            orderEditor: true,
-            iCount: 0,
-            sOptions: [],
-            sValue: [],
-            sList: [],
-            sLoading: false,
-            busTypes: [],
-            currentRow: {},
-            selectedIndex: "",
-            selectInvProductVisible: false,
-            thisData: {},
-            storageList: [],
-            invQueryData: {},
-            type: 1,
-
-        };
+  name: "idQuery",
+  props: {
+    closeDialog: {
+      type: Function,
+      required: true,
+    },
+    idQuery: {
+      type: Object,
+      required: true,
+    },
+    closeConfirmFunction: {
+      type: Function,
+      required: true,
     },
-    components: {
-        draggable,
-        stockOrderNewSelectProduct,
-        dialogInvProduct,
-    },
-    methods: {
-        saveOrder(status) {
-
-            this.code = "";
-            this.$refs.multipleTable.setCurrentRow();
-            this.currentRow = {};
-            this.selectedIndex = "";
-            this.iCount = 0;
-            this.$refs["dataForm"].validate(valid => {
-                if (valid) {
-                    if (this.codeArray.length < 1) {
-                        this.$message.warning('未添加产品');
-                        return;
-                    }
-
-                    for (let i = 0; i < this.codeArray.length; i++) {
-                        if (!this.$isBlank(this.codeArray[i].productDate) && this.codeArray[i].productDate.length != 6) {
-                            return this.$message.error('生产日期格式错误');
-                        }
-                        if (!this.$isBlank(this.codeArray[i].expireDate) && this.codeArray[i].expireDate.length != 6) {
-                            return this.$message.error('失效日期格式错误');
-                        }
-
-                    }
-
-                    if (status === '2') {
-                        for (let i = 0; i < this.codeArray.length; i++) {
-                            if (this.$isBlank(this.codeArray[i].count) || this.codeArray[i].count == "0") {
-                                return this.$message.error('单据数量不能为0');
-                            }
-                            if (this.$isBlank(this.codeArray[i].batchNo)) {
-                                return this.$message.error('批次号不能为空');
-                            }
-
-
-                        }
-                    }
-                    if (status === '0') {
-                        for (let i = 0; i < this.codeArray.length; i++) {
-                            if (this.$isBlank(this.codeArray[i].count) || this.codeArray[i].count == "0") {
-                                return this.$message.error('单据数量不能为0');
-                            }
-                        }
-                    }
-
-                    if (status == "1") {
-                        this.submitFunction(status);
-                    } else {
-                        let tip = "是否确定提交订单?";
-                        this.$confirm(tip, "提示", {
-                            confirmButtonText: "确定",
-                            cancelButtonText: "取消",
-                            type: "warning",
-                        }).then(() => {
-                            this.submitFunction(status);
-                        }).catch(() => {
-                            this.loading = false;
-                        });
-                    }
+  },
+  data() {
+    return {
+      code: "",
+      query: {
+        orderIdFk: "",
+        page: 1,
+        limit: 10,
+      },
+      formData: {
+        noInvOut: false,
+        locStorageCode: null,
+        invWarehouseCode: null,
+        fromSubInvCode: null,
+        billNo: null,
+        billdate: "",
+        billType: "",
+        type: null,
+        corpName: "",
+        corpId: "",
+      },
+      formRules: {
+        corpName: [
+          {required: true, message: "请输入供应商", trigger: "blur"}
+        ],
+        billdate: [
+          {required: true, message: "请输入单据日期", trigger: "blur"}
+        ],
+        billType: [
+          {required: true, message: "请选择业务类型", trigger: "blur"}
+        ],
+        locStorageCode: [
+          {required: true, message: "请选择当前仓库", trigger: "blur"}
+        ],
+        invWarehouseCode: [
+          {required: true, message: "请选择当前分库", trigger: "blur"}
+        ],
+        // type: [
+        //     {required: true, message: "请选择采购类型", trigger: "blur"}
+        // ],
+      },
+      codeArray: [],
+      subInvList: [],
+      fromOptions: [],
+      fromStorageOptions: [],
+      total: 0,
+      loading: false,
+      index: null,
+      formLoading: false,
+      formVisible: false,
+      deleteLoading: false,
+      orderNo: null,
+      statusMap: {
+        101: "未处理",
+        102: "已处理",
+        201: "未配货",
+        202: "已配货",
+        301: "已打印",
+        401: "异常",
+        501: "未提交",
+        502: "已提交",
+      },
+      typeMap: {
+        1: "预入库",
+        2: "普通采购",
+      },
+      curAction: {
+        corpType: 0,
+        genUnit: false,
+      },
+      orderEditor: true,
+      iCount: 0,
+      sOptions: [],
+      sValue: [],
+      sList: [],
+      sLoading: false,
+      busTypes: [],
+      currentRow: {},
+      selectedIndex: "",
+      selectProductVisible: false,
+      selectInvProductVisible: false,
+      thisData: {},
+      storageList: [],
+      invQueryData: {},
+
+    };
+  },
+  components: {
+    draggable,
+    stockOrderNewSelectProduct,
+    dialogInvProduct,
+  },
+  methods: {
+    saveOrder(status) {
+
+      this.code = "";
+      this.$refs.multipleTable.setCurrentRow();
+      this.currentRow = {};
+      this.selectedIndex = "";
+      this.iCount = 0;
+      this.$refs["dataForm"].validate(valid => {
+        if (valid) {
+          if (this.codeArray.length < 1) {
+            this.$message.warning('未添加产品');
+            return;
+          }
+
+          for (let i = 0; i < this.codeArray.length; i++) {
+            if (!this.$isBlank(this.codeArray[i].productDate) && this.codeArray[i].productDate.length != 6) {
+              return this.$message.error('生产日期格式错误');
+            }
+            if (!this.$isBlank(this.codeArray[i].expireDate) && this.codeArray[i].expireDate.length != 6) {
+              return this.$message.error('失效日期格式错误');
+            }
 
+          }
 
-                }
-            });
-        },
-        storageChange(row) {
-            console.log(row);
-            this.formData.corpId = row.code;
-            this.formData.corpName = row.name;
-            this.findSubStorageMethod();
-        },
-
-        //当前仓库
-        getStorage() {
-            this.storageList = [];
-            filterAllByUser()
-                .then((response) => {
-                    this.storageList = response.data || [];
-                    this.findSubInvs();
-                })
-                .catch(() => {
-                });
-        },
-
-        //当前分库
-        findSubInvs() {
-            this.subInvList = [];
-            let query = {
-                pcode: this.formData.locStorageCode
-            };
-            filterSubByInv(query)
-                .then((response) => {
-                    this.subInvList = response.data || [];
-                    if (this.subInvList != null && this.subInvList.length == 1) {
-                        this.formData.invWarehouseCode = this.subInvList[0].code;
-                    }
-                })
-                .catch(() => {
-                });
-        },
+          if (status === '0') {
+            for (let i = 0; i < this.codeArray.length; i++) {
+              if (this.$isBlank(this.codeArray[i].count) || this.codeArray[i].count == "0") {
+                return this.$message.error('单据数量不能为0');
+              }
+              if (this.$isBlank(this.codeArray[i].batchNo)) {
+                return this.$message.error('批次号不能为空');
+              }
 
-        getActionName(action) {
-            for (let i = 0; i < this.busTypes.length; i++) {
-                if (this.busTypes[i].action === action) {
-                    return this.busTypes[i].advanceType;
-                }
-            }
-        },
-
-        //往来仓库
-        findStorageMethod() {
-            if (this.formData.locStorageCode == null)
-                return;
-            this.fromStorageOptions = [];
-            let cQuery = {
-                locInvCode: this.formData.locStorageCode,
-            };
-            filterAllByLoc(cQuery)
-                .then((response) => {
-                    let temp = response.data || [];
-                    for (let i = 0; i < temp.length; i++) {
-                        if (temp[i].code != this.formData.locStorageCode) {
-                            this.fromStorageOptions.push(temp[i]);
-                        }
-                    }
 
-                })
-                .catch(() => {
-                });
-        },
-
-        //往来分库
-        findSubStorageMethod() {
-            let cQuery = {
-                pcode: this.formData.corpId,
-                filter: 2,
-            };
-            filterSubByInv(cQuery)
-                .then((response) => {
-                    this.fromSubStorageOptions = response.data || [];
-                })
-                .catch(() => {
-                });
-        },
-
-
-        submitFunction(status) {
-            let tMessage = status === '501' ? '保存' : '提交';
-            this.loading = true;
-            let tQuery = this.formData;
-            tQuery.editStatus = status;
-            tQuery.subErpOrders = this.codeArray;
-            tQuery.thirdPartyDate = 2;
-            if (this.editType === "add") {
-                inserThrOrderWeb(tQuery)
-                    .then(response => {
-                        this.loading = false;
-                        if (response.code === 20000) {
-                            this.$message.success(tMessage + "成功");
-                            this.closeDialog(true);
-                        } else {
-                            this.$message.error(response.message);
-                        }
-                    })
-                    .catch(() => {
-                        this.loading = false;
-                    })
-            } else if (this.editType === "update") {
-                updateReceive(tQuery)
-                    .then(response => {
-                        this.loading = false;
-                        if (response.code === 20000) {
-                            this.$message.success(tMessage + "成功");
-                            this.closeDialog(true);
-                        } else {
-                            this.$message.error(response.message);
-                        }
-                    })
-                    .catch(() => {
-                        this.loading = false;
-                    })
             }
+          }
+          if (status === '0') {
+            for (let i = 0; i < this.codeArray.length; i++) {
+              if (this.$isBlank(this.codeArray[i].count) || this.codeArray[i].count == "0") {
+                return this.$message.error('单据数量不能为0');
+              }
+            }
+          }
+
+          if (status == "1") {
+            this.submitFunction(status);
+          } else {
+            let tip = "是否确定提交订单?";
+            this.$confirm(tip, "提示", {
+              confirmButtonText: "确定",
+              cancelButtonText: "取消",
+              type: "warning",
+            }).then(() => {
+              this.submitFunction(status);
+            }).catch(() => {
+              this.loading = false;
+            });
+          }
 
 
-        },
-        selectProductFunction(event) {
+        }
+      });
+    },
+    storageChange(row) {
+      console.log(row);
+      this.formData.corpId = row.code;
+      this.formData.corpName = row.name;
+    },
+    getStorage(event) {
+      this.storageList = [];
+      filterAllByUser()
+          .then((response) => {
+            this.storageList = response.data || [];
+            this.findSubInvs();
+          })
+          .catch(() => {
+          });
+    },
+
+    getActionName(action) {
+      for (let i = 0; i < this.busTypes.length; i++) {
+        if (this.busTypes[i].action === action) {
+          return this.busTypes[i].advanceType;
+        }
+      }
+    },
+    findStorageMethod(query) {
+      if (this.formData.locStorageCode == null)
+        return;
+      this.fromStorageOptions = [];
+      let cQuery = {
+        locInvCode: this.formData.locStorageCode,
+      };
+      filterAllByLoc(cQuery)
+          .then((response) => {
+            let temp = response.data || [];
+            for (let i = 0; i < temp.length; i++) {
+              if (temp[i].code != this.formData.locStorageCode) {
+                this.fromStorageOptions.push(temp[i]);
+              }
+            }
 
-            if (event == null) {
-                // this.$refs.inputRef.focus();
+          })
+          .catch(() => {
+          });
+    },
+    submitFunction(status) {
+      let tMessage = status === '501' ? '保存' : '提交';
+      this.loading = true;
+      let tQuery = this.formData;
+      tQuery.editStatus = status;
+      tQuery.subErpOrders = this.codeArray;
+      tQuery.thirdPartyDate = 2;
+
+      // tQuery.billType = this.formData.bi;
+      console.log(tQuery);
+
+      inserThrOrderWeb(tQuery)
+          .then(response => {
+            this.loading = false;
+            if (response.code === 20000) {
+              this.$message.success(tMessage + "成功");
+              this.closeDialog(true);
             } else {
-                event.target.select();
+              this.$message.error(response.message);
             }
-            if (this.$isBlank(event)) {
+          })
+          .catch(() => {
+            this.loading = false;
+          })
+    },
+    selectProductFunction(event) {
+
+      if (event == null) {
+        // this.$refs.inputRef.focus();
+      } else {
+        event.target.select();
+      }
+      if (this.$isBlank(event)) {
+
+        if (this.$isBlank(this.formData.corpName) || this.$isBlank(this.formData.billType)) {
+          this.$message.error("往来信息和单据类型不能为空！")
+          return;
+        }
+        this.code = "";
+        this.$refs.multipleTable.setCurrentRow();
+        this.currentRow = {};
+        this.selectedIndex = "";
+        this.iCount = 0;
+        this.thisData.code = "";
+        this.thisData.orderEditor = this.orderEditor;
+        this.thisData.orderId = "";
+        if (this.orderEditor) {
+          this.thisData.orderId = this.formData.id
+        }
+        this.curAction = this.getActionItem(this.formData.billType);
+        this.thisData.stockOrderLists = this.codeArray;
+        this.thisData.formData = this.formData;
+        this.thisData.formData.thirdSysFk = this.curAction.thirdSys;
+        this.thisData.billType = this.curAction.localAction;
 
-                if (this.$isBlank(this.formData.corpName) || this.$isBlank(this.formData.billType)) {
-                    this.$message.error("往来信息和单据类型不能为空！")
-                    return;
-                }
-                this.code = "";
-                this.$refs.multipleTable.setCurrentRow();
-                this.currentRow = {};
-                this.selectedIndex = "";
-                this.iCount = 0;
-                this.thisData.code = "";
-                this.thisData.orderEditor = this.orderEditor;
-                this.thisData.orderId = "";
-                if (this.orderEditor) {
-                    this.thisData.orderId = this.formData.id
-                }
-                this.thisData.stockOrderLists = this.codeArray;
-                this.thisData.formData = this.formData;
 
+        this.invQueryData = {
+          locStorageCode: this.formData.locStorageCode,
+        };
+        this.selectInvProductVisible = true;
+
+        return;
+      }
 
-                this.invQueryData = {
-                    locStorageCode: this.formData.locStorageCode,
-                };
-                this.selectInvProductVisible = true;
-                return;
-            }
 
+    },
+    closeDialogC2(rData) {
+      this.selectProductVisible = false;
+      this.selectInvProductVisible = false;
+      this.thisData = {};
 
-        },
-        closeDialogC2(rData) {
-            this.selectInvProductVisible = false;
-            this.thisData = {};
+      if (this.$isNotBlank(rData)) {
+        this.codeArray = [];
+        rData.forEach((obj, index) => {
+          this.codeArray.unshift(obj);
+        });
+        console.log(this.codeArray);
+        this.$refs.multipleTable.setCurrentRow(this.codeArray[0]);
+        this.currentRow = this.codeArray[0];
+        this.selectedIndex = 0;
+        this.focusNext('iCount');
+        this.closeConfirmFunction(true);
+      }
+    },
+    rowChange(val) {
+      this.currentRow = val;
+      this.selectedIndex = val.index;
+      this.iCount = val.count;
 
-            if (this.$isNotBlank(rData)) {
-                this.codeArray = [];
-                rData.forEach((obj, index) => {
-                    this.codeArray.unshift(obj);
-                });
-                console.log(this.codeArray);
-                this.$refs.multipleTable.setCurrentRow(this.codeArray[0]);
-                this.currentRow = this.codeArray[0];
-                this.selectedIndex = 0;
-                this.focusNext('iCount');
-                this.closeConfirmFunction(true);
-            }
-        },
-        rowChange(val) {
-            this.currentRow = val;
-            this.selectedIndex = val.index;
-            this.iCount = val.count;
-
-            this.focusNext('iCount');
-
-        },
-        iCountChange() {
-        },
-        iCountEnterFunction() {
-            if (this.$isNotBlank(this.currentRow)) {
-                this.currentRow.count = this.iCount;
-                // this.currentRow.reCount = this.iCount;
-            }
-            this.focusNext('inputRef');
-        },
-        tableCountChange(row) {
-            if (this.$isNotBlank(row)) {
-                // row.count = row.reCount;
-            }
-        },
-        tableRowClassName({row, rowIndex}) {
-            row.index = rowIndex;
-        },
-        focusNext(nextRef) {
-            this.$refs[nextRef].focus()
-        },
-        focusNextToTable(nextRef) {
-            this.$refs[nextRef][0].focus()
-        },
+      this.focusNext('iCount');
+
+    },
+    iCountChange() {
+    },
+    iCountEnterFunction() {
+      if (this.$isNotBlank(this.currentRow)) {
+        this.currentRow.count = this.iCount;
+        // this.currentRow.reCount = this.iCount;
+      }
+      this.focusNext('inputRef');
+    },
+    tableCountChange(row) {
+      if (this.$isNotBlank(row)) {
+        // row.count = row.reCount;
+      }
+    },
+    tableRowClassName({row, rowIndex}) {
+      row.index = rowIndex;
+    },
+    focusNext(nextRef) {
+      this.$refs[nextRef].focus()
+    },
+    focusNextToTable(nextRef) {
+      this.$refs[nextRef][0].focus()
+    },
+    // 刷新表单
+    resetForm() {
+      if (this.$refs["dataForm"]) {
+        // 清空验证信息表单
+        this.$refs["dataForm"].clearValidate();
         // 刷新表单
-        resetForm() {
-            if (this.$refs["dataForm"]) {
-                // 清空验证信息表单
-                this.$refs["dataForm"].clearValidate();
-                // 刷新表单
-                this.$refs["dataForm"].resetFields();
-                this.getList();
-            }
-        },
-        addCode() {
-            this.code = this.code.trim();
-            if (this.$isBlank(this.code)) {
-                this.$message.warning('请输入条码');
-                return;
-            }
-            if (this.iCount <= 0) {
-                this.$message.warning('请输入数量');
-                return;
-            }
-            this.loading = true;
-            let tQuery = {
-                orderId: this.formData.id,
-                count: this.iCount,
-                code: this.code,
-            };
-            if (this.orderEditor) {
-                addStockOrderDetailFromCode(tQuery).then((response) => {
-                    this.loading = false;
-                    if (response.code === 20000) {
-                        this.getStockOrderDetailList();
-                    } else {
-                        this.$alert(response.message, '提示', {
-                            confirmButtonText: '确定',
-                            type: 'warning',
-                            closeOnClickModal: true,
-                            callback: action => {
-                                this.$refs.inputRef.focus();
-                            }
-                        });
-                    }
-                });
-            } else {
-                getStockOrderDetailInstrument(tQuery).then((response) => {
-                    this.loading = false;
-                    if (response.code === 20000) {
-                        for (let i = 0; i < this.codeArray.length; i++) {
-                            if (this.codeArray[i].productId === response.data.productId) {
-                                this.$alert("已添加", '提示', {
-                                    confirmButtonText: '确定',
-                                    type: 'warning',
-                                    closeOnClickModal: true,
-                                    callback: action => {
-                                        this.$refs.inputRef.focus();
-                                    }
-                                });
-                                break;
-                            }
-                            if (i + 1 === this.codeArray.length) {
-                                this.codeArray.push(response.data);
-                            }
-                        }
-                        if (this.codeArray.length === 0) {
-                            this.codeArray.push(response.data);
-                        }
-                    } else {
-                        this.$alert(response.message, '提示', {
-                            confirmButtonText: '确定',
-                            type: 'warning',
-                            closeOnClickModal: true,
-                            callback: action => {
-                                this.$refs.inputRef.focus();
-                            }
-                        });
-                    }
+        this.$refs["dataForm"].resetFields();
+        this.getList();
+      }
+    },
+    addCode() {
+      this.code = this.code.trim();
+      if (this.$isBlank(this.code)) {
+        this.$message.warning('请输入条码');
+        return;
+      }
+      if (this.iCount <= 0) {
+        this.$message.warning('请输入数量');
+        return;
+      }
+      this.loading = true;
+      let tQuery = {
+        orderId: this.formData.id,
+        count: this.iCount,
+        code: this.code,
+      };
+      if (this.orderEditor) {
+        addStockOrderDetailFromCode(tQuery).then((response) => {
+          this.loading = false;
+          if (response.code === 20000) {
+            this.getStockOrderDetailList();
+          } else {
+            this.$alert(response.message, '提示', {
+              confirmButtonText: '确定',
+              type: 'warning',
+              closeOnClickModal: true,
+              callback: action => {
+                this.$refs.inputRef.focus();
+              }
+            });
+          }
+        });
+      } else {
+        getStockOrderDetailInstrument(tQuery).then((response) => {
+          this.loading = false;
+          if (response.code === 20000) {
+            for (let i = 0; i < this.codeArray.length; i++) {
+              if (this.codeArray[i].productId === response.data.productId) {
+                this.$alert("已添加", '提示', {
+                  confirmButtonText: '确定',
+                  type: 'warning',
+                  closeOnClickModal: true,
+                  callback: action => {
+                    this.$refs.inputRef.focus();
+                  }
                 });
+                break;
+              }
+              if (i + 1 === this.codeArray.length) {
+                this.codeArray.push(response.data);
+              }
             }
-        },
-        saveCodeArray(index, row) {
-            if (this.$isBlank(row.batchNo)) {
-                return this.$message.error('批次号不能为空');
+            if (this.codeArray.length === 0) {
+              this.codeArray.push(response.data);
             }
-            this.$refs.multipleTable.setCurrentRow();
-            this.currentRow = {};
-            this.selectedIndex = "";
-            this.iCount = 0;
-
-            this.detailLoading = true;
-            // row.count = row.reCount;
-            let tQuery = row;
-            uploadStockOrderDetail(tQuery).then((response) => {
-                this.detailLoading = false;
-                if (response.code === 20000) {
-                    this.$message.success("修改完成");
-                    this.getStockOrderDetailList();
-                    this.$refs.inputRef.focus();
-                } else {
-                    this.$message.error(response.message);
-                }
+          } else {
+            this.$alert(response.message, '提示', {
+              confirmButtonText: '确定',
+              type: 'warning',
+              closeOnClickModal: true,
+              callback: action => {
+                this.$refs.inputRef.focus();
+              }
             });
-        },
-        deleteCodeArray(index, row) {
-            this.$confirm("此操作将永久删除该数据, 是否继续?", "提示", {
-                confirmButtonText: "确定",
-                cancelButtonText: "取消",
-                type: "warning",
-            }).then(() => {
-                this.$refs.multipleTable.setCurrentRow();
-                this.currentRow = {};
-                this.selectedIndex = "";
-                this.iCount = 0;
-
-                if (this.orderEditor) {
-                    this.detailLoading = true;
-                    if (this.$isNotBlank(row.id)) {
-                        delOrderDetail({id: row.id})
-                            .then(response => {
-                                this.detailLoading = false;
-                                if (response.code === 20000) {
-                                    this.$message.success(response.data);
-                                    // this.getStockOrderDetailList();
-                                    this.codeArray.splice(index, 1);
-                                } else {
-                                    this.$message.error(response.message);
-                                }
-                            })
-                            .catch(() => {
-                                this.detailLoading = false;
-                            })
-                    } else {
-                        this.$message.success('删除成功');
-                        this.codeArray.splice(index, 1);
-                    }
-                } else {
-                    this.$message.success('删除成功');
+          }
+        });
+      }
+    },
+    saveCodeArray(index, row) {
+      if (this.$isBlank(row.batchNo)) {
+        return this.$message.error('批次号不能为空');
+      }
+      this.$refs.multipleTable.setCurrentRow();
+      this.currentRow = {};
+      this.selectedIndex = "";
+      this.iCount = 0;
+
+      this.detailLoading = true;
+      // row.count = row.reCount;
+      let tQuery = row;
+      uploadStockOrderDetail(tQuery).then((response) => {
+        this.detailLoading = false;
+        if (response.code === 20000) {
+          this.$message.success("修改完成");
+          this.getStockOrderDetailList();
+          this.$refs.inputRef.focus();
+        } else {
+          this.$message.error(response.message);
+        }
+      });
+    },
+    deleteCodeArray(index, row) {
+      this.$confirm("此操作将永久删除该数据, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(() => {
+        this.$refs.multipleTable.setCurrentRow();
+        this.currentRow = {};
+        this.selectedIndex = "";
+        this.iCount = 0;
+
+        if (this.orderEditor) {
+          this.detailLoading = true;
+          if (this.$isNotBlank(row.id)) {
+            delOrderDetail({id: row.id})
+                .then(response => {
+                  this.detailLoading = false;
+                  if (response.code === 20000) {
+                    this.$message.success(response.data);
+                    // this.getStockOrderDetailList();
                     this.codeArray.splice(index, 1);
-                }
-            }).catch(() => {
-
-            });
-        },
-        copyDetail(row) {
-            this.$confirm("是否复制该记录?", "提示", {
-                confirmButtonText: "确定",
-                cancelButtonText: "取消",
-                type: "warning",
-            }).then(() => {
-                let rData = JSON.parse(JSON.stringify(row));
-                rData.id = null;
-                if (this.codeArray.length === 0) {
-                    this.codeArray.push(rData);
-                    this.$refs.multipleTable.setCurrentRow(this.codeArray[0]);
-                    this.currentRow = this.codeArray[0];
-                    this.selectedIndex = 0;
-                } else {
-                    this.codeArray.unshift(rData);
-                    this.$refs.multipleTable.setCurrentRow(this.codeArray[0]);
-                    this.currentRow = this.codeArray[0];
-                    this.selectedIndex = 0;
-                }
-                this.$message.success("复制成功");
-                this.iCount = this.currentRow.count;
-                this.focusNext('iCount');
-            }).catch(() => {
-            });
-        },
-        getInputFocus(event) {
-            event.currentTarget.select();
-        },
-        tableSelection() {
-            this.$refs.multipleTable.clearSelection();
-            this.$refs.multipleTable.toggleAllSelection();
-        },
-        handleSizeChange(val) {
-            this.query.limit = val;
-            this.getStockOrderDetailList();
-        },
-        handleCurrentChange(val) {
-            this.query.page = val;
-            this.getStockOrderDetailList();
-        },
-        getStockOrderDetailList() {
-            this.loading = true;
-            getThrOrderDetails(this.query) //查找该单号下的所有条码
-                .then((response) => {
-                    console.log(response)
-                    this.codeArray = response.data.list || [];
-                    this.total = response.data.total || 0;
-                    this.loading = false;
+                  } else {
+                    this.$message.error(response.message);
+                  }
                 })
                 .catch(() => {
-                    this.loading = false;
-                    this.list = [];
-                    this.total = 0;
-                });
-        },
-        intentBack() {
-            this.$router.go(-1);
-        },
-        getBusType() {
-            let query = {
-                enable: false,
-                type: 1,
-            };
-            getBusChange(query)
-                .then((response) => {
-                    this.busTypes = response.data.list || [];
+                  this.detailLoading = false;
                 })
-                .catch(() => {
-                });
-        },
-        selectOne(event) {
-
-            this.formData.corpName = event.name;
-            this.formData.corpId = event.erpId;
-            this.formData.unitIdFk = event.erpId;
-        },
-        getActionItem(action) {
-            for (let i = 0; i < this.busTypes.length; i++) {
-                if (this.busTypes[i].thirdAction === action) {
-                    return this.busTypes[i];
-                }
-            }
-        },
-        locInChange(item) {
-            if (this.formData.invWarehouseCode != null) {
-                this.formData.invWarehouseCode = "";
-            }
-            this.formData.locStorageCode = item;
-            this.$forceUpdate();
-            this.findStorageMethod();
-            this.findSubInvs();
-        },
-
+          } else {
+            this.$message.success('删除成功');
+            this.codeArray.splice(index, 1);
+          }
+        } else {
+          this.$message.success('删除成功');
+          this.codeArray.splice(index, 1);
+        }
+      }).catch(() => {
 
+      });
     },
-    filters: {},
-    mounted() {
-        document.body.ondrop = function (event) {
-            event.preventDefault();
-            event.stopPropagation();
-        };
+    copyDetail(row) {
+      this.$confirm("是否复制该记录?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(() => {
+        let rData = JSON.parse(JSON.stringify(row));
+        rData.id = null;
+        if (this.codeArray.length === 0) {
+          this.codeArray.push(rData);
+          this.$refs.multipleTable.setCurrentRow(this.codeArray[0]);
+          this.currentRow = this.codeArray[0];
+          this.selectedIndex = 0;
+        } else {
+          this.codeArray.unshift(rData);
+          this.$refs.multipleTable.setCurrentRow(this.codeArray[0]);
+          this.currentRow = this.codeArray[0];
+          this.selectedIndex = 0;
+        }
+        this.$message.success("复制成功");
+        this.iCount = this.currentRow.count;
+        this.focusNext('iCount');
+      }).catch(() => {
+      });
+    },
+    getInputFocus(event) {
+      event.currentTarget.select();
+    },
+    tableSelection() {
+      this.$refs.multipleTable.clearSelection();
+      this.$refs.multipleTable.toggleAllSelection();
+    },
+    handleSizeChange(val) {
+      this.query.limit = val;
+      this.getStockOrderDetailList();
     },
-    created() {
+    handleCurrentChange(val) {
+      this.query.page = val;
+      this.getStockOrderDetailList();
+    },
+    getStockOrderDetailList() {
+      this.loading = true;
+      getThrOrderDetails(this.query) //查找该单号下的所有条码
+          .then((response) => {
+            console.log(response)
+            this.codeArray = response.data.list || [];
+            this.total = response.data.total || 0;
+            this.loading = false;
+          })
+          .catch(() => {
+            this.loading = false;
+            this.list = [];
+            this.total = 0;
+          });
+    },
+    intentBack() {
+      this.$router.go(-1);
+    },
+    getBusType() {
+      let query = {
+        enabled: true,
+        corpType: 1,
+      };
+      getOriginJoinBusType(query)
+          .then((response) => {
+            this.busTypes = response.data.list || [];
+            this.curAction = this.busTypes[0];
+          })
+          .catch(() => {
+          });
+    },
+    selectOne(event) {
 
-        if (this.$isNotBlank(this.idQuery.id)) {
-            this.query.limit = 100;
-            this.query.orderIdFk = this.idQuery.id;
-            this.formData = this.idQuery.formData;
-            this.orderEditor = true;
-            this.sValue = this.formData.corpName;
-            this.getStockOrderDetailList();
-        } else {
-            this.formData = {
-                billNo: null,
-                billdate: "",
-                customerId: store.getters.customerId,
-                billType: "",
-                type: "2",
-                corpName: "",
-                corpId: "",
-                noInvOut: "",
-                locStorageCode: "",
-                invWarehouseCode: "",
-            };
-            this.iCount = 0;
-            this.orderEditor = false;
-            // this.generateBillNo();
+      this.formData.corpName = event.name;
+      this.formData.corpId = event.erpId;
+      this.formData.unitIdFk = event.erpId;
+    },
+    findMethod(query) {
+      console.log(query);
+      this.fromOptions = [];
+      let cQuery = {
+        key: query,
+        corpType: null,
+        outType: null,
+      };
+      if (this.curAction.corpType == 3) {//特殊往来
+        cQuery.corpType = 4;
+        this.formData.corpId = this.curAction.defaultUnit;
+      } else if (this.curAction.corpType == 2)//客户
+      {
+        cQuery.corpType = 4;
+        cQuery.outType = 2;
+
+      } else if (this.curAction.corpType == 0) {
+        cQuery.corpType = 2;
+      } else return;
+
+      getBasicUnitMaintains(cQuery)
+          .then((response) => {
+            this.loading = false;
+            this.fromOptions = response.data.page.list || [];
+            if (this.curAction.corpType == 3) {
+              for (let i = 0; i < this.fromOptions.length; i++) {
+                if (this.fromOptions[i].erpId == this.formData.corpId) {
+                  this.formData.corpName = this.fromOptions[i].name;
+                }
+              }
+            }
+          })
+          .catch(() => {
+            this.loading = false;
+          });
+    },
+    getActionItem(action) {
+      for (let i = 0; i < this.busTypes.length; i++) {
+        if (this.busTypes[i].thirdAction === action) {
+          return this.busTypes[i];
         }
+      }
+    },
+    actionChange(item) {
+      console.log(item);
+      this.curAction = this.getActionItem(item);
+      this.locInChange();
+      this.findMethod();
 
-        this.getBusType();
-        this.getStorage();
-        this.findSubInvs();
-        this.findStorageMethod();
-        this.findSubStorageMethod();
-        // this.findSubInvByInv();
-        this.codeArray = [];
-        this.closeConfirmFunction(false);
     },
+    locInChange(item) {
+      if (this.formData.invWarehouseCode != null) {
+        this.formData.invWarehouseCode = "";
+      }
+      this.formData.locStorageCode = item;
+      this.$forceUpdate();
+      this.getBusType(item);
+      this.findStorageMethod();
+      this.findSubInvs();
+    },
+    findSubInvs() {
+      this.subInvList = [];
+      let query = {
+        pcode: this.formData.locStorageCode
+      };
+      filterSubByInv(query)
+          .then((response) => {
+            this.subInvList = response.data || [];
+            if (this.subInvList != null && this.subInvList.length == 1) {
+              this.formData.invWarehouseCode = this.subInvList[0].code;
+            }
+          })
+          .catch(() => {
+          });
+    }
+
+
+  },
+  filters: {},
+  mounted() {
+    document.body.ondrop = function (event) {
+      event.preventDefault();
+      event.stopPropagation();
+    };
+  },
+  created() {
+
+    if (this.$isNotBlank(this.idQuery.id)) {
+      this.query.limit = 100;
+      this.query.orderIdFk = this.idQuery.id;
+      this.formData = this.idQuery.formData;
+      this.orderEditor = true;
+      this.sValue = this.formData.corpName;
+      this.getStockOrderDetailList();
+    } else {
+      this.formData = {
+        billNo: null,
+        billdate: "",
+        customerId: store.getters.customerId,
+        billType: "",
+        type: "2",
+        corpName: "",
+        corpId: "",
+        noInvOut: "",
+        locStorageCode: "",
+        invWarehouseCode: "",
+      };
+      this.iCount = 0;
+      this.orderEditor = false;
+      // this.generateBillNo();
+    }
+
+    this.getBusType();
+    this.getStorage();
+    this.findSubInvByInv();
+    this.findSubStorageMethod();
+    this.codeArray = [];
+    this.closeConfirmFunction(false);
+  },
 };
 </script>
 <style>
 
 .ao-text {
-    width: 100%;
-    font-size: 13px;
-    font-family: "Microsoft YaHei";
-    float: right;
-    text-align: right;
-    margin-top: 10px;
+  width: 100%;
+  font-size: 13px;
+  font-family: "Microsoft YaHei";
+  float: right;
+  text-align: right;
+  margin-top: 10px;
 }
 
 </style>
diff --git a/src/views/warehouse/DialogcChangeNewOrder.vue b/src/views/warehouse/DialogcChangeNewOrder.vue
index f61548d..9a76567 100644
--- a/src/views/warehouse/DialogcChangeNewOrder.vue
+++ b/src/views/warehouse/DialogcChangeNewOrder.vue
@@ -66,19 +66,21 @@
 
                 <el-col :span="3">
                     <div class="ao-text">
-                        <span>当前仓库：</span>
+                        <span>当前分库：</span>
                     </div>
                 </el-col>
 
                 <el-col :span="8">
-                    <el-form-item prop="locStorageCode">
-                        <el-select v-model="formData.locStorageCode" placeholder="当前仓库信息" @change="locCHange">
+                    <el-form-item prop="invWarehouseCode">
+                        <el-select v-model="formData.invWarehouseCode" placeholder="当前分库信息" @change="findSubStorageMethod"
+                        >
                             <el-option
-                                v-for="item in storageList"
+                                v-for="item in subInvList"
                                 :key="item.name"
                                 :label="item.name"
                                 :value="item.code">
                                 <span style="float: left">{{ item.name }}</span>
+                                <span style="float: right; color: #8492a6; font-size: 13px">{{ item.warehouseName }}</span>
                             </el-option>
                         </el-select>
                     </el-form-item>
@@ -120,27 +122,7 @@
                     </el-form-item>
                     <el-form-item class="query-form-item" prop="fromCorp"
                                   v-if="curAction.corpType ==1">
-                        <el-select
-                            v-model="formData.fromCorp"
-                            filterable
-                            remote
-                            clearable="true"
-                            reserve-keyword
-                            placeholder="请输入仓库信息"
-                            :remote-method="findStorageMethod"
-                            :loading="loading"
-                            @change="storageChange"
-                        >
-                            <el-option
-                                v-for="item in fromStorageOptions"
-                                :key="item.value"
-                                :label="item.code"
-                                :value="item">
-                                <span style="float: left">{{ item.name }}</span>
-                                <span style="float: right; color: #8492a6; font-size: 13px">{{ item.code }}</span>
-                            </el-option>
-                        </el-select>
-
+                      
                         <el-select v-model="formData.fromSubInvCode" placeholder="请选择分库" clearable="true"
                         >
                             <el-option
@@ -149,7 +131,7 @@
                                 :label="item.name"
                                 :value="item.code">
                                 <span style="float: left">{{ item.name }}</span>
-                                <span style="float: right; color: #8492a6; font-size: 13px">{{ item.code }}</span>
+                                <span style="float: right; color: #8492a6; font-size: 13px">{{ item.warehouseName }}</span>
                                 <!--<span style="float: right; color: #8492a6; font-size: 13px">{{ item.action }}</span>-->
                             </el-option>
                         </el-select>
@@ -164,26 +146,7 @@
                 </el-col>
 
 
-                <el-col :span="3">
-                    <div class="ao-text">
-                        <span>当前分库：</span>
-                    </div>
-                </el-col>
-
-                <el-col :span="8">
-                    <el-form-item prop="invWarehouseCode">
-                        <el-select v-model="formData.invWarehouseCode" placeholder="当前分库信息"
-                        >
-                            <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-col>
+               
             </el-row>
         </el-form>
 
@@ -383,7 +346,7 @@ export default {
         },
         findSubStorageMethod() {
             let cQuery = {
-                pcode: this.formData.fromCorpId,
+                code: this.formData.invWarehouseCode,
                 filter: 2,
             };
             filterSubByInv(cQuery)
@@ -508,6 +471,7 @@ export default {
             this.formData.corpOrderId = parseTime(date, '{y}{m}{d}{h}{i}{s}') + Math.ceil(Math.random() * 89 + 10);
         }
         this.getBusType();
+        this.findSubInvByInv(this.formData.locStorageCode);
         this.getStorage();
         this.getStockOrderDetailList(this.curRow.id);
     }
diff --git a/src/views/warehouse/IOErrorOrder.vue b/src/views/warehouse/IOErrorOrder.vue
index 4773e23..688bcd9 100644
--- a/src/views/warehouse/IOErrorOrder.vue
+++ b/src/views/warehouse/IOErrorOrder.vue
@@ -24,19 +24,7 @@
                         </el-option>
                     </el-select>
                 </el-form-item>
-                <el-form-item class="query-form-item">
-                    <el-select v-model="filterQuery.locStorageCode" placeholder="请选择当前仓库" clearable="true"
-                               @change="invChangetwo"
-                               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="filterQuery.invWarehouseCode" placeholder="请选择当前分库" clearable="true"
                                size="mini">
@@ -46,6 +34,7 @@
                             :label="item.name"
                             :value="item.code">
                             <span style="float: left">{{ item.name }}</span>
+                            <span style="float: right; color: #8492a6; font-size: 13px">{{ item.warehouseName }}</span>
                         </el-option>
                     </el-select>
                 </el-form-item>
diff --git a/src/views/warehouse/IOWaitOrder.vue b/src/views/warehouse/IOWaitOrder.vue
index f411f35..58bec5c 100644
--- a/src/views/warehouse/IOWaitOrder.vue
+++ b/src/views/warehouse/IOWaitOrder.vue
@@ -560,12 +560,7 @@ export default {
                 this.filterQuery.endTime = null;
             }
 
-            if (!isBlank(this.filterQuery.invWarehouseCode)) {
-                if (isBlank(this.filterQuery.locStorageCode)) {
-                    this.$message.warning("请选择仓库！");
-                    return;
-                }
-            }
+           
             this.getList();
         },
         handleSizeChange(val) {
diff --git a/src/views/warehouse/addHosOrder.vue b/src/views/warehouse/addHosOrder.vue
index 1bad363..77035a5 100644
--- a/src/views/warehouse/addHosOrder.vue
+++ b/src/views/warehouse/addHosOrder.vue
@@ -70,20 +70,21 @@
 
                 <el-col :span="2">
                     <div class="ao-text">
-                        <span>当前仓库：</span>
+                        <span>当前分库：</span>
                     </div>
                 </el-col>
 
                 <el-col :span="8">
-                    <el-form-item prop="locStorageCode">
-                        <el-select v-model="formData.locStorageCode" placeholder="当前仓库信息" @change="locCHange"
-                                   :disabled="corpOrderIdDisabled">
+                    <el-form-item prop="invWarehouseCode">
+                        <el-select v-model="formData.invWarehouseCode" placeholder="当前分库信息"
+                                   :disabled="corpOrderIdDisabled" @change="findSubStorageMethod"   filterable>
                             <el-option
-                                v-for="item in storageList"
+                                v-for="item in subInvList"
                                 :key="item.name"
                                 :label="item.name"
                                 :value="item.code">
                                 <span style="float: left">{{ item.name }}</span>
+                                <span style="float: right; color: #8492a6; font-size: 13px">{{ item.warehouseName }}</span>
                             </el-option>
                         </el-select>
                     </el-form-item>
@@ -130,30 +131,11 @@
                     <el-form-item class="query-form-item" prop="fromCorp"
                                   v-if="curAction.corpType ==1"
                     >
-                        <el-select
-                            v-model="formData.fromCorp"
-                            filterable
-                            remote
-                            clearable="true"
-                            reserve-keyword
-                            placeholder="请输入仓库信息"
-                            :remote-method="findStorageMethod"
-                            :loading="loading" :disabled="corpOrderIdDisabled"
-                            @change="storageChange"
-                        >
-                            <el-option
-                                v-for="item in fromStorageOptions"
-                                :key="item.value"
-                                :label="item.code"
-                                :value="item">
-                                <span style="float: left">{{ item.name }}</span>
-                                <span style="float: right; color: #8492a6; font-size: 13px">{{ item.code }}</span>
-                            </el-option>
-                        </el-select>
+                       
 
 
                         <el-select v-model="formData.fromSubInvCode" placeholder="请选择分库" clearable="true"
-                                   :disabled="corpOrderIdDisabled"
+                                   :disabled="corpOrderIdDisabled"  filterable
                         >
                             <el-option
                                 v-for="item in fromSubStorageOptions"
@@ -161,7 +143,7 @@
                                 :label="item.name"
                                 :value="item.code">
                                 <span style="float: left">{{ item.name }}</span>
-                                <span style="float: right; color: #8492a6; font-size: 13px">{{ item.code }}</span>
+                                <span style="float: right; color: #8492a6; font-size: 13px">{{ item.warehouseName }}</span>
                                 <!--<span style="float: right; color: #8492a6; font-size: 13px">{{ item.action }}</span>-->
                             </el-option>
                         </el-select>
@@ -178,26 +160,7 @@
 
                 </el-col>
 
-                <el-col :span="2">
-                    <div class="ao-text">
-                        <span>当前分库：</span>
-                    </div>
-                </el-col>
-
-                <el-col :span="8">
-                    <el-form-item prop="invWarehouseCode">
-                        <el-select v-model="formData.invWarehouseCode" placeholder="当前分库信息"
-                                   :disabled="corpOrderIdDisabled" @change="subStorageChange">
-                            <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-col>
+               
             </el-row>
 
             <el-row :gutter="20" v-if="enableDept">
@@ -611,10 +574,7 @@ export default {
                 this.$message.error('未选择扫码单据类型');
                 return
             }
-            if (this.formData.locStorageCode == null || this.formData.locStorageCode == '') {
-                this.$message.error('当前仓库不能为空');
-                return;
-            }
+           
 
             if (this.formData.invWarehouseCode == null || this.formData.invWarehouseCode == '') {
                 this.$message.error('当前分库不能为空');
@@ -723,10 +683,7 @@ export default {
                 this.$message.warning("请选择单据类型！");
                 return;
             }
-            if (this.$isBlank(this.formData.locStorageCode)) {
-                this.$message.error('当前仓库不能为空');
-                return;
-            }
+          
             if (this.formData.invWarehouseCode == null || this.formData.invWarehouseCode == '') {
                 this.$message.error('当前分库不能为空');
                 return;
@@ -973,6 +930,7 @@ export default {
             this.getBusType();
         },
         findMethod(query) {
+           
             this.fromOptions = [];
             let cQuery = {
                 key: query,
@@ -1026,6 +984,7 @@ export default {
 
 
         findStorageMethod() {
+           
             if (this.formData.locStorageCode == null)
                 return;
             this.fromStorageOptions = [];
@@ -1042,11 +1001,12 @@ export default {
 
         findSubStorageMethod(val) {
             let cQuery = {
-                pcode: this.formData.fromCorpId,
+                code: this.formData.invWarehouseCode,
                 filter: 2,
             };
             filterSubByInv(cQuery)
                 .then((response) => {
+                 
                     this.fromSubStorageOptions = response.data || [];
                     if (val == 1) {
 
@@ -1059,14 +1019,14 @@ export default {
 
 
         findSubInvByInv(invCode) {
+            
             this.subInvList = [];
             let query = {
-                pcode: invCode
+               
             };
             filterSubByInv(query)
                 .then((response) => {
                     this.subInvList = response.data || [];
-                    this.fromSubStorageOptions = response.data || [];
                     if (this.subInvList != null && this.subInvList.length == 1) {
                         this.formData.invWarehouseCode = this.subInvList[0].code;
                         this.getBusType();
@@ -1222,6 +1182,7 @@ export default {
 
     },
     created() {
+      
         this.formData.code = '';
         this.formData.actDate = new Date();
         this.codeArray = [];
@@ -1240,7 +1201,6 @@ export default {
             this.formData.preCheck = this.idQuery.preCheck;
             this.actionEnable = true;
             this.getCodeList();
-
             this.findSubStorageMethod(1);
         } else {
             this.corpOrderIdDisabled = false;
@@ -1263,7 +1223,7 @@ export default {
             }
         }
         this.findSubInvByInv(this.formData.locStorageCode);
-        // this.findSubStorageMethod();
+        this.findSubStorageMethod();
         this.getBusType();
 
         //查询是否启用多级仓库，判断是否启用部门
diff --git a/src/views/warehouse/addOrder.vue b/src/views/warehouse/addOrder.vue
index 514ec4f..63c4ec7 100644
--- a/src/views/warehouse/addOrder.vue
+++ b/src/views/warehouse/addOrder.vue
@@ -84,28 +84,7 @@
         </el-row>
         <el-row :gutter="20">
 
-          <el-col :span="2">
-            <div class="ao-text">
-              <span>当前仓库：</span>
-            </div>
-          </el-col>
-
-          <el-col :span="8">
-            <el-form-item prop="locStorageCode">
-              <el-select v-model="formData.locStorageCode" placeholder="当前仓库信息" clearable
-                         @change="locCHange"
-                         :disabled="corpOrderIdDisabled">
-                <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-col>
+          
 
           <el-col :span="2">
             <div class="ao-text">
@@ -125,6 +104,7 @@
                     :label="item.name"
                     :value="item.code">
                   <span style="float: left">{{ item.name }}</span>
+                  <span style="float: right; color: #8492a6; font-size: 13px">{{ item.warehouseName }}</span>
                 </el-option>
               </el-select>
             </el-form-item>
@@ -466,10 +446,7 @@ export default {
         this.$message.error('未选择扫码单据类型');
         return
       }
-      if (this.formData.locStorageCode == null || this.formData.locStorageCode == '') {
-        this.$message.error('当前仓库不能为空');
-        return;
-      }
+      
       if (this.formData.invWarehouseCode == null || this.formData.invWarehouseCode == '') {
         this.$message.error('当前分库不能为空');
         return;
@@ -600,10 +577,7 @@ export default {
         this.$message.warning("请选择单据类型！");
         return;
       }
-      if (this.$isBlank(this.formData.locStorageCode)) {
-        this.$message.error('当前仓库不能为空');
-        return;
-      }
+     
       if (this.formData.invWarehouseCode == null || this.formData.invWarehouseCode == '') {
         this.$message.error('当前分库不能为空');
         return;
diff --git a/src/views/warehouse/stockHospOrderNew.vue b/src/views/warehouse/stockHospOrderNew.vue
index e648936..f0c5603 100644
--- a/src/views/warehouse/stockHospOrderNew.vue
+++ b/src/views/warehouse/stockHospOrderNew.vue
@@ -116,39 +116,19 @@
                         </el-form-item>
                         <el-form-item class="query-form-item" prop="fromCorp"
                                       v-if="curAction.corpType ==1">
-                            <el-select
-                                v-model="formData.corpName"
-                                filterable
-                                remote
-                                clearable="true" :disabled="codeArray.length>0"
-                                reserve-keyword
-                                placeholder="请输入仓库信息"
-                                :remote-method="findStorageMethod"
-                                :loading="loading"
-                                @change="storageChange"
-                            >
-                                <el-option
-                                    v-for="item in fromStorageOptions"
-                                    :key="item.value"
-                                    :label="item.code"
-                                    :value="item">
-                                    <span style="float: left">{{ item.name }}</span>
-                                    <span style="float: right; color: #8492a6; font-size: 13px">{{
-                                            item.code
-                                        }}</span>
-                                </el-option>
-                            </el-select>
+                           
 
-                            <el-select v-model="formData.fromSubInvCode" placeholder="请选择分库" clearable="true"
+                            <el-select v-model="formData.fromSubInvCode" placeholder="请选择分库" filterable  clearable="true"
                                        :disabled="codeArray.length>0"
                             >
                                 <el-option
                                     v-for="item in fromSubStorageOptions"
                                     :key="item.code"
+                                    filterable
                                     :label="item.name" :disabled="codeArray.length>0"
                                     :value="item.code">
                                     <span style="float: left">{{ item.name }}</span>
-                                    <span style="float: right; color: #8492a6; font-size: 13px">{{ item.code }}</span>
+                                    <span style="float: right; color: #8492a6; font-size: 13px">{{ item.warehouseName }}</span>
                                 </el-option>
                             </el-select>
 
@@ -164,29 +144,7 @@
 
                 </el-row>
                 <el-row :gutter="20" style="margin-top: 5px">
-                    <el-col :span="3">
-                        <div class="ao-text">
-                            <span>当前仓库：</span>
-                        </div>
-                    </el-col>
-
-                    <el-col :span="7">
-                        <el-form-item prop="locStorageCode">
-                            <el-select v-model="formData.locStorageCode" placeholder="当前仓库信息" @change="locInChange"
-                                       :disabled="codeArray.length>0"
-                                       clearable>
-                                <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-col>
-
-
+                   
                     <el-col :span="3">
                         <div class="ao-text">
                             <span>当前分库：</span>
@@ -195,7 +153,7 @@
 
                     <el-col :span="7">
                         <el-form-item prop="invWarehouseCode">
-                            <el-select v-model="formData.invWarehouseCode" placeholder="当前分库信息"
+                            <el-select v-model="formData.invWarehouseCode"  filterable placeholder="当前分库信息"
                                        :disabled="codeArray.length>0"
                                        @change="subStorageChange"
                                        clearable>
@@ -205,6 +163,7 @@
                                     :label="item.name"
                                     :value="item.code">
                                     <span style="float: left">{{ item.name }}</span>
+                                    <span style="float: right; color: #8492a6; font-size: 13px">{{ item.warehouseName }}</span>
                                 </el-option>
                             </el-select>
                         </el-form-item>
@@ -665,7 +624,7 @@ export default {
             filterAllByUser()
                 .then((response) => {
                     this.storageList = response.data || [];
-                    this.findSubInvs();
+                   
                 })
                 .catch(() => {
                 });
@@ -716,7 +675,7 @@ export default {
 
         findSubStorageMethod() {
             let cQuery = {
-                pcode: this.formData.corpId,
+                code: this.formData.invWarehouseCode,
                 filter: 2,
             };
             filterSubByInv(cQuery)
@@ -734,6 +693,7 @@ export default {
             };
             filterSubByInv(query)
                 .then((response) => {
+
                     this.subInvList = response.data || [];
                     if (this.subInvList != null && this.subInvList.length == 1) {
                         this.formData.invWarehouseCode = this.subInvList[0].code;
@@ -813,8 +773,8 @@ export default {
                     this.$message.error("往来信息和单据类型不能为空！")
                     return;
                 }
-                if (this.$isBlank(this.formData.locStorageCode) || this.$isBlank(this.formData.invWarehouseCode)) {
-                    this.$message.error("当前仓库和当前分库不能为空！");
+                if (this.$isBlank(this.formData.invWarehouseCode)) {
+                    this.$message.error("当前分库不能为空！");
                     return;
                 }
                 this.code = "";
@@ -1288,12 +1248,13 @@ export default {
         locInChange() {
             this.$forceUpdate();
             // this.getBusType();
-            this.invChange();
+            // this.invChange();
             this.findStorageMethod();
         },
 
         subStorageChange() {
             this.getBusType();
+            this.findSubStorageMethod();
         },
         invChange() {
             /*if (this.$isNotBlank(this.formData.invWarehouseCode))
@@ -1308,6 +1269,7 @@ export default {
             };
             filterSubByInv(query)
                 .then((response) => {
+                  
                     this.subInvList = response.data || [];
                     if (this.subInvList != null && this.subInvList.length == 1) {
                         this.formData.invWarehouseCode = this.subInvList[0].code;
diff --git a/src/views/warehouse/stockOrderEditDistribution.vue b/src/views/warehouse/stockOrderEditDistribution.vue
index 52dd1bb..3f0ea73 100644
--- a/src/views/warehouse/stockOrderEditDistribution.vue
+++ b/src/views/warehouse/stockOrderEditDistribution.vue
@@ -89,29 +89,7 @@
                 </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="locStorageCode">
-                            <el-select v-model="formData.locStorageCode" placeholder="当前仓库信息"
-                                       @change="invChange"
-                                       disabled>
-                                <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-col>
-
-
+                  
                     <el-col :span="3">
                         <div class="ao-text">
                             <span>当前分库：</span>
@@ -129,6 +107,7 @@
                                     :label="item.name"
                                     :value="item.code">
                                     <span style="float: left">{{ item.name }}</span>
+                                    <span style="float: right; color: #8492a6; font-size: 13px">{{ item.warehouseName }}</span>
                                 </el-option>
                             </el-select>
                         </el-form-item>
diff --git a/src/views/warehouse/stockOrderNewDistribution.vue b/src/views/warehouse/stockOrderNewDistribution.vue
index 3ee5a66..049377c 100644
--- a/src/views/warehouse/stockOrderNewDistribution.vue
+++ b/src/views/warehouse/stockOrderNewDistribution.vue
@@ -100,29 +100,6 @@
 
                 <el-row :gutter="20" style="margin-top: 5px">
 
-                    <el-col :span="3">
-                        <div class="ao-text">
-                            <span>当前仓库：</span>
-                        </div>
-                    </el-col>
-
-                    <el-col :span="7">
-                        <el-form-item prop="locStorageCode">
-                            <el-select v-model="formData.locStorageCode" placeholder="当前仓库信息" clearable
-                                       :disabled="codeArray.length>0"
-                                       @change="invChange">
-                                <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-col>
-
-
                     <el-col :span="3">
                         <div class="ao-text">
                             <span>当前分库：</span>
@@ -141,6 +118,7 @@
                                     :label="item.name"
                                     :value="item.code">
                                     <span style="float: left">{{ item.name }}</span>
+                                    <span style="float: right; color: #8492a6; font-size: 13px">{{ item.warehouseName }}</span>
                                 </el-option>
                             </el-select>
                         </el-form-item>