From 12d140cc4baf56c9c81ce1fc144ede61c69609eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Tue, 24 Aug 2021 01:01:30 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=99=E7=A7=9F=E6=88=B7=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jshERP-web/src/views/system/TenantList.vue          | 2 +-
 jshERP-web/src/views/system/modules/TenantModal.vue | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/jshERP-web/src/views/system/TenantList.vue b/jshERP-web/src/views/system/TenantList.vue
index b51c8b35..a924c7ca 100644
--- a/jshERP-web/src/views/system/TenantList.vue
+++ b/jshERP-web/src/views/system/TenantList.vue
@@ -100,11 +100,11 @@
           },
           { title: '登录名称', dataIndex: 'loginName', width: 100, align: "center"},
           { title: '用户数量限制', dataIndex: 'userNumLimit', width: 100, align: "center"},
-          { title: '单据数量限制', dataIndex: 'billsNumLimit', width: 100, align: "center"},
           { title: '状态',dataIndex: 'enabled',width:70,align:"center",
             scopedSlots: { customRender: 'customRenderFlag' }
           },
           { title: '创建时间', dataIndex: 'createTimeStr', width: 100, align: "center"},
+          { title: '到期时间', dataIndex: 'expireTimeStr', width: 100, align: "center"},
           {
             title: '操作',
             dataIndex: 'action',
diff --git a/jshERP-web/src/views/system/modules/TenantModal.vue b/jshERP-web/src/views/system/modules/TenantModal.vue
index 90f92044..d8b2fd02 100644
--- a/jshERP-web/src/views/system/modules/TenantModal.vue
+++ b/jshERP-web/src/views/system/modules/TenantModal.vue
@@ -18,9 +18,6 @@
         <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="用户数量限制">
           <a-input-number style="width:50%" placeholder="请输入用户数量限制" v-decorator.trim="[ 'userNumLimit' ]" />
         </a-form-item>
-        <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据数量限制">
-          <a-input-number style="width:50%" placeholder="请输入单据数量限制" v-decorator.trim="[ 'billsNumLimit' ]" />
-        </a-form-item>
       </a-form>
     </a-spin>
   </a-modal>