预约时间大改

Signed-off-by: cellee <893264950@qq.com>

src/components/OnTime/OnTimeTow.tsx

+import React from 'react';
+import { TimePicker } from 'antd';
+const { RangePicker } = TimePicker;
+import moment from 'moment';
+
+const OnTime = (porps: any) => {
+  //  disabled  是否禁止
+  //  limit 默认开放时间
+  //  inhibitTime  禁止选择时间
+  //  onChanges  时间选择事件
+  let { disabled, limit, inhibitTime, onChanges } = porps;
+
+  // 禁止时间  数组格式
+  const disabledHours = () => {
+    // 禁止的小时数组
+    let result = [];
+
+    // 设施默认的开放时间
+    let lim = limit ? limit.split('-') : [];
+    for (var i = 0; i < 24; i++) {
+      if (
+        i < parseInt(moment(lim[0], 'HH:ss').format('HH')) ||
+        i > parseInt(moment(lim[1], 'HH:ss').format('HH'))
+      ) {
+        result.push(i);
+      }
+    }
+
+    // 选择日期禁止的时间
+    if (inhibitTime) {
+      for (let j in inhibitTime) {
+        result.push(parseInt(moment(inhibitTime[j], 'HH:ss').format('HH')));
+      }
+    }
+
+    // 去重排序
+    return [...new Set(result)].sort((x, y) => x - y);
+  };
+
+  return (
+    <>
+      <RangePicker
+        minuteStep={60}
+        format="HH:mm"
+        onChange={(time: any, timeString: any) => {
+          onChanges(time, timeString);
+        }}
+        allowClear={false}
+        disabled={disabled}
+        disabledHours={disabledHours}
+      />
+    </>
+  );
+};
+
+export default OnTime;

src/models/CommunityManagement/FacilityBookings.ts

@@ -192,12 +192,7 @@ export default {
           } break;
           // 时间查询
           case 50:{
-            let resultTime = [];
-            let data = resp.data;
-            for (var i = 0; i < data.length; i += 2){ 
-              let a = data[i] + '-' + data[i+1];
-              resultTime.push(a);
-            }
+            let resultTime = resp.data;
             yield put({ type: 'onResult', resultTime });  
           } break;
           

src/pages/AccountManagement/SystemFeedback/BugDetail.tsx

@@ -58,9 +58,9 @@ const BugDetail = (props: any) => {
           </Descriptions.Item>
           <Descriptions.Item label="Submission time" style={{ paddingBottom: 16 }}>
             {DataSave
-              ? moment(DataSave.updateTime.time).format('YYYY-MM-DD hh') +
-                ':00' +
-                (parseInt(moment(DataSave.updateTime.time).format('HH')) > 11 ? 'PM' : 'AM')
+              ? moment(DataSave.updateTime.time).format('YYYY-MM-DD hh:mm') +
+                // ':00' +
+                (parseInt(moment(DataSave.updateTime.time).format('HH')) > 11 ? ' PM' : ' AM')
               : '-'}
           </Descriptions.Item>
         </Descriptions>

src/pages/AccountManagement/SystemFeedback/SystemFeedback.tsx

@@ -31,9 +31,9 @@ const SystemFeedback = (props: any) => {
       dataIndex: 'createTime',
       render: (text: any) => {
         let data =
-          moment(text.time).format('YYYY-MM-DD hh') +
-          ':00' +
-          (parseInt(moment(text.time).format('HH')) > 11 ? 'PM' : 'AM');
+          moment(text.time).format('YYYY-MM-DD hh:mm') +
+          // ':00' +
+          (parseInt(moment(text.time).format('HH')) > 11 ? ' PM' : ' AM');
 
         // let data = moment(text.time).calendar();
         return data;