diff --git a/src/api/inout/erpOrder.js b/src/api/inout/erpOrder.js
index 5a49a63..65773b3 100644
--- a/src/api/inout/erpOrder.js
+++ b/src/api/inout/erpOrder.js
@@ -25,6 +25,15 @@ export function addStockOrder(query) {
     });
 }
 
+export function addReceiveOrder(query) {
+    return axios({
+        url: "/udiwms/receive/addStockOrder",
+        method: "get",
+        params: query
+    });
+}
+
+
 
 export function getErpMainOrderStatus(query) {
     return axios({
diff --git a/src/api/inout/receiveOrder.js b/src/api/inout/receiveOrder.js
new file mode 100644
index 0000000..c4460a8
--- /dev/null
+++ b/src/api/inout/receiveOrder.js
@@ -0,0 +1,13 @@
+import axios from "../../utils/axios";
+
+//--------------获取领用单据-------------------
+export function getReceiveOrder(query) {
+    return axios({
+        url: "/udiwms/receive/order/filter",
+        method: "get",
+        params: query
+    });
+}
+
+
+
diff --git a/src/api/thrsys/thrOrderReceive.js b/src/api/thrsys/thrOrderReceive.js
index ac7680f..df455c7 100644
--- a/src/api/thrsys/thrOrderReceive.js
+++ b/src/api/thrsys/thrOrderReceive.js
@@ -7,3 +7,12 @@ export function inserThrOrderWeb(query) {
         data: query
     });
 }
+
+export function updateReceive(query) {
+    return axios({
+        url: "/udiwms/receive/order/update",
+        method: "post",
+        data: query
+    });
+}
+
diff --git a/src/views/inventory/DialogInvProduct.vue b/src/views/inventory/DialogInvProduct.vue
index 4de8e30..fc16deb 100644
--- a/src/views/inventory/DialogInvProduct.vue
+++ b/src/views/inventory/DialogInvProduct.vue
@@ -104,6 +104,10 @@ export default {
         invQueryData: {
             type: Object,
             required: true,
+        },
+        type: {
+            type: Object,
+            required: true,
         }
     },
     data() {
@@ -299,6 +303,7 @@ export default {
             let tQuery = {
                 datas: ids,
                 stockOrderLists: this.data.stockOrderLists,
+                type: this.type,
             };
             getStockOrderDetailInstrumentById(tQuery).then((response) => {
                 this.loading = false;
diff --git a/src/views/thrsys/ThrOrdedrReceiveAdd.vue b/src/views/thrsys/ThrOrdedrReceiveAdd.vue
index 44fa3b8..3526d4b 100644
--- a/src/views/thrsys/ThrOrdedrReceiveAdd.vue
+++ b/src/views/thrsys/ThrOrdedrReceiveAdd.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"
@@ -23,7 +20,7 @@
                     </el-form-item>
                     <el-form-item class="query-form-item">
 
-                        <el-select v-model="filterQuery.billAction" placeholder="请选择第三方系统单据类型" clearable="true">
+                        <el-select v-model="filterQuery.billAction" placeholder="单据类型" clearable="true">
                             <el-option
                                 v-for="item in originTypes"
                                 :key="item.name"
@@ -65,14 +62,12 @@
                     </el-form-item>
                 </el-row>
             </el-form>
-
             <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="billTypeName"></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"
+                <el-table-column label="往来信息" prop="corpName"
                                  show-overflow-tooltip="true"></el-table-column>
                 <el-table-column label="单据日期" prop="billdate"></el-table-column>
                 <el-table-column label="操作" fixed="right">
@@ -124,6 +119,7 @@
                 :closeDialog="closeDialog"
                 :idQuery="idQuery"
                 :closeConfirmFunction="closeConfirmFunction"
+                :editType="formName"
             ></thrOrderNew>
         </el-dialog>
     </div>
@@ -141,7 +137,7 @@ import {
     getCloudErp,
 } from "../../api/inout/erpOrder";
 import thrOrderNew from "./thrOrderNew";
-import store from "@/store";
+import {getReceiveOrder} from "@/api/inout/receiveOrder";
 
 export default {
     data() {
@@ -156,7 +152,7 @@ export default {
                 corpName: null,
                 type: 1,
                 editStatus: 1,
-                thirdPartyDate:2,
+                thirdPartyDate: 2,
             },
             formName: null,
             formMap: {
@@ -232,7 +228,7 @@ export default {
                 corpName: null,
                 type: 1,
                 editStatus: 1,
-                thirdPartyDate:2,
+                thirdPartyDate: 2,
             };
             this.actDateRange = [];
             this.getList();
@@ -256,7 +252,7 @@ export default {
                 this.filterQuery.endDate = null;
             }
             this.loading = true;
-            getCloudErp(this.filterQuery)
+            getReceiveOrder(this.filterQuery)
                 .then((response) => {
                     if (response.code == 20000) {
                         this.list = response.data.list || [];
diff --git a/src/views/thrsys/ThrOrdedrReceiveSearch.vue b/src/views/thrsys/ThrOrdedrReceiveSearch.vue
index adfba86..7e648df 100644
--- a/src/views/thrsys/ThrOrdedrReceiveSearch.vue
+++ b/src/views/thrsys/ThrOrdedrReceiveSearch.vue
@@ -1,105 +1,104 @@
 <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"
-                placeholder="单据号"
-                clearable
-            ></el-input>
-          </el-form-item>
-          <el-form-item class="query-form-item">
-            <el-input
-                v-model="filterQuery.corpName"
-                placeholder="往来单位"
-                clearable
-            ></el-input>
-          </el-form-item>
-          <el-form-item class="query-form-item">
+    <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"
+                            placeholder="单据号"
+                            clearable
+                        ></el-input>
+                    </el-form-item>
+                    <el-form-item class="query-form-item">
+                        <el-input
+                            v-model="filterQuery.corpName"
+                            placeholder="往来单位"
+                            clearable
+                        ></el-input>
+                    </el-form-item>
+                    <el-form-item class="query-form-item">
 
-            <el-select v-model="filterQuery.billAction" placeholder="请选择第三方系统单据类型" clearable="true">
-              <el-option
-                  v-for="item in originTypes"
-                  :key="item.name"
-                  :label="item.name"
-                  :value="item.action">
-                <span style="float: left;font-size: 13px">{{ item.name }}</span>
-                <span style="float: right; color: #8492a6; font-size: 13px;margin-left: 10px">{{
-                    item.thirdSysName
-                  }}</span>
-              </el-option>
+                        <el-select v-model="filterQuery.billAction" placeholder="请选择第三方系统单据类型" clearable="true">
+                            <el-option
+                                v-for="item in originTypes"
+                                :key="item.name"
+                                :label="item.name"
+                                :value="item.action">
+                                <span style="float: left;font-size: 13px">{{ item.name }}</span>
+                                <span style="float: right; color: #8492a6; font-size: 13px;margin-left: 10px">{{
+                                        item.thirdSysName
+                                    }}</span>
+                            </el-option>
 
-            </el-select>
-          </el-form-item>
-          <el-form-item class="query-form-item">
-            <span style="color: #000; margin-left: 10px; margin-right: 6px">单据日期:</span>
-            <el-date-picker
-                :picker-options="pickerOptions"
-                v-model="actDateRange"
-                type="daterange"
-                format="yyyy 年 MM 月 dd 日"
-                value-format="yyyy-MM-dd"
-                range-separator="至"
-                start-placeholder="开始日期"
-                end-placeholder="结束日期"
-            >
-            </el-date-picker>
-          </el-form-item>
-          <el-form-item>
-            <el-button-group style="display:flex;">
-              <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
-              <el-button type="primary" icon="search" @click="onSubmitFind">查询</el-button>
-            </el-button-group>
-          </el-form-item>
-        </el-row>
-      </el-form>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item class="query-form-item">
+                        <span style="color: #000; margin-left: 10px; margin-right: 6px">单据日期:</span>
+                        <el-date-picker
+                            :picker-options="pickerOptions"
+                            v-model="actDateRange"
+                            type="daterange"
+                            format="yyyy 年 MM 月 dd 日"
+                            value-format="yyyy-MM-dd"
+                            range-separator="至"
+                            start-placeholder="开始日期"
+                            end-placeholder="结束日期"
+                        >
+                        </el-date-picker>
+                    </el-form-item>
+                    <el-form-item>
+                        <el-button-group style="display:flex;">
+                            <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
+                            <el-button type="primary" icon="search" @click="onSubmitFind">查询</el-button>
+                        </el-button-group>
+                    </el-form-item>
+                </el-row>
+            </el-form>
 
-      <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="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="billdate"></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)"
-            >删除
-            </el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-      <el-pagination
-          :page-size="filterQuery.limit"
-          @current-change="handleCurrentChange"
-          layout="prev, pager, next"
-          :total="total"
-          :current-page="filterQuery.page"
-      ></el-pagination>
-    </el-card>
-    <el-card class="el-card">
-      <el-table v-loading="loading" :data="detailList" style="width: 100%">
-        <el-table-column label="序号" type="index" width="120"></el-table-column>
-        <el-table-column label="产品编码" prop="productId"></el-table-column>
-        <el-table-column label="产品通用名" prop="productName" show-overflow-tooltip="true"></el-table-column>
-        <el-table-column label="规格型号" prop="spec" show-overflow-tooltip="true"></el-table-column>
-        <el-table-column label="批次号" prop="batchNo"></el-table-column>
-        <el-table-column label="生产日期" prop="productDate"></el-table-column>
-        <el-table-column label="失效日期" prop="expireDate"></el-table-column>
-        <el-table-column label="单据数量" prop="reCount"></el-table-column>
-        <el-table-column label="实际数量" prop="count"></el-table-column>
-      </el-table>
-    </el-card>
-  </div>
+            <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="billTypeName"></el-table-column>
+                <el-table-column label="单据号" prop="billNo"></el-table-column>
+                <el-table-column label="往来信息" prop="corpName"
+                                 show-overflow-tooltip="true"></el-table-column>
+                <el-table-column label="单据日期" prop="billdate"></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)"
+                        >删除
+                        </el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+            <el-pagination
+                :page-size="filterQuery.limit"
+                @current-change="handleCurrentChange"
+                layout="prev, pager, next"
+                :total="total"
+                :current-page="filterQuery.page"
+            ></el-pagination>
+        </el-card>
+        <el-card class="el-card">
+            <el-table v-loading="loading" :data="detailList" style="width: 100%">
+                <el-table-column label="序号" type="index" width="120"></el-table-column>
+                <el-table-column label="产品编码" prop="productId"></el-table-column>
+                <el-table-column label="产品通用名" prop="productName" show-overflow-tooltip="true"></el-table-column>
+                <el-table-column label="规格型号" prop="spec" show-overflow-tooltip="true"></el-table-column>
+                <el-table-column label="批次号" prop="batchNo"></el-table-column>
+                <el-table-column label="生产日期" prop="productDate"></el-table-column>
+                <el-table-column label="失效日期" prop="expireDate"></el-table-column>
+                <el-table-column label="单据数量" prop="reCount"></el-table-column>
+                <el-table-column label="实际数量" prop="count"></el-table-column>
+            </el-table>
+        </el-card>
+    </div>
 </template>
 <script>
 import {
-  delThrOrders, delAll, downloadAll
+    delThrOrders, delAll, downloadAll
 } from "../../api/thrsys/thrOrder";
 import {getLocalJoinBusType} from "../../api/basic/busLocalType";
 import {getOriginBusType} from "../../api/basic/busOriginType";
@@ -107,332 +106,333 @@ import {getOriginBusType} from "../../api/basic/busOriginType";
 import {getBasicThirdSys, filterDetailByKey} from "../../api/basic/basicThirdSys";
 import {selectIp} from "../../api/param/systemParamConfig";
 import {
-  getCloudErp,
+    getCloudErp,
 } from "../../api/inout/erpOrder";
+import {getReceiveOrder} from "@/api/inout/receiveOrder";
 
 export default {
-  data() {
-    return {
-      filterQuery: {
-        billAction: null,
-        billNo: "",
-        originType: null,
-        thirdSysFk: "",
-        page: 1,
-        limit: 10,
-        corpName: null,
-        type: 1,
-        editStatus: 0,
-      },
-      total: 0,
-      thirdSys: [],
-      thirdSysDetail: null,
-      busTypes: [],
-      originTypes: [],
-      list: [],
-      detailList: [],
-      uploadFileUrl: null,
-      fileList: [],
-      uploadData: {
-        thirdSys: "thirdId",
-      },
-      loading: false,
-      actDateRange: [],
-      pickerOptions: {
-        shortcuts: [
-          {
-            text: "最近一周",
-            onClick(picker) {
-              const end = new Date();
-              const start = new Date();
-              start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
-              picker.$emit("pick", [start, end]);
+    data() {
+        return {
+            filterQuery: {
+                billAction: null,
+                billNo: "",
+                originType: null,
+                thirdSysFk: "",
+                page: 1,
+                limit: 10,
+                corpName: null,
+                type: 1,
+                editStatus: 2,
             },
-          },
-          {
-            text: "最近一个月",
-            onClick(picker) {
-              const end = new Date();
-              const start = new Date();
-              start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
-              picker.$emit("pick", [start, end]);
+            total: 0,
+            thirdSys: [],
+            thirdSysDetail: null,
+            busTypes: [],
+            originTypes: [],
+            list: [],
+            detailList: [],
+            uploadFileUrl: null,
+            fileList: [],
+            uploadData: {
+                thirdSys: "thirdId",
             },
-          },
-          {
-            text: "最近三个月",
-            onClick(picker) {
-              const end = new Date();
-              const start = new Date();
-              start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
-              picker.$emit("pick", [start, end]);
+            loading: false,
+            actDateRange: [],
+            pickerOptions: {
+                shortcuts: [
+                    {
+                        text: "最近一周",
+                        onClick(picker) {
+                            const end = new Date();
+                            const start = new Date();
+                            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+                            picker.$emit("pick", [start, end]);
+                        },
+                    },
+                    {
+                        text: "最近一个月",
+                        onClick(picker) {
+                            const end = new Date();
+                            const start = new Date();
+                            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+                            picker.$emit("pick", [start, end]);
+                        },
+                    },
+                    {
+                        text: "最近三个月",
+                        onClick(picker) {
+                            const end = new Date();
+                            const start = new Date();
+                            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+                            picker.$emit("pick", [start, end]);
+                        },
+                    },
+                ],
             },
-          },
-        ],
-      },
-    };
-  },
-
-  methods: {
-    onReset() {
-      this.$router.push({
-        path: "",
-      });
-      this.filterQuery = {
-        billNo: "",
-        thirdSysFk: "",
-        billFlag: null,
-        billAction: null,
-        startDate: null,
-        endDate: null,
-        page: 1,
-        limit: 10,
-        corpName: null,
-        type: 1,
-        editStatus: 0,
-      };
-      this.actDateRange = [];
-      this.getList();
+        };
     },
 
+    methods: {
+        onReset() {
+            this.$router.push({
+                path: "",
+            });
+            this.filterQuery = {
+                billNo: "",
+                thirdSysFk: "",
+                billFlag: null,
+                billAction: null,
+                startDate: null,
+                endDate: null,
+                page: 1,
+                limit: 10,
+                corpName: null,
+                type: 1,
+                editStatus: 2,
+            };
+            this.actDateRange = [];
+            this.getList();
+        },
+
 
-    onSubmitFind() {
-      this.filterQuery.page = 1;
-      this.getList();
-    },
+        onSubmitFind() {
+            this.filterQuery.page = 1;
+            this.getList();
+        },
 
-    getList() {
-      if (this.filterQuery.thirdSysFk == null) {
-        this.$message.warning("请先选择第三方系统！")
-        return;
-      }
-      if (this.actDateRange != null) {
-        this.filterQuery.startDate = this.actDateRange[0];
-        this.filterQuery.endDate = this.actDateRange[1];
-      } else {
-        this.filterQuery.startDate = null;
-        this.filterQuery.endDate = null;
-      }
-      this.loading = true;
-      getCloudErp(this.filterQuery)
-          .then((response) => {
-            if (response.code == 20000) {
-              this.list = response.data.list || [];
-              this.total = response.data.total || 0;
+        getList() {
+            if (this.filterQuery.thirdSysFk == null) {
+                this.$message.warning("请先选择第三方系统！")
+                return;
+            }
+            if (this.actDateRange != null) {
+                this.filterQuery.startDate = this.actDateRange[0];
+                this.filterQuery.endDate = this.actDateRange[1];
             } else {
-              this.$message.error(response.message);
+                this.filterQuery.startDate = null;
+                this.filterQuery.endDate = null;
             }
-            this.loading = false;
-          })
-          .catch(() => {
-            this.loading = false;
-            this.list = [];
-            this.total = 0;
-          });
-    },
-    handleDetail(row) {
-      this.detailList = row.subErpOrders;
-    },
-    deleteDialog(row) {
-      this.$confirm("此操作将永久删除该单据, 是否继续?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-          .then(() => {
-            let dQuery = {
-              id: row.id,
-            };
-            delThrOrders(dQuery)
+            this.loading = true;
+            getReceiveOrder(this.filterQuery)
                 .then((response) => {
-                  this.loading = false;
-                  if (response.code == 20000) {
-                    this.$message.success("删除成功");
-                    this.getList();
-                  } else {
-                    this.$message.error(response.message);
-                  }
+                    if (response.code == 20000) {
+                        this.list = response.data.list || [];
+                        this.total = response.data.total || 0;
+                    } else {
+                        this.$message.error(response.message);
+                    }
+                    this.loading = false;
+                })
+                .catch(() => {
+                    this.loading = false;
+                    this.list = [];
+                    this.total = 0;
+                });
+        },
+        handleDetail(row) {
+            this.detailList = row.subErpOrders;
+        },
+        deleteDialog(row) {
+            this.$confirm("此操作将永久删除该单据, 是否继续?", "提示", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning",
+            })
+                .then(() => {
+                    let dQuery = {
+                        id: row.id,
+                    };
+                    delThrOrders(dQuery)
+                        .then((response) => {
+                            this.loading = false;
+                            if (response.code == 20000) {
+                                this.$message.success("删除成功");
+                                this.getList();
+                            } else {
+                                this.$message.error(response.message);
+                            }
+                        })
+                        .catch(() => {
+                            this.loading = false;
+                        });
                 })
                 .catch(() => {
-                  this.loading = false;
                 });
-          })
-          .catch(() => {
-          });
-    }
-    ,
-    clearAll() {
-      this.$confirm("此操作将清空所有单据, 是否继续?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-          .then(() => {
-            delAll()
+        }
+        ,
+        clearAll() {
+            this.$confirm("此操作将清空所有单据, 是否继续?", "提示", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning",
+            })
+                .then(() => {
+                    delAll()
+                        .then((response) => {
+                            this.loading = false;
+                            if (response.code == 20000) {
+                                this.$message.success("删除成功");
+                                this.getList();
+                            } else {
+                                this.$message.success(response.message);
+                            }
+                        })
+                        .catch(() => {
+                            this.loading = false;
+                        });
+                })
+                .catch(() => {
+                });
+        }
+        ,
+        getBasicThirdSys() {
+            let query = {
+                enabled: true,
+            };
+            getBasicThirdSys(query)
                 .then((response) => {
-                  this.loading = false;
-                  if (response.code == 20000) {
-                    this.$message.success("删除成功");
-                    this.getList();
-                  } else {
-                    this.$message.success(response.message);
-                  }
+                    this.thirdSys = response.data.list || [];
+                    this.filterQuery.thirdSysFk = this.thirdSys[0].thirdId;
+                    this.uploadData.thirdSys = this.filterQuery.thirdSysFk;
+                    this.selectSysParam();
+                    this.getThirdSysDetail();
+                    this.getBusType();
                 })
                 .catch(() => {
-                  this.loading = false;
+                    this.loading = false;
+                    this.list = [];
                 });
-          })
-          .catch(() => {
-          });
-    }
-    ,
-    getBasicThirdSys() {
-      let query = {
-        enabled: true,
-      };
-      getBasicThirdSys(query)
-          .then((response) => {
-            this.thirdSys = response.data.list || [];
-            this.filterQuery.thirdSysFk = this.thirdSys[0].thirdId;
-            this.uploadData.thirdSys = this.filterQuery.thirdSysFk;
-            this.selectSysParam();
-            this.getThirdSysDetail();
-            this.getBusType();
-          })
-          .catch(() => {
-            this.loading = false;
-            this.list = [];
-          });
-    }
-    ,
-    handleCurrentChange(val) {
-      this.filterQuery.page = val;
-      this.getList();
-    }
-    ,
-    handleChange(response, files, fileList) {
-      console.log(response);
-      if (response.code != 20000) {
-        this.$message.error(response.message);
-      } else {
-        console.log(files[0] + "\n" + this.fileList[0] + "\n" + fileList[0]);
-        this.$message.success("文件上传成功,请稍后刷新查看！");
-      }
-    }
-    ,
-    selectSysParam() {
-      let query = {
-        key: "thirdIpUrl",
-        thirdSysFk: this.filterQuery.thirdSysFk
-      };
-      selectIp(query).then((response) => {
-        if (response.code == 20000) {
-          this.uploadFileUrl = response.data.thridUrl + "/udiwms/erp/pi/upload";
         }
-      });
-    },
-    thirdSysChange() {
-      this.uploadData.thirdSys = this.filterQuery.thirdSysFk;
-      this.getThirdSysDetail();
-    },
-    getThirdSysDetail() {
-      let query = {
-        thirdSysFk: this.filterQuery.thirdSysFk,
-        key: "orderQueryUrl",
-      };
-      filterDetailByKey(query)
-          .then((response) => {
-            this.thirdSysDetail = response.data;
-          })
-          .catch(() => {
-            this.loading = false;
-            this.list = [];
-          });
-    },
-    downloadDatas() {
-      let query = {
-        billAction: this.filterQuery.billAction
-      };
-      downloadAll(query).then((response) => {
-        if (response.code == 20000) {
-          this.$message.success(response.data);
-        } else {
-          this.$message.error(response.message);
+        ,
+        handleCurrentChange(val) {
+            this.filterQuery.page = val;
+            this.getList();
         }
-      });
-    },
-    getActionName(action) {
-      for (let i = 0; i < this.busTypes.length; i++) {
-        if (this.busTypes[i].action === action) {
-          return this.busTypes[i].name;
+        ,
+        handleChange(response, files, fileList) {
+            console.log(response);
+            if (response.code != 20000) {
+                this.$message.error(response.message);
+            } else {
+                console.log(files[0] + "\n" + this.fileList[0] + "\n" + fileList[0]);
+                this.$message.success("文件上传成功,请稍后刷新查看！");
+            }
         }
-      }
-    },
+        ,
+        selectSysParam() {
+            let query = {
+                key: "thirdIpUrl",
+                thirdSysFk: this.filterQuery.thirdSysFk
+            };
+            selectIp(query).then((response) => {
+                if (response.code == 20000) {
+                    this.uploadFileUrl = response.data.thridUrl + "/udiwms/erp/pi/upload";
+                }
+            });
+        },
+        thirdSysChange() {
+            this.uploadData.thirdSys = this.filterQuery.thirdSysFk;
+            this.getThirdSysDetail();
+        },
+        getThirdSysDetail() {
+            let query = {
+                thirdSysFk: this.filterQuery.thirdSysFk,
+                key: "orderQueryUrl",
+            };
+            filterDetailByKey(query)
+                .then((response) => {
+                    this.thirdSysDetail = response.data;
+                })
+                .catch(() => {
+                    this.loading = false;
+                    this.list = [];
+                });
+        },
+        downloadDatas() {
+            let query = {
+                billAction: this.filterQuery.billAction
+            };
+            downloadAll(query).then((response) => {
+                if (response.code == 20000) {
+                    this.$message.success(response.data);
+                } else {
+                    this.$message.error(response.message);
+                }
+            });
+        },
+        getActionName(action) {
+            for (let i = 0; i < this.busTypes.length; i++) {
+                if (this.busTypes[i].action === action) {
+                    return this.busTypes[i].name;
+                }
+            }
+        },
 
-    getlocalName(action) {
-      for (let i = 0; i < this.busTypes.length; i++) {
-        if (this.busTypes[i].action === action) {
-          return this.busTypes[i].localName;
-        }
-      }
+        getlocalName(action) {
+            for (let i = 0; i < this.busTypes.length; i++) {
+                if (this.busTypes[i].action === action) {
+                    return this.busTypes[i].localName;
+                }
+            }
+        },
+        getBusType() {
+            let query = {
+                enabled: true,
+            };
+            getLocalJoinBusType(query)
+                .then((response) => {
+                    this.busTypes = response.data.list || [];
+                })
+                .catch(() => {
+                });
+            getOriginBusType(query)
+                .then((response) => {
+                    this.originTypes = response.data.list || [];
+                })
+                .catch(() => {
+                });
+        },
+    },
+    components: {},
+    mounted() {
     },
-    getBusType() {
-      let query = {
-        enabled: true,
-      };
-      getLocalJoinBusType(query)
-          .then((response) => {
-            this.busTypes = response.data.list || [];
-          })
-          .catch(() => {
-          });
-      getOriginBusType(query)
-          .then((response) => {
-            this.originTypes = response.data.list || [];
-          })
-          .catch(() => {
-          });
+    created() {
+        this.getBasicThirdSys();
+        let end = new Date();
+        let start = new Date();
+        start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+        this.actDateRange = [start, end];
+        this.getList();
     },
-  },
-  components: {},
-  mounted() {
-  },
-  created() {
-    this.getBasicThirdSys();
-    let end = new Date();
-    let start = new Date();
-    start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
-    this.actDateRange = [start, end];
-    this.getList();
-  },
 };
 </script>
 <style scoped>
 .itemTag {
-  float: left;
-  text-align: left;
-  margin-top: 10px;
-  width: 25%;
+    float: left;
+    text-align: left;
+    margin-top: 10px;
+    width: 25%;
 }
 
 .text {
-  font-size: 13px;
-  font-family: "Microsoft YaHei";
+    font-size: 13px;
+    font-family: "Microsoft YaHei";
 }
 
 .query-form-item {
-  display: block !important;
-  margin-right: 10px;
-  margin-bottom: 5px;
+    display: block !important;
+    margin-right: 10px;
+    margin-bottom: 5px;
 }
 
 .el-row {
-  display: flex;
-  flex-wrap: wrap;
+    display: flex;
+    flex-wrap: wrap;
 }
 
 .el-col {
-  border-radius: 4px;
-  flex-wrap: wrap;
+    border-radius: 4px;
+    flex-wrap: wrap;
 }
 </style>
 
diff --git a/src/views/thrsys/thrOrderNew.vue b/src/views/thrsys/thrOrderNew.vue
index 5bd1713..32bc873 100644
--- a/src/views/thrsys/thrOrderNew.vue
+++ b/src/views/thrsys/thrOrderNew.vue
@@ -1,324 +1,331 @@
 <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="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="locStorageCode">
-              <el-select v-model="formData.locStorageCode" 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-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="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>
-                </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>
+    <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>
 </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";
@@ -330,688 +337,677 @@ 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 {getOriginJoinBusType} from "@/api/basic/busOriginType";
-import {inserThrOrderWeb} from "@/api/thrsys/thrOrderReceive";
+import {getBusChange} from "@/api/basic/busTypeChange";
+import {inserThrOrderWeb, updateReceive} 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,
-    },
-  },
-  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('失效日期格式错误');
-            }
+    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,
 
-          }
+        };
+    },
+    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 === '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('批次号不能为空');
+                            }
+
+
+                        }
+                    }
+                    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;
+                        });
+                    }
 
-          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('批次号不能为空');
-              }
 
+                }
+            });
+        },
+        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(() => {
+                });
+        },
 
