删除：删除系统管理/岗位管理（过于偏向行政业务向）

continew-admin-ui/src/api/common/index.ts

@@ -3,7 +3,6 @@ import qs from 'query-string';
 import { DeptParam } from '@/api/system/dept';
 import { MenuParam } from '@/api/system/menu';
 import { RoleParam } from '@/api/system/role';
-import { PostParam } from '@/api/system/post';
 import { TreeNodeData } from '@arco-design/web-vue';
 import { LabelValueState } from '@/store/modules/dict/types';
 
@@ -34,15 +33,6 @@ export function listRoleDict(params: RoleParam) {
   });
 }
 
-export function listPostDict(params: PostParam) {
-  return axios.get<LabelValueState[]>('/common/dict/post', {
-    params,
-    paramsSerializer: (obj) => {
-      return qs.stringify(obj);
-    },
-  });
-}
-
 export function listEnumDict(enumTypeName: string) {
   return axios.get<LabelValueState[]>(`/common/dict/enum/${enumTypeName}`);
 }

continew-admin-ui/src/api/system/post.ts

@@ -1,54 +0,0 @@
-import axios from 'axios';
-import qs from 'query-string';
-
-const BASE_URL = '/system/post';
-
-export interface PostRecord {
-  postId?: number;
-  postName: string;
-  postSort?: number;
-  description?: string;
-  status?: number;
-  createUserString?: string;
-  createTime?: string;
-  updateUserString?: string;
-  updateTime?: string;
-}
-
-export interface PostParam {
-  postName?: string;
-  status?: number;
-  page?: number;
-  size?: number;
-  sort?: Array<string>;
-}
-
-export interface PostListRes {
-  list: PostRecord[];
-  total: number;
-}
-
-export function listPost(params: PostParam) {
-  return axios.get<PostListRes>(`${BASE_URL}`, {
-    params,
-    paramsSerializer: (obj) => {
-      return qs.stringify(obj);
-    },
-  });
-}
-
-export function getPost(id: number) {
-  return axios.get<PostRecord>(`${BASE_URL}/${id}`);
-}
-
-export function addPost(req: PostRecord) {
-  return axios.post(BASE_URL, req);
-}
-
-export function updatePost(req: PostRecord) {
-  return axios.put(BASE_URL, req);
-}
-
-export function deletePost(ids: number | Array<number>) {
-  return axios.delete(`${BASE_URL}/${ids}`);
-}

continew-admin-ui/src/api/system/user.ts

@@ -19,8 +19,6 @@ export interface UserRecord {
   updateTime?: string;
   deptId?: number;
   deptName?: string;
-  postIds?: Array<number>;
-  postNames?: Array<string>;
   roleIds?: Array<number>;
   roleNames?: Array<string>;
   disabled?: boolean;

continew-admin-ui/src/locale/en-US.ts

@@ -4,7 +4,6 @@ import localeUser from '@/views/system/user/locale/en-US';
 import localeRole from '@/views/system/role/locale/en-US';
 import localeMenu from '@/views/system/menu/locale/en-US';
 import localeDept from '@/views/system/dept/locale/en-US';
-import localePost from '@/views/system/post/locale/en-US';
 
 import localeOnlineUser from '@/views/monitor/online/locale/en-US';
 import localeLoginLog from '@/views/monitor/log/login/locale/en-US';
@@ -56,7 +55,6 @@ export default {
   ...localeRole,
   ...localeMenu,
   ...localeDept,
-  ...localePost,
 
   ...localeOnlineUser,
   ...localeLoginLog,

continew-admin-ui/src/locale/zh-CN.ts

@@ -4,7 +4,6 @@ import localeUser from '@/views/system/user/locale/zh-CN';
 import localeRole from '@/views/system/role/locale/zh-CN';
 import localeMenu from '@/views/system/menu/locale/zh-CN';
 import localeDept from '@/views/system/dept/locale/zh-CN';
-import localePost from '@/views/system/post/locale/zh-CN';
 
 import localeOnlineUser from '@/views/monitor/online/locale/zh-CN';
 import localeLoginLog from '@/views/monitor/log/login/locale/zh-CN';
@@ -56,7 +55,6 @@ export default {
   ...localeRole,
   ...localeMenu,
   ...localeDept,
-  ...localePost,
 
   ...localeOnlineUser,
   ...localeLoginLog,

continew-admin-ui/src/router/routes/modules/system.ts

@@ -52,16 +52,6 @@ const System: AppRouteRecordRaw = {
         roles: ['*'],
       },
     },
-    {
-      path: '/system/post',
-      name: 'Post',
-      component: () => import('@/views/system/post/index.vue'),
-      meta: {
-        locale: 'menu.system.post.list',
-        requiresAuth: true,
-        roles: ['*'],
-      },
-    },
   ],
 };
 

