Merge branch 'lkh-algo' into 'master'

style解决租户管理界选择日期后依然出现提示的bug

See merge request tian-group/skyeye-admin-fe!30

src/views/system/tenant/CreateDrawer.vue

@@ -69,13 +69,13 @@
       required: true,
       message: '请选择开始时间',
       trigger: 'change',
-      type: 'number',
+      type: 'date',
     },
     endDate: {
       required: true,
       message: '请选择结束时间',
       trigger: 'change',
-      type: 'number',
+      type: 'date',
     },
   };
 
@@ -130,8 +130,8 @@
         return message.error('请填写完整信息');
       }
       const params = cloneDeep(formParams.value);
-      params.beginDate = formatToDateTime(params.beginDate);
-      params.endDate = formatToDateTime(params.endDate);
+      params.beginDate = formatToDateTime(params.beginDate || '');
+      params.endDate = formatToDateTime(params.endDate || '');
       if (formParams.value.tenantId) {
         editTenant(params).then((_) => {
           message.success('编辑成功');
@@ -161,8 +161,8 @@
         tenantId: res.tenantId,
         tenantName: res.tenantName,
         tenantCode: res.tenantCode,
-        beginDate: new Date(res.beginDate).getTime(),
-        endDate: new Date(res.endDate).getTime(),
+        beginDate: new Date(res.beginDate).getTime().toString(),
+        endDate: new Date(res.endDate).getTime().toString(),
         tenantStatus: res.tenantStatus,
       };
       formParams.value = info;

src/views/system/tenant/types/index.ts

@@ -2,7 +2,7 @@ export interface formParamsType {
   tenantId?: number | undefined;
   tenantName: string;
   tenantCode: string;
-  beginDate: number | undefined;
-  endDate: number | undefined;
+  beginDate: string | undefined;
+  endDate: string | undefined;
   tenantStatus: number | undefined;
 }