From ece50a3e5481622826fcc951e0e9eee686792e9b Mon Sep 17 00:00:00 2001
From: dqjdda <201507802@qq.com>
Date: Sun, 17 Nov 2019 14:36:16 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E6=9C=9F=E6=9F=A5=E8=AF=A2=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/generator/config.vue          | 61 +++++++++++++++++++------
 src/views/monitor/log/search.vue        |  1 +
 src/views/system/dept/index.vue         |  1 +
 src/views/system/job/index.vue          |  1 +
 src/views/system/menu/index.vue         |  1 +
 src/views/system/role/index.vue         |  1 +
 src/views/system/timing/index.vue       |  1 +
 src/views/system/timing/log.vue         |  1 +
 src/views/system/user/index.vue         |  1 +
 src/views/tools/picture/index.vue       |  1 +
 src/views/tools/storage/local/index.vue |  1 +
 src/views/tools/storage/qiniu/index.vue |  1 +
 12 files changed, 57 insertions(+), 15 deletions(-)

diff --git a/src/views/generator/config.vue b/src/views/generator/config.vue
index 1ad3fc1..609e689 100644
--- a/src/views/generator/config.vue
+++ b/src/views/generator/config.vue
@@ -30,7 +30,7 @@
     </el-tab-pane>
     <el-tab-pane label="字段配置" name="second">
       <el-form size="small" label-width="90px">
-        <el-table v-loading="loading" :data="data" size="small" style="width: 100%;margin-bottom: 15px">
+        <el-table v-loading="loading" :data="data" :height="tableHeight" size="small" style="width: 100%;margin-bottom: 15px">
           <el-table-column label="序号" width="80" align="center">
             <template slot-scope="scope">
               <div>{{ scope.$index + 1 }}</div>
@@ -38,14 +38,44 @@
           </el-table-column>
           <el-table-column prop="columnName" label="字段名称"/>
           <el-table-column prop="columnType" label="字段类型"/>
-          <el-table-column prop="columnComment" label="字段标题">
+          <el-table-column prop="columnComment" label="字段描述">
             <template slot-scope="scope">
-              <el-input v-model="data[scope.$index].columnComment" class="edit-input"/>
+              <el-input v-model="data[scope.$index].columnComment" size="mini" class="edit-input"/>
+            </template>
+          </el-table-column>
+          <el-table-column align="center" prop="columnShow" label="必填">
+            <template slot-scope="scope">
+              <el-switch
+                v-model="data[scope.$index].columnShow"
+                active-color="#409EFF"
+                inactive-color="#F56C6C"
+                active-value="true"
+                inactive-value="false"/>
+            </template>
+          </el-table-column>
+          <el-table-column align="center" prop="columnShow" label="表单">
+            <template slot-scope="scope">
+              <el-switch
+                v-model="data[scope.$index].columnShow"
+                active-color="#409EFF"
+                inactive-color="#F56C6C"
+                active-value="true"
+                inactive-value="false"/>
+            </template>
+          </el-table-column>
+          <el-table-column align="center" prop="columnShow" label="列表">
+            <template slot-scope="scope">
+              <el-switch
+                v-model="data[scope.$index].columnShow"
+                active-color="#409EFF"
+                inactive-color="#F56C6C"
+                active-value="true"
+                inactive-value="false"/>
             </template>
           </el-table-column>
           <el-table-column label="查询方式">
             <template slot-scope="scope">
-              <el-select v-model="data[scope.$index].columnQuery" class="edit-input" clearable placeholder="请选择">
+              <el-select v-model="data[scope.$index].columnQuery" class="edit-input" clearable size="mini" placeholder="请选择">
                 <el-option
                   label="模糊查询"
                   value="1"/>
@@ -55,16 +85,16 @@
               </el-select>
             </template>
           </el-table-column>
-          <el-table-column align="center" prop="columnShow" label="列表显示">
+          <el-table-column label="关联字典">
             <template slot-scope="scope">
-              <el-tooltip :content="scope.row.columnShow === 'true' ?'显示':'不显示'" placement="top">
-                <el-switch
-                  v-model="data[scope.$index].columnShow"
-                  active-color="#13ce66"
-                  inactive-color="#ff4949"
-                  active-value="true"
-                  inactive-value="false"/>
-              </el-tooltip>
+              <el-select v-model="data[scope.$index].columnQuery" class="edit-input" clearable size="mini" placeholder="请选择">
+                <el-option
+                  label="模糊查询"
+                  value="1"/>
+                <el-option
+                  label="精确查询"
+                  value="2"/>
+              </el-select>
             </template>
           </el-table-column>
         </el-table>
