From 2d2f7a8b8a0b66f251748a1db44c7bb1e3170cc1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com>
Date: Tue, 10 Jan 2023 11:12:51 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AC=AC=E4=B8=89=E6=96=B9=E4=B8=9A=E5=8A=A1?=
 =?UTF-8?q?=E5=8D=95=E6=8D=AE=E7=95=8C=E9=9D=A2=E6=A0=B7=E5=BC=8F=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/thirdSys/order/thrOrder.vue         | 769 +++++++-------
 src/views/thirdSys/order/thrOrderExport.vue   | 545 +++++-----
 .../thirdSys/order/thrOrderExportSmp.vue      | 523 ++++-----
 src/views/thirdSys/order/thrOrderImport.vue   | 331 +++---
 .../thirdSys/order/thrOrderImportDetail.vue   | 303 +++---
 src/views/thirdSys/order/thrOrderSelect.vue   | 992 +++++++++---------
 6 files changed, 1759 insertions(+), 1704 deletions(-)

diff --git a/src/views/thirdSys/order/thrOrder.vue b/src/views/thirdSys/order/thrOrder.vue
index f95d5355..6d02fdd5 100644
--- a/src/views/thirdSys/order/thrOrder.vue
+++ b/src/views/thirdSys/order/thrOrder.vue
@@ -1,101 +1,113 @@
 <template>
-    <div>
-        <el-card class="el-card">
-            <el-form :inline="true" :model="filterQuery"
-                     class="query-form" size="mini">
-                <el-row>
+  <div>
+    <el-card>
+      <el-form :model="filterQuery" size="mini" label-width="100px" v-show="showSearch">
+        <el-row>
+          <el-col :span="6">
+            <el-form-item label="单据号:">
+              <el-input
+                v-model="filterQuery.billNo"
+                style="width: 90%"
+                placeholder="请输入单据号"
+                clearable
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="往来单位:">
+              <el-input
+                v-model="filterQuery.corpName"
+                style="width: 90%"
+                placeholder="请输入往来单位"
+                clearable
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="外部系统:">
+              <el-select v-model="filterQuery.billAction" style="width: 90%" placeholder="请选择第三方系统单据类型"
+                         clearable="true">
+                <el-option
+                  v-for="item in originTypes"
+                  :key="item.name"
+                  :label="item.name"
+                  :value="item.action">
+                  <span style="float: left;font-size: 13px">{{ item.name }}</span>
+                  <span style="float: right; color: #8492a6; font-size: 13px;margin-left: 10px">{{
+                      item.thirdSysName
+                    }}</span>
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="单据日期:">
+              <el-date-picker
+                :picker-options="pickerOptions"
+                v-model="actDateRange"
+                style="width: 90%"
+                type="daterange"
+                format="yyyy 年 MM 月 dd 日"
+                value-format="yyyy-MM-dd"
+                range-separator="至"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+              >
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
 
-                    <el-form-item class="query-form-item">
-                        <el-input
-                            v-model="filterQuery.billNo"
-                            placeholder="请输入单据号"
-                            clearable
-                        ></el-input>
-                    </el-form-item>
-                    <el-form-item class="query-form-item">
-                        <el-input
-                            v-model="filterQuery.corpName"
-                            placeholder="请输入往来单位"
-                            clearable
-                        ></el-input>
-                    </el-form-item>
-                    <el-form-item class="query-form-item">
-                        <el-select v-model="filterQuery.billAction" placeholder="请选择第三方系统单据类型" clearable="true">
-                            <el-option
-                                v-for="item in originTypes"
-                                :key="item.name"
-                                :label="item.name"
-                                :value="item.action">
-                                <span style="float: left;font-size: 13px">{{ item.name }}</span>
-                                <span style="float: right; color: #8492a6; font-size: 13px;margin-left: 10px">{{
-                                        item.thirdSysName
-                                    }}</span>
-                            </el-option>
-                        </el-select>
-                    </el-form-item>
-                    <el-form-item class="query-form-item">
-                        <span style="color: #000; margin-left: 10px; margin-right: 6px">单据日期:</span>
-                        <el-date-picker
-                            :picker-options="pickerOptions"
-                            v-model="actDateRange"
-                            type="daterange"
-                            format="yyyy 年 MM 月 dd 日"
-                            value-format="yyyy-MM-dd"
-                            range-separator="至"
-                            start-placeholder="开始日期"
-                            end-placeholder="结束日期"
-                        >
-                        </el-date-picker>
-                    </el-form-item>
-                    <el-form-item>
-                        <el-button-group style="display:flex;">
-                            <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
-                            <el-button type="primary"  icon="el-icon-search" @click="getList">查询</el-button>
-                        </el-button-group>
-                    </el-form-item>
-                </el-row>
-            </el-form>
+      <div class="top-right-btn">
+        <el-button-group style="display:flex;">
+          <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
+          <el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
+          <el-button type="primary" icon="el-icon-search" @click="getList">查询</el-button>
+        </el-button-group>
+      </div>
 
-            <el-table v-loading="loading" :data="list" style="width: 100%" border highlight-current-row
-                      @current-change="handleDetail">
-                <el-table-column label="序号" type="index" width="60"></el-table-column>
-                <el-table-column label="第三方单据类型" prop="billType"></el-table-column>
-                <el-table-column label="单据号" prop="billNo"></el-table-column>
-                <el-table-column label="往来单位ID" prop="corpId"></el-table-column>
-                <el-table-column label="往来单位" prop="corpName"
-                                 show-overflow-tooltip="true"></el-table-column>
-                <el-table-column label="单据状态" prop="billFlag"></el-table-column>
-                <el-table-column label="单据日期" prop="billdate"></el-table-column>
-                <el-table-column label="操作" width="100px">
-                    <template slot-scope="scope">
-                        <el-button type="text" size="small" @click.native.stop="deleteDialog(scope.row)"
-                        >删除
-                        </el-button>
-                    </template>
-                </el-table-column>
-            </el-table>
-          <pagination
-            v-show="total>0"
-            :total="total"
-            :page.sync="filterQuery.page"
-            :limit.sync="filterQuery.limit"
-            @pagination="getList"
-          />
-        </el-card>
-        <el-card class="el-card">
-            <el-table v-loading="loading" :data="detailList" style="width: 100%" border highlight-current-row>
-                <el-table-column label="序号" type="index" width="120"></el-table-column>
-                <el-table-column label="产品编码" prop="productId"></el-table-column>
-                <el-table-column label="产品通用名" prop="productName" show-overflow-tooltip="true"></el-table-column>
-                <el-table-column label="规格型号" prop="spec" show-overflow-tooltip="true"></el-table-column>
-                <el-table-column label="批次号" prop="batchNo"></el-table-column>
-                <el-table-column label="生产日期" prop="productDate"></el-table-column>
-                <el-table-column label="失效日期" prop="expireDate"></el-table-column>
-                <!--        <el-table-column label="单据数量" prop="reCount"></el-table-column>-->
-                <el-table-column label="单据数量" prop="count"></el-table-column>
-            </el-table>
-        </el-card>
-    </div>
+      <el-divider style="margin: 15px"></el-divider>
+      <el-table v-loading="loading" :data="list" style="width: 100%" border highlight-current-row
+                @current-change="handleDetail">
+        <el-table-column label="序号" type="index" width="60"></el-table-column>
+        <el-table-column label="第三方单据类型" prop="billType"></el-table-column>
+        <el-table-column label="单据号" prop="billNo"></el-table-column>
+        <el-table-column label="往来单位ID" prop="corpId"></el-table-column>
+        <el-table-column label="往来单位" prop="corpName"
+                         show-overflow-tooltip="true"></el-table-column>
+        <el-table-column label="单据状态" prop="billFlag"></el-table-column>
+        <el-table-column label="单据日期" prop="billdate"></el-table-column>
+        <el-table-column label="操作" width="60">
+          <template slot-scope="scope">
+            <el-button type="text" @click.native.stop="deleteDialog(scope.row)"
+            >删除
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <pagination
+        v-show="total>0"
+        :total="total"
+        :page.sync="filterQuery.page"
+        :limit.sync="filterQuery.limit"
+        @pagination="getList"
+      />
+    </el-card>
+    <el-card class="el-card">
+      <el-table v-loading="loading" :data="detailList" style="width: 100%" border highlight-current-row>
+        <el-table-column label="序号" type="index" width="120"></el-table-column>
+        <el-table-column label="产品编码" prop="productId"></el-table-column>
+        <el-table-column label="产品通用名" prop="productName" show-overflow-tooltip="true"></el-table-column>
+        <el-table-column label="规格型号" prop="spec" show-overflow-tooltip="true"></el-table-column>
+        <el-table-column label="批次号" prop="batchNo"></el-table-column>
+        <el-table-column label="生产日期" prop="productDate"></el-table-column>
+        <el-table-column label="失效日期" prop="expireDate"></el-table-column>
+        <!--        <el-table-column label="单据数量" prop="reCount"></el-table-column>-->
+        <el-table-column label="单据数量" prop="count"></el-table-column>
+      </el-table>
+    </el-card>
+  </div>
 </template>
 <script>
 import {delThrOrders, delAll, downloadAll} from "@/api/thrsys/thrOrder";
@@ -103,321 +115,324 @@ import {getLocalJoinBusType} from "@/api/basic/busLocalType";
 import {getOriginBusType} from "@/api/basic/busOriginType";
 import {getBasicThirdSys, filterDetailByKey} from "@/api/basic/basicThirdSys";
 import {selectIp} from "@/api/param/systemParamConfig";
