Merge branch 'final' of http://120.77.240.215:9701/Maple/tostumi.git into final

src/components/Relationship/Relationship.tsx

-import React,{useEffect} from 'react';
+import React, { useEffect } from 'react';
 import { Select } from 'antd';
 const { Option } = Select;
 
-const Relationship = (props:any) => {
+const Relationship = (props: any) => {
+  const { value, onChange } = props;
 
-  const { value, onChange }=props
-  
-  useEffect(()=>{
-    onChange("0")
-  },[])
-  const handleChange=(values:any)=>{
-    onChange(values)
-  }
+  useEffect(() => {
+    onChange('0');
+  }, []);
+  const handleChange = (values: any) => {
+    onChange(values);
+  };
   return (
     <>
-    <Select defaultValue="0" style={{ width: 120 }} onChange={handleChange} allowClear>
-      <Option value="0">Oneself</Option>
-      <Option value="1">Family Members</Option>
-      <Option value="2">Tenant</Option>
-    </Select>
+      <Select defaultValue="0" style={{ width: 120 }} onChange={handleChange} allowClear>
+        <Option value="0">Owner</Option>
+        <Option value="1">Family Members</Option>
+        <Option value="2">Tenant</Option>
+      </Select>
     </>
   );
 };

src/pages/CommercialService/Card.tsx

@@ -26,21 +26,22 @@ const Card = (props: any) => {
   // const apply_status = [[0, "审核中"], [1, "批准"], [2, "拒绝"], [3, "领取"]]
   const apply_status = [
     [0, 'Pending'],
-    [1, 'Approval'],
-    [2, 'Reject'],
+    [1, 'Approved'],
+    [2, 'Rejected'],
     [3, 'Received'],
   ];
 
   const apply_relation = [
-    [0, 'Oneself'],
-    [1, 'Family Members'],
+    [0, 'Owner'],
+    [1, 'Family Member'],
     [2, 'Tenant'],
   ];
 
   const columns = objectColumns([
-    ['Community Name', 'community_name'],
+    ['Community', 'community_name'],
+    ['Requestor', 'apply_name'],
     [
-      'Unit',
+      'Unit No',
       null,
       (text: any, record: any) => (
         <Space size="middle">
@@ -48,7 +49,6 @@ const Card = (props: any) => {
         </Space>
       ),
     ],
-    ['User Name', 'apply_name'],
     [
       'Account Type',
       'apply_relation_owner',

src/pages/CommercialService/CardAdd.tsx

@@ -94,7 +94,7 @@ const CardAdd = (props: any) => {
 
   return (
     <div style={{ width: '100%', minWidth: 1020, padding: 34, backgroundColor: '#ffffff' }}>
-      <TitleBack title={'Apply Card Add'}></TitleBack>
+      <TitleBack title={'New Application For Access Card'}></TitleBack>
 
       <Form form={form} name="basic" onFinish={onFinish} validateMessages={validateMessages}>
         <Spin spinning={loading}>
@@ -143,7 +143,7 @@ const CardAdd = (props: any) => {
             ></Input>
           </Form.Item>
 
-          <Form.Item labelCol={{ span: 3 }} label="Owner Name" style={{ marginBottom: -40 }}>
+          <Form.Item labelCol={{ span: 3 }} label="Owner" style={{ marginBottom: -40 }}>
             <Input.Group compact>
               <Form.Item
                 name="communityOwner"
@@ -152,7 +152,7 @@ const CardAdd = (props: any) => {
               >
                 <Input placeholder={'Name'} />
               </Form.Item>
-              <Form.Item style={{ marginRight: 20 }} label={'Contact Information'}>
+              <Form.Item style={{ marginRight: 20 }} label={'Contact Details'}>
                 <Input hidden={true} />
               </Form.Item>
               <Form.Item
@@ -179,7 +179,7 @@ const CardAdd = (props: any) => {
               >
                 <Input placeholder={'Name'} />
               </Form.Item>
-              <Form.Item style={{ marginRight: 20 }} label={'Contact Information'}>
+              <Form.Item style={{ marginRight: 20 }} label={'Contact Details'}>
                 <Input hidden={true} />
               </Form.Item>
               <Form.Item

src/pages/CommercialService/CardDetail.tsx

@@ -18,7 +18,7 @@ const apply_status = [
   [3, 'Received'],
 ];
 
-const apply_relation_owner = ['Oneself', 'Family Members', 'Tenant '];
+const apply_relation_owner = ['Owner', 'Family Member', 'Tenant'];
 
 const CardDetail = (props: any) => {
   const { dispatch, DataSaveDetail, location } = props;
@@ -86,7 +86,7 @@ const CardDetail = (props: any) => {
                 'Status : ' + apply_status[listData.apply_status][1],
                 'Time : ' + moment(listData.create_time.time).format('DD-MM-YYYY'),
               ]}
-              title="Apply Card Detail"
+              title="Access Card Application Details"
             ></TitleBack>
 
             <Row gutter={8}>
@@ -106,14 +106,14 @@ const CardDetail = (props: any) => {
             <Row gutter={8} style={{ marginTop: 16 }}>
               <Col>Owner Name:</Col>
               <Col span={3}>{onwerDetail.owerName}</Col>
-              <Col>Phone:</Col>
+              <Col>Contact Details:</Col>
               <Col>{onwerDetail.owerPhone}</Col>
             </Row>
             <Line></Line>
             <Row gutter={8} style={{ marginTop: 16 }}>
-              <Col span={3}>Apply Name:</Col>
+              <Col span={3}>Applicant:</Col>
               <Col span={3}>{listData.apply_name}</Col>
-              <Col>Phone:</Col>
+              <Col>Contact Details:</Col>
               <Col>{listData.apply_name_phone}</Col>
             </Row>
             <Row gutter={8} style={{ marginTop: 16 }}>
@@ -142,9 +142,9 @@ const CardDetail = (props: any) => {
                       rules={[{ required: true, message: 'Please select the reply result!' }]}
                     >
                       <Radio.Group>
-                        <Radio.Button value={'1'}>Agree</Radio.Button>
+                        <Radio.Button value={'1'}>Approve</Radio.Button>
                         <Radio.Button style={{ marginLeft: 10 }} value={'2'}>
-                          Refuse
+                          Reject
                         </Radio.Button>
                       </Radio.Group>
                     </Form.Item>
@@ -161,7 +161,7 @@ const CardDetail = (props: any) => {
                 </Row>
 
                 <Row gutter={8} style={{ marginTop: 16 }}>
-                  <Col span={3}>Received:</Col>
+                  <Col span={3}>Card Received:</Col>
                   <Col span={4}>
                     <Form.Item name="applyStatus">
                       <Radio.Group>
@@ -179,9 +179,9 @@ const CardDetail = (props: any) => {
             ) : (
               <>
                 <Row>
-                  <Col span={3}>Replyer:</Col>
+                  <Col span={3}>Attended By:</Col>
                   <Col span={3}>{listData.replyName}</Col>
-                  <Col span={3}>Contact:</Col>
+                  <Col span={3}>Contact Details:</Col>
                   <Col>{listData.replyContact}</Col>
                 </Row>
                 <Row gutter={8} style={{ marginTop: 16 }}>
@@ -190,7 +190,7 @@ const CardDetail = (props: any) => {
                     <Radio.Group value={listData.apply_status === 2 ? '2' : '1'}>
                       <Radio.Button value={'1'}>Agree</Radio.Button>
                       <Radio.Button style={{ marginLeft: 10 }} value={'2'}>
-                        Refuse
+                        Reject
                       </Radio.Button>
                     </Radio.Group>
                   </Col>
@@ -210,7 +210,7 @@ const CardDetail = (props: any) => {
                 {listData.apply_status === 1 ? (
                   <Form ref={formRef} name="basic" onFinish={onFinish}>
                     <Row gutter={8} style={{ marginTop: 16 }}>
-                      <Col span={3}>Received:</Col>
+                      <Col span={3}>Card Received:</Col>
                       <Col span={4}>
                         <Form.Item name="applyStatus">
                           <Radio.Group>
@@ -227,7 +227,7 @@ const CardDetail = (props: any) => {
                   </Form>
                 ) : (
                   <Row gutter={8} style={{ marginTop: 16 }}>
-                    <Col span={3}>Received:</Col>
+                    <Col span={3}>Card Received:</Col>
                     <Col span={4}>
                       <Radio.Group value={listData.apply_status === 3 ? '3' : ''}>
                         <Radio value={'3'}>Receive</Radio>

src/pages/CommercialService/Detail.tsx

@@ -29,7 +29,7 @@ const Detail = (props: any) => {
 
   const headTitles = [
     'Reply To Community maintenance',
-    'Reply To Shelf life Service',
+    'Reply To Warranty Period Service',
     'Reply To Owner Complaints',
     'Reply To Report Online',
     'Reply To Problem Feedback',
@@ -37,7 +37,7 @@ const Detail = (props: any) => {
 
   const headTitlesDetail = [
     'Details of community maintenance',
-    'Details of Shelf life Service',
+    'Details of Warranty Period Service',
     'Details of Owner Complaints',
     'Details of Report Online',
     'Details of Problem Feedback',

src/pages/PropertyManagement/ChargeDetail.tsx

@@ -18,8 +18,6 @@ const ChargeDetail = (props: any) => {
   const [pages, setPages] = useState(1);
   const [curpage, setCurpage] = useState(1);
 
-  const [loading, setLoading] = useState(false);
-
   useEffect(() => {
     if (CurData) {
       dispatch({
@@ -33,16 +31,14 @@ const ChargeDetail = (props: any) => {
           },
         },
       });
-      setLoading(true);
+      console.log('发起请求');
     } else {
       history.back();
     }
   }, []);
 
   useEffect(() => {
-    if (FileImg) {
-      setLoading(false);
-    }
+    console.log(FileImg);
   }, [FileImg]);
 
   const pdfpages = (pages: any) => {
@@ -84,7 +80,7 @@ const ChargeDetail = (props: any) => {
           <div className={styles.box4}>
             <Pagination simple defaultCurrent={curpage} total={pages * 10} onChange={pageChange} />
           </div>
-          <Spin spinning={loading}>
+          {CurData.billFileUrl.length > 0 || FileImg ? (
             <Tooltip title={scale == 1.3 ? '点击放大查看' : '还原视图'}>
               <div className={scale == 1.3 ? styles.box3out : null}>
                 <div className={scale == 1.3 ? styles.box3 : styles.box3of} onClick={lookup}>
@@ -92,7 +88,7 @@ const ChargeDetail = (props: any) => {
                     // key="pdfjs"
                     file={
                       // 'data:application/pdf;base64,' + stringSplit(CurData.billFileUrl, 'm/cash')
-                      stringSplit(CurData.billFileUrl || FileImg[0].fileUrl, 'm/cash')
+                      stringSplit(CurData.billFileUrl || FileImg, 'm/cash')
                     }
                     // workerSrc="//cdnjs.cloudflare.com/ajax/libs/pdf.js/2.2.228/pdf.worker.js"
                     scale={scale}
@@ -102,7 +98,9 @@ const ChargeDetail = (props: any) => {
                 </div>
               </div>
             </Tooltip>
-          </Spin>
+          ) : (
+            <></>
+          )}
         </>
       ) : null}
     </div>

src/pages/UserManagement/LIFEUserManagement/UsersDetail.tsx

@@ -370,7 +370,7 @@ const UsersDetail = (props: any) => {
                   <Col span={4}>{memberData.owner_family_name}</Col>
                 </Row>
                 <Row gutter={16}>
-                  <Col span={4}>Contact Number：</Col>
+                  <Col span={4}>Contact Details：</Col>
                   <Col span={4}>{memberData.owner_family_phone}</Col>
                   <Col span={4}>{memberData.owner_family_email}</Col>
                 </Row>