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

src/components/SearchOptions/SearchOptionsCommnity.tsx

@@ -5,26 +5,24 @@ import SearchOptionsTow from './SearchOptionsTow';
 
 
 const SearchOptionsCommnity = (props: any) => {
-  
-  const {dispatch, CommunityList, opname ,defaultName} = props;
-  
-  const tosCommunityget = (values:any) => {dispatch({type: 'Init/tosCommunityget',playload:values})};  
+  const { dispatch, CommunityList, opname, defaultName } = props;
+  const tosCommunityget = (values: any) => { dispatch({ type: 'Init/tosCommunityget', playload: values }) };
   useEffect(() => {
     if (CommunityList == null) {
       tosCommunityget(null)
     }
-  }, []); 
+  }, []);
+
 
-  
   const extendName = (values: any) => {
     // console.log(values)
     opname(values)
   }
 
- 
+
 
   return (
-    <>{CommunityList!=null?
+    <>{CommunityList != null ?
       // <SearchOptions 
       //   titleSearch={titleSearch} 
       //   disabled={disabled} 
@@ -33,14 +31,14 @@ const SearchOptionsCommnity = (props: any) => {
       //   list={CommunityList} 
       //   onSubmit={extendName} />
 
-        <SearchOptionsTow list={CommunityList} extendName={extendName} def = {defaultName}></SearchOptionsTow>
-      :null
-      }
+      <SearchOptionsTow list={CommunityList} extendName={extendName} def={defaultName}></SearchOptionsTow>
+      : null
+    }
     </>
   );
 };