-import {getCloudErp,getThirdSysOrder} from "@/api/inout/erpOrder";
+import {getCloudErp, getThirdSysOrder} from "@/api/inout/erpOrder";
 
 export default {
-    data() {
-        return {
-            filterQuery: {
-                billAction: null,
-                billNo: "",
-                originType:null,
-                thirdSysFk: "",
-                page: 1,
-                limit: 10,
-                corpName: null,
+  data() {
+    return {
+      showSearch: true,
+      filterQuery: {
+        billAction: null,
+        billNo: "",
+        originType: null,
+        thirdSysFk: "",
+        page: 1,
+        limit: 10,
+        corpName: null,
+      },
+      total: 0,
+      thirdSys: [],
+      thirdSysDetail: null,
+      busTypes: [],
+      originTypes: [],
+      list: [],
+      detailList: [],
+      uploadFileUrl: null,
+      fileList: [],
+      uploadData: {
+        thirdSys: "thirdId",
+      },
+      loading: false,
+      actDateRange: [],
+      pickerOptions: {
+        shortcuts: [
+          {
+            text: "最近一周",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+              picker.$emit("pick", [start, end]);
             },
-            total: 0,
-            thirdSys: [],
-            thirdSysDetail: null,
-            busTypes: [],
-            originTypes:[],
-            list: [],
-            detailList: [],
-            uploadFileUrl: null,
-            fileList: [],
-            uploadData: {
-                thirdSys: "thirdId",
+          },
+          {
+            text: "最近一个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+              picker.$emit("pick", [start, end]);
             },
-            loading: false,
-            actDateRange: [],
-            pickerOptions: {
-                shortcuts: [
-                    {
-                        text: "最近一周",
-                        onClick(picker) {
-                            const end = new Date();
-                            const start = new Date();
-                            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
-                            picker.$emit("pick", [start, end]);
-                        },
-                    },
-                    {
-                        text: "最近一个月",
-                        onClick(picker) {
-                            const end = new Date();
-                            const start = new Date();
-                            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
-                            picker.$emit("pick", [start, end]);
-                        },
-                    },
-                    {
-                        text: "最近三个月",
-                        onClick(picker) {
-                            const end = new Date();
-                            const start = new Date();
-                            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
-                            picker.$emit("pick", [start, end]);
-                        },
-                    },
-                ],
+          },
+          {
+            text: "最近三个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+              picker.$emit("pick", [start, end]);
             },
-        };
-    },
-
-    methods: {
-        onReset() {
-            this.$router.push({
-                path: "",
-            });
-            this.filterQuery = {
-                billNo: "",
-                thirdSysFk: "",
-                billFlag: null,
-                billAction: null,
-                startDate: null,
-                endDate: null,
-                page: 1,
-                limit: 10,
-                corpName: null,
-            };
-            this.actDateRange = [];
-            this.getList();
-        },
+          },
+        ],
+      },
+    };
+  },
 
-        getList() {
-            if (this.filterQuery.thirdSysFk == null) {
-                this.$message.warning("请先选择第三方系统！")
-                return;
-            }
-            if (this.actDateRange != null) {
-                this.filterQuery.startDate = this.actDateRange[0];
-                this.filterQuery.endDate = this.actDateRange[1];
-            } else {
-                this.filterQuery.startDate = null;
-                this.filterQuery.endDate = null;
-            }
-            this.loading = true;
-            getThirdSysOrder(this.filterQuery)
-                .then((response) => {
-                    if (response.code == 20000) {
-                        this.list = response.data.list || [];
-                        this.total = response.data.total || 0;
-                    } else {
-                        this.$message.error(response.message);
-                    }
-                    this.loading = false;
-                })
-                .catch(() => {
-                    this.loading = false;
-                    this.list = [];
-                    this.total = 0;
-                });
-        },
-        handleDetail(row) {
-            this.detailList = row.subErpOrders;
-        },
-        deleteDialog(row) {
-            this.$confirm("此操作将永久删除该单据, 是否继续?", "提示", {
-                confirmButtonText: "确定",
-                cancelButtonText: "取消",
-                type: "warning",
+  methods: {
+    onReset() {
+      this.$router.push({
+        path: "",
+      });
+      this.filterQuery = {
+        billNo: "",
+        thirdSysFk: "",
+        billFlag: null,
+        billAction: null,
+        startDate: null,
+        endDate: null,
+        page: 1,
+        limit: 10,
+        corpName: null,
+      };
+      this.actDateRange = [];
+      this.getList();
+    },
+    hideSearch() {
+      this.showSearch = !this.showSearch;
+    },
+    getList() {
+      if (this.filterQuery.thirdSysFk == null) {
+        this.$message.warning("请先选择第三方系统！")
+        return;
+      }
+      if (this.actDateRange != null) {
+        this.filterQuery.startDate = this.actDateRange[0];
+        this.filterQuery.endDate = this.actDateRange[1];
+      } else {
+        this.filterQuery.startDate = null;
+        this.filterQuery.endDate = null;
+      }
+      this.loading = true;
+      getThirdSysOrder(this.filterQuery)
+        .then((response) => {
+          if (response.code == 20000) {
+            this.list = response.data.list || [];
+            this.total = response.data.total || 0;
+          } else {
+            this.$message.error(response.message);
+          }
+          this.loading = false;
+        })
+        .catch(() => {
+          this.loading = false;
+          this.list = [];
+          this.total = 0;
+        });
+    },
+    handleDetail(row) {
+      this.detailList = row.subErpOrders;
+    },
+    deleteDialog(row) {
+      this.$confirm("此操作将永久删除该单据, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          let dQuery = {
+            id: row.id,
+          };
+          delThrOrders(dQuery)
+            .then((response) => {
+              this.loading = false;
+              if (response.code == 20000) {
+                this.$message.success("删除成功");
+                this.getList();
+              } else {
+                this.$message.error(response.message);
+              }
             })
-                .then(() => {
-                    let dQuery = {
-                        id: row.id,
-                    };
-                    delThrOrders(dQuery)
-                        .then((response) => {
-                            this.loading = false;
-                            if (response.code == 20000) {
-                                this.$message.success("删除成功");
-                                this.getList();
-                            } else {
-                                this.$message.error(response.message);
-                            }
-                        })
-                        .catch(() => {
-                            this.loading = false;
-                        });
+            .catch(() => {
+              this.loading = false;
+            });
 
-                })
-                .catch(() => {
-                });
-        },
-        clearAll() {
-            this.$confirm("此操作将清空所有单据, 是否继续?", "提示", {
-                confirmButtonText: "确定",
-                cancelButtonText: "取消",
-                type: "warning",
+        })
+        .catch(() => {
+        });
+    },
+    clearAll() {
+      this.$confirm("此操作将清空所有单据, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          delAll()
+            .then((response) => {
+              this.loading = false;
+              if (response.code == 20000) {
+                this.$message.success("删除成功");
+                this.getList();
+              } else {
+                this.$message.success(response.message);
+              }
             })
-                .then(() => {
-                    delAll()
-                        .then((response) => {
-                            this.loading = false;
-                            if (response.code == 20000) {
-                                this.$message.success("删除成功");
-                                this.getList();
-                            } else {
-                                this.$message.success(response.message);
-                            }
-                        })
-                        .catch(() => {
-                            this.loading = false;
-                        });
-
-                })
-                .catch(() => {
-                });
-        },
-        getBasicThirdSys() {
-            let query = {
-                enabled: true,
-            };
-            getBasicThirdSys(query)
-                .then((response) => {
-                    this.thirdSys = response.data.list || [];
-                    this.filterQuery.thirdSysFk = this.thirdSys[0].thirdId;
-                    this.uploadData.thirdSys = this.filterQuery.thirdSysFk;
-                    this.selectSysParam();
-                    this.getThirdSysDetail();
-                    this.getBusType();
-                })
-                .catch(() => {
-                    this.loading = false;
-                    this.list = [];
-                });
-        },
-        handleChange(response, files, fileList) {
-            console.log(response);
-            if (response.code != 20000) {
-                this.$message.error(response.message);
-            } else {
-                console.log(files[0] + "\n" + this.fileList[0] + "\n" + fileList[0]);
-                this.$message.success("文件上传成功,请稍后刷新查看！");
-            }
-        },
-        selectSysParam() {
-            let query = {
-                key: "thirdIpUrl",
-                thirdSysFk: this.filterQuery.thirdSysFk
-            };
-            selectIp(query).then((response) => {
-                if (response.code == 20000) {
-                    this.uploadFileUrl = response.data.thridUrl + "/udiwms/erp/pi/upload";
-                }
+            .catch(() => {
+              this.loading = false;
             });
-        },
-        thirdSysChange() {
-            this.uploadData.thirdSys = this.filterQuery.thirdSysFk;
-            this.getThirdSysDetail();
-        },
-        getThirdSysDetail() {
-            let query = {
-                thirdSysFk: this.filterQuery.thirdSysFk,
-                key: "orderQueryUrl",
-            };
-            filterDetailByKey(query)
-                .then((response) => {
-                    this.thirdSysDetail = response.data;
-                })
-                .catch(() => {
-                    this.loading = false;
-                    this.list = [];
-                });
 
-        },
-        downloadDatas() {
-            let query = {
-                billAction: this.filterQuery.billAction
-            };
-            downloadAll(query).then((response) => {
-                if (response.code == 20000) {
-                    this.$message.success(response.data);
-                } else {
-                    this.$message.error(response.message);
-                }
-            });
+        })
+        .catch(() => {
+        });
+    },
+    getBasicThirdSys() {
+      let query = {
+        enabled: true,
+      };
+      getBasicThirdSys(query)
+        .then((response) => {
+          this.thirdSys = response.data.list || [];
+          this.filterQuery.thirdSysFk = this.thirdSys[0].thirdId;
+          this.uploadData.thirdSys = this.filterQuery.thirdSysFk;
+          this.selectSysParam();
+          this.getThirdSysDetail();
+          this.getBusType();
+        })
+        .catch(() => {
+          this.loading = false;
+          this.list = [];
+        });
+    },
+    handleChange(response, files, fileList) {
+      console.log(response);
+      if (response.code != 20000) {
+        this.$message.error(response.message);
+      } else {
+        console.log(files[0] + "\n" + this.fileList[0] + "\n" + fileList[0]);
+        this.$message.success("文件上传成功,请稍后刷新查看！");
+      }
+    },
+    selectSysParam() {
+      let query = {
+        key: "thirdIpUrl",
+        thirdSysFk: this.filterQuery.thirdSysFk
+      };
+      selectIp(query).then((response) => {
+        if (response.code == 20000) {
+          this.uploadFileUrl = response.data.thridUrl + "/udiwms/erp/pi/upload";
+        }
+      });
+    },
+    thirdSysChange() {
+      this.uploadData.thirdSys = this.filterQuery.thirdSysFk;
+      this.getThirdSysDetail();
+    },
+    getThirdSysDetail() {
+      let query = {
+        thirdSysFk: this.filterQuery.thirdSysFk,
+        key: "orderQueryUrl",
+      };
+      filterDetailByKey(query)
+        .then((response) => {
+          this.thirdSysDetail = response.data;
+        })
+        .catch(() => {
+          this.loading = false;
+          this.list = [];
+        });
 
-        },
-        getActionName(action) {
-            for (let i = 0; i < this.busTypes.length; i++) {
-                if (this.busTypes[i].action === action) {
-                    return this.busTypes[i].name;
-                }
-            }
-        },
+    },
+    downloadDatas() {
+      let query = {
+        billAction: this.filterQuery.billAction
+      };
+      downloadAll(query).then((response) => {
+        if (response.code == 20000) {
+          this.$message.success(response.data);
+        } else {
+          this.$message.error(response.message);
+        }
+      });
 
-        getlocalName(action) {
-            for (let i = 0; i < this.busTypes.length; i++) {
-                if (this.busTypes[i].action === action) {
-                    return this.busTypes[i].localName;
-                }
-            }
-        },
-        getBusType() {
-            let query = {
-                enabled: true,
-            };
-            getLocalJoinBusType(query)
-                .then((response) => {
-                    this.busTypes = response.data.list || [];
-                    // this.getList();
-                })
-                .catch(() => {
-                });
-            getOriginBusType(query)
-                .then((response) => {
-                    this.originTypes = response.data.list || [];
-                    // this.filterQuery.originType = this.originTypes[0].action;
-                    // this.getList();
-                })
-                .catch(() => {
-                });
+    },
+    getActionName(action) {
+      for (let i = 0; i < this.busTypes.length; i++) {
+        if (this.busTypes[i].action === action) {
+          return this.busTypes[i].name;
+        }
+      }
+    },
 
+    getlocalName(action) {
+      for (let i = 0; i < this.busTypes.length; i++) {
+        if (this.busTypes[i].action === action) {
+          return this.busTypes[i].localName;
+        }
+      }
+    },
+    getBusType() {
+      let query = {
+        enabled: true,
+      };
+      getLocalJoinBusType(query)
+        .then((response) => {
+          this.busTypes = response.data.list || [];
+          // this.getList();
+        })
+        .catch(() => {
+        });
+      getOriginBusType(query)
+        .then((response) => {
+          this.originTypes = response.data.list || [];
+          // this.filterQuery.originType = this.originTypes[0].action;
+          // this.getList();
+        })
+        .catch(() => {
+        });
 
-        },
 
     },
-    components: {},
-    mounted() {
-    },
-    created() {
-        this.getBasicThirdSys();
-        let end = new Date();
-        let start = new Date();
-        start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
-        this.actDateRange = [start, end];
-    },
+
+  },
+  components: {},
+  mounted() {
+  },
+  created() {
+    this.getBasicThirdSys();
+    let end = new Date();
+    let start = new Date();
+    start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+    this.actDateRange = [start, end];
+  },
 };
 </script>
 <style scoped>
 .itemTag {
-    float: left;
-    text-align: left;
-    margin-top: 10px;
-    width: 25%;
+  float: left;
+  text-align: left;
+  margin-top: 10px;
+  width: 25%;
 }
 
 .text {
-    font-size: 13px;
-    font-family: "Microsoft YaHei";
+  font-size: 13px;
+  font-family: "Microsoft YaHei";
 }
 
 .query-form-item {
-    display: block !important;
-    margin-right: 10px;
-    margin-bottom: 5px;
+  display: block !important;
+  margin-right: 10px;
+  margin-bottom: 5px;
 }
 
 .el-row {
-    display: flex;
-    flex-wrap: wrap;
+  display: flex;
+  flex-wrap: wrap;
 }
 
 .el-col {
-    border-radius: 4px;
-    flex-wrap: wrap;
+  border-radius: 4px;
+  flex-wrap: wrap;
 }
 </style>
 
diff --git a/src/views/thirdSys/order/thrOrderExport.vue b/src/views/thirdSys/order/thrOrderExport.vue
index 4067afb2..0b80265f 100644
--- a/src/views/thirdSys/order/thrOrderExport.vue
+++ b/src/views/thirdSys/order/thrOrderExport.vue
@@ -1,291 +1,298 @@
 <template>
-    <div>
-      <el-card>
-        <el-form :inline="true" :model="query" class="query-form" size="mini">
-            <el-row>
-                <el-form-item class="query-form-item">
-                    <el-input v-model="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="el-icon-search" @click="getList">查询</el-button>
-                        <el-button type="primary" icon="el-icon-upload2" @click="exportExcel">导出Excel文件</el-button>
-                    </el-button-group>
-                </el-form-item>
-            </el-row>
-        </el-form>
+  <div>
+    <el-card>
+      <el-form :model="query" size="mini" label-width="100px" v-show="showSearch">
+        <el-row>
+          <el-col :span="6">
+            <el-form-item label="记录ID:">
+              <el-input v-model="filterQuery.genKey" style="width: 90%" placeholder="清输入记录ID"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
 
-        <el-table
-            v-loading="loading"
-            :data="list"
-            style="width: 100%"
-            @selection-change="handleSelectionChange"
-            border highlight-current-row
-        >
-            <el-table-column label="序号" type="index"></el-table-column>
-            <el-table-column
-                label="记录ID"
-                prop="genKey"
-                show-overflow-tooltip
-            ></el-table-column>
+      <div class="top-right-btn">
+        <el-button-group style="display:flex;">
+          <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
+          <el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
+          <el-button type="primary" icon="el-icon-search" @click="getList">查询</el-button>
+          <el-button type="primary" icon="el-icon-upload2" @click="exportExcel">导出Excel文件</el-button>
+        </el-button-group>
+      </div>
+      <el-divider style="margin: 15px"></el-divider>
+
+      <el-table
+        v-loading="loading"
+        :data="list"
+        style="width: 100%"
+        @selection-change="handleSelectionChange"
+        border highlight-current-row
+      >
+        <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
+        <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="dlCount"
+          show-overflow-tooltip
+        >
+        </el-table-column>
+        <el-table-column label="操作" width="120">
+          <template slot-scope="scope">
+            <el-button
+              type="text"
+              @click.native.stop="downloadExcel(scope.row)"
+            >下载
+            </el-button
             >
-                <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="dlCount"
-                show-overflow-tooltip
+            <el-button
+              type="text"
+              @click.native.stop="deleteDialog(scope.row.id)"
+            >删除
+            </el-button
             >
-            </el-table-column>
-            <el-table-column label="操作" fixed="right" width="160">
-                <template slot-scope="scope">
-                    <el-button
-                        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>
+          </template>
+        </el-table-column>
+      </el-table>
 
-        <el-dialog
-            title="导出业务单据"
-            :visible.sync="thrOrderSelectVisible"
-            width="85%"
-            :close-on-click-modal="false"
-            :close-on-press-escape="false"
-            v-if="thrOrderSelectVisible"
-        >
-            <thrOrderSelect :selectType="selectType" v-on:cancelDialog="cancelDialog"
-            ></thrOrderSelect>
-        </el-dialog>
-        <pagination
-          v-show="total>0"
-          :total="total"
-          :page.sync="filterQuery.page"
-          :limit.sync="filterQuery.limit"
-          @pagination="getList"
-        />
-      </el-card>
-    </div>
+      <el-dialog
+        title="导出业务单据"
+        :visible.sync="thrOrderSelectVisible"
+        width="80%"
+        :close-on-click-modal="false"
+        :close-on-press-escape="false"
+        v-if="thrOrderSelectVisible"
+      >
+        <thrOrderSelect :selectType="selectType" v-on:cancelDialog="cancelDialog"
+        ></thrOrderSelect>
+      </el-dialog>
+      <pagination
+        v-show="total>0"
+        :total="total"
+        :page.sync="filterQuery.page"
+        :limit.sync="filterQuery.limit"
+        @pagination="getList"
+      />
+    </el-card>
+  </div>
 </template>
 
 <script>
-    import {filterLog, deleteLog} from "@/api/thrsys/thrOrderExport";
-    import thrOrderSelect from "./thrOrderSelect";
-    import axios from "axios";
-    import {formatDate} from "@/utils/date";
+import {filterLog, deleteLog} from "@/api/thrsys/thrOrderExport";
+import thrOrderSelect from "./thrOrderSelect";
+import axios from "axios";
+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,
-                thrOrderSelectVisible: false,
-                list: [],
-                detailList: [],
-                thirdSys: [],
-                thirdSysDetail: null,
-                total: 0,
-                editQuery: null,
-                fromStatus: {
-                    0: "产品信息",
-                    1: "库存信息",
-                    2: "异常第三方上传"
-                },
-                status: {
-                    0: "等待处理",
-                    1: "正在处理",
-                    2: "处理异常",
-                    3: "处理完成"
-                },
-                uploadFileUrl: null,
-                uploadData: {
-                    thirdSys: "thirdId",
-                },
-            };
-        },
+export default {
+  data() {
+    return {
+      showSearch: true,
+      filterQuery: {
+        type: 1,
+        genKey: null,
+        status: null,
+        fromType: null,
+        page: 1,
+        limit: 20,
+        thirdSysFk: null,
+      },
+      selectType: 0,
+      thrOrderSelectVisible: false,
+      list: [],
+      detailList: [],
+      thirdSys: [],
+      thirdSysDetail: null,
+      total: 0,
+      editQuery: null,
+      fromStatus: {
+        0: "产品信息",
+        1: "库存信息",
+        2: "异常第三方上传"
+      },
+      status: {
+        0: "等待处理",
+        1: "正在处理",
+        2: "处理异常",
+        3: "处理完成"
+      },
+      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) => {
-                        if (response.code == 20000) {
-                            this.list = response.data.list || [];
-                            this.total = response.data.total || 0;
-                        } else {
-                            this.$message.error(response.message);
-                        }
-                        this.loading = false;
-                    })
-                    .catch(() => {
-                        this.loading = false;
-                        this.list = [];
-                        this.total = 0;
-                    });
-            },
+  methods: {
+    onReset() {
+      this.$router.push({
+        path: "",
+      });
+      this.filterQuery = {
+        fromType: null,
+        genKey: null,
+        status: null,
+        page: 1,
+        type: 1,
+        limit: 20,
+        thirdSysFk: null,
+      };
+      this.getList();
+    },
+    hideSearch() {
+      this.showSearch = !this.showSearch;
+    },
+    getList() {
+      this.loading = true;
+      filterLog(this.filterQuery)
+        .then((response) => {
+          if (response.code == 20000) {
+            this.list = response.data.list || [];
+            this.total = response.data.total || 0;
+          } else {
+            this.$message.error(response.message);
+          }
+          this.loading = false;
+        })
+        .catch(() => {
+          this.loading = false;
+          this.list = [];
+          this.total = 0;
+        });
+    },
 
-            exportExcel() {
-                this.selectType = 0;
-                this.thrOrderSelectVisible = true;
-            },
-            uploadSmp() {
-                this.selectType = 1;
-                this.thrOrderSelectVisible = true;
-            },
-            downloadExcel(row) {
-                axios.get("./config.json").then(res => {
-                    let baseUrl = res.data.BASE_URL;
-                    let href = baseUrl + "/udiwms/thrOrder/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);
-                            console.log(a.href);
-                            a.download = "ThirdOrder_" + timestamp + ".UpperIn";
-                            document.body.appendChild(a);
-                            a.click();
-                            this.getList();
-                        });
-                });
-            },
+    exportExcel() {
+      this.selectType = 0;
+      this.thrOrderSelectVisible = true;
+    },
+    uploadSmp() {
+      this.selectType = 1;
+      this.thrOrderSelectVisible = true;
+    },
+    downloadExcel(row) {
+      axios.get("./config.json").then(res => {
+        let baseUrl = res.data.BASE_URL;
+        let href = baseUrl + "/udiwms/thrOrder/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);
+            console.log(a.href);
+            a.download = "ThirdOrder_" + timestamp + ".UpperIn";
+            document.body.appendChild(a);
+            a.click();
+            this.getList();
+          });
+      });
+    },
 
