From 1eba7ce18429cb9275c12c4d648658612abb5949 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 14:09:42 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AC=AC=E4=B8=89=E6=96=B9=E5=BA=93=E5=AD=98?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=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

---
 .../thirdSys/invProducts/thrInvProducts.vue   | 600 +++++++-------
 .../invProducts/thrInvProductsExport.vue      | 543 ++++++------
 .../invProducts/thrInvProductsImport.vue      | 775 +++++++++---------
 .../thrInvProductsImportDetail.vue            | 314 +++----
 .../invProducts/thrInvProductsSelect.vue      | 112 ++-
 .../thirdSys/product/thrProductsImport.vue    |   2 +-
 6 files changed, 1200 insertions(+), 1146 deletions(-)

diff --git a/src/views/thirdSys/invProducts/thrInvProducts.vue b/src/views/thirdSys/invProducts/thrInvProducts.vue
index 13b2cbbf..39b5ccda 100644
--- a/src/views/thirdSys/invProducts/thrInvProducts.vue
+++ b/src/views/thirdSys/invProducts/thrInvProducts.vue
@@ -1,313 +1,345 @@
 <template>
-    <div>
-      <el-card>
-        <el-form :inline="true" :model="filterQuery" class="query-form" size="mini">
-            <el-form-item class="query-form-item">
-                <el-input
-                    v-model="filterQuery.inventoryCode" clearable
-                    placeholder="请输入产品编码"
-                ></el-input>
+  <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.inventoryCode" clearable
+                style="width: 90%"
+                placeholder="请输入产品编码"
+              ></el-input>
             </el-form-item>
-            <el-form-item class="query-form-item">
-                <el-input
-                    v-model="filterQuery.inventoryName" clearable
-                    placeholder="请输入产品名称"
-                ></el-input>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="产品名称:">
+              <el-input
+                v-model="filterQuery.inventoryName" clearable
+                style="width: 90%"
+                placeholder="请输入产品名称"
+              ></el-input>
             </el-form-item>
-            <el-form-item class="query-form-item">
-                <el-input
-                    v-model="filterQuery.spec" clearable
-                    placeholder="请输入规格型号"
-                ></el-input>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="规格型号:">
+              <el-input
+                v-model="filterQuery.spec" clearable
+                style="width: 90%"
+                placeholder="请输入规格型号"
+              ></el-input>
             </el-form-item>
-            <el-form-item class="query-form-item">
-                <el-input
-                    v-model="filterQuery.registerCertNo" clearable
-                    placeholder="请输入注册/备案凭证号"
-                ></el-input>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label-width="120px"  label="注册/备案凭证号:">
+              <el-input
+                v-model="filterQuery.registerCertNo" clearable
+                style="width: 90%"
+                placeholder="请输入注册/备案凭证号"
+              ></el-input>
             </el-form-item>
-            <el-form-item class="query-form-item">
-                <el-input
-                    v-model="filterQuery.manufactory" clearable
-                    placeholder="请输入生厂厂家"
-                ></el-input>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="6">
+            <el-form-item label="生厂厂家:">
+              <el-input
+                v-model="filterQuery.manufactory" clearable
+                style="width: 90%"
+                placeholder="请输入生厂厂家"
+              ></el-input>
             </el-form-item>
-            <el-form-item class="query-form-item">
-                <el-select v-model="filterQuery.filterCount" placeholder="过滤条件">
-                    <el-option label="全部" value="0"></el-option>
-                    <el-option label="库存等于0" value="1"></el-option>
-                    <el-option label="库存大于0" value="2"></el-option>
-                </el-select>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="库存:">
+              <el-select v-model="filterQuery.filterCount" style="width: 90%" placeholder="过滤条件">
+                <el-option label="全部" value="0"></el-option>
+                <el-option label="库存等于0" value="1"></el-option>
+                <el-option label="库存大于0" value="2"></el-option>
+              </el-select>
             </el-form-item>
-            <el-form-item class="query-form-item">
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="外部系统:">
 
-                <el-select v-model="filterQuery.thirdSys" placeholder="请选择第三方系统">
-                    <el-option
-                        v-for="item in thirdSys"
-                        :key="item.value"
-                        :label="item.thirdName"
-                        :value="item.thirdId">
-                        <span style="float: left">{{ item.thirdName }}</span>
-                        <span style="float: right; color: #8492a6; font-size: 13px">{{ item.thirdId }}</span>
-                    </el-option>
-                </el-select>
+              <el-select v-model="filterQuery.thirdSys" style="width: 90%" placeholder="请选择第三方系统">
+                <el-option
+                  v-for="item in thirdSys"
+                  :key="item.value"
+                  :label="item.thirdName"
+                  :value="item.thirdId">
+                  <span style="float: left">{{ item.thirdName }}</span>
+                  <span style="float: right; color: #8492a6; font-size: 13px">{{ item.thirdId }}</span>
+                </el-option>
+              </el-select>
             </el-form-item>
