小区详情费用选择

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

src/pages/CommunityManagement/CellList/Adds.tsx

@@ -42,28 +42,11 @@ const Adds = (props: any) => {
   const [codeStrat, setcodeStrat] = useState(false);
   const [tipMain, setTipMain] = useState('');
 
-  // 监听提交
-  // useEffect(() => {
-  //   console.log(Result);
-  //   if (Result != null) {
-  //     console.log('页面结果');
-  //     console.log(Result);
-  //     if (Result.error_code == undefined) {
-  //       console.log('服务器有问题');
-  //       message.error('服务器有问题，请求失败', 5);
-  //     }
-  //     if (Result.error_code == '0000') {
-  //       message.success(`Community Saved Successfully`);
-  //       ResultClear(module, dispatch);
-  //       history.go(-1);
-  //     }
-  //   }
-  // }, [Result]);
-
   // 赋值
   useEffect(() => {
     // 如果是添加传来没有值的时候 就清空  否则  赋值给表单
     if (Data) {
+      console.log(Data);
       // 返回列表
       form.setFieldsValue({
         // 必填的
@@ -381,7 +364,17 @@ const Adds = (props: any) => {
             </Form.Item>
 
             <Form.Item label="Property Fee" name="propertyFee" style={{ marginBottom: '0' }}>
-              <Checkbox.Group options={plainOptions} defaultValue={['1']} onChange={onChange} />
+              <Checkbox onChange={onChange} disabled>
+                Online Payment
+              </Checkbox>
+              <Checkbox onChange={onChange} checked>
+                Offline Payment
+              </Checkbox>
+              {/* <Checkbox.Group
+                options={plainOptions}
+                defaultValue={PropertyFee}
+                onChange={onChange}
+              /> */}
 
               {/* <div className="tip capi">
                 <span>*</span>There will be a service charge for online payment

src/pages/CommunityManagement/CellList/CellList.tsx

 import React, { useState, useEffect } from 'react';
-import { Space, Button, Form, message, Pagination } from 'antd';
+import { Space, Button, Form, message, Pagination, Tag } from 'antd';
 import { connect, history } from 'umi';
 
 // 图标
@@ -30,7 +30,21 @@ const CellLists = (props: any) => {
       ),
     ],
     ['Office Tel', 'residentialPhone'],
-    ['Address', 'residentialAddress'],
+    [
+      'Address',
+      'residentialAddress',
+      (text: any, record: any) => (
+        <span>
+          {record.residentialAddress}{' '}
+          {record.residentialZipCode.substring(
+            record.residentialZipCode.length - 6,
+            record.residentialZipCode.length,
+          )}
+          {/* <Tag color="#2db7f5">
+          </Tag> */}
+        </span>
+      ),
+    ],
     [
       'Actions',
       null,

src/pages/CommunityManagement/CommunityAnnouncement/Add.tsx

@@ -141,7 +141,7 @@ const Add = (props: any) => {
       noticEndTime: null,
     });
     // 结束时间
-    let day = moment().diff(date, 'days') + 1;
+    let day = moment().diff(date, 'days');
     settimeOver(day);
   };
 

src/pages/CommunityManagement/CommunityAnnouncement/CommunityAnnouncement.tsx

@@ -165,7 +165,10 @@ const CommunityAnnouncement = (props: any) => {
     } else {
       // 要看是哪里分页
       let mlist = { ...value };
-      mlist.communityNumList = value.communityNumList.length > 0 ? value.communityNumList : null;
+      mlist.communityNumList =
+        value.communityNumList != null && value.communityNumList.length > 0
+          ? value.communityNumList
+          : null;
       mlist.pageNum = 1;
       // 把内容存进去
       SA(DetailPage(mlist), module, dispatch);