给租户增加有效期

jshERP-web/src/views/system/modules/TenantModal.vue

@@ -16,7 +16,16 @@
                    suffix="初始密码：123456" />
         </a-form-item>
         <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="用户数量限制">
-          <a-input-number style="width:50%" placeholder="请输入用户数量限制" v-decorator.trim="[ 'userNumLimit' ]" />
+          <a-input-number style="width:60%" 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-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"/>
         </a-form-item>
       </a-form>
     </a-spin>
@@ -25,8 +34,12 @@
 <script>
   import pick from 'lodash.pick'
   import {registerUser,editTenant,checkTenant } from '@/api/api'
+  import JDate from '@/components/jeecg/JDate'
   export default {
     name: "TenantModal",
+    components: {
+      JDate
+    },
     data () {
       return {
         title:"操作",
@@ -62,9 +75,10 @@
       edit (record) {
         this.form.resetFields();
         this.model = Object.assign({}, record);
+        this.model.expireTime = this.model.expireTimeStr
         this.visible = true;
         this.$nextTick(() => {
-          this.form.setFieldsValue(pick(this.model,'loginName', 'userNumLimit', 'billsNumLimit'))
+          this.form.setFieldsValue(pick(this.model,'loginName', 'userNumLimit', 'billsNumLimit', 'type', 'expireTime'))
         });
       },
       close () {