From ef7327438edee7d813bba44e56edc276073230ff Mon Sep 17 00:00:00 2001
From: huk <hu_care_you@163.com>
Date: Sat, 13 Sep 2025 12:33:29 +0800
Subject: [PATCH] =?UTF-8?q?feat(system):=20=E5=A2=9E=E5=8A=A0=E7=A7=9F?=
 =?UTF-8?q?=E6=88=B7=E5=A5=97=E9=A4=90=E7=B1=BB=E5=9E=8B=E7=AD=9B=E9=80=89?=
 =?UTF-8?q?=E5=92=8C=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在租户套餐列表中添加套餐类型筛选功能
- 在租户套餐表中增加套餐类型列- 在租户套餐表单中添加套餐类型选择框
- 更新相关接口定义，增加 tenantType 字段
---
 src/api/system/tenantPackage/types.ts    |  3 +++
 src/views/agent/index.vue                |  2 +-
 src/views/system/tenantPackage/index.vue | 23 ++++++++++++++++++++++-
 3 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/src/api/system/tenantPackage/types.ts b/src/api/system/tenantPackage/types.ts
index c24b8fc..84d84ff 100644
--- a/src/api/system/tenantPackage/types.ts
+++ b/src/api/system/tenantPackage/types.ts
@@ -1,5 +1,6 @@
 export interface TenantPkgVO extends BaseEntity {
   packageId: string | number;
+  tenantType: number;
   packageName: string;
   menuIds: string;
   remark: string;
@@ -9,11 +10,13 @@ export interface TenantPkgVO extends BaseEntity {
 
 export interface TenantPkgQuery extends PageQuery {
   packageName: string;
+  tenantType: number;
 }
 
 export interface TenantPkgForm {
   packageId: string | number | undefined;
   packageName: string;
+  tenantType: number;
   menuIds: string;
   remark: string;
   menuCheckStrictly: boolean;
diff --git a/src/views/agent/index.vue b/src/views/agent/index.vue
index a9d36f7..23c955f 100644
--- a/src/views/agent/index.vue
+++ b/src/views/agent/index.vue
@@ -584,7 +584,7 @@ const initFormData: TenantForm = {
   otherAttachment: '',
   // 签约状态
   signStatus: '0',
-  type: 1
+  type: 3
 };
 
 const data = reactive<PageData<TenantForm, TenantQuery>>({
diff --git a/src/views/system/tenantPackage/index.vue b/src/views/system/tenantPackage/index.vue
index 0a442f0..e4863e1 100644
--- a/src/views/system/tenantPackage/index.vue
+++ b/src/views/system/tenantPackage/index.vue
@@ -7,6 +7,12 @@
             <el-form-item label="套餐名称" prop="packageName">
               <el-input v-model="queryParams.packageName" placeholder="请输入套餐名称" clearable @keyup.enter="handleQuery" />
             </el-form-item>
+            <el-form-item label="套餐类型" prop="tenantType">
+              <el-select v-model="queryParams.tenantType" placeholder="请选择套餐类型" clearable>
+                <el-option label="代理租户" value="3"></el-option>
+                <el-option label="店铺租户" value="2"></el-option>
+              </el-select>
+            </el-form-item>
             <el-form-item>
               <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
               <el-button icon="Refresh" @click="resetQuery">重置</el-button>
@@ -43,6 +49,13 @@
         <el-table-column type="selection" width="55" align="center" />
         <el-table-column v-if="false" label="租户套餐id" align="center" prop="packageId" />
         <el-table-column label="套餐名称" align="center" prop="packageName" />
+        <el-table-column label="套餐类型" align="center" prop="tenantType">
+          <template #default="scope">
+            <span v-if="scope.row.tenantType === 3">代理租户</span>
+            <span v-else-if="scope.row.tenantType === 2">店铺租户</span>
+            <span v-else>{{ scope.row.tenantType }}</span>
+          </template>
+        </el-table-column>
         <el-table-column label="备注" align="center" prop="remark" />
         <el-table-column label="状态" align="center" prop="status">
           <template #default="scope">
@@ -70,6 +83,12 @@
         <el-form-item label="套餐名称" prop="packageName">
           <el-input v-model="form.packageName" placeholder="请输入套餐名称" />
         </el-form-item>
+        <el-form-item label="套餐类型" prop="tenantType">
+          <el-select v-model="form.tenantType" placeholder="请选择套餐类型" clearable>
+            <el-option label="代理租户" :value="3"></el-option>
+            <el-option label="店铺租户" :value="2"></el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item label="关联菜单">
           <el-checkbox v-model="menuExpand" @change="handleCheckedTreeExpand($event, 'menu')">展开/折叠</el-checkbox>
           <el-checkbox v-model="menuNodeAll" @change="handleCheckedTreeNodeAll($event, 'menu')">全选/全不选 </el-checkbox>
@@ -139,6 +158,7 @@ const dialog = reactive<DialogOption>({
 const initFormData: TenantPkgForm = {
   packageId: undefined,
   packageName: '',
+  tenantType: undefined,
   menuIds: '',
   remark: '',
   menuCheckStrictly: true
@@ -148,7 +168,8 @@ const data = reactive<PageData<TenantPkgForm, TenantPkgQuery>>({
   queryParams: {
     pageNum: 1,
     pageSize: 10,
-    packageName: ''
+    packageName: '',
+    tenantType: undefined
   },
   rules: {
     packageId: [{ required: true, message: '租户套餐id不能为空', trigger: 'blur' }],