From 7e6c76d74fadc0a4e97fbe34568c3d8e51c68fd5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com>
Date: Mon, 9 Jan 2023 16:14:52 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AC=AC=E4=B8=89=E6=96=B9=E4=BA=A7=E5=93=81?=
 =?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

---
 src/assets/styles/ruoyi.scss                  |   2 +
 src/views/system/dept/index.vue               |   1 -
 .../thirdSys/invProducts/thrInvProducts.vue   |   1 -
 src/views/thirdSys/product/thrProducts.vue    |  19 +-
 .../thirdSys/product/thrProductsExport.vue    | 164 +++++------
 .../thirdSys/product/thrProductsImport.vue    | 268 +++++++++---------
 .../thirdSys/product/thrProductsSelect.vue    | 187 +++++++-----
 7 files changed, 350 insertions(+), 292 deletions(-)

diff --git a/src/assets/styles/ruoyi.scss b/src/assets/styles/ruoyi.scss
index 2385d35d..4258e7a7 100644
--- a/src/assets/styles/ruoyi.scss
+++ b/src/assets/styles/ruoyi.scss
@@ -317,6 +317,8 @@
 .top-right-btn {
   position: relative;
   float: right;
+  margin-bottom: 15px;
+  margin-top: 15px
 }
 
 
diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue
index d99e679a..b46431da 100644
--- a/src/views/system/dept/index.vue
+++ b/src/views/system/dept/index.vue
@@ -275,7 +275,6 @@ export default {
     },
     /** 新增按钮操作 */
     handleAdd(row) {
-      debugger
       this.reset();
       if (row != undefined) {
         this.form.parentId = row.deptId;
diff --git a/src/views/thirdSys/invProducts/thrInvProducts.vue b/src/views/thirdSys/invProducts/thrInvProducts.vue
index 1fbee588..13b2cbbf 100644
--- a/src/views/thirdSys/invProducts/thrInvProducts.vue
+++ b/src/views/thirdSys/invProducts/thrInvProducts.vue
@@ -240,7 +240,6 @@
                 };
                 getBasicThirdSys(query)
                     .then((response) => {
-                      debugger
                         this.thirdSys = response.data.list || [];
                         this.filterQuery.thirdSys = this.thirdSys[0].thirdId;
                         this.uploadData.thirdSys = this.filterQuery.thirdSys;
diff --git a/src/views/thirdSys/product/thrProducts.vue b/src/views/thirdSys/product/thrProducts.vue
index 388f42fa..6af3f687 100644
--- a/src/views/thirdSys/product/thrProducts.vue
+++ b/src/views/thirdSys/product/thrProducts.vue
@@ -69,8 +69,8 @@
           </el-col>
         </el-row>
       </el-form>
-      <el-row>
-        <div class="top-right-btn" style="margin-bottom: 15px">
+
+        <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>
@@ -80,9 +80,6 @@
             </el-button>
           </el-button-group>
         </div>
-      </el-row>
-
-
       <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="80"></el-table-column>
@@ -92,12 +89,12 @@
         <el-table-column label="计量单位" prop="measname" show-overflow-tooltip></el-table-column>
         <el-table-column label="注册/备案凭证" prop="registerNo" show-overflow-tooltip></el-table-column>
         <el-table-column label="生产厂家" prop="manufactory" show-overflow-tooltip></el-table-column>
-        <el-table-column label="操作" width="200">
+        <el-table-column label="操作" width="180px">
           <template slot-scope="scope">
-            <el-button type="text" size="small" @click.native.stop="detailDialog(scope.row)"
+            <el-button type="text" @click.native.stop="detailDialog(scope.row)"
             >详情
             </el-button>
-            <el-button type="text" size="small" @click.native.stop="deleteDialog(scope.row)"
+            <el-button type="text" @click.native.stop="deleteDialog(scope.row)"
                        v-if="thirdSysDetail.fromType!=0" :disabled="!configParms.basicThirdProducts"
             >删除
             </el-button>
@@ -238,7 +235,6 @@ export default {
       this.loading = true;
       getInvbasdoc(this.filterQuery)
         .then((response) => {
-          debugger
           // this.loading = false;
           if (response.code == 20000) {
             this.list = response.data.list || [];
@@ -423,3 +419,8 @@ export default {
   },
 };
 </script>
+<style scoped>
+.el-form-item--mini.el-form-item {
+  margin-bottom: 9px;
+}
+</style>
diff --git a/src/views/thirdSys/product/thrProductsExport.vue b/src/views/thirdSys/product/thrProductsExport.vue
index e1d94b1d..47d32e0f 100644
--- a/src/views/thirdSys/product/thrProductsExport.vue
+++ b/src/views/thirdSys/product/thrProductsExport.vue
@@ -1,86 +1,89 @@
 <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-top-right" @click="exportExcel">导出产品信息</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"
-    >
-      <el-table-column label="序号" type="index"></el-table-column>
-      <el-table-column
-        label="记录ID"
-        prop="genKey"
-        show-overflow-tooltip
-      ></el-table-column>
+      <el-form :model="query" label-width="100px" size="mini" 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>
+      <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-top-right" @click="exportExcel">导出产品信息</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 label="序号" type="index"></el-table-column>
+        <el-table-column
+          label="记录ID"
+          prop="genKey"
+          show-overflow-tooltip
+        ></el-table-column>
 
 
-      <el-table-column
-        label="更新日期"
-        prop="updateTime"
-        show-overflow-tooltip
-      ></el-table-column>
-      <el-table-column
-        label="状态"
-        prop="status"
-        show-overflow-tooltip
-      >
-        <template slot-scope="scope">
-          <el-tag
-            :type="statusFilterType(scope.row.status)"
-          >{{ status[scope.row.status] }}
-          </el-tag
-          >
-        </template>
-      </el-table-column>
-      <el-table-column
-        label="下载次数"
-        prop="dlCount"
-        show-overflow-tooltip
-      >
-      </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>
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="filterQuery.page"
-      :limit.sync="filterQuery.limit"
-      @pagination="getList"
-    ></pagination>
+        <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"
+              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>
+      <pagination
+        v-show="total>0"
+        :total="total"
+        :page.sync="filterQuery.page"
+        :limit.sync="filterQuery.limit"
+        @pagination="getList"
+      ></pagination>
 
       <el-dialog
         title="导出产品信息"
@@ -107,6 +110,7 @@ import {formatDate} from "../../../utils/date";
 export default {
   data() {
     return {
+      showSearch: true,
       filterQuery: {
         genKey: null,
         status: null,
@@ -174,7 +178,9 @@ export default {
           this.total = 0;
         });
     },
-
+    hideSearch() {
+      this.showSearch = !this.showSearch;
+    },
     exportExcel() {
       this.selectType = 0;
       this.thrProductsSelectVisible = true;
diff --git a/src/views/thirdSys/product/thrProductsImport.vue b/src/views/thirdSys/product/thrProductsImport.vue
index fd7c9b40..f0ea8d12 100644
--- a/src/views/thirdSys/product/thrProductsImport.vue
+++ b/src/views/thirdSys/product/thrProductsImport.vue
@@ -1,36 +1,45 @@
 <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" class="query-form" label-width="100px" size="mini" v-show="showSearch">
+        <el-row>
+          <el-col :span="6">
+            <el-form-item class="query-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 class="query-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 class="query-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>
+        <div class="top-right-btn">
           <el-button-group style="display:flex;">
-            <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
+            <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"
@@ -44,115 +53,115 @@
             >
               <el-button size="mini" type="primary">导入产品信息</el-button>
             </el-upload>
-            <el-button type="primary" icon="search" @click="downloadProducts"
+            <el-button type="primary" icon="el-icon-download" @click="downloadProducts"
                        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%"
-      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>
+      <el-divider style="margin: 15px"></el-divider>
 
-      <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
+      <el-table
+        v-loading="loading"
+        :data="list"
+        style="width: 100%"
+        border highlight-current-row
       >
-        <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="序号" type="index"></el-table-column>
+        <el-table-column
+          label="记录ID"
+          prop="genKey"
+          show-overflow-tooltip
+        ></el-table-column>
 
-      <el-table-column
-        label="备注"
-        prop="remark"
-        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="操作"  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>
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="filterQuery.page"
-      :limit.sync="filterQuery.limit"
-      @pagination="getList"
-    ></pagination>
-    <el-dialog
-      title="导入产品信息详情详情"
-      :visible.sync="udiImportDetailVisible"
-      width="80%"
-      :close-on-click-modal="false"
-      :close-on-press-escape="false"
-      v-if="udiImportDetailVisible"
-    >
-      <thrProductsImportDetail
-        :currentRow="currentRow"
-      ></thrProductsImportDetail>
-    </el-dialog>
+        <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"
+              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>
+      <pagination
+        v-show="total>0"
+        :total="total"
+        :page.sync="filterQuery.page"
+        :limit.sync="filterQuery.limit"
+        @pagination="getList"
+      ></pagination>
+      <el-dialog
+        title="导入产品信息详情详情"
+        :visible.sync="udiImportDetailVisible"
+        width="80%"
+        :close-on-click-modal="false"
+        :close-on-press-escape="false"
+        v-if="udiImportDetailVisible"
+      >
+        <thrProductsImportDetail
+          :currentRow="currentRow"
+        ></thrProductsImportDetail>
+      </el-dialog>
 
 
-    <el-dialog
-      title="下载产品信息"
-      :visible.sync="thrProductsSelectVisible"
-      width="85%"
-      :close-on-click-modal="false"
-      :close-on-press-escape="false"
-      v-if="thrProductsSelectVisible"
-    >
-      <thrProductsSelect :selectType="selectType" v-on:cancelDialog="cancelDialog" :isDownThrSys="true"
-      ></thrProductsSelect>
-    </el-dialog>
+      <el-dialog
+        title="下载产品信息"
+        :visible.sync="thrProductsSelectVisible"
+        width="80%"
+        :close-on-click-modal="false"
+        :close-on-press-escape="false"
+        v-if="thrProductsSelectVisible"
+      >
+        <thrProductsSelect :selectType="selectType" v-on:cancelDialog="cancelDialog" :isDownThrSys="true"
+        ></thrProductsSelect>
+      </el-dialog>
     </el-card>
   </div>
 </template>
@@ -169,6 +178,7 @@ import axios from "axios";
 export default {
   data() {
     return {
+      showSearch: true,
       filterQuery: {
         genKey: null,
         status: null,
@@ -222,6 +232,10 @@ export default {
       };
       this.getList();
     },
+    /*控制搜索栏显示隐藏 */
+    hideSearch() {
+      this.showSearch = !this.showSearch;
+    },
     getList() {
       this.loading = true;
       filterLog(this.filterQuery)
diff --git a/src/views/thirdSys/product/thrProductsSelect.vue b/src/views/thirdSys/product/thrProductsSelect.vue
index b2d99cf5..2b268abf 100644
--- a/src/views/thirdSys/product/thrProductsSelect.vue
+++ b/src/views/thirdSys/product/thrProductsSelect.vue
@@ -1,82 +1,110 @@
 <template>
   <div>
     <el-card class="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.code"
-            placeholder="请输入产品编码/商品条码/医保编码"
-            @keyup.enter.native="keyupErp_submit($event)"
-          ></el-input>
-        </el-form-item>
-        <el-form-item class="query-form-item">
-          <el-input
-            v-model="filterQuery.name"
-            placeholder="请输入产品名称"
-          ></el-input>
-        </el-form-item>
-        <el-form-item class="query-form-item">
-          <el-input
-            v-model="filterQuery.spec" clearable="true"
-            placeholder="请输入规格型号"
-          ></el-input>
-        </el-form-item>
-        <el-form-item class="query-form-item">
-          <el-input
-            v-model="filterQuery.registerNo" clearable="true"
-            placeholder="请输入注册/备案凭证"
-          ></el-input>
-        </el-form-item>
-        <el-form-item class="query-form-item">
-          <el-input
-            v-model="filterQuery.manufactory" clearable="true"
-            placeholder="请输入生产厂家"
-          ></el-input>
-        </el-form-item>
-        <el-form-item class="query-form-item">
-          <el-select v-model="filterQuery.thirdSys" placeholder="请选择第三方系统" @change="thirdSysChange">
-            <el-option
-              v-for="item in thirdSys"
-              :key="item.value"
-              :label="item.thirdName"
-              :value="item.thirdId">
-              <span style="float: left">{{ item.thirdName }}</span>
-              <span style="float: right; color: #8492a6; font-size: 13px">{{ item.thirdId }}</span>
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <el-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-top-right" @click="selectExport" v-if="selectType==0"
-            >选中导出
-            </el-button>
-            <el-button type="primary"  icon="el-icon-top-right" @click="allExport" v-if="selectType==0"
-            >结果全部导出
-            </el-button>
-            <el-button type="primary"  icon="el-icon-top-right" @click="uploadSmp"
-                       v-if="selectType==1"
-            >选中上传
-            </el-button>
-            <el-button type="primary"  icon="el-icon-top-right" @click="allUploadSmp"
-                       v-if="selectType==1"
-            >一键上传
-            </el-button>
+      <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.code"
+                placeholder="请输入产品编码/商品条码/医保编码"
+                style="width: 90%"
+                @keyup.enter.native="keyupErp_submit($event)"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="产品名称:">
+              <el-input
+                v-model="filterQuery.name"
+                style="width: 90%"
+                placeholder="请输入产品名称"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="规格型号:">
+              <el-input
+                v-model="filterQuery.spec" clearable="true"
+                style="width: 90%"
+                placeholder="请输入规格型号"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+        <el-col :span="6">
+          <el-form-item label="注册/备案凭证:">
+            <el-input
+              v-model="filterQuery.registerNo" clearable="true"
+              style="width: 90%"
+              placeholder="请输入注册/备案凭证"
+            ></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="生产厂家:">
+            <el-input
+              v-model="filterQuery.manufactory" clearable="true"
+              style="width: 90%"
+              placeholder="请输入生产厂家"
+            ></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="外部系统:">
+            <el-select v-model="filterQuery.thirdSys" style="width: 90%" placeholder="请选择第三方系统"
+                       @change="thirdSysChange">
+              <el-option
+                v-for="item in thirdSys"
+                :key="item.value"
+                :label="item.thirdName"
+                :value="item.thirdId">
+                <span style="float: left">{{ item.thirdName }}</span>
+                <span style="float: right; color: #8492a6; font-size: 13px">{{ item.thirdId }}</span>
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        </el-row>
+      </el-form>
 
-            <el-button type="primary" icon="search"  @click="downloadErp"
-                       v-if="selectType==3"
-            >选中下载
-            </el-button>
-            <el-button type="primary" icon="search" @click="downloadAllErp"
-                       v-if="selectType==3"
-            >结果全部下载
-            </el-button>
+      <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-group>
-        </el-form-item>
-      </el-form>
-      <el-table v-loading="loading" :data="list" style="width: 100%" @selection-change="handleSelectionChange" border highlight-current-row>
+          <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%" @selection-change="handleSelectionChange" border
+                highlight-current-row>
         <el-table-column type="selection" width="55"></el-table-column>
         <el-table-column label="序号" type="index" width="80"></el-table-column>
         <el-table-column label="产品编码" prop="code"></el-table-column>
@@ -85,7 +113,7 @@
         <el-table-column label="计量单位" prop="measname" show-overflow-tooltip></el-table-column>
         <el-table-column label="注册证号" prop="registerNo" show-overflow-tooltip></el-table-column>
         <el-table-column label="生产厂家" prop="manufactory" show-overflow-tooltip></el-table-column>
-        <el-table-column label="操作">
+        <el-table-column label="操作" width="60">
           <template slot-scope="scope">
             <el-button type="text" size="small" @click.native.stop="detailDialog(scope.row)"
             >详情
@@ -144,6 +172,7 @@ export default {
   },
   data() {
     return {
+      showSearch: true,
       filterQuery: {
         thrProductsEntities: [],
         code: null,
@@ -205,6 +234,9 @@ export default {
           this.total = 0;
         });
     },
+    hideSearch() {
+      this.showSearch = !this.showSearch;
+    },
     clearAll() {
       this.$confirm("此操作将清空所有产品信息, 是否继续?", "提示", {
         confirmButtonText: "确定",
@@ -432,3 +464,8 @@ export default {
   },
 };
 </script>
+<style scoped>
+.el-form-item--mini.el-form-item {
+  margin-bottom: 9px;
+}
+</style>