!40 Vue3 重构：系统管理->租户管理:租户列表

Merge pull request !40 from 东方白/dev

src/views/system/tenant/form.vue

@@ -0,0 +1,204 @@
+<template>
+  <Dialog :title="modelTitle" v-model="modelVisible" width="50%">
+    <el-form
+      ref="formRef"
+      :model="formData"
+      :rules="formRules"
+      label-width="80px"
+      v-loading="formLoading"
+    >
+      <el-row>
+        <el-col :span="10">
+          <el-form-item label="租户名" prop="name">
+            <el-input v-model="formData.name" placeholder="请输入租户名" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="10" :offset="2">
+          <el-form-item label="租户套餐" prop="packageId">
+            <el-select v-model="formData.packageId" placeholder="请选择租户套餐" clearable>
+              <el-option
+                v-for="item in packageList"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="10">
+          <el-form-item label="联系人" prop="contactName">
+            <el-input v-model="formData.contactName" placeholder="请输入联系人" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="10" :offset="2">
+          <el-form-item label="联系手机" prop="contactMobile">
+            <el-input v-model="formData.contactMobile" placeholder="请输入联系手机" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="10">
+          <el-form-item v-if="formData.id === undefined" label="用户名称" prop="username">
+            <el-input v-model="formData.username" placeholder="请输入用户名称" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="10" :offset="2">
+          <el-form-item v-if="formData.id === undefined" label="用户密码" prop="password">
+            <el-input
+              v-model="formData.password"
+              placeholder="请输入用户密码"
+              type="password"
+              show-password
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="10">
+          <el-form-item label="账号额度" prop="accountCount">
+            <el-input-number
+              v-model="formData.accountCount"
+              placeholder="请输入账号额度"
+              controls-position="right"
+              :min="0"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="10" :offset="2">
+          <el-form-item label="过期时间" prop="expireTime">
+            <el-date-picker
+              clearable
+              v-model="formData.expireTime"
+              type="date"
+              value-format="x"
+              placeholder="请选择过期时间"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="10">
+          <el-form-item label="绑定域名" prop="domain">
+            <el-input v-model="formData.domain" placeholder="请输入绑定域名" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="10" :offset="2">
+          <el-form-item label="租户状态" prop="status">
+            <el-radio-group v-model="formData.status">
+              <el-radio
+                v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
+                :key="dict.value"
+                :label="dict.value"
+                >{{ dict.label }}
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
+        <el-button @click="modelVisible = false">取 消</el-button>
+      </div>
+    </template>
+  </Dialog>
+</template>
+<script setup lang="ts">
+import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
+import * as TenantApi from '@/api/system/tenant'
+import { CommonStatusEnum } from '@/utils/constants'
+import { getTenantPackageList as getTenantPackageListApi } from '@/api/system/tenantPackage'
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+const modelVisible = ref(false) // 弹窗的是否展示
+const modelTitle = ref('') // 弹窗的标题
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formType = ref('') // 表单的类型：create - 新增；update - 修改
+const formData = ref({
+  id: undefined,
+  name: undefined,
+  packageId: undefined,
+  contactName: undefined,
+  contactMobile: undefined,
+  accountCount: undefined,
+  expireTime: undefined,
+  domain: undefined,
+  status: CommonStatusEnum.ENABLE
+})
+const formRules = reactive({
+  name: [{ required: true, message: '租户名不能为空', trigger: 'blur' }],
+  packageId: [{ required: true, message: '租户套餐不能为空', trigger: 'blur' }],
+  contactName: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
+  status: [{ required: true, message: '租户状态不能为空', trigger: 'blur' }],
+  accountCount: [{ required: true, message: '账号额度不能为空', trigger: 'blur' }],
+  expireTime: [{ required: true, message: '过期时间不能为空', trigger: 'blur' }],
+  domain: [{ required: true, message: '绑定域名不能为空', trigger: 'blur' }]
+})
+const formRef = ref() // 表单 Ref
+const packageList = ref([]) // 租户套餐
+
+/** 打开弹窗 */
+const openModal = async (type: string, id?: number) => {
+  modelVisible.value = true
+  modelTitle.value = t('action.' + type)
+  formType.value = type
+  resetForm()
+  // 修改时，设置数据
+  if (id) {
+    formLoading.value = true
+    try {
+      formData.value = await TenantApi.getTenantApi(id)
+    } finally {
+      formLoading.value = false
+    }
+  }
+  packageList.value = await getTenantPackageListApi()
+}
+defineExpose({ openModal }) // 提供 openModal 方法，用于打开弹窗
+
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitForm = async () => {
+  // 校验表单
+  if (!formRef) return
+  const valid = await formRef.value.validate()
+  if (!valid) return
+  // 提交请求
+  formLoading.value = true
+  try {
+    const data = formData.value as unknown as TenantApi.TenantVO
+    if (formType.value === 'create') {
+      await TenantApi.createTenantApi(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await TenantApi.updateTenantApi(data)
+      message.success(t('common.updateSuccess'))
+    }
+    modelVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    id: undefined,
+    name: undefined,
+    packageId: undefined,
+    contactName: undefined,
+    contactMobile: undefined,
+    accountCount: undefined,
+    expireTime: undefined,
+    domain: undefined,
+    status: CommonStatusEnum.ENABLE
+  }
+  formRef.value?.resetFields()
+}
+</script>

src/views/system/tenant/index.vue

@@ -1,197 +1,255 @@
 <template>
-  <ContentWrap>
+  <!-- 搜索 -->
-    <!-- 列表 -->
+  <content-wrap>
-    <XTable @register="registerTable">
+    <el-form class="-mb-15px" :model="queryParams" ref="queryFormRef" :inline="true">
-      <template #toolbar_buttons>
+      <el-form-item label="租户名" prop="name">
-        <!-- 操作：新增 -->
+        <el-input
-        <XButton
+          v-model="queryParams.name"
-          type="primary"
+          placeholder="请输入租户名"
-          preIcon="ep:zoom-in"
+          clearable
-          :title="t('action.add')"
+          @keyup.enter="handleQuery"
-          v-hasPermi="['system:tenant:create']"
-          @click="handleCreate()"
-        />
-        <XButton
-          type="warning"
-          preIcon="ep:download"
-          :title="t('action.export')"
-          v-hasPermi="['system:tenant:export']"
-          @click="exportList('租户列表.xls')"
         />
-      </template>
+      </el-form-item>
-      <template #accountCount_default="{ row }">
+      <el-form-item label="联系人" prop="contactName">
-        <el-tag> {{ row.accountCount }} </el-tag>
+        <el-input
-      </template>
+          v-model="queryParams.contactName"
-      <template #packageId_default="{ row }">
+          placeholder="请输入联系人"
-        <el-tag v-if="row.packageId === 0" type="danger">系统租户</el-tag>
+          clearable
-        <el-tag v-else type="success"> {{ getPackageName(row.packageId) }} </el-tag>
+          @keyup.enter="handleQuery"
-      </template>
-      <template #actionbtns_default="{ row }">
-        <!-- 操作：修改 -->
-        <XTextButton
-          preIcon="ep:edit"
-          :title="t('action.edit')"
-          v-hasPermi="['system:tenant:update']"
-          @click="handleUpdate(row.id)"
         />
-        <!-- 操作：详情 -->
+      </el-form-item>
-        <XTextButton
+      <el-form-item label="联系手机" prop="contactMobile">
-          preIcon="ep:view"
+        <el-input
-          :title="t('action.detail')"
+          v-model="queryParams.contactMobile"
-          v-hasPermi="['system:tenant:update']"
+          placeholder="请输入联系手机"
-          @click="handleDetail(row.id)"
+          clearable
+          @keyup.enter="handleQuery"
         />
-        <!-- 操作：删除 -->
+      </el-form-item>
-        <XTextButton
+      <el-form-item label="租户状态" prop="status">
-          preIcon="ep:delete"
+        <el-select v-model="queryParams.status" placeholder="请选择租户状态" clearable>
-          :title="t('action.del')"
+          <el-option
-          v-hasPermi="['system:tenant:delete']"
+            v-for="dict in getDictOptions(DICT_TYPE.COMMON_STATUS)"
-          @click="deleteData(row.id)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="创建时间" prop="createTime">
+        <el-date-picker
+          v-model="queryParams.createTime"
+          value-format="YYYY-MM-DD HH:mm:ss"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
         />
-      </template>
+      </el-form-item>
-    </XTable>
+
-  </ContentWrap>
+      <el-form-item>
-  <XModal v-model="dialogVisible" :title="dialogTitle">
+        <el-button @click="handleQuery">
-    <!-- 对话框(添加 / 修改) -->
+          <Icon icon="ep:search" class="mr-5px" />
-    <Form
+          搜索
-      v-if="['create', 'update'].includes(actionType)"
+        </el-button>
-      :schema="allSchemas.formSchema"
+        <el-button @click="resetQuery">
-      :rules="rules"
+          <Icon icon="ep:refresh" class="mr-5px" />
-      ref="formRef"
+          重置
-    />
+        </el-button>
-    <!-- 对话框(详情) -->
+        <el-button
-    <Descriptions
+          type="primary"
-      v-if="actionType === 'detail'"
+          @click="openModal('create')"
-      :schema="allSchemas.detailSchema"
+          v-hasPermi="['system:tenant:create']"
-      :data="detailData"
+        >
-    >
+          <Icon icon="ep:plus" class="mr-5px" />
-      <template #packageId="{ row }">
+          新增
-        <el-tag v-if="row.packageId === 0" type="danger">系统租户</el-tag>
+        </el-button>
-        <el-tag v-else type="success"> {{ getPackageName(row.packageId) }} </el-tag>
+        <el-button
-      </template>
+          type="success"
-    </Descriptions>
+          plain
-    <!-- 操作按钮 -->
+          @click="handleExport"
-    <template #footer>
+          :loading="exportLoading"
-      <!-- 按钮：保存 -->
+          v-hasPermi="['system:tenant:export']"
-      <XButton
+        >
-        v-if="['create', 'update'].includes(actionType)"
+          <Icon icon="ep:download" class="mr-5px" />
-        type="primary"
+          导出
-        :title="t('action.save')"
+        </el-button>
-        :loading="actionLoading"
+      </el-form-item>
-        @click="submitForm()"
+    </el-form>
+  </content-wrap>
+
+  <!-- 列表 -->
+  <content-wrap>
+    <el-table v-loading="loading" :data="list" align="center">
+      <el-table-column label="租户编号" align="center" prop="id" />
+      <el-table-column label="租户名" align="center" prop="name" />
+      <el-table-column label="租户套餐" align="center" prop="packageId">
+        <template #default="scope">
+          <el-tag v-if="scope.row.packageId === 0" type="danger">系统租户</el-tag>
+          <template v-else v-for="item in packageList">
+            <el-tag type="success" :key="item.id" v-if="item.id === scope.row.packageId"
+              >{{ item.name }}
+            </el-tag>
+          </template>
+        </template>
+      </el-table-column>
+      <el-table-column label="联系人" align="center" prop="contactName" />
+      <el-table-column label="联系手机" align="center" prop="contactMobile" />
+      <el-table-column label="账号额度" align="center" prop="accountCount">
+        <template #default="scope">
+          <el-tag>{{ scope.row.accountCount }}</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="过期时间"
+        align="center"
+        prop="expireTime"
+        width="180"
+        :formatter="dateFormatter"
+      />
+      <el-table-column label="绑定域名" align="center" prop="domain" width="180" />
+      <el-table-column label="租户状态" align="center" prop="status">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status" />
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="创建时间"
+        align="center"
+        prop="createTime"
+        width="180"
+        :formatter="dateFormatter"
       />
-      <!-- 按钮：关闭 -->
+      <el-table-column label="操作" align="center" min-width="110" fixed="right">
-      <XButton :loading="actionLoading" :title="t('dialog.close')" @click="dialogVisible = false" />
+        <template #default="scope">
-    </template>
+          <el-button
-  </XModal>
+            link
+            type="primary"
+            @click="openModal('update', scope.row.id)"
+            v-hasPermi="['system:tenant:update']"
+          >
+            编辑
+          </el-button>
+          <el-button
+            link
+            type="danger"
+            @click="handleDelete(scope.row.id)"
+            v-hasPermi="['system:tenant:delete']"
+          >
+            删除
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页 -->
+    <Pagination
+      :total="total"
+      v-model:page="queryParams.pageNo"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getList"
+    />
+  </content-wrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <tenant-form ref="modalRef" @success="getList" />
 </template>
 <script setup lang="ts" name="Tenant">
-import type { FormExpose } from '@/components/Form'
+import { DICT_TYPE, getDictOptions } from '@/utils/dict'
+import { dateFormatter } from '@/utils/formatTime'
+import download from '@/utils/download'
 import * as TenantApi from '@/api/system/tenant'
-import { rules, allSchemas, tenantPackageOption } from './tenant.data'
+import { getTenantPackageList as getTenantPackageListApi } from '@/api/system/tenantPackage'
+import TenantForm from './form.vue'
+import ContentWrap from '@/components/ContentWrap/src/ContentWrap.vue'
+import DictTag from '@/components/DictTag/src/DictTag.vue'
 
-const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
-// 列表相关的变量
+const { t } = useI18n() // 国际化
-const [registerTable, { reload, deleteData, exportList }] = useXTable({
+
-  allSchemas: allSchemas,
+const loading = ref(true) // 列表的加载中
-  getListApi: TenantApi.getTenantPageApi,
+const total = ref(0) // 列表的总页数
-  deleteApi: TenantApi.deleteTenantApi,
+const list = ref([]) // 列表的数据
-  exportListApi: TenantApi.exportTenantApi
+const packageList = ref([]) //租户套餐列表
-})
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  name: undefined,
+  contactName: undefined,
+  contactMobile: undefined,
+  status: undefined,
+  createTime: []
+}) //查询参数对象
+const queryFormRef = ref() // 搜索的表单
+const exportLoading = ref(false) // 导出的加载中
 
