From a59339b29adb41172c083c5b4dcd2ca996f97a58 Mon Sep 17 00:00:00 2001
From: wangpeng <wangpeng@zcloudchina.com>
Date: Tue, 20 Feb 2024 14:58:38 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=9A=E7=94=A8=E6=A0=87=E5=87=86=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E6=8E=92=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/CascaderDict/index.vue         |   4 +-
 .../common/components/list.vue                | 123 ++++++++++--------
 2 files changed, 72 insertions(+), 55 deletions(-)

diff --git a/src/components/CascaderDict/index.vue b/src/components/CascaderDict/index.vue
index 7bf90df..9e453a5 100644
--- a/src/components/CascaderDict/index.vue
+++ b/src/components/CascaderDict/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div style="position: relative">
     <el-cascader
       ref="cascader"
       :value="value"
@@ -11,7 +11,7 @@
       :clearable = "clearable"
       style="width: 100%"
       @change="cascaderChange" />
-    <i v-show="loading" class="el-icon-loading"/>
+    <i v-show="loading" class="el-icon-loading" style="position: absolute;top: 10px;right: 25px;"/>
   </div>
 </template>
 <script>
diff --git a/src/views/hiddenDangerCheckStandardLibrary/common/components/list.vue b/src/views/hiddenDangerCheckStandardLibrary/common/components/list.vue
index 5586ecf..435984b 100644
--- a/src/views/hiddenDangerCheckStandardLibrary/common/components/list.vue
+++ b/src/views/hiddenDangerCheckStandardLibrary/common/components/list.vue
@@ -1,56 +1,62 @@
 <template>
   <div class="app-container">
     <div class="filter-container">
-      <el-row :gutter="20">
+      <div class="filter-row mb-10">
         <el-form label-width="80px">
-          <el-col :span="8">
-            <el-form-item label="行业类型">
-              <cascader-dict
-                v-model = "searchForm.INDUSTRY_TYPE_ARR"
-                :form.sync="searchForm"
-                :dict-id = "dictId"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="标准名称">
-              <el-input v-model="searchForm.CHECK_STANDARD_NAME" placeholder="搜索标准名称..." class="filter-item" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="导入时间">
-              <el-date-picker
-                v-model="searchForm.CREATE_TIME"
-                type="daterange"
-                range-separator="至"
-                start-placeholder="开始日期"
-                end-placeholder="结束日期"
-                format="yyyy-MM-dd"
-                value-format="yyyy-MM-dd"/>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="状态">
-              <el-select v-model="searchForm.COMMON_STATUS" placeholder="状态" clearable style="width: 100px" class="filter-item">
-                <el-option v-for="item in commonStatusList" :key="item.id" :label="item.name" :value="item.id" />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6" >
-            <el-form-item label-width="10px">
-              <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="getQuery">
-                搜索
-              </el-button>
-              <el-button v-waves class="filter-item" type="success" icon="el-icon-refresh-left" @click="resetting">
-                重置
-              </el-button>
-              <el-button v-waves class="filter-item" type="primary" icon="el-icon-document-add" @click="importExcel('import')">
-                导入标准表
-              </el-button>
-            </el-form-item>
-          </el-col>
+          <el-row :gutter="20">
+            <el-col :span="6">
+              <el-form-item label="行业类型">
+                <cascader-dict
+                  v-model = "searchForm.INDUSTRY_TYPE_ARR"
+                  :form.sync="searchForm"
+                  :dict-id = "dictId"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="7">
+              <el-form-item label="标准名称">
+                <el-input v-model="searchForm.CHECK_STANDARD_NAME" placeholder="搜索标准名称..." class="filter-item" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="6">
+              <el-form-item label="导入时间">
+                <el-date-picker
+                  v-model="searchForm.CREATE_TIME"
+                  type="daterange"
+                  range-separator="至"
+                  start-placeholder="开始日期"
+                  end-placeholder="结束日期"
+                  format="yyyy-MM-dd"
+                  value-format="yyyy-MM-dd"/>
+              </el-form-item>
+            </el-col>
+            <el-col :span="5">
+              <el-form-item label="状态">
+                <el-select v-model="searchForm.COMMON_STATUS" placeholder="状态" clearable style="width: 100%" class="filter-item">
+                  <el-option v-for="item in commonStatusList" :key="item.id" :label="item.name" :value="item.id" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6" >
+              <el-form-item label-width="10px">
+                <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="getQuery">
+                  搜索
+                </el-button>
+                <el-button v-waves class="filter-item" type="success" icon="el-icon-refresh-left" @click="resetting">
+                  重置
+                </el-button>
+              </el-form-item>
+            </el-col>
+          </el-row>
         </el-form>
-      </el-row>
+      </div>
+      <div class="filter-flot">
+        <el-button v-waves class="filter-item" type="primary" icon="el-icon-document-add" @click="importExcel('import')">
+          导入标准表
+        </el-button>
+      </div>
     </div>
     <el-table
       v-loading="listLoading"
@@ -80,16 +86,18 @@
           {{ row.COMMON_STATUS ? (row.COMMON_STATUS === 1 ? '有效' : '停用') : '' }}
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" width="300">
+      <el-table-column label="操作" align="center" width="320">
         <template slot-scope="{row}">
-          <el-row :gutter="20">
+          <el-row :gutter="20" style="margin-bottom: 5px">
             <el-button type="success" icon="el-icon-view" size="mini" @click="getInfo(row)">查看</el-button>
-            <el-button type="primary" icon="el-icon-refresh" size="mini" @click="importExcel('reimport', row)">重新导入</el-button>
-            <el-button type="primary" icon="el-icon-circle-plus-outline" size="mini" @click="importExcel('appendImport', row)">追加导入</el-button>
-            <el-button type="success" icon="el-icon-tickets" size="mini" @click="getCommonItem(row)">清单详细</el-button>
             <el-button v-show="edit" type="primary" icon="el-icon-edit" size="mini" @click="handleEdit(row)">编辑</el-button>
             <el-button v-show="del" :disabled="row.COUNT_CUSTOM !== 0" type="danger" icon="el-icon-delete" size="mini" @click="handleDelete(row.COMMON_ID)">删除</el-button>
           </el-row>
+          <el-row :gutter="20">
+            <el-button type="success" icon="el-icon-tickets" size="mini" @click="getCommonItem(row)">清单详细</el-button>
+            <el-button type="primary" icon="el-icon-refresh" size="mini" @click="importExcel('reimport', row)">重新导入</el-button>
+            <el-button type="primary" icon="el-icon-circle-plus-outline" size="mini" @click="importExcel('appendImport', row)">追加导入</el-button>
+          </el-row>
         </template>
       </el-table-column>
     </el-table>
@@ -312,3 +320,12 @@ export default {
 }
 
 </script>
+<style lang="sass" scoped>
+  .filter-container
+    position: relative
+    .filter-flot
+      position: absolute
+      padding-bottom: 33px
+      right: 0
+      bottom: 0
+</style>