-            cancelDialog(val) {
-                if (val) {
-                    this.getList();
-                }
-                this.thrOrderSelectVisible = false;
-            },
+    cancelDialog(val) {
+      if (val) {
+        this.getList();
+      }
+      this.thrOrderSelectVisible = false;
+    },
 
-            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) {
-                    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: {thrOrderSelect},
-        created() {
-            // this.getBasicThirdSys();
-            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) {
+        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: {thrOrderSelect},
+  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/thirdSys/order/thrOrderExportSmp.vue b/src/views/thirdSys/order/thrOrderExportSmp.vue
index 2a14506b..01d7ad0a 100644
--- a/src/views/thirdSys/order/thrOrderExportSmp.vue
+++ b/src/views/thirdSys/order/thrOrderExportSmp.vue
@@ -1,102 +1,99 @@
 <template>
-    <div>
-      <el-card>
-        <el-form :inline="true" :model="query" class="query-form" size="mini">
-            <el-row>
-                <el-form-item class="query-form-item">
-                    <el-input v-model="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="el-icon-search" @click="getList">查询</el-button>
-                        <!--<el-button type="primary" icon="search" @click="exportExcel">导出Excel文件</el-button>-->
-                        <el-button type="primary" icon="search" @click="uploadSmp">同步至自助平台</el-button>
-                    </el-button-group>
-                </el-form-item>
-            </el-row>
-        </el-form>
+  <div>
+    <el-card>
+      <el-form :model="query" size="mini" label-width="100px" v-show="showSearch">
+        <el-row>
+          <el-col :span="6">
+            <el-form-item label="记录ID:">
+              <el-input v-model="filterQuery.genKey" style="width: 90%" placeholder="请输入记录ID"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
 
-        <el-table
-            v-loading="loading"
-            :data="list"
-            style="width: 100%"
-            @selection-change="handleSelectionChange"
-            border highlight-current-row
-        >
-            <el-table-column label="序号" type="index"></el-table-column>
-            <el-table-column
-                label="记录ID"
-                prop="genKey"
-                show-overflow-tooltip
-            ></el-table-column>
+      <div class="top-right-btn">
+        <el-button-group style="display:flex;">
+          <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
+          <el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
+          <el-button type="primary" icon="el-icon-search" @click="getList">查询</el-button>
+          <el-button type="primary" icon="el-icon-share" @click="uploadSmp">同步至自助平台</el-button>
+        </el-button-group>
+      </div>
+      <el-divider style="margin: 15px"></el-divider>
+
+      <el-table
+        v-loading="loading"
+        :data="list"
+        style="width: 100%"
+        @selection-change="handleSelectionChange"
+        border highlight-current-row
+      >
+        <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
+        <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 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="dlCount"
-                show-overflow-tooltip
+          </template>
+        </el-table-column>
+        <el-table-column
+          label="下载次数"
+          prop="dlCount"
+          show-overflow-tooltip
+        >
+        </el-table-column>
+        <el-table-column label="操作" width="60">
+          <template slot-scope="scope">
+            <el-button
+              type="text"
+              size="small"
+              @click.native.stop="deleteDialog(scope.row.id)"
+            >删除
+            </el-button
             >
-            </el-table-column>
-            <el-table-column label="操作" fixed="right" width="160">
-                <template slot-scope="scope">
-                    <!--<el-button-->
-                    <!--type="text"-->
-                    <!--size="small"-->
-                    <!--@click.native.stop="downloadExcel(scope.row)"-->
-                    <!--&gt;下载-->
-                    <!--</el-button-->
-                    <!--&gt;-->
-                    <el-button
-                        type="text"
-                        size="small"
-                        @click.native.stop="deleteDialog(scope.row.id)"
-                    >删除
-                    </el-button
-                    >
-                </template>
-            </el-table-column>
-        </el-table>
+          </template>
+        </el-table-column>
+      </el-table>
 
-        <el-dialog
-            title="导出业务单据"
-            :visible.sync="thrOrderSelectVisible"
-            :close-on-click-modal="false"
-            :close-on-press-escape="false"
-            width="85%"
-            v-if="thrOrderSelectVisible"
-        >
-            <thrOrderSelect :selectType="selectType" v-on:cancelDialog="cancelDialog"
-            ></thrOrderSelect>
-        </el-dialog>
+      <el-dialog
+        title="导出业务单据"
+        :visible.sync="thrOrderSelectVisible"
+        :close-on-click-modal="false"
+        :close-on-press-escape="false"
+        width="80%"
+        v-if="thrOrderSelectVisible"
+      >
+        <thrOrderSelect :selectType="selectType" v-on:cancelDialog="cancelDialog"
+        ></thrOrderSelect>
+      </el-dialog>
 
-        <pagination
-          v-show="total>0"
-          :total="total"
-          :page.sync="filterQuery.page"
-          :limit.sync="filterQuery.limit"
-          @pagination="getList"
-        />
-      </el-card>
-    </div>
+      <pagination
+        v-show="total>0"
+        :total="total"
+        :page.sync="filterQuery.page"
+        :limit.sync="filterQuery.limit"
+        @pagination="getList"
+      />
+    </el-card>
+  </div>
 </template>
 
 <script>
@@ -104,197 +101,201 @@ import {filterLog, deleteLog} from "@/api/thrsys/thrOrderExport";
 import thrOrderSelect from "./thrOrderSelect";
 
 export default {
-    data() {
-        return {
-            filterQuery: {
-                genKey: null,
-                status: null,
-                fromType: null,
-                page: 1,
-                limit: 20,
-                type: 2,
-                thirdSysFk: null,
-            },
-            loading: false,
-            selectType: 0,
-            thrOrderSelectVisible: false,
-            list: [],
-            detailList: [],
-            thirdSys: [],
-            thirdSysDetail: null,
-            total: 0,
-            editQuery: null,
-            fromStatus: {
-                0: "产品信息",
-                1: "库存信息",
-                2: "异常第三方上传"
-            },
-            status: {
-                0: "等待处理",
-                1: "正在处理",
-                2: "处理异常",
-                3: "处理完成"
-            },
-            uploadFileUrl: null,
-            uploadData: {
-                thirdSys: "thirdId",
-            },
-        };
-    },
+  data() {
+    return {
+      showSearch: true,
+      filterQuery: {
+        genKey: null,
+        status: null,
+        fromType: null,
+        page: 1,
+        limit: 20,
+        type: 2,
+        thirdSysFk: null,
+      },
+      loading: false,
+      selectType: 0,
+      thrOrderSelectVisible: false,
+      list: [],
+      detailList: [],
+      thirdSys: [],
+      thirdSysDetail: null,
+      total: 0,
+      editQuery: null,
+      fromStatus: {
+        0: "产品信息",
+        1: "库存信息",
+        2: "异常第三方上传"
+      },
+      status: {
+        0: "等待处理",
+        1: "正在处理",
+        2: "处理异常",
+        3: "处理完成"
+      },
+      uploadFileUrl: null,
+      uploadData: {
+        thirdSys: "thirdId",
+      },
+    };
+  },
 
-    methods: {
-        onReset() {
-            this.$router.push({
-                path: "",
-            });
-            this.filterQuery = {
-                fromType: null,
-                genKey: null,
-                status: null,
-                page: 1,
-                type: 2,
-                limit: 20,
-                thirdSysFk: null,
-            };
-            this.getList();
-        },
-        getList() {
-            this.loading = true;
-            filterLog(this.filterQuery)
-                .then((response) => {
-                    if (response.code == 20000) {
-                        this.list = response.data.list || [];
-                        this.total = response.data.total || 0;
-                    } else {
-                        this.$message.error(response.message);
-                    }
-                    this.loading = false;
-                })
-                .catch(() => {
-                    this.loading = false;
-                    this.list = [];
-                    this.total = 0;
-                });
-        },
+  methods: {
+    onReset() {
+      this.$router.push({
+        path: "",
+      });
+      this.filterQuery = {
+        fromType: null,
+        genKey: null,
+        status: null,
+        page: 1,
+        type: 2,
+        limit: 20,
+        thirdSysFk: null,
+      };
+      this.getList();
+    },
+    hideSearch() {
+      this.showSearch = !this.showSearch;
+    },
+    getList() {
+      this.loading = true;
+      filterLog(this.filterQuery)
+        .then((response) => {
+          if (response.code == 20000) {
+            this.list = response.data.list || [];
+            this.total = response.data.total || 0;
+          } else {
+            this.$message.error(response.message);
+          }
+          this.loading = false;
+        })
+        .catch(() => {
+          this.loading = false;
+          this.list = [];
+          this.total = 0;
+        });
+    },
 
-        exportExcel() {
-            this.selectType = 0;
-            this.thrOrderSelectVisible = true;
-        },
-        uploadSmp() {
-            this.selectType = 1;
-            this.thrOrderSelectVisible = true;
-        },
-        downloadExcel(row) {
-            let href =
-                "http://127.0.0.1:9991" +
-                "/udiwms/thrOrder/exportLog/download" +
-                "?genKey=" + row.genKey;
-            let a = document.createElement("a");
-            fetch(href)
-                .then((res) => res.blob())
-                .then((blob) => {
-                    // 将链接地址字符内容转变成blob地址
-                    a.href = URL.createObjectURL(blob);
-                    console.log(a.href);
-                    //   a.download = ""; // 下载文件的名字
-                    a.download =
-                        row.filePath.split("/")[
-                        row.filePath.split("/").length - 1
-                            ]; //  // 下载文件的名字
-                    document.body.appendChild(a);
-                    a.click();
-                    this.getList();
-                });
+    exportExcel() {
+      this.selectType = 0;
+      this.thrOrderSelectVisible = true;
+    },
+    uploadSmp() {
+      this.selectType = 1;
+      this.thrOrderSelectVisible = true;
+    },
+    downloadExcel(row) {
+      let href =
+        "http://127.0.0.1:9991" +
+        "/udiwms/thrOrder/exportLog/download" +
+        "?genKey=" + row.genKey;
+      let a = document.createElement("a");
+      fetch(href)
+        .then((res) => res.blob())
+        .then((blob) => {
+          // 将链接地址字符内容转变成blob地址
+          a.href = URL.createObjectURL(blob);
+          console.log(a.href);
+          //   a.download = ""; // 下载文件的名字
+          a.download =
+            row.filePath.split("/")[
+            row.filePath.split("/").length - 1
+              ]; //  // 下载文件的名字
+          document.body.appendChild(a);
+          a.click();
+          this.getList();
+        });
 
-            //   a.setAttribute("download", "");
-            //   a.setAttribute("href", href);
-            //   a.click();
-            //   window.open(mOrder.exportFilePath);
-        },
+      //   a.setAttribute("download", "");
+      //   a.setAttribute("href", href);
+      //   a.click();
+      //   window.open(mOrder.exportFilePath);
+    },
 
-        cancelDialog(val) {
-            if (val) {
-                this.getList();
-            }
-            this.thrOrderSelectVisible = false;
-        },
-        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) {
+      if (val) {
+        this.getList();
+      }
+      this.thrOrderSelectVisible = false;
+    },
+    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];
-        },
+              }
+              this.getList();
+            })
+            .catch(() => {
+              this.loading = false;
+            });
+        })
+        .catch(() => {
+        });
     },
