fix: 租户管理

src/views/sys/sysTenant/package/data.ts

@@ -0,0 +1,162 @@
+import { listDictModel } from '/@/api/common';
+import { DescItem } from '/@/components/Description';
+import { BasicColumn, FormSchema } from '/@/components/Table';
+
+export const columns: BasicColumn[] = [
+  {
+    title: '套餐编码',
+    dataIndex: 'packageCode',
+  },
+  {
+    title: '套餐名称',
+    dataIndex: 'packageName',
+  },
+  {
+    title: '套餐备注',
+    dataIndex: 'remark',
+  },
+  {
+    title: '排序',
+    dataIndex: 'sort',
+  },
+  {
+    title: '套餐类型',
+    dataIndex: 'type',
+  },
+  {
+    title: '启用',
+    dataIndex: 'disable',
+  },
+  {
+    title: '创建时间',
+    dataIndex: 'createTime',
+  },
+];
+
+// 表单列定义
+export const searchFormSchema: FormSchema[] = [
+  {
+    label: '套餐编码',
+    field: 'packageCode',
+    component: 'Input',
+    componentProps: {
+      placeholder: '请输入套餐编码',
+    },
+  },
+  {
+    label: '套餐名称',
+    field: 'packageName',
+    component: 'Input',
+    componentProps: {
+      placeholder: '请输入套餐名称',
+    },
+  },
+  {
+    label: '套餐类型',
+    field: 'type',
+    component: 'Input',
+    componentProps: {
+      placeholder: '请输入套餐类型',
+    },
+  },
+  {
+    label: '启用',
+    field: 'disable',
+    component: 'ApiSelect',
+    componentProps: {
+      api: listDictModel,
+      params: {
+        dictCode: 'sys_disable_type',
+      },
+    },
+  },
+];
+// 表单新增编辑
+export const dataFormSchema: FormSchema[] = [
+  {
+    label: '套餐编码',
+    field: 'packageCode',
+    required: true,
+    component: 'Input',
+    componentProps: {
+      placeholder: '请输入套餐编码',
+    },
+  },
+  {
+    label: '套餐名称',
+    field: 'packageName',
+    required: true,
+    component: 'Input',
+    componentProps: {
+      placeholder: '请输入套餐名称',
+    },
+  },
+  {
+    label: '套餐备注',
+    field: 'remark',
+    required: true,
+    component: 'Input',
+    componentProps: {
+      placeholder: '请输入套餐备注',
+    },
+  },
+  {
+    label: '排序',
+    field: 'sort',
+    required: true,
+    component: 'Input',
+    componentProps: {
+      placeholder: '请输入排序',
+    },
+  },
+  {
+    label: '启用',
+    field: 'disable',
+    component: 'ApiSelect',
+    componentProps: {
+      api: listDictModel,
+      params: {
+        dictCode: 'sys_disable_type',
+      },
+    },
+  },
+];
+// 表单详情查看
+export const viewSchema: DescItem[] = [
+  {
+    label: '套餐id',
+    field: 'id',
+  },
+  {
+    label: '套餐编码',
+    field: 'packageCode',
+  },
+  {
+    label: '套餐名称',
+    field: 'packageName',
+  },
+  {
+    label: '套餐备注',
+    field: 'remark',
+  },
+  {
+    label: '排序',
+    field: 'sort',
+  },
+  {
+    label: '套餐类型',
+    field: 'type',
+  },
+  {
+    label: '启用',
+    field: 'disable',
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+  },
+  {
+    label: '更新时间',
+    field: 'updateTime',
+  },
+];

src/views/sys/sysTenant/package/formDrawer.vue

