Merge branch 'master' of http://182.92.163.198:3000/18610965287/hand_device

web/src/api/system/tenant/index.ts

@@ -2,17 +2,18 @@ import request from '@/config/axios'
 
 export interface TenantVO {
   id: number
-  name: string
-  contactName: string
-  contactMobile: string
-  status: number
-  domain: string
-  packageId: number
-  username: string
-  password: string
-  expireTime: Date
-  accountCount: number
-  createTime: Date
+  name?: string
+  contactName?: string
+  contactMobile?: string
+  status?: number
+  domain?: string
+  packageId?: number
+  username?: string
+  password?: string
+  expireTime?: Date
+  accountCount?: number
+  address?: string
+  createTime?: Date
 }
 
 export interface TenantPageReqVO extends PageParam {

web/src/views/system/tenant/TenantForm.vue

@@ -57,6 +57,9 @@
       <el-form-item label="绑定域名" prop="website">
         <el-input v-model="formData.website" placeholder="请输入绑定域名" />
       </el-form-item>
+      <el-form-item label="地址" prop="address">
+        <el-input v-model="formData.address" placeholder="请输入地址" />
+      </el-form-item>
       <el-form-item label="租户状态" prop="status">
         <el-radio-group v-model="formData.status">
           <el-radio
@@ -98,6 +101,7 @@ const formData = ref({
   accountCount: undefined,
   expireTime: undefined,
   website: undefined,
+  address: undefined,
   status: CommonStatusEnum.ENABLE,
   // 新增专属
   username: undefined,
@@ -174,6 +178,7 @@ const resetForm = () => {
     accountCount: undefined,
     expireTime: undefined,
     website: undefined,
+    address: undefined,
     status: CommonStatusEnum.ENABLE,
     username: undefined,
     password: undefined

web/src/views/system/tenant/index.vue

@@ -137,6 +137,7 @@
         :formatter="dateFormatter"
       />
       <el-table-column label="绑定域名" align="center" prop="website" width="180" />
+      <el-table-column label="地址" align="center" prop="address" min-width="150" />
       <el-table-column label="租户状态" align="center" prop="status">
         <template #default="scope">
           <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status" />