From ba84a1f86eb112f6d36ee51e0774c85c0f48d8a4 Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Thu, 21 Apr 2022 14:59:22 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=93=E5=AD=98=EF=BC=8C=E5=8D=95=E6=8D=AE?=
 =?UTF-8?q?=20=EF=BC=8C=E6=A0=B9=E6=8D=AE=E5=BD=93=E5=89=8D=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=EF=BC=8C=E5=BD=93=E5=89=8D=E5=BA=93=E5=AD=98=E5=8C=BA?=
 =?UTF-8?q?=E5=88=86=E7=AD=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/basic/busOriginType.js                |    9 +
 src/api/thrsys/thrOrderReceive.js             |    9 +
 src/api/warehouse/stockOrder.js               |    9 +
 src/router/index.js                           |    5 +-
 src/views/basic/CorpExport.vue                |  561 +++---
 src/views/basic/UdiinfoExport.vue             |  525 +++---
 src/views/basic/invWarehouse.vue              |  131 +-
 src/views/inventory/InvStatistics.vue         |    4 +-
 src/views/login/index.vue                     |    2 +-
 src/views/thrsys/ThrInvWarehouse.vue          |   17 +-
 src/views/thrsys/ThrOrdedrReceiveAdd.vue      |   38 +-
 src/views/thrsys/ThrOrdedrReceiveSearch.vue   |    6 +-
 src/views/thrsys/ThrOrder.vue                 |    4 +-
 src/views/thrsys/thrOrderNew.vue              |  258 ++-
 src/views/warehouse/IOCheckErrOrder.vue       |    6 +-
 src/views/warehouse/IOErrorOrder.vue          |   34 +-
 src/views/warehouse/IONewOrder.vue            | 1265 ++++++-------
 src/views/warehouse/IOSearchOrder.vue         |   11 +-
 src/views/warehouse/IOWaitOrder.vue           |    5 +-
 src/views/warehouse/addOrder.vue              |    2 +-
 src/views/warehouse/selectThrOrder.vue        |    3 +-
 src/views/warehouse/stockOrder.vue            | 1575 +++++++++--------
 src/views/warehouse/stockOrderDelSearch.vue   |   20 +-
 src/views/warehouse/stockOrderEditor.vue      |    3 +
 src/views/warehouse/stockOrderNew.vue         |    6 +-
 .../warehouse/stockOrderNewDistribution.vue   |    2 +-
 .../warehouse/stockOrderNewSelectProduct.vue  |    5 +-
 src/views/warehouse/stockOrderSearch.vue      |    5 +-
 src/views/warehouse/stockOrderWaitCheck.vue   |    5 +-
 29 files changed, 2253 insertions(+), 2272 deletions(-)
 create mode 100644 src/api/thrsys/thrOrderReceive.js

diff --git a/src/api/basic/busOriginType.js b/src/api/basic/busOriginType.js
index bd78756..476366b 100644
--- a/src/api/basic/busOriginType.js
+++ b/src/api/basic/busOriginType.js
@@ -7,3 +7,12 @@ export function getOriginBusType(query) {
         params: query
     });
 }
+
+
+export function getOriginJoinBusType(query) {
+    return axios({
+        url: "/udiwms/originBusType/filterJoin",
+        method: "get",
+        params: query
+    });
+}
diff --git a/src/api/thrsys/thrOrderReceive.js b/src/api/thrsys/thrOrderReceive.js
new file mode 100644
index 0000000..ac7680f
--- /dev/null
+++ b/src/api/thrsys/thrOrderReceive.js
@@ -0,0 +1,9 @@
+import axios from "@/utils/axios";
+
+export function inserThrOrderWeb(query) {
+    return axios({
+        url: "/udiwms/thrsys/order/insertWeb",
+        method: "post",
+        data: query
+    });
+}
diff --git a/src/api/warehouse/stockOrder.js b/src/api/warehouse/stockOrder.js
index de190a8..458479b 100644
--- a/src/api/warehouse/stockOrder.js
+++ b/src/api/warehouse/stockOrder.js
@@ -234,6 +234,15 @@ export function stockOrderGenerateBillNo(query) {
     });
 }
 