@@ -0,0 +1,75 @@
+<template>
+  <BasicDrawer
+    v-bind="$attrs"
+    destroyOnClose
+    @register="registerDrawer"
+    :title="getTitle"
+    :width="width"
+    @ok="handleSubmit"
+    :showFooter="true"
+  >
+    <BasicForm @register="registerForm" layout="vertical" />
+  </BasicDrawer>
+</template>
+<script lang="ts" setup>
+  import { ref, computed, unref } from 'vue';
+  import { BasicDrawer, useDrawerInner } from '/@/components/Drawer';
+  import { BasicForm, useForm } from '/@/components/Form';
+  import { useMessage } from '/@/hooks/web/useMessage';
+  import { dataFormSchema } from './data';
+
+  import {
+    sysTenantPackageAdd,
+    sysTenantPackageEdit,
+    sysTenantPackageDetail,
+  } from '/@/api/sys/sysTenantPackageApi';
+
+  const emit = defineEmits(['success', 'register']);
+
+  const getTitle = computed(() => (!unref(isUpdate) ? '新增租户套餐' : '编辑租户套餐'));
+  const width = '45%';
+  const isUpdate = ref(false);
+  const rowId = ref();
+
+  const { createMessage } = useMessage();
+  const [registerForm, { setFieldsValue, resetFields, validate }] = useForm({
+    labelWidth: 100,
+    schemas: dataFormSchema,
+    showActionButtonGroup: false,
+    actionColOptions: {
+      span: 23,
+    },
+  });
+  const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async data => {
+    await resetFields();
+    setDrawerProps({ confirmLoading: false });
+    isUpdate.value = !!data?.isUpdate;
+
+    if (unref(isUpdate)) {
+      const resData = await sysTenantPackageDetail(data.record.id);
+      rowId.value = resData.id;
+      await setFieldsValue({
+        ...resData,
+      });
+    }
+  });
+
+  // 提交按钮事件
+  async function handleSubmit() {
+    try {
+      const values = await validate();
+      setDrawerProps({ confirmLoading: true });
+      !unref(isUpdate)
+        ? await sysTenantPackageAdd({ ...values })
+        : await sysTenantPackageEdit({ ...values, id: rowId.value });
+      !unref(isUpdate) ? createMessage.success('新增成功！') : createMessage.success('编辑成功！');
+      closeDrawer();
+      emit('success', {
+        isUpdate: unref(isUpdate),
+        values: { ...values, id: rowId.value },
+      });
+    } finally {
+      setDrawerProps({ confirmLoading: false });
+    }
+  }
+</script>

src/views/sys/sysTenant/package/index.vue