-            <el-form-item>
-                <el-button-group style="display:flex;">
-                    <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
-                    <el-button type="primary" icon="el-icon-search" @click="getList">查询</el-button>
-                    <el-button type="primary" icon="search" @click="clearAll"
-                               v-if="!this.thirdSysDetail.enabled">清空全部
-                    </el-button>
-                </el-button-group>
-            </el-form-item>
-        </el-form>
-        <el-table v-loading="loading" :data="list" style="width: 100%" border highlight-current-row>
-            <el-table-column label="序号" type="index" width="70"></el-table-column>
-            <el-table-column label="产品编码" prop="code" show-overflow-tooltip></el-table-column>
-            <el-table-column label="产品名称" prop="name" show-overflow-tooltip></el-table-column>
-            <el-table-column label="规格型号" prop="spec" show-overflow-tooltip></el-table-column>
-            <el-table-column label="批次号" prop="batchNo" show-overflow-tooltip></el-table-column>
-            <el-table-column label="生产日期" prop="manufacturingDate" show-overflow-tooltip></el-table-column>
-            <el-table-column label="失效日期" prop="expirationDate" show-overflow-tooltip></el-table-column>
-            <el-table-column label="数量" prop="count" show-overflow-tooltip></el-table-column>
-            <el-table-column label="注册证号" prop="registerCertNo" show-overflow-tooltip></el-table-column>
-            <el-table-column label="生产厂家" prop="manufactory" show-overflow-tooltip></el-table-column>
-            <el-table-column label="仓位" prop="warehouseName" show-overflow-tooltip></el-table-column>
-            <el-table-column label="货位" prop="spaceName" show-overflow-tooltip></el-table-column>
+          </el-col>
+        </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 type="primary" icon="el-icon-delete-solid" @click="clearAll"
+                     v-if="!this.thirdSysDetail.enabled">清空全部
+          </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" width="70"></el-table-column>
+        <el-table-column label="产品编码" prop="code" show-overflow-tooltip></el-table-column>
+        <el-table-column label="产品名称" prop="name" show-overflow-tooltip></el-table-column>
+        <el-table-column label="规格型号" prop="spec" show-overflow-tooltip></el-table-column>
+        <el-table-column label="批次号" prop="batchNo" show-overflow-tooltip></el-table-column>
+        <el-table-column label="生产日期" prop="manufacturingDate" show-overflow-tooltip></el-table-column>
+        <el-table-column label="失效日期" prop="expirationDate" show-overflow-tooltip></el-table-column>
+        <el-table-column label="数量" prop="count" show-overflow-tooltip></el-table-column>
+        <el-table-column label="注册证号" prop="registerCertNo" show-overflow-tooltip></el-table-column>
+        <el-table-column label="生产厂家" prop="manufactory" show-overflow-tooltip></el-table-column>
+        <el-table-column label="仓位" prop="warehouseName" show-overflow-tooltip></el-table-column>
+        <el-table-column label="货位" prop="spaceName" show-overflow-tooltip></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>
-    </div>
+        <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>
+  </div>
 </template>
 
 <script>
-    import {delInvProducts, delAll, downloadAll} from "@/api/thrsys/thrInvProducts";
-    import {getBasicThirdSys, filterDetailByKey} from "@/api/basic/basicThirdSys";
-    import {selectIp} from "@/api/param/systemParamConfig";
-    import {getOnhands} from "@/api/inventory/onHand.js";
+import {delInvProducts, delAll, downloadAll} from "@/api/thrsys/thrInvProducts";
+import {getBasicThirdSys, filterDetailByKey} from "@/api/basic/basicThirdSys";
+import {selectIp} from "@/api/param/systemParamConfig";
+import {getOnhands} from "@/api/inventory/onHand.js";
 
