From 6dc9f5acbbc307eed2c0378b0598caa3715f0b3f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Wed, 13 Oct 2021 00:48:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=A7=9F=E6=88=B7=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=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          |  1 +
 jshERP-web/src/views/system/modules/TenantModal.vue | 11 +++++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/jshERP-web/src/views/system/TenantList.vue b/jshERP-web/src/views/system/TenantList.vue
index 7aa03c24..09225f69 100644
--- a/jshERP-web/src/views/system/TenantList.vue
+++ b/jshERP-web/src/views/system/TenantList.vue
@@ -130,6 +130,7 @@
           },
           { title: '创建时间', dataIndex: 'createTimeStr', width: 100, align: "center"},
           { title: '到期时间', dataIndex: 'expireTimeStr', width: 100, align: "center"},
+          { title: '描述', dataIndex: 'remark', width: 200, align: "center", ellipsis:true},
           {
             title: '操作',
             dataIndex: 'action',
diff --git a/jshERP-web/src/views/system/modules/TenantModal.vue b/jshERP-web/src/views/system/modules/TenantModal.vue
index 7abd9c8f..c468e4d9 100644
--- a/jshERP-web/src/views/system/modules/TenantModal.vue
+++ b/jshERP-web/src/views/system/modules/TenantModal.vue
@@ -16,16 +16,19 @@
                    suffix="初始密码：123456" />
         </a-form-item>
         <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="用户数量限制">
-          <a-input-number style="width:60%" placeholder="请输入用户数量限制" v-decorator.trim="[ 'userNumLimit' ]" />
+          <a-input-number style="width:100%" placeholder="请输入用户数量限制" v-decorator.trim="[ 'userNumLimit' ]" />
         </a-form-item>
         <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="租户类型">
-          <a-select style="width:60%" placeholder="请选择租户类型" v-decorator.trim="[ 'type' ]">
+          <a-select style="width:100%" placeholder="请选择租户类型" v-decorator.trim="[ 'type' ]">
             <a-select-option value="0">免费租户</a-select-option>
             <a-select-option value="1">付费租户</a-select-option>
           </a-select>
         </a-form-item>
         <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="到期时间">
-          <j-date style="width:60%" placeholder="请选择到期时间" v-decorator.trim="[ 'expireTime' ]" :show-time="true"/>
+          <j-date style="width:100%" placeholder="请选择到期时间" v-decorator.trim="[ 'expireTime' ]" :show-time="true"/>
+        </a-form-item>
+        <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="描述">
+          <a-textarea :rows="2" placeholder="请输入描述" v-decorator.trim="[ 'remark' ]" />
         </a-form-item>
       </a-form>
     </a-spin>
@@ -79,7 +82,7 @@
         this.model.expireTime = this.model.expireTimeStr
         this.visible = true;
         this.$nextTick(() => {
-          this.form.setFieldsValue(pick(this.model,'loginName', 'userNumLimit', 'billsNumLimit', 'type', 'expireTime'))
+          this.form.setFieldsValue(pick(this.model,'loginName', 'userNumLimit', 'type', 'expireTime', 'remark'))
         });
       },
       close () {