From 9ac027dd5e22bb42b0b9369a9f6bcca96e29c9f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E7=BA=A2=E4=B8=BD?= <1181930680@qq.com>
Date: Fri, 12 Jul 2024 13:26:42 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/data/config.ts                  |  67 ++++++++
 src/api/data/notice.ts                  |  67 ++++++++
 src/api/system/tenant.ts                |  61 +++++++
 src/components/numberInput/index.vue    |  68 ++++++++
 src/views/data/config/columns.ts        |  24 +++
 src/views/data/config/edit.vue          | 104 ++++++++++++
 src/views/data/config/index.vue         | 162 +++++++++++++++++++
 src/views/data/config/querySchemas.ts   |  11 ++
 src/views/data/notice/columns.ts        |  38 +++++
 src/views/data/notice/edit.vue          | 127 +++++++++++++++
 src/views/data/notice/index.vue         | 161 +++++++++++++++++++
 src/views/data/notice/querySchemas.ts   |  47 ++++++
 src/views/system/tenant/columns.ts      |  78 +++++++++
 src/views/system/tenant/edit.vue        | 204 ++++++++++++++++++++++++
 src/views/system/tenant/index.vue       | 171 ++++++++++++++++++++
 src/views/system/tenant/querySchemas.ts |  41 +++++
 src/views/system/user/querySchemas.ts   |  28 ++--
 17 files changed, 1445 insertions(+), 14 deletions(-)
 create mode 100644 src/api/data/config.ts
 create mode 100644 src/api/data/notice.ts
 create mode 100644 src/api/system/tenant.ts
 create mode 100644 src/components/numberInput/index.vue
 create mode 100644 src/views/data/config/columns.ts
 create mode 100644 src/views/data/config/edit.vue
 create mode 100644 src/views/data/config/index.vue
 create mode 100644 src/views/data/config/querySchemas.ts
 create mode 100644 src/views/data/notice/columns.ts
 create mode 100644 src/views/data/notice/edit.vue
 create mode 100644 src/views/data/notice/index.vue
 create mode 100644 src/views/data/notice/querySchemas.ts
 create mode 100644 src/views/system/tenant/columns.ts
 create mode 100644 src/views/system/tenant/edit.vue
 create mode 100644 src/views/system/tenant/index.vue
 create mode 100644 src/views/system/tenant/querySchemas.ts

