代码优化，组件复用

src/views/system/role/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <search :permissions="permissions" :query="query"/>
+    <eHeader :permissions="permissions" :query="query"/>
     <!--表格渲染-->
     <el-table v-loading="loading" :data="data" size="small" border style="width: 100%;">
       <el-table-column prop="name" label="名称"/>
@@ -39,15 +39,15 @@
 </template>
 
 <script>
-import checkPermission from '@/utils/permission' // 权限判断函数
+import checkPermission from '@/utils/permission'
 import initData from '../../../mixins/initData'
 import { del } from '@/api/role'
 import { getPermissionTree } from '@/api/permission'
 import { parseTime } from '@/utils/index'
-import search from './module/search'
+import eHeader from './module/header'
 import edit from './module/edit'
 export default {
-  components: { search, edit },
+  components: { eHeader, edit },
   mixins: [initData],
   data() {
     return {

src/views/system/role/module/add.vue

@@ -1,94 +0,0 @@
-<template>
-  <div>
-    <el-button class="filter-item" size="mini" type="primary" icon="el-icon-plus" @click="dialog = true">新增</el-button>
-    <el-dialog :visible.sync="dialog" :title="title" width="500px">
-      <el-form ref="form" :model="form" :rules="rules" size="small" label-width="66px">
-        <el-form-item label="名称" prop="name">
-          <el-input v-model="form.name" style="width: 370px;"/>
-        </el-form-item>
-        <el-form-item label="权限">
-          <treeselect v-model="permissionIds" :multiple="true" :options="permissions" style="width: 370px;" placeholder="请选择权限" />
-        </el-form-item>
-        <el-form-item style="margin-top: -10px;" label="描述">
-          <el-input v-model="form.remark" style="width: 370px;" rows="5" type="textarea"/>
-        </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>
-  </div>
-</template>
-<script>
-import { add } from '@/api/role'
-import Treeselect from '@riophae/vue-treeselect'
-import '@riophae/vue-treeselect/dist/vue-treeselect.css'
-export default {
-  components: { Treeselect },
-  props: {
-    permissions: {
-      type: Array,
-      required: true
-    }
-  },
-  data() {
-    return {
-      loading: false, dialog: false, title: '新增角色',
-      form: { name: '', permissions: [], remark: '' }, permissionIds: [],
-      rules: {
-        name: [
-          { required: true, message: '请输入名称', trigger: 'blur' }
-        ]
-      }
-    }
-  },
-  methods: {
-    cancel() {
-      this.resetForm()
-    },
-    doSubmit() {
-      this.$refs['form'].validate((valid) => {
-        if (valid) {
-          this.loading = true
-          this.form.permissions = []
-          const _this = this
-          this.permissionIds.forEach(function(data, index) {
-            const permission = { id: data }
-            _this.form.permissions.push(permission)
-          })
-          add(this.form).then(res => {
-            this.resetForm()
-            this.$notify({
-              title: '添加成功',
-              type: 'success',
-              duration: 2500
-            })
-            this.loading = false
-            this.$parent.$parent.init()
-          }).catch(err => {
-            this.loading = false
-            console.log(err.response.data.message)
-          })
-        } else {
-          return false
-        }
-      })
-    },
-    resetForm() {
-      this.dialog = false
-      this.$refs['form'].resetFields()
-      this.permissionIds = []
-      this.form = { name: '', permissions: [], remark: '' }
-    }
-  }
-}
-</script>
-
-<style scoped>
-  div{
-    display: inline-block;
-    margin-left: 5px;
-    margin-right: 5px;
-  }
-</style>

src/views/system/role/module/edit.vue

@@ -1,33 +1,13 @@
 <template>
   <div>
     <el-button :disabled="data.id === 1" size="mini" type="success" @click="to">编辑</el-button>
-    <el-dialog :visible.sync="dialog" :title="title" style="text-align: left" width="500px">
-      <el-form ref="form" :model="form" :rules="rules" size="small" label-width="66px">
-        <el-form ref="form" :model="form" :rules="rules" size="small" label-width="66px">
-          <el-form-item label="名称" prop="name">
-            <el-input v-model="form.name" style="width: 370px;"/>
-          </el-form-item>
-          <el-form-item label="权限">
-            <treeselect v-model="permissionIds" :multiple="true" :options="permissions" style="width: 370px;" placeholder="请选择权限" />
-          </el-form-item>
-          <el-form-item style="margin-top: -10px;" label="描述">
-            <el-input v-model="form.remark" rows="5" style="width: 370px;" type="textarea"/>
-          </el-form-item>
-        </el-form>
-      </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>
+    <eForm ref="form" :permissions="permissions" :sup_this="sup_this" :is-add="false"/>
   </div>
 </template>
 <script>
-import { edit } from '@/api/role'
-import Treeselect from '@riophae/vue-treeselect'
-import '@riophae/vue-treeselect/dist/vue-treeselect.css'
+import eForm from './form'
 export default {
-  components: { Treeselect },
+  components: { eForm },
   props: {
     data: {
       type: Object,
@@ -42,62 +22,15 @@ export default {
       required: true
     }
   },
-  data() {
-    return {
-      loading: false, dialog: false, title: '编辑角色',
-      form: { id: '', name: '', permissions: [], remark: '' }, permissionIds: [],
-      rules: {
-        name: [
-          { required: true, message: '请输入名称', trigger: 'blur' }
-        ]
-      }
-    }
-  },
   methods: {
     to() {
-      const _this = this
-      this.form = { id: this.data.id, name: this.data.name, remark: this.data.remark, permissions: [] }
+      const _this = this.$refs.form
+      _this.permissionIds = []
+      _this.form = { id: this.data.id, name: this.data.name, remark: this.data.remark, permissions: [] }
       this.data.permissions.forEach(function(data, index) {
         _this.permissionIds.push(data.id)
       })
-      this.dialog = true
-    },
-    cancel() {
-      this.resetForm()
-    },
-    doSubmit() {
-      this.$refs['form'].validate((valid) => {
-        if (valid) {
-          this.loading = true
-          this.form.permissions = []
-          const _this = this
-          this.permissionIds.forEach(function(data, index) {
-            const permission = { id: data }
-            _this.form.permissions.push(permission)
-          })
-          edit(this.form).then(res => {
-            this.resetForm()
-            this.$notify({
-              title: '修改成功',
-              type: 'success',
-              duration: 2500
-            })
-            this.loading = false
-            _this.sup_this.init()
-          }).catch(err => {
-            this.loading = false
-            console.log(err.response.data.message)
-          })
-        } else {
-          return false
-        }
-      })
-    },
-    resetForm() {
-      this.dialog = false
-      this.$refs['form'].resetFields()
-      this.permissionIds = []
-      this.form = { name: '', permissions: [], remark: '' }
+      _this.dialog = true
     }
   }
 }

src/views/system/role/module/form.vue

@@ -0,0 +1,116 @@
+<template>
+  <el-dialog :append-to-body="true" :visible.sync="dialog" :title="isAdd ? '新增角色' : '编辑角色'" width="500px">
+    <el-form ref="form" :model="form" :rules="rules" size="small" label-width="66px">
+      <el-form-item label="名称" prop="name">
+        <el-input v-model="form.name" style="width: 370px;"/>
+      </el-form-item>
+      <el-form-item label="权限">
+        <treeselect v-model="permissionIds" :multiple="true" :options="permissions" style="width: 370px;" placeholder="请选择权限" />
+      </el-form-item>
+      <el-form-item style="margin-top: -10px;" label="描述">
+        <el-input v-model="form.remark" style="width: 370px;" rows="5" type="textarea"/>
+      </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/role'
+import Treeselect from '@riophae/vue-treeselect'
+import '@riophae/vue-treeselect/dist/vue-treeselect.css'
+export default {
+  components: { Treeselect },
+  props: {
+    permissions: {
+      type: Array,
+      required: true
+    },
+    isAdd: {
+      type: Boolean,
+      required: true
+    },
+    sup_this: {
+      type: Object,
+      default: null
+    }
+  },
+  data() {
+    return {
+      loading: false, dialog: false,
+      form: { name: '', permissions: [], remark: '' }, permissionIds: [],
+      rules: {
+        name: [
+          { required: true, message: '请输入名称', trigger: 'blur' }
+        ]
+      }
+    }
+  },
+  methods: {
+    cancel() {
+      this.resetForm()
+    },
+    doSubmit() {
+      this.$refs['form'].validate((valid) => {
+        if (valid) {
+          this.loading = true
+          this.form.permissions = []
+          const _this = this
+          this.permissionIds.forEach(function(data, index) {
+            const permission = { id: data }
+            _this.form.permissions.push(permission)
+          })
+          if (this.isAdd) {
+            this.doAdd()
+          } else this.doEdit()
+        } else {
+          return false
+        }
+      })
+    },
+    doAdd() {
+      add(this.form).then(res => {
+        this.resetForm()
+        this.$notify({
+          title: '添加成功',
+          type: 'success',
+          duration: 2500
+        })
+        this.loading = false
+        this.$parent.$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.sup_this.init()
+      }).catch(err => {
+        this.loading = false
+        console.log(err.response.data.message)
+      })
+    },
+    resetForm() {
+      this.dialog = false
+      this.$refs['form'].resetFields()
+      this.permissionIds = []
+      this.form = { name: '', permissions: [], remark: '' }
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

src/views/system/role/module/header.vue

@@ -1,8 +1,20 @@
 <template>
   <div class="head-container">
+    <!-- 搜索 -->
     <el-input v-model="query.value" clearable placeholder="输入名称搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery"/>
     <el-button class="filter-item" size="mini" type="primary" icon="el-icon-search" @click="toQuery">搜索</el-button>
-    <add v-if="checkPermission(['ADMIN','ROLE_ALL','ROLE_CREATE'])" :permissions="permissions"/>
+    <!-- 新增 -->
+    <div style="display: inline-block;margin: 0px 2px;">
+      <el-button
+        v-if="checkPermission(['ADMIN','ROLE_ALL','ROLE_CREATE'])"
+        class="filter-item"
+        size="mini"
+        type="primary"
+        icon="el-icon-plus"
+        @click="$refs.form.dialog = true">新增</el-button>
+      <eForm ref="form" :permissions="permissions" :is-add="true"/>
+    </div>
+    <!-- 导出 -->
     <el-button v-if="checkPermission(['ADMIN'])" :loading="downloadLoading" size="mini" class="filter-item" type="primary" icon="el-icon-download" @click="download">导出</el-button>
   </div>
 </template>
@@ -10,10 +22,10 @@
 <script>
 import checkPermission from '@/utils/permission' // 权限判断函数
 import { parseTime } from '@/utils/index'
-import add from './add'
+import eForm from './form'
 // 查询条件
 export default {
-  components: { add },
+  components: { eForm },
   props: {
     query: {
       type: Object,
@@ -32,7 +44,6 @@ export default {
   methods: {
     checkPermission,
     toQuery() {
-      console.log(this.query)
       this.$parent.page = 0
       this.$parent.init()
     },