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 @@ - - -