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" />
-
+
-
+
免费租户
付费租户
-
+
+
+
+
@@ -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 () {