@@ -0,0 +1,207 @@
+<template>
+  <div>
+    <BasicTable @register="registerTable">
+      <template #bodyCell="{ column, record }">
+        <template v-if="column.key === 'type'">
+          <Tag :color="formatDictColor(typeOptions, record.type)">
+            {{ formatDictValue(typeOptions, record.type) }}
+          </Tag>
+        </template>
+        <template v-if="column.key === 'disable'">
+          <Tag :color="formatDictColor(disableOptions, record.disable)">
+            {{ formatDictValue(disableOptions, record.disable) }}
+          </Tag>
+        </template>
+        <template v-if="column.key === 'action'">
+          <TableAction
+            :actions="[
+              {
+                auth: 'sys:tenantPackage:query',
+                icon: 'icon-eye|iconfont',
+                tooltip: '查看',
+                label: '查看',
+                onClick: handleView.bind(null, record),
+              },
+              {
+                auth: 'sys:tenantPackage:edit',
+                icon: 'icon-edit|iconfont',
+                tooltip: '编辑',
+                label: '编辑',
+                onClick: handleEdit.bind(null, record),
+              },
+              {
+                auth: 'sys:tenantPackage:remove',
+                icon: 'icon-delete|iconfont',
+                tooltip: '删除',
+                label: '删除',
+                color: 'error',
+                popConfirm: {
+                  title: '是否确认删除',
+                  placement: 'left',
+                  confirm: handleDelete.bind(null, record),
+                },
+              },
+            ]"
+          />
+        </template>
+      </template>
+      <template #toolbar>
+        <Button
+          v-auth="['sys:tenantPackage:add']"
+          type="primary"
+          @click="handleCreate"
+          preIcon="icon-plus|iconfont"
+        >
+          新增
+        </Button>
+        <Button
+          v-auth="['sys:tenantPackage:remove']"
+          type="primary"
+          danger
+          @click="handleDelete(null)"
+          preIcon="icon-delete|iconfont"
+        >
+          批量删除
+        </Button>
+      </template>
+    </BasicTable>
+    <FormDrawer @register="registerDrawer" @success="handleSuccess" />
+    <ViewDrawer @register="registerDrawerView" @success="handleSuccess" />
+  </div>
+</template>
+<script lang="ts" setup>
+  import { onBeforeMount, ref } from 'vue';
+  import { Tag } from 'ant-design-vue';
+  import { Button } from '/@/components/Button';
+
+  import { BasicTable, useTable, TableAction } from '/@/components/Table';
+
+  // import { useModal } from '/@/components/Modal';
+  import { useMessage } from '/@/hooks/web/useMessage';
+  import FormDrawer from './formDrawer.vue';
+  import ViewDrawer from './viewDrawer.vue';
+  import { columns, searchFormSchema } from './data';
+
+  import {
+    sysTenantPackageQueryPage,
+    sysTenantPackageRemove,
+  } from '/@/api/sys/sysTenantPackageApi';
+  import { listDictModel } from '/@/api/common';
+  import { formatDictColor, formatDictValue } from '/@/utils';
+  import { useDrawer } from '/@/components/Drawer';
+
+  const typeOptions = ref();
+  const disableOptions = ref();
+  onBeforeMount(async () => {
+    typeOptions.value = await listDictModel({ dictCode: 'sys_create_type' });
+    disableOptions.value = await listDictModel({ dictCode: 'sys_disable_type' });
+  });
+
+  const { createConfirm, createMessage } = useMessage();
+  // const [registerModal, { openModal }] = useModal();
+  const [registerDrawer, { openDrawer }] = useDrawer();
+  const [registerDrawerView, { openDrawer: openDrawerView }] = useDrawer();
+
+  const tableSort = ref([
+    {
+      field: 'create_time',
+      direction: 'DESC',
+    },
+  ]) as any;
+
+  const [registerTable, { reload, getSelectRowKeys }] = useTable({
+    title: '门户列表 ',
+    api: sysTenantPackageQueryPage,
+    rowKey: 'id',
+    columns,
+    showIndexColumn: true,
+    rowSelection: { type: 'checkbox' },
+    formConfig: {
+      labelWidth: 120,
+      schemas: searchFormSchema,
+      autoSubmitOnEnter: true,
+      baseColProps: { xs: 24, sm: 12, md: 12, lg: 8 },
+      resetButtonOptions: {
+        preIcon: 'icon-delete|iconfont',
+      },
+      submitButtonOptions: {
+        preIcon: 'icon-search|iconfont',
+      },
+    },
+    useSearchForm: true,
+    bordered: true,
+    actionColumn: {
+      width: 200,
+      title: '操作',
+      dataIndex: 'action',
+    },
+    beforeFetch: handleBeforeFetch,
+    sortFn: handleSortFn,
+  });
+  // 详情按钮事件
+  function handleView(record: Recordable) {
+    console.log(record);
+    openDrawerView(true, {
+      record,
+    });
+  }
+
+  // 新增按钮事件
+  function handleCreate() {
+    openDrawer(true, {
+      isUpdate: false,
+    });
+  }
+
+  // 编辑按钮事件
+  function handleEdit(record: Recordable) {
+    openDrawer(true, {
+      record,
+      isUpdate: true,
+    });
+  }
+
+  // 删除按钮事件
+  async function handleDelete(record: Recordable) {
+    if (record) {
+      await sysTenantPackageRemove([record.id]);
+      createMessage.success('删除成功！');
+      await reload();
+    } else {
+      createConfirm({
+        content: '你确定要删除?',
+        iconType: 'warning',
+        onOk: async () => {
+          const keys = getSelectRowKeys();
+          await sysTenantPackageRemove(keys);
+          createMessage.success('删除成功！');
+          await reload();
+        },
+      });
+    }
+  }
+  // 表格点击字段排序
+  function handleSortFn(sortInfo) {
+    if (sortInfo?.order && sortInfo?.columnKey) {
+      // 默认单列排序
+      tableSort.value = [
+        {
+          field: sortInfo.columnKey,
+          direction: sortInfo.order.replace(/(\w+)(end)/g, '$1').toUpperCase(),
+        },
+      ];
+    }
+  }
+
+  // 表格请求之前，对参数进行处理, 添加默认 排序
+  function handleBeforeFetch(params) {
+    return { ...params, orders: tableSort.value };
+  }
+
+  // 弹窗回调事件
+  async function handleSuccess({ isUpdate, values }) {
+    console.log(isUpdate);
+    console.log(values);
+    await reload();
+  }
+</script>

src/views/sys/sysTenant/package/viewDrawer.vue