-    mounted() {
+    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("文件上传成功,请稍后刷新查看！");
+      }
     },
-    components: {thrOrderSelect},
-    created() {
-        // this.getBasicThirdSys();
-        this.getList();
+    statusFilterType(status) {
+      const statusMap = {
+        0: "warning",
+        1: "warning",
+        2: "danger",
+        3: "success",
+      };
+      return statusMap[status];
     },
+  },
+  mounted() {
+  },
+  components: {thrOrderSelect},
+  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/thirdSys/order/thrOrderImport.vue b/src/views/thirdSys/order/thrOrderImport.vue
index de822cab..b6bfc0be 100644
--- a/src/views/thirdSys/order/thrOrderImport.vue
+++ b/src/views/thirdSys/order/thrOrderImport.vue
@@ -1,155 +1,158 @@
 <template>
   <div>
     <el-card>
-    <el-form :inline="true" :model="query" class="query-form" size="mini">
-      <el-row>
-        <el-form-item class="query-form-item">
-          <el-input v-model="filterQuery.genKey" placeholder="请输入记录ID"></el-input>
-        </el-form-item>
+      <el-form :model="query" size="mini" label-width="100px" v-show="showSearch">
+        <el-row>
+          <el-col :span="6">
+            <el-form-item label="记录ID:">
+              <el-input v-model="filterQuery.genKey" style="width: 90%" placeholder="请输入记录ID"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="处理状态:">
+              <el-select v-model="filterQuery.status" style="width: 90%" placeholder="请选择处理状态">
+                <el-option label="全部" value=""></el-option>
+                <el-option label="处理中" value="0"></el-option>
+                <el-option label="已处理" value="1"></el-option>
+                <el-option label="异常" value="2"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="外部系统:">
+              <el-select v-model="filterQuery.thirdSysFk" style="width: 90%" placeholder="请选择第三方系统"
+                         @change="sysChange">
+                <el-option
+                  v-for="item in thirdSys"
+                  :key="item.value"
+                  :label="item.thirdName"
+                  :value="item.thirdId">
+                  <span style="float: left">{{ item.thirdName }}</span>
+                  <span style="float: right; color: #8492a6; font-size: 13px">{{ item.thirdId }}</span>
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
 