-    export default {
-        data() {
-            return {
-                filterQuery: {
-                    inventoryCode: null,
-                    inventoryName: null,
-                    spec: null,
-                    registerCertNo: null,
-                    manufactory: null,
-                    thirdSys: null,
-                    page: 1,
-                    limit: 100,
-                    filterCount:null,
-                },
-                total: 0,
-                list: [],
-                thirdSys: [],
-                thirdSysDetail: null,
-                fileList: [],
-                uploadData: {
-                    thirdSys: "thirdId",
-                },
-                uploadFileUrl: null,
-            };
-        },
-
-        methods: {
-            onReset() {
-                this.$router.push({
-                    path: "",
-                });
-                this.filterQuery = {
-                    inventoryCode: null,
-                    inventoryName: null,
-                    thirdSys: null,
-                    spec: null,
-                    registerCertNo: null,
-                    manufactory: null,
-                    page: 1,
-                    limit: 100,
-                    filterCount:null,
-                };
-                this.getList();
-            },
+export default {
+  data() {
+    return {
+      showSearch: true,
+      filterQuery: {
+        inventoryCode: null,
+        inventoryName: null,
+        spec: null,
+        registerCertNo: null,
+        manufactory: null,
+        thirdSys: null,
+        page: 1,
+        limit: 100,
+        filterCount: null,
+      },
+      total: 0,
+      list: [],
+      thirdSys: [],
+      thirdSysDetail: null,
+      fileList: [],
+      uploadData: {
+        thirdSys: "thirdId",
+      },
+      uploadFileUrl: null,
+    };
+  },
 
-            getList() {
-                if (this.filterQuery.thirdSys == null) {
-                    this.$message.warning("请先选择第三方系统！")
-                    return;
-                }
-                this.loading = true;
-                getOnhands(this.filterQuery)
-                    .then((response) => {
-                        this.loading = false;
-                        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;
-                    });
-            },
-            deleteDialog(row) {
-                this.$confirm("此操作将永久删除该产品信息, 是否继续?", "提示", {
-                    confirmButtonText: "确定",
-                    cancelButtonText: "取消",
-                    type: "warning",
-                })
-                    .then(() => {
+  methods: {
+    onReset() {
+      this.$router.push({
+        path: "",
+      });
+      this.filterQuery = {
+        inventoryCode: null,
+        inventoryName: null,
+        thirdSys: null,
+        spec: null,
+        registerCertNo: null,
+        manufactory: null,
+        page: 1,
+        limit: 100,
+        filterCount: null,
+      };
+      this.getList();
+    },
+    hideSearch() {
+      this.showSearch = !this.showSearch;
+    },
+    getList() {
+      if (this.filterQuery.thirdSys == null) {
+        this.$message.warning("请先选择第三方系统！")
+        return;
+      }
+      this.loading = true;
+      getOnhands(this.filterQuery)
+        .then((response) => {
+          this.loading = false;
+          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;
+        });
+    },
+    deleteDialog(row) {
+      this.$confirm("此操作将永久删除该产品信息, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
 
-                        let dQuery = {
-                            id: row.id,
-                        };
-                        delInvProducts(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;
-                            });
+          let dQuery = {
+            id: row.id,
+          };
+          delInvProducts(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(() => {
-                    });
-            },
-            clearAll() {
-                this.$confirm("此操作将清空所有库存产品信息, 是否继续?", "提示", {
-                    confirmButtonText: "确定",
-                    cancelButtonText: "取消",
-                    type: "warning",
-                })
-                    .then(() => {
-                        delAll()
-                            .then((response) => {
-                                this.loading = false;
-                                if (response.code == 20000) {
-                                    this.$message.success("删除成功");
-                                    this.getList();
-                                } else {
-                                    this.$message.success(response.message);
-                                }
-                            })
-                            .catch(() => {
-                                this.loading = false;
-                            });
+        })
+        .catch(() => {
+        });
+    },
+    clearAll() {
+      this.$confirm("此操作将清空所有库存产品信息, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          delAll()
+            .then((response) => {
+              this.loading = false;
+              if (response.code == 20000) {
+                this.$message.success("删除成功");
+                this.getList();
+              } else {
+                this.$message.success(response.message);
+              }
+            })
+            .catch(() => {
+              this.loading = false;
+            });
 
-                    })
-                    .catch(() => {
-                    });
-            },
-            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("文件上传成功,请稍后刷新查看！");
-                }
-            },
-            getBasicThirdSys() {
-                let query = {
-                    enabled: true,
-                };
-                getBasicThirdSys(query)
-                    .then((response) => {
-                        this.thirdSys = response.data.list || [];
-                        this.filterQuery.thirdSys = this.thirdSys[0].thirdId;
-                        this.uploadData.thirdSys = this.filterQuery.thirdSys;
-                        this.getThirdSysDetail();
-                        this.selectSysParam();
-                        this.getList();
-                    })
-                    .catch(() => {
-                        this.loading = false;
-                        this.list = [];
-                    });
-            },
-            selectSysParam() {
-                let query = {
-                    key: "thirdIpUrl",
-                    thirdSysFk: this.filterQuery.thirdSys
-                };
-                selectIp(query).then((response) => {
-                    if (response.code == 20000) {
-                        this.uploadFileUrl = response.data.thridUrl + "/udiwms/erp/invpi/upload";
-                    }
-                });
-            },
-            thirdSysChange() {
-                this.uploadData.thirdSys = this.filterQuery.thirdSys;
-                this.getThirdSysDetail();
-            },
-            getThirdSysDetail() {
-                let query = {
-                    thirdSysFk: this.filterQuery.thirdSys,
-                    key: "invPiUrl",
-                };
-                filterDetailByKey(query)
-                    .then((response) => {
-                        this.thirdSysDetail = response.data;
-                    })
-                    .catch(() => {
-                        this.loading = false;
-                        this.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("文件上传成功,请稍后刷新查看！");
+      }
+    },
+    getBasicThirdSys() {
+      let query = {
+        enabled: true,
+      };
+      getBasicThirdSys(query)
+        .then((response) => {
+          this.thirdSys = response.data.list || [];
+          this.filterQuery.thirdSys = this.thirdSys[0].thirdId;
+          this.uploadData.thirdSys = this.filterQuery.thirdSys;
+          this.getThirdSysDetail();
+          this.selectSysParam();
+          this.getList();
+        })
+        .catch(() => {
+          this.loading = false;
+          this.list = [];
+        });
+    },
+    selectSysParam() {
+      let query = {
+        key: "thirdIpUrl",
+        thirdSysFk: this.filterQuery.thirdSys
+      };
+      selectIp(query).then((response) => {
+        if (response.code == 20000) {
+          this.uploadFileUrl = response.data.thridUrl + "/udiwms/erp/invpi/upload";
+        }
+      });
+    },
+    thirdSysChange() {
+      this.uploadData.thirdSys = this.filterQuery.thirdSys;
+      this.getThirdSysDetail();
+    },
+    getThirdSysDetail() {
+      let query = {
+        thirdSysFk: this.filterQuery.thirdSys,
+        key: "invPiUrl",
+      };
+      filterDetailByKey(query)
+        .then((response) => {
+          this.thirdSysDetail = response.data;
+        })
+        .catch(() => {
+          this.loading = false;
+          this.list = [];
+        });
 
-            },
-            downloadDatas() {
-                let query = {
-                    thirdSysFk: this.filterQuery.thirdSys
-                };
-                downloadAll(query).then((response) => {
-                    if (response.code == 20000) {
-                        this.$message.success(response.data);
-                    } else {
-                        this.$message.error(response.message);
-                    }
-                });
+    },
+    downloadDatas() {
+      let query = {
+        thirdSysFk: this.filterQuery.thirdSys
+      };
+      downloadAll(query).then((response) => {
+        if (response.code == 20000) {
+          this.$message.success(response.data);
+        } else {
+          this.$message.error(response.message);
+        }
+      });
 
-            },
-        },
-        components: {},
-        mounted() {
-        },
-        created() {
-            this.getBasicThirdSys();
+    },
+  },
+  components: {},
+  mounted() {
+  },
+  created() {
+    this.getBasicThirdSys();
 
-        },
-    };
+  },
+};
 
 
 </script>
 
 <style scoped>
-
+.el-form-item--mini.el-form-item {
+  margin-bottom: 9px;
+}
 </style>
diff --git a/src/views/thirdSys/invProducts/thrInvProductsExport.vue b/src/views/thirdSys/invProducts/thrInvProductsExport.vue
index 7cb3d1c8..f01ea114 100644
--- a/src/views/thirdSys/invProducts/thrInvProductsExport.vue
+++ b/src/views/thirdSys/invProducts/thrInvProductsExport.vue
@@ -1,294 +1,301 @@
 <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" class="query-form" 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 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="120">
+          <template slot-scope="scope">
+            <el-button
+              type="text"
+              @click.native.stop="downloadExcel(scope.row)"
+            >下载
+            </el-button
             >
-            </el-table-column>
-            <el-table-column label="操作"  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>
+            <el-button
+              type="text"
+              @click.native.stop="deleteDialog(scope.row.id)"
+            >删除
+            </el-button
+            >
+          </template>
+        </el-table-column>
+      </el-table>
 
-        <el-dialog
-            title="导出库存产品信息"
-            :visible.sync="thrInvProductsSelectVisible"
-            width="85%"
-            :close-on-click-modal="false"
-            :close-on-press-escape="false"
-            v-if="thrInvProductsSelectVisible"
-        >
-            <thrInvProductsSelect :selectType="selectType"  v-on:cancelDialog="cancelDialog"
-            ></thrInvProductsSelect>
-        </el-dialog>
+      <el-dialog
+        title="导出库存产品信息"
+        :visible.sync="thrInvProductsSelectVisible"
+        width="80%"
+        :close-on-click-modal="false"
+        :close-on-press-escape="false"
+        v-if="thrInvProductsSelectVisible"
+      >
+        <thrInvProductsSelect :selectType="selectType" v-on:cancelDialog="cancelDialog"
+        ></thrInvProductsSelect>
+      </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>
-    import {filterLog, deleteLog} from "@/api/thrsys/thrInvProductsExport.js";
-    import thrInvProductsSelect from "./thrInvProductsSelect";
-    import axios from "axios";
-    export default {
-        data() {
-            return {
-                filterQuery: {
-                    genKey: null,
-                    status: null,
-                    fromType: null,
-                    page: 1,
-                    limit: 20,
-                    thirdSysFk: null,
-                },
-                selectType: 0,
-                thrInvProductsSelectVisible: false,
-                list: [],
-                detailList: [],
-                thirdSys: [],
-                thirdSysDetail: null,
-                total: 0,
-                editQuery: null,
-                fromStatus: {
-                    0: "产品信息",
-                    1: "库存信息",
-                    2: "异常第三方上传"
-                },
-                status: {
-                    0: "等待处理",
-                    1: "正在处理",
-                    2: "处理异常",
-                    3: "处理完成"
-                },
-                uploadFileUrl: null,
-                uploadData: {
-                    thirdSys: "thirdId",
-                },
-            };
-        },
+import {filterLog, deleteLog} from "@/api/thrsys/thrInvProductsExport.js";
+import thrInvProductsSelect from "./thrInvProductsSelect";
+import axios from "axios";
 
-        methods: {
-            onReset() {
-                this.$router.push({
-                    path: "",
-                });
-                this.filterQuery = {
-                    fromType: null,
-                    genKey: null,
-                    status: null,
-                    page: 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);
-                        }
+export default {
+  data() {
+    return {
+      showSearch: true,
+      filterQuery: {
+        genKey: null,
+        status: null,
+        fromType: null,
+        page: 1,
+        limit: 20,
+        thirdSysFk: null,
+      },
+      selectType: 0,
+      thrInvProductsSelectVisible: false,
+      list: [],
+      detailList: [],
+      thirdSys: [],
+      thirdSysDetail: null,
+      total: 0,
+      editQuery: null,
+      fromStatus: {
+        0: "产品信息",
+        1: "库存信息",
+        2: "异常第三方上传"
+      },
+      status: {
+        0: "等待处理",
+        1: "正在处理",
+        2: "处理异常",
+        3: "处理完成"
+      },
+      uploadFileUrl: null,
+      uploadData: {
+        thirdSys: "thirdId",
+      },
+    };
+  },
 
-                        this.loading = false;
+  methods: {
+    onReset() {
+      this.$router.push({
+        path: "",
+      });
+      this.filterQuery = {
+        fromType: null,
+        genKey: null,
+        status: null,
+        page: 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);
+          }
 
-                    })
-                    .catch(() => {
-                        this.loading = false;
-                        this.list = [];
-                        this.total = 0;
-                    });
-            },
+          this.loading = false;
 
-            exportExcel() {
-                this.selectType = 0;
-                this.thrInvProductsSelectVisible = true;
-            },
-            uploadSmp() {
-                this.selectType = 1;
-                this.thrInvProductsSelectVisible = true;
-            },
-            downloadExcel(row) {
-                axios.get("./config.json").then(res => {
-                    let baseUrl = res.data.BASE_URL;
-                    let href = baseUrl + "/udiwms/invProducts/exportLog/download" + "?genKey=" +row.genKey;
-                    let a = document.createElement("a");
-                    fetch(href)
-                        .then((res) => res.blob())
-                        .then((blob) => {
-                            a.href = URL.createObjectURL(blob);
-                            console.log(a.href);
-                            a.download =
-                                row.filePath.split("/")[
-                                row.filePath.split("/").length - 1
-                                    ]; //  // 下载文件的名字
-                            document.body.appendChild(a);
-                            a.click();
-                            this.getList();
-                        });
+        })
+        .catch(() => {
+          this.loading = false;
+          this.list = [];
+          this.total = 0;
+        });
+    },
 
-                });
+    exportExcel() {
+      this.selectType = 0;
+      this.thrInvProductsSelectVisible = true;
+    },
+    uploadSmp() {
+      this.selectType = 1;
+      this.thrInvProductsSelectVisible = true;
+    },
+    downloadExcel(row) {
+      axios.get("./config.json").then(res => {
+        let baseUrl = res.data.BASE_URL;
+        let href = baseUrl + "/udiwms/invProducts/exportLog/download" + "?genKey=" + row.genKey;
+        let a = document.createElement("a");
+        fetch(href)
+          .then((res) => res.blob())
+          .then((blob) => {
+            a.href = URL.createObjectURL(blob);
+            console.log(a.href);
+            a.download =
+              row.filePath.split("/")[
+              row.filePath.split("/").length - 1
+                ]; //  // 下载文件的名字
+            document.body.appendChild(a);
+            a.click();
+            this.getList();
+          });
 
+      });
 
-            },
 
