From 1627082185d88099f2400018b00bb07e42f71b53 Mon Sep 17 00:00:00 2001
From: "[li_she]" <[li.she@xujiesoft.com]>
Date: Wed, 8 Sep 2021 08:41:55 +0800
Subject: [PATCH] =?UTF-8?q?=E6=90=9C=E7=B4=A2=E6=A1=86+=E5=91=86=E6=BB=9E?=
 =?UTF-8?q?=E6=96=99=E9=A2=84=E8=AD=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/scss/global.scss                   | 25 +++++++
 src/views/main-navbar.vue                     |  2 +-
 src/views/main-sidebar.vue                    |  2 +-
 src/views/modules/common/column.vue           | 18 ++---
 .../factory/tblbasedata-add-or-update.vue     |  2 +-
 src/views/modules/factory/tblbasedata.vue     | 66 ++++++++++++-------
 6 files changed, 78 insertions(+), 37 deletions(-)

diff --git a/src/assets/scss/global.scss b/src/assets/scss/global.scss
index f745402..7aae0c5 100644
--- a/src/assets/scss/global.scss
+++ b/src/assets/scss/global.scss
@@ -163,5 +163,30 @@
   gap: 10px;
 }
 
+/* 树结构label 字体*/
+.el-tree-node__label {
+  font-size: 12px;
+}
+/* form-item__label*/
+.el-form-item__label {
+  font-size: 12px;
+}
+/* checkbox__label */
+.el-checkbox__label {
+  font-size: 12px;
+}
+/* radio__label */
+.el-radio__label {
+  font-size: 12px;
+}
+
 
