From f7d78f4b986402e7a46b21ced7265ab3b0f178fb Mon Sep 17 00:00:00 2001
From: dqjdda <201507802@qq.com>
Date: Sat, 23 Nov 2019 21:53:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/monitor/online.js                     |   9 --
 src/api/system/dict.js                        |   9 +-
 src/api/system/dictDetail.js                  |   2 +
 src/assets/styles/eladmin.scss                |   1 -
 src/mixins/crud.js                            |   7 +-
 src/views/monitor/log/errorLog.vue            |  17 +--
 src/views/monitor/log/index.vue               |  16 +--
 src/views/monitor/log/search.vue              |  41 ++----
 src/views/monitor/online/index.vue            |  60 ++++-----
 src/views/system/dept/index.vue               |   5 +-
 .../index.vue => dict/dictDetail.vue}         |  99 +++++++--------
 src/views/system/dict/form.vue                | 101 ---------------
 src/views/system/dict/index.vue               | 119 +++++++-----------
 src/views/system/dictDetail/form.vue          | 116 -----------------
 src/views/system/job/index.vue                |   4 +
 src/views/system/menu/index.vue               |   9 +-
 src/views/system/role/index.vue               |   7 ++
 17 files changed, 155 insertions(+), 467 deletions(-)
 rename src/views/system/{dictDetail/index.vue => dict/dictDetail.vue} (53%)
 delete mode 100644 src/views/system/dict/form.vue
 delete mode 100644 src/views/system/dictDetail/form.vue

diff --git a/src/api/monitor/online.js b/src/api/monitor/online.js
index cdfe120..fc9a90c 100644
--- a/src/api/monitor/online.js
+++ b/src/api/monitor/online.js
@@ -6,12 +6,3 @@ export function del(key) {
     method: 'delete'
   })
 }
-
-export function downloadOnline(params) {
-  return request({
-    url: 'auth/online/download',
-    method: 'get',
-    params,
-    responseType: 'blob'
-  })
-}
diff --git a/src/api/system/dict.js b/src/api/system/dict.js
index a5a8f72..11911cf 100644
--- a/src/api/system/dict.js
+++ b/src/api/system/dict.js
@@ -30,11 +30,4 @@ export function edit(data) {
   })
 }
 
-export function downloadDict(params) {
-  return request({
-    url: 'api/dict/download',
-    method: 'get',
-    params,
-    responseType: 'blob'
-  })
-}
+export default { add, edit, del }
diff --git a/src/api/system/dictDetail.js b/src/api/system/dictDetail.js
index b03d1cc..e8dc512 100644
--- a/src/api/system/dictDetail.js
+++ b/src/api/system/dictDetail.js
@@ -48,3 +48,5 @@ export function edit(data) {
     data
   })
 }
+
+export default { add, edit, del }
diff --git a/src/assets/styles/eladmin.scss b/src/assets/styles/eladmin.scss
index c23186d..92d8272 100644
--- a/src/assets/styles/eladmin.scss
+++ b/src/assets/styles/eladmin.scss
@@ -93,4 +93,3 @@
   font-family: Courier New, serif;
   font-size: 12px
 }
