设施修复

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

src/components/TitleSearch/TitleSearch.tsx

@@ -66,6 +66,7 @@ const TitleSearch = (props: any) => {
   }, [CommunityList]);
 
   const onFinish = (values: any) => {
+    // console.log(values);
     if (datePicker) {
       values[time[0]] = datePicker;
     }

src/pages/AccountManagement/SystemFeedback/BugDetail.tsx

@@ -34,29 +34,29 @@ const BugDetail = (props: any) => {
 
         <hr></hr>
         <Descriptions column={{ xxl: 1, xl: 1, lg: 1, md: 1, sm: 1, xs: 1 }}>
-          <Descriptions.Item label="Mobile phone brands">
+          <Descriptions.Item label="Mobile phone brands" style={{ paddingBottom: 16 }}>
             {DataSave ? DataSave.phoneBrand : '-'}
           </Descriptions.Item>
-          <Descriptions.Item label="Phone model">
+          <Descriptions.Item label="Phone model" style={{ paddingBottom: 16 }}>
             {DataSave ? DataSave.deviceModel : '-'}
           </Descriptions.Item>
-          <Descriptions.Item label="System version">
+          <Descriptions.Item label="System version" style={{ paddingBottom: 16 }}>
             {DataSave ? DataSave.osVersion : '-'}
           </Descriptions.Item>
-          <Descriptions.Item label="Software version">
+          <Descriptions.Item label="Software version" style={{ paddingBottom: 16 }}>
             {DataSave ? DataSave.appVersion : '-'}
           </Descriptions.Item>
-          <Descriptions.Item label="Feedback content">
+          <Descriptions.Item label="Feedback content" style={{ paddingBottom: 16 }}>
             {DataSave ? DataSave.description : '-'}
           </Descriptions.Item>
-          <Descriptions.Item className="diys" label="&nbsp;">
+          <Descriptions.Item className="diys" label="&nbsp;" style={{ paddingBottom: 16 }}>
             {DataSave
               ? DataSave.imageUrls.map((item: any) => {
                   return <Image width={120} src={item} />;
                 })
               : '-'}
           </Descriptions.Item>
-          <Descriptions.Item label="Actions">
+          <Descriptions.Item label="Submission time" style={{ paddingBottom: 16 }}>
             {DataSave
               ? moment(DataSave.updateTime.time).format('YYYY-MM-DD hh') +
                 ':00' +

src/pages/CommunityManagement/FacilityBookings/Facility.tsx

@@ -45,7 +45,6 @@ const Facility = (props: any) => {
   // 监听是否选择了小区
   const [imgOpen, setImgOpen] = useState(true);
   const [ctyName, setCtyName] = useState(null);
-  const [soltTime, setSoltTime] = useState(['', '']); // 已选时间
 
   const [Cycle, setCycle] = useState(null as any); // Appointment Cycle下拉
 
@@ -74,7 +73,6 @@ const Facility = (props: any) => {
       setCommunity(true);
       setCtyName(DataSave.communityName);
 
-      setSoltTime(sourceData.reservationQuantumTime); // 设置时间
       // 中断
       // setPictrueExtend({tab:null,pic:null,pics:null})
       // 设施图片默认值
@@ -98,9 +96,6 @@ const Facility = (props: any) => {
         return sam;
       });
 
-      console.log(sourceData);
-      console.log(list);
-
       dispatch({ type: module + '/genxin', list });
 
       // 当是查看的时候禁止点击
@@ -198,7 +193,9 @@ const Facility = (props: any) => {
         moment(values.Time[0]).format('HH:mm'),
         moment(values.Time[1]).format('HH:mm'),
       ]; // 开放时间段
-      // values.categoriesOpenTime = `${soltTime[0]}-${soltTime[1]}`; // 预约时间段  二开需要
+      values.categoriesOpenTime = `${moment(values.Time[0]).format('HH:mm')}-${moment(
+        values.Time[1],
+      ).format('HH:mm')}`; // 预约时间段  二开需要
       values.communityManagerFee = values.communityManagerFee ? values.communityManagerFee : '0.00'; // 价格押金没有为0
       values.communityMargin = values.communityMargin ? values.communityMargin : '0.00'; // 价格押金没有为0
 
@@ -206,7 +203,7 @@ const Facility = (props: any) => {
       delete values.picList;
       delete values.Time;
 
-      // RA(6, values);
+      RA(6, values);
     }
     return false;
   };
@@ -252,7 +249,7 @@ const Facility = (props: any) => {
       } else if (value != ctyName) {
         // eliminate();
         // 清空设施列表图
-        console.log('不等于');
+        // console.log('不等于');
         setCtyName(value); // 给小区赋值
         let list: any = [];
         dispatch({ type: module + '/genxin', list });
@@ -260,6 +257,7 @@ const Facility = (props: any) => {
         //去掉图片组
         form.setFieldsValue({
           categoriesDetailsImageName: [],
+          communityName: value, // 给表单赋值
         });
       }
     }

src/pages/CommunityManagement/FacilityBookings/FacilityBookings.tsx

@@ -119,8 +119,6 @@ const FacilityBookings = (props: any) => {
 
     values.type = index;
 
-    console.log(values);
-
     if (index == 2) {
       values.communityName = values.community;
       // values.id = values.community;
@@ -203,6 +201,7 @@ const FacilityBookings = (props: any) => {
           pageNum: curString.curPage,
           subscribeDate: curString.subscribeDate,
           status: curString.status,
+          globalMark: 'yes',
         });
       } else {
         RA(8, {
@@ -215,6 +214,12 @@ const FacilityBookings = (props: any) => {
   }, [CommunityList]);
 
   const CallBackTitleSearch = (comment: any) => {
+    // 没有选小区就不让他提交
+    if (comment.communityName && comment.communityName.length == 0) {
+      message.info('Please Select A Community !');
+      return;
+    }
+
     if (curString.tab == 1) {
       if (comment.communityName != null || comment.key != null || comment.status != null) {
         var tmp = curString;
@@ -234,6 +239,7 @@ const FacilityBookings = (props: any) => {
           subscribeDate: tmp.subscribeDate,
           status: tmp.status,
           communityNameList: comment.communityName,
+          globalMark: 'no',
         });
       }
     } else {

src/pages/CommunityManagement/FacilityBookings/FacilityTow.tsx

@@ -174,10 +174,12 @@ const FacilityTow = (props: any) => {
         moment(values.Time[0]).format('HH:mm'),
         moment(values.Time[1]).format('HH:mm'),
       ]; // 开放时间段
-      // values.categoriesOpenTime = `${soltTime[0]}-${soltTime[1]}`; // 预约时间段  二开需要
+      values.categoriesOpenTime = `${moment(values.Time[0]).format('HH:mm')}-${moment(
+        values.Time[1],
+      ).format('HH:mm')}`; // 预约时间段  二开需要
       values.communityManagerFee = values.communityManagerFee ? values.communityManagerFee : '0.00'; // 价格押金没有为0
       values.communityMargin = values.communityMargin ? values.communityMargin : '0.00'; // 价格押金没有为0
-
+      values.communityName = DataSave.community;
       values.periodType = Cycle;
       values.id = Facilityid;