From c57fea9c255eb808ccd0f6bb728070a63a92bb8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Sun, 23 Oct 2022 00:24:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=A7=9F=E6=88=B7=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jshERP-web/src/views/system/TenantList.vue          | 11 ++++++-----
 jshERP-web/src/views/system/modules/TenantModal.vue |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/jshERP-web/src/views/system/TenantList.vue b/jshERP-web/src/views/system/TenantList.vue
index 7d0405b1..91f5f352 100644
--- a/jshERP-web/src/views/system/TenantList.vue
+++ b/jshERP-web/src/views/system/TenantList.vue
@@ -14,7 +14,7 @@
               <a-col :md="6" :sm="24">
                 <a-form-item label="租户类型" :labelCol="labelCol" :wrapperCol="wrapperCol">
                   <a-select v-model="queryParam.type" placeholder="请选择租户类型">
-                    <a-select-option value="0">免费租户</a-select-option>
+                    <a-select-option value="0">试用租户</a-select-option>
                     <a-select-option value="1">付费租户</a-select-option>
                   </a-select>
                 </a-form-item>
@@ -69,7 +69,7 @@
             </span>
             <!-- 状态渲染模板 -->
             <template slot="customRenderType" slot-scope="type">
-              <a-tag v-if="type==0">免费租户</a-tag>
+              <a-tag v-if="type==0">试用租户</a-tag>
               <a-tag v-if="type==1" color="green">付费租户</a-tag>
             </template>
             <template slot="customRenderEnabled" slot-scope="enabled">
@@ -129,11 +129,12 @@
             width: 100
           },
           { title: '登录名称', dataIndex: 'loginName', width: 100, align: "center"},
-          { title: '用户数量限制', dataIndex: 'userNumLimit', width: 100, align: "center"},
-          { title: '租户类型',dataIndex: 'type',width:70,align:"center",
+          { title: '用户数量', dataIndex: 'userCount', width: 60, align: "center"},
+          { title: '用户数量限制', dataIndex: 'userNumLimit', width: 80, align: "center"},
+          { title: '租户类型',dataIndex: 'type',width:60,align:"center",
             scopedSlots: { customRender: 'customRenderType' }
           },
-          { title: '租户状态',dataIndex: 'enabled',width:70,align:"center",
+          { title: '租户状态',dataIndex: 'enabled',width:60,align:"center",
             scopedSlots: { customRender: 'customRenderEnabled' }
           },
           { title: '创建时间', dataIndex: 'createTimeStr', width: 100, align: "center"},
diff --git a/jshERP-web/src/views/system/modules/TenantModal.vue b/jshERP-web/src/views/system/modules/TenantModal.vue
index 84d4a320..1b5b79b5 100644
--- a/jshERP-web/src/views/system/modules/TenantModal.vue
+++ b/jshERP-web/src/views/system/modules/TenantModal.vue
@@ -20,7 +20,7 @@
         </a-form-item>
         <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="租户类型">
           <a-select style="width:100%" placeholder="请选择租户类型" v-decorator.trim="[ 'type' ]">
-            <a-select-option value="0">免费租户</a-select-option>
+            <a-select-option value="0">试用租户</a-select-option>
             <a-select-option value="1">付费租户</a-select-option>
           </a-select>
         </a-form-item>