@@ -82,7 +112,7 @@ export default {
   mixins: [initData],
   data() {
     return {
-      activeName: 'second', tableName: '',
+      activeName: 'second', tableName: '', tableHeight: 550,
       form: { author: '', pack: '', path: '', moduleName: '', cover: 'false', apiPath: '', prefix: '' },
       rules: {
         author: [
@@ -104,6 +134,7 @@ export default {
     }
   },
   created() {
+    this.tableHeight = document.documentElement.clientHeight - 260
     this.tableName = this.$route.params.tableName
     this.$nextTick(() => {
       this.init()
@@ -143,7 +174,7 @@ export default {
 <style rel="stylesheet/scss" lang="scss">
   .edit-input {
     .el-input__inner {
-      border: none;
+      border: 1px solid #e5e6e7;
     }
   }
 </style>
diff --git a/src/views/monitor/log/search.vue b/src/views/monitor/log/search.vue
index a9fdc66..3646c2e 100644
--- a/src/views/monitor/log/search.vue
+++ b/src/views/monitor/log/search.vue
@@ -3,6 +3,7 @@
     <el-input v-model="query.value" clearable placeholder="请输入你要搜索的内容" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery"/>
     <el-date-picker
       v-model="query.date"
+      :default-time="['00:00:00','23:59:59']"
       type="daterange"
       range-separator=":"
       class="el-range-editor--small filter-item"
diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue
index cc46af4..c37e964 100644
--- a/src/views/system/dept/index.vue
+++ b/src/views/system/dept/index.vue
@@ -6,6 +6,7 @@
       <el-input v-model="query.value" clearable placeholder="输入部门名称搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery"/>
       <el-date-picker
         v-model="query.date"
+        :default-time="['00:00:00','23:59:59']"
         type="daterange"
         range-separator=":"
         class="el-range-editor--small filter-item"
diff --git a/src/views/system/job/index.vue b/src/views/system/job/index.vue
index eab2207..fb835f7 100644
--- a/src/views/system/job/index.vue
+++ b/src/views/system/job/index.vue
@@ -6,6 +6,7 @@
       <el-input v-model="query.value" clearable placeholder="输入岗位名称搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery"/>
       <el-date-picker
         v-model="query.date"
+        :default-time="['00:00:00','23:59:59']"
         type="daterange"
         range-separator=":"
         class="el-range-editor--small filter-item"
diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue
index ec39db6..d08db1b 100644
--- a/src/views/system/menu/index.vue
+++ b/src/views/system/menu/index.vue
@@ -6,6 +6,7 @@
       <el-input v-model="query.value" clearable placeholder="模糊搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery"/>
       <el-date-picker
         v-model="query.date"
+        :default-time="['00:00:00','23:59:59']"
         type="daterange"
         range-separator=":"
         class="el-range-editor--small filter-item"
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index dde5d10..09c49b9 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -8,6 +8,7 @@
       <el-input v-model="query.value" clearable placeholder="输入名称或者描述搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery"/>
       <el-date-picker
         v-model="query.date"
+        :default-time="['00:00:00','23:59:59']"
         type="daterange"
         range-separator=":"
         class="el-range-editor--small filter-item"
diff --git a/src/views/system/timing/index.vue b/src/views/system/timing/index.vue
index 0e416aa..e3d5ad8 100644
--- a/src/views/system/timing/index.vue
+++ b/src/views/system/timing/index.vue
@@ -6,6 +6,7 @@
       <el-input v-model="query.value" clearable placeholder="输入任务名称搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery"/>
       <el-date-picker
         v-model="query.date"
+        :default-time="['00:00:00','23:59:59']"
         type="daterange"
         range-separator=":"
         class="el-range-editor--small filter-item"
diff --git a/src/views/system/timing/log.vue b/src/views/system/timing/log.vue
index 11abaa5..56a50f2 100644
--- a/src/views/system/timing/log.vue
+++ b/src/views/system/timing/log.vue
@@ -5,6 +5,7 @@
       <el-input v-model="query.value" clearable placeholder="输入任务名称搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery"/>
       <el-date-picker
         v-model="query.date"
+        :default-time="['00:00:00','23:59:59']"
         type="daterange"
         range-separator=":"
         class="el-range-editor--small filter-item"
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 69df4c1..aac73fa 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -18,6 +18,7 @@
           <el-input v-model="query.blurry" clearable placeholder="输入名称或者邮箱搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery"/>
           <el-date-picker
             v-model="query.date"
+            :default-time="['00:00:00','23:59:59']"
             type="daterange"
             range-separator=":"
             class="el-range-editor--small filter-item"
diff --git a/src/views/tools/picture/index.vue b/src/views/tools/picture/index.vue
index c7a1d8b..bbd2631 100644
--- a/src/views/tools/picture/index.vue
+++ b/src/views/tools/picture/index.vue
@@ -6,6 +6,7 @@
       <el-input v-model="query.filename" clearable placeholder="输入文件名" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery"/>
       <el-date-picker
         v-model="query.date"
+        :default-time="['00:00:00','23:59:59']"
         type="daterange"
         range-separator=":"
         class="el-range-editor--small filter-item"
diff --git a/src/views/tools/storage/local/index.vue b/src/views/tools/storage/local/index.vue
index 1c1f296..8d65a08 100644
--- a/src/views/tools/storage/local/index.vue
+++ b/src/views/tools/storage/local/index.vue
@@ -6,6 +6,7 @@
       <el-input v-model="query.value" clearable placeholder="输入内容模糊搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery"/>
       <el-date-picker
         v-model="query.date"
+        :default-time="['00:00:00','23:59:59']"
         type="daterange"
         range-separator=":"
         class="el-range-editor--small filter-item"
diff --git a/src/views/tools/storage/qiniu/index.vue b/src/views/tools/storage/qiniu/index.vue
index b4e6c59..a32d39f 100644
--- a/src/views/tools/storage/qiniu/index.vue
+++ b/src/views/tools/storage/qiniu/index.vue
@@ -8,6 +8,7 @@
       <el-input v-model="query.value" clearable placeholder="输入文件名称搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery"/>
       <el-date-picker
         v-model="query.date"
+        :default-time="['00:00:00','23:59:59']"
         type="daterange"
         range-separator=":"
         class="el-range-editor--small filter-item"