continew-admin-ui/src/views/system/dept/index.vue

@@ -216,7 +216,7 @@
         render-to-body
         @cancel="handleDetailCancel"
       >
-        <a-descriptions :column="2" bordered size="large" layout="vertical">
+        <a-descriptions :column="2" bordered size="large">
           <a-descriptions-item label="部门名称">
             <a-skeleton v-if="detailLoading" :animation="true">
               <a-skeleton-line :rows="1" />

continew-admin-ui/src/views/system/post/index.vue

@@ -1,548 +0,0 @@
-<template>
-  <div class="app-container">
-    <Breadcrumb :items="['menu.system', 'menu.system.post.list']" />
-    <a-card class="general-card" :title="$t('menu.system.post.list')">
-      <!-- 头部区域 -->
-      <div class="header">
-        <!-- 搜索栏 -->
-        <div v-if="showQuery" class="header-query">
-          <a-form ref="queryRef" :model="queryParams" layout="inline">
-            <a-form-item field="postName" hide-label>
-              <a-input
-                v-model="queryParams.postName"
-                placeholder="输入岗位名称搜索"
-                allow-clear
-                style="width: 150px"
-                @press-enter="handleQuery"
-              />
-            </a-form-item>
-            <a-form-item field="status" hide-label>
-              <a-select
-                v-model="queryParams.status"
-                :options="DisEnableStatusEnum"
-                placeholder="状态搜索"
-                allow-clear
-                style="width: 150px"
-              />
-            </a-form-item>
-            <a-form-item hide-label>
-              <a-space>
-                <a-button type="primary" @click="handleQuery">
-                  <template #icon><icon-search /></template>查询
-                </a-button>
-                <a-button @click="resetQuery">
-                  <template #icon><icon-refresh /></template>重置
-                </a-button>
-              </a-space>
-            </a-form-item>
-          </a-form>
-        </div>
-        <!-- 操作栏 -->
-        <div class="header-operation">
-          <a-row>
-            <a-col :span="12">
-              <a-space>
-                <a-button type="primary" @click="toAdd">
-                  <template #icon><icon-plus /></template>新增
-                </a-button>
-                <a-button
-                  type="primary"
-                  status="success"
-                  :disabled="single"
-                  :title="single ? '请选择一条要修改的数据' : ''"
-                  @click="toUpdate(ids[0])"
-                >
-                  <template #icon><icon-edit /></template>修改
-                </a-button>
-                <a-button
-                  type="primary"
-                  status="danger"
-                  :disabled="multiple"
-                  :title="multiple ? '请选择要删除的数据' : ''"
-                  @click="handleBatchDelete"
-                >
-                  <template #icon><icon-delete /></template>删除
-                </a-button>
-                <a-button
-                  :loading="exportLoading"
-                  type="primary"
-                  status="warning"
-                  @click="handleExport"
-                >
-                  <template #icon><icon-download /></template>导出
-                </a-button>
-              </a-space>
-            </a-col>
-            <a-col :span="12">
-              <right-toolbar
-                v-model:show-query="showQuery"
-                @refresh="getList"
-              />
-            </a-col>
-          </a-row>
-        </div>
-      </div>
-
-      <!-- 列表区域 -->
-      <a-table
-        ref="tableRef"
-        :data="postList"
-        :row-selection="{
-          type: 'checkbox',
-          showCheckedAll: true,
-          onlyCurrent: false,
-        }"
-        :pagination="{
-          showTotal: true,
-          showPageSize: true,
-          total: total,
-          current: queryParams.page,
-        }"
-        row-key="postId"
-        :bordered="false"
-        :stripe="true"
-        :loading="loading"
-        size="large"
-        @page-change="handlePageChange"
-        @page-size-change="handlePageSizeChange"
-        @selection-change="handleSelectionChange"
-      >
-        <template #columns>
-          <a-table-column title="ID" data-index="postId" />
-          <a-table-column title="岗位名称">
-            <template #cell="{ record }">
-              <a-link @click="toDetail(record.postId)">{{
-                record.postName
-              }}</a-link>
-            </template>
-          </a-table-column>
-          <a-table-column
-            title="岗位排序"
-            align="center"
-            data-index="postSort"
-          />
-          <a-table-column title="状态" align="center" data-index="status">
-            <template #cell="{ record }">
-              <a-switch
-                v-model="record.status"
-                :checked-value="1"
-                :unchecked-value="2"
-                :disabled="record.disabled"
-                @change="handleChangeStatus(record)"
-              />
-            </template>
-          </a-table-column>
-          <a-table-column title="描述" data-index="description" />
-          <a-table-column title="创建人" data-index="createUserString" />
-          <a-table-column title="创建时间" data-index="createTime" />
-          <a-table-column title="操作" align="center">
-            <template #cell="{ record }">
-              <a-button
-                v-permission="['admin']"
-                type="text"
-                size="small"
-                title="修改"
-                :disabled="record.disabled"
-                @click="toUpdate(record.postId)"
-              >
-                <template #icon><icon-edit /></template>修改
-              </a-button>
-              <a-popconfirm
-                content="确定要删除当前选中的数据吗？"
-                type="warning"
-                @ok="handleDelete([record.postId])"
-              >
-                <a-button
-                  v-permission="['admin']"
-                  type="text"
-                  size="small"
-                  title="删除"
-                  :disabled="record.disabled"
-                >
-                  <template #icon><icon-delete /></template>删除
-                </a-button>
-              </a-popconfirm>
-            </template>
-          </a-table-column>
-        </template>
-      </a-table>
-
-      <!-- 表单区域 -->
-      <a-modal
-        :title="title"
-        :visible="visible"
-        :mask-closable="false"
-        unmount-on-close
-        render-to-body
-        @ok="handleOk"
-        @cancel="handleCancel"
-      >
-        <a-form ref="formRef" :model="form" :rules="rules" size="large">
-          <a-form-item label="岗位名称" field="postName">
-            <a-input v-model="form.postName" placeholder="请输入岗位名称" />
-          </a-form-item>
-          <a-form-item label="岗位排序" field="postSort">
-            <a-input-number
-              v-model="form.postSort"
-              placeholder="请输入岗位排序"
-              :min="1"
-              mode="button"
-            />
-          </a-form-item>
-          <a-form-item label="描述" field="description">
-            <a-textarea
-              v-model="form.description"
-              :max-length="200"
-              placeholder="请输入描述"
-              :auto-size="{
-                minRows: 3,
-              }"
-              show-word-limit
-            />
-          </a-form-item>
-        </a-form>
-      </a-modal>
-
-      <!-- 详情区域 -->
-      <a-drawer
-        title="岗位详情"
-        :visible="detailVisible"
-        :width="580"
-        :footer="false"
-        unmount-on-close
-        render-to-body
-        @cancel="handleDetailCancel"
-      >
-        <a-descriptions :column="2" bordered size="large" layout="vertical">
-          <a-descriptions-item label="岗位名称">
-            <a-skeleton v-if="detailLoading" :animation="true">
-              <a-skeleton-line :rows="1" />
-            </a-skeleton>
-            <span v-else>{{ post.postName }}</span>
-          </a-descriptions-item>
-          <a-descriptions-item label="状态">
-            <a-skeleton v-if="detailLoading" :animation="true">
-              <a-skeleton-line :rows="1" />
-            </a-skeleton>
-            <span v-else>
-              <a-tag v-if="post.status === 1" color="green">启用</a-tag>
-              <a-tag v-else color="red">禁用</a-tag>
-            </span>
-          </a-descriptions-item>
-          <a-descriptions-item label="创建人">
-            <a-skeleton v-if="detailLoading" :animation="true">
-              <a-skeleton-line :rows="1" />
-            </a-skeleton>
-            <span v-else>{{ post.createUserString }}</span>
-          </a-descriptions-item>
-          <a-descriptions-item label="创建时间">
-            <a-skeleton v-if="detailLoading" :animation="true">
-              <a-skeleton-line :rows="1" />
-            </a-skeleton>
-            <span v-else>{{ post.createTime }}</span>
-          </a-descriptions-item>
-          <a-descriptions-item label="修改人">
-            <a-skeleton v-if="detailLoading" :animation="true">
-              <a-skeleton-line :rows="1" />
-            </a-skeleton>
-            <span v-else>{{ post.updateUserString }}</span>
-          </a-descriptions-item>
-          <a-descriptions-item label="修改时间">
-            <a-skeleton v-if="detailLoading" :animation="true">
-              <a-skeleton-line :rows="1" />
-            </a-skeleton>
-            <span v-else>{{ post.updateTime }}</span>
-          </a-descriptions-item>
-          <a-descriptions-item label="描述">
-            <a-skeleton v-if="detailLoading" :animation="true">
-              <a-skeleton-line :rows="1" />
-            </a-skeleton>
-            <span v-else>{{ post.description }}</span>
-          </a-descriptions-item>
-        </a-descriptions>
-      </a-drawer>
-    </a-card>
-  </div>
-</template>
-
-<script lang="ts" setup>
-  import { getCurrentInstance, ref, toRefs, reactive } from 'vue';
-  import {
-    PostRecord,
-    PostParam,
-    listPost,
-    getPost,
-    addPost,
-    updatePost,
-    deletePost,
-  } from '@/api/system/post';
-
-  const { proxy } = getCurrentInstance() as any;
-  const { DisEnableStatusEnum } = proxy.useDict('DisEnableStatusEnum');
-
-  const postList = ref<PostRecord[]>([]);
-  const post = ref<PostRecord>({
-    postName: '',
-    status: 1,
-    createUserString: '',
-    createTime: '',
-    updateUserString: '',
-    updateTime: '',
-    description: '',
-  });
-  const total = ref(0);
-  const ids = ref<Array<number>>([]);
-  const title = ref('');
-  const single = ref(true);
-  const multiple = ref(true);
-  const showQuery = ref(true);
-  const loading = ref(false);
-  const detailLoading = ref(false);
-  const exportLoading = ref(false);
-  const visible = ref(false);
-  const detailVisible = ref(false);
-
-  const data = reactive({
-    // 查询参数
-    queryParams: {
-      postName: undefined,
-      status: undefined,
-      page: 1,
-      size: 10,
-      sort: ['createTime,desc'],
-    },
-    // 表单数据
-    form: {} as PostRecord,
-    // 表单验证规则
-    rules: {
-      postName: [{ required: true, message: '请输入岗位名称' }],
-      postSort: [{ required: true, message: '请输入岗位排序' }],
-    },
-  });
-  const { queryParams, form, rules } = toRefs(data);
-
-  /**
-   * 查询列表
-   *
-   * @param params 查询参数
-   */
-  const getList = (params: PostParam = { ...queryParams.value }) => {
-    loading.value = true;
-    listPost(params)
-      .then((res) => {
-        postList.value = res.data.list;
-        total.value = res.data.total;
-      })
-      .finally(() => {
-        loading.value = false;
-      });
-  };
-  getList();
-
-  /**
-   * 打开新增对话框
-   */
-  const toAdd = () => {
-    reset();
-    title.value = '新增岗位';
-    visible.value = true;
-  };
-
-  /**
-   * 打开修改对话框
-   *
-   * @param id ID
-   */
-  const toUpdate = (id: number) => {
-    reset();
-    getPost(id).then((res) => {
-      form.value = res.data;
-      title.value = '修改岗位';
-      visible.value = true;
-    });
-  };
-
-  /**
-   * 重置表单
-   */
-  const reset = () => {
-    form.value = {
-      postId: undefined,
-      postName: '',
-      description: '',
-      postSort: 999,
-      status: 1,
-    };
-    proxy.$refs.formRef?.resetFields();
-  };
-
-  /**
-   * 取消
-   */
-  const handleCancel = () => {
-    visible.value = false;
-    proxy.$refs.formRef.resetFields();
-  };
-
-  /**
-   * 确定
-   */
-  const handleOk = () => {
-    proxy.$refs.formRef.validate((valid: any) => {
-      if (!valid) {
-        if (form.value.postId !== undefined) {
-          updatePost(form.value).then((res) => {
-            handleCancel();
-            getList();
-            proxy.$message.success(res.msg);
-          });
-        } else {
-          addPost(form.value).then((res) => {
-            handleCancel();
-            getList();
-            proxy.$message.success(res.msg);
-          });
-        }
-      }
-    });
-  };
-
-  /**
-   * 查看详情
-   *
-   * @param id ID
-   */
-  const toDetail = async (id: number) => {
-    if (detailLoading.value) return;
-    detailLoading.value = true;
-    detailVisible.value = true;
-    getPost(id)
-      .then((res) => {
-        post.value = res.data;
-      })
-      .finally(() => {
-        detailLoading.value = false;
-      });
-  };
-
-  /**
-   * 关闭详情
-   */
-  const handleDetailCancel = () => {
-    detailVisible.value = false;
-  };
-
-  /**
-   * 批量删除
-   */
-  const handleBatchDelete = () => {
-    if (ids.value.length === 0) {
-      proxy.$message.info('请选择要删除的数据');
-    } else {
-      proxy.$modal.warning({
-        title: '警告',
-        titleAlign: 'start',
-        content: '确定要删除当前选中的数据吗？',
-        hideCancel: false,
-        onOk: () => {
-          handleDelete(ids.value);
-        },
-      });
-    }
-  };
-
-  /**
-   * 删除
-   *
-   * @param ids ID 列表
-   */
-  const handleDelete = (ids: Array<number>) => {
-    deletePost(ids).then((res) => {
-      proxy.$message.success(res.msg);
-      getList();
-    });
-  };
-
-  /**
-   * 已选择的数据行发生改变时触发
-   *
-   * @param rowKeys ID 列表
-   */
-  const handleSelectionChange = (rowKeys: Array<any>) => {
-    ids.value = rowKeys;
-    single.value = rowKeys.length !== 1;
-    multiple.value = !rowKeys.length;
-  };
-
-  /**
-   * 导出
-   */
-  const handleExport = () => {
-    if (exportLoading.value) return;
-    exportLoading.value = true;
-    proxy
-      .download('/system/post/export', { ...queryParams.value }, '岗位数据')
-      .finally(() => {
-        exportLoading.value = false;
-      });
-  };
-
-  /**
-   * 修改状态
-   *
-   * @param record 记录信息
-   */
-  const handleChangeStatus = (record: PostRecord) => {
-    const tip = record.status === 1 ? '启用' : '禁用';
-    updatePost(record)
-      .then(() => {
-        proxy.$message.success(`${tip}成功`);
-      })
-      .catch(() => {
-        record.status = record.status === 1 ? 2 : 1;
-      });
-  };
-
-  /**
-   * 查询
-   */
-  const handleQuery = () => {
-    getList();
-  };
-
-  /**
-   * 重置
-   */
-  const resetQuery = () => {
-    proxy.$refs.queryRef.resetFields();
-    handleQuery();
-  };
-
-  /**
-   * 切换页码
-   *
-   * @param current 页码
-   */
-  const handlePageChange = (current: number) => {
-    queryParams.value.page = current;
-    getList();
-  };
-
-  /**
-   * 切换每页条数
-   *
-   * @param pageSize 每页条数
-   */
-  const handlePageSizeChange = (pageSize: number) => {
-    queryParams.value.size = pageSize;
-    getList();
-  };
-</script>
-
-<script lang="ts">
-  export default {
-    name: 'Post',
-  };
-</script>
-
-<style scoped lang="less"></style>

