设施排序，

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

src/components/Facilitys/Facilitys.tsx

@@ -63,8 +63,6 @@ const Facilitys = (props: any) => {
         message.success(`${info.file.name} file uploaded successfully`);
         // 拿到key 值  开始存储
         let key = parseInt(info.fileList[0].response.data.identification);
-        console.log(info);
-        console.log(key);
         let list = FacilitysList;
         setidKey(idKey + 1);
         list[key] = {
@@ -104,8 +102,6 @@ const Facilitys = (props: any) => {
       list.push(adds);
       // 存储到mode里面去
       dispatch({ type: module + '/genxin', list });
-
-      console.log(list);
     } else {
       // 提示每一项都要填写完
       message.error('Please fill out each item ！');

src/models/CommunityManagement/FacilityBookings.ts

@@ -22,7 +22,8 @@ export default {
       communityNameList: null,
       tab:1,
       curPage: 1,
-      curPage2: 1
+      curPage2: 1,
+      globalMark:'yes'
     },
     
     Result:null,

src/pages/CommunityManagement/FacilityBookings/BookingDetail.tsx

@@ -120,14 +120,9 @@ const BookingDetail = (props: any) => {
     setModalVisible(false);
   };
 
-  // 最大数量
-  const maxPar = () => {
-    return;
-  };
-
   return (
     <>
-      {DataSave != null ? (
+      {DataSave && DataSaveDetail ? (
         <Spin spinning={load}>
           <div className={styles.base}>
             <TitleBack
@@ -169,7 +164,8 @@ const BookingDetail = (props: any) => {
               DataSaveDetail.managerFee > 0) ||
             (DataSaveDetail.managerFee == 0 &&
               DataSaveDetail.marginFee > 0 &&
-              DataSave.status != 3) ? (
+              DataSave.status != 3 &&
+              DataSave.status != 5) ? (
               <>
                 <Form
                   ref={formRef}

src/pages/CommunityManagement/FacilityBookings/FacilityBookings.tsx

@@ -86,7 +86,7 @@ const FacilityBookings = (props: any) => {
         });
         Array.push(a);
       }
-      setFacility(Array);
+      setFacility([...Array]);
     }
   }, [Data2]);
 
@@ -162,9 +162,17 @@ const FacilityBookings = (props: any) => {
       'Facilities',
       'facilities',
       (text: any, record: any) => {
+        console.log();
         let a = '';
-        text.map((item: any) => {
-          a += item.name + ' , ';
+        text.sort((n1: any, n2: any) => {
+          return n1.id - n2.id;
+        });
+        text.map((item: any, index: any) => {
+          if (record.facilities.length - 1 != index) {
+            a += item.name + ' , ';
+          } else {
+            a += item.name;
+          }
         });
         return a;
       },
@@ -196,7 +204,7 @@ const FacilityBookings = (props: any) => {
           pageNum: curString.curPage,
           subscribeDate: curString.subscribeDate,
           status: curString.status,
-          globalMark: 'yes',
+          globalMark: curString.globalMark,
         });
       } else {
         RA(8, {
@@ -226,6 +234,7 @@ const FacilityBookings = (props: any) => {
         }
         tmp.communityNameList = comment.communityName;
         tmp.curPage = 1;
+        tmp.globalMark = 'no';
         QA(tmp);
         //中断
         RA(9, {

src/pages/CommunityManagement/FacilityBookings/FacilityTow.tsx

@@ -62,6 +62,10 @@ const FacilityTow = (props: any) => {
       setCtyName(DataSave.community);
       setFacilityId(DataSave.facilities[0].id);
       beg(DataSave.facilities[0].id);
+
+      DataSave.facilities.sort((n1: any, n2: any) => {
+        return n1.id - n2.id;
+      });
     } else {
       //返回列表
     }
@@ -148,7 +152,7 @@ const FacilityTow = (props: any) => {
 
   // 提交
   const onFinish = (values: any) => {
-    console.log(FacilitysList);
+    // console.log(FacilitysList);
     // 先判断是否填写完整
     for (let j in FacilitysList) {
       if (FacilitysList[j].fileList.length == 0) {
@@ -205,7 +209,7 @@ const FacilityTow = (props: any) => {
       delete values.endTime;
       delete values.picList;
       delete values.Time;
-      // RA(17, values);
+      RA(17, values);
     }
   };