Commit 807940a0 authored by cellee's avatar cellee

大部分bug处理

Signed-off-by: cellee's avatarcellee <893264950@qq.com>
parent b198719b
{
"compact": false
}
\ No newline at end of file
...@@ -345,7 +345,7 @@ class SelectOptions extends React.PureComponent { ...@@ -345,7 +345,7 @@ class SelectOptions extends React.PureComponent {
if (this.state.menuList.indexOf(item) > -1) { if (this.state.menuList.indexOf(item) > -1) {
return ( return (
<a <a
key={item} key={index}
style={{ marginLeft: 10, userSelect: 'none' }} style={{ marginLeft: 10, userSelect: 'none' }}
onClick={this.itemSelect.bind(this, item)} onClick={this.itemSelect.bind(this, item)}
> >
...@@ -354,7 +354,7 @@ class SelectOptions extends React.PureComponent { ...@@ -354,7 +354,7 @@ class SelectOptions extends React.PureComponent {
); );
} else { } else {
return ( return (
<a key={item} style={{ marginLeft: 10, userSelect: 'none' }} disabled> <a key={index} style={{ marginLeft: 10, userSelect: 'none' }} disabled>
{item} {item}
</a> </a>
); );
......
...@@ -148,7 +148,7 @@ const TitleSearch = (props: any) => { ...@@ -148,7 +148,7 @@ const TitleSearch = (props: any) => {
<Select style={{ width: 160 }} placeholder={item.name[1]} allowClear={true}> <Select style={{ width: 160 }} placeholder={item.name[1]} allowClear={true}>
{item.data.map((word) => { {item.data.map((word) => {
return ( return (
<Option key={word} value={word[0]}> <Option key={index} value={word[0]}>
{word[1]} {word[1]}
</Option> </Option>
); );
......
...@@ -204,9 +204,9 @@ const Account = (props: any) => { ...@@ -204,9 +204,9 @@ const Account = (props: any) => {
<Form.Item name="tosUserName"> <Form.Item name="tosUserName">
<Input allowClear placeholder="Account Name" /> <Input allowClear placeholder="Account Name" />
</Form.Item> </Form.Item>
<Form.Item name="creatorName"> {/* <Form.Item name="creatorName">
<Input allowClear placeholder="Account Creator" /> <Input allowClear placeholder="Account Creator" />
</Form.Item> </Form.Item> */}
<Form.Item> <Form.Item>
<Button type="primary" htmlType="submit" icon={<SearchOutlined />} loading={loading}> <Button type="primary" htmlType="submit" icon={<SearchOutlined />} loading={loading}>
Search{' '} Search{' '}
......
...@@ -206,7 +206,7 @@ const Adds = (props: any) => { ...@@ -206,7 +206,7 @@ const Adds = (props: any) => {
obj.propertyFee = PropertyFee; obj.propertyFee = PropertyFee;
// 小区信息; // 小区信息;
let { residentialZipCode, residentialAddress, residentialName } = values.des; let { residentialZipCode, residentialAddress, residentialName } = values.des;
console.log(values);
obj.residentialZipCode = `SINGAPORE ${residentialZipCode}`; obj.residentialZipCode = `SINGAPORE ${residentialZipCode}`;
obj.residentialAddress = residentialAddress; obj.residentialAddress = residentialAddress;
obj.residentialName = residentialName; obj.residentialName = residentialName;
...@@ -253,7 +253,7 @@ const Adds = (props: any) => { ...@@ -253,7 +253,7 @@ const Adds = (props: any) => {
} }
console.log(obj); console.log(obj);
// 上传 // 上传
// RA(29, obj, 'CellList', dispatch); RA(29, obj, 'CellList', dispatch);
} }
// 返回 // 返回
...@@ -352,7 +352,7 @@ const Adds = (props: any) => { ...@@ -352,7 +352,7 @@ const Adds = (props: any) => {
onKeyUp={keyup_communityManagerFee} onKeyUp={keyup_communityManagerFee}
/> />
</Form.Item> </Form.Item>
<Button type="text"></Button> <Button type="text">-</Button>
<Form.Item name={['info', 'email']} noStyle rules={village[5] as any}> <Form.Item name={['info', 'email']} noStyle rules={village[5] as any}>
<Input <Input
style={{ marginLeft: '10px', width: '180px' }} style={{ marginLeft: '10px', width: '180px' }}
......
...@@ -148,8 +148,8 @@ const CellLists = (props: any) => { ...@@ -148,8 +148,8 @@ const CellLists = (props: any) => {
</Button>, </Button>,
]} ]}
options={{ options={{
density: true, density: false,
fullScreen: true, fullScreen: false,
reload: () => { reload: () => {
resetHandler(); resetHandler();
}, },
......
...@@ -164,7 +164,7 @@ const BookingDetail = (props: any) => { ...@@ -164,7 +164,7 @@ const BookingDetail = (props: any) => {
<Descriptions.Item label="User Name">{DataSave.accountName}</Descriptions.Item> <Descriptions.Item label="User Name">{DataSave.accountName}</Descriptions.Item>
<Descriptions.Item label="Contact Number">{DataSave.accountPhone}</Descriptions.Item> <Descriptions.Item label="Contact Number">{DataSave.accountPhone}</Descriptions.Item>
<Descriptions.Item label="Unit"> <Descriptions.Item label="Unit">
{DataSave.buildNumber}# {DataSave.floorNumber}-{DataSave.roomNumber} {DataSave.buildNumber} # {DataSave.floorNumber}-{DataSave.roomNumber}
</Descriptions.Item> </Descriptions.Item>
</Descriptions> </Descriptions>
......
...@@ -406,6 +406,7 @@ const Facility = (props: any) => { ...@@ -406,6 +406,7 @@ const Facility = (props: any) => {
suffix="Day" suffix="Day"
style={{ width: 160, textAlign: 'center' }} style={{ width: 160, textAlign: 'center' }}
placeholder="0" placeholder="0"
maxLength={2}
/> />
</Form.Item> </Form.Item>
<Form.Item <Form.Item
...@@ -420,6 +421,7 @@ const Facility = (props: any) => { ...@@ -420,6 +421,7 @@ const Facility = (props: any) => {
suffix="Day" suffix="Day"
style={{ width: 160, textAlign: 'center' }} style={{ width: 160, textAlign: 'center' }}
placeholder="0" placeholder="0"
maxLength={2}
/> />
</Form.Item> </Form.Item>
<Form.Item label="Booking" name="canReservationDay" rules={NewFaci[7]}> <Form.Item label="Booking" name="canReservationDay" rules={NewFaci[7]}>
...@@ -430,6 +432,7 @@ const Facility = (props: any) => { ...@@ -430,6 +432,7 @@ const Facility = (props: any) => {
disabled={facilityDetail} disabled={facilityDetail}
prefix="Advance" prefix="Advance"
suffix="Day" suffix="Day"
maxLength={2}
/> />
</Form.Item> </Form.Item>
</Input.Group> </Input.Group>
......
...@@ -8,6 +8,7 @@ import { RA, SA } from '@/utils/method'; ...@@ -8,6 +8,7 @@ import { RA, SA } from '@/utils/method';
import { PlusOutlined, SearchOutlined, ClearOutlined } from '@ant-design/icons'; import { PlusOutlined, SearchOutlined, ClearOutlined } from '@ant-design/icons';
import './index.less'; import './index.less';
import moment from 'moment'; import moment from 'moment';
import SearchOptionsCommnity from '@/components/SearchOptions/SearchOptionsCommnity';
const module = 'VisitorRecord'; const module = 'VisitorRecord';
...@@ -105,6 +106,7 @@ const VisitorRecord = (props: any) => { ...@@ -105,6 +106,7 @@ const VisitorRecord = (props: any) => {
// 点击重置 // 点击重置
const onResetFrom = () => { const onResetFrom = () => {
form.resetFields();
onReset(); onReset();
}; };
...@@ -163,6 +165,13 @@ const VisitorRecord = (props: any) => { ...@@ -163,6 +165,13 @@ const VisitorRecord = (props: any) => {
return JSON.stringify(newObj); return JSON.stringify(newObj);
} }
// 选择小区名字并赋值
const opname = (value: any) => {
form.setFieldsValue({
visitorCommunity: value,
});
};
return ( return (
<> <>
<div className="VisitorRecord"> <div className="VisitorRecord">
...@@ -173,6 +182,12 @@ const VisitorRecord = (props: any) => { ...@@ -173,6 +182,12 @@ const VisitorRecord = (props: any) => {
name="contract" name="contract"
onFinish={onSubmitForm} onFinish={onSubmitForm}
> >
<Form.Item name="visitorCommunity">
<SearchOptionsCommnity
// ubmit={extendName}
opname={opname}
/>
</Form.Item>
<Form.Item name="inviterName"> <Form.Item name="inviterName">
<Input allowClear placeholder="Please input Invitees Name." style={{ width: 240 }} /> <Input allowClear placeholder="Please input Invitees Name." style={{ width: 240 }} />
</Form.Item> </Form.Item>
......
...@@ -8,6 +8,7 @@ import { RA, SA } from '@/utils/method'; ...@@ -8,6 +8,7 @@ import { RA, SA } from '@/utils/method';
import { PlusOutlined, SearchOutlined, ClearOutlined } from '@ant-design/icons'; import { PlusOutlined, SearchOutlined, ClearOutlined } from '@ant-design/icons';
import './index.less'; import './index.less';
import moment from 'moment'; import moment from 'moment';
import SearchOptionsCommnity from '@/components/SearchOptions/SearchOptionsCommnity';
const module = 'VisitorRecord'; const module = 'VisitorRecord';
...@@ -105,6 +106,7 @@ const VisitorRecord = (props: any) => { ...@@ -105,6 +106,7 @@ const VisitorRecord = (props: any) => {
// 点击重置 // 点击重置
const onResetFrom = () => { const onResetFrom = () => {
form.resetFields();
onReset(); onReset();
}; };
...@@ -163,6 +165,13 @@ const VisitorRecord = (props: any) => { ...@@ -163,6 +165,13 @@ const VisitorRecord = (props: any) => {
return JSON.stringify(newObj); return JSON.stringify(newObj);
} }
// 选择小区名字并赋值
const opname = (value: any) => {
form.setFieldsValue({
visitorCommunity: value,
});
};
return ( return (
<> <>
<div className="VisitorRecord"> <div className="VisitorRecord">
...@@ -173,6 +182,12 @@ const VisitorRecord = (props: any) => { ...@@ -173,6 +182,12 @@ const VisitorRecord = (props: any) => {
name="contract" name="contract"
onFinish={onSubmitForm} onFinish={onSubmitForm}
> >
<Form.Item name="visitorCommunity">
<SearchOptionsCommnity
// ubmit={extendName}
opname={opname}
/>
</Form.Item>
<Form.Item name="inviterName"> <Form.Item name="inviterName">
<Input allowClear placeholder="Please input Invitees Name." style={{ width: 240 }} /> <Input allowClear placeholder="Please input Invitees Name." style={{ width: 240 }} />
</Form.Item> </Form.Item>
......
{
"compact": false
}
\ No newline at end of file
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