+        getActionName(action) {
+            for (let i = 0; i < this.busTypes.length; i++) {
+                if (this.busTypes[i].action === action) {
+                    return this.busTypes[i].advanceType;
+                }
             }
-          }
-          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;
-            });
-          }
+        },
+
+        //往来仓库
+        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;
+                    })
+            }
 
-        }
-      });
-    },
-    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]);
-              }
-            }
+        },
+        selectProductFunction(event) {
 
-          })
-          .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);
+            if (event == null) {
+                // this.$refs.inputRef.focus();
             } else {
-              this.$message.error(response.message);
+                event.target.select();
             }
-          })
-          .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(event)) {
 
-
-        this.invQueryData = {
-          locStorageCode: this.formData.locStorageCode,
-        };
-        this.selectInvProductVisible = true;
-
-        return;
-      }
+                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;
 
 
-    },
-    closeDialogC2(rData) {
-      this.selectProductVisible = false;
-      this.selectInvProductVisible = false;
-      this.thisData = {};
+                this.invQueryData = {
+                    locStorageCode: this.formData.locStorageCode,
+                };
+                this.selectInvProductVisible = true;
+                return;
+            }
 
-      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');
+        },
+        closeDialogC2(rData) {
+            this.selectInvProductVisible = false;
+            this.thisData = {};
 
-    },
-    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();
+            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.$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();
-                  }
+        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();
+                            }
+                        });
+                    }
                 });