-function mapStateToProps(state:any) {
-  const { CommunityList } = state.Init;  
+function mapStateToProps(state: any) {
+  const { CommunityList } = state.Init;
   return {
     CommunityList,
   };

src/components/SearchOptions/SearchOptionsTow.tsx

@@ -2,16 +2,15 @@ import React from 'react'
 import { Select } from 'antd';
 const { Option } = Select;
 
-const SearchOptionsTow = (porps:any) => {
+const SearchOptionsTow = (porps: any) => {
 
-    const {list,extendName,def} = porps;
-    const options = list.map((d:any,index:number) => <Option value={d} key={index}>{d}</Option>);
-    function onChange(value:any) {
+    const { list, extendName, def } = porps;
+    const options = list.map((d: any, index: number) => <Option value={d} key={index}>{d}</Option>);
+    function onChange(value: any) {
         // console.log(`selected ${value}`);
         extendName(value)
     }
 
-
     return (
         <div>
             <Select

src/pages/CommercialService/PropertyServices.tsx

 import React, { useState, useEffect } from 'react';
 import styles from './css/index.less';
-import { Input ,Menu,Table,Space,Upload,message,Pagination, Button } from 'antd';
+import { Input, Menu, Table, Space, Upload, message, Pagination, Button } from 'antd';
 
-import { Link, useIntl, connect, Dispatch,history } from 'umi';
+import { Link, useIntl, connect, Dispatch, history } from 'umi';
 
 import { timestampToTime3 } from '../../utils/time';
 
@@ -11,10 +11,10 @@ import { RA, urlEncode, filterObj, filterObjbyTg } from '@/utils/method';
 
 
 const pathname = ["CommunityMaintenance", "ShelfLifeService", "OwnerComplaints", "ReportOnline", "ProblemFeedback"]
-const handle_Status = [[0,"Pending"], [1,"Processed"]]//["未处理","处理","拒绝"] , [2,"Rejected"]
+const handle_Status = [[0, "Pending"], [1, "Processed"]]//["未处理","处理","拒绝"] , [2,"Rejected"]
 const goToName = ["Reply", "Detail"];
 
-const module="CommunityService"
+const module = "CommunityService"
 const PropertyServices = (props: any) => {
 
   const { dispatch, location, Data } = props;
@@ -22,15 +22,15 @@ const PropertyServices = (props: any) => {
   const [loading, setLoading] = useState(false)
   const [pageNum, setPageNum] = useState(1)
   const [serviceTypeGobal, setServiceType] = useState("")
-  const [readyData,setReadyData]=useState(null)
+  const [readyData, setReadyData] = useState(null)
 
   const columns = [
-    { title: "Community Name",dataIndex: 'community_name',},
-    { title: "Ower Name",dataIndex: 'ower_name',},
-    { title: "Reply",dataIndex: 'handle_name',render: (text: any) => (<Space size="middle">{text!=null?text:"--"}</Space>)},
-    { title: "Create Time",dataIndex: "create_time",render: (text: any, record: any) => (<Space size="middle">{timestampToTime3(text.time)}</Space>)},
-    { title: "Handle status", dataIndex: 'handle_status',render: (text: any, record: any) => (<Space size="middle">{handle_Status[text][1]}</Space>)},
-    { title: "Actions",dataIndex: 'handle_status',render: (text: any, record: any) => (<Space size="middle"><a onClick={goToDetail.bind(this,text,record)}>{goToName[text]}</a></Space>)},
+    { title: "Community Name", dataIndex: 'community_name', },
+    { title: "Ower Name", dataIndex: 'ower_name', },
+    { title: "service Content", dataIndex: 'service_content', ellipsis: true, width: 500, render: (text: any) => (<Space size="middle">{text != null ? text : "--"}</Space>) },
+    { title: "Create Time", dataIndex: "create_time", render: (text: any, record: any) => (<Space size="middle">{timestampToTime3(text.time)}</Space>) },
+    { title: "Handle status", dataIndex: 'handle_status', render: (text: any, record: any) => (<Space size="middle">{handle_Status[text][1]}</Space>) },
+    { title: "Actions", dataIndex: 'handle_status', render: (text: any, record: any) => (<Space size="middle"><a onClick={goToDetail.bind(this, text, record)}>{goToName[text]}</a></Space>) },
   ];
 
   const goToDetail = (value: any, record: any, e: any) => {
@@ -39,38 +39,40 @@ const PropertyServices = (props: any) => {
     console.log(record);
     //页面递进
     history.push(
-      location.pathname+(value==0?"/Edit":"/Detail")+urlEncode(
+      location.pathname + (value == 0 ? "/Edit" : "/Detail") + urlEncode(
         {
           serviceType: serviceTypeGobal,
           id: record.id,
-          user_id:record.user_id,
-          community_id:record.community_id
+          user_id: record.user_id,
+          community_id: record.community_id
         }
-        )
+      )
     )
   }
 
   useEffect(() => {
-    if (Data != null) {setLoading(false)}
+    if (Data != null) { setLoading(false) }
   }, [Data]);
 
   const ClickTitleSearch = (comment: any) => {
     //页面搜索
     comment.serviceType = serviceTypeGobal
     comment.current = 1
-    history.push(location.pathname+urlEncode(filterObj(comment)))
+    history.push(location.pathname + urlEncode(filterObj(comment)))
   }
+
+
   const PageChange = (values: any) => { //.current
     //页面跳转参数
     var tmp = filterObjbyTg(location.query, ["handleStatus", "ownerName", "communityName"])
-    tmp["current"]=values.current
+    tmp["current"] = values.current
     history.push(location.pathname + urlEncode(tmp))
   }
 
-  useEffect(()=>{
+  useEffect(() => {
     if (location != null) {
       //细分类：页面指令
-      var serviceType =""
+      var serviceType = ""
       pathname.map((item, index) => {
         if ((location.pathname).indexOf(item) > -1) {
           serviceType = "" + (index + 1)
@@ -78,7 +80,7 @@ const PropertyServices = (props: any) => {
         }
       })
       //分页设置
-      if (location.query.current!=null) {
+      if (location.query.current != null) {
         setPageNum(parseInt(location.query.current))
       } else {
         setPageNum(1)
@@ -117,20 +119,20 @@ const PropertyServices = (props: any) => {
         defaultValue={readyData}
         onSubmit={ClickTitleSearch}
       />
-        <Table
-          rowKey={"id"}
-          style={{ marginTop: 16 }}
-          loading={loading}
-          columns={columns}
-          dataSource={ Data != null ?Data.data.rows:[]}
-          pagination={Data != null ? { current: pageNum, total: Data.data.rows.length } : {}}
-          onChange={PageChange}
-        />
+      <Table
+        rowKey={"id"}
+        style={{ marginTop: 16 }}
+        loading={loading}
+        columns={columns}
+        dataSource={Data != null ? Data.data.rows : []}
+        pagination={Data != null ? { current: pageNum, total: Data.data.rows.length } : {}}
+        onChange={PageChange}
+      />
     </div>
   );
 };
 
-function mapStateToProps(state:any) {
+function mapStateToProps(state: any) {
   const { Data } = state.CommunityService;
   return {
     Data

src/pages/CommercialService/Renovation.tsx

-import React, { useState, useEffect,useRef} from 'react';
-import { Input ,Tabs,Table,Space, Button} from 'antd';
+import React, { useState, useEffect, useRef } from 'react';
+import { Input, Tabs, Table, Space, Button } from 'antd';
 const { TabPane } = Tabs;
 
-import {connect,history} from 'umi';
+import { connect, history } from 'umi';
 
+import TitleSearch from '../../components/TitleSearch/TitleSearch';
 
+import { RA, SA, urlEncode, filterObj, filterObjbyTg } from '@/utils/method';
 
-import { RA, SA } from '@/utils/method';
 import { objectColumns, stringTab } from '@/utils/string';
 import { timestampToTime } from '@/utils/time';
-const module="CommunityService"
-const Renovation = (props:any) => {
+const module = "CommunityService"
+const Renovation = (props: any) => {
 
   //  const decoration_status = [[0, "待处理"], [1, "已批准"], [2, "已拒绝"]]
   const decoration_status = [[0, "Pending"], [1, "Approved"], [2, "Rejected"]]
+  const pathname = ["CommunityMaintenance", "ShelfLifeService", "OwnerComplaints", "ReportOnline", "ProblemFeedback"]
+
+  const [loading, setLoading] = useState(false)
+  const [serviceTypeGobal, setServiceType] = useState("")
+  const [pageNum, setPageNum] = useState(1)
+  const [readyData, setReadyData] = useState(null)
 
   const columns = objectColumns([
     ["Community", "community_name"],
     ["Applicant", "applyfor_name"],
     ["Unit", null, (text: any, record: any) => (<div>{record.community_build_decorate}#{record.community_floor_decorate}-{record.community_room_decoate}</div>)],
     ["Content", "decoration_content", (text: any) => (<div>{stringTab(text)}</div>)],
-    ["Request Time", "create_time",(text: any) => (<div>{timestampToTime(text.time)}</div>)],
-    ["status", "decoration_status",(text: any) => (<div>{decoration_status[parseInt(text)][1]}</div>)],
-    ["Actions",null, (text: any, record: any) => (<Space size="middle"> <a onClick={goToDetail.bind(this,record)}>Detail</a></Space>)],
+    ["Request Time", "create_time", (text: any) => (<div>{timestampToTime(text.time)}</div>)],
+    ["status", "decoration_status", (text: any) => (<div>{decoration_status[parseInt(text)][1]}</div>)],
+    ["Actions", null, (text: any, record: any) => (<Space size="middle"> <a onClick={goToDetail.bind(this, record)}>Detail</a></Space>)],
   ])
 
-  const { dispatch, Data8 } = props;
-  const formRef = useRef(null)
-
-  useEffect(()=>{
-    RA(23, { serviceType: "6", id: "" }, module, dispatch)
-
-// applyfor_name: "jack-小白白"
-// communityId: "7e5c6fd2f4ba497a90e64535df6e9088"
-// community_build_decorate: "01"
-// community_floor_decorate: "00"
-// community_name: "A4"
-// community_room_decoate: "767"
-// contact_name: "15626274096"
-// contact_phone: "jack-小白白"
-// create_time: {date: 10, day: 4, hours: 19, minutes: 39, month: 8, …}
-// decorationBegin_time: {date: 10, day: 4, hours: 0, minutes: 0, month: 8, …}
-// decorationEnd_time: {date: 10, day: 4, hours: 0, minutes: 0, month: 8, …}
-// decoration_content: "滚滚滚"
-// decoration_status: 0
-// deleted: 0
-// id: "977591272158003200"
-// ownerId: "c4da40676d044487b37e7a1bdc6dd045"
-//     update_time: {
-//       date: 10, day: 4, hours: 19, minutes:
-
-  }, [])
+  const { dispatch, Data8, location } = props;
+
+  useEffect(() => {
+    if (Data8 != null) { setLoading(false) }
+  }, [Data8]);
+
+  useEffect(() => {
+
+    if (location != null) {
+      //前置数据
+      console.log("前置数据");
+      let tmp: any = filterObjbyTg(location.query, ["handleStatus", "ownerName", "communityName", "current"])
+      tmp.handleStatus = decoration_status[parseInt(tmp.handleStatus)] //特殊处理
+
+      setReadyData(tmp)
+      //获取数据
+      setLoading(true)
+      RA(23, { serviceType: "6", id: "" }, module, dispatch)
+    }
+
+  }, [location])
+
+  //页面搜索
+  const ClickTitleSearch = (comment: any) => {
+    let tmp = filterObjbyTg(comment, ["handleStatus", "ownerName", "communityName"])
+    tmp["current"] = 1
+    console.log(tmp)
+    history.push(location.pathname + urlEncode(tmp))
+  }
 
   const goToDetail = (values: any, e: any) => {
-      SA(values,module,dispatch)
-      history.push('./RenovationApplication/Detail')
+    SA(values, module, dispatch)
+    history.push('./RenovationApplication/Detail')
   }
   return (
     <div style={{ width: "100%", minWidth: 1020, padding: 34, backgroundColor: "#ffffff" }}>
       {
-                Data8 != null ?
-                <>
-                  <Table loading={false} rowKey="id" style={{ marginTop: 16 }}
-                  dataSource={Data8.data.rows}
-                  columns={columns}
-                  pagination={{ defaultCurrent: 1, total: Data8.total }} />
-                </>
+        Data8 != null ?
+          <>
+            <TitleSearch
+              communitySelect={true}
+              listkey={['ownerName']}
+              list={['Owner Name']}
+              status={[{ name: ["handleStatus", "Status"], data: decoration_status }]}
+              defaultValue={readyData}
+              onSubmit={ClickTitleSearch}
+            />
+            <Table
+              loading={loading}
+              rowKey="id"
+              style={{ marginTop: 16 }}
+              dataSource={Data8.data.rows}
+              columns={columns}
+              pagination={{ defaultCurrent: 1, total: Data8.total }}
+            />
+          </>
           : null
       }
     </div>
   );
 };
 
-function map(state:any) {
-  const { Data8} = state[module]
-  return { Data8}
+function map(state: any) {
+  const { Data8 } = state[module]
+  return { Data8 }
 }
 export default connect(map)(Renovation);

src/pages/PropertyManagement/ChargeDetail.tsx

@@ -66,7 +66,7 @@ const ChargeDetail = (props: any) => {
             <Pagination simple defaultCurrent={curpage} total={pages * 10} onChange={pageChange} />
           </div>
           <>
-            <Tooltip title={scale == 1.3 ? '点击放大查看' + CurData.billFileUrl : '还原视图'}>
+            <Tooltip title={scale == 1.3 ? '点击放大查看' : '还原视图'}>
               <div className={scale == 1.3 ? styles.box3out : null}>
                 <div className={scale == 1.3 ? styles.box3 : styles.box3of} onClick={lookup}>
                   <PDF

src/pages/UserManagement/LIFEUserManagement/UsersAdd.tsx

@@ -10,7 +10,7 @@ import SearchOptionsCommnity from '../../../components/SearchOptions/SearchOptio
 import { checkParam, RA } from '../../../utils/method'
 import { validateMessages } from '@/utils/params';
 
-import "./UsersAddInput.less"
+// import "./UsersAddInput.less"
 
 
 const module = "User"
@@ -22,8 +22,9 @@ const UsersAdd = (props: any) => {
   const formRef = useRef(null as any);
 
   const [loading, setLoading] = useState(false)
-  const onFinish = (values: any) => {
 
+  const onFinish = (values: any) => {
+    console.log(values)
     if (postman.extend != null) {
       values.communityName = postman.extend
     } else {
@@ -57,6 +58,7 @@ const UsersAdd = (props: any) => {
   }, [communityInfo])
 
   const checkData = (rule: any, value: any, callback: any) => {
+    console.log(rule, value)
     if (value) {
       if (/^[a-zA-Z0-9]+$/g.test(value)) {
         callback();
@@ -79,10 +81,10 @@ const UsersAdd = (props: any) => {
           </div>
 
           {/* <div className={styles.box4}>
-        <div className={styles.box4item0}>Contact Details</div>
-        <div className={styles.box4item1}><Form.Item name="owerPhone" ><Input placeholder="Phone Number" /></Form.Item></div>
-        <div className={styles.box4item2}><Form.Item name="owerEmail" ><Input placeholder="Email" /></Form.Item></div>
-      </div>  */}
+            <div className={styles.box4item0}>Contact Details</div>
+            <div className={styles.box4item1}><Form.Item name="owerPhone" ><Input placeholder="Phone Number" /></Form.Item></div>
+            <div className={styles.box4item2}><Form.Item name="owerEmail" ><Input placeholder="Email" /></Form.Item></div>
+          </div> */}
 
           <div className={styles.box2}>
             <div className={styles.box2item1}>Contact Details</div>

src/pages/UserManagement/LIFEUserManagement/UsersAddInput.css

-.box2item3___3VsZz .ant-form-item-explain {
+/* .box2item3___3VsZz .ant-form-item-explain {
   margin-left: -80px;
 }
 .box2item5___2AZ2K .ant-form-item-explain {
@@ -9,4 +9,4 @@
 }
 .box2item7___ePaor .ant-form-item-explain {
   margin-left: -30px;
-}
+} */

src/pages/UserManagement/ServiceProviderManagement/ServiceProviderManagement.tsx

@@ -108,22 +108,16 @@ const ServiceProviderManagement = (props: any) => {
   }, [Data])
 
   useEffect(() => {
-    //分页设置
-    // if (location.query.pageNum != null) {
-    //   setPageNum(parseInt(location.query.pageNum))
-    // } else {
 
-    // }
     setPageNum(1)
-
     setLoading(true)
-    //获取数据
     TosTosServiceProviderGet({
       ...location.query,
       serviceCommunityList: (testData === null || testData.length === 0) ? CommunityList : testData,
       pageNum: 1
     })
 
+
   }, [location])
 
   const CallBackTitleSearch = (comment: any) => {

src/pages/UserManagement/ServiceProviderManagement/Services.tsx

@@ -4,12 +4,7 @@ import { Form, Button, Modal, Space, Pagination, Tooltip, Checkbox } from 'antd'
 
 import { Link, useIntl, connect, Dispatch } from 'umi';
 
-
-import { PlusCircleOutlined } from '@ant-design/icons';
-
 import Line from '../../../components/Line/Line';
-import BackButton from '../../../components/BackButton/BackButton';
-import TitleGet from '../../../components/TitleGet/TitleGet';
 import TagSelect from '../../../components/TagSelect/index';
 import { RA } from '@/utils/method';
 import TitleBack from '@/components/TitleBack/TitleBack';

src/pages/user/login/index.tsx

@@ -32,9 +32,6 @@ const Login: React.FC<LoginProps> = (props) => {
 
   const handleSubmit = (values: LoginParamsType) => {
     const { dispatch } = props;
-    console.log({ ...values, type, userName, password });
-    console.log(props);
-    console.log(dispatch, 'dispatch');
     dispatch({
       type: 'login/login',
       payload: { userName, password },
@@ -84,8 +81,8 @@ const Login: React.FC<LoginProps> = (props) => {
           <ArrowLeftOutlined style={{ fontSize: '28px' }} />
         </div>
       ) : (
-        <div />
-      )}
+          <div />
+        )}
       <LoginForm activeKey={type} onTabChange={setType} onSubmit={handleSubmit}>
         <div className={styles.box1}>Account Number</div>
         <input className={styles.input} onChange={usernameHandle} />
@@ -98,20 +95,20 @@ const Login: React.FC<LoginProps> = (props) => {
             </div>
           </div>
         ) : (
-          <div>
-            <input className={styles.input2} onChange={passwdHandle} type="password" />
             <div>
-              <div className={styles.input3} onClick={gotoForgetHandle}>
-                Forget Password
+              <input className={styles.input2} onChange={passwdHandle} type="password" />
+              <div>
+                <div className={styles.input3} onClick={gotoForgetHandle}>
+                  Forget Password
               </div>
-              <div className={styles.input4}>
-                {status === 'error' && loginType === 'account' && !submitting && (
-                  <div>Wrong account or password</div>
-                )}
+                <div className={styles.input4}>
+                  {status === 'error' && loginType === 'account' && !submitting && (
+                    <div>Wrong account or password</div>
+                  )}
+                </div>
               </div>
             </div>
-          </div>
-        )}
+          )}
         <Submit className={styles.button} loading={submitting} style={{ width: 330 }}>
           {forgetflag ? 'Next' : '登录'}
         </Submit>

src/utils/method.ts

@@ -146,7 +146,7 @@ export const filterObjbyTg = (obj: any, tg: any) => {
   var tmp = {};
   for (var item in obj) {
     if (tg.indexOf(item) > -1) {
-      if (obj[item] != null) {
+      if ((obj[item] === 0 || obj[item]) && obj[item] != null) {
         tmp[item] = obj[item];
       }
     }