角色管理

src/stores/web.ts

@@ -53,10 +53,13 @@ export const useWebStore = defineStore('web', {
               type.children = type.sysIndexList?.map(index => {
                 index.treeId = index.indexTableName
                 index.treeName = index.indexName
+                index.__id = tag.treeId + '_' + type.treeId + '_' + index.treeId
                 return index
               })
+              type.__id = tag.treeId + '_' + type.treeId
               return type
             })
+            tag.__id = tag.treeId
             return tag
           }).filter(tag => tag.children?.length > 0))
           resolve(this.searchAreaTree)

src/views/manage/system/role/auth.vue

@@ -20,6 +20,8 @@
           :props="state.tree.defaultProps"
           default-expand-all
           :filter-node-method="filterNode"
+          show-checkbox
+          node-key="__id"
         />
       </div>
     </div>
@@ -28,12 +30,15 @@
 
 <script setup lang="ts">
 import {computed, getCurrentInstance, nextTick, reactive, ref, watch} from "vue";
-import {useDictionaryStore} from "@/stores";
+import {useDictionaryStore, useWebStore} from "@/stores";
 import {ElMessage, ElMessageBox} from "element-plus";
+import {rolesDoAuthorization} from "@/api/modules/manage/role";
+import {frontGetAllSysLabelsForQd} from "@/api/modules/web/list";
 
 const emit = defineEmits(['update:show', 'refresh'])
 const {proxy} = getCurrentInstance()
 const DictionaryStore = useDictionaryStore()