-            cancelDialog(val) {
-                this.thrInvProductsSelectVisible = false;
-                if (val) {
-                    this.getList();
-                }
-            },
-            deleteDialog(rowId) {
-                this.$confirm("此操作将删除该导出记录, 是否继续?", "提示", {
-                    confirmButtonText: "确定",
-                    cancelButtonText: "取消",
-                    type: "warning",
-                })
-                    .then(() => {
-                        let dQuery = {
-                            id: rowId,
-                        };
-                        deleteLog(dQuery)
-                            .then((response) => {
-                                this.loading = false;
-                                if (response.code == 20000) {
-                                    this.$message.success("删除成功");
-                                } else {
-                                    this.$message.error(response.message);
-                                }
-                                this.getList();
-                            })
-                            .catch(() => {
-                                this.loading = false;
-                            });
-                    })
-                    .catch(() => {
-                    });
-            },
-            handleChange(response, files, fileList) {
-                console.log(response);
-                if (response.code != 20000) {
-                    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: {thrInvProductsSelect},
-        created() {
-            // this.getBasicThirdSys();
-            this.getList();
-        },
-    };
+    },
+
+    cancelDialog(val) {
+      this.thrInvProductsSelectVisible = false;
+      if (val) {
+        this.getList();
+      }
+    },
+    deleteDialog(rowId) {
+      this.$confirm("此操作将删除该导出记录, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          let dQuery = {
+            id: rowId,
+          };
+          deleteLog(dQuery)
+            .then((response) => {
+              this.loading = false;
+              if (response.code == 20000) {
+                this.$message.success("删除成功");
+              } else {
+                this.$message.error(response.message);
+              }
+              this.getList();
+            })
+            .catch(() => {
+              this.loading = false;
+            });
+        })
+        .catch(() => {
+        });
+    },
+    handleChange(response, files, fileList) {
+      console.log(response);
+      if (response.code != 20000) {
+        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: {thrInvProductsSelect},
+  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/invProducts/thrInvProductsImport.vue b/src/views/thirdSys/invProducts/thrInvProductsImport.vue
index c235db30..ae7ca54e 100644
--- a/src/views/thirdSys/invProducts/thrInvProductsImport.vue
+++ b/src/views/thirdSys/invProducts/thrInvProductsImport.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>
+  <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-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>
+      <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
+            v-if="this.thirdSysDetail.enabled && this.thirdSysDetail.fromType==1"
+            :action="uploadFileUrl"
+            multiple
+            :limit="1"
+            :data="uploadData"
+            :show-file-list="false"
+            :on-success="handleChange"
+            :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="downloadInpi"
+                     v-if="this.thirdSysDetail.enabled && this.thirdSysDetail.fromType==3">
+            下载库存产品信息
+          </el-button>
+        </el-button-group>
+      </div>
+      <el-divider style="margin: 15px"></el-divider>
 
-                <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
-                            v-if="this.thirdSysDetail.enabled && this.thirdSysDetail.fromType==1"
-                            :action="uploadFileUrl"
-                            multiple
-                            :limit="1"
-                            :data="uploadData"
-                            :show-file-list="false"
-                            :on-success="handleChange"
-                            :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="downloadInpi"
-                                   v-if="this.thirdSysDetail.enabled && this.thirdSysDetail.fromType==3">
-                            下载库存产品信息
-                        </el-button>
-                    </el-button-group>
-                </el-form-item>
-            </el-row>
-        </el-form>
+      <el-table
+        v-loading="loading"
+        :data="list"
+        style="width: 100%"
+        @selection-change="handleSelectionChange"
+        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
-            v-loading="loading"
-            :data="list"
-            style="width: 100%"
-            @selection-change="handleSelectionChange"
-            border highlight-current-row
+        <el-table-column
+          label="来源"
+          prop="fromType"
+          show-overflow-tooltip
         >
-            <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="fromType"
-                show-overflow-tooltip
+        </el-table-column>
+        <el-table-column
+          label="更新日期"
+          prop="updateTime"
+          show-overflow-tooltip
+        ></el-table-column>
+        <el-table-column
+          label="来源系统"
+          prop="thirdSysFk"
+          show-overflow-tooltip
+          :formatter="formatterThirdSys"
+        ></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="remark"
+          show-overflow-tooltip
+        ></el-table-column>
+        <el-table-column label="操作" width="120">
+          <template slot-scope="scope">
+            <el-button
+              type="text"
+              @click.native.stop="handleDetailClick(scope.row)"
+            >详情
+            </el-button
             >
-            </el-table-column>
-            <el-table-column
-                label="更新日期"
-                prop="updateTime"
-                show-overflow-tooltip
-            ></el-table-column>
-            <el-table-column
-                label="来源系统"
-                prop="thirdSysFk"
-                show-overflow-tooltip
-                :formatter="formatterThirdSys"
-            ></el-table-column>
-            <el-table-column
-                label="状态"
-                prop="status"
-                show-overflow-tooltip
+            <el-button
+              type="text"
+              @click.native.stop="deleteDialog(scope.row.id)"
+            >删除
+            </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="remark"
-                show-overflow-tooltip
-            ></el-table-column>
-            <el-table-column label="操作"  width="160">
-                <template slot-scope="scope">
-                    <el-button
-                        type="text"
-                        size="small"
-                        @click.native.stop="handleDetailClick(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="udiImportDetailVisible"
-            width="85%"
-            :close-on-click-modal="false"
-            :close-on-press-escape="false"
-            v-if="udiImportDetailVisible"
-        >
-            <thrInvProductsImportDetail
-                :currentRow="currentRow"
-            ></thrInvProductsImportDetail>
-        </el-dialog>
+      <el-dialog
+        title="导入库存产品信息详情详情"
+        :visible.sync="udiImportDetailVisible"
+        width="80%"
+        :close-on-click-modal="false"
+        :close-on-press-escape="false"
+        v-if="udiImportDetailVisible"
+      >
+        <thrInvProductsImportDetail
+          :currentRow="currentRow"
+        ></thrInvProductsImportDetail>
+      </el-dialog>
 
-        <el-dialog
-            title="导出库存产品信息"
-            :visible.sync="thrInvProductsSelectVisible"
-            width="85%"
-            :close-on-click-modal="false"
-            :close-on-press-escape="false"
-            v-if="thrInvProductsSelectVisible"
-        >
-            <thrInvProductsSelect :selectType="selectType" v-on:cancelDialog="cancelDialog"
-                                  :isDownThrSys="true"
-            ></thrInvProductsSelect>
-        </el-dialog>
+      <el-dialog
+        title="导出库存产品信息"
+        :visible.sync="thrInvProductsSelectVisible"
+        width="80%"
+        :close-on-click-modal="false"
+        :close-on-press-escape="false"
+        v-if="thrInvProductsSelectVisible"
+      >
+        <thrInvProductsSelect :selectType="selectType" v-on:cancelDialog="cancelDialog"
+                              :isDownThrSys="true"
+        ></thrInvProductsSelect>
+      </el-dialog>
       <pagination
         v-show="total>0"
         :total="total"
@@ -157,8 +160,8 @@
         :limit.sync="filterQuery.limit"
         @pagination="getList"
       />
-      </el-card>
-    </div>
+    </el-card>
+  </div>
 </template>
 
 <script>
@@ -171,271 +174,275 @@ import thrInvProductsSelect from "./thrInvProductsSelect";
 import axios from "axios";
 
 export default {
-    data() {
-        return {
-            filterQuery: {
-                genKey: null,
-                status: null,
-                fromType: null,
-                page: 1,
-                limit: 20,
-                thirdSysFk: null,
-            },
-            selectType: 0,
-            udiImportDetailVisible: false,
-            thrInvProductsSelectVisible: false,
-            checked: false,
-            list: [],
-            detailList: [],
-            fileList: [],
-            thirdSys: [],
-            thirdSysDetail: null,
-            total: 0,
-            currentRow: null,
-            editQuery: null,
-            fromStatus: {
-                0: "产品信息",
-                1: "库存信息",
-                2: "异常第三方上传"
-            },
-            status: {
-                0: "等待处理",
-                1: "正在处理",
-                2: "处理异常",
-                3: "处理完成"
-            },
-            uploadFileUrl: null,
-            uploadData: {
-                thirdSys: "thirdId",
-            },
-            templateDlUrl: null,
-        };
-    },
+  data() {
+    return {
+      showSearch: true,
+      filterQuery: {
+        genKey: null,
+        status: null,
+        fromType: null,
+        page: 1,
+        limit: 20,
+        thirdSysFk: null,
+      },
+      selectType: 0,
+      udiImportDetailVisible: false,
+      thrInvProductsSelectVisible: false,
+      checked: false,
+      list: [],
+      detailList: [],
+      fileList: [],
+      thirdSys: [],
+      thirdSysDetail: null,
+      total: 0,
+      currentRow: null,
+      editQuery: null,
+      fromStatus: {
+        0: "产品信息",
+        1: "库存信息",
+        2: "异常第三方上传"
+      },
+      status: {
+        0: "等待处理",
+        1: "正在处理",
+        2: "处理异常",
+        3: "处理完成"
+      },
+      uploadFileUrl: null,
+      uploadData: {
+        thirdSys: "thirdId",
+      },
+      templateDlUrl: null,
+    };
+  },
 
-    methods: {
-        onReset() {
-            this.$router.push({
-                path: "",
-            });
-            this.filterQuery = {
-                fromType: null,
-                genKey: null,
-                status: null,
-                page: 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;
-                });
-        },
-        sysChange() {
-            this.getThirdSysDetail();
-            // console.log( this.thirdSysDetail.thirdId+"\n"+ this.thirdSysDetail.fromType+"\n"+this.thirdSysDetail.enable);
-        },
+  methods: {
+    onReset() {
+      this.$router.push({
+        path: "",
+      });
+      this.filterQuery = {
+        fromType: null,
+        genKey: null,
+        status: null,
+        page: 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;
+        });
+    },
+    sysChange() {
+      this.getThirdSysDetail();
+      // console.log( this.thirdSysDetail.thirdId+"\n"+ this.thirdSysDetail.fromType+"\n"+this.thirdSysDetail.enable);
+    },
 
-        genInCode() {
-            this.selectBasicUdiVisible = true;
-        },
-        downloadInpi() {
-            this.selectType = 3;
-            this.thrInvProductsSelectVisible = true;
-        },
-        handleDetailClick(row) {
-            this.currentRow = row;
-            console.log(this.currentRow.genKey)
-            this.udiImportDetailVisible = true;
+    genInCode() {
+      this.selectBasicUdiVisible = true;
+    },
+    downloadInpi() {
+      this.selectType = 3;
+      this.thrInvProductsSelectVisible = true;
+    },
+    handleDetailClick(row) {
+      this.currentRow = row;
+      console.log(this.currentRow.genKey)
+      this.udiImportDetailVisible = true;
 
-        },
-        cancelDialog(val) {
-            this.udiImportDetailVisible = false;
-            this.thrInvProductsSelectVisible = false;
-            if (val) {
-                this.getList();
-            }
-        },
-        deleteDialog(rowId) {
-            this.$confirm("此操作将删除该导入记录, 是否继续?", "提示", {
-                confirmButtonText: "确定",
-                cancelButtonText: "取消",
-                type: "warning",
+    },
+    cancelDialog(val) {
+      this.udiImportDetailVisible = false;
+      this.thrInvProductsSelectVisible = false;
+      if (val) {
+        this.getList();
+      }
+    },
+    deleteDialog(rowId) {
+      this.$confirm("此操作将删除该导入记录, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          let dQuery = {
+            id: rowId,
+          };
+          deleteLog(dQuery)
+            .then((response) => {
+              this.loading = false;
+              if (response.code == 20000) {
+                this.$message.success("删除成功");
+              } else {
+                this.$message.error(response.message);
+              }
+              this.getList();
             })
-                .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 = [];
-                });
-            axios.get("./config.json").then(res => {
-                let response = res.data.SERVER_IP;
-                this.templateDlUrl = response + "/第三方库存产品信息导入模板.xlsx";
-                console.log(this.templateDlUrl);
-
+            .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 = [];
+        });
+      axios.get("./config.json").then(res => {
+        let response = res.data.SERVER_IP;
+        this.templateDlUrl = response + "/第三方库存产品信息导入模板.xlsx";
+        console.log(this.templateDlUrl);
 
-        },
-        jumpDl() {
-            window.open(this.templateDlUrl, '_blank');
-        },
-        selectSysParam() {
-            let query = {
-                key: "thirdIpUrl",
-                thirdSysFk: this.filterQuery.thirdSysFk
-            };
-            selectIp(query).then((response) => {
-                if (response.code == 20000) {
-                    this.uploadFileUrl = response.data.thridUrl + "/udiwms/erp/invpi/upload";
-                }
-            });
-        },
-        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(response.data);
-            }
-            this.fileList = [];
-            this.getList();
-        },
-        formatterThirdSys(key) {
-            let data = null;
-            this.thirdSys.forEach((item, index) => {
-                if (key.thirdSysFk == item.thirdId) {
-                    data = item.thirdName;
-                }
-            });
-            return data;
-        },
-        statusFilterType(status) {
-            const statusMap = {
-                0: "warning",
-                1: "warning",
-                2: "danger",
-                3: "success",
-            };
-            return statusMap[status];
-        },
-        getThirdSysDetail() {
-            let query = {
-                thirdSysFk: this.filterQuery.thirdSysFk,
-                key: "invPiUrl",
-            };
-            filterDetailByKey(query)
-                .then((response) => {
-                    this.thirdSysDetail = response.data;
-                })
-                .catch(() => {
-                    this.loading = false;
-                    this.list = [];
-                });
-            this.uploadData.thirdSys = this.filterQuery.thirdSysFk;
+      });
+
+    },
+    jumpDl() {
+      window.open(this.templateDlUrl, '_blank');
+    },
+    selectSysParam() {
+      let query = {
+        key: "thirdIpUrl",
+        thirdSysFk: this.filterQuery.thirdSysFk
+      };
+      selectIp(query).then((response) => {
+        if (response.code == 20000) {
+          this.uploadFileUrl = response.data.thridUrl + "/udiwms/erp/invpi/upload";
+        }
+      });
+    },
+    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(response.data);
+      }
+      this.fileList = [];
+      this.getList();
+    },
+    formatterThirdSys(key) {
+      let data = null;
+      this.thirdSys.forEach((item, index) => {
+        if (key.thirdSysFk == item.thirdId) {
+          data = item.thirdName;
+        }
+      });
+      return data;
+    },
+    statusFilterType(status) {
+      const statusMap = {
+        0: "warning",
+        1: "warning",
+        2: "danger",
+        3: "success",
+      };
+      return statusMap[status];
+    },
+    getThirdSysDetail() {
+      let query = {
+        thirdSysFk: this.filterQuery.thirdSysFk,
+        key: "invPiUrl",
+      };
+      filterDetailByKey(query)
+        .then((response) => {
+          this.thirdSysDetail = response.data;
+        })
+        .catch(() => {
+          this.loading = false;
+          this.list = [];
+        });
+      this.uploadData.thirdSys = this.filterQuery.thirdSysFk;
 
-        },
-        downloadDatas() {
+    },
+    downloadDatas() {
 
-            this.$confirm("此操作从第三方系统下载全部库存产品信息, 是否继续?", "提示", {
-                confirmButtonText: "确定",
-                cancelButtonText: "取消",
-                type: "warning",
-            }).then(() => {
-                let query = {
-                    thirdSysFk: this.filterQuery.thirdSysFk
-                };
-                downloadAll(query).then((response) => {
-                    if (response.code == 20000) {
-                        this.$message.success(response.data);
-                        this.getList();
-                    } else {
-                        this.$message.error(response.message);
-                    }
+      this.$confirm("此操作从第三方系统下载全部库存产品信息, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(() => {
+        let query = {
+          thirdSysFk: this.filterQuery.thirdSysFk
+        };
+        downloadAll(query).then((response) => {
+          if (response.code == 20000) {
+            this.$message.success(response.data);
+            this.getList();
+          } else {
+            this.$message.error(response.message);
+          }
 
-                });
-            });
+        });
+      });
 
 
-        },
     },