-                break;
-              }
-              if (i + 1 === this.codeArray.length) {
-                this.codeArray.push(response.data);
-              }
             }
-            if (this.codeArray.length === 0) {
-              this.codeArray.push(response.data);
+        },
+        saveCodeArray(index, row) {
+            if (this.$isBlank(row.batchNo)) {
+                return this.$message.error('批次号不能为空');
             }
-          } else {
-            this.$alert(response.message, '提示', {
-              confirmButtonText: '确定',
-              type: 'warning',
-              closeOnClickModal: true,
-              callback: action => {
-                this.$refs.inputRef.focus();
-              }
+            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);
+                }
             });
-          }
-        });
-      }
-    },
-    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();
+        },
+        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('删除成功');
                     this.codeArray.splice(index, 1);
-                  } else {
-                    this.$message.error(response.message);
-                  }
+                }
+            }).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;
                 })
                 .catch(() => {
-                  this.detailLoading = false;
+                    this.loading = false;
+                    this.list = [];
+                    this.total = 0;
+                });
+        },
+        intentBack() {
+            this.$router.go(-1);
+        },
+        getBusType() {
+            let query = {
+                enable: false,
+            };
+            getBusChange(query)
+                .then((response) => {
+                    this.busTypes = response.data.list || [];
                 })
-          } else {
-            this.$message.success('删除成功');
-            this.codeArray.splice(index, 1);
-          }
-        } else {
-          this.$message.success('删除成功');
-          this.codeArray.splice(index, 1);
-        }
-      }).catch(() => {
+                .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();
+        },
 
-      });
-    },
-    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;
-          })
-          .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) {
 
-      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;
-          });
+    filters: {},
+    mounted() {
+        document.body.ondrop = function (event) {
+            event.preventDefault();
+            event.stopPropagation();
+        };
     },