+.el-table .cell, .el-table th div, .el-table--border td:first-child .cell, .el-table--border th:first-child .cell {
+  padding-left: 5px;
+}
+.el-table .cell, .el-table th div {
+  padding-right: 4px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
 
diff --git a/src/views/main-navbar.vue b/src/views/main-navbar.vue
index 0e6c11c..fbe9a24 100644
--- a/src/views/main-navbar.vue
+++ b/src/views/main-navbar.vue
@@ -2,7 +2,7 @@
   <nav class="site-navbar" :class="'site-navbar--' + navbarLayoutType">
     <div class="site-navbar__header">
 <!--      @click="$router.push({ name: 'home' })"-->
-      <h1 class="site-navbar__brand">
+      <h1 class="site-navbar__brand" >
         <el-menu
           class="site-navbar__menu"
           mode="horizontal">
diff --git a/src/views/main-sidebar.vue b/src/views/main-sidebar.vue
index b063dea..ec36444 100644
--- a/src/views/main-sidebar.vue
+++ b/src/views/main-sidebar.vue
@@ -12,7 +12,7 @@
                                         @keyup.enter.native="searchMenu1"></el-input></span>
           <i type="primary" class="el-icon-search" @click="searchMenu1()"></i>
         </el-menu-item>
-        <el-menu-item index="home">
+        <el-menu-item index="home" @click="$router.push({ name: 'home' })">
           <icon-svg name="shouye" class="site-sidebar__menu-icon"></icon-svg>
           <span slot="title">{{ $t('commonhomePage') }}</span>
         </el-menu-item>
diff --git a/src/views/modules/common/column.vue b/src/views/modules/common/column.vue
index 3a824e5..393aa0d 100644
--- a/src/views/modules/common/column.vue
+++ b/src/views/modules/common/column.vue
@@ -42,13 +42,12 @@
           <el-input-number v-model="item.columnWidth" controls-position="right" size="mini" :min="0"
                            :max="1000"></el-input-number>
         </el-form-item>
-
       </el-form-item>
     </el-form>
     <span slot="footer" class="dialog-footer">
-          <el-button @click="visible = false">取消</el-button>
-          <el-button type="primary" @click="updateColumnList()">确定</el-button>
-          </span>
+      <el-button type="primary" @click="updateColumnList()">确定</el-button>
+      <el-button @click="visible = false">取消</el-button>
+    </span>
   </el-dialog>
 
 </template>
@@ -56,7 +55,6 @@
 <script>
 
 
-
 import {
   saveTableUser,
   getTableDefaultListLanguage,
@@ -75,21 +73,17 @@ export default {
   methods: {
     // 获取 用户的配置
     init(queryTable) {
+      this.visible = true
       this.queryTable = queryTable
-      getTableUserListLanguage( queryTable ).then(({data}) => {
+      getTableUserListLanguage(queryTable).then(({data}) => {
         if (data.code == 0) {
           this.userColumnList = data.rows
           if (data.rows.length <= 0) {
-            getTableDefaultListLanguage( queryTable).then(({data}) => {
+            getTableDefaultListLanguage(queryTable).then(({data}) => {
               this.userColumnList = data.rows
             })
           }
         }
-      }).then(() => {
-        this.visible = true
-        this.$nextTick(() => {
-          this.$refs['userColumnList'].resetFields()
-        })
       })
 
     },
diff --git a/src/views/modules/factory/tblbasedata-add-or-update.vue b/src/views/modules/factory/tblbasedata-add-or-update.vue
index cb5aaf8..1b5b639 100644
--- a/src/views/modules/factory/tblbasedata-add-or-update.vue
+++ b/src/views/modules/factory/tblbasedata-add-or-update.vue
@@ -39,8 +39,8 @@
       </el-form-item>
     </el-form>
     <span slot="footer" class="dialog-footer">
-      <el-button @click="visible = false">取消</el-button>
       <el-button type="primary" @click="dataFormSubmit()">确定</el-button>
+      <el-button @click="visible = false">取消</el-button>
     </span>
   </el-dialog>
 </template>
diff --git a/src/views/modules/factory/tblbasedata.vue b/src/views/modules/factory/tblbasedata.vue
index 3d6ef21..a6877c3 100644
--- a/src/views/modules/factory/tblbasedata.vue
+++ b/src/views/modules/factory/tblbasedata.vue
@@ -5,19 +5,18 @@
          <icon-svg :name="favorite?'xiangqufill':'xiangqu'" class="sl-svg"  ></icon-svg>
         </span>
     </div>
-    <el-form :inline="true" :model="queryData" @keyup.enter.native="getDataList()">
-      <el-form-item>
+    <el-button @click="searchList()" type="primary">{{buttons.search}}</el-button>
+    <el-button @click="saveColumnList()" type="primary" v-show="showDefault">{{buttons.defaultTable}}
+    </el-button>
+    <el-button @click="userSetting" type="primary">{{ buttons.settingTable}}</el-button>
+    <el-button @click="addOrUpdateHandle(0)" type="primary">{{ buttons.add}}</el-button>
+    <el-form v-show="searchShow" :inline="true" :model="queryData" @keyup.enter.native="getDataList()">
+      <el-form-item label="工厂编辑">
         <el-input filterable v-model="queryData.key" clearable>
         </el-input>
       </el-form-item>
-      <el-form-item>
-        <el-button @click="getDataList()" type="primary">{{buttons.search}}</el-button>
-        <el-button @click="saveColumnList()" type="primary" v-show="showDefault">{{buttons.defaultTable}}
-        </el-button>
-        <el-button @click="userSetting" type="primary">{{ buttons.settingTable}}</el-button>
-        <el-button @click="addOrUpdateHandle(0)" type="primary">{{ buttons.add}}</el-button>
-      </el-form-item>
     </el-form>
+
     <el-table
       :height="height"
       :data="dataList"
@@ -63,6 +62,10 @@
       :total="totalPage"
       layout="total, sizes, prev, pager, next, jumper">
     </el-pagination>
+
+    <!-- 设置查询条件 -->
+    <search v-if="searchVisible"  v-on:childByValue="childByValue" ref="search" @refreshDataList="getDataList" ></search>
+    <!-- 设置列 -->
     <column  v-if="visible" ref="column" @refreshData="getTableUserColumn"></column>
     <!-- 弹窗, 新增 / 修改 -->
     <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
@@ -71,6 +74,7 @@
 
 <script>
 import column from "../common/column";
+import search from "../common/search";
 import {
   searchSysLanguageParam,
   searchFunctionButtonList,
@@ -85,9 +89,10 @@ import {userFavoriteList,saveUserFavorite,removeUserFavorite} from '@/api/userFa
   import AddOrUpdate from './tblbasedata-add-or-update'
 
   export default {
-
     data () {
       return {
+        searchVisible: false,
+        searchShow: false,
         queryData:{
           key: ''
         },
@@ -269,7 +274,7 @@ import {userFavoriteList,saveUserFavorite,removeUserFavorite} from '@/api/userFa
           delete: '删除',
           deleteList: '批量删除',
           cz: '操作',
-          search: '查询',
+          search: '搜索',
           download: '导出',
           settingTable: '设置列表',
           defaultTable: '设置默认配置'
@@ -353,12 +358,12 @@ import {userFavoriteList,saveUserFavorite,removeUserFavorite} from '@/api/userFa
         dataListLoading: false,
         dataListSelections: [],
         addOrUpdateVisible: false,
-
       }
     },
     components: {
       AddOrUpdate,
-      column
+      column,
+      search
     },
     mounted() {
       this.$nextTick(()=>{
@@ -369,7 +374,33 @@ import {userFavoriteList,saveUserFavorite,removeUserFavorite} from '@/api/userFa
       this.getDataList()
     },
     methods: {
+      childByValue(childValue) {
+        // childValue就是子组件传过来的值
+        console.log(childValue)
+      },
+      // 打开搜索页面
+      searchList() {
+        this.searchVisible = true;
+        let queryTable = {
+          userId: this.userId,
+          functionId: this.functionId,
+          tableId: this.tableId,
+          languageCode: this.languageCode
+        }
+        this.$nextTick(() => {
+          this.$refs.search.init(queryTable);
+        });
+      },
+      // searchShows
+      searchShows(){
+
+        if (this.searchShow){
+          this.searchShow = false;
+        }else {
+          this.searchShow = true;
+        }
 
+      },
       // 添加
       addOrUpdateBase(){
 
@@ -440,7 +471,6 @@ import {userFavoriteList,saveUserFavorite,removeUserFavorite} from '@/api/userFa
         }
 
       },
-
       // 获取button的词典
       getFunctionButtonList() {
         let queryButton = {
@@ -509,14 +539,6 @@ import {userFavoriteList,saveUserFavorite,removeUserFavorite} from '@/api/userFa
             this.$message.error(data.msg)
           }
         })
-        saveTableDefaultList(this.columnList1).then(({data}) => {
-          if (data.code == 0) {
-            this.$message.success(data.msg)
-            this.showDefault = false
-          } else {
-            this.$message.error(data.msg)
-          }
-        })
         this.getFunctionButtonList();
         this.getColumnList()
       },