+  },
 
-    mounted() {
-    },
-    components: {thrInvProductsImportDetail, thrInvProductsSelect},
-    created() {
-        this.getBasicThirdSys();
-        // this.getList();
-    },
+  mounted() {
+  },
+  components: {thrInvProductsImportDetail, thrInvProductsSelect},
+  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/invProducts/thrInvProductsImportDetail.vue b/src/views/thirdSys/invProducts/thrInvProductsImportDetail.vue
index f24bbb3a..f72901c6 100644
--- a/src/views/thirdSys/invProducts/thrInvProductsImportDetail.vue
+++ b/src/views/thirdSys/invProducts/thrInvProductsImportDetail.vue
@@ -1,166 +1,178 @@
 <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.inventoryCode" clearable
-                            placeholder="请输入存货编码"
-                        ></el-input>
-                    </el-form-item>
-                    <el-form-item class="query-form-item">
-                        <el-input
-                            v-model="filterQuery.inventoryName" clearable
-                            placeholder="请输入存货名称"
-                        ></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-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="存货编码:">
+              <el-input
+                v-model="filterQuery.inventoryCode" clearable
+                style="width: 90%"
+                placeholder="请输入存货编码"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="存货名称:">
+              <el-input
+                v-model="filterQuery.inventoryName" clearable
+                style="width: 90%"
+                placeholder="请输入存货名称"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
 