-    getActionItem(action) {
-      for (let i = 0; i < this.busTypes.length; i++) {
-        if (this.busTypes[i].thirdAction === action) {
-          return this.busTypes[i];
+    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();
         }
-      }
-    },
-    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/selectReceiveOrderDialog.vue b/src/views/warehouse/selectReceiveOrderDialog.vue
new file mode 100644
index 0000000..0d2459a
--- /dev/null
+++ b/src/views/warehouse/selectReceiveOrderDialog.vue
@@ -0,0 +1,393 @@
+<template>
+    <div>
+        <el-card class="el-card" style="margin-top: -15px">
+            <div>
+                <el-form :inline="true" :model="listQuery" style="display: flex;" size="mini">
+                    <el-row>
+                        <el-form-item class="query-form-item">
+                            <el-input
+                                v-model="listQuery.billNo"
+                                placeholder="单据号"
+                                clearable
+                            ></el-input>
+                        </el-form-item>
+                        <el-form-item class="query-form-item">
+                            <el-input
+                                v-model="listQuery.corpName"
+                                placeholder="往来单位"
+                                clearable
+                            ></el-input>
+                        </el-form-item>
+                        <el-form-item class="query-form-item">
+                            <el-select v-model="listQuery.billAction" placeholder="请选择领用类型" clearable="true">
+                                <el-option
+                                    v-for="item in originTypes"
+                                    :key="item.originAction"
+                                    :label="item.originName"
+                                    :value="item.originAction">
+                                    <span style="float: left;font-size: 13px">{{ item.originAction }}</span>
+                                    <span style="float: right; color: #8492a6; font-size: 13px;margin-left: 10px">{{
+                                            item.originName
+                                        }}</span>
+                                </el-option>
+                            </el-select>
+                        </el-form-item>
+                        <el-form-item class="query-form-item">
+                        <span style="color: #000; margin-left: 10px; margin-right: 6px"
+                        >单据日期:</span
+                        >
+                            <el-date-picker
+                                :picker-options="pickerOptions"
+                                v-model="actDateRange"
+                                type="daterange"
+                                format="yyyy 年 MM 月 dd 日"
+                                value-format="yyyy-MM-dd"
+                                range-separator="至"
+                                start-placeholder="开始日期"
+                                end-placeholder="结束日期"
+                            >
+                            </el-date-picker>
+                        </el-form-item>
+                        <el-form-item style="display: flex">
+                            <el-button-group>
+                                <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
+                                >
+                            </el-button-group>
+                        </el-form-item>
+                    </el-row>
+                    <el-row>
+
+                    </el-row>
+
+                </el-form>
+                <el-table
+                    :data="dataList"
+                    style="width: 100%"
+                    highlight-current-row="true"
+                    v-loading="loading"
+                    :row-class-name="tableRowClassName"
+                    @current-change="handleChange"
+                >
+                    <el-table-column label="序号" type="index"></el-table-column>
+                    <el-table-column label="单据号" prop="billNo"></el-table-column>
+                    <el-table-column label="往来单位" prop="corpName" width="300"
+                                     show-overflow-tooltip="true"></el-table-column>
+                    <el-table-column label="单据类型" prop="billType"></el-table-column>
+                    <el-table-column label="单据状态" prop="billFlag" width="80"></el-table-column>
+                    <el-table-column label="单据日期" prop="billdate"></el-table-column>
+                </el-table>
+                <el-pagination
+                    :page-size="listQuery.limit"
+                    @current-change="handleErpPageChange"
+                    layout="prev, pager, next"
+                    :total="pageTotal"
+                    :current-page="listQuery.page"
+                ></el-pagination>
+            </div>
+        </el-card>
+
+        <el-card class="el-card">
+            <el-table v-loading="loading" :data="detailList" style="width: 100%">
+                <el-table-column label="序号" type="index" width="120"></el-table-column>
+                <el-table-column label="产品编码" prop="productId"></el-table-column>
+                <el-table-column label="产品通用名" prop="productName" show-overflow-tooltip="true"></el-table-column>
+                <el-table-column label="规格型号" prop="spec" show-overflow-tooltip="true"></el-table-column>
+                <el-table-column label="批次号" prop="batchNo"></el-table-column>
+                <el-table-column label="生产日期" prop="productDate"></el-table-column>
+                <el-table-column label="失效日期" prop="expireDate"></el-table-column>
+                <el-table-column label="单据数量" prop="count"></el-table-column>
+            </el-table>
+        </el-card>
+
+
+        <el-dialog
+            v-if="storageVisible"
+            title="请选择单据所属仓库信息"
+            :close-on-click-modal="false"
+            :close-on-press-escape="false"
+            append-to-body
+            :visible.sync="storageVisible">
+
+            <selectInvDialog
+                :closeInvDialog="closeInvDialog"
+                :billData="currentRow"
+                :closeSubmitDialog="closeSubmitDialog"
+            ></selectInvDialog>
+
+        </el-dialog>
+    </div>
+</template>
+
+<script>
+import {addReceiveOrder, addStockOrder, getCloudErp} from "../../api/inout/erpOrder";
+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";
+import {getReceiveOrder} from "@/api/inout/receiveOrder";
+import {getBusChange} from "@/api/basic/busTypeChange";
+
+export default {
+    name: "closeDialog",
+    props: {
+        data: {
+            type: Object,
+            required: true,
+        },
+        closeDialog: {
+            type: Function,
+            required: true,
+        },
+    },
+
+    data() {
+        return {
+            listQuery: {
+                billNo: "",
+                thirdSysFk: "",
+                billAction: null,
+                originType: null,
+                page: 1,
+                limit: 10,
+                type: 1,
+                editStatus: 2,
+                allocateStatus: 0,
+                customerId: null,
+            },
+            detailList: [],
+            storageVisible: false,
+            dataList: [],
+            pageTotal: 1,
+            total: 1,
+            currentRow: null,
+            curLocInv: null,
+            loading: false,
+            multipleUdiSelection: [],
+            thirdSys: [],
+            thirdSysFk: null,
+            originTypes: [],
+            storageList: [],
+            actDateRange: [],
+            pickerOptions: {
+                shortcuts: [
+                    {
+                        text: "最近一周",
+                        onClick(picker) {
+                            const end = new Date();
+                            const start = new Date();
+                            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+                            picker.$emit("pick", [start, end]);
+                        },
+                    },
+                    {
+                        text: "最近一个月",
+                        onClick(picker) {
+                            const end = new Date();
+                            const start = new Date();
+                            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+                            picker.$emit("pick", [start, end]);
+                        },
+                    },
+                    {
+                        text: "最近三个月",
+                        onClick(picker) {
+                            const end = new Date();
+                            const start = new Date();
+                            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+                            picker.$emit("pick", [start, end]);
+                        },
+                    },
+                ],
+            },
+        };
+    },
+    methods: {
+        onReset() {
+            this.$router.push({
+                path: "",
+            });
+            this.listQuery = {
+                billNo: "",
+                corpName: null,
+                billAction: null,
+                type: 1,
+                editStatus: 2,
+                page: 1,
+                allocateStatus: 0,
+                limit: 10,
+            };
+            this.actDateRange = [];
+            this.getList();
+        },
+
+        tableRowClassName({row}) {
+            if (row.checked) return "warning-row";
+            return "";
+        },
+        checkSelectable(row) {
+            return !row.check;
+        },
+        handleCurrentChange(val) {
+            this.unionQuery.page = val;
+            this.getList();
+        },
+        handleChange(val) {
+            this.currentRow = val;
+            this.detailList = val.subErpOrders;
+        },
+        handleErpPageChange(val) {
+            this.listQuery.page = val;
+            this.getList();
+        },
+        keyup_submit(event) {
+            this.getList();
+            event.target.select();
+        },
+        getList() {
+            this.loading = true;
+            if (this.actDateRange !== null) {
+                this.listQuery.startDate = this.actDateRange[0];
+                this.listQuery.endDate = this.actDateRange[1];
+            } else {
+                this.listQuery.startDate = null;
+                this.listQuery.endDate = null;
+            }
+            this.listQuery.customerId = store.getters.customerId;
+            getReceiveOrder(this.listQuery)
+                .then((response) => {
+                    console.log(response)
+                    this.loading = false;
+                    if (response.code === 20000) {
+                        this.dataList = response.data.list || [];
+                        this.pageTotal = response.data.total || 0;
+                    } else {
+                        this.$message.error(response.message);
+                        this.dataList = [];
+                        this.pageTotal = 0;
+                    }
+                })
+                .catch(() => {
+                    this.loading = false;
+                    this.dataList = [];
+                    this.pageTotal = 0;
+                });
+        },
+        intentBack() {
+            this.closeDialog();
+        },
+        combine() {
+            if (this.$isBlank(this.currentRow.id)) {
+                return;
+            }
+            this.curLocInv = this.currentRow.locStorageCode;
+            if (this.$isBlank(this.curLocInv)) {
+                this.storageVisible = true;
+            } else {
+                let tQuery = {
+                    id: this.currentRow.id,
+                    locStorageCode: this.curLocInv,
+                    invWarehouseCode: this.currentRow.invWarehouseCode,
+                }
+                addReceiveOrder(tQuery)
+                    .then((response) => {
+                        if (response.code === 20000) {
+                            this.closeDialog();
+                        } else {
+                            this.$message.error(response.message);
+                        }
+                    })
+                    .catch(() => {
+                    });
+            }
+        },
+        submitFind() {
+            this.listQuery.page = 1;
+            this.getList();
+        },
+        selectStorage(row) {
+            this.curLocInv = row.code;
+            let tQuery = {
+                id: this.currentRow.id,
+                locStorageCode: this.curLocInv,
+            }
+            addStockOrder(tQuery)
+                .then((response) => {
+                    if (response.code === 20000) {
+                        this.storageVisible = false;
+                        this.closeDialog();
+                    } else {
+                        this.$message.error(response.message);
+                    }
+                })
+                .catch(() => {
+                });
+        },
+
+        handleSelectionUdiChange(val) {
+            console.log("----" + val);
+            this.multipleUdiSelection = val;
+        },
+        getBusType() {
+            let query = {
+                enabled: false,
+            };
+            getBusChange(query)
+                .then((response) => {
+                    this.originTypes = response.data.list || [];
+                })
+                .catch(() => {
+                });
+        },
+        getStorage(event) {
+            this.storageList = [];
+            filterAllByUser()
+                .then((response) => {
+                    this.storageList = response.data || [];
+                    if (this.storageList.length == 1) {
+                        this.curLocInv = this.storageList[0].code;
+                    }
+                })
+                .catch(() => {
+                });
+        },
+
+
+        closeInvDialog() {
+            this.storageVisible = false;
+        },
+
+        closeSubmitDialog() {
+            this.storageVisible = false;
+            this.combine();
+        },
+    },
+    created() {
+        this.getBusType();
+        this.getStorage();
+        this.getList();
+    },
+    components: {selectInvDialog}
+
+};
+</script>
+
+<style scoped>
+
+div /deep/ .el-table .warning-row {
+    background: #bebebe;
+}
+
+div /deep/ .el-table .success-row {
+    background: #ffffff;
+}
+</style>
diff --git a/src/views/warehouse/selectThrOrder.vue b/src/views/warehouse/selectThrOrderDialog.vue
similarity index 92%
rename from src/views/warehouse/selectThrOrder.vue
rename to src/views/warehouse/selectThrOrderDialog.vue
index e769336..d88a1a7 100644
--- a/src/views/warehouse/selectThrOrder.vue
+++ b/src/views/warehouse/selectThrOrderDialog.vue
@@ -1,8 +1,7 @@
 <template>
     <div>