@@ -0,0 +1,49 @@
+<template>
+  <BasicDrawer
+    v-bind="$attrs"
+    destroyOnClose
+    @register="registerDrawer"
+    :title="getTitle"
+    :width="width"
+  >
+    <Description @register="registerDesc" :data="descData" />
+  </BasicDrawer>
+</template>
+<script lang="ts" setup>
+  import { onBeforeMount, ref } from 'vue'; // onBeforeMount,
+  import { BasicDrawer, useDrawerInner } from '/@/components/Drawer';
+  import { Description, useDescription } from '/@/components/Description';
+  import { viewSchema } from './data';
+
+  import { sysTenantPackageDetail } from '/@/api/sys/sysTenantPackageApi';
+  import { listDictModel } from '/@/api/common';
+  import { formatDictValue } from '/@/utils';
+
+  const descData = ref({});
+  const getTitle = '查看租户套餐';
+  const width = '45%';
+
+  const typeOptions = ref();
+  const disableOptions = ref();
+  onBeforeMount(async () => {
+    typeOptions.value = await listDictModel({ dictCode: 'sys_create_type' });
+    disableOptions.value = await listDictModel({ dictCode: 'sys_disable_type' });
+  });
+  const [registerDrawer] = useDrawerInner(async data => {
+    console.log('::::::::::', data.record);
+    const resData = await sysTenantPackageDetail(data.record.id);
+    descData.value = {
+      ...resData,
+      type: formatDictValue(typeOptions.value, resData.type),
+      disable: formatDictValue(disableOptions.value, resData.disable),
+    };
+  });
+  const [registerDesc] = useDescription({
+    schema: viewSchema,
+    column: 2,
+    size: 'middle',
+    labelStyle: {
+      width: '120px',
+    },
+  });
+</script>

src/views/sys/sysTenant/page/data.ts

@@ -1,6 +1,6 @@
+import { listDictModel } from '/@/api/common';
 import { DescItem } from '/@/components/Description';
 import { BasicColumn, FormSchema } from '/@/components/Table';
