zhengnaiwen_citu 1 год назад
Родитель
Сommit
3afedaba0f

+ 0 - 0
src/api/menduner/system/user/index.ts → src/api/menduner/system/madUser/index.ts


+ 1 - 1
src/views/menduner/system/user/MdeUserForm.vue → src/views/menduner/system/madUser/MdeUserForm.vue

@@ -59,7 +59,7 @@
 </template>
 <script setup lang="ts">
 import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
-import { MdeUserApi, MdeUserVO } from '@/api/menduner/system/user'
+import { MdeUserApi, MdeUserVO } from '@/api/menduner/system/madUser'
 
 /** 门墩儿-用户登录 表单 */
 defineOptions({ name: 'MdeUserForm' })

+ 1 - 1
src/views/menduner/system/user/index.vue → src/views/menduner/system/madUser/index.vue

@@ -154,7 +154,7 @@
 import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
 import { dateFormatter } from '@/utils/formatTime'
 import download from '@/utils/download'
-import { MdeUserApi, MdeUserVO } from '@/api/menduner/system/user'
+import { MdeUserApi, MdeUserVO } from '@/api/menduner/system/madUser'
 import MdeUserForm from './MdeUserForm.vue'
 
 /** 门墩儿-用户登录 列表 */

+ 5 - 5
src/views/menduner/system/permission/RoleAssignMenuForm.vue

@@ -57,7 +57,7 @@ const message = useMessage() // 消息弹窗
 
 const dialogVisible = ref(false) // 弹窗的是否展示
 const formLoading = ref(false) // 表单的加载中:1)修改时的数据加载;2)提交的按钮禁用
-const formData = reactive({
+const formData = ref({
   id: 0,
   name: '',
   code: '',
@@ -76,9 +76,9 @@ const open = async (row: RoleApi.RoleVO) => {
   // 加载 Menu 列表。注意,必须放在前面,不然下面 setChecked 没数据节点
   menuOptions.value = handleTree(await MenuApi.getSimpleMenusList())
   // 设置数据
-  formData.id = row.id
-  formData.name = row.name
-  formData.code = row.code
+  formData.value.id = row.id
+  formData.value.name = row.name
+  formData.value.code = row.code
   formLoading.value = true
   try {
     formData.value.menuIds = await PermissionApi.getRoleMenuList(row.id)
@@ -103,7 +103,7 @@ const submitForm = async () => {
   formLoading.value = true
   try {
     const data = {
-      roleId: formData.id,
+      roleId: formData.value.id,
       menuIds: [
         ...(treeRef.value.getCheckedKeys(false) as unknown as Array<number>), // 获得当前选中节点
         ...(treeRef.value.getHalfCheckedKeys() as unknown as Array<number>) // 获得半选中的父节点

+ 6 - 6
src/views/menduner/system/permission/index.vue

@@ -57,7 +57,7 @@
           重置
         </el-button>
         <el-button
-          v-hasPermi="['system:role:create']"
+          v-hasPermi="['menduner:system:mde-role:create']"
           plain
           type="primary"
           @click="openForm('create')"
@@ -66,7 +66,7 @@
           新增
         </el-button>
         <el-button
-          v-hasPermi="['system:role:export']"
+          v-hasPermi="['menduner:system:mde-role:export']"
           :loading="exportLoading"
           plain
           type="success"
@@ -107,14 +107,14 @@
       <el-table-column :width="300" align="center" label="操作">
         <template #default="scope">
           <el-button
-            v-hasPermi="['system:role:update']"
+            v-hasPermi="['menduner:system:mde-role:update']"
             link
             type="primary"
             @click="openForm('update', scope.row.id)"
           >
             编辑
           </el-button>
-          <el-button
+          <!-- <el-button
             v-hasPermi="['system:permission:assign-role-menu']"
             link
             preIcon="ep:basketball"
@@ -123,7 +123,7 @@
             @click="openAssignMenuForm(scope.row)"
           >
             菜单权限
-          </el-button>
+          </el-button> -->
           <el-button
             v-hasPermi="['system:permission:assign-role-data-scope']"
             link
@@ -135,7 +135,7 @@
             数据权限
           </el-button>
           <el-button
-            v-hasPermi="['system:role:delete']"
+            v-hasPermi="['menduner:system:mde-role:delete']"
             link
             type="danger"
             @click="handleDelete(scope.row.id)"

+ 5 - 5
src/views/system/role/RoleAssignMenuForm.vue

@@ -57,7 +57,7 @@ const message = useMessage() // 消息弹窗
 
 const dialogVisible = ref(false) // 弹窗的是否展示
 const formLoading = ref(false) // 表单的加载中:1)修改时的数据加载;2)提交的按钮禁用
-const formData = reactive({
+const formData = ref({
   id: 0,
   name: '',
   code: '',
@@ -76,9 +76,9 @@ const open = async (row: RoleApi.RoleVO) => {
   // 加载 Menu 列表。注意,必须放在前面,不然下面 setChecked 没数据节点
   menuOptions.value = handleTree(await MenuApi.getSimpleMenusList())
   // 设置数据
-  formData.id = row.id
-  formData.name = row.name
-  formData.code = row.code
+  formData.value.id = row.id
+  formData.value.name = row.name
+  formData.value.code = row.code
   formLoading.value = true
   try {
     formData.value.menuIds = await PermissionApi.getRoleMenuList(row.id)
@@ -103,7 +103,7 @@ const submitForm = async () => {
   formLoading.value = true
   try {
     const data = {
-      roleId: formData.id,
+      roleId: formData.value.id,
       menuIds: [
         ...(treeRef.value.getCheckedKeys(false) as unknown as Array<number>), // 获得当前选中节点
         ...(treeRef.value.getHalfCheckedKeys() as unknown as Array<number>) // 获得半选中的父节点

+ 2 - 1
src/views/system/user/index.vue

@@ -225,7 +225,7 @@ const queryParams = reactive({
   mobile: undefined,
   status: undefined,
   deptId: undefined,
-  createTime: []
+  createTime: ''
 })
 const queryFormRef = ref() // 搜索的表单
 
@@ -233,6 +233,7 @@ const queryFormRef = ref() // 搜索的表单
 const getList = async () => {
   loading.value = true
   try {
+    console.log(123)
     const data = await UserApi.getUserPage(queryParams)
     list.value = data.list
     total.value = data.total