From 8596dda8f41eeb9628672ac1786c5635436e5ebb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E7=BA=A2=E4=B8=BD?= <1181930680@qq.com>
Date: Wed, 10 Jul 2024 16:30:09 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=92=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/system/level.ts                       |   5 +-
 src/api/system/position.ts                    |   5 +-
 .../Table/src/hooks/useDataSource.ts          |   2 +-
 src/views/system/level/columns.ts             |  39 +++++
 src/views/system/level/edit.vue               | 112 ++++++++++++
 src/views/system/level/index.vue              | 161 ++++++++++++++++++
 src/views/system/level/querySchemas.ts        |  29 ++++
 src/views/system/role/edit.vue                |   6 +-
 src/views/system/role/index.vue               |  36 +++-
 src/views/system/role/querySchemas.ts         |  11 ++
 src/views/system/user/index.vue               |   6 +-
 11 files changed, 394 insertions(+), 18 deletions(-)
 create mode 100644 src/views/system/level/columns.ts
 create mode 100644 src/views/system/level/edit.vue
 create mode 100644 src/views/system/level/index.vue
 create mode 100644 src/views/system/level/querySchemas.ts
 create mode 100644 src/views/system/role/querySchemas.ts

diff --git a/src/api/system/level.ts b/src/api/system/level.ts
index 4c7db54..72615ef 100644
--- a/src/api/system/level.ts
+++ b/src/api/system/level.ts
@@ -58,9 +58,10 @@ export function levelDelete(levelId) {
 /**
  * @description: 批量删除职级
  */
-export function levelBatchDelete(levelId) {
+export function levelBatchDelete(data:any) {
   return http.request({
-    url: '/level/batchDelete/'+levelId,
+    url: '/level/batchDelete',
     method: 'DELETE',
+    data
   });
 }
\ No newline at end of file
diff --git a/src/api/system/position.ts b/src/api/system/position.ts
index 678ea05..93d3806 100644
--- a/src/api/system/position.ts
+++ b/src/api/system/position.ts
@@ -58,9 +58,10 @@ export function positionDelete(positionId) {
 /**
  * @description: 批量删除岗位
  */
-export function positionBatchDelete(positionId) {
+export function positionBatchDelete(data:any) {
   return http.request({
-    url: '/role/batchDelete/'+positionId,
+    url: '/position/batchDelete',
     method: 'DELETE',
+    data
   });
 }
\ No newline at end of file
diff --git a/src/components/Table/src/hooks/useDataSource.ts b/src/components/Table/src/hooks/useDataSource.ts
index ad6249b..9061e66 100644
--- a/src/components/Table/src/hooks/useDataSource.ts
+++ b/src/components/Table/src/hooks/useDataSource.ts
@@ -85,7 +85,7 @@ export function useDataSource(
       const res = await request(params);
       if (!res) return;
       const resultPageCount = res[totalField];
-      const resultCurrentPage = res[pageField];
+      const resultCurrentPage = res['current'];
       const resultTotal = res[itemCount];
       const results = res[listField] ? res[listField] : [];
       // 如果数据异常，需获取正确的页码再次执行
diff --git a/src/views/system/level/columns.ts b/src/views/system/level/columns.ts
new file mode 100644
index 0000000..3385421
--- /dev/null
+++ b/src/views/system/level/columns.ts
@@ -0,0 +1,39 @@
+import { h } from 'vue';
+import { ElTag } from 'element-plus';
+
+export const columns = [
+  {
+    type: 'selection',
+  },
+  {
+    label: '职级名称',
+    prop: 'name',
+  },
+  {
+    label: '职级状态',
+    prop: 'status',
+    render(record) {
+      return h(
+        ElTag,
+        {
+          type: record.row.status ==1 ? 'success' : 'danger',
+        },
+        {
+          default: () => (record.row.status ==1 ? '正常' : '禁用'),
+        },
+      );
+    },
+  },
+  {
+    label: '排序',
+    prop: 'sort',
+  },
+  {
+    label: '创建人',
+    prop: 'createUser',
+  },
+  {
+    label: '创建时间',
+    prop: 'createTime',
+  },
+];
diff --git a/src/views/system/level/edit.vue b/src/views/system/level/edit.vue
new file mode 100644
index 0000000..4adc356
--- /dev/null
+++ b/src/views/system/level/edit.vue
@@ -0,0 +1,112 @@
+<template>
+  <el-dialog
+      v-model="props.visible"
+      :title="props.levelId?'编辑':'新增'"
+      :append-to-body="true"
+      width="500"
+      :close-on-click-modal="false"
+      :before-close="dialogClose"
+  >
+    <el-form
+        class="ls-form"
+        ref="formRef"
+        :model="formData"
+        label-width="80px"
+    >
+      <el-form-item
+          label="名称"
+          prop="name"
+          :rules="{ required: true, message: '请输入名称', trigger: 'blur' }"
+      >
+        <el-input
+            class="ls-input"
+            v-model="formData.name"
+            placeholder="请输入名称"
+            clearable
+        />
+      </el-form-item>
+      <el-form-item label="职级状态" prop="status">
+          <el-radio-group v-model="formData.status" name="status">
+            <el-radio :value="1">正常</el-radio>
+            <el-radio :value="2">禁用</el-radio>
+          </el-radio-group>
+        </el-form-item>
+      <el-form-item label="排序" prop="sort">
+        <el-input-number v-model="formData.sort"/>
+      </el-form-item>
+      <el-form-item label="备注" prop="note">
+          <el-input v-model="formData.note" type="textarea" placeholder="请输入备注" clearable />
+        </el-form-item>
+    </el-form>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button @click="dialogClose">取消</el-button>
+        <el-button :loading="subLoading" type="primary" @click="submit">
+          确定
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+<script lang="ts" setup>
+import type {FormInstance} from "element-plus";
+import {getLevelDetail,levelAdd,levelUpdate} from "@/api/system/level";
+import {onMounted, reactive, shallowRef} from "vue";
+import {message} from "@/utils/auth";
+import {useLockFn} from "@/utils/useLockFn";
+
+const emit = defineEmits(["success", "update:visible"]);
+const formRef = shallowRef<FormInstance>();
+const formData = reactive({
+  id: "",
+  name: "",
+  status: 1,
+  sort: 0,
+  note:'',
+});
+
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    required: true,
+    default: false
+  },
+  levelId: {
+    type: Number,
+    required: true,
+    default: 0
+  }
+});
+
+const handleSubmit = async () => {
+    await formRef.value?.validate();
+    props.levelId ? await levelUpdate(formData) : await levelAdd(formData);
+    message("操作成功");
+    emit("update:visible", false);
+    emit("success");
+};
+
+const dialogClose = () => {
+  emit("update:visible", false);
+};
+
+const { isLock:subLoading,lockFn: submit } = useLockFn(handleSubmit);
+
+
+const setFormData = async () => {
+  const data = await getLevelDetail(props.levelId);
+  for (const key in formData) {
+    if (data[key] != null && data[key] != undefined) {
+      //@ts-ignore
+      formData[key] = data[key];
+    }
+  }
+};
+
+onMounted(() => {
+  if (props.levelId) {
+    setFormData();
+  }
+});
+
+</script>
diff --git a/src/views/system/level/index.vue b/src/views/system/level/index.vue
new file mode 100644
index 0000000..05bd21d
--- /dev/null
+++ b/src/views/system/level/index.vue
@@ -0,0 +1,161 @@
+<template>
+  <PageWrapper>
+    <el-card :bordered="false" class="pt-3 mb-3 proCard">
+      <BasicForm @register="register" @submit="handleSubmit" @reset="handleReset"></BasicForm>
+    </el-card>
+    <el-card :bordered="false" class="proCard">
+      <BasicTable
+        :columns="columns"
+        :request="loadDataTable"
+        :row-key="(row) => row.id"
+        ref="tableRef"
+        :actionColumn="actionColumn"
+         @selection-change="onSelectionChange"
+      >
+        <template #tableTitle>
+          <el-button type="primary" @click="handleAdd">
+            <template #icon>
+              <el-icon class="el-input__icon">
+                <PlusOutlined />
+              </el-icon>
+            </template>
+            添加职级
+          </el-button>
+          <el-button type="danger" @click="handleDelete()" :disabled="!selectionData.length">
+              <template #icon>
+                <el-icon class="el-input__icon">
+                  <Delete />
+                </el-icon>
+              </template>
+              删除
+            </el-button>
+        </template>
+
+        <template #action>
+          <TableAction />
+        </template>
+      </BasicTable>
+    </el-card>
+
+    <editDialog
+        v-if="editVisible"
+        :levelId="levelId"
+        v-model:visible="editVisible"
+        @success="reloadTable"
+    >
+    </editDialog>
+  </PageWrapper>
+</template>
+
+<script lang="ts" setup>
+  import { reactive, ref, h,nextTick,defineAsyncComponent } from 'vue';
+  import { ColProps } from 'element-plus';
+  import { schemas } from './querySchemas';
+  import { BasicForm, useForm } from '@/components/Form/index';
+  import { BasicTable, TableAction } from '@/components/Table';
+  import { getLevelList,levelDelete,levelBatchDelete } from '@/api/system/level';
+  import { columns } from './columns';
+  import { PlusOutlined } from '@vicons/antd';
+  import {message,confirm} from "@/utils/auth";
+  const editDialog = defineAsyncComponent(() =>
+    import('./edit.vue')
+)
+const levelId =ref(0)
+const editVisible=ref(false)
+  const selectionData = ref([])
+  const tableRef = ref();
+  const formParams = reactive({
+    name:'',
+    status:''
+  });
+  const actionColumn = reactive({
+    width: 250,
+    label: '操作',
+    prop: 'action',
+    fixed: 'right',
+    render(record) {
+      return h(TableAction, {
+        style: 'button',
+        actions: [
+          {
+            label: '编辑',
+            type: 'warning',
+            onClick: handleEdit.bind(null, record),
+            ifShow: () => {
+              return true;
+            },
+            // auth: ['basic_list'],
+          },
+          {
+            label: '删除',
+            type: 'danger',
+            onClick: handleDelete.bind(null, record),
+            // 根据业务控制是否显示 isShow 和 auth 是并且关系
+            ifShow: () => {
+              return true;
+            },
+            // 根据权限控制是否显示: 有权限，会显示，支持多个
+            // auth: ['basic_list'],
+          },
+        ],
+      });
+    },
+  });
+
+  const loadDataTable = async (res: any) => {
+    const result = await getLevelList({ ...formParams, ...res });
+    return result;
+  };
+
+  function reloadTable() {
+    tableRef.value.reload();
+  }
+  const [register, {}] = useForm({
+    labelWidth: 80,
+    layout: 'horizontal',
+    colProps: { span: 6 } as ColProps,
+    submitOnReset:true,
+    schemas
+  });
+  function handleSubmit(values: Recordable) {
+    for (const key in formParams) {
+      if (values[key] != null && values[key] != undefined) {
+        formParams[key] = values[key];
+      }
+    }
+    reloadTable();
+  }
+
+  function handleReset() {
+    for (const key in formParams) {
+        formParams[key] ='';
+    }
+  }
+  const handleAdd = async () => {
+  levelId.value=0
+  await nextTick();
+  editVisible.value=true
+};
+
+const handleEdit = async (record: Recordable) => {
+  levelId.value=record.row.id
+  await nextTick();
+  editVisible.value=true
+};
+
+async function handleDelete(record: Recordable) {
+    let ids = []
+    if(!record){
+      ids = selectionData.value.map(({id}) => id);
+    }
+    await confirm('确定要删除？');
+    record? await levelDelete(record.row.id):await levelBatchDelete(ids);
+    message("删除成功");
+    reloadTable()
+  }
+function onSelectionChange(value){
+    selectionData.value = value
+  }
+</script>
+
+<style lang="scss" scoped></style>
diff --git a/src/views/system/level/querySchemas.ts b/src/views/system/level/querySchemas.ts
new file mode 100644
index 0000000..87bd1f2
--- /dev/null
+++ b/src/views/system/level/querySchemas.ts
@@ -0,0 +1,29 @@
+import { FormSchema } from '@/components/Form/index';
+export const schemas: FormSchema[] = [
+  {
+    field: 'name',
+    component: 'Input',
+    label: '职级名称',
+    componentProps: {
+      placeholder: '请输入职级名称',
+    },
+  },
+  {
+    field: 'status',
+    component: 'Select',
+    label: '状态',
+    componentProps: {
+      placeholder: '请选择状态',
+      options: [
+        {
+          label: '正常',
+          value: '1',
+        },
+        {
+          label: '禁用',
+          value: '2',
+        },
+      ],
+    },
+  },
+];
diff --git a/src/views/system/role/edit.vue b/src/views/system/role/edit.vue
index 3a48bc2..239ad8a 100644
--- a/src/views/system/role/edit.vue
+++ b/src/views/system/role/edit.vue
@@ -68,8 +68,7 @@ const formData = reactive({
   name: "",
   code: "",
   sort: 0,
-  note:'',
-  menus: []
+  note:''
 });
 
 const props = defineProps({
@@ -87,8 +86,7 @@ const props = defineProps({
 
 const handleSubmit = async () => {
     await formRef.value?.validate();
-    const params = {...formData, menuIds: formData.menus.join()};
-    props.roleId ? await roleUpdate(params) : await roleAdd(params);
+    props.roleId ? await roleUpdate(formData) : await roleAdd(formData);
     message("操作成功");
     emit("update:visible", false);
     emit("success");
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index 09b428e..964c6a8 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -1,5 +1,8 @@
 <template>
   <PageWrapper>
+    <el-card :bordered="false" class="pt-3 mb-3 proCard">
+      <BasicForm @register="register" @submit="handleSubmit" @reset="handleReset"></BasicForm>
+    </el-card>
     <el-card :bordered="false" class="proCard">
       <BasicTable
         :columns="columns"
@@ -53,12 +56,17 @@
 
 <script lang="ts" setup>
   import { reactive, ref, h,nextTick,defineAsyncComponent } from 'vue';
-  import { ElMessage } from 'element-plus';
+  import { ColProps } from 'element-plus';
+  import { schemas } from './querySchemas';
+  import { BasicForm, useForm } from '@/components/Form/index';
   import { BasicTable, TableAction } from '@/components/Table';
   import { getRoleList,roleDelete,roleBatchDelete } from '@/api/system/role';
   import { columns } from './columns';
   import { PlusOutlined } from '@vicons/antd';
   import {message,confirm} from "@/utils/auth";
+  const formParams = reactive({
+    name:''
+  });
   const editDialog = defineAsyncComponent(() =>
     import('./edit.vue')
 )
@@ -117,16 +125,34 @@ const authVisible=ref(false)
   });
 
   const loadDataTable = async (res: any) => {
-    let _params = {
-      ...res,
-    };
-    return await getRoleList(_params);
+    const result = await getRoleList({ ...formParams, ...res });
+    return result;
   };
 
   function reloadTable() {
     tableRef.value.reload();
   }
+  const [register, {}] = useForm({
+    labelWidth: 80,
+    layout: 'horizontal',
+    colProps: { span: 6 } as ColProps,
+    submitOnReset:true,
+    schemas
+  });
+  function handleSubmit(values: Recordable) {
+    for (const key in formParams) {
+      if (values[key] != null && values[key] != undefined) {
+        formParams[key] = values[key];
+      }
+    }
+    reloadTable();
+  }
 
+  function handleReset() {
+    for (const key in formParams) {
+        formParams[key] ='';
+    }
+  }
   const handleAdd = async () => {
   roleId.value=0
   await nextTick();
diff --git a/src/views/system/role/querySchemas.ts b/src/views/system/role/querySchemas.ts
new file mode 100644
index 0000000..4bd5d64
--- /dev/null
+++ b/src/views/system/role/querySchemas.ts
@@ -0,0 +1,11 @@
+import { FormSchema } from '@/components/Form/index';
+export const schemas: FormSchema[] = [
+  {
+    field: 'name',
+    component: 'Input',
+    label: '角色名',
+    componentProps: {
+      placeholder: '请输入角色名',
+    },
+  }
+];
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index e684a78..fa5dda4 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -79,8 +79,8 @@
 </template>
 
 <script lang="ts" setup>
-  import { h, nextTick, reactive, ref, unref ,defineAsyncComponent,onMounted} from 'vue';
-  import { ColProps, ElMessage,  UploadInstance } from 'element-plus';
+  import { h, nextTick, reactive, ref ,defineAsyncComponent} from 'vue';
+  import { ColProps,  UploadInstance } from 'element-plus';
   import { BasicTable, TableAction } from '@/components/Table';
   import { BasicForm, useForm } from '@/components/Form/index';
   import { getUserList,userDelete,userBatchDelete,userExport,resetPwd } from '@/api/system/user';
@@ -93,7 +93,6 @@
   const basicTableRef = ref();
   const editVisible = ref(false)
   const selectionData = ref([])
-  const tableData = ref();
   const upload = ref<UploadInstance>();
   const exportLoading=ref(false)
   const editDialog = defineAsyncComponent(() =>
@@ -155,7 +154,6 @@ const uploadHeaders = reactive({
 
   const loadDataTable = async (res) => {
     const result = await getUserList({ ...formParams, ...res });
-    tableData.value = result.records;
     return result;
   };