diff --git a/src/api/thrsys/thrOrder.js b/src/api/thrsys/thrOrder.js
index 479c217..9f166be 100644
--- a/src/api/thrsys/thrOrder.js
+++ b/src/api/thrsys/thrOrder.js
@@ -24,6 +24,15 @@ export function delThrOrders(query) {
     });
 }
 
+export function delOrderDetail(query) {
+    return axios({
+        url: "/udiwms/thrsys/delOrderDetail",
+        method: "post",
+        data: query
+    });
+}
+
+
 export function delAll(query) {
     return axios({
         url: "/udiwms/thrsys/order/delAll",
diff --git a/src/views/business/selectThrOrder.vue b/src/views/business/selectThrOrder.vue
index 9a8e67b..fa08c4b 100644
--- a/src/views/business/selectThrOrder.vue
+++ b/src/views/business/selectThrOrder.vue
@@ -20,16 +20,6 @@
                             ></el-input>
                         </el-form-item>
                         <el-form-item class="query-form-item">
-                            <!--                        <el-select v-model="listQuery.billAction" placeholder="请选择业务类型">-->
-                            <!--                            <el-option-->
-                            <!--                                v-for="item in busTypes"-->
-                            <!--                                :key="item.localName"-->
-                            <!--                                :label="item.localName"-->
-                            <!--                                :value="item.action">-->
-                            <!--                                <span style="float: left">{{ item.localName }}</span>-->
-                            <!--                                &lt;!&ndash;<span style="float: right; color: #8492a6; font-size: 13px">{{ item.action }}</span>&ndash;&gt;-->
-                            <!--                            </el-option>-->
-                            <!--                        </el-select>-->
 
                             <el-select v-model="listQuery.billAction" placeholder="请选择第三方系统单据类型" clearable="true">
                                 <el-option
@@ -47,20 +37,6 @@
 
 
                         </el-form-item>
-                        <!--                        <el-form-item class="query-form-item">-->
-                        <!--                            <el-select v-model="listQuery.thirdSys" placeholder="请选择第三方系统" @change="thirdSysChange">-->
-                        <!--                                <el-option-->
-                        <!--                                    v-for="item in thirdSys"-->
-                        <!--                                    :key="item.value"-->
-                        <!--                                    :label="item.thirdName"-->
-                        <!--                                    :value="item.thirdId">-->
-                        <!--                                    <span style="float: left">{{ item.thirdName }}</span>-->
-                        <!--                                    <span style="float: right; color: #8492a6; font-size: 13px">{{-->
-                        <!--                                            item.thirdId-->
-                        <!--                                        }}</span>-->
-                        <!--                                </el-option>-->
-                        <!--                            </el-select>-->
-                        <!--                        </el-form-item>-->
                     </el-row>
                     <el-row>
                         <el-form-item class="query-form-item">
@@ -81,7 +57,12 @@
                         </el-form-item>
                         <el-form-item style="display: flex">
                             <el-button-group>
-                                <el-button type="primary" icon="search" @click="getList">查询</el-button>
+                                <el-button
+                                    type="primary"
+                                    icon="el-icon-refresh"
+                                    @click="onReset"
+                                ></el-button>
+                                <el-button type="primary" icon="search" @click="submitFind">查询</el-button>
                                 <el-button type="primary" icon="search" @click="combine"
                                 >确定
                                 </el-button
@@ -120,60 +101,31 @@
 
         <el-dialog
             v-if="storageVisible"
-            title="请选择当前仓库"
+            title="请选择单据所属仓库信息"
             :close-on-click-modal="false"
             :close-on-press-escape="false"
             append-to-body
             :visible.sync="storageVisible">
 
-            <el-table
-                :data="storageList"
-                style="width: 100%;margin-bottom: 20px;"
-                row-key="id"
-                highlight-current-row>
-
-                <el-table-column
-                    prop="code"
-                    label="仓库编码"
-                    width="120"
-                >
-                </el-table-column>
-                <el-table-column
-                    prop="name"
-                    label="仓库名称"
-                    width="250"
-                >
-                </el-table-column>
-
-
-                <el-table-column label="操作" fixed="right">
-                    <template slot-scope="scope">
-
-                        <el-button
-                            type="text"
-                            size="small"
-                            @click.native.stop="selectStorage(scope.row)"
-                        >选择
-                        </el-button
-                        >
-                    </template>
-
-                </el-table-column>
-            </el-table>
+            <selectInvDialog
+                :closeInvDialog="closeInvDialog"
+                :billData="currentRow"
+                :closeSubmitDialog="closeSubmitDialog"
+            ></selectInvDialog>
 
         </el-dialog>
-
     </div>
 </template>
 
 <script>
 import {addStockOrder, getCloudErp} from "../../api/inout/erpOrder";
-import {getBussinessType} from "../../api/basic/bussinessType";
 import {getLocalJoinBusType} from "../../api/basic/busLocalType";
 import store from "../../store";
 import {getOriginBusType} from "@/api/basic/busOriginType";
 import {filterAllByUser} from "@/api/basic/invWarehouse";
 
+import selectInvDialog from "./DialogSelectInv";
+
 export default {
     name: "closeDialog",
     props: {
@@ -252,6 +204,21 @@ export default {
         };
     },
     methods: {
+        onReset() {
+            this.$router.push({
+                path: "",
+            });
+            this.listQuery = {
+                billNo: "",
+                corpName: null,
+                billAction: null,
+                page: 1,
+                limit: 10,
+            };
+            this.actDateRange = [];
+            this.getList();
+        },
+
         tableRowClassName({row}) {
             if (row.checked) return "warning-row";
             return "";
@@ -318,6 +285,7 @@ export default {
                 let tQuery = {
                     id: this.currentRow.id,
                     locStorageCode: this.curLocInv,
+                    invWarehouseCode: this.currentRow.invWarehouseCode,
                 }
                 addStockOrder(tQuery)
                     .then((response) => {
@@ -331,6 +299,10 @@ export default {
                     });
             }
         },
+        submitFind() {
+            this.listQuery.page = 1;
+            this.getList();
+        },
         selectStorage(row) {
             this.curLocInv = row.code;
             let tQuery = {
@@ -361,15 +333,12 @@ export default {
             getLocalJoinBusType(query)
                 .then((response) => {
                     this.busTypes = response.data.list || [];
-                    // this.listQuery.billAction = this.busTypes[0].action;
                 })
                 .catch(() => {
                 });
             getOriginBusType(query)
                 .then((response) => {
                     this.originTypes = response.data.list || [];
-                    // this.listQuery.billAction = this.originTypes[0].action;
-                    // this.getList();
                 })
                 .catch(() => {
                 });
@@ -386,11 +355,24 @@ export default {
                 .catch(() => {
                 });
         },
+
+
+        closeInvDialog() {
+            this.storageVisible = false;
+        },
+
+        closeSubmitDialog() {
+            this.storageVisible = false;
+            this.combine();
+        },
     },
     created() {
         this.getBusType();
         this.getStorage();
+        this.getList();
     },
+    components: {selectInvDialog}
+
 };
 </script>
 
diff --git a/src/views/business/stockOrderEditor.vue b/src/views/business/stockOrderEditor.vue
index 4a82d17..37d2929 100644
--- a/src/views/business/stockOrderEditor.vue
+++ b/src/views/business/stockOrderEditor.vue
@@ -72,7 +72,7 @@
                             <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
                             <el-button type="primary" icon="search" @click="onSubmit">查询</el-button>
                             <el-button type="primary" icon="search" @click="selectThrOrderFunction()"
-                                       :loading="loading">选入订单
+                                       :loading="loading">选入单据
                             </el-button>
                         </el-button-group>
                     </el-form-item>
@@ -474,7 +474,7 @@
         </el-dialog>
 
         <el-dialog
-            title="选入订单"
+            title="选入单据"
             :visible.sync="selectThrOrderVisible"
             :close-on-click-modal="false"
             :close-on-press-escape="false"
diff --git a/src/views/inout/DialogSelectInv.vue b/src/views/inout/DialogSelectInv.vue
new file mode 100644
index 0000000..c028357
--- /dev/null
+++ b/src/views/inout/DialogSelectInv.vue
@@ -0,0 +1,153 @@
+<template>
+
+
+    <el-form :model="userInfo">
+        <el-row :gutter="20">
+
+            <el-col :span="6">
+                <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="6">
+                <div class="ao-text">
+                    <span>当前分库：</span>
+                </div>
+            </el-col>
+            <el-col :span="16">
+                <el-form-item prop="locInvCode">
+                    <el-select v-model="userInfo.locSubInvCode" 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>
+                        </el-option>
+                    </el-select>
+                </el-form-item>
+            </el-col>
+        </el-row>
+        <div style='text-align: center; margin-bottom: 10px;margin-top: 18px ;'>
+            <el-button type="primary" @click="submitInv">提交</el-button>
+            <el-button type="primary" @click="closeDG">取消</el-button>
+        </div>
+    </el-form>
+
+</template>
+
+<script>
+import {filterAllByUser} from "@/api/basic/invWarehouse";
+import {filterSubByInv} from "@/api/basic/invSubWarehouse";
+import {updateInv} from "@/api/auth/authAdmin";
+
+export default {
+    name: "DialogSelectInv",
+    props: {
+        billData: {
+            type: Object,
+            required: true,
+        },
+        closeInvDialog: {
+            type: Function,
+            required: true,
+        },
+
+        closeSubmitDialog:{
+            type: Function,
+            required: true,
+        }
+    },
+
+    data() {
+        return {
+            userInfo: {
+                locInvCode: this.$store.getters.locInvCode,
+                locSubInvCode: this.$store.getters.locSubInvCode,
+            },
+            storageList: [],
+            subInvList: [],
+        }
+    },
+    methods: {
+        getStorage() {
+            this.storageList = [];
+            filterAllByUser()
+                .then((response) => {
+                    this.storageList = response.data || [];
+                    this.findSubInvByInv();
+                })
+                .catch(() => {
+                });
+        },
+        findSubInvByInv() {
+            this.subInvList = [];
+            let query = {
+                pcode: this.userInfo.locInvCode
+            };
+            filterSubByInv(query)
+                .then((response) => {
+                    this.subInvList = response.data || [];
+                    if (this.subInvList != null && this.subInvList.length == 1) {
+                        this.userInfo.locSubInvCode = this.subInvList[0].code;
+                    }
+                })
+                .catch(() => {
+                });
+        },
+        locCHange() {
+
+            if (this.$isNotBlank(this.userInfo.locSubInvCode)) {
+                this.userInfo.locSubInvCode = "";
+            }
+            this.findSubInvByInv();
+        },
+
+        submitInv() {
+            if (this.$isBlank(this.userInfo.locInvCode)) {
+                this.$message.error("当前仓库不能为空！");
+                return;
+            }
+            if (this.$isBlank(this.userInfo.locSubInvCode)) {
+                this.$message.error("当前分库不能为空！");
+                return;
+            }
+
+            this.billData.locStorageCode = this.userInfo.locInvCode;
+            this.billData.invWarehouseCode = this.userInfo.locSubInvCode;
+            this.closeSubmitDialog();
+        },
+        closeDG() {
+            this.closeInvDialog();
+        },
+    },
+    created() {
+        this.getStorage();
+    },
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/inventory/DialogInvProduct.vue b/src/views/inventory/DialogInvProduct.vue
index 0aad9db..bbc4ab2 100644
--- a/src/views/inventory/DialogInvProduct.vue
+++ b/src/views/inventory/DialogInvProduct.vue
@@ -14,7 +14,11 @@
                     </el-form-item>
                     <el-form-item>
                         <el-button-group>
-
+                            <el-button
+                                type="primary"
+                                icon="el-icon-refresh"
+                                @click="onReset"
+                            ></el-button>
                             <el-button type="primary" icon="search" @click="onSubmit"
                             >查询
                             </el-button
@@ -67,6 +71,7 @@
             @current-change="handleCurrentChange"
             layout="prev, pager, next"
             :total="total"
+            :current-page="filterQuery.page"
         ></el-pagination>
     </div>
 </template>
@@ -97,7 +102,7 @@ export default {
             type: Function,
             required: true,
         },
-        invQueryData:{
+        invQueryData: {
             type: Object,
             required: true,
         }
@@ -115,6 +120,13 @@ export default {
                 supId: null,
                 unitFk: null,
                 invStorageCode: null,
+                invWarehouseCode: null,
+            },
+            detailQuery: {
+                code: null,
+                productIdFk: null,
+                page: 1,
+                limit: 20,
             },
             list: [],
             codeDetailVisible: false,
@@ -319,12 +331,13 @@ export default {
     created() {
         this.getBusType();
         let query = this.$route.query;
-        this.filterQuery.invStorageCode = this.invQueryData.locStorageCode;
+
         this.filterQuery = Object.assign(this.filterQuery, query);
+
+
+        this.filterQuery.invStorageCode = this.invQueryData.locStorageCode;
+        this.filterQuery.invWarehouseCode = this.invQueryData.invWarehouseCode;
         this.filterQuery.limit = parseInt(this.filterQuery.limit);
-        if (!isBlank(this.invQueryData.corpId)) {
-            this.filterQuery.supId = this.invQueryData.corpId;
-        }
         // 加载表格数据
         this.getList();
     },
diff --git a/src/views/thrsys/ThrOrdedrReceiveAdd.vue b/src/views/thrsys/ThrOrdedrReceiveAdd.vue
index b43dcd1..a50f295 100644
--- a/src/views/thrsys/ThrOrdedrReceiveAdd.vue
+++ b/src/views/thrsys/ThrOrdedrReceiveAdd.vue
@@ -1,6 +1,8 @@
 <template>
     <div>
         <el-card class="el-card">
+
+
             <el-form :inline="true" :model="filterQuery"
                      class="query-form" size="mini">
                 <el-row>
@@ -52,9 +54,9 @@
                     <el-form-item>
                         <el-button-group style="display:flex;">
                             <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
-                            <el-button type="primary" icon="search" @click="getList">查询</el-button>
+                            <el-button type="primary" icon="search" @click="onSubmitFind">查询</el-button>
                             <el-button type="primary" icon="search" @click="newDistributionForm()" :loading="loading">
-                                新增订单
+                                新增单据
                             </el-button>
 
 
@@ -67,12 +69,11 @@
             <el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row="true"
                       @current-change="handleDetail">
                 <el-table-column label="序号" type="index" width="60"></el-table-column>
-                <el-table-column label="第三方单据类型" prop="billType"></el-table-column>
+                <el-table-column label="第三方单据类型" prop="billTypeName"></el-table-column>
                 <el-table-column label="单据号" prop="billNo"></el-table-column>
                 <el-table-column label="往来单位ID" prop="corpId"></el-table-column>
                 <el-table-column label="往来单位" prop="corpName"
                                  show-overflow-tooltip="true"></el-table-column>
-                <!--                <el-table-column label="单据状态" prop="billFlag"></el-table-column>-->
                 <el-table-column label="单据日期" prop="billdate"></el-table-column>
                 <el-table-column label="操作" fixed="right">
                     <template slot-scope="scope">
@@ -111,7 +112,7 @@
         </el-card>
 
         <el-dialog
-            title="编辑"
+            :title="formMap[formName]"
             :visible.sync="newSpDistributionVisible"
             width="80%"
             v-if="newSpDistributionVisible"
@@ -156,6 +157,12 @@ export default {
                 type: 1,
                 editStatus: 1,
             },
+            formName: null,
+            formMap: {
+                add: "新增领用单据",
+                update: "编辑领用单据",
+            },
+
             idQuery: {},
             total: 0,
             thirdSys: [],
@@ -229,6 +236,11 @@ export default {
             this.getList();
         },
 
+        onSubmitFind() {
+            this.filterQuery.page = 1;
+            this.getList();
+        },
+
         getList() {
             if (this.filterQuery.thirdSysFk == null) {
                 this.$message.warning("请先选择第三方系统！")
@@ -443,7 +455,9 @@ export default {
             if (this.$isNotBlank(row) && this.$isNotBlank(row.id)) {
                 this.idQuery.id = row.id;
                 this.idQuery.formData = row;
-            }
+                this.formName = "update";
+            } else
+                this.formName = "add";
             this.newSpDistributionVisible = true;
         },
 
@@ -459,6 +473,7 @@ export default {
         let start = new Date();
         start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
         this.actDateRange = [start, end];
+        this.getList();
     },
 };
 </script>
diff --git a/src/views/thrsys/ThrOrdedrReceiveSearch.vue b/src/views/thrsys/ThrOrdedrReceiveSearch.vue
index 2e31a6d..b9ac908 100644
--- a/src/views/thrsys/ThrOrdedrReceiveSearch.vue
+++ b/src/views/thrsys/ThrOrdedrReceiveSearch.vue
@@ -1,12 +1,9 @@
 <template>
     <div>
         <el-card class="el-card">
-
-
             <el-form :inline="true" :model="filterQuery"
                      class="query-form" size="mini">
                 <el-row>
-
                     <el-form-item class="query-form-item">
                         <el-input
                             v-model="filterQuery.billNo"
@@ -51,40 +48,10 @@
                         >
                         </el-date-picker>
                     </el-form-item>
-                    <!--<el-form-item class="query-form-item">-->
-                    <!--<el-select v-model="filterQuery.thirdSysFk" placeholder="请选择第三方系统">-->
-                    <!--<el-option-->
-                    <!--v-for="item in thirdSys"-->
-
-
-                    <!--:key="item.value"-->
-                    <!--:label="item.thirdName"-->
-                    <!--:value="item.thirdId">-->
-                    <!--<span style="float: left">{{ item.thirdName }}</span>-->
-                    <!--<span style="float: right; color: #8492a6; font-size: 13px">{{ item.thirdId }}</span>-->
-                    <!--</el-option>-->
-                    <!--</el-select>-->
-                    <!--</el-form-item>-->
                     <el-form-item>
                         <el-button-group style="display:flex;">
                             <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
-                            <el-button type="primary" icon="search" @click="getList">查询</el-button>
-                            <!--<el-button type="primary" icon="search" @click="clearAll">清空全部</el-button>-->
-                            <!--<el-upload-->
-                            <!--v-if="!this.thirdSysDetail.enabled"-->
-                            <!--:action="uploadFileUrl"-->
-                            <!--multiple-->
-                            <!--:limit="3"-->
-                            <!--:data="uploadData"-->
-                            <!--:show-file-list="false"-->
-                            <!--:on-success="handleChange"-->
-                            <!--:file-list="fileList"-->
-                            <!--&gt;-->
-                            <!--<el-button size="mini" type="primary">导入业务单据</el-button>-->
-                            <!--</el-upload>-->
-                            <!--<el-button type="primary" icon="search" @click="downloadDatas"-->
-                            <!--v-if="this.thirdSysDetail.enabled && this.thirdSysDetail.itrCache">导入业务单据-->
-                            <!--</el-button>-->
+                            <el-button type="primary" icon="search" @click="onSubmitFind">查询</el-button>
                         </el-button-group>
                     </el-form-item>
                 </el-row>
@@ -93,25 +60,12 @@
             <el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row="true"
                       @current-change="handleDetail">
                 <el-table-column label="序号" type="index" width="60"></el-table-column>
-                <el-table-column label="第三方单据类型" prop="billType"></el-table-column>
+                <el-table-column label="第三方单据类型" prop="billTypeName"></el-table-column>
                 <el-table-column label="单据号" prop="billNo"></el-table-column>
                 <el-table-column label="往来单位ID" prop="corpId"></el-table-column>
                 <el-table-column label="往来单位" prop="corpName"
                                  show-overflow-tooltip="true"></el-table-column>
-<!--                <el-table-column label="单据状态" prop="billFlag"></el-table-column>-->
                 <el-table-column label="单据日期" prop="billdate"></el-table-column>
-
-
-                <!--        <el-table-column label="扫码单据类型" prop="billType">-->
-                <!--          <template slot-scope="scope">-->
-                <!--            <span>{{ getActionName(scope.row.billType) }}</span>-->
-                <!--          </template>-->
-                <!--        </el-table-column>-->
-                <!--        <el-table-column label="目标单据类型" prop="billType">-->
-                <!--          <template slot-scope="scope">-->
-                <!--            <span>{{ getlocalName(scope.row.billType) }}</span>-->
-                <!--          </template>-->
-                <!--        </el-table-column>-->
                 <el-table-column label="操作" fixed="right">
                     <template slot-scope="scope">
                         <el-button type="text" size="small" @click.native.stop="deleteDialog(scope.row)"
@@ -163,7 +117,7 @@ export default {
             filterQuery: {
                 billAction: null,
                 billNo: "",
-                originType:null,
+                originType: null,
                 thirdSysFk: "",
                 page: 1,
                 limit: 10,
@@ -175,7 +129,7 @@ export default {
             thirdSys: [],
             thirdSysDetail: null,
             busTypes: [],
-            originTypes:[],
+            originTypes: [],
             list: [],
             detailList: [],
             uploadFileUrl: null,
@@ -241,6 +195,12 @@ export default {
             this.getList();
         },
 
+
+        onSubmitFind() {
+            this.filterQuery.page = 1;
+            this.getList();
+        },
+
         getList() {
             if (this.filterQuery.thirdSysFk == null) {
                 this.$message.warning("请先选择第三方系统！")
@@ -271,24 +231,7 @@ export default {
                 });
         },
         handleDetail(row) {
-
             this.detailList = row.subErpOrders;
-            // console.log(row.billNo);
-            // let query = {
-            //     orderIdFk: row.id
-            // };
-            // this.loading = true;
-            // getThrOrderDetails(query)
-            //     .then((response) => {
-            //         this.loading = false;
-            //         this.detailList = response.data.list || [];
-            //         this.total = response.data.total || 0;
-            //     })
-            //     .catch(() => {
-            //         this.loading = false;
-            //         this.list = [];
-            //         this.total = 0;
-            //     });
         },
         deleteDialog(row) {
             this.$confirm("此操作将永久删除该单据, 是否继续?", "提示", {
@@ -313,11 +256,11 @@ export default {
                         .catch(() => {
                             this.loading = false;
                         });
-
                 })
                 .catch(() => {
                 });
-        },
+        }
+        ,
         clearAll() {
             this.$confirm("此操作将清空所有单据, 是否继续?", "提示", {
                 confirmButtonText: "确定",
@@ -338,11 +281,11 @@ export default {
                         .catch(() => {
                             this.loading = false;
                         });
-
                 })
                 .catch(() => {
                 });
-        },
+        }
+        ,
         getBasicThirdSys() {
             let query = {
                 enabled: true,
@@ -360,11 +303,13 @@ export default {
                     this.loading = false;
                     this.list = [];
                 });
-        },
+        }
+        ,
         handleCurrentChange(val) {
             this.filterQuery.page = val;
             this.getList();
-        },
+        }
+        ,
         handleChange(response, files, fileList) {
             console.log(response);
             if (response.code != 20000) {
@@ -373,7 +318,8 @@ export default {
                 console.log(files[0] + "\n" + this.fileList[0] + "\n" + fileList[0]);
                 this.$message.success("文件上传成功,请稍后刷新查看！");
             }
-        },
+        }
+        ,
         selectSysParam() {
             let query = {
                 key: "thirdIpUrl",
@@ -402,7 +348,6 @@ export default {
                     this.loading = false;
                     this.list = [];
                 });
-
         },
         downloadDatas() {
             let query = {
@@ -415,7 +360,6 @@ export default {
                     this.$message.error(response.message);
                 }
             });
-
         },
         getActionName(action) {
             for (let i = 0; i < this.busTypes.length; i++) {
@@ -439,22 +383,16 @@ export default {
             getLocalJoinBusType(query)
                 .then((response) => {
                     this.busTypes = response.data.list || [];
-                    // this.getList();
                 })
                 .catch(() => {
                 });
             getOriginBusType(query)
                 .then((response) => {
                     this.originTypes = response.data.list || [];
-                    // this.filterQuery.originType = this.originTypes[0].action;
-                    // this.getList();
                 })
                 .catch(() => {
                 });
-
-
         },
-
     },
     components: {},
     mounted() {
@@ -465,6 +403,7 @@ export default {
         let start = new Date();
         start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
         this.actDateRange = [start, end];
+        this.getList();
     },
 };
 </script>
diff --git a/src/views/thrsys/thrOrderNew.vue b/src/views/thrsys/thrOrderNew.vue
index fb584fa..27fe74d 100644
--- a/src/views/thrsys/thrOrderNew.vue
+++ b/src/views/thrsys/thrOrderNew.vue
@@ -139,7 +139,6 @@
                     <el-col :span="7">
                         <el-form-item prop="invWarehouseCode">
                             <el-select v-model="formData.invWarehouseCode" placeholder="当前分库信息"
-                                       :disabled="codeArray.length>0"
                                        clearable>
                                 <el-option
                                     v-for="item in subInvList"
@@ -153,22 +152,6 @@
                     </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="type" style="margin-right: 20px;"
-                                      v-if="!(curAction.mainAction=='WareHouseIn' && curAction.corpType == 0)">
-                            <el-checkbox v-model="formData.noInvOut" :disabled="codeArray.length>0">允许无库存出库
-                            </el-checkbox>
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-
             </el-card>
 
             <el-card>
@@ -326,12 +309,18 @@
 
 <script>
 import {
+    stockOrderDetail,
+    submitStockOrder,
+    stockOrderGenerateBillNo,
     getStockOrderDetailInstrument,
+    insertStockOrderWeb,
     deleteStockOrderDetailById,
     addStockOrderDetailFromCode,
     uploadStockOrderDetail,
 } from "../../api/inout/stockOrder";
 import draggable from "vuedraggable";
+import {saveAs} from "file-saver";
+import {parseTime} from "../../filtres";
 import store from "../../store";
 import stockOrderNewSelectProduct from "../business/stockOrderNewSelectProduct";
 import {getBasicUnitMaintains} from "../../api/basic/basicUnitMaintain";
@@ -339,7 +328,7 @@ import {filterAllByLoc, filterAllByUser} from "@/api/basic/invWarehouse";
 import dialogInvProduct from "../inventory/DialogInvProduct"
 import {getOriginJoinBusType} from "@/api/basic/busOriginType";
 import {inserThrOrderWeb} from "@/api/thrsys/thrOrderReceive";
-import {getThrOrderDetails} from "@/api/thrsys/thrOrder";
+import {getThrOrderDetails, delThrOrders, delOrderDetail} from "@/api/thrsys/thrOrder";
 import {filterSubByInv} from "@/api/basic/invSubWarehouse";
 
 export default {
@@ -391,6 +380,9 @@ export default {
                 locStorageCode: [
                     {required: true, message: "请选择当前仓库", trigger: "blur"}
                 ],
+                invWarehouseCode: [
+                    {required: true, message: "请选择当前分库", trigger: "blur"}
+                ],
                 // type: [
                 //     {required: true, message: "请选择采购类型", trigger: "blur"}
                 // ],
@@ -479,12 +471,6 @@ export default {
                             if (this.$isBlank(this.codeArray[i].batchNo)) {
                                 return this.$message.error('批次号不能为空');
                             }
-                            // if (this.$isBlank(this.codeArray[i].productDate) && this.$isBlank(this.codeArray[i].expireDate)) {
-                            //     return this.$message.error('生产日期与失效日期不能全部为空');
-                            // }
-                            // if (this.$isBlank(this.codeArray[i].expireDate)) {
-                            //     return this.$message.error('失效日期不能为空');
-                            // }
 
 
                         }
@@ -517,6 +503,7 @@ export default {
             });
         },
         storageChange(row) {
+            console.log(row);
             this.formData.corpId = row.code;
             this.formData.corpName = row.name;
         },
@@ -525,6 +512,7 @@ export default {
             filterAllByUser()
                 .then((response) => {
                     this.storageList = response.data || [];
+                    this.findSubInvs();
                 })
                 .catch(() => {
                 });
@@ -564,6 +552,7 @@ export default {
             tQuery.editStatus = status;
             tQuery.subErpOrders = this.codeArray;
             // tQuery.billType = this.formData.bi;
+            console.log(tQuery);
             inserThrOrderWeb(tQuery)
                 .then(response => {
                     this.loading = false;
@@ -629,6 +618,7 @@ export default {
                 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;
@@ -782,7 +772,7 @@ export default {
                 if (this.orderEditor) {
                     this.detailLoading = true;
                     if (this.$isNotBlank(row.id)) {
-                        deleteStockOrderDetailById({id: row.id})
+                        delOrderDetail({id: row.id})
                             .then(response => {
                                 this.detailLoading = false;
                                 if (response.code === 20000) {
@@ -852,6 +842,7 @@ export default {
             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;
@@ -940,7 +931,6 @@ export default {
             this.$forceUpdate();
             this.getBusType(item);
             this.findStorageMethod();
-            this.findSubInvs();
         },
         findSubInvs() {
             this.subInvList = [];