新增没款管理

src/api/department/index.ts

@@ -9,7 +9,7 @@ export const getUserListByIdApi = (params: any) => {
 }
 
 export const getUserByIdApi = (id: string) => {
-  return request.get({ url: `/oms/emp/info/${id}`, params })
+  return request.get({ url: `/oms/emp/info/${id}` })
 }
 
 export const deleteUserByIdApi = (data: any) => {

src/api/module/index.ts

@@ -0,0 +1,33 @@
+import request from '@/config/axios'
+
+export const getListPage = (params: any) => {
+  return request.get({ url: '/oms/module/list', params })
+}
+
+export const getInfo = (params: any) => {
+  return request.get({ url: '/oms/module/info/{id}', params })
+}
+
+export const delTableListApi = (data: any) => {
+  return request.post({ url: `/oms/module/delete`, data })
+}
+
+export const saveTableApi = (data: any) => {
+  return request.post({ url: '/oms/module/save', data })
+}
+
+export const updateTableApi = (data: any) => {
+  return request.post({ url: '/oms/module/update', data })
+}
+
+export const getOptions = () => {
+  return request.get({ url: '/oms/module/items' })
+}
+
+export const getAllocInfo = (id: any) => {
+  return request.post({ url: `/oms/module/allocInfo/${id}` })
+}
+
+export const updateAllocModule = (data: any) => {
+  return request.post({ url: '/oms/module/allocModule', data })
+}

src/components/UserInfo/src/UserInfo.vue

@@ -52,7 +52,6 @@ const dialogVisible = ref<boolean>(false)
 const lockScreen = () => {
   dialogVisible.value = true
 }
-
 </script>
 
 <template>

src/config/axios/config.ts

@@ -108,10 +108,12 @@ const defaultResponseInterceptors = (response: AxiosResponse<any>) => {
         }
       })
     }
-  } else if (response.data.code === 400) {
-    ElMessage.error((response as any).data.message)
-    return response
-  } else {
+  }
+  // else if (response.data.code === 400) {
+  //   ElMessage.error((response as any).data.message)
+  //   return response
+  // }
+  else {
     ElMessage.error((response as any).data.message)
   }
 }

src/views/Authorization/Institution/Institution.vue

@@ -14,9 +14,12 @@ import { Search } from '@/components/Search'
 import { FormSchema } from '@/components/Form'
 import { ContentWrap } from '@/components/ContentWrap'
 import Write from './components/Write.vue'
+import Module from './components/Module/Module.vue'
 import { Dialog } from '@/components/Dialog'
 import moment from 'moment'
 import UserList from './components/User/User.vue'