diff --git a/src/api/data/config.ts b/src/api/data/config.ts
new file mode 100644
index 0000000..192bfcf
--- /dev/null
+++ b/src/api/data/config.ts
@@ -0,0 +1,67 @@
+import { http } from '@/utils/http/axios';
+
+/**
+ * @description: 配置列表
+ */
+export function getConfigList(params?) {
+  return http.request({
+    url: '/config/page',
+    method: 'GET',
+    params,
+  });
+}
+export function getConfigAllList(params?) {
+  return http.request({
+    url: '/config/list',
+    method: 'GET',
+    params,
+  });
+}
+/**
+ * @description: 根据ID获取详情
+ */
+export function getConfigDetail(id) {
+  return http.request({
+    url: '/config/detail/'+id,
+    method: 'get',
+  });
+}
+/**
+ * @description: 添加配置
+ */
+export function configAdd(data:any) {
+  return http.request({
+    url: '/config/add',
+    method: 'POST',
+    data,
+  });
+}
+/**
+ * @description: 更新配置
+ */
+export function configUpdate(data:any) {
+  return http.request({
+    url: '/config/update',
+    method: 'PUT',
+    data
+  });
+}
+/**
+ * @description: 删除配置
+ */
+export function configDelete(id) {
+  return http.request({
+    url: '/config/delete/'+id,
+    method: 'DELETE',
+  });
+}
+/**
+ * @description: 批量删除配置
+ */
+export function configBatchDelete(data:any) {
+  return http.request({
+    url: '/config/batchDelete',
+    method: 'DELETE',
+    data
+  });
+}
\ No newline at end of file
diff --git a/src/api/data/notice.ts b/src/api/data/notice.ts
new file mode 100644
index 0000000..a476a9c
--- /dev/null
+++ b/src/api/data/notice.ts
@@ -0,0 +1,67 @@
+import { http } from '@/utils/http/axios';
+
+/**
+ * @description: 公告列表
+ */
+export function getNoticeList(params?) {
+  return http.request({
+    url: '/notice/page',
+    method: 'GET',
+    params,
+  });
+}
+export function getNoticeAllList(params?) {
+  return http.request({
+    url: '/notice/list',
+    method: 'GET',
+    params,
+  });
+}
+/**
+ * @description: 根据ID获取详情
+ */
+export function getNoticeDetail(id) {
+  return http.request({
+    url: '/notice/detail/'+id,
+    method: 'get',
+  });
+}
+/**
+ * @description: 添加公告
+ */
+export function noticeAdd(data:any) {
+  return http.request({
+    url: '/notice/add',
+    method: 'POST',
+    data,
+  });
+}
+/**
+ * @description: 更新公告
+ */
+export function noticeUpdate(data:any) {
+  return http.request({
+    url: '/notice/update',
+    method: 'PUT',
+    data
+  });
+}
+/**
+ * @description: 删除公告
+ */
+export function noticeDelete(id) {
+  return http.request({
+    url: '/notice/delete/'+id,
+    method: 'DELETE',
+  });
+}
+/**
+ * @description: 批量删除公告
+ */
+export function noticeBatchDelete(data:any) {
+  return http.request({
+    url: '/notice/batchDelete',
+    method: 'DELETE',
+    data
+  });
+}
\ No newline at end of file
diff --git a/src/api/system/tenant.ts b/src/api/system/tenant.ts
new file mode 100644
index 0000000..afb89dd
--- /dev/null
+++ b/src/api/system/tenant.ts
@@ -0,0 +1,61 @@
+import { http } from '@/utils/http/axios';
+
+
+/**
+ * @description: 获取租户列表
+ */
+export function getTenantList(params) {
+  return http.request({
+    url: '/tenant/page',
+    method: 'get',
+    params,
+  });
+}
+/**
+ * @description: 根据ID获取详情
+ */
+export function getTenantDetail(tenantId) {
+  return http.request({
+    url: '/tenant/detail/'+tenantId,
+    method: 'get',
+  });
+}
+/**
+ * @description: 添加租户
+ */
+export function tenantAdd(data:any) {
+  return http.request({
+    url: '/tenant/add',
+    method: 'POST',
+    data,
+  });
+}
+/**
+ * @description: 更新租户
+ */
+export function tenantUpdate(data:any) {
+  return http.request({
+    url: '/tenant/update',
+    method: 'PUT',
+    data
+  });
+}
+/**
+ * @description: 删除租户
+ */
+export function tenantDelete(tenantId) {
+  return http.request({
+    url: '/tenant/delete/'+tenantId,
+    method: 'DELETE',
+  });
+}
+/**
+ * @description: 批量删除租户
+ */
+export function tenantBatchDelete(data:any) {
+  return http.request({
+    url: '/tenant/batchDelete',
+    method: 'DELETE',
+    data
+  });
+}
\ No newline at end of file
diff --git a/src/components/numberInput/index.vue b/src/components/numberInput/index.vue
new file mode 100644
index 0000000..c873770
--- /dev/null
+++ b/src/components/numberInput/index.vue
@@ -0,0 +1,68 @@
+<template>
+  <el-input
+      v-model="inputValue"
+      :placeholder="placeholder"
+      clearable
+      @blur="inputBlur"
+      :maxlength="maxlength"
+      @input="value =>inputF(value)"
+  />
+</template>
+
+<script lang="ts" setup>
+import {computed} from "vue";
+
+const props = defineProps({
+  modelValue: {
+    default: ""
+  },
+  maxlength: {
+    default: 50
+  },
+  zh: {
+    default: false
+  },
+  isMax: {
+    default: false
+  },
+  maxNum:{
+    default: 0
+  },
+  placeholder:{
+    default: '请输入'
+  },
+});
+
+const inputF = (value) =>{
+  let filterValue=value.replace(/[^0-9]/g,'')?(props.zh?parseInt(value.replace(/[^0-9]/g,'')):value.replace(/[^0-9]/g,'')):''
+  if(props.isMax){
+    if(!props.maxNum&&filterValue){
+      filterValue=0
+    }else if(props.maxNum&&filterValue&&filterValue> props.maxNum){
+      filterValue=props.maxNum
+    }
+  }
+  inputValue.value=filterValue
+}
+
+const emit = defineEmits<{
+  (event: 'update:modelValue', value: any): void,
+  (event: 'blur'): void,
+}>()
+
+const inputBlur = ()=>{
+  emit('blur')
+}
+
+const inputValue = computed({
+  get() {
+    return props.modelValue
+  },
+  set(value) {
+    emit('update:modelValue', value)
+  }
+})
+</script>
+
+<style lang="scss">
+</style>
\ No newline at end of file
diff --git a/src/views/data/config/columns.ts b/src/views/data/config/columns.ts
new file mode 100644
index 0000000..baca339
--- /dev/null
+++ b/src/views/data/config/columns.ts
@@ -0,0 +1,24 @@
+import { h } from 'vue';
+import { ElTag } from 'element-plus';
+
+export const columns = [
+  {
+    type: 'selection',
+  },
+  {
+    label: '配置名称',
+    prop: 'name',
+  },
+  {
+    label: '排序',
+    prop: 'sort',
+  },
+  {
+    label: '创建人',
+    prop: 'createUser',
+  },
+  {
+    label: '创建时间',
+    prop: 'createTime',
+  },
+];
diff --git a/src/views/data/config/edit.vue b/src/views/data/config/edit.vue
new file mode 100644
index 0000000..717f21d
--- /dev/null
+++ b/src/views/data/config/edit.vue
@@ -0,0 +1,104 @@
+<template>
+  <el-dialog
+      v-model="props.visible"
+      :title="props.configId?'编辑':'新增'"
+      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="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 {getConfigDetail,configAdd,configUpdate} from "@/api/data/config";
+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: "",
+  sort: 0,
+  note:'',
+});
+
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    required: true,
+    default: false
+  },
+  configId: {
+    type: Number,
+    required: true,
+    default: 0
+  }
+});
+
+const handleSubmit = async () => {
+    await formRef.value?.validate();
+    props.configId ? await configUpdate(formData) : await configAdd(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 getConfigDetail(props.configId);
+  for (const key in formData) {
+    if (data[key] != null && data[key] != undefined) {
+      //@ts-ignore
+      formData[key] = data[key];
+    }
+  }
+};
+
+onMounted(() => {
+  if (props.configId) {
+    setFormData();
+  }
+});
+
+</script>
diff --git a/src/views/data/config/index.vue b/src/views/data/config/index.vue
new file mode 100644
index 0000000..b793cdf
--- /dev/null
+++ b/src/views/data/config/index.vue
@@ -0,0 +1,162 @@
+<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"
+        :configId="configId"
+        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 { useForm } from '@/components/Form/index';
+  import { TableAction } from '@/components/Table';
+  import { getConfigList,configDelete,configBatchDelete } from '@/api/data/config';
+  import { columns } from './columns';
+  import { PlusOutlined } from '@vicons/antd';
+  import {message,confirm} from "@/utils/auth";
+  const editDialog = defineAsyncComponent(() =>
+    import('./edit.vue')
+)
+const configId =ref(0)
+const editVisible=ref(false)
+  const selectionData = ref([])
+  const tableRef = ref();
+  const formParams = reactive({
+    name:'',
+    status:'',
+    type:''
+  });
+  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 getConfigList({ ...formParams, ...res });
+    return result;
+  };
+
+  function reloadTable() {
+    tableRef.value.reload({pageNo:1});
+  }
+  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 () => {
+  configId.value=0
+  await nextTick();
+  editVisible.value=true
+};
+
+const handleEdit = async (record: Recordable) => {
+  configId.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 configDelete(record.row.id):await configBatchDelete(ids);
+    message("删除成功");
+    reloadTable()
+  }
+function onSelectionChange(value){
+    selectionData.value = value
+  }
+</script>
+
+<style lang="scss" scoped></style>
diff --git a/src/views/data/config/querySchemas.ts b/src/views/data/config/querySchemas.ts
new file mode 100644
index 0000000..acba086
--- /dev/null
+++ b/src/views/data/config/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/data/notice/columns.ts b/src/views/data/notice/columns.ts
new file mode 100644
index 0000000..599ec3e
--- /dev/null
+++ b/src/views/data/notice/columns.ts
@@ -0,0 +1,38 @@
+import { h } from 'vue';
+import { ElTag } from 'element-plus';
+
+export const columns = [
+  {
+    type: 'selection',
+  },
+  {
+    label: '标题',
+    prop: 'title',
+  },
+  {
+    label: '类型',
+    prop: 'type',
+    render(record) {
+      return h('span', record.row.type === 1 ? '通知' : '公告');
+    },
+  },
+  {
+    label: '状态',
+    prop: 'status',
+    render(record) {
+      return h('span', record.row.status === 1 ? '正常' : '关闭')
+    },
+  },
+  {
+    label: '点击率',
+    prop: 'clickNum',
+  },
+  {
+    label: '创建人',
+    prop: 'createUser',
+  },
+  {
+    label: '创建时间',
+    prop: 'createTime',
+  },
+];
diff --git a/src/views/data/notice/edit.vue b/src/views/data/notice/edit.vue
new file mode 100644
index 0000000..295ac6a
--- /dev/null
+++ b/src/views/data/notice/edit.vue
@@ -0,0 +1,127 @@
+<template>
+  <el-dialog
+      v-model="props.visible"
+      :title="props.noticeId?'编辑':'新增'"
+      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="title"
+          :rules="{ required: true, message: '请输入通知标题', trigger: 'blur' }"
+      >
+        <el-input
+            class="ls-input"
+            v-model="formData.title"
+            placeholder="通知标题"
+            clearable
+        />
+      </el-form-item>
+        <el-form-item label="通知类型">
+          <el-select
+              v-model="formData.type"
+              placeholder="请选择通知类型"
+          >
+            <el-option label="通知" :value="1"></el-option>
+            <el-option label="公告" :value="2"></el-option>
+          </el-select>
+        </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="content"
+          :rules="{ required: true, message: '请输入通知内容', trigger: 'blur' }"
+      >
+        <el-input
+            class="ls-input"
+            type="textarea"
+            v-model="formData.content"
+            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 {getNoticeDetail,noticeAdd,noticeUpdate} from "@/api/data/notice";
+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: "",
+  title: "",
+  status: 1,
+  type: 1,
+  content:''
+});
+
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    required: true,
+    default: false
+  },
+  noticeId: {
+    type: Number,
+    required: true,
+    default: 0
+  }
+});
+
+const handleSubmit = async () => {
+    await formRef.value?.validate();
+    props.noticeId ? await noticeUpdate(formData) : await noticeAdd(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 getNoticeDetail(props.noticeId);
+  for (const key in formData) {
+    if (data[key] != null && data[key] != undefined) {
+      //@ts-ignore
+      formData[key] = data[key];
+    }
+  }
+};
+
+onMounted(() => {
+  if (props.noticeId) {
+    setFormData();
+  }
+});
+
+</script>
diff --git a/src/views/data/notice/index.vue b/src/views/data/notice/index.vue
new file mode 100644
index 0000000..939de6a
--- /dev/null
+++ b/src/views/data/notice/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-space>
+          <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>
+          </el-space>
+        </template>
+
+        <template #action>
+          <TableAction />
+        </template>
+      </BasicTable>
+    </el-card>
+
+    <editDialog
+        v-if="editVisible"
+        :noticeId="noticeId"
+        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 { useForm } from '@/components/Form/index';
+  import { TableAction } from '@/components/Table';
+  import { getNoticeList,noticeDelete,noticeBatchDelete } from '@/api/data/notice';
+  import { columns } from './columns';
+  import { PlusOutlined } from '@vicons/antd';
+  import {message,confirm,loading, closeLoading} from "@/utils/auth";
+  const editDialog = defineAsyncComponent(() =>
+    import('./edit.vue')
+)
+  const noticeId =ref(0)
+  const editVisible=ref(false)
+  const selectionData = ref([])
+  const tableRef = ref();
+  const formParams = reactive({
+    title:'',
+    status:'',
+    type:''
+  });
+  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 getNoticeList({ ...formParams, ...res });
+    return result;
+  };
+
+  function reloadTable() {
+    tableRef.value.reload({pageNo:1});
+  }
+  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 () => {
+  noticeId.value=0
+  await nextTick();
+  editVisible.value=true
+};
+
+const handleEdit = async (record: Recordable) => {
+  noticeId.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 noticeDelete(record.row.id):await noticeBatchDelete(ids);
+    message("删除成功");
+    reloadTable()
+  }
+</script>
+
+<style lang="scss" scoped></style>
diff --git a/src/views/data/notice/querySchemas.ts b/src/views/data/notice/querySchemas.ts
new file mode 100644
index 0000000..516003f
--- /dev/null
+++ b/src/views/data/notice/querySchemas.ts
@@ -0,0 +1,47 @@
+import { FormSchema } from '@/components/Form/index';
+export const schemas: FormSchema[] = [
+  {
+    field: 'title',
+    component: 'Input',
+    label: '标题',
+    componentProps: {
+      placeholder: '请输入标题',
+    },
+  },
+  {
+    field: 'type',
+    component: 'Select',
+    label: '状态',
+    componentProps: {
+      placeholder: '请选择类型',
+      options: [
+        {
+          label: '通知',
+          value: '1',
+        },
+        {
+          label: '公告',
+          value: '2',
+        },
+      ],
+    },
+  },
+  {
+    field: 'status',
+    component: 'Select',
+    label: '状态',
+    componentProps: {
+      placeholder: '请选择状态',
+      options: [
+        {
+          label: '正常',
+          value: '1',
+        },
+        {
+          label: '关闭',
+          value: '2',
+        },
+      ],
+    },
+  },
+];
diff --git a/src/views/system/tenant/columns.ts b/src/views/system/tenant/columns.ts
new file mode 100644
index 0000000..6e5124f
--- /dev/null
+++ b/src/views/system/tenant/columns.ts
@@ -0,0 +1,78 @@
+import { h } from 'vue';
+import { ElAvatar, ElTag } from 'element-plus';
+
+export const columns = [
+  {
+    type: 'selection',
+  },
+  {
+    label: '租户名称',
+    prop: 'name',
+  },
+  {
+    label: '租户编码',
+    prop: 'code',
+  },
+  {
+    label: '统一社会信用代码',
+    prop: 'license',
+    width: 160,
+  },
+  {
+    label: '人数',
+    prop: 'number',
+  },
+  {
+    label: '到期时间',
+    prop: 'expireTime',
+  },
+  {
+    label: '联系人姓名',
+    prop: 'contactUser',
+    width:140
+  },
+  {
+    label: '联系人电话',
+    prop: 'contactMobile',
+    width:140
+  },
+  {
+    label: '联系人姓名',
+    prop: 'contactUser',
+    width:140
+  },
+  {
+    label: '联系人邮箱',
+    prop: 'contactEmail',
+    width:140
+  },
+  {
+    label: '联系人网址',
+    prop: 'contactSite',
+    width:140
+  },
+  {
+    label: '状态',
+    prop: 'status',
+    render(record) {
+      return h(
+        ElTag,
+        {
+          type: record.row.status ==1 ? 'success' : 'danger',
+        },
+        {
+          default: () => (record.row.status ==1 ? '正常' : '禁用'),
+        },
+      );
+    },
+  },
+  {
+    label: '创建人',
+    prop: 'createUser',
+  },
+  {
+    label: '创建时间',
+    prop: 'createTime',
+    width: 180,
+  },
+];
diff --git a/src/views/system/tenant/edit.vue b/src/views/system/tenant/edit.vue
new file mode 100644
index 0000000..90ea277
--- /dev/null
+++ b/src/views/system/tenant/edit.vue
@@ -0,0 +1,204 @@
+<template>
+  <el-dialog v-model="props.visible" :title="props.tenantId ? '编辑' : '新增'" width="800" :close-on-click-modal="false"
+    :before-close="dialogClose">
+    <el-form ref="formRef" :model="formData" label-width="140px">
+      <div class="flex">
+        <el-form-item label="名称" prop="name" class="flex-1"
+          :rules="{ required: true, message: '请输入名称', trigger: 'blur' }">
+          <el-input v-model="formData.name" placeholder="请输入名称" clearable />
+        </el-form-item>
+        <el-form-item label="编号" prop="code" class="flex-1"
+          :rules="{ required: true, message: '请输入编号', trigger: 'blur' }">
+          <el-input v-model="formData.code" clearable
+            placeholder="请输入编号" />
+        </el-form-item>
+      </div>
+      <div class="flex">
+        <el-form-item label="统一社会信用代码" prop="license" class="flex-1"
+          :rules="{ required: true, message: '请输入统一社会信用代码', trigger: 'blur' }">
+          <el-input v-model="formData.license" placeholder="请输入统一社会信用代码" clearable />
+        </el-form-item>
+        <el-form-item label="联系人" prop="contactUser" class="flex-1"
+        :rules="{ required: true, message: '请输入联系人', trigger: 'blur' }">
+          <el-input v-model="formData.contactUser" placeholder="请输入联系人" clearable />
+        </el-form-item>
+      </div>
+      <div class="flex">
+        <el-form-item label="联系电话" prop="contactMobile" class="flex-1"
+          :rules="{ required: true, message: '请输入联系电话', trigger: 'blur' }">
+          <el-input v-model="formData.contactMobile" placeholder="请输入联系电话" clearable />
+        </el-form-item>
+        <el-form-item label="邮箱地址" prop="contactEmail" class="flex-1"
+          :rules="[{ required: true, message: '请输入邮箱地址', trigger: 'blur' },{ type: 'email', message: '请输入正确邮箱地址', trigger: 'blur'}]">
+          <el-input v-model="formData.contactEmail" placeholder="请输入邮箱地址" clearable />
+        </el-form-item>
+      </div>
+      <div class="flex">
+        <el-form-item label="官网地址" prop="contactSite" class="flex-1"
+        :rules="{ required: true, message: '请输入官网地址', trigger: 'blur'}">
+          <el-input v-model="formData.contactSite" placeholder="请输入官网地址" clearable />
+        </el-form-item>
+        <el-form-item label="用户数量" prop="number" class="flex-1"
+        :rules="{ required: true, message: '请输入用户数量', trigger: 'blur'}">
+          <number-input v-model="formData.number" placeholder="请输入用户数量" clearable />
+        </el-form-item>
+      </div>
+      <div class="flex">
+        <el-form-item label="过期时间" prop="expireTime"  class="flex-1"
+        :rules="{ required: true, message: '请选择过期时间', trigger: 'blur'}">
+          <el-date-picker type="datetime" placeholder="请选择过期时间" v-model="formData.expireTime" />
+        </el-form-item>
+        <el-form-item label="租户地址" prop="contactAddress" class="flex-1"
+        :rules="{ required: true, message: '请输入租户地址', trigger: 'blur'}">
+          <el-input v-model="formData.contactAddress" placeholder="请输入租户地址" clearable />
+        </el-form-item>
+      </div>
+      <div class="flex">
+        <el-form-item label="简介" prop="contactIntro" class="flex-1"
+        :rules="{ required: true, message: '请输入简介', trigger: 'blur'}">
+          <el-input v-model="formData.contactIntro" type="textarea" placeholder="请输入简介" clearable />
+        </el-form-item>
+      </div>
+      <div class="flex">
+        <el-form-item label="备注" prop="contactNote" class="flex-1">
+          <el-input v-model="formData.contactNote" type="textarea" placeholder="请输入备注" clearable />
+        </el-form-item>
+      </div>
+      <div class="flex">
+        <el-form-item label="租户状态" prop="status" class="flex-1">
+          <el-radio-group v-model="formData.status" name="status">
+            <el-radio :value="0">正常</el-radio>
+            <el-radio :value="1">禁用</el-radio>
+          </el-radio-group>
+        </el-form-item>
+      </div>
+
+    </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 { getTenantDetail, tenantAdd, tenantUpdate } from '@/api/system/tenant';
+import {  onMounted, reactive, shallowRef } from "vue";
+import { getRoleAllList } from '@/api/system/role';
+import { getDeptList } from '@/api/system/dept';
+import { getLevelAllList } from '@/api/system/level';
+import { getPositionAllList } from '@/api/system/position';
+import {buildTree } from "@/utils/auth";
+import { FormInstance } from "element-plus";
+
+const formRef = shallowRef<FormInstance>();
+import { useLockFn } from "@/utils/useLockFn";
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    required: true,
+    default: false
+  },
+  tenantId: {
+    type: Number,
+    required: true,
+    default: 0
+  }
+});
+
+const emit = defineEmits(["success", "update:visible"]);
+const formData = reactive({
+  id: 0,
+  code:'',
+  name: '',
+  license: "",
+  contactUser: "",
+  contactMobile: '',
+  contactEmail: '',
+  contactAddress:'',
+  contactIntro: '',
+  contactSite: '',
+  contactNote: '',
+  expireTime: '',
+  status: 0,
+  number: ''
+});
+const passwordConfirmValidator = (
+  rule: object,
+  value: string,
+  callback: any
+) => {
+  if (formData.password) {
+    if (!value) callback(new Error("请再次输入密码"));
+    if (value !== formData.password) callback(new Error("两次输入密码不一致!"));
+  }
+  callback();
+};
+
+const dialogClose = () => {
+  emit("update:visible", false);
+};
+
+const setFormData = async (row: any) => {
+  const data = await getTenantDetail(row.tenantId);
+  for (const key in formData) {
+    if (data[key] != null && data[key] != undefined) {
+      if(key=='city'){
+        if(data.city.length>0){
+          formData[key] = [parseInt(data.city[0]),parseInt(data.city[1]),parseInt(data.city[2]),parseInt(data.city[3])];
+        }else{
+          formData[key] =''
+        }
+      }else{
+        formData[key] = data[key];
+      }
+    }
+  }
+};
+
+const handleSubmit = async () => {
+  await formRef.value?.validate();
+  props.tenantId ? await tenantUpdate(formData) : await tenantAdd(formData);
+  emit("update:visible", false);
+  emit("success");
+};
+
+const { isLock: subLoading, lockFn: submit } = useLockFn(handleSubmit);
+
+const optionData = reactive({
+  roleList: [],
+  deptList: [],
+  levelList: [],
+  positionList: []
+});
+
+function uploadChange(data: string[]) {
+  formData.avatar = data.fileUrl;
+  formData.avatarName =data.fileName
+}
+const handleDelete =async(file)=>{
+  console.log(file)
+}
+
+const getAllDict = async () => {
+  let list = await getRoleAllList();
+  optionData.roleList = list ? list : [];
+  list = await getDeptList();
+  optionData.deptList = list ? buildTree(list) : [];
+  list = await getLevelAllList();
+  optionData.levelList = list ? list : [];
+  list = await getPositionAllList();
+  optionData.positionList = list ? list : [];
+};
+onMounted(() => {
+  getAllDict()
+  if (props.tenantId) {
+    setFormData({ tenantId: props.tenantId });
+  }
+});
+
+</script>
\ No newline at end of file
diff --git a/src/views/system/tenant/index.vue b/src/views/system/tenant/index.vue
new file mode 100644
index 0000000..93edd96
--- /dev/null
+++ b/src/views/system/tenant/index.vue
@@ -0,0 +1,171 @@
+<template>
+  <PageWrapper>
+    <el-card :bordered="false" class="pt-3 mb-3 proCard">
+      <BasicForm @register="register" @submit="handleSubmit" @reset="handleReset">
+        <template #statusSlot="{ model, field }">
+          <el-input v-model="model[field]" />
+        </template>
+      </BasicForm>
+    </el-card>
+    <el-card :bordered="false" class="proCard">
+      <BasicTable
+        :columns="columns"
+        :request="loadDataTable"
+        :row-key="(row) => row.id"
+        ref="basicTableRef"
+        :actionColumn="actionColumn"
+        @selection-change="onSelectionChange"
+        scroll-x="1200"
+        virtual-scroll
+      >
+        <template #tableTitle>
+          <el-space>
+            <el-button type="primary" @click="addTenant">
+              <template #icon>
+                <el-icon style="vertical-align: middle">
+                  <plus />
+                </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>
+          </el-space>
+        </template>
+      </BasicTable>
+    </el-card>
+    <editDialog
+        v-if="editVisible"
+        :tenantId="tenantId"
+        v-model:visible="editVisible"
+        @success="reloadTable"
+    >
+    </editDialog>
+  </PageWrapper>
+</template>
+
+<script lang="ts" setup>
+  import { h, nextTick, reactive, ref ,defineAsyncComponent} from 'vue';
+  import { ColProps } from 'element-plus';
+  import { TableAction } from '@/components/Table';
+  import { useForm } from '@/components/Form/index';
+  import { getTenantList,tenantDelete,tenantBatchDelete } from '@/api/system/tenant';
+  import {message,confirm} from "@/utils/auth";
+  import { columns } from './columns';
+  import { schemas } from './querySchemas';
+  const tenantId =  ref(0);
+  const basicTableRef = ref();
+  const editVisible = ref(false)
+  const selectionData = ref([])
+  const editDialog = defineAsyncComponent(() =>
+    import('./edit.vue'))
+  const formParams = reactive({
+    name: '',
+    status:'',
+  });
+
+
+  const actionColumn = reactive({
+    width: 250,
+    label: '操作',
+    prop: 'action',
+    fixed: 'right',
+    align: 'center',
+    render(record) {
+      return h(TableAction as any, {
+        style: 'text',
+        actions: [
+          {
+            label: '删除',
+            type: 'danger',
+            onClick: handleDelete.bind(null, record),
+          },
+          {
+            label: '编辑',
+            type: 'warning',
+            onClick: handleEdit.bind(null, record),
+          },
+        ],
+        // dropDownActions: [
+        //   {
+        //     label: '启用',
+        //     key: 'enabled',
+        //   },
+        //   {
+        //     label: '禁用',
+        //     key: 'disabled',
+        //   },
+        // ],
+        // select: (key) => {
+        //   ElMessage.info(`您点击了，${key} 按钮`);
+        // },
+      });
+    },
+  });
+
+  const loadDataTable = async (res) => {
+    const result = await getTenantList({ ...formParams, ...res });
+    return result;
+  };
+
+  function reloadTable() {
+    basicTableRef.value.reload({pageNo:1});
+  }
+
+  async function handleEdit(record: Recordable) {
+    tenantId.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 tenantDelete(record.row.id):await tenantBatchDelete(ids);
+    message("删除成功");
+    reloadTable()
+  }
+  
+  function handleSubmit(values: Recordable) {
+    for (const key in formParams) {
+      if (values[key] != null && values[key] != undefined) {
+        formParams[key] = values[key];
+      }
+    }
+    reloadTable();
+  }
+
+  function handleReset(values: Recordable) {
+    for (const key in formParams) {
+        formParams[key] ='';
+    }
+  }
+  function onSelectionChange(value){
+    selectionData.value = value
+  }
+  const [register, {}] = useForm({
+    labelWidth: 80,
+    layout: 'horizontal',
+    colProps: { span: 6 } as ColProps,
+    submitOnReset:true,
+    schemas
+  });
+  //添加
+  function addTenant() {
+    tenantId.value =0
+    editVisible.value  = true
+  }
+
+</script>
+
+<style lang="scss" scoped></style>
diff --git a/src/views/system/tenant/querySchemas.ts b/src/views/system/tenant/querySchemas.ts
new file mode 100644
index 0000000..e3f56f9
--- /dev/null
+++ b/src/views/system/tenant/querySchemas.ts
@@ -0,0 +1,41 @@
+import { FormSchema } from '@/components/Form/index';
+import { getRoleAllList } from '@/api/system/role';
+export const loadSelectData = async(res)=> {
+  //这里可以进行数据转换处理
+  return (await getRoleAllList({ ...res })).map((item, index) => {
+    return {
+      ...item,
+      label:item.name,
+      value:item.id,
+      index,
+    };
+  });
+}
+export const schemas: FormSchema[] = [
+  {
+    field: 'name',
+    component: 'Input',
+    label: '租户名称',
+    componentProps: {
+      placeholder: '请输入租户名称',
+    },
+  },
+  {
+    field: 'status',
+    component: 'Select',
+    label: '状态',
+    componentProps: {
+      placeholder: '请选择状态',
+      options: [
+        {
+          label: '正常',
+          value: '0',
+        },
+        {
+          label: '禁用',
+          value: '1',
+        },
+      ],
+    },
+  },
+];
diff --git a/src/views/system/user/querySchemas.ts b/src/views/system/user/querySchemas.ts
index 9a87893..8ce4ae3 100644
--- a/src/views/system/user/querySchemas.ts
+++ b/src/views/system/user/querySchemas.ts
@@ -20,20 +20,20 @@ export const schemas: FormSchema[] = [
       placeholder: '请输入用户名',
     },
   },
-  {
-    field: 'role',
-    component: 'BasicSelect',
-    label: '角色',
-    componentProps: {
-      placeholder: '请选择角色',
-      block:true,
-      multiple:true,
-      request: loadSelectData,
-      onChange: (e: any) => {
-        console.log(e);
-      },
-    },
-  },
+  // {
+  //   field: 'role',
+  //   component: 'BasicSelect',
+  //   label: '角色',
+  //   componentProps: {
+  //     placeholder: '请选择角色',
+  //     block:true,
+  //     multiple:true,
+  //     request: loadSelectData,
+  //     onChange: (e: any) => {
+  //       console.log(e);
+  //     },
+  //   },
+  // },
   {
     field: 'status',
     component: 'Select',