-            <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="inventoryCode" show-overflow-tooltip></el-table-column>
-                <el-table-column label="产品名称" prop="inventoryName" show-overflow-tooltip></el-table-column>
-                <el-table-column label="规格型号" prop="spec" show-overflow-tooltip></el-table-column>
-                <el-table-column label="批次号" prop="batchNo" show-overflow-tooltip></el-table-column>
-                <el-table-column label="仓位" prop="warehouseName" show-overflow-tooltip></el-table-column>
-                <el-table-column label="货位" prop="spaceName" show-overflow-tooltip></el-table-column>
-                <el-table-column label="注册证号" prop="registerCertNo" show-overflow-tooltip></el-table-column>
-                <el-table-column label="生产日期" prop="manufacturingDate" show-overflow-tooltip></el-table-column>
-                <el-table-column label="失效日期" prop="expirationDate" show-overflow-tooltip></el-table-column>
-                <el-table-column label="数量" prop="count" show-overflow-tooltip></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>
+      <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="inventoryCode" show-overflow-tooltip></el-table-column>
+        <el-table-column label="产品名称" prop="inventoryName" show-overflow-tooltip></el-table-column>
+        <el-table-column label="规格型号" prop="spec" show-overflow-tooltip></el-table-column>
+        <el-table-column label="批次号" prop="batchNo" show-overflow-tooltip></el-table-column>
+        <el-table-column label="仓位" prop="warehouseName" show-overflow-tooltip></el-table-column>
+        <el-table-column label="货位" prop="spaceName" show-overflow-tooltip></el-table-column>
+        <el-table-column label="注册证号" prop="registerCertNo" show-overflow-tooltip></el-table-column>
+        <el-table-column label="生产日期" prop="manufacturingDate" show-overflow-tooltip></el-table-column>
+        <el-table-column label="失效日期" prop="expirationDate" show-overflow-tooltip></el-table-column>
+        <el-table-column label="数量" prop="count" show-overflow-tooltip></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/thrInvProductsImport";
+import {
+  filterDetail,
+} from "@/api/thrsys/thrInvProductsImport";
 