-        <el-form-item class="query-form-item">
-          <el-select v-model="filterQuery.status" placeholder="请选择处理状态">
-            <el-option label="全部" value=""></el-option>
-            <el-option label="处理中" value="0"></el-option>
-            <el-option label="已处理" value="1"></el-option>
-            <el-option label="异常" value="2"></el-option>
-          </el-select>
-        </el-form-item>
-
-        <el-form-item class="query-form-item">
-          <el-select v-model="filterQuery.thirdSysFk" placeholder="请选择第三方系统" @change="sysChange">
-            <el-option
-                v-for="item in thirdSys"
-                :key="item.value"
-                :label="item.thirdName"
-                :value="item.thirdId">
-              <span style="float: left">{{ item.thirdName }}</span>
-              <span style="float: right; color: #8492a6; font-size: 13px">{{ item.thirdId }}</span>
-            </el-option>
-          </el-select>
-        </el-form-item>
-
-        <el-form-item>
-          <el-button-group style="display:flex;">
-            <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
-            <el-button type="primary" icon="el-icon-search" @click="getList">查询</el-button>
-            <el-upload
-                :action="uploadFileUrl"
-                multiple
-                :limit="1"
-                :data="uploadData"
-                :show-file-list="false"
-                :on-success="handleChange"
-                v-if="this.thirdSysDetail.enabled && this.thirdSysDetail.fromType==1"
-                :file-list="fileList"
-            >
-              <el-button size="mini" type="primary">导入业务单据</el-button>
-            </el-upload>
-<!--            <el-button type="primary" icon="search" @click="jumpDl"-->
-<!--                       v-if="this.thirdSysDetail.enabled && this.thirdSysDetail.fromType==1">模板下载-->
-<!--            </el-button>-->
-            <el-button type="primary" icon="el-icon-download" @click="downloadOrderss"
-                       v-if="this.thirdSysDetail.enabled && this.thirdSysDetail.fromType==3">
-              下载业务单据
-            </el-button>
-          </el-button-group>
-        </el-form-item>
-      </el-row>
-    </el-form>
-
-    <el-table
+      <div class="top-right-btn">
+        <el-button-group style="display:flex;">
+          <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
+          <el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
+          <el-button type="primary" icon="el-icon-search" @click="getList">查询</el-button>
+          <el-upload
+            :action="uploadFileUrl"
+            multiple
+            :limit="1"
+            :data="uploadData"
+            :show-file-list="false"
+            :on-success="handleChange"
+            v-if="this.thirdSysDetail.enabled && this.thirdSysDetail.fromType==1"
+            :file-list="fileList"
+          >
+            <el-button icon="el-icon-bottom-right" type="primary">导入业务单据</el-button>
+          </el-upload>
+          <el-button type="primary" icon="el-icon-download" @click="downloadOrderss"
+                     v-if="this.thirdSysDetail.enabled && this.thirdSysDetail.fromType==3">
+            下载业务单据
+          </el-button>
+        </el-button-group>
+      </div>
+      <el-divider style="margin: 15px"></el-divider>
+      <el-table
         v-loading="loading"
         :data="list"
         style="width: 100%"
         @selection-change="handleSelectionChange"
         border highlight-current-row
-    >
-      <el-table-column label="序号" type="index"></el-table-column>
-      <el-table-column
+      >
+        <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>
 
-      <el-table-column
+        <el-table-column
           label="来源"
           prop="fromType"
           show-overflow-tooltip
-      >
-      </el-table-column>
-      <el-table-column
+        >
+        </el-table-column>
+        <el-table-column
           label="更新日期"
           prop="updateTime"
           show-overflow-tooltip
-      ></el-table-column>
-      <el-table-column
+        ></el-table-column>
+        <el-table-column
           label="来源系统"
           prop="thirdSysFk"
           :formatter="formatterThirdSys"
           show-overflow-tooltip
-      ></el-table-column>
-      <el-table-column
+        ></el-table-column>
+        <el-table-column
           label="状态"
           prop="status"
           show-overflow-tooltip
-      >
-        <template slot-scope="scope">
-          <el-tag
+        >
+          <template slot-scope="scope">
+            <el-tag
               :type="statusFilterType(scope.row.status)"
-          >{{ status[scope.row.status] }}
-          </el-tag
-          >
-        </template>
-      </el-table-column>
+            >{{ status[scope.row.status] }}
+            </el-tag
+            >
+          </template>
+        </el-table-column>
 
-      <el-table-column
+        <el-table-column
           label="备注"
           prop="remark"
           show-overflow-tooltip
-      ></el-table-column>
-      <el-table-column label="操作" fixed="right" width="160">
-        <template slot-scope="scope">
-          <el-button
+        ></el-table-column>
+        <el-table-column label="操作" width="120">
+          <template slot-scope="scope">
+            <el-button
               type="text"
               size="small"
               @click.native.stop="handleDetailClick(scope.row)"
-          >详情
-          </el-button
-          >
-          <el-button
+            >详情
+            </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
+            >删除
+            </el-button
+            >
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-dialog
         title="导入订单详情"
         :visible.sync="udiImportDetailVisible"
-        width="85%"
+        width="80%"
         :close-on-click-modal="false"
         :close-on-press-escape="false"
         v-if="udiImportDetailVisible"
-    >
-      <thrOrderImportDetail
+      >
+        <thrOrderImportDetail
           :currentRow="currentRow"
-      ></thrOrderImportDetail>
-    </el-dialog>
+        ></thrOrderImportDetail>
+      </el-dialog>
 
-    <el-dialog
+      <el-dialog
         title="下载业务单据"
         :visible.sync="thrOrderSelectVisible"
-        width="85%"
+        width="80%"
         :close-on-click-modal="false"
         :close-on-press-escape="false"
         v-if="thrOrderSelectVisible"
-    >
-      <thrOrderSelect :selectType="selectType" v-on:cancelDialog="cancelDialog" :isDownThrSys="true"
-      ></thrOrderSelect>
-    </el-dialog>
+      >
+        <thrOrderSelect :selectType="selectType" v-on:cancelDialog="cancelDialog" :isDownThrSys="true"
+        ></thrOrderSelect>
+      </el-dialog>
 
       <pagination
         v-show="total>0"