continew-admin-ui/src/views/system/post/locale/en-US.ts

@@ -1,3 +0,0 @@
-export default {
-  'menu.system.post.list': 'Post management',
-};

continew-admin-ui/src/views/system/post/locale/zh-CN.ts

@@ -1,3 +0,0 @@
-export default {
-  'menu.system.post.list': '岗位管理',
-};

continew-admin-ui/src/views/system/user/index.vue

@@ -304,18 +304,6 @@
               style="width: 416px"
             />
           </a-form-item>
-          <a-form-item label="所属岗位" field="postIds">
-            <a-select
-              v-model="form.postIds"
-              :options="postOptions"
-              placeholder="请选择所属岗位"
-              :loading="postLoading"
-              multiple
-              allow-clear
-              :allow-search="{ retainInputValue: true }"
-              style="width: 416px"
-            />
-          </a-form-item>
           <a-form-item label="所属角色" field="roleIds">
             <a-select
               v-model="form.roleIds"
@@ -379,7 +367,7 @@
         render-to-body
         @cancel="handleDetailCancel"
       >
-        <a-descriptions :column="2" bordered size="large" layout="vertical">
+        <a-descriptions :column="2" bordered size="large">
           <a-descriptions-item label="用户名">
             <a-skeleton v-if="detailLoading" :animation="true">
               <a-skeleton-line :rows="1" />