-    export default {
-        name: "ThrInvProductsImportDetail",
-        props: {
-            currentRow: {
-                type: Object,
-                required: true,
-            },
+export default {
+  name: "ThrInvProductsImportDetail",
+  props: {
+    currentRow: {
+      type: Object,
+      required: true,
+    },
 
-        },
-        data() {
-            return {
-                filterQuery: {
-                    genKey: null,
-                    inventoryCode: null,
-                    inventoryName: 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,
-                    inventoryCode: null,
-                    inventoryName: 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,
+        inventoryCode: null,
+        inventoryName: 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,
+        inventoryCode: null,
+        inventoryName: 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/invProducts/thrInvProductsSelect.vue b/src/views/thirdSys/invProducts/thrInvProductsSelect.vue
index 243b0839..ae824911 100644
--- a/src/views/thirdSys/invProducts/thrInvProductsSelect.vue
+++ b/src/views/thirdSys/invProducts/thrInvProductsSelect.vue
@@ -1,46 +1,47 @@
 <template>
     <div>
       <el-card>
-        <el-form :inline="true" :model="filterQuery" class="query-form" size="mini">
-            <el-form-item class="query-form-item">
-                <el-input
-                    v-model="filterQuery.inventoryCode" clearable
-                    placeholder="请输入产品编码"
-                ></el-input>
+        <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.inventoryCode"   style="width: 90%" clearable  placeholder="请输入产品编码"></el-input>
             </el-form-item>
-            <el-form-item class="query-form-item">
-                <el-input
-                    v-model="filterQuery.inventoryName" clearable
-                    placeholder="请输入产品名称"
-                ></el-input>
+            </el-col>
+              <el-col :span="6">
+            <el-form-item label="产品编码:">
+                <el-input v-model="filterQuery.inventoryName"  style="width: 90%" clearable placeholder="请输入产品名称"></el-input>
             </el-form-item>
-            <el-form-item class="query-form-item">
-                <el-input
-                    v-model="filterQuery.spec" clearable
-                    placeholder="请输入规格型号"
-                ></el-input>
+              </el-col>
+            <el-col :span="6">
+            <el-form-item label="产品编码:">
+                <el-input v-model="filterQuery.spec" clearable   style="width: 90%"  placeholder="请输入规格型号"></el-input>
             </el-form-item>
-            <el-form-item class="query-form-item">
-                <el-input
-                    v-model="filterQuery.registerCertNo" clearable
-                    placeholder="请输入注册/备案凭证号"
-                ></el-input>
+            </el-col>
+            <el-col :span="6">
+            <el-form-item label="产品编码:">
+                <el-input v-model="filterQuery.registerCertNo"   style="width: 90%" clearable placeholder="请输入注册/备案凭证号"></el-input>
             </el-form-item>
-            <el-form-item class="query-form-item">
-                <el-input
-                    v-model="filterQuery.manufactory" clearable
-                    placeholder="请输入生厂厂家"
-                ></el-input>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="6">
+            <el-form-item label="产品编码:">
+                <el-input v-model="filterQuery.manufactory"   style="width: 90%" clearable placeholder="请输入生厂厂家"></el-input>
             </el-form-item>
-            <el-form-item class="query-form-item">
-                <el-select v-model="filterQuery.filterCount" placeholder="请选择过滤条件">
+            </el-col>
+            <el-col :span="6">
+            <el-form-item label="产品编码:">
+                <el-select v-model="filterQuery.filterCount"   style="width: 90%" placeholder="请选择过滤条件">
                     <el-option label="全部" value="0"></el-option>
                     <el-option label="库存等于0" value="1"></el-option>
                     <el-option label="库存大于0" value="2"></el-option>
                 </el-select>
             </el-form-item>
-            <el-form-item class="query-form-item">
-                <el-select v-model="filterQuery.thirdSys" placeholder="请选择第三方系统">
+            </el-col>
+            <el-col :span="6">
+            <el-form-item label="产品编码:">
+                <el-select v-model="filterQuery.thirdSys"   style="width: 90%" placeholder="请选择第三方系统">
                     <el-option
                         v-for="item in thirdSys"
                         :key="item.value"
@@ -51,35 +52,26 @@
                     </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-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="uploadSMP"
-                               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-col>
+          </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 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="uploadSMP" 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 v-loading="loading" :data="list" style="width: 100%"  border highlight-current-row   @selection-change="handleSelectionChange">
             <el-table-column type="selection" width="55"></el-table-column>
             <el-table-column label="序号" type="index" width="70"></el-table-column>
@@ -131,6 +123,7 @@
 
         data() {
             return {
+              showSearch: true,
                 filterQuery: {
                     thrInvProductsEntities:[],
                     inventoryCode: null,
@@ -177,6 +170,9 @@
             handleSelectionChange(val) {
                 this.multipleSelection = val;
             },
+            hideSearch() {
+            this.showSearch = !this.showSearch;
+          },
             getList() {
                 this.loading = true;
                 this.filterQuery.isDownThrSys = this.isDownThrSys;
diff --git a/src/views/thirdSys/product/thrProductsImport.vue b/src/views/thirdSys/product/thrProductsImport.vue
index aa47f66d..55e94097 100644
--- a/src/views/thirdSys/product/thrProductsImport.vue
+++ b/src/views/thirdSys/product/thrProductsImport.vue
@@ -51,7 +51,7 @@
               :on-success="handleChange"
               :file-list="fileList"
             >
-              <el-button size="mini" type="primary">导入产品信息</el-button>
+              <el-button size="mini" icon="el-icon-bottom-right" type="primary">导入产品信息</el-button>
             </el-upload>
             <el-button type="primary" icon="el-icon-download" @click="downloadProducts"
                        v-if="this.thirdSysDetail.enabled && this.thirdSysDetail.fromType==3">