@@ -175,6 +178,7 @@ import {selectIp} from "@/api/param/systemParamConfig";
 export default {
   data() {
     return {
+      showSearch: true,
       filterQuery: {
         genKey: null,
         status: null,
@@ -229,23 +233,26 @@ export default {
       };
       this.getList();
     },
+    hideSearch() {
+      this.showSearch = !this.showSearch;
+    },
     getList() {
       this.loading = true;
       filterLog(this.filterQuery)
-          .then((response) => {
-            if (response.code == 20000) {
-              this.list = response.data.list || [];
-              this.total = response.data.total || 0;
-            } else {
-              this.$message.error(response.message);
-            }
-            this.loading = false;
-          })
-          .catch(() => {
-            this.loading = false;
-            this.list = [];
-            this.total = 0;
-          });
+        .then((response) => {
+          if (response.code == 20000) {
+            this.list = response.data.list || [];
+            this.total = response.data.total || 0;
+          } else {
+            this.$message.error(response.message);
+          }
+          this.loading = false;
+        })
+        .catch(() => {
+          this.loading = false;
+          this.list = [];
+          this.total = 0;
+        });
     },
 
     handleDetailClick(row) {
@@ -276,44 +283,44 @@ export default {
         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(() => {
-          });
+        .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(() => {
+        });
     },
     getBasicThirdSys() {
       let query = {
         enabled: true,
       };
       getBasicThirdSys(query)
-          .then((response) => {
-            this.thirdSys = response.data.list || [];
-            this.filterQuery.thirdSysFk = this.thirdSys[0].thirdId;
-            this.uploadData.thirdSys = this.filterQuery.thirdSysFk;
-            this.getList();
-            this.getThirdSysDetail();
-            this.selectSysParam();
-          })
-          .catch(() => {
-            this.loading = false;
-            this.list = [];
-          });
+        .then((response) => {
+          this.thirdSys = response.data.list || [];
+          this.filterQuery.thirdSysFk = this.thirdSys[0].thirdId;
+          this.uploadData.thirdSys = this.filterQuery.thirdSysFk;
+          this.getList();
+          this.getThirdSysDetail();
+          this.selectSysParam();
+        })
+        .catch(() => {
+          this.loading = false;
+          this.list = [];
+        });
       axios.get("./config.json").then(res => {
         // 基础地址
         let response = res.data.BASE_URL;
@@ -371,13 +378,13 @@ export default {
         key: "orderQueryUrl",
       };
       filterDetailByKey(query)
-          .then((response) => {
-            this.thirdSysDetail = response.data;
-          })
-          .catch(() => {
-            this.loading = false;
-            this.list = [];
-          });
+        .then((response) => {
+          this.thirdSysDetail = response.data;
+        })
+        .catch(() => {
+          this.loading = false;
+          this.list = [];
+        });
       this.uploadData.thirdSys = this.filterQuery.thirdSysFk;
 
     },
@@ -412,12 +419,12 @@ export default {
         enabled: true,
       };
       getBussinessType(query)
-          .then((response) => {
-            this.busTypes = response.data.list || [];
-            this.filterQuery.billAction = this.busTypes[0].action;
-          })
-          .catch(() => {
-          });
+        .then((response) => {
+          this.busTypes = response.data.list || [];
+          this.filterQuery.billAction = this.busTypes[0].action;
+        })
+        .catch(() => {
+        });
     },
     formatter(row, index) {
       if (row.isE == true) {
diff --git a/src/views/thirdSys/order/thrOrderImportDetail.vue b/src/views/thirdSys/order/thrOrderImportDetail.vue
index 020f6c35..c8b2caca 100644
--- a/src/views/thirdSys/order/thrOrderImportDetail.vue
+++ b/src/views/thirdSys/order/thrOrderImportDetail.vue
@@ -1,164 +1,171 @@
 <template>
-    <div>
-        <el-card>
-            <el-form :inline="true" :model="query" size="mini">
-                <el-row>
-                    <el-form-item class="query-form-item">
-                        <el-input v-model="filterQuery.billNo" placeholder="请输入UDI编码"></el-input>
-                    </el-form-item>
+  <div>
+    <el-card>
+      <el-form :model="query" size="mini" label-width="100px" v-show="showSearch">
+        <el-row>
+          <el-col :span="6">
+            <el-form-item label="UDI编码:">
+              <el-input v-model="filterQuery.billNo" style="width: 90%" placeholder="请输入UDI编码"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
 
-                    <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="el-icon-search" @click="getList">查询</el-button>
-                        </el-button-group>
-                    </el-form-item>
-                </el-row>
-            </el-form>
+      <div class="top-right-btn">
+        <el-button-group style="display:flex;">
+          <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
+          <el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
+          <el-button type="primary" icon="el-icon-search" @click="getList">查询</el-button>
+        </el-button-group>
+      </div>
+      <el-divider style="margin: 15px"></el-divider>
+      <el-table
+        v-loading="loading"
+        :data="list"
+        style="width: 100%"
+        border highlight-current-row
+      >
+        <el-table-column label="序号" type="index"></el-table-column>
+        <el-table-column label="单据号" prop="billNo"></el-table-column>
+        <el-table-column label="往来单位ID" prop="corpId"
+                         show-overflow-tooltip="true"></el-table-column>
+        <el-table-column label="往来单位" prop="corpName"
+                         show-overflow-tooltip="true"></el-table-column>
 
-            <el-table
-                v-loading="loading"
-                :data="list"
-                style="width: 100%"
-                border highlight-current-row
-            >
-                <el-table-column label="序号" type="index"></el-table-column>
-                <el-table-column label="单据号" prop="billNo"></el-table-column>
-                <el-table-column label="往来单位ID" prop="corpId"
-                                 show-overflow-tooltip="true"></el-table-column>
-                <el-table-column label="往来单位" prop="corpName"
-                                 show-overflow-tooltip="true"></el-table-column>
-
-                <el-table-column label="扫码单据类型" prop="billType">
-                </el-table-column>
-                <el-table-column label="单据状态" prop="billFlag" width="80" show-overflow-tooltip="true"></el-table-column>
-                <el-table-column label="单据日期" prop="billdate" show-overflow-tooltip="true"></el-table-column>
-                <el-table-column label="产品编码" prop="productId" show-overflow-tooltip="true"></el-table-column>
-                <el-table-column label="产品名称" prop="productName" show-overflow-tooltip="true"></el-table-column>
-                <el-table-column label="规格型号" prop="spec" show-overflow-tooltip="true"></el-table-column>
-                <el-table-column label="批次号" prop="batchNo" show-overflow-tooltip="true"></el-table-column>
-                <el-table-column label="生产日期" prop="productDate" show-overflow-tooltip="true"></el-table-column>
-                <el-table-column label="失效日期" prop="expireDate" show-overflow-tooltip="true"></el-table-column>
-                <el-table-column label="单据数量" prop="reCount" show-overflow-tooltip="true"></el-table-column>
-                <el-table-column label="实际数量" prop="count" show-overflow-tooltip="true"></el-table-column>
-            </el-table>
-            <pagination
-            v-show="total>0"
-            :total="total"
-            :page.sync="filterQuery.page"
-            :limit.sync="filterQuery.limit"
-            @pagination="getList"
-            />
-        </el-card>
-    </div>
+        <el-table-column label="扫码单据类型" prop="billType">
+        </el-table-column>
+        <el-table-column label="单据状态" prop="billFlag" width="80" show-overflow-tooltip="true"></el-table-column>
+        <el-table-column label="单据日期" prop="billdate" show-overflow-tooltip="true"></el-table-column>
+        <el-table-column label="产品编码" prop="productId" show-overflow-tooltip="true"></el-table-column>
+        <el-table-column label="产品名称" prop="productName" show-overflow-tooltip="true"></el-table-column>
+        <el-table-column label="规格型号" prop="spec" show-overflow-tooltip="true"></el-table-column>
+        <el-table-column label="批次号" prop="batchNo" show-overflow-tooltip="true"></el-table-column>
+        <el-table-column label="生产日期" prop="productDate" show-overflow-tooltip="true"></el-table-column>
+        <el-table-column label="失效日期" prop="expireDate" show-overflow-tooltip="true"></el-table-column>
+        <el-table-column label="单据数量" prop="reCount" show-overflow-tooltip="true"></el-table-column>
+        <el-table-column label="实际数量" prop="count" show-overflow-tooltip="true"></el-table-column>
+      </el-table>
+      <pagination
+        v-show="total>0"
+        :total="total"
+        :page.sync="filterQuery.page"
+        :limit.sync="filterQuery.limit"
+        @pagination="getList"
+      />
+    </el-card>
+  </div>
 </template>
 
 <script>
-    import {
-        filterDetail,
-    } from "@/api/thrsys/thrOrderImport";
-
-    export default {
-        name: "ThrOrderImportDetail",
-        props: {
-            currentRow: {
-                type: Object,
-                required: true,
-            },
+import {
+  filterDetail,
+} from "@/api/thrsys/thrOrderImport";
 
-        },
-        data() {
-            return {
-                filterQuery: {
-                    genKey: null,
-                    billNo: null,
-                    status: null,
-                    page: 1,
-                    limit: 10,
-                },
-                list: [],
-                detailList: [],
-                total: 0,
-                status: {
-                    0: "未处理",
-                    1: "处理失败",
-                    2: "处理成功"
-                },
-            };
-        },
+export default {
+  name: "ThrOrderImportDetail",
+  props: {
+    currentRow: {
+      type: Object,
+      required: true,
+    },
 
-        methods: {
-            onReset() {
-                this.$router.push({
-                    path: "",
-                });
-                this.filterQuery = {
-                    genKey: null,
-                    billNo: null,
-                    status: null,
-                    page: 1,
-                    limit: 10,
-                };
-                this.getList();
-            },
-            getList() {
-                this.loading = true;
-                console.log(" this.genKey = " + this.currentRow)
-                this.filterQuery.genKey = this.currentRow.genKey;
-                filterDetail(this.filterQuery)
-                    .then((response) => {
-                        if (response.code == 20000) {
-                            this.list = response.data.list || [];
-                            this.total = response.data.total || 0;
-                        }else {
-                            this.$message.error(response.message);
-                        }
-                        this.loading = false;
-                    })
-                    .catch(() => {
-                        this.loading = false;
-                        this.list = [];
-                        this.total = 0;
-                    });
-            },
-            statusFilterType(status) {
-                const statusMap = {
-                    0: "warning",
-                    1: "danger",
-                    2: "success",
-                };
-                return statusMap[status];
-            },
-        },
-        mounted() {
-        },
-        created() {
-            this.getList();
-        },
-        filters: {},
+  },
+  data() {
+    return {
+      showSearch: true,
+      filterQuery: {
+        genKey: null,
+        billNo: null,
+        status: null,
+        page: 1,
+        limit: 10,
+      },
+      list: [],
+      detailList: [],
+      total: 0,
+      status: {
+        0: "未处理",
+        1: "处理失败",
+        2: "处理成功"
+      },
     };
+  },
+
+  methods: {
+    onReset() {
+      this.$router.push({
+        path: "",
+      });
+      this.filterQuery = {
+        genKey: null,
+        billNo: null,
+        status: null,
+        page: 1,
+        limit: 10,
+      };
+      this.getList();
+    },
+    hideSearch() {
+      this.showSearch = !this.showSearch;
+    },
+    getList() {
+      this.loading = true;
+      console.log(" this.genKey = " + this.currentRow)
+      this.filterQuery.genKey = this.currentRow.genKey;
+      filterDetail(this.filterQuery)
+        .then((response) => {
+          if (response.code == 20000) {
+            this.list = response.data.list || [];
+            this.total = response.data.total || 0;
+          } else {
+            this.$message.error(response.message);
+          }
+          this.loading = false;
+        })
+        .catch(() => {
+          this.loading = false;
+          this.list = [];
+          this.total = 0;
+        });
+    },
+    statusFilterType(status) {
+      const statusMap = {
+        0: "warning",
+        1: "danger",
+        2: "success",
+      };
+      return statusMap[status];
+    },
+  },
+  mounted() {
+  },
+  created() {
+    this.getList();
+  },
+  filters: {},
+};
 </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/thirdSys/order/thrOrderSelect.vue b/src/views/thirdSys/order/thrOrderSelect.vue
index 8b1435e0..ede914ac 100644
--- a/src/views/thirdSys/order/thrOrderSelect.vue
+++ b/src/views/thirdSys/order/thrOrderSelect.vue
@@ -1,132 +1,147 @@
 <template>
-    <div>
-        <el-card class="el-card">
-            <el-form :inline="true" :model="filterQuery"
-                     class="query-form" size="mini">
-                <el-row>
-                    <el-form-item class="query-form-item">
-                        <el-input
-                            v-model="filterQuery.billNo"
-                            placeholder="请输入单据号"
-                            clearable
-                        ></el-input>
-                    </el-form-item>
-                    <el-form-item class="query-form-item">
-                        <el-input
-                            v-model="filterQuery.corpName"
-                            placeholder="请输入往来单位"
-                            clearable
-                        ></el-input>
-                    </el-form-item>
-                    <el-form-item class="query-form-item">
-                        <el-select v-model="filterQuery.billAction" placeholder="请选择业务类型">
-                            <el-option
-                                v-for="item in originTypes"
-                                :key="item.name"
-                                :label="item.name"
-                                :value="item.action">
-                                <span style="float: left">{{ item.name }}</span>
-                                <!--<span style="float: right; color: #8492a6; font-size: 13px">{{ item.action }}</span>-->
-                            </el-option>
-                        </el-select>
-                    </el-form-item>
-                    <el-form-item class="query-form-item">
-                        <span style="color: #000; margin-left: 10px; margin-right: 6px">单据日期:</span>
-                        <el-date-picker
-                            :picker-options="pickerOptions"
-                            v-model="actDateRange"
-                            type="daterange"
-                            format="yyyy 年 MM 月 dd 日"
-                            value-format="yyyy-MM-dd"
-                            range-separator="至"
-                            start-placeholder="开始日期"
-                            end-placeholder="结束日期"
-                        >
-                        </el-date-picker>
-                    </el-form-item>
-                    <el-form-item>
-                        <el-button-group style="display:flex;">
-                            <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
-                            <el-button type="primary" icon="search" @click="getList">查询</el-button>
-                            <el-button type="primary" icon="el-icon-upload2" @click="selectExport" v-if="selectType==0"
-                            >选中导出
-                            </el-button>
-                            <el-button type="primary" icon="el-icon-upload2" @click="allExport" v-if="selectType==0"
-                            >结果全部导出
-                            </el-button>
-                            <el-button type="primary" icon="search" @click="uploadSMP"
-                                       v-if="selectType==1"
-                            >选中上传
-                            </el-button>
-                            <el-button type="primary" icon="search" @click="allUploadSMP"
-                                       v-if="selectType==1"
-                            >一键上传
-                            </el-button>
-                            <el-button type="primary" icon="el-icon-download" @click="downloadErp" v-if="selectType==3"
-                            >选中下载
-                            </el-button>
-                            <el-button type="primary" icon="el-icon-download" @click="downloadAllErp" v-if="selectType==3"
-                            >结果全部下载
-                            </el-button>
-                        </el-button-group>
-                    </el-form-item>
-                </el-row>
-            </el-form>
-            <el-table v-loading="loading" :data="list" style="width: 100%" border highlight-current-row
-                      @selection-change="handleSelectionChange"
-                      @current-change="handleDetail">
-                <el-table-column type="selection" width="55"></el-table-column>
-                <el-table-column label="序号" type="index" width="60"></el-table-column>
-                <el-table-column label="单据号" prop="billNo"></el-table-column>
+  <div>
+    <el-card class="el-card">
+      <el-form :model="filterQuery" size="mini" label-width="100px" v-show="showSearch">
+        <el-row>
+          <el-col :span="6">
+            <el-form-item label="单据号:">
+              <el-input
+                v-model="filterQuery.billNo"
+                style="width: 90%"
+                placeholder="请输入单据号"
+                clearable
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="往来单位:">
+              <el-input
+                v-model="filterQuery.corpName"
+                style="width: 90%"
+                placeholder="请输入往来单位"
+                clearable
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="业务类型:">
+              <el-select v-model="filterQuery.billAction" placeholder="请选择业务类型">
+                <el-option
+                  v-for="item in originTypes"
+                  style="width: 90%"
+                  :key="item.name"
+                  :label="item.name"
+                  :value="item.action">
+                  <span style="float: left">{{ item.name }}</span>
+                  <!--<span style="float: right; color: #8492a6; font-size: 13px">{{ item.action }}</span>-->
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="单据日期:">
+              <el-date-picker
+                :picker-options="pickerOptions"
+                v-model="actDateRange"
+                style="width: 90%"
+                type="daterange"
+                format="yyyy 年 MM 月 dd 日"
+                value-format="yyyy-MM-dd"
+                range-separator="至"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+              >
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
 
-                <el-table-column label="往来单位ID" prop="corpId" width="100"></el-table-column>
-                <el-table-column label="往来单位" prop="corpName" width="300"
-                                 show-overflow-tooltip="true"></el-table-column>
-                <el-table-column label="第三方单据类型" prop="originType"></el-table-column>
-                <el-table-column label="扫码单据类型" prop="billType">
 
-                    <template slot-scope="scope">
-                        <span>{{ geActionName(scope.row.billType) }}</span>
-                    </template>
+      <div class="top-right-btn">
+        <el-button-group style="display:flex;">
+          <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
+          <el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
+          <el-button type="primary" icon="el-icon-search" @click="getList">查询</el-button>
+          <el-button type="primary" icon="el-icon-upload2" @click="selectExport" v-if="selectType==0"
+          >选中导出
+          </el-button>
+          <el-button type="primary" icon="el-icon-upload2" @click="allExport" v-if="selectType==0"
+          >结果全部导出
+          </el-button>
+          <el-button type="primary" icon="el-icon-top-upload" @click="uploadSMP"
+                     v-if="selectType==1"
+          >选中上传
+          </el-button>
+          <el-button type="primary" icon="el-icon-top-upload" @click="allUploadSMP"
+                     v-if="selectType==1"
+          >一键上传
+          </el-button>
+          <el-button type="primary" icon="el-icon-download" @click="downloadErp" v-if="selectType==3"
+          >选中下载
+          </el-button>
+          <el-button type="primary" icon="el-icon-download" @click="downloadAllErp" v-if="selectType==3"
+          >结果全部下载
+          </el-button>
+        </el-button-group>
+      </div>
+      <el-divider style="margin: 15px"></el-divider>
 
-                </el-table-column>
-                <el-table-column label="单据状态" prop="billFlag" width="80"></el-table-column>
-                <el-table-column label="单据日期" prop="billdate"></el-table-column>
+      <el-table v-loading="loading" :data="list" style="width: 100%" border highlight-current-row
+                @selection-change="handleSelectionChange"
+                @current-change="handleDetail">
+        <el-table-column type="selection" width="55"></el-table-column>
+        <el-table-column label="序号" type="index" width="60"></el-table-column>
+        <el-table-column label="单据号" prop="billNo"></el-table-column>
 
-                <el-table-column label="操作"  v-if="thirdSysDetail.fromType!=0">
-                    <template slot-scope="scope">
-                        <el-button type="text" size="small" @click.native.stop="deleteDialog(scope.row)"
-                        >删除
-                        </el-button>
-                    </template>
-                </el-table-column>
-            </el-table>
-          <pagination
-            v-show="total>0"
-            :total="total"
-            :page.sync="filterQuery.page"
-            :limit.sync="filterQuery.limit"
-            @pagination="getList"
-          />
-        </el-card>
-        <el-card class="el-card">
-            <el-table v-loading="loading" :data="detailList" style="width: 100%" border highlight-current-row>
-                <el-table-column label="序号" type="index" width="120"></el-table-column>
-                <el-table-column label="产品编码" prop="productId"></el-table-column>
-                <el-table-column label="产品名称" prop="productName" show-overflow-tooltip="true"></el-table-column>
-                <el-table-column label="规格型号" prop="spec" show-overflow-tooltip="true"></el-table-column>
-                <el-table-column label="批次号" prop="batchNo"></el-table-column>
-                <el-table-column label="生产日期" prop="productDate"></el-table-column>
-                <el-table-column label="失效日期" prop="expireDate"></el-table-column>
-                <el-table-column label="单据数量" prop="reCount"></el-table-column>
-                <el-table-column label="实际数量" prop="count"></el-table-column>
-            </el-table>
-        </el-card>
-    </div>
+        <el-table-column label="往来单位ID" prop="corpId" width="100"></el-table-column>
+        <el-table-column label="往来单位" prop="corpName" width="300"
+                         show-overflow-tooltip="true"></el-table-column>
+        <el-table-column label="第三方单据类型" prop="originType"></el-table-column>
+        <el-table-column label="扫码单据类型" prop="billType">
+
+          <template slot-scope="scope">
+            <span>{{ geActionName(scope.row.billType) }}</span>
+          </template>
+
+        </el-table-column>
+        <el-table-column label="单据状态" prop="billFlag" width="80"></el-table-column>
+        <el-table-column label="单据日期" prop="billdate"></el-table-column>
+
+        <el-table-column label="操作" v-if="thirdSysDetail.fromType!=0" width="60">
+          <template slot-scope="scope">
+            <el-button type="text" size="small" @click.native.stop="deleteDialog(scope.row)"
+            >删除
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <pagination
+        v-show="total>0"
+        :total="total"
+        :page.sync="filterQuery.page"
+        :limit.sync="filterQuery.limit"
+        @pagination="getList"
+      />
+    </el-card>
+    <el-card class="el-card">
+      <el-table v-loading="loading" :data="detailList" style="width: 100%" border highlight-current-row>
+        <el-table-column label="序号" type="index" width="120"></el-table-column>
+        <el-table-column label="产品编码" prop="productId"></el-table-column>
+        <el-table-column label="产品名称" prop="productName" show-overflow-tooltip="true"></el-table-column>
+        <el-table-column label="规格型号" prop="spec" show-overflow-tooltip="true"></el-table-column>
+        <el-table-column label="批次号" prop="batchNo"></el-table-column>
+        <el-table-column label="生产日期" prop="productDate"></el-table-column>
+        <el-table-column label="失效日期" prop="expireDate"></el-table-column>
+        <el-table-column label="单据数量" prop="reCount"></el-table-column>
+        <el-table-column label="实际数量" prop="count"></el-table-column>
+      </el-table>
+    </el-card>
+  </div>
 </template>
 <script>
 import {
-    delThrOrders, delAll, downloadAll, orderDownload
+  delThrOrders, delAll, downloadAll, orderDownload
 } from "@/api/thrsys/thrOrder";
 import {getBussinessType} from "@/api/basic/bussinessType";
 import {getBasicThirdSys, filterDetailByKey} from "@/api/basic/basicThirdSys";
@@ -137,416 +152,419 @@ import {orderUpload} from "@/api/thrsys/smp"
 import {getOriginBusType} from "@/api/basic/busOriginType";
 
 export default {
-    name: "ThrOrderSelect",
-    props: {
-        selectType: {
-            type: Object,
-            required: true,
-        },
-        isDownThrSys: {
-            type: Object,
-            required: true,
-        },
-
+  name: "ThrOrderSelect",
+  props: {
+    selectType: {
+      type: Object,
+      required: true,
+    },
+    isDownThrSys: {
+      type: Object,
+      required: true,
     },
-    data() {
-        return {
-            filterQuery: {
-                erpOrderResponses: [],
-                billNo: "",
-                thirdSysFk: "",
-                billFlag: null,
-                billAction: null,
-                startDate: null,
-                endDate: null,
-                page: 1,
-                limit: 10,
-                isDownThrSys: null,
+
+  },
+  data() {
+    return {
+      showSearch: true,
+      filterQuery: {
+        erpOrderResponses: [],
+        billNo: "",
+        thirdSysFk: "",
+        billFlag: null,
+        billAction: null,
+        startDate: null,
+        endDate: null,
+        page: 1,
+        limit: 10,
+        isDownThrSys: null,
+      },
+      total: 0,
+      thirdSys: [],
+      thirdSysDetail: null,
+      busTypes: [],
+      originTypes: [],
+      list: [],
+      detailList: [],
+      uploadFileUrl: null,
+      fileList: [],
+      uploadData: {
+        thirdSys: "thirdId",
+      },
+      loading: false,
+      multipleSelection: [],
+      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]);
             },
-            total: 0,
-            thirdSys: [],
-            thirdSysDetail: null,
-            busTypes: [],
-            originTypes: [],
-            list: [],
-            detailList: [],
-            uploadFileUrl: null,
-            fileList: [],
-            uploadData: {
-                thirdSys: "thirdId",
+          },
+          {
+            text: "最近一个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+              picker.$emit("pick", [start, end]);
             },
-            loading: false,
-            multipleSelection: [],
-            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]);
-                        },
-                    },
-                ],
+          },
+          {
+            text: "最近三个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+              picker.$emit("pick", [start, end]);
             },
-        };
-    },
+          },
+        ],
+      },
+    };
+  },
 