+import { updateAllocModule } from '@/api/module'
+
 const { t } = useI18n()
 
 const { tableRegister, tableState, tableMethods } = useTable({
@@ -66,7 +69,7 @@ const tableColumns = reactive<TableColumn[]>([
   {
     field: 'action',
     label: t('userDemo.action'),
-    width: 260,
+    width: 360,
     slots: {
       default: (data: any) => {
         const row = data.row
@@ -78,6 +81,9 @@ const tableColumns = reactive<TableColumn[]>([
             <ElButton type="success" onClick={() => handleUser(row)}>
               用户管理
             </ElButton>
+            <ElButton type="success" onClick={() => action(row, 'module')}>
+              配置模块
+            </ElButton>
             <ElButton type="danger" onClick={() => handleDelete(row)}>
               {t('exampleDemo.del')}
             </ElButton>
@@ -125,14 +131,14 @@ const AddAction = () => {
   dialogVisible.value = true
   actionType.value = ''
 }
-
+const moduleRef = ref()
 const save = async () => {
-  const write = unref(writeRef)
+  const write = actionType.value == 'module' ? unref(moduleRef) : unref(writeRef)
   const formData = await write?.submit()
   if (formData) {
     saveLoading.value = true
-    if (formData.id) {
-      updateDepartmentApi(formData).then((res) => {
+    if (actionType.value == 'module') {
+      updateAllocModule(formData).then((res) => {
         if (res) {
           ElMessage.success('修改成功')
           dialogVisible.value = false
@@ -140,14 +146,25 @@ const save = async () => {
         }
       })
     } else {
-      saveDepartmentApi(formData).then((res) => {
-        if (res) {
-          ElMessage.success('保存成功')
-          dialogVisible.value = false
-          getList()
-        }
-      })
+      if (formData.id) {
+        updateDepartmentApi(formData).then((res) => {
+          if (res) {
+            ElMessage.success('修改成功')
+            dialogVisible.value = false
+            getList()
+          }
+        })
+      } else {
+        saveDepartmentApi(formData).then((res) => {
+          if (res) {
+            ElMessage.success('保存成功')
+            dialogVisible.value = false
+            getList()
+          }
+        })
+      }
     }
+
     saveLoading.value = false
   }
 }
@@ -190,8 +207,12 @@ const handleUser = (row: any) => {
   </ContentWrap>
 
   <Dialog v-model="dialogVisible" :title="dialogTitle">
-    <Write v-if="actionType !== 'detail'" ref="writeRef" :current-row="currentRow" />
-
+    <Write
+      v-if="actionType == 'edit' || actionType == 'add'"
+      ref="writeRef"
+      :current-row="currentRow"
+    />
+    <Module ref="moduleRef" v-if="actionType == 'module'" :current-row="currentRow" />
     <template #footer>
       <ElButton v-if="actionType !== 'detail'" type="primary" :loading="saveLoading" @click="save">
         {{ t('exampleDemo.save') }}

src/views/Authorization/Institution/components/Module/Module.vue

@@ -0,0 +1,108 @@
+<script setup lang="tsx">
+import { Form, FormSchema } from '@/components/Form'
+import { useForm } from '@/hooks/web/useForm'
+import { PropType, reactive, watch, ref } from 'vue'
+import { useValidator } from '@/hooks/web/useValidator'
+import { getDepartmentItemApi } from '@/api/department'
+import { getOptions, getAllocInfo } from '@/api/module'
+
+const { required } = useValidator()
+
+const props = defineProps({
+  currentRow: {
+    type: Object as PropType<any>,
+    default: () => null
+  }
+})
+
+const { formRegister, formMethods } = useForm()
+const { setValues, getFormData, getElFormExpose } = formMethods
+
+const formSchema = ref<FormSchema[]>([
+  {
+    field: 'name',
+    label: '机构名称',
+    component: 'Input',
+    componentProps: {
+      readonly: true
+    },
+    colProps: {
+      span: 24
+    }
+  },
+  {
+    field: 'ids',
+    label: '模块配置',
+    component: 'Select',
+    colProps: {
+      span: 24
+    },
+    componentProps: {
+      options: [],
+      multiple: true
+    },
+    // 远程加载option
+    optionApi: async () => {
+      const res = await getOptions()
+      return res.data.map((e: any) => {
+        return {
+          label: e.name,
+          value: e.id
+        }
+      })
+    }
+  }
+])
+
+const rules = reactive({
+  ids: [required()]
+})
+
+const submit = async () => {
+  const elForm = await getElFormExpose()
+  const valid = await elForm?.validate().catch((err) => {
+    console.log(err)
+  })
+  if (valid) {
+    const formData = await getFormData()
+    return formData
+  }
+}
+
+const initValue = () => {
+  getDepartmentItemApi(props.currentRow.id).then((res) => {
+    setValues({
+      ...res.data
+    })
+  })
+  getAllocInfo(props.currentRow.id).then((res) => {
+    setValues({
+      ids: res.data.map((e: any) => {
+        return e.moduleId
+      })
+    })
+  })
+}
+
+watch(
+  () => props.currentRow,
+  (currentRow) => {
+    if (!currentRow) {
+      return
+    }
+    initValue()
+  },
+  {
+    deep: true,
+    immediate: true
+  }
+)
+
+defineExpose({
+  submit
+})
+</script>
+
+<template>
+  <Form :rules="rules" @register="formRegister" :schema="formSchema" />
+</template>

src/views/Authorization/Institution/components/User/components/Write.vue

@@ -76,7 +76,7 @@ const rules = reactive({
 })
 
 const { formRegister, formMethods } = useForm()
-const { setValues, getFormData, getElFormExpose } = formMethods
+const { setValues, getFormData, getElFormExpose, setSchema } = formMethods
 
 const submit = async () => {
   const elForm = await getElFormExpose()
@@ -111,7 +111,7 @@ watch(
     if (!currentRow) {
       return
     }
-    initValue()
+    initValue(currentRow)
   },
   {
     deep: true,

src/views/Authorization/Menu/components/Write.vue

@@ -22,6 +22,7 @@ const formSchema = reactive<FormSchema[]>([
     field: 'type',
     label: '类型',
     component: 'RadioGroup',
+    hidden: true,
     value: 0,
     colProps: {
       span: 24
@@ -43,21 +44,10 @@ const formSchema = reactive<FormSchema[]>([
       ]
     }
   },
-  {
-    field: 'name',
-    label: t('menu.menuName'),
-    component: 'Input',
-    colProps: {
-      span: 24
-    }
-  },
   {
     field: 'pid',
     label: '上级菜单',
     component: 'TreeSelect',
-    colProps: {
-      span: 24
-    },
     componentProps: {
       checkStrictly: true,
       nodeKey: 'id',
@@ -67,38 +57,22 @@ const formSchema = reactive<FormSchema[]>([
       data: props.treeSelectData
     }
   },
-  {
-    field: 'icon',
-    label: t('menu.icon'),
-    colProps: {
-      span: 24
-    },
-    component: 'IconPicker'
-  },
   {
     field: 'url',
     label: '路由地址',
-    colProps: {
-      span: 24
-    },
+    component: 'Input'
+  },
+  {
+    field: 'redirect',
+    label: '重定向路由',
     component: 'Input'
   },
   {
     field: 'orderNum',
     label: '排序',
-    colProps: {
-      span: 24
-    },
     component: 'InputNumber'
   },
-  {
-    field: 'permissions',
-    label: '授权标识',
-    colProps: {
-      span: 24
-    },
-    component: 'Input'
-  },
+
   {
     field: 'meta.title',
     label: t('menu.menuName'),
@@ -117,7 +91,7 @@ const formSchema = reactive<FormSchema[]>([
   {
     field: 'meta.icon',
     label: t('menu.icon'),
-    component: 'Input'
+    component: 'IconPicker'
   },
   {
     field: 'status',
@@ -136,6 +110,11 @@ const formSchema = reactive<FormSchema[]>([
       ]
     }
   },
+  {
+    field: 'permissions',
+    label: '授权标识',
+    component: 'Input'
+  },
   {
     field: 'meta.activeMenu',
     label: t('menu.activeMenu'),

src/views/Organizational/Menu/Menu.vue

@@ -28,13 +28,8 @@ const { dataList, loading } = tableState
 const { getList } = tableMethods
 
 const tableColumns = reactive<TableColumn[]>([
-  // {
-  //   field: 'index',
-  //   label: t('userDemo.index'),
-  //   type: 'index'
-  // },
   {
-    field: 'name',
+    field: 'meta.title',
     label: t('menu.menuName')
   },
   {
@@ -62,24 +57,14 @@ const tableColumns = reactive<TableColumn[]>([
       default: (data: any) => {
         return (
           <>
-            <ElTag type={data.row.type === 0 ? '' : data.row.type === 1 ? 'success' : 'info'}>
-              {data.row.type === 0 ? '目录' : data.row.type === 1 ? '菜单' : '按钮'}
+            <ElTag type={data.row.type == 0 ? '' : data.row.type == 1 ? 'success' : 'info'}>
+              {data.row.type == 0 ? '目录' : data.row.type == 1 ? '菜单' : '按钮'}
             </ElTag>
           </>
         )
       }
     }
   },
-  // {
-  //   field: 'component',
-  //   label: t('menu.component'),
-  //   slots: {
-  //     default: (data: any) => {
-  //       const component = data.row.component
-  //       return <>{component === '#' ? '顶级目录' : component === '##' ? '子目录' : component}</>
-  //     }
-  //   }
-  // },
   {
     field: 'orderNum',
     label: '排序'

src/views/Organizational/Menu/components/Write.vue

@@ -1,10 +1,10 @@
-<script setup lang="ts">
+<script setup lang="tsx">
 import { Form, FormSchema } from '@/components/Form'
 import { useForm } from '@/hooks/web/useForm'
 import { PropType, reactive, watch } from 'vue'
 import { useValidator } from '@/hooks/web/useValidator'
 import { useI18n } from '@/hooks/web/useI18n'
-
+import { getOptions } from '@/api/module'
 const { t } = useI18n()
 
 const { required } = useValidator()
@@ -19,37 +19,7 @@ const props = defineProps({
 
 const formSchema = reactive<FormSchema[]>([
   {
-    field: 'type',
-    label: '类型',
-    component: 'RadioGroup',
-    value: 0,
-    colProps: {
-      span: 24
-    },
-    componentProps: {
-      options: [
-        {
-          label: '目录',
-          value: 0
-        },
-        {
-          label: '菜单',
-          value: 1
-        },
-        {
-          label: '按钮',
-          value: 2
-        }
-      ],
-      on: {
-        change: (val: string | number) => {
-          changeType(val)
-        }
-      }
-    }
-  },
-  {
-    field: 'name',
+    field: 'meta.title',
     label: t('menu.menuName'),
     component: 'Input',
     colProps: {
@@ -60,18 +30,46 @@ const formSchema = reactive<FormSchema[]>([
     field: 'pid',
     label: '上级菜单',
     component: 'TreeSelect',
+    value: 0,
     colProps: {
       span: 24
     },
     componentProps: {
       checkStrictly: true,
       nodeKey: 'id',
+      label: 'name',
       props: {
         label: 'name'
       },
+      slots: {
+        default: ({ data: { meta } }) => {
+          return <>{meta?.title ? meta.title : ''}</>
+        }
+      },
       data: props.treeSelectData
     }
   },
+  {
+    field: 'moduleId',
+    label: '所属模块',
+    component: 'Select',
+    colProps: {
+      span: 24
+    },
+    componentProps: {
+      options: []
+    },
+    // 远程加载option
+    optionApi: async () => {
+      const res = await getOptions()
+      return res.data.map((e: any) => {
+        return {
+          label: e.name,
+          value: e.id
+        }
+      })
+    }
+  },
   {
     field: 'icon',
     label: t('menu.icon'),
@@ -103,6 +101,106 @@ const formSchema = reactive<FormSchema[]>([
       span: 24
     },
     component: 'Input'
+  },
+  {
+    field: 'component',
+    label: t('menu.component'),
+    component: 'Input'
+  },
+  {
+    field: 'name',
+    label: t('menu.name'),
+    component: 'Input'
+  },
+  {
+    field: 'meta.icon',
+    label: t('menu.icon'),
+    component: 'Input'
+  },
+  {
+    field: 'status',
+    label: t('menu.status'),
+    component: 'Select',
+    value: 1,
+    componentProps: {
+      options: [
+        {
+          label: t('userDemo.disable'),
+          value: 0
+        },
+        {
+          label: t('userDemo.enable'),
+          value: 1
+        }
+      ]
+    }
+  },
+  {
+    field: 'meta.activeMenu',
+    label: t('menu.activeMenu'),
+    component: 'Input'
+  },
+  // {
+  //   field: 'permission',
+  //   label: t('menu.permission'),
+  //   component: 'CheckboxGroup',
+  //   componentProps: {
+  //     options: [
+  //       {
+  //         label: 'add',
+  //         value: 'add'
+  //       },
+  //       {
+  //         label: 'edit',
+  //         value: 'edit'
+  //       },
+  //       {
+  //         label: 'delete',
+  //         value: 'delete'
+  //       }
+  //     ]
+  //   }
+  // },
+  {
+    field: 'meta.hidden',
+    label: t('menu.hidden'),
+    component: 'Switch'
+  },
+  {
+    field: 'meta.alwaysShow',
+    label: t('menu.alwaysShow'),
+    component: 'Switch'
+  },
+  {
+    field: 'isApp',
+    label: '是否是App',
+    component: 'Switch',
+    value: false
+  },
+  {
+    field: 'meta.noCache',
+    label: t('menu.noCache'),
+    component: 'Switch'
+  },
+  {
+    field: 'meta.breadcrumb',
+    label: t('menu.breadcrumb'),
+    component: 'Switch'
+  },
+  {
+    field: 'meta.affix',
+    label: t('menu.affix'),
+    component: 'Switch'
+  },
+  {
+    field: 'meta.noTagsView',
+    label: t('menu.noTagsView'),
+    component: 'Switch'
+  },
+  {
+    field: 'canTo',
+    label: t('menu.canTo'),
+    component: 'Switch'
   }
 ])
 
@@ -121,7 +219,7 @@ const submit = async () => {
   })
   if (valid) {
     const formData = await getFormData()
-    return formData
+    return { ...formData, type: 1 }
   }
 }
 

src/views/Organizational/Module/Module.vue

@@ -0,0 +1,198 @@
+<script setup lang="tsx">
+import { ContentWrap } from '@/components/ContentWrap'
+import { useI18n } from '@/hooks/web/useI18n'
+import { Table } from '@/components/Table'
+import { ref, unref, reactive } from 'vue'
+import { ElButton } from 'element-plus'
+import { saveTableApi, delTableListApi, updateTableApi, getListPage } from '@/api/module'
+import type { DictData, DictRowData } from '@/api/manage/types'
+import { useTable } from '@/hooks/web/useTable'
+import { Search } from '@/components/Search'
+import Write from './components/Write.vue'
+import { Dialog } from '@/components/Dialog'
+import { CrudSchema, useCrudSchemas } from '@/hooks/web/useCrudSchemas'
+const { t } = useI18n()
+const { tableRegister, tableState, tableMethods } = useTable({
+  fetchDataApi: async () => {
+    const { currentPage, pageSize } = tableState
+    const res = await getListPage({
+      ...searchParams.value,
+      page: unref(currentPage),
+      limit: unref(pageSize),
+      order: '',
+      orderField: ''
+    })
+    return {
+      list: res.data.data,
+      total: res.data.total
+    }
+  },
+  fetchDelApi: async () => {
+    const res = await delTableListApi([id.value])
+    return !!res
+  }
+})
+const { loading, dataList, total, pageSize, currentPage } = tableState
+const { getList, delList } = tableMethods
+
+const crudSchemas = reactive<CrudSchema[]>([
+  {
+    field: 'name',
+    label: '模块名称'
+  },
+
+  {
+    field: 'description',
+    label: '备注',
+    search: {
+      hidden: true
+    }
+  },
+  {
+    field: 'action',
+    label: t('userDemo.action'),
+    form: {
+      hidden: true
+    },
+    detail: {
+      hidden: true
+    },
+    search: {
+      hidden: true
+    },
+    table: {
+      width: 160,
+      fixed: 'right',
+      slots: {
+        default: (data: any) => {
+          const row = data.row as DictRowData
+          return (
+            <>
+              <ElButton type="primary" onClick={() => action(row, 'edit')}>
+                {t('exampleDemo.edit')}
+              </ElButton>
+              <ElButton type="danger" onClick={() => delData(row)}>
+                {t('exampleDemo.del')}
+              </ElButton>
+            </>
+          )
+        }
+      }
+    }
+  }
+])
+
+const { allSchemas } = useCrudSchemas(crudSchemas)
+
+const searchParams = ref({})
+const setSearchParams = (params: any) => {
+  currentPage.value = 1
+  searchParams.value = params
+  getList()
+}
+
+const dialogVisible = ref(false)
+const dialogTitle = ref('')
+
+const currentRow = ref<DictData>()
+const actionType = ref('')
+
+const AddAction = () => {
+  dialogTitle.value = '新增'
+  dialogVisible.value = true
+  currentRow.value = undefined
+  actionType.value = 'add'
+}
+
+const delLoading = ref(false)
+const id = ref<string>('')
+
+const delData = async (row: DictRowData) => {
+  id.value = row.id
+  delLoading.value = true
+
+  await delList(unref(id).length).finally(() => {
+    delLoading.value = false
+  })
+}
+
+const action = (row: DictData, type: string) => {
+  dialogTitle.value = type === 'edit' ? '编辑' : '新增'
+  actionType.value = type
+  currentRow.value = row
+  dialogVisible.value = true
+}
+
+const writeRef = ref<ComponentRef<typeof Write>>()
+// const tableRef = ref<ComponentRef<typeof Table>>()
+const saveLoading = ref(false)
+const save = async () => {
+  const write = unref(writeRef)
+  const formData = await write?.submit()
+  if (formData) {
+    saveLoading.value = true
+    try {
+      if (!formData.id) {
+        const res = await saveTableApi(formData)
+        if (res) {
+          getList()
+        }
+      } else {
+        const res = await updateTableApi(formData)
+        if (res) {
+          getList()
+        }
+      }
+    } catch (error) {
+      console.log(error)
+    } finally {
+      saveLoading.value = false
+      dialogVisible.value = false
+      actionType.value = 'detail'
+    }
+  }
+}
+</script>
+
+<template>
+  <div class="flex w-100% h-100%">
+    <ContentWrap class="flex-[3] ml-20px">
+      <Search
+        :schema="allSchemas.searchSchema"
+        @reset="setSearchParams"
+        @search="setSearchParams"
+      />
+
+      <div class="mb-10px">
+        <ElButton type="primary" @click="AddAction">{{ t('exampleDemo.add') }}</ElButton>
+      </div>
+      <Table
+        v-model:current-page="currentPage"
+        v-model:page-size="pageSize"
+        row-key="id"
+        :columns="allSchemas.tableColumns"
+        :data="dataList"
+        :loading="loading"
+        :pagination="{
+          total: total
+        }"
+        @register="tableRegister"
+      />
+    </ContentWrap>
+
+    <Dialog v-model="dialogVisible" :title="dialogTitle">
+      <Write
+        ref="writeRef"
+        v-if="actionType !== 'detail'"
+        :form-schema="allSchemas.formSchema"
+        :current-row="currentRow"
+      />
+      <template #footer>
+        <ElButton type="primary" :loading="saveLoading" @click="save">
+          {{ t('exampleDemo.save') }}
+        </ElButton>
+        <ElButton @click="dialogVisible = false">{{ t('dialogDemo.close') }}</ElButton>
+      </template>
+    </Dialog>
+  </div>
+</template>

src/views/Organizational/Module/components/Write.vue

@@ -0,0 +1,61 @@
+<script setup lang="ts">
+import { Form, FormSchema } from '@/components/Form'
+import { useForm } from '@/hooks/web/useForm'
+import { PropType, reactive, watch } from 'vue'
+import { DictData } from '@/api/manage/types'
+import { useValidator } from '@/hooks/web/useValidator'
+
+const { required } = useValidator()
+
+const props = defineProps({
+  currentRow: {
+    type: Object as PropType<DictData>,
+    default: () => undefined
+  },
+  formSchema: {
+    type: Array as PropType<FormSchema[]>,
+    default: () => []
+  }
+})
+
+const rules = reactive({
+  code: [required()],
+  name: [required()],
+  value: [required()],
+  pid: [required()]
+})
+
+const { formRegister, formMethods } = useForm()
+const { setValues, getFormData, getElFormExpose } = formMethods
+
+const submit = async () => {
+  const elForm = await getElFormExpose()
+  const valid = await elForm?.validate().catch((err) => {
+    console.log(err)
+  })
+  if (valid) {
+    const formData = await getFormData()
+    return formData
+  }
+}
+
+watch(
+  () => props.currentRow,
+  (currentRow) => {
+    if (!currentRow) return
+    setValues(currentRow)
+  },
+  {
+    deep: true,
+    immediate: true
+  }
+)
+
+defineExpose({
+  submit
+})
+</script>
+
+<template>
+  <Form :rules="rules" @register="formRegister" :schema="formSchema" />
+</template>

types/router.d.ts

@@ -64,7 +64,7 @@ declare global {
     children?: AppRouteRecordRaw[]
     props?: Recordable
     fullPath?: string
-    url:string
+    url?:string
   }
 
   declare interface AppCustomRouteRecordRaw