Skip to content

T
TOSTUMI
Commit 934ce15b authored by cellee's avatar cellee
Browse files
Options

修改UI样式，修复下拉选择小区清除不了 情况， 

Signed-off-by: cellee's avatarcellee <893264950@qq.com>
parent 38295bfd
Hide whitespace changes
Inline Side-by-side
Showing with 148 additions and 155 deletions
src/components/Form/PdfUpload.tsx
View file @ 934ce15b
/* /*
* @Author: your name * @Author: your name
* @Date: 2021-02-01 14:54:48 * @Date: 2021-02-01 14:54:48
* @LastEditTime: 2021-02-05 18:00:41 * @LastEditTime: 2021-02-06 11:51:58
* @LastEditors: Please set LastEditors * @LastEditors: Please set LastEditors
* @Description: In User Settings Edit * @Description: In User Settings Edit
* @FilePath: \tostumi\src\components\Form\PdfUpload.tsx * @FilePath: \tostumi\src\components\Form\PdfUpload.tsx
...@@ -19,7 +19,7 @@ interface PriceInputProps { ...@@ -19,7 +19,7 @@ interface PriceInputProps {
} }
const PdfUpload: React.FC<PriceInputProps> = ({ value = {}, onChange, disabled, action, data }) => { const PdfUpload: React.FC<PriceInputProps> = ({ value = {}, onChange, disabled, action, data }) => {
const [loading, setLoading] = useState(false); const [loading, setLoading] = useState([false, false, false, false, false]);
const [imgList, setImgList] = useState([] as any); const [imgList, setImgList] = useState([] as any);
// 上传前检测 // 上传前检测
...@@ -37,12 +37,14 @@ const PdfUpload: React.FC<PriceInputProps> = ({ value = {}, onChange, disabled, ...@@ -37,12 +37,14 @@ const PdfUpload: React.FC<PriceInputProps> = ({ value = {}, onChange, disabled,
// 上传成功怎么做 // 上传成功怎么做
const handleChange = (info: any) => { const handleChange = (info: any) => {
console.log(info);
console.log(info.event);
let { status, response } = info.file; let { status, response } = info.file;
if (status === 'uploading') { if (status === 'uploading') {
setLoading(true); // setLoading();
return; return;
} else { } else {
setLoading(false); // setLoading(false);
} }
if (status === 'done') { if (status === 'done') {
let { fileName, key } = response.data; let { fileName, key } = response.data;
...@@ -73,6 +75,7 @@ const PdfUpload: React.FC<PriceInputProps> = ({ value = {}, onChange, disabled, ...@@ -73,6 +75,7 @@ const PdfUpload: React.FC<PriceInputProps> = ({ value = {}, onChange, disabled,
name: '', name: '',
fileList: [], fileList: [],
tip: true, tip: true,
loading: false,
message: '123', message: '123',
}; };
list.push(item); list.push(item);
...@@ -86,14 +89,6 @@ const PdfUpload: React.FC<PriceInputProps> = ({ value = {}, onChange, disabled, ...@@ -86,14 +89,6 @@ const PdfUpload: React.FC<PriceInputProps> = ({ value = {}, onChange, disabled,
setImgList([...list]); setImgList([...list]);
}; };
// 上传的按钮
const uploadButton = (
<div>
{loading ? <LoadingOutlined /> : <PlusOutlined />}
<div style={{ marginTop: 8 }}>Upload</div>
</div>
);
//携带数据 、 传递给后台加 key //携带数据 、 传递给后台加 key
const updeta = (key: any) => { const updeta = (key: any) => {
data.key = key; data.key = key;
...@@ -133,8 +128,14 @@ const PdfUpload: React.FC<PriceInputProps> = ({ value = {}, onChange, disabled, ...@@ -133,8 +128,14 @@ const PdfUpload: React.FC<PriceInputProps> = ({ value = {}, onChange, disabled,
onPreview={handlePreview} // 预览 onPreview={handlePreview} // 预览
beforeUpload={beforeUpload} beforeUpload={beforeUpload}
onChange={handleChange} onChange={handleChange}
id={index}
> >
{item.fileList && item.fileList.length >= 5 ? null : uploadButton} {item.fileList && item.fileList.length >= 5 ? null : (
<div>
{loading[index] ? <LoadingOutlined /> : <PlusOutlined />}
<div style={{ marginTop: 8 }}>Upload</div>
</div>
)}
</Upload> </Upload>
<MinusCircleOutlined <MinusCircleOutlined
className="pdf-icon" className="pdf-icon"
......
src/components/GlobalHeader/index.less
View file @ 934ce15b
...@@ -14,14 +14,14 @@ ...@@ -14,14 +14,14 @@
.right { .right {
display: flex; display: flex;
float: right; float: right;
height: 64px;//@layout-header-height; height: 64px; //@layout-header-height;
margin-left: auto; margin-left: auto;
overflow: hidden; overflow: hidden;
.action { .action {
display: flex; display: flex;
align-items: center; align-items: center;
height: 100%; height: 100%;
padding: 0 12px; padding: 0 25px;
cursor: pointer; cursor: pointer;
transition: all 0.3s; transition: all 0.3s;
> span { > span {
......
src/components/SearchOptions/SearchOptionsTow.tsx
View file @ 934ce15b
/* /*
* @Author: your name * @Author: your name
* @Date: 2020-12-02 09:42:49 * @Date: 2020-12-02 09:42:49
* @LastEditTime: 2021-01-22 18:16:44 * @LastEditTime: 2021-02-06 13:24:38
* @LastEditors: your name * @LastEditors: Please set LastEditors
* @Description: In User Settings Edit * @Description: In User Settings Edit
* @FilePath: \tostumi\src\components\SearchOptions\SearchOptionsTow.tsx * @FilePath: \tostumi\src\components\SearchOptions\SearchOptionsTow.tsx
*/ */
...@@ -13,7 +13,7 @@ const { Option } = Select; ...@@ -13,7 +13,7 @@ const { Option } = Select;
const SearchOptionsTow = (porps: any) => { const SearchOptionsTow = (porps: any) => {
const { list, extendName, def, type, disabled } = porps; const { list, extendName, def, type, disabled } = porps;
const [value, setValue] = useState(undefined); const [value, setValue] = useState(null as any);
const options = list.map((d: any, index: number) => ( const options = list.map((d: any, index: number) => (
<Option value={d} key={index}> <Option value={d} key={index}>
{d} {d}
...@@ -36,6 +36,10 @@ const SearchOptionsTow = (porps: any) => { ...@@ -36,6 +36,10 @@ const SearchOptionsTow = (porps: any) => {
} }
}, [def]); }, [def]);
const onClear = () => {
setValue(null);
};
return ( return (
<div> <div>
{type ? ( {type ? (
...@@ -49,6 +53,7 @@ const SearchOptionsTow = (porps: any) => { ...@@ -49,6 +53,7 @@ const SearchOptionsTow = (porps: any) => {
optionFilterProp="children" optionFilterProp="children"
onChange={onChange} onChange={onChange}
value={value} value={value}
onClear={onClear}
disabled={disabled} disabled={disabled}
> >
{options} {options}
...@@ -62,6 +67,7 @@ const SearchOptionsTow = (porps: any) => { ...@@ -62,6 +67,7 @@ const SearchOptionsTow = (porps: any) => {
optionFilterProp="children" optionFilterProp="children"
onChange={onChange} onChange={onChange}
value={value} value={value}
onClear={onClear}
disabled={disabled} disabled={disabled}
> >
{options} {options}
......
src/pages/CommunityManagement/CommunityAnnouncement/CommunityAnnouncement.tsx
View file @ 934ce15b
...@@ -147,21 +147,16 @@ const CommunityAnnouncement = (props: any) => { ...@@ -147,21 +147,16 @@ const CommunityAnnouncement = (props: any) => {
// 表单提交 // 表单提交
const onFinishContract = (value: any) => { const onFinishContract = (value: any) => {
// console.log(value); // 要看是哪里分页
if (!value.communityNumList && !value.noticTitlel && !value.creator) { let mlist = { ...value };
message.error('Please enter one of them!'); mlist.communityNumList =
} else { value.communityNumList != null && value.communityNumList.length > 0
// 要看是哪里分页 ? [value.communityNumList]
let mlist = { ...value }; : null;
mlist.communityNumList = mlist.pageNum = 1;
value.communityNumList != null && value.communityNumList.length > 0 // 把内容存进去
? [value.communityNumList] SA(DetailPage(mlist), module, dispatch);
: null; // requst(payload);
mlist.pageNum = 1;
// 把内容存进去
SA(DetailPage(mlist), module, dispatch);
// requst(payload);
}
}; };
// 选择小区名字并赋值 // 选择小区名字并赋值
......
src/pages/CommunityManagement/FacilityBookings/Facility.tsx
View file @ 934ce15b
...@@ -329,16 +329,17 @@ const Facility = (props: any) => { ...@@ -329,16 +329,17 @@ const Facility = (props: any) => {
</Form.Item> </Form.Item>
{/* 设施名称 以及费用 */} {/* 设施名称 以及费用 */}
<Form.Item label="Facility Classification" name="facilityName" rules={NewFaci[1]}>
<Input
placeholder="Facility Classification"
disabled={facilityDetail}
maxLength={30}
style={{ width: '200px' }}
/>
</Form.Item>
<Input.Group> <Input.Group>
<Form.Item label="Facility Classification" name="facilityName" rules={NewFaci[1]}> <Form.Item label="Fee($):" name="communityManagerFee" style={{ marginRight: 80 }}>
<Input
placeholder="Facility Classification"
disabled={facilityDetail}
maxLength={30}
/>
</Form.Item>
<span className="divIconMoney">Fee($):</span>
<Form.Item label="" name="communityManagerFee">
<InputNumber <InputNumber
onKeyUp={keyup_communityManagerFee} onKeyUp={keyup_communityManagerFee}
prefix="$" prefix="$"
...@@ -350,8 +351,7 @@ const Facility = (props: any) => { ...@@ -350,8 +351,7 @@ const Facility = (props: any) => {
style={{ width: '120px' }} style={{ width: '120px' }}
/> />
</Form.Item> </Form.Item>
<span className="divIconMoney">Deposit:</span> <Form.Item label="Deposit:" name="communityMargin">
<Form.Item label="" name="communityMargin">
<InputNumber <InputNumber
onKeyUp={keyup_communityMargin} onKeyUp={keyup_communityMargin}
prefix="$" prefix="$"
...@@ -418,49 +418,47 @@ const Facility = (props: any) => { ...@@ -418,49 +418,47 @@ const Facility = (props: any) => {
<p className="diyp">Booking Rules : </p> <p className="diyp">Booking Rules : </p>
{/* 预约设置 */} {/* 预约设置 */}
<Input.Group> <Form.Item name="cancelReservationDay" label="Early Cancellation" rules={NewFaci[5]}>
<Form.Item name="cancelReservationDay" label="Early Cancellation" rules={NewFaci[5]}> <Input
<Input onKeyUp={keyup.bind(this, 'cancelReservationDay')}
onKeyUp={keyup.bind(this, 'cancelReservationDay')} disabled={facilityDetail}
disabled={facilityDetail} // prefix="Advance"
// prefix="Advance" suffix="Day(s) In Advance"
suffix="Day(s) In Advance" style={{ width: 160, textAlign: 'center' }}
style={{ width: 160, textAlign: 'center' }} placeholder="0"
placeholder="0" maxLength={2}
maxLength={2} />
/> </Form.Item>
</Form.Item> <Form.Item
<Form.Item label="Cancel Reservation Without Payment"
label="Cancel Reservation Without Payment" name="nomarginCancelReservationDay"
name="nomarginCancelReservationDay" rules={NewFaci[6]}
rules={NewFaci[6]} >
> <Input
<Input onKeyUp={keyup.bind(this, 'nomarginCancelReservationDay')}
onKeyUp={keyup.bind(this, 'nomarginCancelReservationDay')} disabled={facilityDetail}
disabled={facilityDetail} // prefix="Advance"
// prefix="Advance" suffix="Day(s) In Advance"
suffix="Day(s) In Advance" style={{ width: 160, textAlign: 'center' }}
style={{ width: 160, textAlign: 'center' }} placeholder="0"
placeholder="0" maxLength={2}
maxLength={2} />
/> </Form.Item>
</Form.Item> <Form.Item label="Booking" name="canReservationDay" rules={NewFaci[7]}>
<Form.Item label="Booking" name="canReservationDay" rules={NewFaci[7]}> <Input
<Input onKeyUp={keyup.bind(this, 'canReservationDay')}
onKeyUp={keyup.bind(this, 'canReservationDay')} placeholder="0"
placeholder="0" style={{ width: 160, textAlign: 'center' }}
style={{ width: 160, textAlign: 'center' }} disabled={facilityDetail}
disabled={facilityDetail} // prefix="Advance"
// prefix="Advance" suffix="Day(s) In Advance"
suffix="Day(s) In Advance" maxLength={2}
maxLength={2} />
/> </Form.Item>
</Form.Item>
</Input.Group>
{/* 设置次数 */} {/* 设置次数 */}
<Input.Group> <Input.Group>
<Form.Item label="Booking Limits" rules={NewFaci[8]}> <Form.Item label="Booking Limits" className="flex required" rules={NewFaci[8]}>
<Select <Select
placeholder="Cycle" placeholder="Cycle"
allowClear allowClear
......
src/pages/CommunityManagement/FacilityBookings/FacilityTow.tsx
View file @ 934ce15b
...@@ -324,16 +324,16 @@ const FacilityTow = (props: any) => { ...@@ -324,16 +324,16 @@ const FacilityTow = (props: any) => {
labelAlign="right" labelAlign="right"
> >
{/* 设施名称 以及费用 */} {/* 设施名称 以及费用 */}
<Form.Item label="Facility Classification" name="facilityName" rules={NewFaci[1]}>
<Input
placeholder="Facility Classification"
disabled={facilityDetail}
maxLength={30}
style={{ width: '200px' }}
/>
</Form.Item>
<Input.Group> <Input.Group>
<Form.Item label="Facility Classification" name="facilityName" rules={NewFaci[1]}> <Form.Item label="Fee($):" name="communityManagerFee" style={{ marginRight: 80 }}>
<Input
placeholder="Facility Classification"
disabled={facilityDetail}
maxLength={30}
/>
</Form.Item>
<span className="divIconMoney">Fee($):</span>
<Form.Item label="" name="communityManagerFee">
<InputNumber <InputNumber
prefix="$" prefix="$"
placeholder="00.00" placeholder="00.00"
...@@ -344,8 +344,7 @@ const FacilityTow = (props: any) => { ...@@ -344,8 +344,7 @@ const FacilityTow = (props: any) => {
style={{ width: '120px' }} style={{ width: '120px' }}
/> />
</Form.Item> </Form.Item>
<span className="divIconMoney">Deposit:</span> <Form.Item label="Deposit:" name="communityMargin">
<Form.Item label="" name="communityMargin">
<InputNumber <InputNumber
prefix="$" prefix="$"
placeholder="00.00" placeholder="00.00"
...@@ -415,53 +414,51 @@ const FacilityTow = (props: any) => { ...@@ -415,53 +414,51 @@ const FacilityTow = (props: any) => {
<p className="diyp">Booking Rules : </p> <p className="diyp">Booking Rules : </p>
{/* 预约设置 */} {/* 预约设置 */}
<Input.Group> <Form.Item
<Form.Item name="cancelReservationDay"
name="cancelReservationDay" label="Early Cancellation"
label="Early Cancellation" rules={NewFaci[5]}
rules={NewFaci[5]} >
> <Input
<Input onKeyUp={keyup.bind(this, 'cancelReservationDay')}
onKeyUp={keyup.bind(this, 'cancelReservationDay')} disabled={facilityDetail}
disabled={facilityDetail} // prefix="Advance"
// prefix="Advance" suffix="Day(s) In Advance"
suffix="Day(s) In Advance" style={{ width: 160, textAlign: 'center' }}
style={{ width: 160, textAlign: 'center' }} placeholder="0"
placeholder="0" maxLength={2}
maxLength={2} />
/> </Form.Item>
</Form.Item> <Form.Item
<Form.Item label="Cancel Reservation Without Payment"
label="Cancel Reservation Without Payment" name="nomarginCancelReservationDay"
name="nomarginCancelReservationDay" rules={NewFaci[6]}
rules={NewFaci[6]} >
> <Input
<Input onKeyUp={keyup.bind(this, 'nomarginCancelReservationDay')}
onKeyUp={keyup.bind(this, 'nomarginCancelReservationDay')} disabled={facilityDetail}
disabled={facilityDetail} // prefix="Advance"
// prefix="Advance" suffix="Day(s) In Advance"
suffix="Day(s) In Advance" style={{ width: 160, textAlign: 'center' }}
style={{ width: 160, textAlign: 'center' }} placeholder="0"
placeholder="0" maxLength={2}
maxLength={2} />
/> </Form.Item>
</Form.Item> <Form.Item label="Booking" name="canReservationDay" rules={NewFaci[7]}>
<Form.Item label="Booking" name="canReservationDay" rules={NewFaci[7]}> <Input
<Input onKeyUp={keyup.bind(this, 'canReservationDay')}
onKeyUp={keyup.bind(this, 'canReservationDay')} placeholder="0"
placeholder="0" style={{ width: 160, textAlign: 'center' }}
style={{ width: 160, textAlign: 'center' }} disabled={facilityDetail}
disabled={facilityDetail} // prefix="Advance"
// prefix="Advance" suffix="Day(s) In Advance"
suffix="Day(s) In Advance" maxLength={2}
maxLength={2} />
/> </Form.Item>
</Form.Item>
</Input.Group>
{/* 设置次数 */} {/* 设置次数 */}
<Input.Group> <Input.Group>
<Form.Item label="Booking Limits" rules={NewFaci[8]}> <Form.Item label="Booking Limits" className="flex required" rules={NewFaci[8]}>
<Select <Select
placeholder="Cycle" placeholder="Cycle"
allowClear allowClear
......
src/pages/CommunityManagement/FacilityBookings/css/index.less
View file @ 934ce15b
...@@ -332,7 +332,7 @@ hr { ...@@ -332,7 +332,7 @@ hr {
.divIconMoney { .divIconMoney {
display: inline-block; display: inline-block;
margin-right: 10px; width: 68px;
color: rgba(0, 0, 0, 0.85); color: rgba(0, 0, 0, 0.85);
line-height: 32px; line-height: 32px;
} }
......
src/pages/ContractManagement/Contract.tsx
View file @ 934ce15b
...@@ -126,14 +126,10 @@ const Contract = (props: any) => { ...@@ -126,14 +126,10 @@ const Contract = (props: any) => {
// 表单提交 // 表单提交
const onFinishContract = (value: any) => { const onFinishContract = (value: any) => {
if (!value.communityName && !value.contractNumber && !value.contractTitle) { value.pageNum = 1;
message.error('Please enter one of them!'); let t = { ...term, ...value };
} else { setTerm(t);
value.pageNum = 1; RA(19, t);
let t = { ...term, ...value };
setTerm(t);
RA(19, t);
}
}; };
// 选择小区名字并赋值 // 选择小区名字并赋值
......
src/pages/ContractManagement/ContractContent.tsx
View file @ 934ce15b
...@@ -186,7 +186,7 @@ const ContractContent = (props: any) => { ...@@ -186,7 +186,7 @@ const ContractContent = (props: any) => {
const onFinish = (values: any) => { const onFinish = (values: any) => {
// 判断有没有文件 // 判断有没有文件
if (state.fileList.length == 0) { if (state.fileList.length == 0) {
message.error('Please upload the attachment!'); message.error('Please upload the contract annex!');
} else { } else {
values.contractValidStartDate = values.time[0].format('YYYY-MM-DD'); values.contractValidStartDate = values.time[0].format('YYYY-MM-DD');
values.contractValidEndDate = values.time[1].format('YYYY-MM-DD'); values.contractValidEndDate = values.time[1].format('YYYY-MM-DD');
......
src/utils/tip.ts
View file @ 934ce15b
/* /*
* @Author: your name * @Author: your name
* @Date: 2020-11-19 16:54:53 * @Date: 2020-11-19 16:54:53
* @LastEditTime: 2021-02-02 18:29:06 * @LastEditTime: 2021-02-06 13:13:47
* @LastEditors: Please set LastEditors * @LastEditors: Please set LastEditors
* @Description: In User Settings Edit * @Description: In User Settings Edit
* @FilePath: \tostumi\src\utils\tip.ts * @FilePath: \tostumi\src\utils\tip.ts
...@@ -88,14 +88,14 @@ export const Notice = [ ...@@ -88,14 +88,14 @@ export const Notice = [
// 新增设施 // 新增设施
export const NewFaci = [ export const NewFaci = [
[reqMes('Please select community')], [reqMes('Please the community')],
[reqMes('Please input Facility Name')], [reqMes('Please input the Facility Name')],
[reqMes('Please Set management fee')], [reqMes('Please Set management fee')],
[reqMes('Please Set Setting deposit')], [reqMes('Please Set Setting deposit')],
[reqMes('Please Upload facility photos')], [reqMes('Please Upload facility photos')],
[reqMes('Required')], [reqMes('Please enter restrictions')],
[reqMes('Required')], [reqMes('Please enter restrictions')],
[reqMes('Required')], [reqMes('Please enter restrictions')],
[reqMes('Required')], [reqMes('Required')],
[reqMes('Required')], [reqMes('Required')],
]; ];
......
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