-    methods: {
-        onReset() {
-            this.$router.push({
-                path: "",
-            });
-            this.filterQuery = {
-                erpOrderResponses: [],
-                billNo: "",
-                thirdSysFk: "",
-                billFlag: null,
-                billAction: null,
-                startDate: null,
-                endDate: null,
-                page: 1,
-                limit: 10,
-                isDownThrSys: null,
-            };
-            this.actDateRange = [];
-            this.getList();
-        },
-
-        getList() {
-            if (this.filterQuery.thirdSysFk == null) {
-                this.$message.warning("请先选择第三方系统！")
-                return;
-            }
-            if (this.actDateRange != null) {
-                this.filterQuery.startDate = this.actDateRange[0];
-                this.filterQuery.endDate = this.actDateRange[1];
-            } else {
-                this.filterQuery.startDate = null;
-                this.filterQuery.endDate = null;
-            }
+  methods: {
+    onReset() {
+      this.$router.push({
+        path: "",
+      });
+      this.filterQuery = {
+        erpOrderResponses: [],
+        billNo: "",
+        thirdSysFk: "",
+        billFlag: null,
+        billAction: null,
+        startDate: null,
+        endDate: null,
+        page: 1,
+        limit: 10,
+        isDownThrSys: null,
+      };
+      this.actDateRange = [];
+      this.getList();
+    },
+    hideSearch() {
+      this.showSearch = !this.showSearch;
+    },
+    getList() {
+      if (this.filterQuery.thirdSysFk == null) {
+        this.$message.warning("请先选择第三方系统！")
+        return;
+      }
+      if (this.actDateRange != null) {
+        this.filterQuery.startDate = this.actDateRange[0];
+        this.filterQuery.endDate = this.actDateRange[1];
+      } else {
+        this.filterQuery.startDate = null;
+        this.filterQuery.endDate = null;
+      }
 
-            this.loading = true;
-            this.filterQuery.isDownThrSys = this.isDownThrSys;
-            getThirdSysOrder(this.filterQuery)
-                .then((response) => {
-                    if (response.code == 20000) {
-                        this.list = response.data.list || [];
-                        this.total = response.data.total || 0;
-                    } else {
-                        this.$message.error(response.message);
-                    }
-                    this.loading = false;
-                })
-                .catch(() => {
-                    this.loading = false;
-                    this.list = [];
-                    this.total = 0;
-                });
-        },
-        handleDetail(row) {
-            this.detailList = row.subErpOrders;
-        },
-        handleSelectionChange(val) {
-            this.multipleSelection = val;
-        },
-        selectExport() {
-            var selectData = this.multipleSelection;
-            selectData.forEach((obj) => {
-                this.filterQuery.erpOrderResponses.push(obj);
+      this.loading = true;
+      this.filterQuery.isDownThrSys = this.isDownThrSys;
+      getThirdSysOrder(this.filterQuery)
+        .then((response) => {
+          if (response.code == 20000) {
+            this.list = response.data.list || [];
+            this.total = response.data.total || 0;
+          } else {
+            this.$message.error(response.message);
+          }
+          this.loading = false;
+        })
+        .catch(() => {
+          this.loading = false;
+          this.list = [];
+          this.total = 0;
+        });
+    },
+    handleDetail(row) {
+      this.detailList = row.subErpOrders;
+    },
+    handleSelectionChange(val) {
+      this.multipleSelection = val;
+    },
+    selectExport() {
+      var selectData = this.multipleSelection;
+      selectData.forEach((obj) => {
+        this.filterQuery.erpOrderResponses.push(obj);
+      });
+      this.allExport();
+    },
+    allExport() {
+      exportExcel(this.filterQuery)
+        .then((response) => {
+          if (response.code == 20000) {
+            this.$message({
+              type: "success",
+              message: "导出成功，后台正在生成Excel文件，请稍后刷新查看！",
             });
-            this.allExport();
-        },
-        allExport() {
-            exportExcel(this.filterQuery)
-                .then((response) => {
-                    if (response.code == 20000) {
-                        this.$message({
-                            type: "success",
-                            message: "导出成功，后台正在生成Excel文件，请稍后刷新查看！",
-                        });
-                    } else {
-                        this.$message({
-                            type: "error",
-                            message: response.message,
-                        });
-                    }
-                    this.$emit("cancelDialog", true);
-                })
-                .catch(() => {
-                    this.$message({
-                        type: "error",
-                        message: "上传失败",
-                    });
-                });
-        },
-
-        uploadSMP() {
-            var selectData = this.multipleSelection;
-            selectData.forEach((obj) => {
-                this.filterQuery.erpOrderResponses.push(obj);
+          } else {
+            this.$message({
+              type: "error",
+              message: response.message,
             });
-            this.allUploadSMP();
-        },
-
-        allUploadSMP() {
-            orderUpload(this.filterQuery)
-                .then((response) => {
-                    if (response.code == 20000) {
-                        this.$message.success("提交成功，后台正在上传！")
-                    } else {
-                        this.$message.error(response.message)
-                    }
-                    this.$emit("cancelDialog", true);
-                })
-                .catch(() => {
-                    this.$message.error("上传失败！");
-                });
-        },
-
+          }
+          this.$emit("cancelDialog", true);
+        })
+        .catch(() => {
+          this.$message({
+            type: "error",
+            message: "上传失败",
+          });
+        });
+    },
 
-        downloadErp() {
-            var selectData = this.multipleSelection;
-            selectData.forEach((obj) => {
-                this.filterQuery.erpOrderResponses.push(obj);
-            });
-            this.downloadAllErp();
-        },
+    uploadSMP() {
+      var selectData = this.multipleSelection;
+      selectData.forEach((obj) => {
+        this.filterQuery.erpOrderResponses.push(obj);
+      });
+      this.allUploadSMP();
+    },
 
-        downloadAllErp() {
-            orderDownload(this.filterQuery)
-                .then((response) => {
-                    if (response.code == 20000) {
-                        this.$message.success("提交成功，后台正在下载！")
+    allUploadSMP() {
+      orderUpload(this.filterQuery)
+        .then((response) => {
+          if (response.code == 20000) {
+            this.$message.success("提交成功，后台正在上传！")
+          } else {
+            this.$message.error(response.message)
+          }
+          this.$emit("cancelDialog", true);
+        })
+        .catch(() => {
+          this.$message.error("上传失败！");
+        });
+    },
 
-                    } else {
-                        this.$message.error(response.message)
-                    }
-                    this.$emit("cancelDialog", true);
-                })
-                .catch(() => {
-                    this.$message.error("下载失败！");
-                });
-        },
 
-        deleteDialog(row) {
-            this.$confirm("此操作将永久删除该单据, 是否继续?", "提示", {
-                confirmButtonText: "确定",
-                cancelButtonText: "取消",
-                type: "warning",
-            })
-                .then(() => {
-                    let dQuery = {
-                        id: row.id,
-                    };
-                    delThrOrders(dQuery)
-                        .then((response) => {
-                            this.loading = false;
-                            if (response.code == 20000) {
-                                this.$message.success("删除成功");
-                                this.getList();
-                            } else {
-                                this.$message.error(response.message);
-                            }
-                        })
-                        .catch(() => {
-                            this.loading = false;
-                        });
+    downloadErp() {
+      var selectData = this.multipleSelection;
+      selectData.forEach((obj) => {
+        this.filterQuery.erpOrderResponses.push(obj);
+      });
+      this.downloadAllErp();
+    },
 
-                })
-                .catch(() => {
-                });
-        },
-        clearAll() {
-            this.$confirm("此操作将清空所有单据, 是否继续?", "提示", {
-                confirmButtonText: "确定",
-                cancelButtonText: "取消",
-                type: "warning",
-            })
-                .then(() => {
-                    delAll()
-                        .then((response) => {
-                            this.loading = false;
-                            if (response.code == 20000) {
-                                this.$message.success("删除成功");
-                                this.getList();
-                            } else {
-                                this.$message.success(response.message);
-                            }
-                        })
-                        .catch(() => {
-                            this.loading = false;
-                        });
+    downloadAllErp() {
+      orderDownload(this.filterQuery)
+        .then((response) => {
+          if (response.code == 20000) {
+            this.$message.success("提交成功，后台正在下载！")
 
-                })
-                .catch(() => {
-                });
-        },
-        getBasicThirdSys() {
-            let query = {
-                enabled: true,
-            };
-            getBasicThirdSys(query)
-                .then((response) => {
-                    this.thirdSys = response.data.list || [];
-                    this.filterQuery.thirdSysFk = this.thirdSys[0].thirdId;
-                    this.uploadData.thirdSys = this.filterQuery.thirdSysFk;
-                    this.selectSysParam();
-                    this.getThirdSysDetail();
-                    this.getBusType();
+          } else {
+            this.$message.error(response.message)
+          }
+          this.$emit("cancelDialog", true);
+        })
+        .catch(() => {
+          this.$message.error("下载失败！");
+        });
+    },
 
-                })
-                .catch(() => {
-                    this.loading = false;
-                    this.list = [];
-                });
-            getOriginBusType()
-                .then((response) => {
-                    this.originTypes = response.data.list || [];
-                })
-                .catch(() => {
-                });
-        },
-        handleChange(response, files, fileList) {
-            console.log(response);
-            if (response.code != 20000) {
+    deleteDialog(row) {
+      this.$confirm("此操作将永久删除该单据, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          let dQuery = {
+            id: row.id,
+          };
+          delThrOrders(dQuery)
+            .then((response) => {
+              this.loading = false;
+              if (response.code == 20000) {
+                this.$message.success("删除成功");
+                this.getList();
+              } else {
                 this.$message.error(response.message);
-            } else {
-                console.log(files[0] + "\n" + this.fileList[0] + "\n" + fileList[0]);
-                this.$message.success("文件上传成功,请稍后刷新查看！");
-            }
-        },
-        selectSysParam() {
-            let query = {
-                key: "thirdIpUrl",
-                thirdSysFk: this.filterQuery.thirdSysFk
-            };
-            selectIp(query).then((response) => {
-                if (response.code == 20000) {
-                    this.uploadFileUrl = response.data.thridUrl + "/udiwms/erp/pi/upload";
-                }
+              }
+            })
+            .catch(() => {
+              this.loading = false;
             });
-        },
-        thirdSysChange() {
-            this.uploadData.thirdSys = this.filterQuery.thirdSysFk;
-            this.getThirdSysDetail();
-        },
-        getThirdSysDetail() {
-            let query = {
-                thirdSysFk: this.filterQuery.thirdSysFk,
-                key: "orderQueryUrl",
-            };
-            filterDetailByKey(query)
-                .then((response) => {
-                    this.thirdSysDetail = response.data;
-                })
-                .catch(() => {
-                    this.loading = false;
-                    this.list = [];
-                });
 
-        },
-        downloadDatas() {
-            let query = {
-                billAction: this.filterQuery.billAction
-            };
-            downloadAll(query).then((response) => {
-                if (response.code == 20000) {
-                    this.$message.success(response.data);
-                } else {
-                    this.$message.error(response.message);
-                }
+        })
+        .catch(() => {
+        });
+    },
+    clearAll() {
+      this.$confirm("此操作将清空所有单据, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          delAll()
+            .then((response) => {
+              this.loading = false;
+              if (response.code == 20000) {
+                this.$message.success("删除成功");
+                this.getList();
+              } else {
+                this.$message.success(response.message);
+              }
+            })
+            .catch(() => {
+              this.loading = false;
             });
 
-        },
-        getBusType() {
-            let query = {
-                enabled: true,
-            };
-            getBussinessType(query)
-                .then((response) => {
-                    this.busTypes = response.data.list || [];
-                    // this.filterQuery.billAction = this.busTypes[0].action;
-                    this.getList();
-                })
-                .catch(() => {
-                });
-        },
-        geActionName(action) {
-            for (let i = 0; i < this.busTypes.length; i++) {
-                if (this.busTypes[i].action === action) {
-                    return this.busTypes[i].name;
-                }
-            }
-            return action;
-        },
+        })
+        .catch(() => {
+        });
+    },
+    getBasicThirdSys() {
+      let query = {
+        enabled: true,
+      };
+      getBasicThirdSys(query)
+        .then((response) => {
+          this.thirdSys = response.data.list || [];
+          this.filterQuery.thirdSysFk = this.thirdSys[0].thirdId;
+          this.uploadData.thirdSys = this.filterQuery.thirdSysFk;
+          this.selectSysParam();
+          this.getThirdSysDetail();
+          this.getBusType();
 
+        })
+        .catch(() => {
+          this.loading = false;
+          this.list = [];
+        });
+      getOriginBusType()
+        .then((response) => {
+          this.originTypes = response.data.list || [];
+        })
+        .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("文件上传成功,请稍后刷新查看！");
+      }
+    },
+    selectSysParam() {
+      let query = {
+        key: "thirdIpUrl",
+        thirdSysFk: this.filterQuery.thirdSysFk
+      };
+      selectIp(query).then((response) => {
+        if (response.code == 20000) {
+          this.uploadFileUrl = response.data.thridUrl + "/udiwms/erp/pi/upload";
+        }
+      });
     },
-    components: {},
-    mounted() {
+    thirdSysChange() {
+      this.uploadData.thirdSys = this.filterQuery.thirdSysFk;
+      this.getThirdSysDetail();
     },
-    created() {
-        let end = new Date();
-        let start = new Date();
-        start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
-        this.actDateRange = [start, end];
-        this.getBasicThirdSys();
+    getThirdSysDetail() {
+      let query = {
+        thirdSysFk: this.filterQuery.thirdSysFk,
+        key: "orderQueryUrl",
+      };
+      filterDetailByKey(query)
+        .then((response) => {
+          this.thirdSysDetail = response.data;
+        })
+        .catch(() => {
+          this.loading = false;
+          this.list = [];
+        });
 
+    },
+    downloadDatas() {
+      let query = {
+        billAction: this.filterQuery.billAction
+      };
+      downloadAll(query).then((response) => {
+        if (response.code == 20000) {
+          this.$message.success(response.data);
+        } else {
+          this.$message.error(response.message);
+        }
+      });
 
     },
+    getBusType() {
+      let query = {
+        enabled: true,
+      };
+      getBussinessType(query)
+        .then((response) => {
+          this.busTypes = response.data.list || [];
+          // this.filterQuery.billAction = this.busTypes[0].action;
+          this.getList();
+        })
+        .catch(() => {
+        });
+    },
+    geActionName(action) {
+      for (let i = 0; i < this.busTypes.length; i++) {
+        if (this.busTypes[i].action === action) {
+          return this.busTypes[i].name;
+        }
+      }
+      return action;
+    },
+
+  },
+  components: {},
+  mounted() {
+  },
+  created() {
+    let end = new Date();
+    let start = new Date();
+    start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+    this.actDateRange = [start, end];
+    this.getBasicThirdSys();
+
+
+  },
 };
 </script>
 <style scoped>
 .itemTag {
-    float: left;
-    text-align: left;
-    margin-top: 10px;
-    width: 25%;
+  float: left;
+  text-align: left;
+  margin-top: 10px;
+  width: 25%;
 }
 
 .text {
-    font-size: 13px;
-    font-family: "Microsoft YaHei";
+  font-size: 13px;
+  font-family: "Microsoft YaHei";
 }
 
 .query-form {
-    margin-top: 10px;
-    display: flex;
+  margin-top: 10px;
+  display: flex;
 }
 
 .query-form-item {
-    display: block !important;
-    margin-right: 10px;
-    margin-bottom: 5px;
+  display: block !important;
+  margin-right: 10px;
+  margin-bottom: 5px;
 }
 
 .el-row {
-    display: flex;
-    flex-wrap: wrap;
+  display: flex;
+  flex-wrap: wrap;
 }
 
 .el-col {
-    border-radius: 4px;
-    flex-wrap: wrap;
+  border-radius: 4px;
+  flex-wrap: wrap;
 }
 </style>