-const actionLoading = ref(false) // 遮罩层
+/** 查询参数列表 */
-const actionType = ref('') // 操作按钮的类型
+const getList = async () => {
-const dialogVisible = ref(false) // 是否显示弹出层
+  loading.value = true
-const dialogTitle = ref('edit') // 弹出层标题
+  try {
-const formRef = ref<FormExpose>() // 表单 Ref
+    const data = await TenantApi.getTenantPageApi(queryParams)
-const detailData = ref() // 详情 Ref
+    list.value = data.list
-const getPackageName = (packageId: number) => {
+    total.value = data.total
-  for (let item of tenantPackageOption) {
+  } finally {
-    if (item.value === packageId) {
+    loading.value = false
-      return item.label
-    }
   }
-  return '未知套餐'
 }
 
-// 设置标题
+/** 搜索按钮操作 */
-const setDialogTile = (type: string) => {
+const handleQuery = () => {
-  dialogTitle.value = t('action.' + type)
+  queryParams.pageNo = 1
-  actionType.value = type
+  getList()
-  dialogVisible.value = true
 }
 
-// 新增操作
+/** 重置按钮操作 */
-const handleCreate = async () => {
+const resetQuery = () => {
-  // 重置表单
+  queryFormRef.value.resetFields()
-  setDialogTile('create')
+  handleQuery()
-  await nextTick()
-  console.log(allSchemas.formSchema, 'allSchemas.formSchema')
-  if (allSchemas.formSchema[4].field !== 'username') {
-    unref(formRef)?.addSchema(
-      {
-        field: 'username',
-        label: '用户名称',
-        component: 'Input'
-      },
-      0
-    )
-    unref(formRef)?.addSchema(
-      {
-        field: 'password',
-        label: '用户密码',
-        component: 'InputPassword'
-      },
-      1
-    )
-  }
 }
 
-// 修改操作
+/** 添加/修改操作 */
-const handleUpdate = async (rowId: number) => {
+const modalRef = ref()
-  setDialogTile('update')
+const openModal = (type: string, id?: number) => {
-  await nextTick()
+  modalRef.value.openModal(type, id)
-  unref(formRef)?.delSchema('username')
-  unref(formRef)?.delSchema('password')
-  // 设置数据
-  const res = await TenantApi.getTenantApi(rowId)
-  unref(formRef)?.setValues(res)
 }
 
-// 详情操作
+/** 删除按钮操作 */
-const handleDetail = async (rowId: number) => {
+const handleDelete = async (id: number) => {
-  // 设置数据
+  try {
-  const res = await TenantApi.getTenantApi(rowId)
+    // 删除的二次确认
-  detailData.value = res
+    await message.delConfirm()
-  setDialogTile('detail')
+    // 发起删除
+    await TenantApi.deleteTenantApi(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
 }
 
-// 提交按钮
+/** 导出按钮操作 */
-const submitForm = async () => {
+const handleExport = async () => {
-  const elForm = unref(formRef)?.getElFormRef()
+  try {
-  if (!elForm) return
+    // 导出的二次确认
-  elForm.validate(async (valid) => {
+    await message.exportConfirm()
-    if (valid) {
+    // 发起导出
-      actionLoading.value = true
+    exportLoading.value = true
-      // 提交请求
+    const data = await TenantApi.exportTenantApi(queryParams)
-      try {
+    download.excel(data, '参数配置.xls')
-        const data = unref(formRef)?.formModel as TenantApi.TenantVO
+  } catch {
-        if (actionType.value === 'create') {
+  } finally {
-          await TenantApi.createTenantApi(data)
+    exportLoading.value = false
-          message.success(t('common.createSuccess'))
+  }
-        } else {
+}
-          await TenantApi.updateTenantApi(data)
+
-          message.success(t('common.updateSuccess'))
+/**获取租户套餐**/
-        }
+const getTenantPackageList = async () => {
-        // 操作成功，重新加载列表
+  const data = await getTenantPackageListApi()
-        dialogVisible.value = false
+  packageList.value = data
-      } finally {
-        actionLoading.value = false
-        // 刷新列表
-        await reload()
-      }
-    }
-  })
 }
+
+/** 初始化 **/
+onMounted(() => {
+  getList()
+  getTenantPackageList()
+})
 </script>