-
diff --git a/src/mixins/crud.js b/src/mixins/crud.js
index 65e00a9..c429c8d 100644
--- a/src/mixins/crud.js
+++ b/src/mixins/crud.js
@@ -37,10 +37,8 @@ export default {
       form: {},
       // 重置表单
       resetForm: {},
-      // 弹窗的标题
-      title: '',
-      // 方法
-      method: ''
+      // 标题
+      title: ''
     }
   },
   methods: {
@@ -159,6 +157,7 @@ export default {
       this.delLoading = true
       this.crudMethod.del(id).then(() => {
         this.delLoading = false
+        console.log(this.$refs[id])
         this.$refs[id].doClose()
         this.dleChangePage()
         this.delSuccessNotify()
diff --git a/src/views/monitor/log/errorLog.vue b/src/views/monitor/log/errorLog.vue
index b78ffb7..31f5fd0 100644
--- a/src/views/monitor/log/errorLog.vue
+++ b/src/views/monitor/log/errorLog.vue
@@ -49,14 +49,13 @@
 </template>
 
 <script>
-import initData from '@/mixins/initData'
-import { parseTime } from '@/utils/index'
+import crud from '@/mixins/crud'
 import { getErrDetail } from '@/api/monitor/log'
 import Search from './search'
 export default {
   name: 'ErrorLog',
   components: { Search },
-  mixins: [initData],
+  mixins: [crud],
   data() {
     return {
       errorInfo: '', dialog: false
@@ -68,21 +67,13 @@ export default {
     })
   },
   methods: {
-    parseTime,
+    // 获取数据前设置好接口地址
     beforeInit() {
       this.url = 'api/logs/error'
-      const sort = 'id,desc'
-      const query = this.query
-      const value = query.value
-      this.params = { page: this.page, size: this.size, sort: sort }
-      if (value) { this.params['blurry'] = value }
       this.params['logType'] = 'ERROR'
-      if (query.date) {
-        this.params['startTime'] = query.date[0]
-        this.params['endTime'] = query.date[1]
-      }
       return true
     },
+    // 获取异常详情
     info(id) {
       this.dialog = true
       getErrDetail(id).then(res => {
diff --git a/src/views/monitor/log/index.vue b/src/views/monitor/log/index.vue
index 377196d..bbc6411 100644
--- a/src/views/monitor/log/index.vue
+++ b/src/views/monitor/log/index.vue
@@ -46,32 +46,22 @@
 </template>
 
 <script>
-import initData from '@/mixins/initData'
-import { parseTime } from '@/utils/index'
+import crud from '@/mixins/crud'
 import Search from './search'
 export default {
   name: 'Log',
   components: { Search },
-  mixins: [initData],
+  mixins: [crud],
   created() {
     this.$nextTick(() => {
       this.init()
     })
   },
+  // 获取数据前设置好接口地址
   methods: {
-    parseTime,
     beforeInit() {
       this.url = 'api/logs'
-      const sort = 'id,desc'
-      const query = this.query
-      const value = query.value
-      this.params = { page: this.page, size: this.size, sort: sort }
-      if (value) { this.params['blurry'] = value }
       this.params['logType'] = 'INFO'
-      if (query.date) {
-        this.params['startTime'] = query.date[0]
-        this.params['endTime'] = query.date[1]
-      }
       return true
     }
   }
diff --git a/src/views/monitor/log/search.vue b/src/views/monitor/log/search.vue
index 56f43f7..a2d0218 100644
--- a/src/views/monitor/log/search.vue
+++ b/src/views/monitor/log/search.vue
@@ -1,8 +1,8 @@
 <template>
   <div class="head-container">
-    <el-input v-model="query.value" clearable size="small" placeholder="请输入你要搜索的内容" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery" />
+    <el-input v-model="query.blurry" clearable size="small" placeholder="请输入你要搜索的内容" style="width: 200px;" class="filter-item" />
     <el-date-picker
-      v-model="query.date"
+      v-model="query.createTime"
       :default-time="['00:00:00','23:59:59']"
       type="daterange"
       range-separator=":"
@@ -14,45 +14,24 @@
     />
     <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="$parent.toQuery">搜索</el-button>
     <!-- 导出 -->
-    <div style="display: inline-block;">
-      <el-button
-        :loading="downloadLoading"
-        size="mini"
-        class="filter-item"
-        type="warning"
-        icon="el-icon-download"
-        @click="download"
-      >导出</el-button>
-    </div>
+    <el-button
+      :loading="$parent.downloadLoading"
+      size="mini"
+      class="filter-item"
+      type="warning"
+      icon="el-icon-download"
+      @click="$parent.downloadMethod"
+    >导出</el-button>
   </div>
 </template>
 
 <script>
-import { downloadFile } from '@/utils/index'
-import { downloadLog } from '@/api/monitor/log'
 export default {
   props: {
     query: {
       type: Object,
       required: true
     }
-  },
-  data() {
-    return {
-      downloadLoading: false
-    }
-  },
-  methods: {
-    download() {
-      this.$parent.beforeInit()
-      this.downloadLoading = true
-      downloadLog(this.$parent.params).then(result => {
-        downloadFile(result, '系统日志列表', 'xlsx')
-        this.downloadLoading = false
-      }).catch(() => {
-        this.downloadLoading = false
-      })
-    }
   }
 }
 </script>
diff --git a/src/views/monitor/online/index.vue b/src/views/monitor/online/index.vue
index 978c251..373743d 100644
--- a/src/views/monitor/online/index.vue
+++ b/src/views/monitor/online/index.vue
@@ -1,19 +1,17 @@
 <template>
   <div class="app-container">
     <div class="head-container">
-      <el-input v-model="query.value" clearable size="small" placeholder="全表模糊搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery" />
+      <el-input v-model="query.filter" clearable size="small" placeholder="全表模糊搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery" />
       <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="toQuery">搜索</el-button>
       <!-- 导出 -->
-      <div style="display: inline-block;">
-        <el-button
-          :loading="downloadLoading"
-          size="mini"
-          class="filter-item"
-          type="warning"
-          icon="el-icon-download"
-          @click="download"
-        >导出</el-button>
-      </div>
+      <el-button
+        :loading="downloadLoading"
+        size="mini"
+        class="filter-item"
+        type="warning"
+        icon="el-icon-download"
+        @click="downloadMethod"
+      >导出</el-button>
     </div>
     <!--表格渲染-->
     <el-table v-loading="loading" :data="data" size="small" style="width: 100%;">
@@ -38,7 +36,7 @@
             <p>确定踢出该用户吗？</p>
             <div style="text-align: right; margin: 0">
               <el-button size="mini" type="text" @click="$refs[scope.$index].doClose()">取消</el-button>
-              <el-button :loading="delLoading" type="primary" size="mini" @click="subDelete(scope.$index, scope.row.key)">确定</el-button>
+              <el-button :loading="delLoading" type="primary" size="mini" @click="delMethod(scope.row.key, scope.$index)">确定</el-button>
             </div>
             <el-button slot="reference" size="mini" type="text">踢出</el-button>
           </el-popover>
@@ -58,15 +56,15 @@
 </template>
 
 <script>
-import initData from '@/mixins/initData'
-import { parseTime, downloadFile } from '@/utils/index'
-import { del, downloadOnline } from '@/api/monitor/online'
+import crud from '@/mixins/crud'
+import { del } from '@/api/monitor/online'
 export default {
   name: 'OnlineUser',
-  mixins: [initData],
+  mixins: [crud],
   data() {
     return {
-      delLoading: false
+      title: '在线用户',
+      crudMethod: { del }
     }
   },
   created() {
@@ -75,39 +73,23 @@ export default {
     })
   },
   methods: {
-    parseTime,
+    // 获取数据前设置好接口地址
     beforeInit() {
       this.url = 'auth/online'
-      this.params = { page: this.page, size: this.size }
-      if (this.query.value) { this.params['filter'] = this.query.value }
       return true
     },
-    subDelete(index, key) {
+    // 踢出用户
+    delMethod(key, index) {
       this.delLoading = true
-      del(key).then(res => {
+      this.crudMethod.del(key).then(() => {
         this.delLoading = false
         this.$refs[index].doClose()
         this.dleChangePage()
+        this.notify('踢出成功', 'success')
         this.init()
-        this.$notify({
-          title: '踢出成功',
-          type: 'success',
-          duration: 2500
-        })
-      }).catch(err => {
+      }).catch(() => {
         this.delLoading = false
         this.$refs[index].doClose()
-        console.log(err.response.data.message)
-      })
-    },
-    download() {
-      this.beforeInit()
-      this.downloadLoading = true
-      downloadOnline(this.params).then(result => {
-        downloadFile(result, '在线用户列表', 'xlsx')
-        this.downloadLoading = false
-      }).catch(() => {
-        this.downloadLoading = false
       })
     }
   }
diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue
index 16fccd6..7e941c1 100644
--- a/src/views/system/dept/index.vue
+++ b/src/views/system/dept/index.vue
@@ -130,6 +130,7 @@ export default {
     })
   },
   methods: {
+    // 获取数据前设置好接口地址
     beforeInit() {
       this.url = 'api/dept'
       return true
@@ -138,11 +139,12 @@ export default {
     beforeShowAddForm() {
       this.getDepts()
     },
-    // 打开新增弹窗前做的操作
+    // 打开编辑弹窗前做的操作
     beforeShowEditForm(data) {
       this.getDepts()
       this.form.enabled = data.enabled.toString()
     },
+    // 提交前先做下验证
     beforeSubmitMethod() {
       if (!this.form.pid) {
         this.$message({
@@ -170,6 +172,7 @@ export default {
         data.enabled = !data.enabled
       })
     },
+    // 获取所有部门
     getDepts() {
       this.crudMethod.getDepts({ enabled: true }).then(res => {
         this.depts = res.content
diff --git a/src/views/system/dictDetail/index.vue b/src/views/system/dict/dictDetail.vue
similarity index 53%
rename from src/views/system/dictDetail/index.vue
rename to src/views/system/dict/dictDetail.vue
index f76be64..0cbf6dc 100644
--- a/src/views/system/dictDetail/index.vue
+++ b/src/views/system/dict/dictDetail.vue
@@ -7,11 +7,27 @@
       <!--工具栏-->
       <div class="head-container">
         <!-- 搜索 -->
-        <el-input v-model="query.value" clearable size="small" placeholder="输入字典标签查询" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery" />
+        <el-input v-model="query.label" clearable size="small" placeholder="输入字典标签查询" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery" />
         <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="toQuery">搜索</el-button>
       </div>
       <!--表单组件-->
-      <eForm ref="form" :is-add="isAdd" :dict-id="dictId" />
+      <el-dialog :append-to-body="true" :close-on-click-modal="false" :before-close="cancel" :visible.sync="dialog" :title="getFormTitle()" width="500px">
+        <el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
+          <el-form-item label="字典标签" prop="label">
+            <el-input v-model="form.label" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="字典值">
+            <el-input v-model="form.value" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="排序" prop="sort">
+            <el-input-number v-model.number="form.sort" :min="0" :max="999" controls-position="right" style="width: 370px;" />
+          </el-form-item>
+        </el-form>
+        <div slot="footer" class="dialog-footer">
+          <el-button type="text" @click="cancel">取消</el-button>
+          <el-button :loading="loading" type="primary" @click="submitMethod">确认</el-button>
+        </div>
+      </el-dialog>
       <!--表格渲染-->
       <el-table v-loading="loading" :data="data" size="small" style="width: 100%;">
         <el-table-column label="所属字典">
@@ -22,7 +38,7 @@
         <el-table-column prop="sort" label="排序" />
         <el-table-column v-if="checkPermission(['admin','dict:edit','dict:del'])" label="操作" width="130px" align="center" fixed="right">
           <template slot-scope="scope">
-            <el-button v-permission="['admin','dict:edit']" size="mini" type="primary" icon="el-icon-edit" @click="edit(scope.row)" />
+            <el-button v-permission="['admin','dict:edit']" size="mini" type="primary" icon="el-icon-edit" @click="showEditFormDialog(scope.row)" />
             <el-popover
               :ref="scope.row.id"
               v-permission="['admin','dict:del']"
@@ -32,7 +48,7 @@
               <p>确定删除本条数据吗？</p>
               <div style="text-align: right; margin: 0">
                 <el-button size="mini" type="text" @click="$refs[scope.row.id].doClose()">取消</el-button>
-                <el-button :loading="delLoading" type="primary" size="mini" @click="subDelete(scope.row.id)">确定</el-button>
+                <el-button :loading="delLoading" type="primary" size="mini" @click="delMethod(scope.row.id)">确定</el-button>
               </div>
               <el-button slot="reference" type="danger" icon="el-icon-delete" size="mini" />
             </el-popover>
@@ -53,71 +69,42 @@
 </template>
 
 <script>
-import checkPermission from '@/utils/permission'
-import initData from '@/mixins/initData'
-import { del } from '@/api/system/dictDetail'
-import eForm from './form'
+import crud from '@/mixins/crud'
+import crudDictDetail from '@/api/system/dictDetail'
 export default {
-  components: { eForm },
-  mixins: [initData],
+  mixins: [crud],
   data() {
     return {
-      delLoading: false, dictName: '', dictId: 0
+      title: '字典详情',
+      sort: ['sort,asc', 'id,desc'],
+      crudMethod: { ...crudDictDetail },
+      dictName: '',
+      form: { id: null, label: null, value: null, dict: { id: null }, sort: 999 },
+      rules: {
+        label: [
+          { required: true, message: '请输入字典标签', trigger: 'blur' }
+        ],
+        sort: [
+          { required: true, message: '请输入序号', trigger: 'blur', type: 'number' }
+        ]
+      }
     }
   },
-  created() {
-    this.loading = false
-  },
   methods: {
-    checkPermission,
+    // 获取数据前设置好接口地址
     beforeInit() {
       this.url = 'api/dictDetail'
-      this.params = { page: this.page, size: this.size, dictName: this.dictName }
-      const query = this.query
-      const value = query.value
-      if (value) { this.params['label'] = value }
-      return true
-    },
-    subDelete(id) {
-      this.delLoading = true
-      del(id).then(res => {
-        this.delLoading = false
-        this.$refs[id].doClose()
-        this.dleChangePage()
-        this.init()
-        this.$notify({
-          title: '删除成功',
-          type: 'success',
-          duration: 2500
-        })
-      }).catch(err => {
-        this.delLoading = false
-        this.$refs[id].doClose()
-        console.log(err.response.data.message)
-      })
-    },
-    edit(data) {
-      this.isAdd = false
-      const _this = this.$refs.form
-      _this.form = {
-        id: data.id,
-        label: data.label,
-        value: data.value,
-        sort: data.sort
+      if (this.dictName) {
+        this.params['dictName'] = this.dictName
       }
-      _this.dialog = true
+      return true
     }
   }
 }
 </script>
 
-<style scoped>
-  .my-code{
-    padding: 15px;
-    line-height: 20px;
-    border-left: 3px solid #ddd;
-    color: #333;
-    font-family: Courier New;
-    font-size: 12px
+<style rel="stylesheet/scss" lang="scss" scoped>
+  /deep/ .el-input-number .el-input__inner {
+    text-align: left;
   }
 </style>
diff --git a/src/views/system/dict/form.vue b/src/views/system/dict/form.vue
deleted file mode 100644
index ac76a08..0000000
--- a/src/views/system/dict/form.vue
+++ /dev/null
@@ -1,101 +0,0 @@
-<template>
-  <el-dialog :append-to-body="true" :close-on-click-modal="false" :before-close="cancel" :visible.sync="dialog" :title="isAdd ? '新增字典' : '编辑字典'" width="500px">
-    <el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
-      <el-form-item label="字典名称" prop="name">
-        <el-input v-model="form.name" style="width: 370px;" />
-      </el-form-item>
-      <el-form-item label="描述">
-        <el-input v-model="form.remark" style="width: 370px;" />
-      </el-form-item>
-    </el-form>
-    <div slot="footer" class="dialog-footer">
-      <el-button type="text" @click="cancel">取消</el-button>
-      <el-button :loading="loading" type="primary" @click="doSubmit">确认</el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { add, edit } from '@/api/system/dict'
-export default {
-  props: {
-    isAdd: {
-      type: Boolean,
-      required: true
-    }
-  },
-  data() {
-    return {
-      loading: false, dialog: false,
-      form: {
-        id: '',
-        name: '',
-        remark: ''
-      },
-      rules: {
-        name: [
-          { required: true, message: '请输入名称', trigger: 'blur' }
-        ]
-      }
-    }
-  },
-  methods: {
-    cancel() {
-      this.resetForm()
-    },
-    doSubmit() {
-      this.$refs['form'].validate((valid) => {
-        if (valid) {
-          this.loading = true
-          if (this.isAdd) {
-            this.doAdd()
-          } else this.doEdit()
-        }
-      })
-    },
-    doAdd() {
-      add(this.form).then(res => {
-        this.resetForm()
-        this.$notify({
-          title: '添加成功',
-          type: 'success',
-          duration: 2500
-        })
-        this.loading = false
-        this.$parent.init()
-      }).catch(err => {
-        this.loading = false
-        console.log(err.response.data.message)
-      })
-    },
-    doEdit() {
-      edit(this.form).then(res => {
-        this.resetForm()
-        this.$notify({
-          title: '修改成功',
-          type: 'success',
-          duration: 2500
-        })
-        this.loading = false
-        this.$parent.init()
-      }).catch(err => {
-        this.loading = false
-        console.log(err.response.data.message)
-      })
-    },
-    resetForm() {
-      this.dialog = false
-      this.$refs['form'].resetFields()
-      this.form = {
-        id: '',
-        name: '',
-        remark: ''
-      }
-    }
-  }
-}
-</script>
-
-<style scoped>
-
-</style>
diff --git a/src/views/system/dict/index.vue b/src/views/system/dict/index.vue
index 1f1e434..ba756af 100644
--- a/src/views/system/dict/index.vue
+++ b/src/views/system/dict/index.vue
@@ -1,12 +1,27 @@
 <template>
   <div class="app-container">
     <!--表单组件-->
-    <eForm ref="form" :is-add="isAdd" />
+    <el-dialog :append-to-body="true" :close-on-click-modal="false" :before-close="cancel" :visible.sync="dialog" :title="getFormTitle()" width="500px">
+      <el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
+        <el-form-item label="字典名称" prop="name">
+          <el-input v-model="form.name" style="width: 370px;" />
+        </el-form-item>
+        <el-form-item label="描述">
+          <el-input v-model="form.remark" style="width: 370px;" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="text" @click="cancel">取消</el-button>
+        <el-button :loading="loading" type="primary" @click="submitMethod">确认</el-button>
+      </div>
+    </el-dialog>
+    <!-- 字典列表 -->
     <el-row :gutter="10">
       <el-col :xs="24" :sm="24" :md="10" :lg="10" :xl="10" style="margin-bottom: 10px">
         <el-card class="box-card">
           <div slot="header" class="clearfix">
             <span>字典列表</span>
+            <!-- 新增 -->
             <el-button
               v-permission="['admin','dict:add']"
               class="filter-item"
@@ -14,25 +29,23 @@
               style="float: right;padding: 4px 10px"
               type="primary"
               icon="el-icon-plus"
-              @click="$refs.form.dialog = true;isAdd = true"
+              @click="showAddFormDialog"
             >新增</el-button>
           </div>
           <!--工具栏-->
           <div class="head-container">
             <!-- 搜索 -->
-            <el-input v-model="query.value" clearable size="small" placeholder="输入名称或者描述搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery" />
+            <el-input v-model="query.blurry" clearable size="small" placeholder="输入名称或者描述搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery" />
             <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="toQuery">搜索</el-button>
             <!-- 导出 -->
-            <div style="display: inline-block;">
-              <el-button
-                :loading="downloadLoading"
-                size="mini"
-                class="filter-item"
-                type="warning"
-                icon="el-icon-download"
-                @click="download"
-              >导出</el-button>
-            </div>
+            <el-button
+              :loading="downloadLoading"
+              size="mini"
+              class="filter-item"
+              type="warning"
+              icon="el-icon-download"
+              @click="downloadMethod"
+            >导出</el-button>
           </div>
           <!--表格渲染-->
           <el-table v-loading="loading" :data="data" size="small" highlight-current-row style="width: 100%;" @current-change="handleCurrentChange">
@@ -40,7 +53,7 @@
             <el-table-column :show-overflow-tooltip="true" prop="remark" label="描述" />
             <el-table-column v-if="checkPermission(['admin','dict:edit','dict:del'])" label="操作" width="130px" align="center" fixed="right">
               <template slot-scope="scope">
-                <el-button v-permission="['admin','dict:edit']" size="mini" type="primary" icon="el-icon-edit" @click="edit(scope.row)" />
+                <el-button v-permission="['admin','dict:edit']" size="mini" type="primary" icon="el-icon-edit" @click="showEditFormDialog(scope.row)" />
                 <el-popover
                   :ref="scope.row.id"
                   v-permission="['admin','dict:del']"
@@ -50,7 +63,7 @@
                   <p>此操作将删除字典与对应的字典详情，确定要删除吗？</p>
                   <div style="text-align: right; margin: 0">
                     <el-button size="mini" type="text" @click="$refs[scope.row.id].doClose()">取消</el-button>
-                    <el-button :loading="delLoading" type="primary" size="mini" @click="subDelete(scope.row.id)">确定</el-button>
+                    <el-button :loading="delLoading" type="primary" size="mini" @click="delMethod(scope.row.id)">确定</el-button>
                   </div>
                   <el-button slot="reference" type="danger" icon="el-icon-delete" size="mini" />
                 </el-popover>
@@ -68,6 +81,7 @@
           />
         </el-card>
       </el-col>
+      <!-- 字典详情列表 -->
       <el-col :xs="24" :sm="24" :md="14" :lg="14" :xl="14">
         <el-card class="box-card">
           <div slot="header" class="clearfix">
@@ -79,7 +93,7 @@
               style="float: right;padding: 4px 10px"
               type="primary"
               icon="el-icon-plus"
-              @click="$refs.dictDetail.$refs.form.dialog = true;$refs.dictDetail.isAdd = true"
+              @click="$refs.dictDetail.showAddFormDialog"
             >新增</el-button>
           </div>
           <dictDetail ref="dictDetail" />
@@ -90,23 +104,27 @@
 </template>
 
 <script>
-import checkPermission from '@/utils/permission'
-import initData from '@/mixins/initData'
-import { del, downloadDict } from '@/api/system/dict'
-import dictDetail from '../dictDetail/index'
-import { downloadFile } from '@/utils/index'
-import eForm from './form'
+import crud from '@/mixins/crud'
+import dictDetail from './dictDetail'
+import crudDict from '@/api/system/dict'
 export default {
   name: 'Dict',
-  components: { dictDetail, eForm },
-  mixins: [initData],
+  components: { dictDetail },
+  mixins: [crud],
   data() {
     return {
-      delLoading: false,
+      title: '字典',
+      crudMethod: { ...crudDict },
       queryTypeOptions: [
         { key: 'name', display_name: '字典名称' },
         { key: 'remark', display_name: '描述' }
-      ]
+      ],
+      form: { id: null, name: null, remark: null },
+      rules: {
+        name: [
+          { required: true, message: '请输入名称', trigger: 'blur' }
+        ]
+      }
     }
   },
   created() {
@@ -115,69 +133,26 @@ export default {
     })
   },
   methods: {
-    checkPermission,
+    // 获取数据前设置好接口地址
     beforeInit() {
       this.url = 'api/dict'
-      const sort = 'id,desc'
-      this.params = { page: this.page, size: this.size, sort: sort }
-      const query = this.query
-      const value = query.value
-      if (value) { this.params['blurry'] = value }
       if (this.$refs.dictDetail) {
         this.$refs.dictDetail.data = []
         this.$refs.dictDetail.dictName = ''
       }
       return true
     },
-    subDelete(id) {
-      this.delLoading = true
-      del(id).then(res => {
-        this.delLoading = false
-        this.$refs[id].doClose()
-        this.dleChangePage()
-        this.init()
-        this.$notify({
-          title: '删除成功',
-          type: 'success',
-          duration: 2500
-        })
-      }).catch(err => {
-        this.delLoading = false
-        this.$refs[id].doClose()
-        console.log(err.response.data.message)
-      })
-    },
+    // 选中字典后，设置字典详情数据
     handleCurrentChange(val) {
       if (val) {
         this.$refs.dictDetail.dictName = val.name
-        this.$refs.dictDetail.dictId = val.id
+        this.$refs.dictDetail.form.dict.id = val.id
         this.$refs.dictDetail.init()
       }
-    },
-    edit(data) {
-      this.isAdd = false
-      const _this = this.$refs.form
-      _this.form = {
-        id: data.id,
-        name: data.name,
-        remark: data.remark
-      }
-      _this.dialog = true
-    },
-    download() {
-      this.beforeInit()
-      this.downloadLoading = true
-      downloadDict(this.params).then(result => {
-        downloadFile(result, '字典列表', 'xlsx')
-        this.downloadLoading = false
-      }).catch(() => {
-        this.downloadLoading = false
-      })
     }
   }
 }
 </script>
 
 <style scoped>
-
 </style>
diff --git a/src/views/system/dictDetail/form.vue b/src/views/system/dictDetail/form.vue
deleted file mode 100644
index f6e20ce..0000000
--- a/src/views/system/dictDetail/form.vue
+++ /dev/null
@@ -1,116 +0,0 @@
-<template>
-  <el-dialog :append-to-body="true" :close-on-click-modal="false" :before-close="cancel" :visible.sync="dialog" :title="isAdd ? '新增字典详情' : '编辑字典详情'" width="500px">
-    <el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
-      <el-form-item label="字典标签" prop="label">
-        <el-input v-model="form.label" style="width: 370px;" />
-      </el-form-item>
-      <el-form-item label="字典值">
-        <el-input v-model="form.value" style="width: 370px;" />
-      </el-form-item>
-      <el-form-item label="排序" prop="sort">
-        <el-input-number v-model.number="form.sort" :min="0" :max="999" controls-position="right" style="width: 370px;" />
-      </el-form-item>
-    </el-form>
-    <div slot="footer" class="dialog-footer">
-      <el-button type="text" @click="cancel">取消</el-button>
-      <el-button :loading="loading" type="primary" @click="doSubmit">确认</el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { add, edit } from '@/api/system/dictDetail'
-export default {
-  props: {
-    isAdd: {
-      type: Boolean,
-      required: true
-    },
-    dictId: {
-      type: Number,
-      required: true
-    }
-  },
-  data() {
-    return {
-      loading: false, dialog: false,
-      form: {
-        id: '',
-        label: '',
-        value: '',
-        sort: 999
-      },
-      rules: {
-        label: [
-          { required: true, message: '请输入字典标签', trigger: 'blur' }
-        ],
-        sort: [
-          { required: true, message: '请输入序号', trigger: 'blur', type: 'number' }
-        ]
-      }
-    }
-  },
-  methods: {
-    cancel() {
-      this.resetForm()
-    },
-    doSubmit() {
-      this.form['dict'] = { id: this.dictId }
-      this.$refs['form'].validate((valid) => {
-        if (valid) {
-          this.loading = true
-          if (this.isAdd) {
-            this.doAdd()
-          } else this.doEdit()
-        }
-      })
-    },
-    doAdd() {
-      add(this.form).then(res => {
-        this.resetForm()
-        this.$notify({
-          title: '添加成功',
-          type: 'success',
-          duration: 2500
-        })
-        this.loading = false
-        this.$parent.init()
-      }).catch(err => {
-        this.loading = false
-        console.log(err.response.data.message)
-      })
-    },
-    doEdit() {
-      edit(this.form).then(res => {
-        this.resetForm()
-        this.$notify({
-          title: '修改成功',
-          type: 'success',
-          duration: 2500
-        })
-        this.loading = false
-        this.$parent.init()
-      }).catch(err => {
-        this.loading = false
-        console.log(err.response.data.message)
-      })
-    },
-    resetForm() {
-      this.dialog = false
-      this.$refs['form'].resetFields()
-      this.form = {
-        id: '',
-        label: '',
-        value: '',
-        sort: '999'
-      }
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  /deep/ .el-input-number .el-input__inner {
-    text-align: left;
-  }
-</style>
diff --git a/src/views/system/job/index.vue b/src/views/system/job/index.vue
index 912ed69..4e2ceee 100644
--- a/src/views/system/job/index.vue
+++ b/src/views/system/job/index.vue
@@ -160,17 +160,21 @@ export default {
     })
   },
   methods: {
+    // 获取数据前设置好接口地址
     beforeInit() {
       this.url = 'api/job'
       return true
     },
+    // 打开新增弹窗前做的操作
     beforeShowAddForm() {
       this.getDepts()
     },
+    // 打开编辑弹窗前做的操作
     beforeShowEditForm(data) {
       this.getDepts()
       this.form.enabled = data.enabled.toString()
     },
+    // 提交前的验证
     beforeSubmitMethod() {
       if (!this.form.dept.id) {
         this.notify('所属部门不能为空', 'warning')
diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue
index cfa388d..f72e9b0 100644
--- a/src/views/system/menu/index.vue
+++ b/src/views/system/menu/index.vue
@@ -83,7 +83,7 @@
           <el-input v-model="form.name" placeholder="按钮名称" style="width: 178px;" />
         </el-form-item>
         <el-form-item v-show="form.type.toString() !== '0'" label="权限标识" prop="permission">
-          <el-input v-model="form.permission" :disabled="form.iframe === 'true'" placeholder="权限标识" style="width: 178px;" />
+          <el-input v-model="form.permission" :disabled="form.iframe" placeholder="权限标识" style="width: 178px;" />
         </el-form-item>
         <el-form-item v-if="form.type.toString() !== '2'" label="路由地址" prop="path">
           <el-input v-model="form.path" placeholder="路由地址" style="width: 178px;" />
@@ -91,10 +91,10 @@
         <el-form-item label="菜单排序" prop="sort">
           <el-input-number v-model.number="form.sort" :min="0" :max="999" controls-position="right" style="width: 178px;" />
         </el-form-item>
-        <el-form-item v-show="form.iframe === 'false' && form.type.toString() === '1'" label="组件名称" prop="componentName">
+        <el-form-item v-show="!form.iframe && form.type.toString() === '1'" label="组件名称" prop="componentName">
           <el-input v-model="form.componentName" style="width: 178px;" placeholder="匹配组件内Name字段" />
         </el-form-item>
-        <el-form-item v-show="form.iframe === 'false' && form.type.toString() === '1'" label="组件路径" prop="component">
+        <el-form-item v-show="!form.iframe && form.type.toString() === '1'" label="组件路径" prop="component">
           <el-input v-model="form.component" style="width: 178px;" placeholder="组件路径" />
         </el-form-item>
         <el-form-item label="上级类目" prop="pid">
@@ -200,6 +200,7 @@ export default {
     })
   },
   methods: {
+    // 获取数据前设置好接口地址
     beforeInit() {
       this.url = 'api/menus'
       return true
@@ -212,9 +213,11 @@ export default {
     beforeShowEditForm() {
       this.getMenus()
     },
+    // 选中图标
     selected(name) {
       this.form.icon = name
     },
+    // 获取所有菜单
     getMenus() {
       this.crudMethod.getMenusTree().then(res => {
         this.menus = []
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index 85ffa0c..70364a1 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -190,6 +190,7 @@ export default {
     })
   },
   methods: {
+    // 获取数据前设置好接口地址
     beforeInit() {
       this.showButton = false
       this.url = 'api/roles'
@@ -227,11 +228,13 @@ export default {
       }
       return true
     },
+    // 获取所有菜单
     getMenus() {
       getMenusTree().then(res => {
         this.menus = res
       })
     },
+    // 触发单选
     handleCurrentChange(val) {
       if (val) {
         const _this = this
@@ -249,6 +252,7 @@ export default {
         })
       }
     },
+    // 保存菜单
     saveMenu() {
       this.menuLoading = true
       const role = { id: this.currentId, menus: [] }
@@ -271,6 +275,7 @@ export default {
         console.log(err.response.data.message)
       })
     },
+    // 改变数据
     update() {
       // 无刷新更新 表格数据
       this.crudMethod.get(this.currentId).then(res => {
@@ -282,11 +287,13 @@ export default {
         }
       })
     },
+    // 获取部门数据
     getDepts() {
       getDepts({ enabled: true }).then(res => {
         this.depts = res.content
       })
     },
+    // 如果数据权限为自定义则获取部门数据
     changeScope() {
       if (this.form.dataScope === '自定义') {
         this.getDepts()