-import { radioBoolean } from '/@/utils/filters';
 
 export const columns: BasicColumn[] = [
   {
@@ -11,6 +11,10 @@ export const columns: BasicColumn[] = [
     title: '租户联系人',
     dataIndex: 'contractUser',
   },
+  {
+    title: '租户类型',
+    dataIndex: 'type',
+  },
   {
     title: '租户联系人电话',
     dataIndex: 'contactMobile',
@@ -28,13 +32,44 @@ export const columns: BasicColumn[] = [
     dataIndex: 'remark',
   },
   {
-    title: '租户状态 0、开启 1、关闭',
+    title: '租户状态',
     dataIndex: 'disable',
   },
 ];
 
 // 表单列定义
-export const searchFormSchema: FormSchema[] = [];
+export const searchFormSchema: FormSchema[] = [
+  {
+    label: '租户名称',
+    field: 'name',
+    component: 'Input',
+    componentProps: {
+      placeholder: '请输入租户名称',
+    },
+  },
+  {
+    label: '租户类型',
+    field: 'type',
+    component: 'ApiSelect',
+    componentProps: {
+      api: listDictModel,
+      params: {
+        dictCode: 'sys_create_type',
+      },
+    },
+  },
+  {
+    label: '租户状态',
+    field: 'disable',
+    component: 'ApiSelect',
+    componentProps: {
+      api: listDictModel,
+      params: {
+        dictCode: 'sys_disable_type',
+      },
+    },
+  },
+];
 // 表单新增编辑
 export const dataFormSchema: FormSchema[] = [
   {
@@ -55,6 +90,17 @@ export const dataFormSchema: FormSchema[] = [
       placeholder: '请输入租户联系人',
     },
   },
+  {
+    label: '租户类型',
+    field: 'type',
+    component: 'ApiRadioGroup',
+    componentProps: {
+      api: listDictModel,
+      params: {
+        dictCode: 'sys_create_type',
+      },
+    },
+  },
   {
     label: '租户联系人电话',
     field: 'contactMobile',
@@ -92,12 +138,14 @@ export const dataFormSchema: FormSchema[] = [
     },
   },
   {
-    label: '租户状态 0、开启 1、关闭',
+    label: '租户状态',
     field: 'disable',
-    component: 'RadioGroup',
-    required: true,
+    component: 'ApiSelect',
     componentProps: {
-      options: radioBoolean,
+      api: listDictModel,
+      params: {
+        dictCode: 'sys_disable_type',
+      },
     },
   },
 ];
@@ -115,6 +163,10 @@ export const viewSchema: DescItem[] = [
     label: '租户联系人',
     field: 'contractUser',
   },
+  {
+    label: '租户类型',
+    field: 'type',
+  },
   {
     label: '租户联系人电话',
     field: 'contactMobile',
@@ -132,7 +184,7 @@ export const viewSchema: DescItem[] = [
     field: 'remark',
   },
   {
-    label: '租户状态 0、开启 1、关闭',
+    label: '租户状态',
     field: 'disable',
   },
   {

src/views/sys/sysTenant/page/formDrawer.vue

@@ -22,7 +22,7 @@
 
   const emit = defineEmits(['success', 'register']);
 
-  const getTitle = computed(() => (!unref(isUpdate) ? '新增租户表' : '编辑租户表'));
+  const getTitle = computed(() => (!unref(isUpdate) ? '新增租户列表' : '编辑租户列表'));
   const width = '45%';
   const isUpdate = ref(false);
   const rowId = ref();

src/views/sys/sysTenant/page/index.vue

@@ -2,6 +2,16 @@
   <div>
     <BasicTable @register="registerTable">
       <template #bodyCell="{ column, record }">
+        <template v-if="column.key === 'type'">
+          <Tag :color="formatDictColor(typeOptions, record.type)">
+            {{ formatDictValue(typeOptions, record.type) }}
+          </Tag>
+        </template>
+        <template v-if="column.key === 'disable'">
+          <Tag :color="formatDictColor(disableOptions, record.disable)">
+            {{ formatDictValue(disableOptions, record.disable) }}
+          </Tag>
+        </template>
         <template v-if="column.key === 'action'">
           <TableAction
             :actions="[
@@ -61,6 +71,7 @@
 </template>
 <script lang="ts" setup>
   import { onBeforeMount, ref } from 'vue';
+  import { Tag } from 'ant-design-vue';
   import { Button } from '/@/components/Button';
 
   import { BasicTable, useTable, TableAction } from '/@/components/Table';
@@ -72,9 +83,16 @@
   import { columns, searchFormSchema } from './data';
 
   import { sysTenantQueryPage, sysTenantRemove } from '/@/api/sys/sysTenantApi';
+  import { listDictModel } from '/@/api/common';
+  import { formatDictColor, formatDictValue } from '/@/utils';
   import { useDrawer } from '/@/components/Drawer';
 
-  onBeforeMount(async () => {});
+  const typeOptions = ref();
+  const disableOptions = ref();
+  onBeforeMount(async () => {
+    typeOptions.value = await listDictModel({ dictCode: 'sys_create_type' });
+    disableOptions.value = await listDictModel({ dictCode: 'sys_disable_type' });
+  });
 
   const { createConfirm, createMessage } = useMessage();
   // const [registerModal, { openModal }] = useModal();

src/views/sys/sysTenant/page/viewDrawer.vue

@@ -16,17 +16,26 @@
   import { viewSchema } from './data';
 
   import { sysTenantDetail } from '/@/api/sys/sysTenantApi';
+  import { listDictModel } from '/@/api/common';
+  import { formatDictValue } from '/@/utils';
 
   const descData = ref({});
-  const getTitle = '查看租户表';
+  const getTitle = '查看租户列表';
   const width = '45%';
 
-  onBeforeMount(async () => {});
+  const typeOptions = ref();
+  const disableOptions = ref();
+  onBeforeMount(async () => {
+    typeOptions.value = await listDictModel({ dictCode: 'sys_create_type' });
+    disableOptions.value = await listDictModel({ dictCode: 'sys_disable_type' });
+  });
   const [registerDrawer] = useDrawerInner(async data => {
     console.log('::::::::::', data.record);
     const resData = await sysTenantDetail(data.record.id);
     descData.value = {
       ...resData,
+      type: formatDictValue(typeOptions.value, resData.type),
+      disable: formatDictValue(disableOptions.value, resData.disable),
     };
   });
   const [registerDesc] = useDescription({