设施以及合同需求更改

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

src/models/CommunityManagement/FacilityBookings.ts

@@ -20,6 +20,7 @@ export default {
       subscribeDate: null,
       status: 0,
       communityNameList: null,
+      communityNameList2: null,
       tab:1,
       curPage: 1,
       curPage2: 1,

src/pages/CommunityManagement/FacilityBookings/FacilityBookings.tsx

@@ -198,6 +198,11 @@ const FacilityBookings = (props: any) => {
     //发起请求--有小区再发起，没有就没必要了
     if (CommunityList) {
       if (curString.tab == 1) {
+        let tmp = curString;
+        tmp.communityNameList = CommunityList;
+        tmp.communityNameList2 = CommunityList;
+        QA(tmp);
+
         RA(9, {
           communityNameList: CommunityList,
           userToken: token,
@@ -227,6 +232,7 @@ const FacilityBookings = (props: any) => {
       if (comment.communityName != null || comment.key != null || comment.status != null) {
         var tmp = curString;
         tmp.subscribeDate = comment.key;
+
         if (comment.status == null || comment.status == undefined) {
           tmp.status = null;
         } else {
@@ -249,7 +255,7 @@ const FacilityBookings = (props: any) => {
     } else {
       if (comment.communityName != null || comment.facilityName != null) {
         var tmp = curString;
-        tmp.communityNameList = comment.communityName;
+        tmp.communityNameList2 = comment.communityName;
         tmp.facilityName = comment.facilityName;
         tmp.curPage = 1;
         QA(tmp);
@@ -267,7 +273,7 @@ const FacilityBookings = (props: any) => {
     QA(tmp);
     if (tab == 1) {
       RA(9, {
-        communityNameList: CommunityList,
+        communityNameList: curString.communityNameList,
         userToken: token,
         status: curString.status,
         subscribeDate: curString.subscribeDate,
@@ -278,7 +284,7 @@ const FacilityBookings = (props: any) => {
       RA(8, {
         userToken: token,
         pageNum: curString.curPage2,
-        communityNameList: CommunityList,
+        communityNameList: curString.communityNameList2,
       });
     }
   }
@@ -292,7 +298,7 @@ const FacilityBookings = (props: any) => {
         pageNum: current,
         subscribeDate: curString.subscribeDate,
         status: curString.status,
-        communityNameList: CommunityList,
+        communityNameList: curString.communityNameList,
         globalMark: curString.globalMark,
       });
     } else {
@@ -303,8 +309,8 @@ const FacilityBookings = (props: any) => {
         RA(8, {
           userToken: token,
           pageNum: current,
-          communityNameList: curString.communityNameList
-            ? curString.communityNameList
+          communityNameList: curString.communityNameList2
+            ? curString.communityNameList2
             : JSON.parse(localStorage.getItem('CommunityList') as any),
         });
       } else {
@@ -314,16 +320,16 @@ const FacilityBookings = (props: any) => {
   }
 
   // 预约刷新
-  const onReset = () => {
-    RA(9, {
-      userToken: token,
-      pageNum: curString.curPage,
-      subscribeDate: curString.subscribeDate,
-      status: curString.status,
-      communityNameList: CommunityList,
-      globalMark: curString.globalMark,
-    });
-  };
+  // const onReset = () => {
+  //   RA(9, {
+  //     userToken: token,
+  //     pageNum: curString.curPage,
+  //     subscribeDate: curString.subscribeDate,
+  //     status: curString.status,
+  //     communityNameList: CommunityList,
+  //     globalMark: curString.globalMark,
+  //   });
+  // };
 
   return (
     <>
@@ -347,7 +353,7 @@ const FacilityBookings = (props: any) => {
               ]}
               time={['key', 'Booking time ']}
               community={'communityName'}
-              checklist={CommunityList}
+              checklist={curString.communityNameList ? curString.communityNameList : []}
               onSubmit={CallBackTitleSearch}
             />
           </>
@@ -357,7 +363,7 @@ const FacilityBookings = (props: any) => {
               listkey={['facilityName']}
               list={['Facility name']}
               community={'communityName'}
-              checklist={CommunityList}
+              checklist={curString.communityNameList2 ? curString.communityNameList2 : []}
               onSubmit={CallBackTitleSearch}
             />
           </>

src/pages/ContractManagement/Contract.tsx

@@ -63,14 +63,11 @@ const Contract = (props: any) => {
       },
     }, // 合同编号
     {
-      title: 'Company',
+      title: ' Contract Party',
       render: (text: any, record: any) => (
         <>
           <div>
-            <span>Party A : {record.contractPartyA}</span>
-          </div>
-          <div>
-            <span>Party B : {record.contractPartyB}</span>
+            <span>{record.contractPartyB}</span>
           </div>
         </>
       ),

src/pages/ContractManagement/ContractContent.tsx

@@ -398,7 +398,7 @@ const ContractContent = (props: any) => {
               </div>
               {/* 合同编号、甲方、乙方 */}
               <div className="list_1">
-                <div className="item_1">
+                {/* <div className="item_1">
                   <Form.Item
                     name="contractPartyA"
                     label="Contract Party A"
@@ -406,14 +406,14 @@ const ContractContent = (props: any) => {
                   >
                     <Input style={{ width: 300 }} placeholder="Contract Party A" />
                   </Form.Item>
-                </div>
+                </div> */}
                 <div className="item_1">
                   <Form.Item
                     name="contractPartyB"
-                    label="Contract Party B"
+                    label="Contract Party"
                     rules={[{ required: true, message: `${tipList[2]}` }]}
                   >
-                    <Input style={{ width: 300 }} placeholder="Contract Party B" />
+                    <Input style={{ width: 300 }} placeholder="Contract Party " />
                   </Form.Item>
                 </div>
               </div>

src/pages/ContractManagement/ContractDetail.tsx

@@ -217,22 +217,13 @@ const ContractContent = (props: any) => {
               </div>
               {/* 合同编号、甲方、乙方 */}
               <div className="list_1">
-                <div className="item_1">
-                  <Form.Item
-                    name="contractPartyA"
-                    label="Contract Party A"
-                    rules={[{ required: true, message: `${tipList[1]}` }]}
-                  >
-                    <Input style={{ width: 300 }} disabled placeholder="Contract Party A" />
-                  </Form.Item>
-                </div>
                 <div className="item_1">
                   <Form.Item
                     name="contractPartyB"
-                    label="Contract Party B"
+                    label="Contract Party"
                     rules={[{ required: true, message: `${tipList[2]}` }]}
                   >
-                    <Input style={{ width: 300 }} disabled placeholder="Contract Party B" />
+                    <Input style={{ width: 300 }} disabled />
                   </Form.Item>
                 </div>
               </div>