Skip to content

T
TOSTUMI
Commit 4ad66726 authored by Sixiang_Zzb's avatar Sixiang_Zzb
Browse files
Options

小区模块文案修改和排版修改，物业模块文案修改

parent 61fdac01
Show whitespace changes
Inline Side-by-side
Showing with 116 additions and 101 deletions
src/components/TreeAction/TreeAction.tsx
View file @ 4ad66726
import React, { useEffect }from 'react'; import React, { useEffect } from 'react';
import styles from './index.less'; import styles from './index.less';
import { Tree } from 'antd'; import { Tree } from 'antd';
// const treeData = [ // const treeData = [
// { // {
// title: 'LIFE用户管理', // title: 'LIFE用户管理',
...@@ -93,10 +92,10 @@ const treeData = [ ...@@ -93,10 +92,10 @@ const treeData = [
title: 'Life user management', title: 'Life user management',
key: 'A', key: 'A',
children: [ children: [
{title: 'View life users',key: '2'}, { title: 'View life users', key: '2' },
{ title: 'Edit life user', key: '3' }, { title: 'Edit life user', key: '3' },
{ title: 'Add owner file', key: '4' }, { title: 'Add owner file', key: '4' },
{title: 'Cancellation of owner files',key: '5'}, { title: 'Cancellation of owner files', key: '5' },
], ],
}, },
{ title: 'Data center', key: '1' }, { title: 'Data center', key: '1' },
...@@ -104,17 +103,17 @@ const treeData = [ ...@@ -104,17 +103,17 @@ const treeData = [
title: 'Service provider management', title: 'Service provider management',
key: 'B', key: 'B',
children: [ children: [
{title: 'View service provider',key: '6'}, { title: 'View service provider', key: '6' },
{ title: 'Editorial service provider', key: '7' }, { title: 'Editorial service provider', key: '7' },
{ title: 'Add service provider', key: '8' }, { title: 'Add service provider', key: '8' },
{title: 'Cancellation of service provider',key: '9'}, { title: 'Cancellation of service provider', key: '9' },
], ],
}, },
{ {
title: 'Property management', title: 'Property management',
key: 'C', key: 'C',
children: [ children: [
{title: 'View property fee records',key: '10'}, { title: 'View property fee records', key: '10' },
{ title: 'Add property fee record', key: '11' }, { title: 'Add property fee record', key: '11' },
], ],
}, },
...@@ -122,7 +121,7 @@ const treeData = [ ...@@ -122,7 +121,7 @@ const treeData = [
title: 'Estate management', title: 'Estate management',
key: 'D', key: 'D',
children: [ children: [
{title: 'View property services',key: '12'}, { title: 'View property services', key: '12' },
{ title: 'Edit property services', key: '13' }, { title: 'Edit property services', key: '13' },
{ title: 'Cancellation of property services', key: '14' }, { title: 'Cancellation of property services', key: '14' },
], ],
...@@ -131,7 +130,7 @@ const treeData = [ ...@@ -131,7 +130,7 @@ const treeData = [
title: 'Order management', title: 'Order management',
key: 'E', key: 'E',
children: [ children: [
{title: 'View order',key: '15'}, { title: 'View order', key: '15' },
{ title: 'Edit order', key: '16' }, { title: 'Edit order', key: '16' },
], ],
}, },
...@@ -139,26 +138,26 @@ const treeData = [ ...@@ -139,26 +138,26 @@ const treeData = [
title: 'Contract management', title: 'Contract management',
key: 'F', key: 'F',
children: [ children: [
{title: 'View contract',key: '17'}, { title: 'View contract', key: '17' },
{ title: 'Edit contract', key: '18' }, { title: 'Edit contract', key: '18' },
{ title: 'Add contract', key: '19'}, { title: 'Add contract', key: '19' },
], ],
}, },
{ {
title: 'Community management', title: 'Community management',
key: 'G', key: 'G',
children: [ children: [
{title: 'View community',key: '20'}, { title: 'View community', key: '20' },
{ title: 'Edit community', key: '21' }, { title: 'Edit community', key: '21' },
{ title: 'Add cell', key: '22' }, { title: 'Add cell', key: '22' },
], ],
}, },
{ title: 'Visitor record', key: '26' }, { title: 'Visitor records', key: '26' },
{ {
title: 'Booking facilities', title: 'Booking facilities',
key: 'H', key: 'H',
children: [ children: [
{title: 'View booking services',key: '27'}, { title: 'View booking services', key: '27' },
{ title: 'Edit booking service', key: '28' }, { title: 'Edit booking service', key: '28' },
{ title: 'Add booking service', key: '29' }, { title: 'Add booking service', key: '29' },
], ],
...@@ -167,55 +166,80 @@ const treeData = [ ...@@ -167,55 +166,80 @@ const treeData = [
title: 'Back-stage management', title: 'Back-stage management',
key: 'I', key: 'I',
children: [ children: [
{title: 'View background account',key: '30'}, { title: 'View background account', key: '30' },
{ title: 'Configure background account', key: '31' }, { title: 'Configure background account', key: '31' },
], ],
}, },
]; ];
const TreeAction = (props:any) => { const TreeAction = (props: any) => {
const { value, onChange } = props;
const {value,onChange}=props const onSelect = (selectedKeys: any, info: any) => {
const onSelect = (selectedKeys:any, info:any) => {
// console.log('selected', selectedKeys, info); // console.log('selected', selectedKeys, info);
}; };
useEffect(()=>{ useEffect(() => {
onChange([ onChange([
'2', '3', '4', '5', '1', '2',
'6', '7', '8', '9', '10', '3',
'11', '12', '13', '14', '15', '4',
'16', '17', '18', '19', '20', '5',
'21', '22', '26', '27', '28', '1',
'29', '30', '31' '6',
]) '7',
},[]) '8',
const onCheck = (checkedKeys:any, info:any) => { '9',
const checklist = ['A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I'] '10',
var array=new Array() '11',
checkedKeys.map((items:any, index:any) => { '12',
var nothave=true '13',
'14',
'15',
'16',
'17',
'18',
'19',
'20',
'21',
'22',
'26',
'27',
'28',
'29',
'30',
'31',
]);
}, []);
const onCheck = (checkedKeys: any, info: any) => {
const checklist = ['A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I'];
var array = new Array();
checkedKeys.map((items: any, index: any) => {
var nothave = true;
checklist.map((check, i) => { checklist.map((check, i) => {
if (items == check) { if (items == check) {
nothave=false nothave = false;
} }
}) });
if (nothave) { if (nothave) {
array.push(items) array.push(items);
} }
}) });
// props.onSubmit(array) // props.onSubmit(array)
onChange(array) onChange(array);
}; };
return ( return (
<> <>
<Tree checkable defaultExpandedKeys={[]} defaultSelectedKeys={[]} defaultCheckedKeys={['A','B','C','D','E','F','G','H','I','1','26']} <Tree
checkable
defaultExpandedKeys={[]}
defaultSelectedKeys={[]}
defaultCheckedKeys={['A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', '1', '26']}
onSelect={onSelect} onSelect={onSelect}
onCheck={onCheck} onCheck={onCheck}
treeData={treeData}/> treeData={treeData}
/>
</> </>
); );
}; };
export default TreeAction; export default TreeAction;
src/locales/en-US/menu.ts
View file @ 4ad66726
...@@ -77,7 +77,7 @@ export default { ...@@ -77,7 +77,7 @@ export default {
'menu.communitymanagement.celllist': 'Community', 'menu.communitymanagement.celllist': 'Community',
'menu.communitymanagement.communityannouncement': 'Announcements', 'menu.communitymanagement.communityannouncement': 'Announcements',
'menu.communitymanagement.facilitybookings': 'Facility Bookings', 'menu.communitymanagement.facilitybookings': 'Facility Bookings',
'menu.communitymanagement.visitorrecord': 'Visitor Record', 'menu.communitymanagement.visitorrecord': 'Visitor Records',
'menu.accountmanagement': 'General Admin Functions', 'menu.accountmanagement': 'General Admin Functions',
'menu.accountmanagement.accountmanagement1': 'Admin Account Management', 'menu.accountmanagement.accountmanagement1': 'Admin Account Management',
'menu.accountmanagement.systemfeedback': 'System Issue Feedback', 'menu.accountmanagement.systemfeedback': 'System Issue Feedback',
......
src/pages/CommunityManagement/CellList/Adds.tsx
View file @ 4ad66726
...@@ -305,13 +305,15 @@ const Adds = (props: any) => { ...@@ -305,13 +305,15 @@ const Adds = (props: any) => {
setForms(!forms); setForms(!forms);
}; };
console.log(match);
return ( return (
<> <>
<Spin spinning={loading} tip="loading..." size="large"> <Spin spinning={loading} tip="loading..." size="large">
<div className="form"> <div className="form">
<h3 className="capi"> <h3 className="capi">
<EditOutlined /> <EditOutlined />
&nbsp; {match && match.params ? 'edit' : 'Create New'} community &nbsp; {match && match.params.id ? 'edit' : 'Create New'} community
<div className="back"> <div className="back">
<Button onClick={goToReturn}> <Button onClick={goToReturn}>
<LeftOutlined /> <LeftOutlined />
...@@ -356,11 +358,7 @@ const Adds = (props: any) => { ...@@ -356,11 +358,7 @@ const Adds = (props: any) => {
/> />
</Form.Item> </Form.Item>
{/* 小区联系方式 */} {/* 小区联系方式 */}
<Form.Item <Form.Item name="residentialPhone" label="Contact Number" rules={village[4] as any}>
name="residentialPhone"
label="Community Telephone"
rules={village[4] as any}
>
<Input <Input
style={{ marginRight: '10px', width: '240px' }} style={{ marginRight: '10px', width: '240px' }}
placeholder="Please enter phone" placeholder="Please enter phone"
...@@ -369,7 +367,7 @@ const Adds = (props: any) => { ...@@ -369,7 +367,7 @@ const Adds = (props: any) => {
/> />
</Form.Item> </Form.Item>
{/* 小区邮箱 */} {/* 小区邮箱 */}
<Form.Item name="residentialEmail" label="Community Mailbox" rules={village[5] as any}> <Form.Item name="residentialEmail" label="Email" rules={village[5] as any}>
<Input style={{ width: '240px' }} placeholder="Please enter email" /> <Input style={{ width: '240px' }} placeholder="Please enter email" />
</Form.Item> </Form.Item>
{/* 小区管理员 */} {/* 小区管理员 */}
......
src/pages/CommunityManagement/CellList/Details.tsx
View file @ 4ad66726
...@@ -211,11 +211,11 @@ const Detail = (props: any) => { ...@@ -211,11 +211,11 @@ const Detail = (props: any) => {
{/* ---------- */} {/* ---------- */}
<div className="inst"> <div className="inst">
<div className="item"> <div className="item">
<label>Community Telephone：</label> <label>Contact Number：</label>
<span>{detailData.communityData.residentialPhone}</span> <span>{detailData.communityData.residentialPhone}</span>
</div> </div>
<div className="item"> <div className="item">
<label>Community Email：</label> <label>Email：</label>
<span>{detailData.communityData.residentialEmail}</span> <span>{detailData.communityData.residentialEmail}</span>
</div> </div>
</div> </div>
......
src/pages/CommunityManagement/FacilityBookings/Bookings.tsx
View file @ 4ad66726
...@@ -361,7 +361,7 @@ const Bookings = (props: any) => { ...@@ -361,7 +361,7 @@ const Bookings = (props: any) => {
<TitleBack title="Facility Bookings" /> <TitleBack title="Facility Bookings" />
<div className={styles.box1}> <div className={styles.box1}>
<div className={styles.box1item1}>Communit : </div> <div className={styles.box1item1}>Community : </div>
<div className={styles.box1item2}> <div className={styles.box1item2}>
<Spin spinning={loading} tip="Finding..."> <Spin spinning={loading} tip="Finding...">
<SearchOptionsCommnity <SearchOptionsCommnity
......
src/pages/CommunityManagement/FacilityBookings/Facility.tsx
View file @ 4ad66726
...@@ -131,7 +131,7 @@ const Facility = (props: any) => { ...@@ -131,7 +131,7 @@ const Facility = (props: any) => {
} else { } else {
tmp.tab = 3; tmp.tab = 3;
setPictrueExtend(tmp); setPictrueExtend(tmp);
setPATHNAME('Add Facility'); setPATHNAME('Create New Facility');
} }
}, []); }, []);
...@@ -329,15 +329,29 @@ const Facility = (props: any) => { ...@@ -329,15 +329,29 @@ const Facility = (props: any) => {
</Form.Item> </Form.Item>
{/* 设施名称 以及费用 */} {/* 设施名称 以及费用 */}
<Form.Item label="Facility Classification" name="facilityName" rules={NewFaci[1]}> <Form.Item label="Facility Category" name="facilityName" rules={NewFaci[1]}>
<Input <Input
placeholder="Facility Classification" placeholder="Facility Category"
disabled={facilityDetail} disabled={facilityDetail}
maxLength={30} maxLength={30}
style={{ width: '200px' }} style={{ width: '200px' }}
/> />
</Form.Item> </Form.Item>
{/* 设施详情上传 */}
<Form.Item name="categoriesDetailsImageName" label="Photo" rules={NewFaci[4]}>
<PictureOptionsRow
over={imgOpen}
data={{
// userToken: token,
imageType: 'categoriesDetailsImageName',
extends: ctyName,
}}
limitNums={99}
value={fileList}
/>
</Form.Item>
<Input.Group> <Input.Group>
<Form.Item label="Fee($):" name="communityManagerFee" style={{ marginRight: 80 }}> <Form.Item label="Fee($):" name="communityManagerFee" style={{ marginRight: 80 }}>
<InputNumber <InputNumber
...@@ -368,7 +382,7 @@ const Facility = (props: any) => { ...@@ -368,7 +382,7 @@ const Facility = (props: any) => {
<hr></hr> <hr></hr>
{/* 设施品类上传 */} {/* 设施品类上传 */}
<Form.Item label="Facilities" className="flex required" style={{ marginBottom: 0 }}> <Form.Item label="Add Facilities" className="flex required" style={{ marginBottom: 0 }}>
<Facilitys <Facilitys
disabled={imgOpen} disabled={imgOpen}
updata={{ updata={{
...@@ -379,24 +393,6 @@ const Facility = (props: any) => { ...@@ -379,24 +393,6 @@ const Facility = (props: any) => {
></Facilitys> ></Facilitys>
</Form.Item> </Form.Item>
{/* 设施详情上传 */}
<Form.Item
name="categoriesDetailsImageName"
label="Facility Pictures"
rules={NewFaci[4]}
>
<PictureOptionsRow
over={imgOpen}
data={{
// userToken: token,
imageType: 'categoriesDetailsImageName',
extends: ctyName,
}}
limitNums={99}
value={fileList}
/>
</Form.Item>
{/* 时间 */} {/* 时间 */}
<Form.Item label="Opening Hours" className="required"> <Form.Item label="Opening Hours" className="required">
<Form.Item name="Time" noStyle> <Form.Item name="Time" noStyle>
...@@ -430,7 +426,7 @@ const Facility = (props: any) => { ...@@ -430,7 +426,7 @@ const Facility = (props: any) => {
/> />
</Form.Item> </Form.Item>
<Form.Item <Form.Item
label="Cancel Reservation Without Payment" label="Cancel Booking Without Payment "
name="nomarginCancelReservationDay" name="nomarginCancelReservationDay"
rules={NewFaci[6]} rules={NewFaci[6]}
> >
......
src/pages/CommunityManagement/FacilityBookings/FacilityTow.tsx
View file @ 4ad66726
...@@ -324,14 +324,29 @@ const FacilityTow = (props: any) => { ...@@ -324,14 +324,29 @@ const FacilityTow = (props: any) => {
labelAlign="right" labelAlign="right"
> >
{/* 设施名称 以及费用 */} {/* 设施名称 以及费用 */}
<Form.Item label="Facility Classification" name="facilityName" rules={NewFaci[1]}> <Form.Item label="Facility Category" name="facilityName" rules={NewFaci[1]}>
<Input <Input
placeholder="Facility Classification" placeholder="Facility Category"
disabled={facilityDetail} disabled={facilityDetail}
maxLength={30} maxLength={30}
style={{ width: '200px' }} style={{ width: '200px' }}
/> />
</Form.Item> </Form.Item>
{/* 设施详情上传 */}
<Form.Item name="categoriesDetailsImageName" label="Photo" rules={NewFaci[4]}>
<PictureOptionsRow
over={facilityDetail}
data={{
// userToken: token,
imageType: 'categoriesDetailsImageName',
extends: ctyName,
}}
limitNums={99}
imgs={fileList}
/>
</Form.Item>
<Input.Group> <Input.Group>
<Form.Item label="Fee($):" name="communityManagerFee" style={{ marginRight: 80 }}> <Form.Item label="Fee($):" name="communityManagerFee" style={{ marginRight: 80 }}>
<InputNumber <InputNumber
...@@ -361,7 +376,7 @@ const FacilityTow = (props: any) => { ...@@ -361,7 +376,7 @@ const FacilityTow = (props: any) => {
{/* 设施品类上传 */} {/* 设施品类上传 */}
<Form.Item <Form.Item
label="Facilities" label="Add Facilities"
className="flex required" className="flex required"
style={{ marginBottom: 0, minHeight: 134 }} style={{ marginBottom: 0, minHeight: 134 }}
> >
...@@ -375,24 +390,6 @@ const FacilityTow = (props: any) => { ...@@ -375,24 +390,6 @@ const FacilityTow = (props: any) => {
></Facilitys> ></Facilitys>
</Form.Item> </Form.Item>
{/* 设施详情上传 */}
<Form.Item
name="categoriesDetailsImageName"
label="Facility Pictures"
rules={NewFaci[4]}
>
<PictureOptionsRow
over={facilityDetail}
data={{
// userToken: token,
imageType: 'categoriesDetailsImageName',
extends: ctyName,
}}
limitNums={99}
imgs={fileList}
/>
</Form.Item>
{/* 时间 */} {/* 时间 */}
<Form.Item label="Opening Hours" className="required"> <Form.Item label="Opening Hours" className="required">
<Form.Item name="Time" noStyle> <Form.Item name="Time" noStyle>
...@@ -430,7 +427,7 @@ const FacilityTow = (props: any) => { ...@@ -430,7 +427,7 @@ const FacilityTow = (props: any) => {
/> />
</Form.Item> </Form.Item>
<Form.Item <Form.Item
label="Cancel Reservation Without Payment" label="Cancel Booking Without Payment"
name="nomarginCancelReservationDay" name="nomarginCancelReservationDay"
rules={NewFaci[6]} rules={NewFaci[6]}
> >
......
src/pages/UserManagement/LIFEUserManagement/UsersAdd.tsx
View file @ 4ad66726
...@@ -92,7 +92,7 @@ const UsersAdd = (props: any) => { ...@@ -92,7 +92,7 @@ const UsersAdd = (props: any) => {
</div> </div>
<div className={styles.box2}> <div className={styles.box2}>
<div className={styles.box2item1}>Contact Details</div> <div className={styles.box2item1}>Address</div>
<div className={styles.box2item2}> <div className={styles.box2item2}>
<SearchOptionsCommnity alone={true} opname={extendName} /> <SearchOptionsCommnity alone={true} opname={extendName} />
</div> </div>
......
src/utils/power.js
View file @ 4ad66726
...@@ -326,10 +326,10 @@ export const enUsFaci = [ ...@@ -326,10 +326,10 @@ export const enUsFaci = [
], ],
}, },
{ {
title: 'Visitor Record', title: 'Visitor Records',
key: '60', key: '60',
disabled: true, disabled: true,
children: [{ title: 'View Visitor Record', key: '61', disableCheckbox: true }], children: [{ title: 'View Visitor Records', key: '61', disableCheckbox: true }],
}, },
{ {
title: 'Building Condition Report', title: 'Building Condition Report',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment