租户实例修改

src/views/system/tenantInstance/TenantInstanceForm.vue

@@ -77,6 +77,16 @@
           <el-option label="禁用" :value="1" />
         </el-select>
       </el-form-item>
+      <el-form-item label="租户分销套餐包" prop="distributionPackageId">
+        <el-select v-model="formData.distributionPackageId" placeholder="请选择租户分销套餐包" clearable>
+          <el-option
+            v-for="distPkg in filteredTenantPackageList"
+            :key="distPkg.id"
+            :label="distPkg.name"
+            :value="distPkg.id"
+          />
+        </el-select>
+      </el-form-item>
     </el-form>
     <template #footer>
       <span class="dialog-footer">
@@ -125,6 +135,7 @@ const formData = ref<any>({
   tenantId: 0,
   packageId: 0,
   serviceId: 0,
+  distributionPackageId: 0,
   instanceName: '',
   instanceType: 0,
   instanceIcon: '',
@@ -145,6 +156,7 @@ const formRules = reactive({
   tenantId: [{ required: true, message: '租户不能为空', trigger: 'blur' }],
   packageId: [{ required: true, message: '租户套餐包不能为空', trigger: 'blur' }],
   serviceId: [{ required: true, message: '服务不能为空', trigger: 'blur' }],
+  distributionPackageId: [{ required: false, message: '租户分销套餐包不能为空', trigger: 'blur' }],
   instanceName: [{ required: true, message: '实例名称不能为空', trigger: 'blur' }],
   instanceType: [{ required: true, message: '实例类型不能为空', trigger: 'blur' }],
   contactPhone: [{ required: true, message: '联系电话不能为空', trigger: 'blur' }],
@@ -156,6 +168,8 @@ const formRules = reactive({
 })
 // 租户套餐包列表
 const tenantPackageList = ref<any[]>([])
+// 分销套餐包列表
+const distributionPackageList = ref<any[]>([])
 // 表单的引用
 const formRef = ref<any>()
 const message = useMessage() // 消息弹窗
@@ -185,6 +199,18 @@ const loadTenantPackages = async () => {
   }
 }
 
+// 加载分销套餐包列表
+const loadDistributionPackages = async () => {
+  try {
+    // 假设使用相同的API获取分销套餐包列表
+    // 实际项目中可能需要调用不同的API
+    const data = await TenantPackageApi.getTenantPackageList()
+    distributionPackageList.value = data
+  } catch (error) {
+    console.error('加载分销套餐包列表失败:', error)
+  }
+}
+
 // 打开弹窗
 const open = (type: string, id?: number) => {
   formState.value = type
@@ -198,6 +224,8 @@ const open = (type: string, id?: number) => {
   }
   // 加载租户套餐包列表
   loadTenantPackages()
+  // 加载分销套餐包列表
+  loadDistributionPackages()
   // 显示弹窗
   visible.value = true
 }
@@ -209,6 +237,7 @@ const resetForm = () => {
     tenantId: 0,
     packageId: 0,
     serviceId: 0,
+    distributionPackageId: 0,
     instanceName: '',
     instanceType: 0,
     instanceIcon: '',

src/views/system/tenantInstance/index.vue

@@ -145,6 +145,7 @@
         </template>
       </el-table-column>
       <el-table-column label="数据库" align="center" prop="dbName" />
+      <!-- <el-table-column label="租户分销套餐包" align="center" prop="distributionPackageId" /> -->
       <el-table-column label="状态" align="center" prop="status">
         <template #default="scope">
           <el-tag :type="getStatusTagType(scope.row.status)">