@@ -428,24 +416,12 @@
             </a-skeleton>
             <span v-else>{{ user.deptName }}</span>
           </a-descriptions-item>
-          <a-descriptions-item label="所属岗位">
-            <a-skeleton v-if="detailLoading" :animation="true">
-              <a-skeleton-line :rows="1" />
-            </a-skeleton>
-            <span v-else>{{ user.postNames }}</span>
-          </a-descriptions-item>
           <a-descriptions-item label="所属角色">
             <a-skeleton v-if="detailLoading" :animation="true">
               <a-skeleton-line :rows="1" />
             </a-skeleton>
             <span v-else>{{ user.roleNames }}</span>
           </a-descriptions-item>
-          <a-descriptions-item label="最后一次修改密码时间">
-            <a-skeleton v-if="detailLoading" :animation="true">
-              <a-skeleton-line :rows="1" />
-            </a-skeleton>
-            <span v-else>{{ user.pwdResetTime }}</span>
-          </a-descriptions-item>
           <a-descriptions-item label="创建人">
             <a-skeleton v-if="detailLoading" :animation="true">
               <a-skeleton-line :rows="1" />
@@ -496,7 +472,7 @@
     resetPassword,
     updateUserRole,
   } from '@/api/system/user';
-  import { listDeptTree, listPostDict, listRoleDict } from '@/api/common';
+  import { listDeptTree, listRoleDict } from '@/api/common';
   import { LabelValueState } from '@/store/modules/dict/types';
   import getAvatar from '@/utils/avatar';
 