+export function generateBillNoInt(query) {
+    return axios({
+        url: "/udiwms/stock/order/generateBillNoInt",
+        method: "get",
+        params: query
+    });
+}
+
+
 export function supplementOrder(query) {
     return axios({
         url: "/udiwms/stock/order/supplementOrder",
diff --git a/src/router/index.js b/src/router/index.js
index 918ad4c..6ab01fa 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -85,9 +85,8 @@ import udplatGoodsImport from "../views/thrsys/UdplatGoodsImport";
 import ThrCorps from "../views/thrsys/ThrCorps.vue";
 import thrCorpsExport from "../views/thrsys/ThrCorpsExport.vue";
 import thrCorpsImport from "../views/thrsys/ThrCorpsImport.vue";
-import receiveOrderNew from "../views/thrsys/ThrOrder.vue";
-import receiveOrderSearch from "../views/thrsys/ThrOrder.vue";
-
+import receiveOrderNew from "../views/thrsys/ThrOrdedrReceiveAdd.vue";
+import receiveOrderSearch from "../views/thrsys/ThrOrdedrReceiveSearch.vue";
 
 
 //库存
diff --git a/src/views/basic/CorpExport.vue b/src/views/basic/CorpExport.vue
index 1953806..7586e72 100644
--- a/src/views/basic/CorpExport.vue
+++ b/src/views/basic/CorpExport.vue
@@ -1,304 +1,303 @@
 <template>
-    <div>
-        <el-form :inline="true" :model="query" class="query-form" size="mini">
-            <el-row>
-                <el-form-item class="query-form-item">
-                    <el-input v-model="filterQuery.genKey" placeholder="记录ID"></el-input>
-                </el-form-item>
-                <el-form-item>
-                    <el-button-group style="display:flex;">
-                        <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
-                        <el-button type="primary" icon="search" @click="getList">查询</el-button>
-                        <el-button type="primary" icon="search" @click="exportExcel">导出往来单位信息</el-button>
-                      <el-button type="primary" icon="search" @click="uploadSmp">同步至UDI管理系统</el-button>
-                    </el-button-group>
-                </el-form-item>
-            </el-row>
-        </el-form>
+  <div>
+    <el-form :inline="true" :model="query" class="query-form" size="mini">
+      <el-row>
+        <el-form-item class="query-form-item">
+          <el-input v-model="filterQuery.genKey" placeholder="记录ID"></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-button-group style="display:flex;">
+            <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
+            <el-button type="primary" icon="search" @click="getList">查询</el-button>
+            <el-button type="primary" icon="search" @click="exportExcel">导出往来单位信息</el-button>
+            <el-button type="primary" icon="search" @click="uploadSmp">同步至UDI管理系统</el-button>
+          </el-button-group>
+        </el-form-item>
+      </el-row>
+    </el-form>
 
-        <el-table
-            v-loading="loading"
-            :data="list"
-            style="width: 100%"
-            @selection-change="handleSelectionChange"
-        >
-            <el-table-column label="序号" type="index"></el-table-column>
-            <el-table-column
-                label="记录ID"
-                prop="genKey"
-                show-overflow-tooltip
-            ></el-table-column>
+    <el-table
+        v-loading="loading"
+        :data="list"
+        style="width: 100%"
+        @selection-change="handleSelectionChange"
+    >
+      <el-table-column label="序号" type="index"></el-table-column>
+      <el-table-column
+          label="记录ID"
+          prop="genKey"
+          show-overflow-tooltip
+      ></el-table-column>
 
 
-            <el-table-column
-                label="更新日期"
-                prop="updateTime"
-                show-overflow-tooltip
-            ></el-table-column>
-            <el-table-column
-                label="状态"
-                prop="status"
-                show-overflow-tooltip
-            >
-                <template slot-scope="scope">
-                    <el-tag
-                        :type="statusFilterType(scope.row.status)"
-                    >{{ status[scope.row.status] }}
-                    </el-tag
-                    >
-                </template>
-            </el-table-column>
-            <el-table-column label="类型" prop="enabled">
-                <template slot-scope="scope">
-                    <span>{{ typeMap[scope.row.type] }}</span>
-                </template>
-            </el-table-column>
-            <el-table-column
-                label="下载次数"
-                prop="dlCount"
-                show-overflow-tooltip
-            >
-            </el-table-column>
-            <el-table-column label="操作" fixed="right" width="160">
-                <template slot-scope="scope">
-                    <el-button
-                        v-if="scope.row.type==1"
-                        type="text"
-                        size="small"
-                        @click.native.stop="downloadExcel(scope.row)"
-                    >下载
-                    </el-button
-                    >
-                    <el-button
-                        type="text"
-                        size="small"
-                        @click.native.stop="deleteDialog(scope.row.id)"
-                    >删除
-                    </el-button
-                    >
-                </template>
-            </el-table-column>
-        </el-table>
+      <el-table-column
+          label="更新日期"
+          prop="updateTime"
+          show-overflow-tooltip
+      ></el-table-column>
+      <el-table-column
+          label="状态"
+          prop="status"
+          show-overflow-tooltip
+      >
+        <template slot-scope="scope">
+          <el-tag
+              :type="statusFilterType(scope.row.status)"
+          >{{ status[scope.row.status] }}
+          </el-tag
+          >
+        </template>
+      </el-table-column>
+      <el-table-column label="类型" prop="enabled">
+        <template slot-scope="scope">
+          <span>{{ typeMap[scope.row.type] }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+          label="下载次数"
+          prop="dlCount"
+          show-overflow-tooltip
+      >
+      </el-table-column>
+      <el-table-column label="操作" fixed="right" width="160">
+        <template slot-scope="scope">
+          <el-button
+              v-if="scope.row.type==1"
+              type="text"
+              size="small"
+              @click.native.stop="downloadExcel(scope.row)"
+          >下载
+          </el-button
+          >
+          <el-button
+              type="text"
+              size="small"
+              @click.native.stop="deleteDialog(scope.row.id)"
+          >删除
+          </el-button
+          >
+        </template>
+      </el-table-column>
+    </el-table>
 
-        <el-dialog
-            title="导出往来单位信息"
-            :close-on-click-modal="false"
-            :close-on-press-escape="false"
-            :visible.sync="corpImportDetailVisible"
-            width="85%"
-            v-if="corpImportDetailVisible"
-        >
-            <corpSelect :selectType="selectType" v-on:cancelDialog="cancelDialog"
-            ></corpSelect>
-        </el-dialog>
+    <el-dialog
+        title="导出往来单位信息"
+        :close-on-click-modal="false"
+        :close-on-press-escape="false"
+        :visible.sync="corpImportDetailVisible"
+        width="85%"
+        v-if="corpImportDetailVisible"
+    >
+      <corpSelect :selectType="selectType" v-on:cancelDialog="cancelDialog"
+      ></corpSelect>
+    </el-dialog>
 
-        <el-pagination
-            :page-size="filterQuery.limit"
-            @current-change="handleCurrentChange"
-            layout="prev, pager, next"
-            :total="total"
-        ></el-pagination>
-    </div>
+    <el-pagination
+        :page-size="filterQuery.limit"
+        @current-change="handleCurrentChange"
+        layout="prev, pager, next"
+        :total="total"
+    ></el-pagination>
+  </div>
 </template>
 
 <script>
-    import {filterLog, deleteLog} from "../../api/basic/corpExport";
-    import corpSelect from "./CorpSelect";
-    import axios from "axios";
-    // import axios from "../../utils/axios";
-    export default {
-        data() {
-            return {
-                filterQuery: {
-                    genKey: null,
-                    status: null,
-                    fromType: null,
-                    page: 1,
-                    limit: 20,
-                    // type: 1,
-                    thirdSysFk: null,
-                },
-                selectType: 0,
-                corpImportDetailVisible: false,
-                list: [],
-                detailList: [],
-                thirdSys: [],
-                thirdSysDetail: null,
-                total: 0,
-                editQuery: null,
-                fromStatus: {
-                    0: "产品信息",
-                    1: "库存信息",
-                    2: "异常第三方上传"
-                },
-                status: {
-                    0: "等待处理",
-                    1: "正在处理",
-                    2: "处理异常",
-                    3: "处理完成"
-                },
-                typeMap: {
-                    1: '文件导出',
-                    2: '网络同步',
+import {filterLog, deleteLog} from "../../api/basic/corpExport";
+import corpSelect from "./CorpSelect";
+import axios from "axios";
+import {formatDate} from "@/utils/date";
+// import axios from "../../utils/axios";
+export default {
+  data() {
+    return {
+      filterQuery: {
+        genKey: null,
+        status: null,
+        fromType: null,
+        page: 1,
+        limit: 20,
+        // type: 1,
+        thirdSysFk: null,
+      },
+      selectType: 0,
+      corpImportDetailVisible: false,
+      list: [],
+      detailList: [],
+      thirdSys: [],
+      thirdSysDetail: null,
+      total: 0,
+      editQuery: null,
+      fromStatus: {
+        0: "产品信息",
+        1: "库存信息",
+        2: "异常第三方上传"
+      },
+      status: {
+        0: "等待处理",
+        1: "正在处理",
+        2: "处理异常",
+        3: "处理完成"
+      },
+      typeMap: {
+        1: '文件导出',
+        2: '网络同步',
 
-                },
-                uploadFileUrl: null,
-                uploadData: {
-                    thirdSys: "thirdId",
-                },
-            };
-        },
+      },
+      uploadFileUrl: null,
+      uploadData: {
+        thirdSys: "thirdId",
+      },
+    };
+  },
 
-        methods: {
-            onReset() {
-                this.$router.push({
-                    path: "",
-                });
-                this.filterQuery = {
-                    fromType: null,
-                    genKey: null,
-                    status: null,
-                    page: 1,
-                    // type: 1,
-                    limit: 20,
-                    thirdSysFk: null,
-                };
-                this.getList();
-            },
-            getList() {
-                this.loading = true;
-                filterLog(this.filterQuery)
-                    .then((response) => {
-                        this.loading = false;
-                        this.list = response.data.list || [];
-                        this.total = response.data.total || 0;
-                    })
-                    .catch(() => {
-                        this.loading = false;
-                        this.list = [];
-                        this.total = 0;
-                    });
-            },
+  methods: {
+    onReset() {
+      this.$router.push({
+        path: "",
+      });
+      this.filterQuery = {
+        fromType: null,
+        genKey: null,
+        status: null,
+        page: 1,
+        // type: 1,
+        limit: 20,
+        thirdSysFk: null,
+      };
+      this.getList();
+    },
+    getList() {
+      this.loading = true;
+      filterLog(this.filterQuery)
+          .then((response) => {
+            this.loading = false;
+            this.list = response.data.list || [];
+            this.total = response.data.total || 0;
+          })
+          .catch(() => {
+            this.loading = false;
+            this.list = [];
+            this.total = 0;
+          });
+    },
 
-            exportExcel() {
-                this.selectType = 0;
-                this.corpImportDetailVisible = true;
-            },
-            uploadSmp() {
-                this.selectType = 1;
-                this.corpImportDetailVisible = true;
-            },
-            downloadExcel(row) {
-                axios.get("./config.json").then(res => {
-                    let baseUrl = res.data.BASE_URL;
-                    let href = baseUrl + "/udiwms/corps/exportLog/download" +
-                        "?genKey=" + row.genKey;
-                    console.log("href = " + href);
-                    let a = document.createElement("a");
-                    fetch(href)
-                        .then((res) => res.blob())
-                        .then((blob) => {
-                            a.href = URL.createObjectURL(blob);
-                            console.log(a.href);
-                            a.download =
-                                row.filePath.split("\\")[
-                                row.filePath.split("\\").length - 1
-                                    ]; //  // 下载文件的名字
-                            document.body.appendChild(a);
-                            a.click();
-                            this.getList();
-                        });
-                });
+    exportExcel() {
+      this.selectType = 0;
+      this.corpImportDetailVisible = true;
+    },
+    uploadSmp() {
+      this.selectType = 1;
+      this.corpImportDetailVisible = true;
+    },
+    downloadExcel(row) {
+      axios.get("./config.json").then(res => {
+        let baseUrl = res.data.BASE_URL;
+        let href = baseUrl + "/udiwms/corps/exportLog/download" +
+            "?genKey=" + row.genKey;
+        console.log("href = " + href);
+        var timestamp = formatDate(new Date(), "yyyyMMddhhmmss");
+        let a = document.createElement("a");
+        fetch(href)
+            .then((res) => res.blob())
+            .then((blob) => {
+              a.href = URL.createObjectURL(blob);
+              console.log(a.href);
+              a.download = "BaseCorp_" + timestamp + ".LowerIn";
+              document.body.appendChild(a);
+              a.click();
+              this.getList();
+            });
+      });
 
 
-            },
+    },
 
-            cancelDialog(val) {
-                this.corpImportDetailVisible = false;
-                if (val) {
-                    this.getList();
-                }
-            },
-            handleCurrentChange(val) {
-                this.filterQuery.page = val;
-                this.getList();
-            },
-            deleteDialog(rowId) {
-                this.$confirm("此操作将删除该往来单位信息, 是否继续?", "提示", {
-                    confirmButtonText: "确定",
-                    cancelButtonText: "取消",
-                    type: "warning",
-                })
-                    .then(() => {
-                        let dQuery = {
-                            id: rowId,
-                        };
-                        deleteLog(dQuery)
-                            .then((response) => {
-                                this.loading = false;
-                                if (response.code == 20000) {
-                                    this.$message.success("删除成功");
-                                } else {
-                                    this.$message.error(response.message);
-                                }
-                                this.getList();
-                            })
-                            .catch(() => {
-                                this.loading = false;
-                            });
-                    })
-                    .catch(() => {
-                    });
-            },
-            handleChange(response, files, fileList) {
-                console.log(response);
-                if (response.code != 20000) {
+    cancelDialog(val) {
+      this.corpImportDetailVisible = false;
+      if (val) {
+        this.getList();
+      }
+    },
+    handleCurrentChange(val) {
+      this.filterQuery.page = val;
+      this.getList();
+    },
+    deleteDialog(rowId) {
+      this.$confirm("此操作将删除该往来单位信息, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+          .then(() => {
+            let dQuery = {
+              id: rowId,
+            };
+            deleteLog(dQuery)
+                .then((response) => {
+                  this.loading = false;
+                  if (response.code == 20000) {
+                    this.$message.success("删除成功");
+                  } else {
                     this.$message.error(response.message);
-                } else {
-                    console.log(files[0] + "\n" + this.fileList[0] + "\n" + fileList[0]);
-                    this.$message.success("文件上传成功,请稍后刷新查看！");
-                }
-            },
-            statusFilterType(status) {
-                const statusMap = {
-                    0: "warning",
-                    1: "warning",
-                    2: "danger",
-                    3: "success",
-                };
-                return statusMap[status];
-            },
-        },
-        mounted() {
-        },
-        components: {corpSelect},
-        created() {
-            // this.getBasicThirdSys();
-            this.getList();
-        },
-    };
+                  }
+                  this.getList();
+                })
+                .catch(() => {
+                  this.loading = false;
+                });
+          })
+          .catch(() => {
+          });
+    },
+    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("文件上传成功,请稍后刷新查看！");
+      }
+    },
+    statusFilterType(status) {
+      const statusMap = {
+        0: "warning",
+        1: "warning",
+        2: "danger",
+        3: "success",
+      };
+      return statusMap[status];
+    },
+  },
+  mounted() {
+  },
+  components: {corpSelect},
+  created() {
+    // this.getBasicThirdSys();
+    this.getList();
+  },
+};
 </script>
 <style>
-    .itemTag {
-        float: left;
-        text-align: left;
-        margin-top: 10px;
-        width: 100px;
-    }
+.itemTag {
+  float: left;
+  text-align: left;
+  margin-top: 10px;
+  width: 100px;
+}
 
-    .text {
-        font-size: 13px;
-        font-family: "Microsoft YaHei";
-    }
+.text {
+  font-size: 13px;
+  font-family: "Microsoft YaHei";
+}
 
-    .el-row {
-        display: flex;
-        flex-wrap: wrap;
+.el-row {
+  display: flex;
+  flex-wrap: wrap;
 
-    }
+}
 
-    .el-col {
-        border-radius: 4px;
-        flex-wrap: wrap;
-    }
+.el-col {
+  border-radius: 4px;
+  flex-wrap: wrap;
+}
 </style>
diff --git a/src/views/basic/UdiinfoExport.vue b/src/views/basic/UdiinfoExport.vue
index 19ba0fd..b5e80b9 100644
--- a/src/views/basic/UdiinfoExport.vue
+++ b/src/views/basic/UdiinfoExport.vue
@@ -1,105 +1,105 @@
 <template>
-    <div>
-        <el-form :inline="true" :model="query" class="query-form" size="mini">
-            <el-row>
-                <el-form-item class="query-form-item">
-                    <el-input v-model="filterQuery.genKey" placeholder="记录ID"></el-input>
-                </el-form-item>
-                <el-form-item>
-                    <el-button-group style="display:flex;">
-                        <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
-                        <el-button type="primary" icon="search" @click="getList">查询</el-button>
-                        <el-button type="primary" icon="search" @click="exportExcel">导出文件</el-button>
-                        <el-button type="primary" icon="search" @click="uploadSmp">同步至UDI管理系统</el-button>
-                    </el-button-group>
-                </el-form-item>
-            </el-row>
-        </el-form>
+  <div>
+    <el-form :inline="true" :model="query" class="query-form" size="mini">
+      <el-row>
+        <el-form-item class="query-form-item">
+          <el-input v-model="filterQuery.genKey" placeholder="记录ID"></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-button-group style="display:flex;">
+            <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
+            <el-button type="primary" icon="search" @click="getList">查询</el-button>
+            <el-button type="primary" icon="search" @click="exportExcel">导出文件</el-button>
+            <el-button type="primary" icon="search" @click="uploadSmp">同步至UDI管理系统</el-button>
+          </el-button-group>
+        </el-form-item>
+      </el-row>
+    </el-form>
 
-        <el-table
-            v-loading="loading"
-            :data="list"
-            style="width: 100%"
-            @selection-change="handleSelectionChange"
-        >
-            <el-table-column label="序号" type="index"></el-table-column>
-            <el-table-column
-                label="记录ID"
-                prop="genKey"
-                show-overflow-tooltip
-            ></el-table-column>
+    <el-table
+        v-loading="loading"
+        :data="list"
+        style="width: 100%"
+        @selection-change="handleSelectionChange"
+    >
+      <el-table-column label="序号" type="index"></el-table-column>
+      <el-table-column
+          label="记录ID"
+          prop="genKey"
+          show-overflow-tooltip
+      ></el-table-column>
 
 
-            <el-table-column
-                label="更新日期"
-                prop="updateTime"
-                show-overflow-tooltip
-            ></el-table-column>
-            <el-table-column
-                label="状态"
-                prop="status"
-                show-overflow-tooltip
-            >
-                <template slot-scope="scope">
-                    <el-tag
-                        :type="statusFilterType(scope.row.status)"
-                    >{{ status[scope.row.status] }}
-                    </el-tag
-                    >
-                </template>
-            </el-table-column>
-            <el-table-column label="类型" prop="enabled">
-                <template slot-scope="scope">
-                    <span>{{ typeMap[scope.row.type] }}</span>
-                </template>
-            </el-table-column>
-            <el-table-column
-                label="下载次数"
-                prop="dlCount"
-                show-overflow-tooltip
-            >
-            </el-table-column>
-            <el-table-column label="操作" fixed="right" width="160">
-                <template slot-scope="scope">
-                    <el-button
-                        type="text"
-                        v-if="scope.row.type==1"
-                        size="small"
-                        @click.native.stop="downloadExcel(scope.row)"
-                    >下载
-                    </el-button
-                    >
-                    <el-button
-                        type="text"
-                        size="small"
-                        @click.native.stop="deleteDialog(scope.row.id)"
-                    >删除
-                    </el-button
-                    >
-                </template>
-            </el-table-column>
-        </el-table>
+      <el-table-column
+          label="更新日期"
+          prop="updateTime"
+          show-overflow-tooltip
+      ></el-table-column>
+      <el-table-column
+          label="状态"
+          prop="status"
+          show-overflow-tooltip
+      >
+        <template slot-scope="scope">
+          <el-tag
+              :type="statusFilterType(scope.row.status)"
+          >{{ status[scope.row.status] }}
+          </el-tag
+          >
+        </template>
+      </el-table-column>
+      <el-table-column label="类型" prop="enabled">
+        <template slot-scope="scope">
+          <span>{{ typeMap[scope.row.type] }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+          label="下载次数"
+          prop="dlCount"
+          show-overflow-tooltip
+      >
+      </el-table-column>
+      <el-table-column label="操作" fixed="right" width="160">
+        <template slot-scope="scope">
+          <el-button
+              type="text"
+              v-if="scope.row.type==1"
+              size="small"
+              @click.native.stop="downloadExcel(scope.row)"
+          >下载
+          </el-button
+          >
+          <el-button
+              type="text"
+              size="small"
+              @click.native.stop="deleteDialog(scope.row.id)"
+          >删除
+          </el-button
+          >
+        </template>
+      </el-table-column>
+    </el-table>
 
-        <el-dialog
-            title="导出医疗器械产品信息"
-            :visible.sync="udiImportDetailVisible"
-            width="85%"
-            :close-on-click-modal="false"
-            :close-on-press-escape="false"
-            append-to-body
-            v-if="udiImportDetailVisible"
-        >
-            <udiInfoSelect :selectType="selectType" v-on:cancelDialog="cancelDialog"
-            ></udiInfoSelect>
-        </el-dialog>
+    <el-dialog
+        title="导出医疗器械产品信息"
+        :visible.sync="udiImportDetailVisible"
+        width="85%"
+        :close-on-click-modal="false"
+        :close-on-press-escape="false"
+        append-to-body
+        v-if="udiImportDetailVisible"
+    >
+      <udiInfoSelect :selectType="selectType" v-on:cancelDialog="cancelDialog"
+      ></udiInfoSelect>
+    </el-dialog>
 
-        <el-pagination
-            :page-size="filterQuery.limit"
-            @current-change="handleCurrentChange"
-            layout="prev, pager, next"
-            :total="total"
-        ></el-pagination>
-    </div>
+    <el-pagination
+        :page-size="filterQuery.limit"
+        @current-change="handleCurrentChange"
+        layout="prev, pager, next"
+        :total="total"
+    ></el-pagination>
+  </div>
 </template>
 
 <script>
@@ -107,197 +107,202 @@ import axios from "axios";
 import {filterLog, downloadLog, deleteLog} from "../../api/basic/udiInfoExport";
 import udiInfoSelect from "./UdIInfoSelect";
 import store from "@/store";
+import {formatDate} from "@/utils/date";
 
 export default {
-    data() {
-        return {
-            filterQuery: {
-                // type: 1,
-                genKey: null,
-                status: null,
-                fromType: null,
-                page: 1,
-                limit: 20,
-                thirdSysFk: null,
-            },
-            selectType: 0,
-            udiImportDetailVisible: false,
-            list: [],
-            detailList: [],
-            thirdSys: [],
-            thirdSysDetail: null,
-            total: 0,
-            editQuery: null,
-            fromStatus: {
-                0: "产品信息",
-                1: "库存信息",
-                2: "异常第三方上传"
-            },
-            status: {
-                0: "等待处理",
-                1: "正在处理",
-                2: "处理异常",
-                3: "处理完成"
-            },
-            typeMap: {
-                1: '文件导出',
-                2: '网络同步',
+  data() {
+    return {
+      filterQuery: {
+        // type: 1,
+        genKey: null,
+        status: null,
+        fromType: null,
+        page: 1,
+        limit: 20,
+        thirdSysFk: null,
+      },
+      selectType: 0,
+      udiImportDetailVisible: false,
+      list: [],
+      detailList: [],
+      thirdSys: [],
+      thirdSysDetail: null,
+      total: 0,
+      editQuery: null,
+      fromStatus: {
+        0: "产品信息",
+        1: "库存信息",
+        2: "异常第三方上传"
+      },
+      status: {
+        0: "等待处理",
+        1: "正在处理",
+        2: "处理异常",
+        3: "处理完成"
+      },
+      typeMap: {
+        1: '文件导出',
+        2: '网络同步',
 
-            },
-            uploadFileUrl: null,
-            uploadData: {
-                thirdSys: "thirdId",
-            },
-        };
+      },
+      uploadFileUrl: null,
+      uploadData: {
+        thirdSys: "thirdId",
+      },
+    };
+  },
+
+  methods: {
+    onReset() {
+      this.$router.push({
+        path: "",
+      });
+      this.filterQuery = {
+        type: 1,
+        fromType: null,
+        genKey: null,
+        status: null,
+        page: 1,
+        limit: 20,
+        thirdSysFk: null,
+      };
+      this.getList();
+    },
+    getList() {
+      this.loading = true;
+      filterLog(this.filterQuery)
+          .then((response) => {
+            this.loading = false;
+            this.list = response.data.list || [];
+            this.total = response.data.total || 0;
+          })
+          .catch(() => {
+            this.loading = false;
+            this.list = [];
+            this.total = 0;
+          });
     },
 
-    methods: {
-        onReset() {
-            this.$router.push({
-                path: "",
-            });
-            this.filterQuery = {
-                type: 1,
-                fromType: null,
-                genKey: null,
-                status: null,
-                page: 1,
-                limit: 20,
-                thirdSysFk: null,
-            };
-            this.getList();
-        },
-        getList() {
-            this.loading = true;
-            filterLog(this.filterQuery)
-                .then((response) => {
-                    this.loading = false;
-                    this.list = response.data.list || [];
-                    this.total = response.data.total || 0;
-                })
-                .catch(() => {
-                    this.loading = false;
-                    this.list = [];
-                    this.total = 0;
-                });
-        },
+    exportExcel() {
+      this.selectType = 0;
+      this.udiImportDetailVisible = true;
+    },
+    uploadSmp() {
+      this.selectType = 1;
+      this.udiImportDetailVisible = true;
+    },
+    downloadExcel(row) {
+      axios.get("./config.json").then(res => {
+        let baseUrl = res.data.BASE_URL;
+        let href = baseUrl + "/udiwms/products/exportLog/download" + "?genKey=" + row.genKey;
+        let a = document.createElement("a");
+        var timestamp = formatDate(new Date(), "yyyyMMddhhmmss");
+        fetch(href)
+            .then((res) => res.blob())
+            .then((blob) => {
+              a.href = URL.createObjectURL(blob);
+
+              a.download = "BaseProduct_" + timestamp + ".LowerIn";
 
-        exportExcel() {
-            this.selectType = 0;
-            this.udiImportDetailVisible = true;
-        },
-        uploadSmp() {
-            this.selectType = 1;
-            this.udiImportDetailVisible = true;
-        },
-        downloadExcel(row) {
-            axios.get("./config.json").then(res => {
-                let baseUrl = res.data.BASE_URL;
-                let href = baseUrl + "/udiwms/products/exportLog/download" + "?genKey=" + row.genKey;
-                let a = document.createElement("a");
-                fetch(href)
-                    .then((res) => res.blob())
-                    .then((blob) => {
-                        a.href = URL.createObjectURL(blob);
-                        a.download =
-                            row.filePath.split("\\")[
-                            row.filePath.split("\\").length - 1
-                                ]; //  // 下载文件的名字
-                        document.body.appendChild(a);
-                        a.click();
-                        this.getList();
-                    });
+              // a.download =
+              //     row.filePath.split("\\")[
+              //     row.filePath.split("\\").length - 1
+              //         ]; //  // 下载文件的名字
+              document.body.appendChild(a);
+              a.click();
+              this.getList();
             });
-        },
+      });
+    },
 
-        cancelDialog(val) {
-            this.udiImportDetailVisible = false;
-            if (val) {
-                this.getList();
-            }
-        },
-        handleCurrentChange(val) {
-            this.filterQuery.page = val;
-            this.getList();
-        },
-        deleteDialog(rowId) {
-            this.$confirm("此操作将删除该产品信息, 是否继续?", "提示", {
-                confirmButtonText: "确定",
-                cancelButtonText: "取消",
-                type: "warning",
-            })
-                .then(() => {
-                    let dQuery = {
-                        id: rowId,
-                    };
-                    deleteLog(dQuery)
-                        .then((response) => {
-                            this.loading = false;
-                            if (response.code == 20000) {
-                                this.$message.success("删除成功");
-                            } else {
-                                this.$message.error(response.message);
-                            }
-                            this.getList();
-                        })
-                        .catch(() => {
-                            this.loading = false;
-                        });
+    cancelDialog(val) {
+      this.udiImportDetailVisible = false;
+      if (val) {
+        this.getList();
+      }
+    },
+    handleCurrentChange(val) {
+      this.filterQuery.page = val;
+      this.getList();
+    },
+    deleteDialog(rowId) {
+      this.$confirm("此操作将删除该产品信息, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+          .then(() => {
+            let dQuery = {
+              id: rowId,
+            };
+            deleteLog(dQuery)
+                .then((response) => {
+                  this.loading = false;
+                  if (response.code == 20000) {
+                    this.$message.success("删除成功");
+                  } else {
+                    this.$message.error(response.message);
+                  }
+                  this.getList();
                 })
                 .catch(() => {
+                  this.loading = false;
                 });
-        },
-        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.getList();
-                this.$message.success("文件上传成功,请稍后刷新查看！");
-
-            }
-        },
-        statusFilterType(status) {
-            const statusMap = {
-                0: "warning",
-                1: "warning",
-                2: "danger",
-                3: "success",
-            };
-            return statusMap[status];
-        },
-    },
-    mounted() {
+          })
+          .catch(() => {
+          });
     },
-    components: {udiInfoSelect},
-    created() {
-        // this.getBasicThirdSys();
+    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.getList();
+        this.$message.success("文件上传成功,请稍后刷新查看！");
+
+      }
+    },
+    statusFilterType(status) {
+      const statusMap = {
+        0: "warning",
+        1: "warning",
+        2: "danger",
+        3: "success",
+      };
+      return statusMap[status];
     },
+  },
+  mounted() {
+  },
+  components: {udiInfoSelect},
+  created() {
+    // this.getBasicThirdSys();
+    this.getList();
+  },
 };
 </script>
 <style>
 .itemTag {
-    float: left;
-    text-align: left;
-    margin-top: 10px;
-    width: 100px;
+  float: left;
+  text-align: left;
+  margin-top: 10px;
+  width: 100px;
 }
 
 .text {
-    font-size: 13px;
-    font-family: "Microsoft YaHei";
+  font-size: 13px;
+  font-family: "Microsoft YaHei";
 }
 
 .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/basic/invWarehouse.vue b/src/views/basic/invWarehouse.vue
index a210248..a8047d5 100644
--- a/src/views/basic/invWarehouse.vue
+++ b/src/views/basic/invWarehouse.vue
@@ -104,14 +104,14 @@
                 <el-table-column label="操作" fixed="right">
                     <template slot-scope="scope">
 
-                        <el-button
-                            type="text"
-                            size="small"
-                            :disabled="scope.row.pid!=0"
-                            @click.native.stop="handleSubForm(node, scope.row, 'add')"
-                        >添加货位
-                        </el-button
-                        >
+<!--                        <el-button-->
+<!--                            type="text"-->
+<!--                            size="small"-->
+<!--                            :disabled="scope.row.pid!=0"-->
+<!--                            @click.native.stop="handleSubForm(node, scope.row, 'add')"-->
+<!--                        >添加货位-->
+<!--                        </el-button-->
+<!--                        >-->
                         <el-button
                             type="text"
                             size="small"
@@ -476,6 +476,13 @@
                         </el-form-item>
                     </el-col>
                 </el-row>
+                <el-row :gutter="20" class="el-row" type="flex">
+                    <el-col :span="12" class="el-col">
+                        <div class="text item">
+                            <el-checkbox v-model="formData.spUse" :disabled="formData.level!='1'">是否允许供应商使用</el-checkbox>
+                        </div>
+                    </el-col>
+                </el-row>
 
 
                 <!--                <el-form-item v-if="formData.pid == 0">-->
@@ -507,109 +514,6 @@
         </el-dialog>
 
 
-        <!--        <el-dialog-->
-        <!--            :title="formMap[formName]"-->
-        <!--            :close-on-click-modal="false"-->
-        <!--            :close-on-press-escape="false"-->
-        <!--            :visible.sync="formVisible"-->
-        <!--            :before-close="hideForm"-->
-        <!--            width="60%"-->
-        <!--            top="5vh"-->
-        <!--        >-->
-
-        <!--            <el-table v-if="thirdSysVisible" :data="sysList" style="width: 100%; margin-bottom: 30px;" border>-->
-        <!--                <el-table-column label="序号" type="index"></el-table-column>-->
-        <!--                <el-table-column-->
-        <!--                    label="第三方系统名称"-->
-        <!--                    prop="sysName"-->
-        <!--                    show-overflow-tooltip-->
-        <!--                ></el-table-column>-->
-        <!--                <el-table-column-->
-        <!--                    label="第三方仓库ID"-->
-        <!--                    prop="thirdId"-->
-        <!--                    show-overflow-tooltip-->
-        <!--                ></el-table-column>-->
-        <!--                <el-table-column-->
-        <!--                    label="第三方仓库名称"-->
-        <!--                    prop="thirdName"-->
-        <!--                    show-overflow-tooltip-->
-        <!--                ></el-table-column>-->
-        <!--                <el-table-column label="操作" fixed="right">-->
-        <!--                    <template slot-scope="scope">-->
-        <!--                        <el-button-->
-        <!--                            type="text"-->
-        <!--                            size="small"-->
-        <!--                            @click="intentSelect(scope.row)"-->
-        <!--                        >关联-->
-        <!--                        </el-button-->
-        <!--                        >-->
-        <!--                        <el-button type="text" size="small" @click.native.stop="unbindThrWarehouse(scope.row)"-->
-        <!--                                   :disabled="scope.row.thirdId=='' ||scope.row.thirdId==null"-->
-        <!--                        >解绑-->
-        <!--                        </el-button>-->
-        <!--                    </template>-->
-        <!--                </el-table-column>-->
-        <!--            </el-table>-->
-
-        <!--            <el-form :model="formData" :rules="formRules" ref="dataForm">-->
-
-        <!--                <el-form-item label="仓库编码" prop="title" class="query-form-item">-->
-        <!--                    <el-input-->
-        <!--                        v-model="formData.code" style="width: 80%"-->
-        <!--                        auto-complete="off"-->
-        <!--                    ></el-input>-->
-        <!--                </el-form-item>-->
-        <!--                <el-form-item label="仓库名称" prop="name" class="query-form-item">-->
-        <!--                    <el-input-->
-        <!--                        v-model="formData.name" style="width: 80%"-->
-        <!--                        auto-complete="off"-->
-        <!--                    ></el-input>-->
-        <!--                </el-form-item>-->
-
-
-        <!--                <el-form-item class="query-form-item" label="仓库类型:">-->
-        <!--                    <el-select v-model="formData.advanceType" placeholder="仓库类型" clearable>-->
-        <!--                        <el-option label="寄售" :value='true'></el-option>-->
-        <!--                        <el-option label="仓库" :value='false'></el-option>-->
-        <!--                    </el-select>-->
-        <!--                </el-form-item>-->
-        <!--                <el-form-item label="状态:" prop="status" class="query-form-item">-->
-        <!--                    <el-radio-group v-model="formData.status">-->
-        <!--                        <el-radio :label="0">禁用</el-radio>-->
-        <!--                        <el-radio :label="1">正常</el-radio>-->
-        <!--                    </el-radio-group>-->
-        <!--                </el-form-item>-->
-
-        <!--                &lt;!&ndash;                <el-form-item v-if="formData.pid == 0">&ndash;&gt;-->
-        <!--                &lt;!&ndash;                    <el-row :gutter="20" class="el-row" type="flex">&ndash;&gt;-->
-        <!--                &lt;!&ndash;                        <el-col :span="4" class="el-col">&ndash;&gt;-->
-        <!--                &lt;!&ndash;                            <div class="text item">&ndash;&gt;-->
-        <!--                &lt;!&ndash;                                <el-checkbox v-model="formData.advanceType">是否寄售仓库</el-checkbox>&ndash;&gt;-->
-        <!--                &lt;!&ndash;                            </div>&ndash;&gt;-->
-        <!--                &lt;!&ndash;                        </el-col>&ndash;&gt;-->
-        <!--                &lt;!&ndash;                        <el-col :span="4" class="el-col">&ndash;&gt;-->
-        <!--                &lt;!&ndash;                            <div class="text item">&ndash;&gt;-->
-        <!--                &lt;!&ndash;                                <el-checkbox v-model="formData.isDefault">是否设为默认仓库</el-checkbox>&ndash;&gt;-->
-        <!--                &lt;!&ndash;                            </div>&ndash;&gt;-->
-        <!--                &lt;!&ndash;                        </el-col>&ndash;&gt;-->
-        <!--                &lt;!&ndash;                    </el-row>&ndash;&gt;-->
-        <!--                &lt;!&ndash;                </el-form-item>&ndash;&gt;-->
-
-        <!--            </el-form>-->
-
-        <!--            <div slot="footer" class="dialog-footer">-->
-        <!--                <el-button @click.native="hideForm">取消</el-button>-->
-        <!--                <el-button-->
-        <!--                    type="primary"-->
-        <!--                    @click.native="formSubmit()"-->
-        <!--                    :loading="formLoading"-->
-        <!--                >提交-->
-        <!--                </el-button-->
-        <!--                >-->
-        <!--            </div>-->
-        <!--        </el-dialog>-->
-
-
         <el-dialog title="关联仓库" :visible.sync="thrWareHouseVisible">
             <el-table
                 :data="thrWarehouseData"
@@ -1031,8 +935,9 @@ export default {
                 );
                 this.loading = false;
                 const eleLink = document.createElement('a');
-                var timestamp = formatDate(new Date(), "yyyy-MM-dd_hh:mm")
-                eleLink.download = "仓库信息导出" + timestamp + ".udi";
+                var timestamp = formatDate(new Date(), "yyyyMMddhhmmss")
+                // eleLink.download = "仓库信息导出" + timestamp + ".udi";
+                eleLink.download =  "BaseWarehouse_" + timestamp + ".LowerIn";
                 eleLink.style.display = 'none';
                 eleLink.href = url;
                 document.body.appendChild(eleLink)
diff --git a/src/views/inventory/InvStatistics.vue b/src/views/inventory/InvStatistics.vue
index b7d7aa1..10bab4f 100644
--- a/src/views/inventory/InvStatistics.vue
+++ b/src/views/inventory/InvStatistics.vue
@@ -101,8 +101,8 @@
 
                 <el-table-column label="供应商" prop="companyName" v-if="showSup" show-overflow-tooltip
                                  width="120"></el-table-column>
-                <el-table-column label="仓库" prop="invStorageName" v-if="showSup"
-                                 show-overflow-tooltip width="120"></el-table-column>
+<!--                <el-table-column label="仓库" prop="invStorageName" v-if="showSup"-->
+                <!--                                 show-overflow-tooltip width="120"></el-table-column>-->
             </el-table>
         </el-card>
 
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 2e2d673..ab9b156 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -3,7 +3,7 @@
 
 
         <div>
-            <h3 class="toptitle">诏安县总医院</h3>
+            <h3 class="toptitle">平和县医院</h3>
         </div>
 
         <el-form
diff --git a/src/views/thrsys/ThrInvWarehouse.vue b/src/views/thrsys/ThrInvWarehouse.vue
index 74c8b9f..4c58585 100644
--- a/src/views/thrsys/ThrInvWarehouse.vue
+++ b/src/views/thrsys/ThrInvWarehouse.vue
@@ -297,6 +297,15 @@ export default {
     },
     methods: {
         /*eslint-disable */
+
+// <el-button
+//     style="font-size: 12px;"
+//     type="text"
+//     on-click={() => this.handleSubForm(node, data, "add")}
+// >
+//     添加货位
+// </el-button>
+
         renderContent(h, {node, data, store}) {
             return (
                 <span
@@ -306,13 +315,7 @@ export default {
                        <span style="margin-left:18px">(编码：{data.code})</span>
                     </span>
                     <span>
-                    <el-button
-                        style="font-size: 12px;"
-                        type="text"
-                        on-click={() => this.handleSubForm(node, data, "add")}
-                    >
-                添加货位
-                </el-button>
+
                 <el-button
                     style="font-size: 12px;"
                     type="text"
diff --git a/src/views/thrsys/ThrOrdedrReceiveAdd.vue b/src/views/thrsys/ThrOrdedrReceiveAdd.vue
index 3ce9b97..752b347 100644
--- a/src/views/thrsys/ThrOrdedrReceiveAdd.vue
+++ b/src/views/thrsys/ThrOrdedrReceiveAdd.vue
@@ -74,10 +74,17 @@
                 <el-table-column label="往来单位ID" prop="corpId"></el-table-column>
                 <el-table-column label="往来单位" prop="corpName"
                                  show-overflow-tooltip="true"></el-table-column>
-                <el-table-column label="单据状态" prop="billFlag"></el-table-column>
+<!--                <el-table-column label="单据状态" prop="billFlag"></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="newDistributionForm(scope.$index, scope.row)"
+                        >编辑
+                        </el-button
+                        >
                         <el-button type="text" size="small" @click.native.stop="deleteDialog(scope.row)"
                         >删除
                         </el-button>
@@ -100,8 +107,8 @@
                 <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-column label="单据数量" prop="reCount"></el-table-column>-->
+                <el-table-column label="单据数量" prop="count"></el-table-column>
             </el-table>
         </el-card>
 
@@ -117,6 +124,7 @@
             <thrOrderNew
                 :closeDialog="closeDialog"
                 :idQuery="idQuery"
+                :closeConfirmFunction="closeConfirmFunction"
             ></thrOrderNew>
         </el-dialog>
     </div>
@@ -134,6 +142,8 @@ import {
     getCloudErp,
 } from "../../api/inout/erpOrder";
 import thrOrderNew from "./thrOrderNew";
+import store from "@/store";
+
 export default {
     data() {
         return {
@@ -145,7 +155,10 @@ export default {
                 page: 1,
                 limit: 10,
                 corpName: null,
+                type: 1,
+                editStatus: 1,
             },
+            idQuery: {},
             total: 0,
             thirdSys: [],
             thirdSysDetail: null,
@@ -158,6 +171,7 @@ export default {
             uploadData: {
                 thirdSys: "thirdId",
             },
+            closeConfirm: false,
             loading: false,
             actDateRange: [],
             newSpDistributionVisible: false,
@@ -210,6 +224,8 @@ export default {
                 page: 1,
                 limit: 10,
                 corpName: null,
+                type: 1,
+                editStatus: 1,
             };
             this.actDateRange = [];
             this.getList();
@@ -381,7 +397,11 @@ export default {
                 }
             }
         },
-
+        closeConfirmFunction(type) {
+            if (this.$isNotBlank(type) && type) {
+                this.closeConfirm = type;
+            }
+        },
         getlocalName(action) {
             for (let i = 0; i < this.busTypes.length; i++) {
                 if (this.busTypes[i].action === action) {
@@ -418,6 +438,16 @@ export default {
             this.detailList = [];
         },
 
+
+        newDistributionForm(index, row) {
+            this.idQuery.id = '';
+            if (this.$isNotBlank(row) && this.$isNotBlank(row.id)) {
+                this.idQuery.id = row.id;
+                this.idQuery.formData = row;
+            }
+            this.newSpDistributionVisible = true;
+        },
+
     },
     components: {
         thrOrderNew,
diff --git a/src/views/thrsys/ThrOrdedrReceiveSearch.vue b/src/views/thrsys/ThrOrdedrReceiveSearch.vue
index ec47470..e5278bb 100644
--- a/src/views/thrsys/ThrOrdedrReceiveSearch.vue
+++ b/src/views/thrsys/ThrOrdedrReceiveSearch.vue
@@ -98,7 +98,7 @@
                 <el-table-column label="往来单位ID" prop="corpId"></el-table-column>
                 <el-table-column label="往来单位" prop="corpName"
                                  show-overflow-tooltip="true"></el-table-column>
-                <el-table-column label="单据状态" prop="billFlag"></el-table-column>
+<!--                <el-table-column label="单据状态" prop="billFlag"></el-table-column>-->
                 <el-table-column label="单据日期" prop="billdate"></el-table-column>
 
 
@@ -167,6 +167,8 @@ export default {
                 page: 1,
                 limit: 10,
                 corpName: null,
+                type: 1,
+                editStatus: 0,
             },
             total: 0,
             thirdSys: [],
@@ -231,6 +233,8 @@ export default {
                 page: 1,
                 limit: 10,
                 corpName: null,
+                type: 1,
+                editStatus: 0,
             };
             this.actDateRange = [];
             this.getList();
diff --git a/src/views/thrsys/ThrOrder.vue b/src/views/thrsys/ThrOrder.vue
index 7daf5f1..b009cf0 100644
--- a/src/views/thrsys/ThrOrder.vue
+++ b/src/views/thrsys/ThrOrder.vue
@@ -136,8 +136,8 @@
         <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-column label="单据数量" prop="reCount"></el-table-column>-->
+        <el-table-column label="单据数量" prop="count"></el-table-column>
       </el-table>
     </el-card>
   </div>
diff --git a/src/views/thrsys/thrOrderNew.vue b/src/views/thrsys/thrOrderNew.vue
index 2f7dcc2..7276b12 100644
--- a/src/views/thrsys/thrOrderNew.vue
+++ b/src/views/thrsys/thrOrderNew.vue
@@ -13,7 +13,7 @@
                     >
                     <el-button
                         type="primary"
-                        @click.native="saveOrder('2')"
+                        @click.native="saveOrder('0')"
                         :loading="loading"
                     >提交单据
                     </el-button
@@ -65,10 +65,10 @@
                                        @change="actionChange" clearable>
                                 <el-option
                                     v-for="item in busTypes"
-                                    :key="item.localAction"
-                                    :label="item.localName"
-                                    :value="item.localAction">
-                                    <span style="float: left">{{ item.localName }}</span>
+                                    :key="item.thirdAction"
+                                    :label="item.thirdName"
+                                    :value="item.thirdAction">
+                                    <span style="float: left">{{ item.thirdName }}</span>
                                 </el-option>
                             </el-select>
                         </el-form-item>
@@ -344,7 +344,7 @@ import {
     addStockOrderDetailFromCode,
     uploadStockOrderDetail,
     stockOrderDetailQueryProduct,
-    getStockOrderDetailInstrumentById, stockOrderDetail2
+    getStockOrderDetailInstrumentById, stockOrderDetail2, generateBillNoInt
 } from "../../api/warehouse/stockOrder";
 import draggable from "vuedraggable";
 import {saveAs} from "file-saver";
@@ -356,6 +356,9 @@ 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 {getThrOrderDetails} from "@/api/thrsys/thrOrder";
 
 export default {
     name: "idQuery",
@@ -441,6 +444,7 @@ export default {
             thisData: {},
             storageList: [],
             invQueryData: {},
+
         };
     },
     components: {
@@ -473,7 +477,7 @@ export default {
 
                     }
 
-                    if (status === '3') {
+                    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');
@@ -491,7 +495,7 @@ export default {
 
                         }
                     }
-                    if (status === '2') {
+                    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');
@@ -499,33 +503,22 @@ export default {
                         }
                     }
 
-
-                    if (status === '501') {
+                    if (status == "1") {
                         this.submitFunction(status);
                     } else {
-
-                        if (status == "1") {
+                        let tip = "是否确定提交订单?";
+                        this.$confirm(tip, "提示", {
+                            confirmButtonText: "确定",
+                            cancelButtonText: "取消",
+                            type: "warning",
+                        }).then(() => {
                             this.submitFunction(status);
-                        } else {
-                            let tip = "是否确定提交订单?";
-                            if (status == "2") {
-                                tip = "是否确定提交单据为未配货？";
-                            } else if (status == "3") {
-                                tip = "是否确定提交单据为已配货？";
-                            }
-                            this.$confirm(tip, "提示", {
-                                confirmButtonText: "确定",
-                                cancelButtonText: "取消",
-                                type: "warning",
-                            }).then(() => {
-                                this.submitFunction(status);
-                            }).catch(() => {
-                                this.loading = false;
-                            });
-                        }
+                        }).catch(() => {
+                            this.loading = false;
+                        });
+                    }
 
 
-                    }
                 }
             });
         },
@@ -576,19 +569,11 @@ export default {
             let tMessage = status === '501' ? '保存' : '提交';
             this.loading = true;
             let tQuery = this.formData;
-            tQuery.status = status;
-            // if (!this.orderEditor) {
+            tQuery.editStatus = status;
             tQuery.subErpOrders = this.codeArray;
-            if (status == '3') {
-                tQuery.subErpOrders.forEach((obj) => {
-                    obj.reCount = obj.count;
-                    console.log(obj.reCount);
-                });
-            }
-
-
+            // tQuery.billType = this.formData.bi;
             console.log(tQuery);
-            insertStockOrderWeb(tQuery)
+            inserThrOrderWeb(tQuery)
                 .then(response => {
                     this.loading = false;
                     if (response.code === 20000) {
@@ -602,34 +587,6 @@ export default {
                     this.loading = false;
                 })
         },
-        submit(formName) {
-            if (this.total < 1) {
-                this.$message.warning('未添加产品');
-                return;
-            }
-            this.$confirm("是否提交？", "提示", {
-                confirmButtonText: "确定",
-                cancelButtonText: "取消",
-                type: "warning",
-            }).then(() => {
-                let tQuery = {
-                    id: this.idQuery.id
-                }
-                this.loading = true;
-                submitStockOrder(tQuery)
-                    .then((response) => {
-                        this.loading = false;
-                        if (response.code === 20000) {
-                            this.$message.success("提交成功");
-                            this.closeDialog(true);
-                        } else {
-                            this.$message.error(response.message);
-                        }
-                    });
-            }).catch(() => {
-                this.loading = false;
-            });
-        },
         selectProductFunction(event) {
 
             if (event == null) {
@@ -654,18 +611,23 @@ export default {
                 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;
-                let item = this.getActionItem(this.formData.billType);
-                if (item.mainAction == 'WareHouseOut' && this.formData.noInvOut != true) {
+                this.thisData.formData.thirdSysFk = this.curAction.thirdSys;
+                this.thisData.billType = this.curAction.localAction;
+
+                // this.thisData.formData.billType = this.curAction.localAction;
+                if (this.curAction.mainAction == 'WareHouseOut' && this.formData.noInvOut != true) {
                     this.invQueryData = {
                         locStorageCode: this.formData.locStorageCode,
                     };
                     this.selectInvProductVisible = true;
-                } else if (item.mainAction == "WareHouseIn" && this.curAction.corpType == 1 && this.formData.noInvOut != true) {
+                } else if (this.curAction.mainAction == "WareHouseIn" && this.curAction.corpType == 1 && this.formData.noInvOut != true) {
 
                     this.invQueryData = {
                         locStorageCode: this.formData.corpId,
+
                     };
                     console.log("his.invQueryData " + this.invQueryData.locStorageCode);
                     this.selectInvProductVisible = true;
@@ -676,66 +638,66 @@ export default {
 
                 return;
             }
-            this.code = this.code.trim();
-
-            if (this.code.length > 13) {
-                let tStr = this.code.substring(0, 2);
-                tStr = tStr.replace('m', 'M');
-                tStr = tStr.replace('a', 'A');
-                if (tStr.indexOf("MA") !== -1) {
-                    this.code = tStr + this.code.substring(2, this.code.length);
-                }
-            }
-
-            this.loading = true;
-            let tQuery = {
-                code: this.code,
-                customerId: store.getters.customerId,
-            };
-
-            stockOrderDetailQueryProduct(tQuery).then((response) => {
-                this.loading = false;
-                console.log(response)
-                if (response.code === 20000) {
-                    if (response.data.getType === "1") {
-                        this.loading = true;
-
-                        let ids = [response.data.getId];
-                        let tQuery2 = {
-                            ids: ids,
-                            udiEntity: response.data
-                        };
-                        getStockOrderDetailInstrumentById(tQuery2).then((response) => {
-                            this.loading = false;
-                            if (response.code === 20000) {
-                                this.closeDialogC2(response.data);
-                            } else {
-                                this.$message.error(response.message);
-                            }
-                        }).catch(() => {
-                            this.loading = false;
-                        });
-                    } else {
-                        this.thisData = response.data;
-                        this.thisData.code = this.code;
-                        this.thisData.orderEditor = this.orderEditor;
-                        this.thisData.orderId = "";
-                        if (this.orderEditor) {
-                            this.thisData.orderId = this.formData.id
-                        }
-                        this.thisData.stockOrderLists = this.codeArray;
-                        this.selectProductVisible = true;
-                    }
-                } else {
-                    this.$message.warning(response.message);
-                    // this.focusNext('inputRef');
-                    if (this.$isNotBlank(event)) {
-                        event.target.select();
-                    }
-                    // event.target.select();
-                    // event.currentTarget.select();
-                }
-            });
+            // this.code = this.code.trim();
+            //
+            // if (this.code.length > 13) {
+            //     let tStr = this.code.substring(0, 2);
+            //     tStr = tStr.replace('m', 'M');
+            //     tStr = tStr.replace('a', 'A');
+            //     if (tStr.indexOf("MA") !== -1) {
+            //         this.code = tStr + this.code.substring(2, this.code.length);
+            //     }
+            // }
+            //
+            // this.loading = true;
+            // let tQuery = {
+            //     code: this.code,
+            //     customerId: store.getters.customerId,
+            // };
+            //
+            // stockOrderDetailQueryProduct(tQuery).then((response) => {
+            //     this.loading = false;
+            //     console.log(response)
+            //     if (response.code === 20000) {
+            //         if (response.data.getType === "1") {
+            //             this.loading = true;
+            //
+            //             let ids = [response.data.getId];
+            //             let tQuery2 = {
+            //                 ids: ids,
+            //                 udiEntity: response.data
+            //             };
+            //             getStockOrderDetailInstrumentById(tQuery2).then((response) => {
+            //                 this.loading = false;
+            //                 if (response.code === 20000) {
+            //                     this.closeDialogC2(response.data);
+            //                 } else {
+            //                     this.$message.error(response.message);
+            //                 }
+            //             }).catch(() => {
+            //                 this.loading = false;
+            //             });
+            //         } else {
+            //             this.thisData = response.data;
+            //             this.thisData.code = this.code;
+            //             this.thisData.orderEditor = this.orderEditor;
+            //             this.thisData.orderId = "";
+            //             if (this.orderEditor) {
+            //                 this.thisData.orderId = this.formData.id
+            //             }
+            //             this.thisData.stockOrderLists = this.codeArray;
+            //             this.selectProductVisible = true;
+            //         }
+            //     } else {
+            //         this.$message.warning(response.message);
+            //         // this.focusNext('inputRef');
+            //         if (this.$isNotBlank(event)) {
+            //             event.target.select();
+            //         }
+            //         // event.target.select();
+            //         // event.currentTarget.select();
+            //     }
+            // });
 
 
         },
@@ -956,21 +918,6 @@ export default {
                 cancelButtonText: "取消",
                 type: "warning",
             }).then(() => {
-                // let tQuery = {
-                //     id: row.id
-                // }
-                // this.detailLoading = true;
-                // copyStockOrderDetail(tQuery)
-                //     .then((response) => {
-                //         this.detailLoading = false;
-                //         if (response.code === 20000) {
-                //             this.$message.success("复制成功");
-                //             this.getStockOrderDetailList();
-                //         } else {
-                //             this.$message.error(response.message);
-                //         }
-                //     });
-
                 let rData = JSON.parse(JSON.stringify(row));
                 rData.id = null;
                 if (this.codeArray.length === 0) {
@@ -1007,7 +954,7 @@ export default {
         },
         getStockOrderDetailList() {
             this.loading = true;
-            stockOrderDetail(this.query) //查找该单号下的所有条码
+            getThrOrderDetails(this.query) //查找该单号下的所有条码
                 .then((response) => {
                     console.log(response)
                     this.codeArray = response.data.list || [];
@@ -1028,7 +975,7 @@ export default {
                 action: this.formData.billType
             }
             this.loading = true;
-            stockOrderGenerateBillNo(tQuery)
+            generateBillNoInt(tQuery)
                 .then((response) => {
                     this.loading = false;
                     if (response.code === 20000) {
@@ -1045,7 +992,7 @@ export default {
                 enabled: true,
                 // code: invCode,
             };
-            getLocalJoinByUser(query)
+            getOriginJoinBusType(query)
                 .then((response) => {
                     this.busTypes = response.data.list || [];
                 })
@@ -1098,19 +1045,16 @@ export default {
         },
         getActionItem(action) {
             for (let i = 0; i < this.busTypes.length; i++) {
-                if (this.busTypes[i].localAction === action) {
+                if (this.busTypes[i].thirdAction === action) {
                     return this.busTypes[i];
                 }
             }
         },
         actionChange(item) {
-            // console.log("item = " + item);
-            // if (item == '') {
-            //     this.formData.locStorageCode == null;
-            // } else {
+            console.log(item);
             this.curAction = this.getActionItem(item);
-            this.formData.locStorageCode = this.curAction.storageCode;
-            console.log(this.curAction.corpType + "---" + this.formData.locStorageCode + "-----" + this.curAction.action);
+            // this.formData.locStorageCode = this.curAction.storageCode;
+            console.log(this.curAction.corpType + "---" + "-----" + this.curAction.action);
             this.findMethod();
             // }
 
diff --git a/src/views/warehouse/IOCheckErrOrder.vue b/src/views/warehouse/IOCheckErrOrder.vue
index 3309784..fb71d6d 100644
--- a/src/views/warehouse/IOCheckErrOrder.vue
+++ b/src/views/warehouse/IOCheckErrOrder.vue
@@ -1065,6 +1065,10 @@ export default {
             filterAllByUser()
                 .then((response) => {
                     this.storageList = response.data || [];
+                    if (this.storageList.length > 0) {
+                        this.filterQuery.locStorageCode = this.storageList[0].code;
+                        this.getList();
+                    }
                 })
                 .catch(() => {
                 });
@@ -1245,8 +1249,6 @@ export default {
         let query = this.$route.query;
         this.query = Object.assign(this.query, query);
         this.query.limit = parseInt(this.query.limit);
-        // 加载表格数据
-        this.getList();
         let end = new Date();
         let start = new Date();
         start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
diff --git a/src/views/warehouse/IOErrorOrder.vue b/src/views/warehouse/IOErrorOrder.vue
index 92cc6dd..c0b045e 100644
--- a/src/views/warehouse/IOErrorOrder.vue
+++ b/src/views/warehouse/IOErrorOrder.vue
@@ -24,6 +24,18 @@
                         </el-option>
                     </el-select>
                 </el-form-item>
+                <el-form-item class="query-form-item">
+                    <el-select v-model="filterQuery.locStorageCode" placeholder="请选择当前仓库" clearable="true"
+                               size="mini">
+                        <el-option
+                            v-for="item in storageList"
+                            :key="item.name"
+                            :label="item.name"
+                            :value="item.code">
+                            <span style="float: left">{{ item.name }}</span>
+                        </el-option>
+                    </el-select>
+                </el-form-item>
                 <el-form-item>
                     <el-button-group>
                         <el-button
@@ -212,7 +224,7 @@
             :close-on-press-escape="false"
             v-if="dialogStorageVisible"
         >
-            <dialogSelectInvStorage  v-on:selectStorage="selectStorage"></dialogSelectInvStorage>
+            <dialogSelectInvStorage v-on:selectStorage="selectStorage"></dialogSelectInvStorage>
         </el-dialog>
 
         <el-dialog
@@ -256,6 +268,7 @@ import store from "../../store";
 import {getBussinessType} from "../../api/basic/bussinessType";
 import {getBasicUnitMaintains} from "@/api/basic/basicUnitMaintain";
 import {getLocalJoinByUser} from "@/api/basic/busLocalType";
+import {filterAllByUser} from "@/api/basic/invWarehouse";
 
 const formJson = {
     site_id: "",
@@ -273,6 +286,7 @@ export default {
                 action: null,
                 page: 1,
                 limit: 20,
+                locStorageCode:null,
             },
             checkStatus: {
                 '-1': "等待提交",
@@ -303,6 +317,7 @@ export default {
                 "7": "UDI供应商平台",
                 "8": "平衡补录单据",
             },
+            storageList: [],
             list: [],
             adId: [],
             adSelectList: [],
@@ -310,7 +325,7 @@ export default {
             adListNoDataText: "无数据",
             queryAdIdAsyncLoading: false,
             codeDetailVisible: false,
-            dialogStorageVisible:false,
+            dialogStorageVisible: false,
             total: 0,
             loading: true,
             index: null,
@@ -423,7 +438,7 @@ export default {
             this.loading = true;
             this.filterQuery.status = 3;
             this.filterQuery.customerId = store.getters.customerId;
-            orderListError(this.filterQuery)
+            filterOrder(this.filterQuery)
                 .then((response) => {
                     console.log(response)
                     this.loading = false;
@@ -524,6 +539,18 @@ export default {
                 }
             }
         },
+        getStorage() {
+            this.storageList = [];
+            filterAllByUser()
+                .then((response) => {
+                    this.storageList = response.data || [];
+                    if (this.storageList.length > 0) {
+                        this.filterQuery.locStorageCode = this.storageList[0].code;
+                    }
+                })
+                .catch(() => {
+                });
+        },
     },
     filters: {
         statusFilterType(status) {
@@ -547,6 +574,7 @@ export default {
         this.filterQuery.limit = parseInt(this.filterQuery.limit);
         // 加载表格数据
         this.getList();
+        this.getStorage();
     },
 };
 </script>
diff --git a/src/views/warehouse/IONewOrder.vue b/src/views/warehouse/IONewOrder.vue
index 3b5d00f..2801688 100644
--- a/src/views/warehouse/IONewOrder.vue
+++ b/src/views/warehouse/IONewOrder.vue
@@ -1,306 +1,306 @@
 <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.id" placeholder="单号"></el-input>
-          </el-form-item>
-          <el-form-item class="query-form-item">
-            <el-select v-model="filterQuery.mainAction" placeholder="出入库类型">
-              <el-option label="全部" value=""></el-option>
-              <el-option label="入库" value="WareHouseIn"></el-option>
-              <el-option label="出库" value="WareHouseOut"></el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item class="query-form-item">
-            <el-select v-model="filterQuery.action" placeholder="请选择扫码单据类型">
-              <el-option
-                  v-for="item in busTypes"
-                  :key="item.name"
-                  :label="item.name"
-                  :value="item.action">
-                <span style="float: left">{{ item.name }}</span>
-              </el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item class="query-form-item">
-            <el-select v-model="filterQuery.locStorageCode" placeholder="请选择当前仓库" clearable="true"
-                       size="mini">
-              <el-option
-                  v-for="item in storageList"
-                  :key="item.name"
-                  :label="item.name"
-                  :value="item.code">
-                <span style="float: left">{{ item.name }}</span>
-              </el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item>
-            <el-button-group>
-              <el-button
-                  type="primary"
-                  icon="el-icon-refresh"
-                  @click="onReset"
-              ></el-button>
-              <el-button type="primary" icon="search" @click="onSubmit"
-              >查询
-              </el-button
-              >
-            </el-button-group>
-          </el-form-item>
-          <el-form-item style="margin-right: 50px; margin-left: auto">
-            <el-button-group>
-              <el-button type="primary" icon="search" @click="mergesOrders">合并单据</el-button>
-              <el-button type="primary" icon="search" @click="addOrders">新增订单</el-button>
-              <el-button type="primary" icon="search" @click="errOrders">异常单据</el-button>
+    <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.id" placeholder="单号"></el-input>
+                    </el-form-item>
+                    <el-form-item class="query-form-item">
+                        <el-select v-model="filterQuery.mainAction" placeholder="出入库类型">
+                            <el-option label="全部" value=""></el-option>
+                            <el-option label="入库" value="WareHouseIn"></el-option>
+                            <el-option label="出库" value="WareHouseOut"></el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item class="query-form-item">
+                        <el-select v-model="filterQuery.action" placeholder="请选择扫码单据类型">
+                            <el-option
+                                v-for="item in busTypes"
+                                :key="item.name"
+                                :label="item.name"
+                                :value="item.action">
+                                <span style="float: left">{{ item.name }}</span>
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item class="query-form-item">
+                        <el-select v-model="filterQuery.locStorageCode" placeholder="请选择当前仓库" clearable="true"
+                                   size="mini">
+                            <el-option
+                                v-for="item in storageList"
+                                :key="item.name"
+                                :label="item.name"
+                                :value="item.code">
+                                <span style="float: left">{{ item.name }}</span>
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item>
+                        <el-button-group>
+                            <el-button
+                                type="primary"
+                                icon="el-icon-refresh"
+                                @click="onReset"
+                            ></el-button>
+                            <el-button type="primary" icon="search" @click="onSubmit"
+                            >查询
+                            </el-button
+                            >
+                        </el-button-group>
+                    </el-form-item>
+                    <el-form-item style="margin-right: 50px; margin-left: auto">
+                        <el-button-group>
+                            <el-button type="primary" icon="search" @click="mergesOrders">合并单据</el-button>
+                            <el-button type="primary" icon="search" @click="addOrders">新增订单</el-button>
+                            <el-button type="primary" icon="search" @click="errOrders">异常单据</el-button>
 
-            </el-button-group>
-          </el-form-item>
-        </el-row>
-      </el-form>
+                        </el-button-group>
+                    </el-form-item>
+                </el-row>
+            </el-form>
 
-      <el-table v-loading="loading" :data="list" style="width: 100%"
-                @selection-change="handleSelectionChange">
-        <el-table-column type="selection" width="55"></el-table-column>
-        <el-table-column label="序号" type="index"></el-table-column>
-        <el-table-column label="扫码单据类型" prop="action">
-          <template slot-scope="scope">
-            <span>{{ getActionName(scope.row.action) }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="订单号" prop="id" show-overflow-tooltip></el-table-column>
-        <el-table-column label="来源订单号" prop="corpOrderId" show-overflow-tooltip></el-table-column>
-        <el-table-column label="来源" prop="fromType">
-          <template slot-scope="scope">
-            <span>{{ fromTypeMap[scope.row.fromType] }}</span>
-          </template>
+            <el-table v-loading="loading" :data="list" style="width: 100%"
+                      @selection-change="handleSelectionChange">
+                <el-table-column type="selection" width="55"></el-table-column>
+                <el-table-column label="序号" type="index"></el-table-column>
+                <el-table-column label="扫码单据类型" prop="action">
+                    <template slot-scope="scope">
+                        <span>{{ getActionName(scope.row.action) }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column label="订单号" prop="id" show-overflow-tooltip></el-table-column>
+                <el-table-column label="来源订单号" prop="corpOrderId" show-overflow-tooltip></el-table-column>
+                <el-table-column label="来源" prop="fromType">
+                    <template slot-scope="scope">
+                        <span>{{ fromTypeMap[scope.row.fromType] }}</span>
+                    </template>
 
-        </el-table-column>
-        <el-table-column label="往来单位" prop="fromCorp" width="220">
-          <template slot-scope="scope">
-            {{ scope.row.fromCorp }}
-            <!--                    <p v-if="scope.row.fromCorp == null">-->
-            <!--                        <el-button-->
-            <!--                            type="primary"-->
-            <!--                            size="mini"-->
-            <!--                            @click.native.stop="handleUnitClick(scope.row)"-->
-            <!--                        >选择往来单位-->
-            <!--                        </el-button-->
-            <!--                        >-->
-            <!--                    </p>-->
-            <!--                    <p v-if="scope.row.fromCorp !== null">-->
-            <!--                        <el-button-->
-            <!--                            type="primary"-->
-            <!--                            size="mini"-->
-            <!--                            @click.native.stop="handleUnitClick(scope.row)"-->
-            <!--                        >{{ scope.row.fromCorp }}-->
-            <!--                        </el-button-->
-            <!--                        >-->
-            <!--                    </p>-->
-          </template>
-        </el-table-column>
-        <el-table-column label="当前仓库" prop="locStorageCode" width="150">
-          <template slot-scope="scope">
-            <span>{{ getStorageName(scope.row.locStorageCode) }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="创建时间" prop="actDate" show-overflow-tooltip>
-          <template slot-scope="scope">
-            <i class="el-icon-time"></i>
-            <span>{{ scope.row.actDate }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="校验状态" prop="status" width="100">
-          <template slot-scope="scope">
-            <el-tag :type="(scope.row.status ===-1 ) | statusFilterType">{{
-                checkStatus[scope.row.status]
-              }}
-            </el-tag>
-          </template>
-        </el-table-column>
-        <el-table-column label="操作" width="150" fixed="right">
-          <template slot-scope="scope">
-            <el-button
-                type="text"
-                size="small"
+                </el-table-column>
+                <el-table-column label="往来单位" prop="fromCorp" width="220">
+                    <template slot-scope="scope">
+                        {{ scope.row.fromCorp }}
+                        <!--                    <p v-if="scope.row.fromCorp == null">-->
+                        <!--                        <el-button-->
+                        <!--                            type="primary"-->
+                        <!--                            size="mini"-->
+                        <!--                            @click.native.stop="handleUnitClick(scope.row)"-->
+                        <!--                        >选择往来单位-->
+                        <!--                        </el-button-->
+                        <!--                        >-->
+                        <!--                    </p>-->
+                        <!--                    <p v-if="scope.row.fromCorp !== null">-->
+                        <!--                        <el-button-->
+                        <!--                            type="primary"-->
+                        <!--                            size="mini"-->
+                        <!--                            @click.native.stop="handleUnitClick(scope.row)"-->
+                        <!--                        >{{ scope.row.fromCorp }}-->
+                        <!--                        </el-button-->
+                        <!--                        >-->
+                        <!--                    </p>-->
+                    </template>
+                </el-table-column>
+                <el-table-column label="当前仓库" prop="locStorageCode" width="150">
+                    <template slot-scope="scope">
+                        <span>{{ getStorageName(scope.row.locStorageCode) }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column label="创建时间" prop="actDate" show-overflow-tooltip>
+                    <template slot-scope="scope">
+                        <i class="el-icon-time"></i>
+                        <span>{{ scope.row.actDate }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column label="校验状态" prop="status" width="100">
+                    <template slot-scope="scope">
+                        <el-tag :type="(scope.row.status ===-1 ) | statusFilterType">{{
+                                checkStatus[scope.row.status]
+                            }}
+                        </el-tag>
+                    </template>
+                </el-table-column>
+                <el-table-column label="操作" width="150" fixed="right">
+                    <template slot-scope="scope">
+                        <el-button
+                            type="text"
+                            size="small"
 
-                @click.native.stop="addOrders(scope.row)"
-            >编辑
-            </el-button
-            >
-            <!--                        v-if="scope.row.status === -1"-->
-            <!--                        <el-button-->
-            <!--                            type="text"-->
-            <!--                            size="small"-->
-            <!--                            v-if="scope.row.status !== -1"-->
-            <!--                            @click.native.stop="intentDetail(scope.row)"-->
-            <!--                        >详情-->
-            <!--                        </el-button-->
-            <!--                        >-->
+                            @click.native.stop="addOrders(scope.row)"
+                        >编辑
+                        </el-button
+                        >
+                        <!--                        v-if="scope.row.status === -1"-->
+                        <!--                        <el-button-->
+                        <!--                            type="text"-->
+                        <!--                            size="small"-->
+                        <!--                            v-if="scope.row.status !== -1"-->
+                        <!--                            @click.native.stop="intentDetail(scope.row)"-->
+                        <!--                        >详情-->
+                        <!--                        </el-button-->
+                        <!--                        >-->
 
-            <!--                        <el-button-->
-            <!--                            type="text"-->
-            <!--                            size="small"-->
-            <!--                            v-if="scope.row.status !== -1"-->
-            <!--                            @click.native.stop="handleErrorDetail(scope.$index)"-->
-            <!--                        >错误详情-->
-            <!--                        </el-button-->
-            <!--                        >-->
-            <el-button
-                type="text"
-                size="small"
-                @click.native.stop="deleteDialog(scope.row.id)"
-            >删除
-            </el-button
-            >
-            <el-button
-                type="text"
-                size="small"
-                v-if="scope.row.status !== -1"
-                @click.native.stop="onUpload(scope.row.id)"
-            >立即处理
-            </el-button
-            >
-          </template>
-        </el-table-column>
-      </el-table>
+                        <!--                        <el-button-->
+                        <!--                            type="text"-->
+                        <!--                            size="small"-->
+                        <!--                            v-if="scope.row.status !== -1"-->
+                        <!--                            @click.native.stop="handleErrorDetail(scope.$index)"-->
+                        <!--                        >错误详情-->
+                        <!--                        </el-button-->
+                        <!--                        >-->
+                        <el-button
+                            type="text"
+                            size="small"
+                            @click.native.stop="deleteDialog(scope.row.id)"
+                        >删除
+                        </el-button
+                        >
+                        <el-button
+                            type="text"
+                            size="small"
+                            v-if="scope.row.status !== -1"
+                            @click.native.stop="onUpload(scope.row.id)"
+                        >立即处理
+                        </el-button
+                        >
+                    </template>
+                </el-table-column>
+            </el-table>
 
-      <el-dialog title="错误信息" :visible.sync="dialogVisible" width="30%">
-        <span>{{ errorDetail }}</span>
-        <span slot="footer" class="dialog-footer">
+            <el-dialog title="错误信息" :visible.sync="dialogVisible" width="30%">
+                <span>{{ errorDetail }}</span>
+                <span slot="footer" class="dialog-footer">
         <el-button type="primary" @click="dialogVisible = false"
         >关 闭</el-button
         >
       </span>
-      </el-dialog>
-      <el-dialog
-          title="选择往来单位"
-          :visible.sync="dialogTableVisible"
-          :close-on-click-modal="false"
-          :close-on-press-escape="false"
-          width="70%"
-      >
-        <el-form :inline="true" :model="unitquery" class="query-form" size="mini">
-          <el-form-item class="query-form-item">
-            <el-input v-model="unitquery.key" placeholder="搜索"></el-input>
-          </el-form-item>
-          <el-form-item>
-            <el-button
-                type="primary"
-                icon="search"
-                @click.native.stop="getUnitList()"
-            >查询
-            </el-button
+            </el-dialog>
+            <el-dialog
+                title="选择往来单位"
+                :visible.sync="dialogTableVisible"
+                :close-on-click-modal="false"
+                :close-on-press-escape="false"
+                width="70%"
             >
-          </el-form-item>
-        </el-form>
+                <el-form :inline="true" :model="unitquery" class="query-form" size="mini">
+                    <el-form-item class="query-form-item">
+                        <el-input v-model="unitquery.key" placeholder="搜索"></el-input>
+                    </el-form-item>
+                    <el-form-item>
+                        <el-button
+                            type="primary"
+                            icon="search"
+                            @click.native.stop="getUnitList()"
+                        >查询
+                        </el-button
+                        >
+                    </el-form-item>
+                </el-form>
 
-        <el-table
-            v-loading="loading"
-            :data="unitlist"
-            style="width: 100%"
-            @row-click="selectUnit"
-        >
-          <el-table-column
-              label="往来单位ID"
-              prop="unitId"
-              show-overflow-tooltip
-          ></el-table-column>
-          <el-table-column
-              label="往来单位名称"
-              prop="name"
-              show-overflow-tooltip
-          ></el-table-column>
-          <el-table-column
-              label="往来单位简写"
-              prop="spell"
-              show-overflow-tooltip
-          ></el-table-column>
-          <el-table-column
-              label="地址"
-              prop="addr"
-              show-overflow-tooltip
-          ></el-table-column>
-          <el-table-column label="状态" prop="status"></el-table-column>
-          <el-table-column label="类型" prop="type"></el-table-column>
-        </el-table>
-      </el-dialog>
+                <el-table
+                    v-loading="loading"
+                    :data="unitlist"
+                    style="width: 100%"
+                    @row-click="selectUnit"
+                >
+                    <el-table-column
+                        label="往来单位ID"
+                        prop="unitId"
+                        show-overflow-tooltip
+                    ></el-table-column>
+                    <el-table-column
+                        label="往来单位名称"
+                        prop="name"
+                        show-overflow-tooltip
+                    ></el-table-column>
+                    <el-table-column
+                        label="往来单位简写"
+                        prop="spell"
+                        show-overflow-tooltip
+                    ></el-table-column>
+                    <el-table-column
+                        label="地址"
+                        prop="addr"
+                        show-overflow-tooltip
+                    ></el-table-column>
+                    <el-table-column label="状态" prop="status"></el-table-column>
+                    <el-table-column label="类型" prop="type"></el-table-column>
+                </el-table>
+            </el-dialog>
 
 
-      <el-dialog
-          title="异常订单"
-          :visible.sync="errOrderVisible"
-          width="80%"
-          :close-on-click-modal="false"
-          :close-on-press-escape="false"
-      >
-        <ioErrorOrder
-        ></ioErrorOrder>
-      </el-dialog>
+            <el-dialog
+                title="异常订单"
+                :visible.sync="errOrderVisible"
+                width="80%"
+                :close-on-click-modal="false"
+                :close-on-press-escape="false"
+            >
+                <ioErrorOrder
+                ></ioErrorOrder>
+            </el-dialog>
 
-      <el-dialog
-          title="新增订单"
-          :visible.sync="addOrderVisible"
-          width="75%" append-to-body
-          :close-on-click-modal="false"
-          :close-on-press-escape="false"
-          v-if="addOrderVisible"
-          @close='closeDialog'
-      >
-        <addOrder
-            :closeDialog="closeDialog"
-            :idQuery="idQuery"
-        ></addOrder>
-      </el-dialog>
+            <el-dialog
+                title="新增订单"
+                :visible.sync="addOrderVisible"
+                width="75%" append-to-body
+                :close-on-click-modal="false"
+                :close-on-press-escape="false"
+                v-if="addOrderVisible"
+                @close='closeDialog'
+            >
+                <addOrder
+                    :closeDialog="closeDialog"
+                    :idQuery="idQuery"
+                ></addOrder>
+            </el-dialog>
 
-      <el-dialog
-          title="新增订单"
-          :visible.sync="addHosOrderVisible"
-          width="75%"
-          append-to-body
-          :close-on-click-modal="false"
-          :close-on-press-escape="false"
-          v-if="addHosOrderVisible"
-          @close='closeDialog'
-      >
-        <addHosOrder
-            :closeDialog="closeDialog"
-            :idQuery="idQuery"
-        ></addHosOrder>
-      </el-dialog>
+            <el-dialog
+                title="新增订单"
+                :visible.sync="addHosOrderVisible"
+                width="75%"
+                append-to-body
+                :close-on-click-modal="false"
+                :close-on-press-escape="false"
+                v-if="addHosOrderVisible"
+                @close='closeDialog'
+            >
+                <addHosOrder
+                    :closeDialog="closeDialog"
+                    :idQuery="idQuery"
+                ></addHosOrder>
+            </el-dialog>
 
-      <el-dialog
-          title="单号详情"
-          :visible.sync="codeDetailVisible"
-          :close-on-click-modal="false"
-          :close-on-press-escape="false"
-          width="80%"
-          v-if="codeDetailVisible"
-      >
-        <codeDetail
-            :idQuery="idQuery"
-            v-on:closeDetailDialog="closeDetailDialog"
-        ></codeDetail>
-      </el-dialog>
-      <el-pagination
-          :page-size="filterQuery.limit"
-          @current-change="handleCurrentChange"
-          layout="prev, pager, next"
-          :total="total"
-      ></el-pagination>
-    </el-card>
-  </div>
+            <el-dialog
+                title="单号详情"
+                :visible.sync="codeDetailVisible"
+                :close-on-click-modal="false"
+                :close-on-press-escape="false"
+                width="80%"
+                v-if="codeDetailVisible"
+            >
+                <codeDetail
+                    :idQuery="idQuery"
+                    v-on:closeDetailDialog="closeDetailDialog"
+                ></codeDetail>
+            </el-dialog>
+            <el-pagination
+                :page-size="filterQuery.limit"
+                @current-change="handleCurrentChange"
+                layout="prev, pager, next"
+                :total="total"
+            ></el-pagination>
+        </el-card>
+    </div>
 </template>
 
 <script>
 import {
-  orderListError,
-  codeList,
-  filterOrder,
-  deleteByOrderId,
-  commitOrder,
-  updateUnit, mergeOrder,
+    orderListError,
+    codeList,
+    filterOrder,
+    deleteByOrderId,
+    commitOrder,
+    updateUnit, mergeOrder,
 } from "../../api/warehouse/order";
 import {unitListBykey} from "../../api/warehouse/unit";
 import draggable from "vuedraggable";
@@ -315,376 +315,381 @@ import {filterAllByUser} from "@/api/basic/invWarehouse";
 import {getLocalJoinByUser} from "@/api/basic/busLocalType";
 
 const formJson = {
-  site_id: "",
-  site_name: "",
-  describe: "",
-  ads: [],
+    site_id: "",
+    site_name: "",
+    describe: "",
+    ads: [],
 };
 
 export default {
-  data() {
-    return {
-      filterQuery: {
-        id: "",
-        mainAction: null,
-        action: null,
-        page: 1,
-        status: 10,
-        limit: 10,
-      },
-      checkStatus: {
-        '-1': "草稿",
-        // 1: "等待处理",
-        1: "等待处理",
-        2: "等待校验",
-        3: "校验异常",
-        4: "校验成功",
-      },
-      curIndex: "",
-      unitquery: {key: "", page: 1, limit: 20},
-      unitlist: [],
-      multipleSelection: [],
-      unitUpdateQuery: {
-        id: "",
-        fromCorpId: "",
-        fromCorp: "",
-      },
-      idQuery: {
-        id: "",
-      },
-      storageList: [],
-      errOrderVisible: false,
-      list: [],
-      adId: [],
-      adSelectList: [],
-      adList: {},
-      adListNoDataText: "无数据",
-      queryAdIdAsyncLoading: false,
-      codeDetailVisible: false,
-      addOrderVisible: false,
-      addHosOrderVisible: false,
-      total: 0,
-      loading: true,
-      index: null,
-      formName: null,
-      errorDetail: "1111111111111",
-      formMap: {
-        add: "新增",
-        edit: "编辑",
-      },
-      fromTypeMap: {
-        "1": "UDIMS平台",
-        "2": "网页新增",
-        "3": "pda即时校验",
-        "4": "pda未校验",
-        "5": "pc端扫码精灵",
-        "6": "缺量补录单据",
-        "7": "UDI供应商平台",
-        "8": "平衡补录单据",
-      },
-      deleteData: {
-        id: "",
-      },
-      dialogTableVisible: false,
-      formLoading: false,
-      dialogVisible: false,
-      formData: formJson,
-      deleteLoading: false,
-      busTypes: [],
-    };
-  },
-  components: {
-    draggable,
-    codeDetail,
-    addOrder,
-    addHosOrder,
-    ioErrorOrder
-  },
-  methods: {
-    onReset() {
-      this.$router.push({
-        path: "",
-      });
-      this.filterQuery = {
-        status: 10,
-        page: 1,
-        limit: 10,
-      };
-      this.getList();
-    },
-    onSubmit() {
-      this.loading = true;
-      this.getList();
-    },
-    handleSizeChange(val) {
-      this.filterQuery.limit = val;
-      this.getList();
-    },
-    handleCurrentChange(val) {
-      this.filterQuery.page = val;
-      this.getList();
-    },
-    handleUnitClick(row) {
-      this.curIndex = row.id;
-      this.dialogTableVisible = true;
-    },
-    closeDetailDialog(val) {
-      this.codeDetailVisible = false;
-    },
-    getActionName(action) {
-      for (let i = 0; i < this.busTypes.length; i++) {
-        if (this.busTypes[i].action === action) {
-          return this.busTypes[i].name;
-        }
-      }
+    data() {
+        return {
+            filterQuery: {
+                id: "",
+                mainAction: null,
+                action: null,
+                page: 1,
+                status: 10,
+                limit: 10,
+                locStorageCode:null,
+            },
+            checkStatus: {
+                '-1': "草稿",
+                // 1: "等待处理",
+                1: "等待处理",
+                2: "等待校验",
+                3: "校验异常",
+                4: "校验成功",
+            },
+            curIndex: "",
+            unitquery: {key: "", page: 1, limit: 20},
+            unitlist: [],
+            multipleSelection: [],
+            unitUpdateQuery: {
+                id: "",
+                fromCorpId: "",
+                fromCorp: "",
+            },
+            idQuery: {
+                id: "",
+            },
+            storageList: [],
+            errOrderVisible: false,
+            list: [],
+            adId: [],
+            adSelectList: [],
+            adList: {},
+            adListNoDataText: "无数据",
+            queryAdIdAsyncLoading: false,
+            codeDetailVisible: false,
+            addOrderVisible: false,
+            addHosOrderVisible: false,
+            total: 0,
+            loading: true,
+            index: null,
+            formName: null,
+            errorDetail: "1111111111111",
+            formMap: {
+                add: "新增",
+                edit: "编辑",
+            },
+            fromTypeMap: {
+                "1": "UDIMS平台",
+                "2": "网页新增",
+                "3": "pda即时校验",
+                "4": "pda未校验",
+                "5": "pc端扫码精灵",
+                "6": "缺量补录单据",
+                "7": "UDI供应商平台",
+                "8": "平衡补录单据",
+            },
+            deleteData: {
+                id: "",
+            },
+            dialogTableVisible: false,
+            formLoading: false,
+            dialogVisible: false,
+            formData: formJson,
+            deleteLoading: false,
+            busTypes: [],
+        };
     },
-    getBusType() {
-      let query = {
-        enabled: true,
-      };
-      getLocalJoinByUser(query)
-          .then((response) => {
-            this.busTypes = response.data.list || [];
-            this.filterQuery.billAction = this.busTypes[0].action;
-            // this.getList();
-          })
-          .catch(() => {
-          });
+    components: {
+        draggable,
+        codeDetail,
+        addOrder,
+        addHosOrder,
+        ioErrorOrder
     },
-    getStorage() {
-      this.storageList = [];
-      filterAllByUser()
-          .then((response) => {
-            this.storageList = response.data || [];
-          })
-          .catch(() => {
-          });
-    },
-    getStorageName(code) {
-      for (let i = 0; i < this.storageList.length; i++) {
-        if (this.storageList[i].code === code) {
-          return this.storageList[i].name;
-        }
-      }
-    },
-    addOrders(row) {
-      console.log(row)
-      this.idQuery.id = '';
-      this.idQuery.actDate = '';
-      this.idQuery.corpOrderId = '';
-      this.idQuery.outChangeEnable = row.outChangeEnable;
-      if (row.id !== null && row.id !== undefined && row.id !== '') {
-        this.idQuery.id = row.id;
-        this.idQuery.actDate = row.actDate;
-        this.idQuery.corpOrderId = row.corpOrderId;
-        this.idQuery.billType = row.action;
-        this.idQuery.locStorageCode = row.locStorageCode;
-      }
+    methods: {
+        onReset() {
+            this.$router.push({
+                path: "",
+            });
+            this.filterQuery = {
+                status: 10,
+                page: 1,
+                limit: 10,
+            };
+            this.getList();
+        },
+        onSubmit() {
+            this.loading = true;
+            this.getList();
+        },
+        handleSizeChange(val) {
+            this.filterQuery.limit = val;
+            this.getList();
+        },
+        handleCurrentChange(val) {
+            this.filterQuery.page = val;
+            this.getList();
+        },
+        handleUnitClick(row) {
+            this.curIndex = row.id;
+            this.dialogTableVisible = true;
+        },
+        closeDetailDialog(val) {
+            this.codeDetailVisible = false;
+        },
+        getActionName(action) {
+            for (let i = 0; i < this.busTypes.length; i++) {
+                if (this.busTypes[i].action === action) {
+                    return this.busTypes[i].name;
+                }
+            }
+        },
+        getBusType() {
+            let query = {
+                enabled: true,
+            };
+            getLocalJoinByUser(query)
+                .then((response) => {
+                    this.busTypes = response.data.list || [];
+                    this.filterQuery.billAction = this.busTypes[0].action;
+                    // this.getList();
+                })
+                .catch(() => {
+                });
+        },
+        getStorage() {
+            this.storageList = [];
+            filterAllByUser()
+                .then((response) => {
+                    this.storageList = response.data || [];
+                    if (this.storageList.length > 0) {
+                        this.filterQuery.locStorageCode = this.storageList[0].code;
+                        this.getList();
+                    }
+                })
+                .catch(() => {
+                });
+        },
+        getStorageName(code) {
+            for (let i = 0; i < this.storageList.length; i++) {
+                if (this.storageList[i].code === code) {
+                    return this.storageList[i].name;
+                }
+            }
+        },
+        addOrders(row) {
+            console.log(row)
+            this.idQuery.id = '';
+            this.idQuery.actDate = '';
+            this.idQuery.corpOrderId = '';
+            this.idQuery.outChangeEnable = row.outChangeEnable;
+            if (row.id !== null && row.id !== undefined && row.id !== '') {
+                this.idQuery.id = row.id;
+                this.idQuery.actDate = row.actDate;
+                this.idQuery.corpOrderId = row.corpOrderId;
+                this.idQuery.billType = row.action;
+                this.idQuery.locStorageCode = row.locStorageCode;
+            }
 
-      if (store.getters.customerId == 110) {
-        this.addHosOrderVisible = true;
-        this.idQuery.action = row.action;
-        this.idQuery.fromCorp = row.fromCorp;
-        this.idQuery.fromCorpId = row.fromCorpId;
+            if (store.getters.customerId == 110) {
+                this.addHosOrderVisible = true;
+                this.idQuery.action = row.action;
+                this.idQuery.fromCorp = row.fromCorp;
+                this.idQuery.fromCorpId = row.fromCorpId;
 
-      } else
-        this.addOrderVisible = true;
+            } else
+                this.addOrderVisible = true;
 
 
-    },
-    errOrders() {
-      this.errOrderVisible = true;
-    },
-    closeDialog() {
-      this.addOrderVisible = false;
-      this.addHosOrderVisible = false;
-      this.getList();
-    },
-    getUnitList() {
-      this.loading = true;
-      unitListBykey(this.unitquery)
-          .then((response) => {
-            this.loading = false;
-            this.unitlist = response.data.list || [];
-          })
-          .catch(() => {
-            this.loading = false;
-          });
-    },
-    handleSelectionChange(val) {
-      console.log(val);
-      this.multipleSelection = val;
-    },
-    selectUnit(row) {
-      console.log(row.id);
-      this.unitUpdateQuery.id = this.curIndex;
-      this.unitUpdateQuery.fromCorp = row.name;
-      this.unitUpdateQuery.fromCorpId = row.unitid;
-      updateUnit(this.unitUpdateQuery)
-          .then((response) => {
-            this.dialogTableVisible = false;
+        },
+        errOrders() {
+            this.errOrderVisible = true;
+        },
+        closeDialog() {
+            this.addOrderVisible = false;
+            this.addHosOrderVisible = false;
             this.getList();
-          })
-          .catch(() => {
-            this.dialogTableVisible = false;
-          });
-    },
-    //获取订单列表
-    getList() {
-      this.loading = true;
-      // this.filterQuery.status = -1;
-      this.filterQuery.customerId = store.getters.customerId;
-      // this.filterQuery.status = 1;
-      // this.filterQuery.statusOrOne = -1;
-      orderListError(this.filterQuery)
-          .then((response) => {
-            console.log(response)
-            this.loading = false;
-            this.list = response.data.list || [];
-            this.total = response.data.total || 0;
-          })
-          .catch(() => {
-            this.loading = false;
-            this.list = [];
-            this.total = 0;
-          });
-    },
-    mergesOrders() {
-      let repeatData = this.multipleSelection;
-      if (repeatData.length <= 1) {
-        this.$message.warning("未选择单据！");
-        return;
-      }
-      let orderid = repeatData[0].id;
-      let unit = repeatData[0].fromCorp;
-      let action = repeatData[0].action;
-      let orderList = [];
-      repeatData.forEach((obj, index) => {
-        if (unit !== obj.fromCorp) {
-          this.$message.warning("往来单位不一致！");
-          return;
-        }
-        if (action !== obj.action) {
-          this.$message.warning("业务类型不一致！");
-          return;
-        }
-        orderList.push(obj.id);
-      });
-      let tquery = {
-        orderList: orderList,
-      };
-
-      this.$confirm(
-          "所选择的订单将会合并到订单号为" + orderid + "的订单下",
-          "提示",
-          {
-            confirmButtonText: "确定",
-            cancelButtonText: "取消",
-            type: "warning",
-          }
-      )
-          .then(() => {
-            mergeOrder(tquery).then((response) => {
-              if (response.code === 20000) {
-                this.getList();
-                this.$message({
-                  type: "success",
-                  message: "合并成功",
+        },
+        getUnitList() {
+            this.loading = true;
+            unitListBykey(this.unitquery)
+                .then((response) => {
+                    this.loading = false;
+                    this.unitlist = response.data.list || [];
+                })
+                .catch(() => {
+                    this.loading = false;
                 });
-              } else {
-                this.$message.error(response.message);
-              }
-            });
-          })
-          .catch(() => {
-          });
-    },
-    deleteOrders(data) {
-      this.loading = true;
-      this.deleteData.id = data;
-      deleteByOrderId(this.deleteData)
-          .then((response) => {
-            this.getList();
-            this.$message({
-              type: "success",
-              message: "删除成功！",
+        },
+        handleSelectionChange(val) {
+            console.log(val);
+            this.multipleSelection = val;
+        },
+        selectUnit(row) {
+            console.log(row.id);
+            this.unitUpdateQuery.id = this.curIndex;
+            this.unitUpdateQuery.fromCorp = row.name;
+            this.unitUpdateQuery.fromCorpId = row.unitid;
+            updateUnit(this.unitUpdateQuery)
+                .then((response) => {
+                    this.dialogTableVisible = false;
+                    this.getList();
+                })
+                .catch(() => {
+                    this.dialogTableVisible = false;
+                });
+        },
+        //获取订单列表
+        getList() {
+            this.loading = true;
+            // this.filterQuery.status = -1;
+            this.filterQuery.customerId = store.getters.customerId;
+            // this.filterQuery.status = 1;
+            // this.filterQuery.statusOrOne = -1;
+            filterOrder(this.filterQuery)
+                .then((response) => {
+                    console.log(response)
+                    this.loading = false;
+                    this.list = response.data.list || [];
+                    this.total = response.data.total || 0;
+                })
+                .catch(() => {
+                    this.loading = false;
+                    this.list = [];
+                    this.total = 0;
+                });
+        },
+        mergesOrders() {
+            let repeatData = this.multipleSelection;
+            if (repeatData.length <= 1) {
+                this.$message.warning("未选择单据！");
+                return;
+            }
+            let orderid = repeatData[0].id;
+            let unit = repeatData[0].fromCorp;
+            let action = repeatData[0].action;
+            let orderList = [];
+            repeatData.forEach((obj, index) => {
+                if (unit !== obj.fromCorp) {
+                    this.$message.warning("往来单位不一致！");
+                    return;
+                }
+                if (action !== obj.action) {
+                    this.$message.warning("业务类型不一致！");
+                    return;
+                }
+                orderList.push(obj.id);
             });
-          })
-          .catch(() => {
-          });
-    },
+            let tquery = {
+                orderList: orderList,
+            };
 
-    deleteDialog(rowId) {
-      this.$confirm("此操作将永久删除该订单, 是否继续?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-          .then(() => {
-            this.deleteOrders(rowId);
-          })
-          .catch(() => {
-          });
-    },
+            this.$confirm(
+                "所选择的订单将会合并到订单号为" + orderid + "的订单下",
+                "提示",
+                {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "warning",
+                }
+            )
+                .then(() => {
+                    mergeOrder(tquery).then((response) => {
+                        if (response.code === 20000) {
+                            this.getList();
+                            this.$message({
+                                type: "success",
+                                message: "合并成功",
+                            });
+                        } else {
+                            this.$message.error(response.message);
+                        }
+                    });
+                })
+                .catch(() => {
+                });
+        },
+        deleteOrders(data) {
+            this.loading = true;
+            this.deleteData.id = data;
+            deleteByOrderId(this.deleteData)
+                .then((response) => {
+                    this.getList();
+                    this.$message({
+                        type: "success",
+                        message: "删除成功！",
+                    });
+                })
+                .catch(() => {
+                });
+        },
 
-    onUpload(data) {
-      this.loading = true;
-      var idQuery = {
-        orderId: "",
-      };
-      idQuery.orderId = data;
-      commitOrder(idQuery)
-          .then((response) => {
-            if (response.code == 20000) {
-              this.$message.success(response.data);
-              this.getList();
-            } else {
-              this.$message.error(response.message);
-            }
-          })
-          .catch(() => {
-          });
-    },
+        deleteDialog(rowId) {
+            this.$confirm("此操作将永久删除该订单, 是否继续?", "提示", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning",
+            })
+                .then(() => {
+                    this.deleteOrders(rowId);
+                })
+                .catch(() => {
+                });
+        },
 
-    handleErrorDetail(poistion) {
-      var mOrder = this.list[poistion];
-      var corpOrderId = mOrder.remark;
+        onUpload(data) {
+            this.loading = true;
+            var idQuery = {
+                orderId: "",
+            };
+            idQuery.orderId = data;
+            commitOrder(idQuery)
+                .then((response) => {
+                    if (response.code == 20000) {
+                        this.$message.success(response.data);
+                        this.getList();
+                    } else {
+                        this.$message.error(response.message);
+                    }
+                })
+                .catch(() => {
+                });
+        },
 
-      this.errorDetail = mOrder.remark;
-      console.log(corpOrderId + "  " + mOrder + "  " + mOrder.remark);
-      this.dialogVisible = true;
-    },
+        handleErrorDetail(poistion) {
+            var mOrder = this.list[poistion];
+            var corpOrderId = mOrder.remark;
+
+            this.errorDetail = mOrder.remark;
+            console.log(corpOrderId + "  " + mOrder + "  " + mOrder.remark);
+            this.dialogVisible = true;
+        },
 
-    intentDetail(row) {
-      this.codeDetailVisible = true;
-      this.idQuery.id = row.id;
+        intentDetail(row) {
+            this.codeDetailVisible = true;
+            this.idQuery.id = row.id;
 
+        },
     },
-  },
-  filters: {
-    statusFilterType(status) {
-      const statusMap = {
-        false: "success",
-        true: "warning",
-      };
-      return statusMap[status];
+    filters: {
+        statusFilterType(status) {
+            const statusMap = {
+                false: "success",
+                true: "warning",
+            };
+            return statusMap[status];
+        },
     },
-  },
-  mounted() {
-    document.body.ondrop = function (event) {
-      event.preventDefault();
-      event.stopPropagation();
-    };
-  },
-  created() {
-    this.getStorage();
-    this.getBusType();
-    let query = this.$route.query;
-    this.filterQuery = Object.assign(this.filterQuery, query);
-    this.filterQuery.limit = parseInt(this.filterQuery.limit);
-    this.getList();
+    mounted() {
+        document.body.ondrop = function (event) {
+            event.preventDefault();
+            event.stopPropagation();
+        };
+    },
+    created() {
+        this.getStorage();
+        this.getBusType();
+        let query = this.$route.query;
+        this.filterQuery = Object.assign(this.filterQuery, query);
+        this.filterQuery.limit = parseInt(this.filterQuery.limit);
+
 
-  },
+    },
 };
 </script>
 
diff --git a/src/views/warehouse/IOSearchOrder.vue b/src/views/warehouse/IOSearchOrder.vue
index 01a203f..eaa5550 100644
--- a/src/views/warehouse/IOSearchOrder.vue
+++ b/src/views/warehouse/IOSearchOrder.vue
@@ -610,6 +610,10 @@ export default {
             filterAllByUser()
                 .then((response) => {
                     this.storageList = response.data || [];
+                    if (this.storageList.length > 0) {
+                        this.filterQuery.locStorageCode = this.storageList[0].code;
+                        this.getList();
+                    }
                 })
                 .catch(() => {
                 });
@@ -701,8 +705,9 @@ export default {
                 // window.open(url);
                 this.loading = false;
                 const eleLink = document.createElement('a');
-                var timestamp = formatDate(new Date(), "yyyy-MM-dd_hh:mm")
-                eleLink.download = "已完成单据导出" + timestamp + ".json";
+                var timestamp = formatDate(new Date(), "yyyyMMddhhmmss")
+                // var timestamp = formatDate(new Date(), "yyyy-MM-dd_hh:mm")
+                eleLink.download = "Order_" + timestamp + ".LowerIn";
                 eleLink.style.display = 'none';
                 eleLink.href = url;
                 document.body.appendChild(eleLink)
@@ -960,8 +965,6 @@ export default {
         let query = this.$route.query;
         this.query = Object.assign(this.query, query);
         this.query.limit = parseInt(this.query.limit);
-        // 加载表格数据
-        this.getList();
         let end = new Date();
         let start = new Date();
         start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
diff --git a/src/views/warehouse/IOWaitOrder.vue b/src/views/warehouse/IOWaitOrder.vue
index ef23713..83a9b7c 100644
--- a/src/views/warehouse/IOWaitOrder.vue
+++ b/src/views/warehouse/IOWaitOrder.vue
@@ -969,6 +969,10 @@ export default {
             filterAllByUser()
                 .then((response) => {
                     this.storageList = response.data || [];
+                    if (this.storageList.length > 0) {
+                        this.filterQuery.locStorageCode = this.storageList[0].code;
+                        this.getList();
+                    }
                 })
                 .catch(() => {
                 });
@@ -997,7 +1001,6 @@ export default {
         this.query = Object.assign(this.query, query);
         this.query.limit = parseInt(this.query.limit);
         // 加载表格数据
-        this.getList();
         let end = new Date();
         let start = new Date();
         start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
diff --git a/src/views/warehouse/addOrder.vue b/src/views/warehouse/addOrder.vue
index 1cea6ad..b2cc7f0 100644
--- a/src/views/warehouse/addOrder.vue
+++ b/src/views/warehouse/addOrder.vue
@@ -603,7 +603,7 @@ export default {
         getStorage(event) {
             let query = {
                 // advanceType: this.getActionName(event),
-                isDefault: true,
+                spUse: true,
             };
             this.storageList = [];
             // this.formData.locStorageCode = null;
diff --git a/src/views/warehouse/selectThrOrder.vue b/src/views/warehouse/selectThrOrder.vue
index dbd3ab0..d7fdfcd 100644
--- a/src/views/warehouse/selectThrOrder.vue
+++ b/src/views/warehouse/selectThrOrder.vue
@@ -310,7 +310,8 @@ export default {
             if (this.$isBlank(this.currentRow.id)) {
                 return;
             }
-            if (this.curLocInv == null) {
+            this.curLocInv = this.currentRow.locStorageCode;
+            if (this.$isBlank(this.curLocInv)) {
                 this.storageVisible = true;
             } else {
                 let tQuery = {
diff --git a/src/views/warehouse/stockOrder.vue b/src/views/warehouse/stockOrder.vue
index 5d3cd87..c0daf88 100644
--- a/src/views/warehouse/stockOrder.vue
+++ b/src/views/warehouse/stockOrder.vue
@@ -1,361 +1,361 @@
 <template>
-  <div>
-    <el-card class="el-card">
-      <el-form
-          :inline="true"
-          :model="query"
-          class="query-form"
-          size="mini"
+    <div>
+        <el-card class="el-card">
+            <el-form
+                :inline="true"
+                :model="query"
+                class="query-form"
+                size="mini"
 
-      >
-        <el-row style="width: 100%">
-          <el-form-item class="query-form-item">
-            <el-input v-model="query.billNo" placeholder="单据号" clearable></el-input>
-          </el-form-item>
-          <el-form-item class="query-form-item">
-            <el-select v-model="query.billType" placeholder="请选择业务类型" clearable="true" size="mini">
-              <el-option
-                  v-for="item in busTypes"
-                  :key="item.localName"
-                  :label="item.localName"
-                  :value="item.localAction">
-                <span style="float: left">{{ item.localName }}</span>
-              </el-option>
-            </el-select>
-          </el-form-item>
-
-          <el-form-item class="query-form-item" v-if="isSp ==110">
-            <el-input v-model="query.corpName" placeholder="往来单位" clearable></el-input>
-          </el-form-item>
-          <el-form-item class="query-form-item">
-            <el-select v-model="query.locStorageCode" placeholder="请选择当前仓库" clearable="true" size="mini">
-              <el-option
-                  v-for="item in storageList"
-                  :key="item.name"
-                  :label="item.name"
-                  :value="item.code">
-                <span style="float: left">{{ item.name }}</span>
-              </el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item class="query-form-item">
-            <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-row style="width: 100%">
+                    <el-form-item class="query-form-item">
+                        <el-input v-model="query.billNo" placeholder="单据号" clearable></el-input>
+                    </el-form-item>
+                    <el-form-item class="query-form-item">
+                        <el-select v-model="query.billType" placeholder="请选择业务类型" clearable="true" size="mini">
+                            <el-option
+                                v-for="item in busTypes"
+                                :key="item.localName"
+                                :label="item.localName"
+                                :value="item.localAction">
+                                <span style="float: left">{{ item.localName }}</span>
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
 
-          <!--<el-form-item class="query-form-item">-->
-          <!--<el-select v-model="query.status" placeholder="配货状态">-->
-          <!--&lt;!&ndash;                            <el-option label="未配货" value="201"></el-option>&ndash;&gt;-->
-          <!--<el-option label="已配货" value="202"></el-option>-->
-          <!--<el-option label="新增提交" value="502"></el-option>-->
-          <!--</el-select>-->
-          <!--</el-form-item>-->
+                    <el-form-item class="query-form-item" v-if="isSp ==110">
+                        <el-input v-model="query.corpName" placeholder="往来单位" clearable></el-input>
+                    </el-form-item>
+                    <el-form-item class="query-form-item">
+                        <el-select v-model="query.locStorageCode" placeholder="请选择当前仓库" clearable="true" size="mini">
+                            <el-option
+                                v-for="item in storageList"
+                                :key="item.name"
+                                :label="item.name"
+                                :value="item.code">
+                                <span style="float: left">{{ item.name }}</span>
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item class="query-form-item">
+                        <span style="color: #000; margin-left: 10px; margin-right: 6px">单据日期:</span>
+                        <el-date-picker
+                            :picker-options="pickerOptions"
+                            v-model="actDateRange"
+                            type="daterange"
+                            format="yyyy 年 MM 月 dd 日"
+                            value-format="yyyy-MM-dd"
+                            range-separator="至"
+                            start-placeholder="开始日期"
+                            end-placeholder="结束日期"
+                        >
+                        </el-date-picker>
+                    </el-form-item>
 
-          <el-form-item>
-            <el-button-group>
-              <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
-              <el-button type="primary" icon="search" @click="onSubmit">查询</el-button>
-              <el-button type="primary" icon="search"
-                         v-if="haveDistributionVisible" @click="generateQRCodeText(null, 1)"
-                         :loading="loading">生成码
-              </el-button>
-            </el-button-group>
-          </el-form-item>
+                    <!--<el-form-item class="query-form-item">-->
+                    <!--<el-select v-model="query.status" placeholder="配货状态">-->
+                    <!--&lt;!&ndash;                            <el-option label="未配货" value="201"></el-option>&ndash;&gt;-->
+                    <!--<el-option label="已配货" value="202"></el-option>-->
+                    <!--<el-option label="新增提交" value="502"></el-option>-->
+                    <!--</el-select>-->
+                    <!--</el-form-item>-->
 
-          <el-form-item style="margin: 0 1px 0 auto">
-            <el-button-group>
-              <el-switch
-                  v-if="haveDistributionVisible"
-                  v-model="filterUDIType"
-                  active-text="过滤已有UDI码的产品">
-              </el-switch>
-            </el-button-group>
-          </el-form-item>
-        </el-row>
-      </el-form>
-      <el-table v-loading="loading"
-                :data="list"
-                style="width: 100%;"
-                highlight-current-row
-                @row-click="getStockOrderDetailList" ref="multipleTable">
-        <el-table-column
-            type="selection"
-            width="55">
-        </el-table-column>
-        <el-table-column type="index" label="序号" width="50"></el-table-column>
-        <el-table-column label="单据号" prop="billNo" show-overflow-tooltip></el-table-column>
-        <el-table-column label="往来单位" prop="corpName" show-overflow-tooltip></el-table-column>
-        <el-table-column label="单据来源" prop="sourceType" width="150">
-          <template slot-scope="scope">
-            <span>{{ sourceMap[scope.row.sourceType] }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="单据日期" prop="billdate"></el-table-column>
-        <el-table-column label="单据状态">
-          <template slot-scope="scope">
-            {{ scope.row.status | statusFilterName }}
-          </template>
-        </el-table-column>
-        <el-table-column label="业务类型" prop="billType">
-          <template slot-scope="scope">
-            <span>{{ getActionName(scope.row.billType) }}</span>
-          </template>
-        </el-table-column>
+                    <el-form-item>
+                        <el-button-group>
+                            <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
+                            <el-button type="primary" icon="search" @click="onSubmit">查询</el-button>
+                            <el-button type="primary" icon="search"
+                                       v-if="haveDistributionVisible" @click="generateQRCodeText(null, 1)"
+                                       :loading="loading">生成码
+                            </el-button>
+                        </el-button-group>
+                    </el-form-item>
 
-        <el-table-column label="当前仓库" prop="locStorageCode" width="150">
-          <template slot-scope="scope">
-            <span>{{ getStorageName(scope.row.locStorageCode) }}</span>
-          </template>
-        </el-table-column>
-        <!--                <el-table-column label="采购类型">-->
-        <!--                    <template slot-scope="scope">-->
-        <!--                        {{ scope.row.type | typeFilterName }}-->
-        <!--                    </template>-->
-        <!--                </el-table-column>-->
-        <el-table-column label="操作" fixed="right" width="200">
-          <template slot-scope="scope">
-            <el-button
-                type="text"
-                size="small"
-                @click.native="qrcodeDetail(scope.row)"
-            >内部码详情
-            </el-button
-            >
-            <el-button
-                type="text"
-                size="small"
-                @click.native="printQRCodeText(scope.row)"
-            >标签打印
-            </el-button
-            >
-            <!--                        <el-button-->
-            <!--                            type="text"-->
-            <!--                            size="small"-->
-            <!--                            @click.native="deleteStockOrder(scope.row)"-->
-            <!--                        >删除-->
-            <!--                        </el-button-->
-            <!--                        >-->
-          </template>
-        </el-table-column>
-      </el-table>
+                    <el-form-item style="margin: 0 1px 0 auto">
+                        <el-button-group>
+                            <el-switch
+                                v-if="haveDistributionVisible"
+                                v-model="filterUDIType"
+                                active-text="过滤已有UDI码的产品">
+                            </el-switch>
+                        </el-button-group>
+                    </el-form-item>
+                </el-row>
+            </el-form>
+            <el-table v-loading="loading"
+                      :data="list"
+                      style="width: 100%;"
+                      highlight-current-row
+                      @row-click="getStockOrderDetailList" ref="multipleTable">
+                <el-table-column
+                    type="selection"
+                    width="55">
+                </el-table-column>
+                <el-table-column type="index" label="序号" width="50"></el-table-column>
+                <el-table-column label="单据号" prop="billNo" show-overflow-tooltip></el-table-column>
+                <el-table-column label="往来单位" prop="corpName" show-overflow-tooltip></el-table-column>
+                <el-table-column label="单据来源" prop="sourceType" width="150">
+                    <template slot-scope="scope">
+                        <span>{{ sourceMap[scope.row.sourceType] }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column label="单据日期" prop="billdate"></el-table-column>
+                <el-table-column label="单据状态">
+                    <template slot-scope="scope">
+                        {{ scope.row.status | statusFilterName }}
+                    </template>
+                </el-table-column>
+                <el-table-column label="业务类型" prop="billType">
+                    <template slot-scope="scope">
+                        <span>{{ getActionName(scope.row.billType) }}</span>
+                    </template>
+                </el-table-column>
 
-      <el-pagination
-          :page-size="query.limit"
-          @current-change="handleCurrentChange"
-          layout="prev, pager, next"
-          :total="total"
-      >
-      </el-pagination>
-    </el-card>
+                <el-table-column label="当前仓库" prop="locStorageCode" width="150">
+                    <template slot-scope="scope">
+                        <span>{{ getStorageName(scope.row.locStorageCode) }}</span>
+                    </template>
+                </el-table-column>
+                <!--                <el-table-column label="采购类型">-->
+                <!--                    <template slot-scope="scope">-->
+                <!--                        {{ scope.row.type | typeFilterName }}-->
+                <!--                    </template>-->
+                <!--                </el-table-column>-->
+                <el-table-column label="操作" fixed="right" width="200">
+                    <template slot-scope="scope">
+                        <el-button
+                            type="text"
+                            size="small"
+                            @click.native="qrcodeDetail(scope.row)"
+                        >内部码详情
+                        </el-button
+                        >
+                        <el-button
+                            type="text"
+                            size="small"
+                            @click.native="printQRCodeText(scope.row)"
+                        >标签打印
+                        </el-button
+                        >
+                        <!--                        <el-button-->
+                        <!--                            type="text"-->
+                        <!--                            size="small"-->
+                        <!--                            @click.native="deleteStockOrder(scope.row)"-->
+                        <!--                        >删除-->
+                        <!--                        </el-button-->
+                        <!--                        >-->
+                    </template>
+                </el-table-column>
+            </el-table>
 
-    <el-card class="el-card">
-      <el-table v-loading="detailLoading"
-                :data="detailList"
-                style="width: 100%">
-        <el-table-column type="index" label="序号" width="50"></el-table-column>
-        <el-table-column label="产品通用名" width="150" prop="productName"></el-table-column>
-        <el-table-column label="规格型号" width="150" prop="spec"></el-table-column>
-        <el-table-column label="批次号" width="150" prop="batchNo"></el-table-column>
-        <el-table-column label="生产日期" width="150" prop="productDate"></el-table-column>
-        <el-table-column label="失效日期" width="150" prop="expireDate"></el-table-column>
-        <el-table-column label="实际数量" width="150" prop="reCount"></el-table-column>
-        <el-table-column label="单据数量" width="150" prop="count"></el-table-column>
-        <el-table-column label="价格" width="150" prop="price"></el-table-column>
-        <el-table-column label="生产厂家" width="150" prop="ylqxzcrbarmc"></el-table-column>
-        <el-table-column label="注册/备案凭证号" width="150" prop="zczbhhzbapzbh"></el-table-column>
+            <el-pagination
+                :page-size="query.limit"
+                @current-change="handleCurrentChange"
+                layout="prev, pager, next"
+                :total="total"
+            >
+            </el-pagination>
+        </el-card>
 
-      </el-table>
+        <el-card class="el-card">
+            <el-table v-loading="detailLoading"
+                      :data="detailList"
+                      style="width: 100%">
+                <el-table-column type="index" label="序号" width="50"></el-table-column>
+                <el-table-column label="产品通用名" width="150" prop="productName"></el-table-column>
+                <el-table-column label="规格型号" width="150" prop="spec"></el-table-column>
+                <el-table-column label="批次号" width="150" prop="batchNo"></el-table-column>
+                <el-table-column label="生产日期" width="150" prop="productDate"></el-table-column>
+                <el-table-column label="失效日期" width="150" prop="expireDate"></el-table-column>
+                <el-table-column label="实际数量" width="150" prop="reCount"></el-table-column>
+                <el-table-column label="单据数量" width="150" prop="count"></el-table-column>
+                <el-table-column label="价格" width="150" prop="price"></el-table-column>
+                <el-table-column label="生产厂家" width="150" prop="ylqxzcrbarmc"></el-table-column>
+                <el-table-column label="注册/备案凭证号" width="150" prop="zczbhhzbapzbh"></el-table-column>
 
-      <el-pagination
-          :page-size="detailQuery.limit"
-          @current-change="detailHandleCurrentChange"
-          layout="prev, pager, next"
-          :total="detailTotal"
-      >
-      </el-pagination>
-    </el-card>
+            </el-table>
 
+            <el-pagination
+                :page-size="detailQuery.limit"
+                @current-change="detailHandleCurrentChange"
+                layout="prev, pager, next"
+                :total="detailTotal"
+            >
+            </el-pagination>
+        </el-card>
 
-    <el-dialog
-        title="配货"
-        :visible.sync="distributionVisible"
-        :close-on-click-modal="false"
-        :close-on-press-escape="false"
-        width="60%"
-        v-if="distributionVisible"
-        @close='closeDialog'
-    >
-      <stockOrderDistribution
-          :closeDialog="closeDialog"
-          :idQuery="idQuery"
-      ></stockOrderDistribution>
-    </el-dialog>
 
-    <el-dialog
-        title="编辑"
-        :visible.sync="detailFormVisible"
-        :before-close="hideDetailForm"
-        :close-on-click-modal="false"
-        :close-on-press-escape="false"
-        width="85%"
-        top="5vh"
-    >
-      <el-form :model="detailFormData" :rules="detailFormRules" ref="dataForm">
+        <el-dialog
+            title="配货"
+            :visible.sync="distributionVisible"
+            :close-on-click-modal="false"
+            :close-on-press-escape="false"
+            width="60%"
+            v-if="distributionVisible"
+            @close='closeDialog'
+        >
+            <stockOrderDistribution
+                :closeDialog="closeDialog"
+                :idQuery="idQuery"
+            ></stockOrderDistribution>
+        </el-dialog>
 
-        <el-row :gutter="20">
-          <el-col :span="3">
-            <div class="ao-text">
-              <span>产品通用名：</span>
-            </div>
-          </el-col>
-          <el-col :span="7">
-            <el-form-item prop="productName">
-              <el-input v-model="detailFormData.productName" auto-complete="off"
-                        :disabled="true"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="3">
-            <div class="ao-text">
-              <span>包装规格：</span>
-            </div>
-          </el-col>
-          <el-col :span="7">
-            <el-form-item prop="spec">
-              <el-input v-model="detailFormData.spec" auto-complete="off" :disabled="true"></el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="3">
-            <div class="ao-text">
-              <span>单据数量：</span>
-            </div>
-          </el-col>
-          <el-col :span="7">
-            <el-form-item prop="count">
-              <el-input v-model="detailFormData.count" auto-complete="off" :disabled="true"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="3">
-            <div class="ao-text">
-              <span>实际数量：</span>
-            </div>
-          </el-col>
-          <el-col :span="7">
-            <el-form-item prop="reCount">
-              <el-input v-model="detailFormData.reCount" auto-complete="off" :disabled="true"></el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="3">
-            <div class="ao-text">
-              <span>生产日期：</span>
-            </div>
-          </el-col>
-          <el-col :span="7">
-            <el-form-item prop="productDate">
-              <el-input v-model="detailFormData.productDate" auto-complete="off"
-                        :disabled="false"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="3">
-            <div class="ao-text">
-              <span>失效日期：</span>
-            </div>
-          </el-col>
-          <el-col :span="7">
-            <el-form-item prop="expireDate">
-              <el-input v-model="detailFormData.expireDate" auto-complete="off"
-                        :disabled="false"></el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="3">
-            <div class="ao-text">
-              <span>批次号：</span>
-            </div>
-          </el-col>
-          <el-col :span="7">
-            <el-form-item prop="batchNo">
-              <el-input v-model="detailFormData.batchNo" auto-complete="off" :disabled="false"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="3">
-            <div class="ao-text">
-              <span>扫码数量：</span>
-            </div>
-          </el-col>
-          <el-col :span="7">
-            <el-form-item prop="sweepCount">
-              <el-input v-model="detailFormData.sweepCount" auto-complete="off" :disabled="false"
-                        oninput="value=value.replace(/[^\d]/g,'')"></el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button @click.native="hideDetailForm">取消</el-button>
-        <el-button
-            type="primary"
-            @click.native="submitUploadDetail()"
-            :loading="detailFormLoading"
-        >提交
-        </el-button
+        <el-dialog
+            title="编辑"
+            :visible.sync="detailFormVisible"
+            :before-close="hideDetailForm"
+            :close-on-click-modal="false"
+            :close-on-press-escape="false"
+            width="85%"
+            top="5vh"
         >
-      </div>
-    </el-dialog>
+            <el-form :model="detailFormData" :rules="detailFormRules" ref="dataForm">
+
+                <el-row :gutter="20">
+                    <el-col :span="3">
+                        <div class="ao-text">
+                            <span>产品通用名：</span>
+                        </div>
+                    </el-col>
+                    <el-col :span="7">
+                        <el-form-item prop="productName">
+                            <el-input v-model="detailFormData.productName" auto-complete="off"
+                                      :disabled="true"></el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="3">
+                        <div class="ao-text">
+                            <span>包装规格：</span>
+                        </div>
+                    </el-col>
+                    <el-col :span="7">
+                        <el-form-item prop="spec">
+                            <el-input v-model="detailFormData.spec" auto-complete="off" :disabled="true"></el-input>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-row :gutter="20">
+                    <el-col :span="3">
+                        <div class="ao-text">
+                            <span>单据数量：</span>
+                        </div>
+                    </el-col>
+                    <el-col :span="7">
+                        <el-form-item prop="count">
+                            <el-input v-model="detailFormData.count" auto-complete="off" :disabled="true"></el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="3">
+                        <div class="ao-text">
+                            <span>实际数量：</span>
+                        </div>
+                    </el-col>
+                    <el-col :span="7">
+                        <el-form-item prop="reCount">
+                            <el-input v-model="detailFormData.reCount" auto-complete="off" :disabled="true"></el-input>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-row :gutter="20">
+                    <el-col :span="3">
+                        <div class="ao-text">
+                            <span>生产日期：</span>
+                        </div>
+                    </el-col>
+                    <el-col :span="7">
+                        <el-form-item prop="productDate">
+                            <el-input v-model="detailFormData.productDate" auto-complete="off"
+                                      :disabled="false"></el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="3">
+                        <div class="ao-text">
+                            <span>失效日期：</span>
+                        </div>
+                    </el-col>
+                    <el-col :span="7">
+                        <el-form-item prop="expireDate">
+                            <el-input v-model="detailFormData.expireDate" auto-complete="off"
+                                      :disabled="false"></el-input>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-row :gutter="20">
+                    <el-col :span="3">
+                        <div class="ao-text">
+                            <span>批次号：</span>
+                        </div>
+                    </el-col>
+                    <el-col :span="7">
+                        <el-form-item prop="batchNo">
+                            <el-input v-model="detailFormData.batchNo" auto-complete="off" :disabled="false"></el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="3">
+                        <div class="ao-text">
+                            <span>扫码数量：</span>
+                        </div>
+                    </el-col>
+                    <el-col :span="7">
+                        <el-form-item prop="sweepCount">
+                            <el-input v-model="detailFormData.sweepCount" auto-complete="off" :disabled="false"
+                                      oninput="value=value.replace(/[^\d]/g,'')"></el-input>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+            </el-form>
+            <div slot="footer" class="dialog-footer">
+                <el-button @click.native="hideDetailForm">取消</el-button>
+                <el-button
+                    type="primary"
+                    @click.native="submitUploadDetail()"
+                    :loading="detailFormLoading"
+                >提交
+                </el-button
+                >
+            </div>
+        </el-dialog>
 
-    <el-dialog
-        title="码详情"
-        :visible.sync="qrcodeDetailVisible"
-        :close-on-click-modal="false"
-        :close-on-press-escape="false"
-        width="70%"
-        v-if="qrcodeDetailVisible"
-        @close='closeQRCodeDetailDialog'
-    >
-      <stockOrderQRCodeDetail
-          :closeDialog="closeQRCodeDetailDialog"
-          :idQuery="idQuery"
-      ></stockOrderQRCodeDetail>
-    </el-dialog>
+        <el-dialog
+            title="码详情"
+            :visible.sync="qrcodeDetailVisible"
+            :close-on-click-modal="false"
+            :close-on-press-escape="false"
+            width="70%"
+            v-if="qrcodeDetailVisible"
+            @close='closeQRCodeDetailDialog'
+        >
+            <stockOrderQRCodeDetail
+                :closeDialog="closeQRCodeDetailDialog"
+                :idQuery="idQuery"
+            ></stockOrderQRCodeDetail>
+        </el-dialog>
 
-    <el-dialog
-        title="标签打印"
-        :visible.sync="qrcodeExportVisible"
-        width="80%"
-        :close-on-click-modal="false"
-        :close-on-press-escape="false"
-        v-if="qrcodeExportVisible"
-        @close='closeQRCodeExportDialog'
-    >
-      <stockQRCodeExport
-          :closeDialog="closeQRCodeExportDialog"
-          :idQuery="idQuery"
-      ></stockQRCodeExport>
-    </el-dialog>
-  </div>
+        <el-dialog
+            title="标签打印"
+            :visible.sync="qrcodeExportVisible"
+            width="80%"
+            :close-on-click-modal="false"
+            :close-on-press-escape="false"
+            v-if="qrcodeExportVisible"
+            @close='closeQRCodeExportDialog'
+        >
+            <stockQRCodeExport
+                :closeDialog="closeQRCodeExportDialog"
+                :idQuery="idQuery"
+            ></stockQRCodeExport>
+        </el-dialog>
+    </div>
 </template>
 
 <script>
 import {
-  stockOrderList, stockOrderDetail,
-  deleteStockOrderById, deleteStockOrderDetailById,
-  copyStockOrderDetail, submitStockOrder,
-  uploadStockOrderDetail, uploadStockOrderDetailCount,
-  generateStockOrderQRCodeText
+    stockOrderList, stockOrderDetail,
+    deleteStockOrderById, deleteStockOrderDetailById,
+    copyStockOrderDetail, submitStockOrder,
+    uploadStockOrderDetail, uploadStockOrderDetailCount,
+    generateStockOrderQRCodeText
 } from "../../api/warehouse/stockOrder";
 import {BASE_URL} from "../../config/app";
 import stockOrderDistribution from "./stockOrderDistribution";
@@ -370,473 +370,476 @@ import {getLocalJoinBusType, getLocalJoinByUser} from "../../api/basic/busLocalT
 import {filterAll, filterAllByUser} from "@/api/basic/invWarehouse";
 
 export default {
-  name: "stockOrder",
-  data() {
-    return {
-      query: {
-        billType: null,
-        corpName: null,
-        locStorageCode: null,
-        billNo: "",
-        status: "3",
-        page: 1,
-        limit: 10,
-        startTime: "",
-        endTime: "",
-      },
-      detailQuery: {
-        orderIdFk: "",
-        page: 1,
-        limit: 20
-      },
-      isSp: store.getters.customerId,
-      storageList: [],
-      busTypes: [],
-      list: [],
-      detailList: [],
-      total: 0,
-      detailTotal: 0,
-      loading: false,
-      detailLoading: false,
-      sourceMap: {
-        "1": "web端新增单据",
-        "2": "第三方系统",
-        "3": "扫码单据转换",
-      },
-      idQuery: {
-        id: "",
-        filterUDIType: null,
-      },
-      distributionVisible: false,
-      detailFormRules: {
-        batchNo: [
-          {required: true, message: "请输入批次号", trigger: "blur"}
-        ],
-        productDate: [
-          {required: true, message: "请输入生产日期", trigger: "blur"}
-        ],
-        expireDate: [
-          {required: true, message: "请输入失效日期", trigger: "blur"}
-        ],
-        sweepCount: [
-          {required: true, message: "请输入扫码数量", trigger: "blur"}
-        ]
-      },
-      detailFormVisible: false,
-      detailFormData: {},
-      detailFormLoading: false,
-      haveDistributionVisible: true,
-      qrcodeDetailVisible: false,
-      qrcodeExportVisible: false,
-      filterUDIType: true,
-      actDateRange: [],
-      pickerOptions: {
-        shortcuts: [
-          {
-            text: "最近一周",
-            onClick(picker) {
-              const end = new Date();
-              const start = new Date();
-              start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
-              picker.$emit("pick", [start, end]);
+    name: "stockOrder",
+    data() {
+        return {
+            query: {
+                billType: null,
+                corpName: null,
+                locStorageCode: null,
+                billNo: "",
+                status: "3",
+                page: 1,
+                limit: 10,
+                startTime: "",
+                endTime: "",
             },
-          },
-          {
-            text: "最近一个月",
-            onClick(picker) {
-              const end = new Date();
-              const start = new Date();
-              start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
-              picker.$emit("pick", [start, end]);
+            detailQuery: {
+                orderIdFk: "",
+                page: 1,
+                limit: 20
             },
-          },
-          {
-            text: "最近三个月",
-            onClick(picker) {
-              const end = new Date();
-              const start = new Date();
-              start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
-              picker.$emit("pick", [start, end]);
+            isSp: store.getters.customerId,
+            storageList: [],
+            busTypes: [],
+            list: [],
+            detailList: [],
+            total: 0,
+            detailTotal: 0,
+            loading: false,
+            detailLoading: false,
+            sourceMap: {
+                "1": "web端新增单据",
+                "2": "第三方系统",
+                "3": "扫码单据转换",
+            },
+            idQuery: {
+                id: "",
+                filterUDIType: null,
+            },
+            distributionVisible: false,
+            detailFormRules: {
+                batchNo: [
+                    {required: true, message: "请输入批次号", trigger: "blur"}
+                ],
+                productDate: [
+                    {required: true, message: "请输入生产日期", trigger: "blur"}
+                ],
+                expireDate: [
+                    {required: true, message: "请输入失效日期", trigger: "blur"}
+                ],
+                sweepCount: [
+                    {required: true, message: "请输入扫码数量", trigger: "blur"}
+                ]
+            },
+            detailFormVisible: false,
+            detailFormData: {},
+            detailFormLoading: false,
+            haveDistributionVisible: true,
+            qrcodeDetailVisible: false,
+            qrcodeExportVisible: false,
+            filterUDIType: true,
+            actDateRange: [],
+            pickerOptions: {
+                shortcuts: [
+                    {
+                        text: "最近一周",
+                        onClick(picker) {
+                            const end = new Date();
+                            const start = new Date();
+                            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+                            picker.$emit("pick", [start, end]);
+                        },
+                    },
+                    {
+                        text: "最近一个月",
+                        onClick(picker) {
+                            const end = new Date();
+                            const start = new Date();
+                            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+                            picker.$emit("pick", [start, end]);
+                        },
+                    },
+                    {
+                        text: "最近三个月",
+                        onClick(picker) {
+                            const end = new Date();
+                            const start = new Date();
+                            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+                            picker.$emit("pick", [start, end]);
+                        },
+                    },
+                ],
             },
-          },
-        ],
-      },
-    }
-  },
-  methods: {
-    onReset() {
-      this.$router.push({
-        path: ""
-      });
-      this.query = {
-        billNo: "",
-        status: "3",
-        page: 1,
-        limit: 10,
-        startTime: "",
-        endTime: "",
-      };
-      this.getList();
-
-      this.haveDistributionVisible = true;
-      this.actDateRange = [];
-    },
-    onSubmit() {
-      this.getList();
-      if (this.query.status === "202" || this.query.status === "502") {
-        this.haveDistributionVisible = true;
-      } else {
-        this.haveDistributionVisible = false;
-      }
-    },
-    handleCurrentChange(val) {
-      this.query.page = val;
-      this.getList();
-    },
-    detailHandleCurrentChange(val) {
-      this.query.page = val;
-      this.getStockOrderDetailList();
-    },
-    // 刷新表单
-    resetForm() {
-      if (this.$refs["dataForm"]) {
-        // 清空验证信息表单
-        this.$refs["dataForm"].clearValidate();
-        // 刷新表单
-        this.$refs["dataForm"].resetFields();
-        this.getList();
-      }
-    },
-    getList() {
-      this.loading = true;
-      this.query.corpId = store.getters.customerId;
-      stockOrderList(this.query)
-          .then(response => {
-            this.loading = false;
-            this.list = response.data.list || [];
-            this.total = response.data.total || 0;
-            this.detailList = [];
-          })
-          .catch(() => {
-            this.loading = false;
-            this.list = [];
-            this.detailList = [];
-            this.total = 0;
-          });
-    },
-    distributionForm(index, row) {
-      this.idQuery.id = '';
-      if (this.$isNotBlank(row.id)) {
-        this.idQuery.id = row.id;
-        this.idQuery.formData = row;
-        this.distributionVisible = true;
-      }
-    },
-    closeDialog(type) {
-      this.distributionVisible = false;
-      this.getList();
-      if (this.$isNotBlank(type)) {
-        this.detailList = [];
-      }
-    },
-    printQRCodeText(row) {
-      this.idQuery.id = '';
-      if (this.$isNotBlank(row.id)) {
-        this.idQuery.id = row.id;
-        this.idQuery.formData = row;
-        this.qrcodeExportVisible = true;
-      }
-    },
-    printOrder(row) {
-      let tQuery = {queryId: row.id,}
-      this.loading = true;
-      inspectionStockOrderPDFFromTemplateFile(tQuery).then((response) => {
-        if (response.code === 20000) {
-          tQuery = {
-            id: row.id,
-          }
-          stockOrderPDFFromTemplateFile(tQuery).then((response) => {
-            //将pdf文件转换为url。
-            const binaryData = [];
-            binaryData.push(response);
-            //获取blob链接。
-            let url = window.URL.createObjectURL(
-                new Blob(binaryData, {type: "application/pdf"})
-            );
-            this.loading = false;
-            window.open(url);//打开新标签页，预览pdf。
-          }).catch(() => {
-            this.loading = false;
-          });
-        } else {
-          this.loading = false;
-          this.$message.error(response.message);
         }
-      }).catch(() => {
-        this.loading = false;
-      });
-    },
-    closeQRCodeExportDialog() {
-      this.qrcodeExportVisible = false;
-      this.getList();
-    },
-    qrcodeDetail(row) {
-      this.idQuery.id = '';
-      if (this.$isNotBlank(row.id)) {
-        this.idQuery.id = row.id;
-        this.idQuery.formData = row;
-        this.idQuery.filterUDIType = this.filterUDIType;
-        this.qrcodeDetailVisible = true;
-      }
-    },
-    closeQRCodeDetailDialog() {
-      this.qrcodeDetailVisible = false;
-      this.getList();
-    },
-    getStockOrderDetailList(row) {
-      if (this.$isNotBlank(row)) {
-        this.detailQuery.orderIdFk = row.id;
-      }
-      this.detailLoading = true;
-      stockOrderDetail(this.detailQuery)
-          .then((response) => {
-            console.log(response)
-            this.detailLoading = false;
-            this.detailList = response.data.list || [];
-          })
-          .catch(() => {
-            this.detailLoading = false;
-            this.detailList = [];
-          });
-    },
-    deleteStockOrder(row) {
-      this.$confirm("此操作将永久删除该订单, 是否继续?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      }).then(() => {
-        this.loading = true;
-        deleteStockOrderById({id: row.id})
-            .then(response => {
-              this.loading = false;
-              if (response.code === 20000) {
-                this.$message.success(response.data);
-                this.getList();
-                this.detailList = [];
-              } else {
-                this.$message.error(response.message);
-              }
-            })
-            .catch(() => {
-              this.loading = false;
-            })
-      }).catch(() => {
-
-      });
     },
-    copyDetail(row) {
-      this.$confirm("是否复制该记录?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      }).then(() => {
-        let tQuery = {
-          id: row.id
-        }
-        this.detailLoading = true;
-        copyStockOrderDetail(tQuery)
-            .then((response) => {
-              this.detailLoading = false;
-              if (response.code === 20000) {
-                this.$message.success("复制成功");
-                this.getStockOrderDetailList();
-              } else {
-                this.$message.error(response.message);
-              }
+    methods: {
+        onReset() {
+            this.$router.push({
+                path: ""
             });
-      }).catch(() => {
-      });
-    },
-    deleteStockOrderDetail(row) {
-      this.$confirm("此操作将永久删除该数据, 是否继续?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      }).then(() => {
-        this.detailLoading = true;
-        deleteStockOrderDetailById({id: row.id})
-            .then(response => {
-              this.detailLoading = false;
-              if (response.code === 20000) {
-                this.$message.success(response.data);
-                this.getStockOrderDetailList();
-              } else {
-                this.$message.error(response.message);
-              }
-            })
-            .catch(() => {
-              this.detailLoading = false;
-            })
-      }).catch(() => {
+            this.query = {
+                billNo: "",
+                status: "3",
+                page: 1,
+                limit: 10,
+                startTime: "",
+                endTime: "",
+            };
+            this.getList();
 
-      });
-    },
-    generateQRCodeText(row, type) {
-      let ids = [];
-      if (type === 1) {
-        let selection = this.$refs.multipleTable.selection;
-        if (selection.length < 1) {
-          this.$message.error('请选择需要生成内部码单据！');
-          return;
-        }
-        selection.forEach((obj, index) => {
-          ids.push(obj.id);
-        });
-      } else {
-        ids = [row.id];
-      }
-      this.$confirm("确定生成内部码?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      }).then(() => {
-        let tQuery = {};
-        tQuery.ids = ids;
-        tQuery.filterUDIType = this.filterUDIType;
-        this.loading = true;
-        generateStockOrderQRCodeText(tQuery)
-            .then(response => {
-              this.loading = false;
-              if (response.code === 20000) {
-                this.$message.success(response.data);
+            this.haveDistributionVisible = true;
+            this.actDateRange = [];
+        },
+        onSubmit() {
+            this.getList();
+            if (this.query.status === "202" || this.query.status === "502") {
+                this.haveDistributionVisible = true;
+            } else {
+                this.haveDistributionVisible = false;
+            }
+        },
+        handleCurrentChange(val) {
+            this.query.page = val;
+            this.getList();
+        },
+        detailHandleCurrentChange(val) {
+            this.query.page = val;
+            this.getStockOrderDetailList();
+        },
+        // 刷新表单
+        resetForm() {
+            if (this.$refs["dataForm"]) {
+                // 清空验证信息表单
+                this.$refs["dataForm"].clearValidate();
+                // 刷新表单
+                this.$refs["dataForm"].resetFields();
                 this.getList();
+            }
+        },
+        getList() {
+            this.loading = true;
+            this.query.corpId = store.getters.customerId;
+            stockOrderList(this.query)
+                .then(response => {
+                    this.loading = false;
+                    this.list = response.data.list || [];
+                    this.total = response.data.total || 0;
+                    this.detailList = [];
+                })
+                .catch(() => {
+                    this.loading = false;
+                    this.list = [];
+                    this.detailList = [];
+                    this.total = 0;
+                });
+        },
+        distributionForm(index, row) {
+            this.idQuery.id = '';
+            if (this.$isNotBlank(row.id)) {
+                this.idQuery.id = row.id;
+                this.idQuery.formData = row;
+                this.distributionVisible = true;
+            }
+        },
+        closeDialog(type) {
+            this.distributionVisible = false;
+            this.getList();
+            if (this.$isNotBlank(type)) {
                 this.detailList = [];
-              } else {
-                this.$message.error(response.message);
-              }
-            })
-            .catch(() => {
-              this.loading = false;
-            })
-      }).catch(() => {
+            }
+        },
+        printQRCodeText(row) {
+            this.idQuery.id = '';
+            if (this.$isNotBlank(row.id)) {
+                this.idQuery.id = row.id;
+                this.idQuery.formData = row;
+                this.qrcodeExportVisible = true;
+            }
+        },
+        printOrder(row) {
+            let tQuery = {queryId: row.id,}
+            this.loading = true;
+            inspectionStockOrderPDFFromTemplateFile(tQuery).then((response) => {
+                if (response.code === 20000) {
+                    tQuery = {
+                        id: row.id,
+                    }
+                    stockOrderPDFFromTemplateFile(tQuery).then((response) => {
+                        //将pdf文件转换为url。
+                        const binaryData = [];
+                        binaryData.push(response);
+                        //获取blob链接。
+                        let url = window.URL.createObjectURL(
+                            new Blob(binaryData, {type: "application/pdf"})
+                        );
+                        this.loading = false;
+                        window.open(url);//打开新标签页，预览pdf。
+                    }).catch(() => {
+                        this.loading = false;
+                    });
+                } else {
+                    this.loading = false;
+                    this.$message.error(response.message);
+                }
+            }).catch(() => {
+                this.loading = false;
+            });
+        },
+        closeQRCodeExportDialog() {
+            this.qrcodeExportVisible = false;
+            this.getList();
+        },
+        qrcodeDetail(row) {
+            this.idQuery.id = '';
+            if (this.$isNotBlank(row.id)) {
+                this.idQuery.id = row.id;
+                this.idQuery.formData = row;
+                this.idQuery.filterUDIType = this.filterUDIType;
+                this.qrcodeDetailVisible = true;
+            }
+        },
+        closeQRCodeDetailDialog() {
+            this.qrcodeDetailVisible = false;
+            this.getList();
+        },
+        getStockOrderDetailList(row) {
+            if (this.$isNotBlank(row)) {
+                this.detailQuery.orderIdFk = row.id;
+            }
+            this.detailLoading = true;
+            stockOrderDetail(this.detailQuery)
+                .then((response) => {
+                    console.log(response)
+                    this.detailLoading = false;
+                    this.detailList = response.data.list || [];
+                })
+                .catch(() => {
+                    this.detailLoading = false;
+                    this.detailList = [];
+                });
+        },
+        deleteStockOrder(row) {
+            this.$confirm("此操作将永久删除该订单, 是否继续?", "提示", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning",
+            }).then(() => {
+                this.loading = true;
+                deleteStockOrderById({id: row.id})
+                    .then(response => {
+                        this.loading = false;
+                        if (response.code === 20000) {
+                            this.$message.success(response.data);
+                            this.getList();
+                            this.detailList = [];
+                        } else {
+                            this.$message.error(response.message);
+                        }
+                    })
+                    .catch(() => {
+                        this.loading = false;
+                    })
+            }).catch(() => {
 
-      });
-    },
-    // 显示表单
-    handleDetailForm(index, row) {
-      this.detailFormVisible = true;
-      this.detailFormData = {};
-      if (row !== null) {
-        this.detailFormData = Object.assign({}, row);
-      }
-    },
-    hideDetailForm() {
-      // 更改值
-      this.detailFormVisible = !this.detailFormVisible;
-      return true;
-    },
-    getActionName(action) {
-      for (let i = 0; i < this.busTypes.length; i++) {
-        if (this.busTypes[i].localAction === action) {
-          return this.busTypes[i].localName;
-        }
-      }
-    },
-    getBusType() {
-      let query = {
-        enabled: true,
-      };
-      getLocalJoinByUser(query)
-          .then((response) => {
-            this.busTypes = response.data.list || [];
-            this.filterQuery.billAction = this.busTypes[0].action;
-            // this.getList();
-          })
-          .catch(() => {
-          });
-    },
-    getStorageName(code) {
-      for (let i = 0; i < this.storageList.length; i++) {
-        if (this.storageList[i].code === code) {
-          return this.storageList[i].name;
-        }
-      }
-    },
-    getStorage() {
-      this.storageList = [];
-      filterAllByUser()
-          .then((response) => {
-            this.storageList = response.data || [];
-          })
-          .catch(() => {
-          });
-    },
-    submitUploadDetail() {
-      this.$refs["dataForm"].validate(valid => {
-        if (valid) {
-          this.detailLoading = true;
-          let tQuery = this.detailFormData;
-          uploadStockOrderDetail(tQuery).then((response) => {
-            this.detailLoading = false;
-            if (response.code === 20000) {
-              this.$message.success("修改完成");
-              this.hideDetailForm();
-              this.getStockOrderDetailList();
+            });
+        },
+        copyDetail(row) {
+            this.$confirm("是否复制该记录?", "提示", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning",
+            }).then(() => {
+                let tQuery = {
+                    id: row.id
+                }
+                this.detailLoading = true;
+                copyStockOrderDetail(tQuery)
+                    .then((response) => {
+                        this.detailLoading = false;
+                        if (response.code === 20000) {
+                            this.$message.success("复制成功");
+                            this.getStockOrderDetailList();
+                        } else {
+                            this.$message.error(response.message);
+                        }
+                    });
+            }).catch(() => {
+            });
+        },
+        deleteStockOrderDetail(row) {
+            this.$confirm("此操作将永久删除该数据, 是否继续?", "提示", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning",
+            }).then(() => {
+                this.detailLoading = true;
+                deleteStockOrderDetailById({id: row.id})
+                    .then(response => {
+                        this.detailLoading = false;
+                        if (response.code === 20000) {
+                            this.$message.success(response.data);
+                            this.getStockOrderDetailList();
+                        } else {
+                            this.$message.error(response.message);
+                        }
+                    })
+                    .catch(() => {
+                        this.detailLoading = false;
+                    })
+            }).catch(() => {
+
+            });
+        },
+        generateQRCodeText(row, type) {
+            let ids = [];
+            if (type === 1) {
+                let selection = this.$refs.multipleTable.selection;
+                if (selection.length < 1) {
+                    this.$message.error('请选择需要生成内部码单据！');
+                    return;
+                }
+                selection.forEach((obj, index) => {
+                    ids.push(obj.id);
+                });
             } else {
-              this.$alert(response.message, '提示', {
-                confirmButtonText: '确定',
-                type: 'warning',
-                closeOnClickModal: true,
-                callback: action => {
-                  this.$refs.inputRef.focus();
+                ids = [row.id];
+            }
+            this.$confirm("确定生成内部码?", "提示", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning",
+            }).then(() => {
+                let tQuery = {};
+                tQuery.ids = ids;
+                tQuery.filterUDIType = this.filterUDIType;
+                this.loading = true;
+                generateStockOrderQRCodeText(tQuery)
+                    .then(response => {
+                        this.loading = false;
+                        if (response.code === 20000) {
+                            this.$message.success(response.data);
+                            this.getList();
+                            this.detailList = [];
+                        } else {
+                            this.$message.error(response.message);
+                        }
+                    })
+                    .catch(() => {
+                        this.loading = false;
+                    })
+            }).catch(() => {
+
+            });
+        },
+        // 显示表单
+        handleDetailForm(index, row) {
+            this.detailFormVisible = true;
+            this.detailFormData = {};
+            if (row !== null) {
+                this.detailFormData = Object.assign({}, row);
+            }
+        },
+        hideDetailForm() {
+            // 更改值
+            this.detailFormVisible = !this.detailFormVisible;
+            return true;
+        },
+        getActionName(action) {
+            for (let i = 0; i < this.busTypes.length; i++) {
+                if (this.busTypes[i].localAction === action) {
+                    return this.busTypes[i].localName;
+                }
+            }
+        },
+        getBusType() {
+            let query = {
+                enabled: true,
+            };
+            getLocalJoinByUser(query)
+                .then((response) => {
+                    this.busTypes = response.data.list || [];
+                    this.filterQuery.billAction = this.busTypes[0].action;
+                    // this.getList();
+                })
+                .catch(() => {
+                });
+        },
+        getStorageName(code) {
+            for (let i = 0; i < this.storageList.length; i++) {
+                if (this.storageList[i].code === code) {
+                    return this.storageList[i].name;
                 }
-              });
             }
-          });
+        },
+        getStorage() {
+            this.storageList = [];
+            filterAllByUser()
+                .then((response) => {
+                    this.storageList = response.data || [];
+                    if (this.storageList.length > 0) {
+                        this.query.locStorageCode = this.storageList[0].code;
+                        this.getList();
+                    }
+                })
+                .catch(() => {
+                });
+        },
+        submitUploadDetail() {
+            this.$refs["dataForm"].validate(valid => {
+                if (valid) {
+                    this.detailLoading = true;
+                    let tQuery = this.detailFormData;
+                    uploadStockOrderDetail(tQuery).then((response) => {
+                        this.detailLoading = false;
+                        if (response.code === 20000) {
+                            this.$message.success("修改完成");
+                            this.hideDetailForm();
+                            this.getStockOrderDetailList();
+                        } else {
+                            this.$alert(response.message, '提示', {
+                                confirmButtonText: '确定',
+                                type: 'warning',
+                                closeOnClickModal: true,
+                                callback: action => {
+                                    this.$refs.inputRef.focus();
+                                }
+                            });
+                        }
+                    });
+                }
+            });
         }
-      });
-    }
-  },
-  components: {
-    draggable,
-    stockOrderDistribution,
-    stockOrderQRCodeDetail,
-    stockQRCodeExport,
-  },
-  filters: {
-    statusFilterType(status) {
-      const statusMap = {
-        0: "gray",
-        1: "success"
-      };
-      return statusMap[status];
     },
-    statusFilterName(status) {
-      const statusMap = {
-        "1": "草稿",
-        "2": "未配货",
-        "3": "待校验",
-      };
-      return statusMap[status];
+    components: {
+        draggable,
+        stockOrderDistribution,
+        stockOrderQRCodeDetail,
+        stockQRCodeExport,
+    },
+    filters: {
+        statusFilterType(status) {
+            const statusMap = {
+                0: "gray",
+                1: "success"
+            };
+            return statusMap[status];
+        },
+        statusFilterName(status) {
+            const statusMap = {
+                "1": "草稿",
+                "2": "未配货",
+                "3": "待校验",
+            };
+            return statusMap[status];
+        },
+        typeFilterName(type) {
+            const typeMap = {
+                1: "预入库",
+                2: "普通采购",
+            };
+            return typeMap[type];
+        }
     },
-    typeFilterName(type) {
-      const typeMap = {
-        1: "预入库",
-        2: "普通采购",
-      };
-      return typeMap[type];
+    created() {
+        // 加载表格数据
+        this.getStorage();
+        this.getBusType();
+        let end = new Date();
+        let start = new Date();
+        start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+        this.actDateRange = [start, end];
     }
-  },
-  created() {
-    // 加载表格数据
-    this.getStorage();
-    this.getBusType();
-    let end = new Date();
-    let start = new Date();
-    start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
-    this.actDateRange = [start, end];
-    this.getList();
-  }
 }
 </script>
 
diff --git a/src/views/warehouse/stockOrderDelSearch.vue b/src/views/warehouse/stockOrderDelSearch.vue
index 3d7e4a7..808049a 100644
--- a/src/views/warehouse/stockOrderDelSearch.vue
+++ b/src/views/warehouse/stockOrderDelSearch.vue
@@ -131,13 +131,13 @@
                         >发票
                         </el-button
                         >
-                        <el-button
-                            type="text"
-                            size="small"
-                            @click.native="generOrder(scope.row)"
-                        >生成单据
-                        </el-button
-                        >
+<!--                        <el-button-->
+<!--                            type="text"-->
+<!--                            size="small"-->
+<!--                            @click.native="generOrder(scope.row)"-->
+<!--                        >复制-->
+<!--                        </el-button-->
+<!--                        >-->
 
 
                         <!--                           v-if="haveDistributionVisible"-->
@@ -834,6 +834,10 @@ export default {
             filterAllByUser()
                 .then((response) => {
                     this.storageList = response.data || [];
+                    if (this.storageList.length > 0) {
+                        this.query.locStorageCode = this.storageList[0].code;
+                        this.getList();
+                    }
                 })
                 .catch(() => {
                 });
@@ -902,7 +906,7 @@ export default {
         let start = new Date();
         start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
         this.actDateRange = [start, end];
-        this.getList();
+
     }
 }
 </script>
diff --git a/src/views/warehouse/stockOrderEditor.vue b/src/views/warehouse/stockOrderEditor.vue
index b637a43..695a7f0 100644
--- a/src/views/warehouse/stockOrderEditor.vue
+++ b/src/views/warehouse/stockOrderEditor.vue
@@ -917,6 +917,9 @@ export default {
             filterAllByUser()
                 .then((response) => {
                     this.storageList = response.data || [];
+                    if (this.storageList.length > 0) {
+                        this.query.locStorageCode = this.storageList[0].code;
+                    }
                 })
                 .catch(() => {
                 });
diff --git a/src/views/warehouse/stockOrderNew.vue b/src/views/warehouse/stockOrderNew.vue
index b05b8d3..9ee80d9 100644
--- a/src/views/warehouse/stockOrderNew.vue
+++ b/src/views/warehouse/stockOrderNew.vue
@@ -895,6 +895,10 @@ export default {
             filterAllByUser()
                 .then((response) => {
                     this.storageList = response.data || [];
+                    if (this.storageList.length > 0) {
+                        this.query.locStorageCode = this.storageList[0].code;
+                        this.getList();
+                    }
                 })
                 .catch(() => {
                 });
@@ -935,7 +939,7 @@ export default {
         let start = new Date();
         start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
         this.actDateRange = [start, end];
-        this.getList();
+
     }
 }
 </script>
diff --git a/src/views/warehouse/stockOrderNewDistribution.vue b/src/views/warehouse/stockOrderNewDistribution.vue
index 331e779..930d209 100644
--- a/src/views/warehouse/stockOrderNewDistribution.vue
+++ b/src/views/warehouse/stockOrderNewDistribution.vue
@@ -1098,7 +1098,7 @@ export default {
             console.log("-----" + event);
             let query = {
                 advanceType: this.getActionName(event),
-                isDefault: true,
+                spUse: true,
             };
             this.storageList = [];
             filterAll(query)
diff --git a/src/views/warehouse/stockOrderNewSelectProduct.vue b/src/views/warehouse/stockOrderNewSelectProduct.vue
index 1076f76..abdcabb 100644
--- a/src/views/warehouse/stockOrderNewSelectProduct.vue
+++ b/src/views/warehouse/stockOrderNewSelectProduct.vue
@@ -325,7 +325,10 @@ export default {
         if (this.$isNotBlank(this.data)) {
             console.log(this.data.stockOrderLists);
             this.listQuery.nameCode = this.data.udi;
-            this.listQuery.billType = this.data.formData.billType;
+            if (this.data.billType != null) {
+                this.listQuery.billType = this.data.billType;
+            } else
+                this.listQuery.billType = this.data.formData.billType;
             this.listQuery.corpId = this.data.formData.corpId;
             this.orderEditor = this.data.orderEditor;
             this.orderId = this.data.orderId;
diff --git a/src/views/warehouse/stockOrderSearch.vue b/src/views/warehouse/stockOrderSearch.vue
index cf12364..fffc630 100644
--- a/src/views/warehouse/stockOrderSearch.vue
+++ b/src/views/warehouse/stockOrderSearch.vue
@@ -935,6 +935,10 @@ export default {
       filterAllByUser()
           .then((response) => {
             this.storageList = response.data || [];
+              if (this.storageList.length > 0) {
+                  this.query.locStorageCode = this.storageList[0].code;
+                  this.getList();
+              }
           })
           .catch(() => {
           });
@@ -1010,7 +1014,6 @@ export default {
     let start = new Date();
     start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
     this.actDateRange = [start, end];
-    this.getList();
   }
 }
 </script>
diff --git a/src/views/warehouse/stockOrderWaitCheck.vue b/src/views/warehouse/stockOrderWaitCheck.vue
index 38ac341..74a6c7b 100644
--- a/src/views/warehouse/stockOrderWaitCheck.vue
+++ b/src/views/warehouse/stockOrderWaitCheck.vue
@@ -754,6 +754,10 @@ export default {
             filterAllByUser()
                 .then((response) => {
                     this.storageList = response.data || [];
+                    if (this.storageList.length > 0) {
+                        this.query.locStorageCode = this.storageList[0].code;
+                        this.getList();
+                    }
                 })
                 .catch(() => {
                 });
@@ -822,7 +826,6 @@ export default {
         let start = new Date();
         start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
         this.actDateRange = [start, end];
-        this.getList();
     }
 }
 </script>