From cb790f86d04bc2fb771fe715cf6d8dd5c930450e Mon Sep 17 00:00:00 2001
From: jiangzhe <244140623@qq.com>
Date: Thu, 4 Jul 2024 10:54:32 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E5=A4=8D=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/system/tenant/types.ts                |  2 ++
 .../catalogPerson/components/FileList.vue     |  2 +-
 src/views/system/tenant/index.vue             | 26 ++++++++++++++++---
 3 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/src/api/system/tenant/types.ts b/src/api/system/tenant/types.ts
index 25395fa..4df5785 100644
--- a/src/api/system/tenant/types.ts
+++ b/src/api/system/tenant/types.ts
@@ -43,4 +43,6 @@ export interface TenantForm {
   expireTime: string;
   accountCount: number;
   status: string;
+  personTotalVolume: string;
+  schoolTotalVolume: string;
 }
diff --git a/src/views/resource/catalogPerson/components/FileList.vue b/src/views/resource/catalogPerson/components/FileList.vue
index 9774680..07088c5 100644
--- a/src/views/resource/catalogPerson/components/FileList.vue
+++ b/src/views/resource/catalogPerson/components/FileList.vue
@@ -44,7 +44,7 @@
         <el-table-column label="课件名" align="center" prop="fileName" width="240" />
         <el-table-column label="课件格式" align="center" prop="fileSuffix" />
         <el-table-column label="课件大小" align="center" prop="volume" />
-        <el-table-column label="创建人" align="center" prop="createBy" />
+        <!-- <el-table-column label="创建人" align="center" prop="createBy" /> -->
         <el-table-column label="创建时间" align="center" prop="createTime">
           <template #default="scope">
             <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
diff --git a/src/views/system/tenant/index.vue b/src/views/system/tenant/index.vue
index 5e7cc1f..e65b185 100644
--- a/src/views/system/tenant/index.vue
+++ b/src/views/system/tenant/index.vue
@@ -128,6 +128,18 @@
         <el-form-item label="绑定域名" prop="domain">
           <el-input v-model="form.domain" placeholder="请输入绑定域名" />
         </el-form-item>
+        <el-form-item v-if="isAdd" label="我的空间" prop="personTotalVolume">
+          <el-select v-model="form.personTotalVolume" placeholder="请选择">
+            <el-option v-for="dict in sys_volume_type" :key="dict.value" :label="dict.label"
+              :value="dict.value"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item v-if="isAdd" label="学校资源" prop="schoolTotalVolume">
+          <el-select v-model="form.schoolTotalVolume" placeholder="请选择">
+            <el-option v-for="dict in sys_volume_type" :key="dict.value" :label="dict.label"
+              :value="dict.value"></el-option>
+          </el-select>
+        </el-form-item>
       </el-form>
       <template #footer>
         <div class="dialog-footer">
@@ -147,6 +159,8 @@ import { TenantPkgVO } from '@/api/system/tenantPackage/types';
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 
+const { sys_volume_type } = toRefs<any>(proxy?.useDict('sys_volume_type'));
+
 const tenantList = ref<TenantVO[]>([]);
 const packageList = ref<TenantPkgVO[]>([]);
 const buttonLoading = ref(false);
@@ -164,7 +178,7 @@ const dialog = reactive<DialogOption>({
   visible: false,
   title: ''
 });
-
+const isAdd = ref(true)
 const initFormData: TenantForm = {
   id: undefined,
   tenantId: undefined,
@@ -181,7 +195,9 @@ const initFormData: TenantForm = {
   packageId: '',
   expireTime: '',
   accountCount: 0,
-  status: '0'
+  status: '0',
+  personTotalVolume: '',
+  schoolTotalVolume: ''
 };
 const data = reactive<PageData<TenantForm, TenantQuery>>({
   form: { ...initFormData },
@@ -206,7 +222,9 @@ const data = reactive<PageData<TenantForm, TenantQuery>>({
     password: [
       { required: true, message: '密码不能为空', trigger: 'blur' },
       { min: 5, max: 20, message: '用户密码长度必须介于 5 和 20 之间', trigger: 'blur' }
-    ]
+    ],
+    personTotalVolume: [{ required: isAdd.value, message: '我的空间不能为空', trigger: 'blur' }],
+    schoolTotalVolume: [{ required: isAdd.value, message: '学校资源不能为空', trigger: 'blur' }]
   }
 });
 
@@ -276,6 +294,7 @@ const handleAdd = () => {
   getTenantPackage();
   dialog.visible = true;
   dialog.title = '添加租户';
+  isAdd.value = true
 };
 
 /** 修改按钮操作 */
@@ -287,6 +306,7 @@ const handleUpdate = async (row?: TenantVO) => {
   Object.assign(form.value, res.data);
   dialog.visible = true;
   dialog.title = '修改租户';
+  isAdd.value = false
 };
 
 /** 提交按钮 */