@@ -533,10 +509,8 @@
   const userRoleVisible = ref(false);
   const detailVisible = ref(false);
   const deptLoading = ref(false);
-  const postLoading = ref(false);
   const roleLoading = ref(false);
   const deptOptions = ref<TreeNodeData[]>([]);
-  const postOptions = ref<LabelValueState[]>([]);
   const roleOptions = ref<LabelValueState[]>([]);
   const deptTree = ref<TreeNodeData[]>([]);
   const deptName = ref('');
@@ -606,7 +580,6 @@
   const toAdd = () => {
     reset();
     getDeptOptions();
-    getPostOptions();
     getRoleOptions();
     title.value = '新增用户';
     visible.value = true;
@@ -620,7 +593,6 @@
   const toUpdate = (id: number) => {
     reset();
     getDeptOptions();
-    getPostOptions();
     getRoleOptions();
     getUser(id).then((res) => {
       form.value = res.data;
@@ -657,20 +629,6 @@
       });
   };
 
-  /**
-   * 查询岗位列表
-   */
-  const getPostOptions = () => {
-    postLoading.value = true;
-    listPostDict({})
-      .then((res) => {
-        postOptions.value = res.data;
-      })
-      .finally(() => {
-        postLoading.value = false;
-      });
-  };
-
   /**
    * 查询角色列表
    */
@@ -699,7 +657,6 @@
       description: '',
       status: 1,
       deptId: undefined,
-      postIds: [] as Array<number>,
       roleIds: [] as Array<number>,
     };
     proxy.$refs.formRef?.resetFields();