Merge branch 'gin-vue-admin_v2_dev' of https://github.com/flipped-aurora/gin-vue-admin into gin-vue-admin_v2_dev

2020-04-17 10:56:52 +08:00
parent 6b61abdf96 569abbeb53
commit a837638672
42 changed files with 2005 additions and 1149 deletions
@@ -121,6 +121,10 @@ export default {
    },
    closeDialog(){
      this.dialogFormVisible = false
+      this.form = {
+        customerName:"",
+        customerPhoneData:""
+      }
    },
    async deleteCustomer(row){
      this.visible = false
@@ -149,7 +153,7 @@ export default {
      }
     
      if(res.code == 0){
-        this.dialogFormVisible = false
+        this.closeDialog()
        this.getTableData()
      }
    },
@@ -157,6 +161,9 @@ export default {
      this.type = "create"
      this.dialogFormVisible = true
    }
+  },
+  created(){
+    this.getTableData()
  }
 }
 </script>
@@ -145,6 +145,9 @@ export default {
    downloadFile(row) {
      downloadImage(row.url, row.name)
    }
+  },
+  created(){
+    this.getTableData()
  }
 }
 </script>
@@ -67,7 +67,12 @@
        :to="{ path: item.path }" 暂时注释不用-->
        <HistoryComponent />
        <transition mode="out-in" name="el-fade-in-linear">
-          <router-view class="admin-box"></router-view>
+          <keep-alive>
+            <router-view v-if="$route.meta.keepAlive" class="admin-box"></router-view>
+          </keep-alive>
+        </transition>
+        <transition mode="out-in" name="el-fade-in-linear">
+            <router-view v-if="!$route.meta.keepAlive" class="admin-box"></router-view>
        </transition>
      </el-main>
    </el-container>
@@ -181,6 +181,12 @@ export default {
    },
    initForm() {
      this.$refs.apiForm.resetFields()
+      this.form= {
+        path: '',
+        apiGroup: '',
+        method: '',
+        description: ''
+      }
    },
    closeDialog() {
      this.initForm()
@@ -253,7 +259,7 @@ export default {
                if (res.code == 0) {
                  this.$message({
                    type: 'success',
-                    message: '添加成功',
+                    message: '编辑成功',
                    showClose: true
                  })
                }
@@ -285,6 +291,9 @@ export default {
      const target = methodOptions.filter(item => item.value === value)[0]
      return target && `${target.type}`
    }
+  },
+  created(){
+    this.getTableData()
  }
 }
 </script>
@@ -16,19 +16,34 @@
      <el-table-column fixed="right" label="操作" min-width="300">
        <template slot-scope="scope">
          <el-button @click="opdendrawer(scope.row)" size="small" type="text">设置权限</el-button>
-          <el-button @click="deleteAuth(scope.row)" size="small" type="text">删除角色</el-button>
          <el-button @click="addAuthority(scope.row.authorityId)" size="small" type="text">新增子角色</el-button>
+          <el-button @click="editAuthority(scope.row)" size="small" type="text">编辑角色</el-button>
+          <el-button @click="deleteAuth(scope.row)" size="small" type="text">删除角色</el-button>
+
        </template>
      </el-table-column>
    </el-table>
    <!-- 新增角色弹窗 -->
    <el-dialog :visible.sync="dialogFormVisible" :title="dialogTitle">
      <el-form :model="form" :rules="rules" ref="authorityForm">
-        <el-form-item label="父级角色ID" prop="parentId">
-          <el-input autocomplete="off" disabled v-model="form.parentId"></el-input>
+        <el-form-item label="父级角色"  prop="parentId">
+           <el-select
+           :disabled="dialogType=='add'"
+            placeholder="请选择"
+            v-model="form.parentId"
+            filterable
+          >
+            <el-option
+              :disabled="canSelect(item)"
+              :key="item.authorityId"
+              :label="item.authorityName"
+              :value="item.authorityId"
+              v-for="item in AuthorityOption"
+            ></el-option>
+          </el-select>
        </el-form-item>
        <el-form-item label="角色ID" prop="authorityId">
-          <el-input autocomplete="off" v-model="form.authorityId"></el-input>
+          <el-input autocomplete="off" :disabled="dialogType=='edit'" v-model="form.authorityId"></el-input>
        </el-form-item>
        <el-form-item label="角色姓名" prop="authorityName">
          <el-input autocomplete="off" v-model="form.authorityName"></el-input>
@@ -62,7 +77,8 @@
 import {
  getAuthorityList,
  deleteAuthority,
-  createAuthority
+  createAuthority,
+  updateAuthority 
 } from '@/api/authority'

 import Menus from '@/view/superAdmin/authority/components/menus'