-        <el-card class="el-card">
+        <el-card class="el-card" style="margin-top: -15px">
             <div>
-
                 <el-form :inline="true" :model="listQuery" style="display: flex;" size="mini">
                     <el-row>
                         <el-form-item class="query-form-item">
@@ -20,7 +19,6 @@
                             ></el-input>
                         </el-form-item>
                         <el-form-item class="query-form-item">
-
                             <el-select v-model="listQuery.billAction" placeholder="请选择第三方系统单据类型" clearable="true">
                                 <el-option
                                     v-for="item in originTypes"
@@ -32,13 +30,8 @@
                                             item.thirdSysName
                                         }}</span>
                                 </el-option>
-
                             </el-select>
-
-
                         </el-form-item>
-                    </el-row>
-                    <el-row>
                         <el-form-item class="query-form-item">
                         <span style="color: #000; margin-left: 10px; margin-right: 6px"
                         >单据日期:</span
@@ -98,6 +91,19 @@
             </div>
         </el-card>
 
+        <el-card class="el-card">
+            <el-table v-loading="loading" :data="detailList" style="width: 100%">
+                <el-table-column label="序号" type="index" width="120"></el-table-column>
+                <el-table-column label="产品编码" prop="productId"></el-table-column>
+                <el-table-column label="产品通用名" prop="productName" show-overflow-tooltip="true"></el-table-column>
+                <el-table-column label="规格型号" prop="spec" show-overflow-tooltip="true"></el-table-column>
+                <el-table-column label="批次号" prop="batchNo"></el-table-column>
+                <el-table-column label="生产日期" prop="productDate"></el-table-column>
+                <el-table-column label="失效日期" prop="expireDate"></el-table-column>
+                <el-table-column label="单据数量" prop="count"></el-table-column>
+            </el-table>
+        </el-card>
+
 
         <el-dialog
             v-if="storageVisible"
