lcl 9 months ago
parent
commit
719b896138

+ 2 - 0
src/api/system.ts

@@ -140,6 +140,7 @@ export const putRoleMenuList = (params?: object): dataResult => {
 };
 /** 添加菜单 */
 export const postMenuList = (params?: object): dataResult => {
+  console.log(params);
   return http.Request({
     url: UrlList.SkbSystem.menuadd.url,
     method: UrlList.SkbSystem.menuadd.method,
@@ -148,6 +149,7 @@ export const postMenuList = (params?: object): dataResult => {
 };
 /** 编辑菜单 */
 export const putMenuList = (params?: object): dataResult => {
+  console.log(params);
   return http.Request({
     url: UrlList.SkbSystem.menuupdate.url,
     method: UrlList.SkbSystem.menuupdate.method,

+ 3 - 2
src/views/admin/menu/hook.tsx

@@ -20,7 +20,7 @@ export function useUser() {
     path: "", //路由路径
     parentId: "-1", //父菜单ID
     icon: "", //菜单图标
-    sortOrder: "", //排序值,越小越靠前
+    sortOrder: "0", //排序值,越小越靠前
     embedded: "0", //是否内嵌,0否,1是
     menuType: "0" //菜单类型,0菜单,1按钮
   });
@@ -218,7 +218,7 @@ export function useUser() {
       path: "", //路由路径
       parentId: "", //父菜单ID
       icon: "", //菜单图标
-      sortOrder: "", //排序值,越小越靠前
+      sortOrder: "0", //排序值,越小越靠前
       embedded: "0", //是否内嵌,0否,1是
       menuType: "0" //菜单类型,0菜单,1按钮
     };
@@ -269,6 +269,7 @@ export function useUser() {
   async function onSearch() {
     loading.value = true;
     const { data } = await getMenuList({});
+    console.log('testlog', data);
     dataList.value = data;
     pagination.total = data.length;
     setTimeout(() => {

+ 2 - 2
src/views/admin/menu/index.vue

@@ -113,8 +113,8 @@ defineExpose({
       el-form-item(label='菜单标题' prop="name")
         el-input(v-model='UpdateForm.name' autocomplete='off' class="!w-[300px]"
           placeholder="请输入菜单标题")
-      el-form-item(label='菜单名称' prop="title" v-if="UpdateForm.menuType == '0'")
-        el-input(v-model='UpdateForm.title' autocomplete='off' class="!w-[300px]"
+      el-form-item(label='菜单名称' prop="enName" v-if="UpdateForm.menuType == '0'")
+        el-input(v-model='UpdateForm.enName' autocomplete='off' class="!w-[300px]"
           placeholder="请输入菜单名称(英文字母名称)")
       el-form-item(label='权限标识' prop="permission" v-if="UpdateForm.menuType == '1'")
         el-input(v-model='UpdateForm.permission' autocomplete='off' class="!w-[300px]"

+ 2 - 1
src/views/admin/role/hook.tsx

@@ -19,7 +19,7 @@ export function useUser() {
   const AddFormdata: any = ref({
     roleName: "",
     roleDesc: "",
-    roleCode: "roleCode"
+    roleCode: ""
   });
   const dialogType = ref(1);
   const AddFormvalueStrictly = ref([]);
@@ -279,6 +279,7 @@ export function useUser() {
     console.log(arr);
     AddFormvalueStrictly.value = arr;
     AuthorizationVisible.value = true;
+    menuTree.value = arr.menus;
     menuTree.value.setCheckedKeys(arr);
   }
   const menuTree = ref();

+ 3 - 0
src/views/admin/role/index.vue

@@ -179,6 +179,9 @@ defineExpose({
       el-form-item(label='角色描述' prop="roleDesc")
         el-input(v-model='AddFormdata.roleDesc' autocomplete='off' class="!w-[230px]"
           placeholder="请输入角色描述")
+      el-form-item(label='角色编码' prop="roleCode")
+        el-input(v-model='AddFormdata.roleCode' autocomplete='off' class="!w-[230px]"
+          placeholder="请输入角色编码")
     template(#footer)
       span.dialog-footer
         el-button(@click='dialogAddVisible = false') 关闭