@@ -75,8 +91,13 @@ export default {
  mixins: [infoList],
  data() {
    return {
+      AuthorityOption:[{
+          authorityId:"0",
+          authorityName:"根角色"
+        }],
      listApi: getAuthorityList,
      drawer: false,
+      dialogType:"add",
      activeRow: {},
      activeUserId: 0,
      dialogTitle:"新增角色",
@@ -137,6 +158,11 @@ export default {
    // 初始化表单
    initForm() {
      this.$refs.authorityForm.resetFields()
+      this.form =  {
+        authorityId: '',
+        authorityName: '',
+        parentId: '0'
+      }
    },
    // 关闭窗口
    closeDialog() {
@@ -156,28 +182,96 @@ export default {
      }
      this.$refs.authorityForm.validate(async valid => {
        if (valid) {
-          const res = await createAuthority(this.form)
-          if (res.code == 0) {
-            this.$message({
-              type: 'success',
-              message: '添加成功!'
-            })
-            this.getTableData()
-            this.closeDialog()
+          switch (this.dialogType) {
+            case 'add':
+              {
+                const res = await createAuthority(this.form)
+                if (res.code == 0) {
+                  this.$message({
+                    type: 'success',
+                    message: '添加成功!'
+                  })
+                  this.getTableData()
+                  this.closeDialog()
+                }
+              }
+              break;
+            case 'edit':
+              {
+                const res = await updateAuthority(this.form)
+                if (res.code == 0) {
+                  this.$message({
+                    type: 'success',
+                    message: '添加成功!'
+                  })
+                  this.getTableData()
+                  this.closeDialog()
+                }
+              }
+              break;
+            default:
+              break;
          }
+          
          this.initForm()
          this.dialogFormVisible = false
        }
      })
    },
+    getAuthorityList(AuthorityData){
+      AuthorityData.map(item=>{
+        this.AuthorityOption.push({
+          authorityId:item.authorityId,
+          authorityName:item.authorityName
+        })
+        if(item.children){
+          this.getAuthorityList(item.children)
+        }
+      })
+    },
+    findAuthoritySelf(authority,authData,outData){
+      authData.some(item=>{
+        if(item.authorityId == authority.authorityId){
+          outData.push(item)
+          return true
+        }
+        this.findAuthoritySelf(authority,item.children,outData)
+      })
+    },
+    findAllChild(authority,array){
+      authority&&authority.map(item=>{
+        array.push(item.authorityId)
+        this.findAllChild(item.children,array)
+      })
+    },
+    canSelect(authority){
+      const array = []
+      const arrayIds = []
+      this.findAuthoritySelf({authorityId:this.form.authorityId},this.tableData,array)
+      this.findAllChild(array,arrayIds)
+      return arrayIds.indexOf(authority.authorityId)>-1
+    },
    // 增加角色
    addAuthority(parentId) {
+      this. dialogTitle = "新增角色"
+      this.dialogType = "add"
      this.form.parentId = parentId
      this.dialogFormVisible = true
+    },
+    // 增加角色
+    editAuthority(row) {
+      this. dialogTitle = "编辑角色"
+      this.dialogType = "edit"
+      for(let key in this.form){
+        this.form[key] = row[key]
+      }
+      this.dialogFormVisible = true
    }
  },
-  created() {
+  async created() {
    this.pageSize = 999
+    await this.getTableData()
+    this.getAuthorityList(this.tableData)
  }
 }
 </script>
@@ -47,7 +47,21 @@
          </el-select>
        </el-form-item>
        <el-form-item label="父节点Id">
-          <el-input autocomplete="off" disabled v-model="form.parentId"></el-input>
+           <el-select
+            placeholder="请选择"
+            v-model="form.parentId"
+            :disabled="!this.isEdit"
+            filterable 
+          >
+            <el-option
+              :disabled="canSelect(item)"
+              :key="item.ID"
+              :label="item.title"
+              :value="item.ID"
+              v-for="item in menuOption"
+            >
+            </el-option>
+          </el-select>
        </el-form-item>
        <el-form-item label="文件路径" prop="component">
          <el-input autocomplete="off" v-model="form.component"></el-input>
@@ -55,12 +69,18 @@
        <el-form-item label="展示名称" prop="meta.title">
          <el-input autocomplete="off" v-model="form.meta.title"></el-input>
        </el-form-item>
-        <el-form-item label="图标">
+        <el-form-item label="图标" prop="meta.icon">
          <el-input autocomplete="off" v-model="form.meta.icon"></el-input>
        </el-form-item>
-        <el-form-item label="排序标记">
+        <el-form-item label="排序标记" prop="sort">
          <el-input autocomplete="off" v-model.number="form.sort"></el-input>
        </el-form-item>
+        <el-form-item label="keepAlive" prop="meta.keepAlive">
+          <el-select placeholder="是否keepAlive缓存页面" v-model="form.meta.keepAlive">
+            <el-option :value="false" label="否"></el-option>
+            <el-option :value="true" label="是"></el-option>
+          </el-select>
+        </el-form-item>
      </el-form>
      <div class="warning">新增菜单需要在角色管理内配置权限才可使用</div>
      <div class="dialog-footer" slot="footer">
@@ -90,6 +110,12 @@ export default {
      listApi: getMenuList,
      dialogFormVisible: false,
      dialogTitle:"新增菜单",
+      menuOption:[
+        {
+          ID:"0",
+          title:"根菜单"
+        }
+      ],
      form: {
        ID: 0,
        path: '',
@@ -99,7 +125,9 @@ export default {
        component: '',
        meta: {
          title: '',
-          icon: ''
+          icon: '',
+          defaultMenu:false,
+          keepAlive:false
        }
      },
      rules: {
@@ -163,6 +191,20 @@ export default {
    // 初始化弹窗内表格方法
    initForm() {
      this.$refs.menuForm.resetFields()
+      this.form = {
+        ID: 0,
+        path: '',
+        name: '',
+        hidden: '',
+        parentId: '',
+        component: '',
+        meta: {
+          title: '',
+          icon: '',
+          defaultMenu:false,
+          keepAlive:""
+        }
+      }
    },
    // 关闭弹窗
    closeDialog() {
@@ -183,14 +225,9 @@ export default {
          if (res.code == 0) {
            this.$message({
              type: 'success',
-              message: '添加成功!'
+              message: this.isEdit?'编辑成功':'添加成功!'
            })
            this.getTableData()
-          } else {
-            this.$message({
-              type: 'error',
-              message: '添加失败!'
-            })
          }
          this.initForm()
          this.dialogFormVisible = false
@@ -211,10 +248,45 @@ export default {
      this.form = res.data.menu
      this.dialogFormVisible = true
      this.isEdit = true
-    }
+    },
+    getMenuList(MenuData){
+      MenuData.map(item=>{
+        this.menuOption.push({
+          ID:String(item.ID),
+          title:item.meta.title
+        })
+        if(item.children){
+          this.getMenuList(item.children)
+        }
+      })
+    },
+    findAuthoritySelf(mune,muneData,outData){
+      muneData&&muneData.some(item=>{
+        if(item.ID == mune.ID){
+          outData.push(item)
+          return true
+        }
+        this.findAuthoritySelf(mune,item.children,outData)
+      })
+    },
+    findAllChild(menu,array){
+      menu&&menu.map(item=>{
+        array.push(String(item.ID))
+        this.findAllChild(item.children,array)
+      })
+    },
+    canSelect(authority){
+      const array = []
+      const arrayIds = []
+      this.findAuthoritySelf({ID:this.form.ID},this.tableData,array)
+      this.findAllChild(array,arrayIds)
+      return arrayIds.indexOf(authority.ID)>-1
+    },
  },
-  created() {
+   async created() {
    this.pageSize = 999
+    await this.getTableData()
+    await this.getMenuList(this.tableData)
  }
 }
 </script>
@@ -30,6 +30,21 @@
          </el-select>
        </template>
      </el-table-column>
+      <el-table-column label="操作" min-width="150">
+        <template slot-scope="scope">
+          <el-popover
+          placement="top"
+          width="160"
+          v-model="scope.row.visible">
+          <p>确定要删除此用户吗</p>
+          <div style="text-align: right; margin: 0">
+            <el-button size="mini" type="text" @click="scope.row.visible = false">取消</el-button>
+            <el-button type="primary" size="mini" @click="deleteUser(scope.row)">确定</el-button>
+          </div>
+           <el-button type="text" size="small" slot="reference">删除</el-button>
+        </el-popover>
+        </template>
+      </el-table-column>
    </el-table>
    <el-pagination
      :current-page="page"
@@ -89,7 +104,7 @@
 <script>
 // 获取列表内容封装在mixins内部  getTableData方法 初始化已封装完成
 const path = process.env.VUE_APP_BASE_API
-import { getUserList, setUserAuthority, register } from '@/api/user'
+import { getUserList, setUserAuthority, register, deleteUser } from '@/api/user'
 import { getAuthorityList } from '@/api/authority'
 import infoList from '@/components/mixins/infoList'
 import { mapGetters } from 'vuex'
@@ -127,6 +142,24 @@ export default {
    ...mapGetters('user', ['token'])
  },
  methods: {
+    async deleteUser(row){
+      const res = await deleteUser({id:row.ID})
+      if(res.code == 0){
+        this.getTableData()
+        row.visible = false
+      }
+    },
+     getAuthorityList(AuthorityData){
+      AuthorityData.map(item=>{
+        this.authOptions.push({
+          authorityId:item.authorityId,
+          authorityName:item.authorityName
+        })
+        if(item.children){
+          this.getAuthorityList(item.children)
+        }
+      })
+    },
    async enterAddUserDialog() {
      this.$refs.userForm.validate(async valid => {
        if (valid) {
@@ -160,8 +193,10 @@ export default {
    }
  },
  async created() {
+    this.getTableData()
    const res = await getAuthorityList({ page: 1, pageSize: 999 })
    this.authOptions = res.data.list
+    
  }