+const WebStore = useWebStore()
 const props = defineProps({
   show: {default: false},
   transfer: {}
@@ -45,7 +50,7 @@ const state: any = reactive({
     filter: '',
     defaultProps: {
       children: 'children',
-      label: 'label',
+      label: 'treeName',
     },
     options: []
   }
@@ -53,32 +58,38 @@ const state: any = reactive({
 const ref_tree = ref()
 const filterNode = (value, data) => {
   if (!value) return true
-  return data.label.includes(value)
+  return data.treeName.includes(value)
 }
 watch(() => state.tree.filter, (n) => {
   ref_tree.value?.filter(n)
 })
 const onSubmit = () => {
-}
-const initDetail = () => {
-  // state.loading = true
-  // sysIndexGetDetail(props.transfer.id).then(res => {
-  //   if (res.code === 200) {
-  //     state.form = res.data
-  //     state.loading = false
-  //   } else {
-  //     ElMessage.error(res.msg)
-  //   }
+  console.log(ref_tree.value.getCheckedKeys(false))
+  console.log(ref_tree.value.getCheckedKeys(true))
+  console.log(ref_tree.value.getCheckedNodes(false, false))
+  console.log(ref_tree.value.getCheckedNodes(false, true))
+  console.log(ref_tree.value.getCheckedNodes(true, true))
+  console.log(ref_tree.value.getCheckedNodes(true, false))
+  // rolesDoAuthorization({
+  //   "roleId": props.transfer.id,
+  //   "indexIds": []
   // })
 }
+const initTree = () => {
+  state.loading = true
+  WebStore.getSearchAreaTree().then(res => {
+    state.tree.options = JSON.parse(JSON.stringify(res))
+    console.log(state.tree.options)
+    state.loading = false
+  })
+}
 watch(() => props.show, (n) => {
   if (n) {
     initDictionary()
-    initDetail()
+    initTree()
   }
 })
 const initDictionary = () => {
-  DictionaryStore.initDict('gx_method')
 }
 </script>
 

src/views/manage/system/role/detail.vue

@@ -14,15 +14,15 @@
           :span="24"
           required
           label="角色名称"
-          v-model:param="state.form.indexName"
+          v-model:param="state.form.roleName"
         />
         <CusFormColumn
           :span="24"
           required
           label="状态"
-          v-model:param="state.form.shareMethod"
+          v-model:param="state.form.status"
           link="select"
-          :options="DictionaryStore.gxMethodList"
+          :options="DictionaryStore.roleStatusList"
         />
       </CusForm>
     </div>
@@ -33,6 +33,7 @@
 import {computed, getCurrentInstance, nextTick, reactive, ref, watch} from "vue";
 import {useDictionaryStore} from "@/stores";
 import {ElMessage, ElMessageBox} from "element-plus";
+import {rolesCreate, rolesGetRoleById, rolesUpdate} from "@/api/modules/manage/role";
 
 const emit = defineEmits(['update:show', 'refresh'])
 const {proxy} = getCurrentInstance()
@@ -63,17 +64,30 @@ const onSubmit = () => {
       cancelButtonText: "取消",
       type: "warning",
     } as any).then(() => {
-      // state.loading = true
-      // sysIndexSaveOrUpdate(state.form).then(res => {
-      //   if (res.code === 200) {
-      //     ElMessage.success(props.transfer.mode === 'add' ? '新增成功！' : '编辑成功！')
-      //     emit('update:show', false)
-      //     emit('refresh')
-      //   } else {
-      //     ElMessage.error(res.msg)
-      //   }
-      //   state.loading = false
-      // })
+      state.loading = true
+      if (props.transfer.mode === 'add') {
+        rolesCreate(state.form).then(res => {
+          if (res.code === 200) {
+            ElMessage.success('新增成功')
+            emit('update:show', false)
+            emit('refresh')
+          } else {
+            ElMessage.error(res.msg)
+          }
+          state.loading = false
+        })
+      } else if (props.transfer.mode === 'edit') {
+        rolesUpdate(state.form).then(res => {
+          if (res.code === 200) {
+            ElMessage.success('编辑成功')
+            emit('update:show', false)
+            emit('refresh')
+          } else {
+            ElMessage.error(res.msg)
+          }
+          state.loading = false
+        })
+      }
     }).catch(() => {})
   }).catch((e) => {
     ElMessage({
@@ -84,15 +98,15 @@ const onSubmit = () => {
   })
 }
 const initDetail = () => {
-  // state.loading = true
-  // sysIndexGetDetail(props.transfer.id).then(res => {
-  //   if (res.code === 200) {
-  //     state.form = res.data
-  //     state.loading = false
-  //   } else {
-  //     ElMessage.error(res.msg)
-  //   }
-  // })
+  state.loading = true
+  rolesGetRoleById(props.transfer.id).then(res => {
+    if (res.code === 200) {
+      state.form = res.data
+      state.loading = false
+    } else {
+      ElMessage.error(res.msg)
+    }
+  })
 }
 watch(() => props.show, (n) => {
   if (n) {
@@ -108,7 +122,7 @@ watch(() => props.show, (n) => {
   }
 })
 const initDictionary = () => {
-  DictionaryStore.initDict('gx_method')
+  DictionaryStore.initDict('role_status')
 }
 </script>
 

src/views/manage/system/role/index.vue

@@ -7,14 +7,14 @@
           label-width="80px"
           :span="4"
           label="角色名称"
-          v-model:param="state.query.form.keyword"
+          v-model:param="state.query.form.roleName"
         />
         <CusFormColumn
           :span="4"
           label="状态"
-          v-model:param="state.query.form.keyword"
+          v-model:param="state.query.form.status"
           link="select"
-          :options="DictionaryStore.trueFalseList"
+          :options="DictionaryStore.roleStatusList"
         />
         <CusButton type="main" title="搜索" @click="onSearch"/>
         <CusButton type="main" title="重置" @click="onReset"/>
@@ -30,8 +30,8 @@
         :table-head="state.query.tableHead"
         @handlePage="onPage"
       >
-        <template #shareMethod-column-value="{scope}">
-          {{DictionaryStore.gxMethodMap.get(scope.row.shareMethod)}}
+        <template #status-column-value="{scope}">
+          {{DictionaryStore.roleStatusMap.get(scope.row.status)}}
         </template>
         <template #do-column-value="{scope}">
           <CusButton type="table-edit" @click="onEdit(scope.row)"/>
@@ -47,10 +47,11 @@
 
 <script setup lang="ts">
 import {getCurrentInstance, onMounted, reactive} from "vue";
-import {ElMessage} from "element-plus";
+import {ElMessage, ElMessageBox} from "element-plus";
 import DetailCom from "./detail.vue";
 import AuthCom from "./auth.vue";
 import {useDictionaryStore} from "@/stores";
+import {rolesDelete, rolesGetByPage} from "@/api/modules/manage/role";
 
 const {proxy} = getCurrentInstance()
 const DictionaryStore = useDictionaryStore()
@@ -62,12 +63,12 @@ const state: any = reactive({
       pageSize: 10
     },
     tableHead: [
-      {value: "indexName", label: "角色名称", fixed: 'left'},
-      {value: "dataSource", label: "状态"},
+      {value: "roleName", label: "角色名称", fixed: 'left'},
+      {value: "status", label: "状态"},
       {value: "createTime", label: "创建时间", width: 200},
-      {value: "indexName", label: "创建人"},
+      {value: "createByName", label: "创建人"},
       {value: "updateTime", label: "最后修改时间", width: 200},
-      {value: "updateTime", label: "最后修改人"},
+      {value: "updateByName", label: "最后修改人"},
       {value: "do", label: "操作", width: 240, fixed: 'right'},
     ],
     form: {},
@@ -95,19 +96,16 @@ const onPage = (pageNum, pageSize) => {
     page: state.query.page.pageNum,
     size: state.query.page.pageSize,
   }
-  if (proxy.$util.isValue(state.query.formReal.keyword)) {
-    params.keyword = state.query.formReal.keyword
-  }
-  // state.query.loading = true
-  // sysIndexFindIndexByPage(proxy.$util.formatGetParam(params)).then(res => {
-  //   if (res.code === 200) {
-  //     state.query.result.total = res.data.totalElements
-  //     state.query.result.data = res.data.content
-  //     state.query.loading = false
-  //   } else {
-  //     ElMessage.error(res.msg)
-  //   }
-  // })
+  state.query.loading = true
+  rolesGetByPage(proxy.$util.formatGetParam(params)).then(res => {
+    if (res.code === 200) {
+      state.query.result.total = res.data.totalElements
+      state.query.result.data = res.data.content
+      state.query.loading = false
+    } else {
+      ElMessage.error(res.msg)
+    }
+  })
 }
 const onSearch = () => {
   state.query.formReal = JSON.parse(JSON.stringify(state.query.form))
@@ -141,9 +139,24 @@ const onAuth = (row) => {
   state.auth.show = true
 }
 const onDel = (row) => {
+  ElMessageBox.confirm(`请确认是否删除${row.roleName}?`, "提示", {
+    confirmButtonText: "确定",
+    cancelButtonText: "取消",
+    type: "warning",
+  } as any).then(() => {
+    state.loading = true
+    rolesDelete(row.id).then(res => {
+      if (res.code === 200) {
+        ElMessage.success('删除成功！')
+      } else {
+        ElMessage.error(res.msg)
+      }
+      onSearch()
+    })
+  }).catch(() => {})
 }
 const initDictionary = () => {
-  DictionaryStore.initDict('true_false')
+  DictionaryStore.initDict('role_status')
 }
 onMounted(() => {
   initDictionary()