@@ -148,15 +154,11 @@ export default {
                 originType: null,
                 page: 1,
                 limit: 10,
-                editStatus: 2,
+                allocateStatus: 0,
+                type: 0,
                 customerId: null,
             },
-            combineQuery: {
-                thirdId: "",
-                relId: "",
-                erpName: "",
-                keys: [],
-            },
+            detailList: [],
             storageVisible: false,
             dataList: [],
             pageTotal: 1,
@@ -215,6 +217,7 @@ export default {
                 billAction: null,
                 page: 1,
                 limit: 10,
+                allocateStatus: 0,
             };
             this.actDateRange = [];
             this.getList();
@@ -232,8 +235,8 @@ export default {
             this.getList();
         },
         handleChange(val) {
-            console.log(val);
             this.currentRow = val;
+            this.detailList = val.subErpOrders;
         },
         handleErpPageChange(val) {
             this.listQuery.page = val;
diff --git a/src/views/warehouse/stockOrderEditor.vue b/src/views/warehouse/stockOrderEditor.vue
index 15fed54..ae3c8eb 100644
--- a/src/views/warehouse/stockOrderEditor.vue
+++ b/src/views/warehouse/stockOrderEditor.vue
@@ -71,7 +71,10 @@
                             <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 type="primary" icon="search" @click="selectReceive()"
+                                       :loading="loading">选入领用单据
                             </el-button>
                         </el-button-group>
                     </el-form-item>
@@ -84,7 +87,7 @@
                       @row-click="getStockOrderDetailList" ref="multipleTable">
                 <el-table-column type="index" label="序号" width="50"></el-table-column>
                 <el-table-column label="单据号" prop="billNo" show-overflow-tooltip width="150"></el-table-column>
-                <el-table-column label="往来单位" prop="corpName" show-overflow-tooltip width="150" ></el-table-column>
+                <el-table-column label="往来单位" prop="corpName" show-overflow-tooltip width="150"></el-table-column>
                 <el-table-column label="单据来源" prop="sourceType" width="120" show-overflow-tooltip>
                     <template slot-scope="scope">
                         <span>{{ sourceMap[scope.row.sourceType] }}</span>
@@ -436,7 +439,7 @@
         </el-dialog>
 
         <el-dialog
-            title="选入单据"
+            title="选入第三方单据"
             :visible.sync="selectThrOrderVisible"
             :close-on-click-modal="false"
             :close-on-press-escape="false"
@@ -448,6 +451,21 @@
                 :data="thisData"
             ></selectThrOrder>
         </el-dialog>
+        <el-dialog
+            title="选入领用单据"
+            :visible.sync="selectReceiveVisible"
+            :close-on-click-modal="false"
+            :close-on-press-escape="false"
+            width="85%"
+            v-if="selectReceiveVisible"
+        >
+            <selectReceiveOrderDialog
+                :closeDialog="closeDialog"
+                :data="thisData"
+            ></selectReceiveOrderDialog>
+        </el-dialog>
+
+
     </div>
 </template>
 
@@ -463,7 +481,8 @@ import {BASE_URL} from "../../config/app";
 import stockOrderDistribution from "./stockOrderDistribution";
 import stockOrderEditDistribution from "./stockOrderEditDistribution";
 import stockQRCodeExport from "./stockQRCodeExport";
-import selectThrOrder from "./selectThrOrder";
+import selectThrOrder from "./selectThrOrderDialog";
+import selectReceiveOrderDialog from "./selectReceiveOrderDialog";
 import draggable from "vuedraggable";
 import codeDetail from "./errorCode";
 import addOrder from "./addOrder";
@@ -547,6 +566,7 @@ export default {
             qrcodeExportVisible: false,
             filterUDIType: false,
             selectThrOrderVisible: false,
+            selectReceiveVisible: false,
             thisData: {},
             actDateRange: [],
             pickerOptions: {
@@ -680,9 +700,15 @@ export default {
         selectThrOrderFunction() {
             this.selectThrOrderVisible = true;
         },
+
+        selectReceive() {
+            this.selectReceiveVisible = true;
+        },
+
         closeDialog(type) {
             this.distributionVisible = false;
             this.selectThrOrderVisible = false;
+            this.selectReceiveVisible = false;
             this.getList();
             if (this.$isNotBlank(type)) {
                 this.detailList = [];
@@ -967,7 +993,7 @@ export default {
         stockOrderDistribution,
         stockQRCodeExport,
         stockOrderEditDistribution,
-        selectThrOrder,
+        selectThrOrder, selectReceiveOrderDialog
     },
     filters: {
         statusFilterType(status) {