liuchang/fe_service_ebtp_frontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'release_electronic_bid_evaluation_room' of http://gitlab.tianti.tg.unicom.local/eshop/fe_service_ebtp_frontend into release_electronic_bid_evaluation_room

Browse Source
This commit is contained in:
jl-zhoujl2
2022-11-21 11:04:03 +08:00
parent f42e7dbacf 0e49ce320d
commit 5723ea711e
2 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/pages/ElecEvaluation/EvalSiteManage/SiteUser/components/AuthorizeModal.tsx
View File

@ -314,9 +314,9 @@ const AuthorizeModal: React.FC<AuthorizeModalProps> = (props) => {
rules={rule('权限开始时间')} rules={rule('权限开始时间')}
> >
<DatePicker <DatePicker
format="YYYY-MM-DD" format="yyyy-MM-DD HH:mm"
disabledDate={disabledDate} disabledDate={disabledDate}
showTime={{ defaultValue: moment('00:00:00', 'HH:mm:ss') }} showTime={{ defaultValue: moment('00', 'ss') }}
showNow={false} showNow={false}
style={{ width: "90%" }} style={{ width: "90%" }}
/> />
@ -327,9 +327,9 @@ const AuthorizeModal: React.FC<AuthorizeModalProps> = (props) => {
rules={rule('权限结束时间')} rules={rule('权限结束时间')}
> >
<DatePicker <DatePicker
format="YYYY-MM-DD" format="yyyy-MM-DD HH:mm"
disabledDate={disabledDate} disabledDate={disabledDate}
showTime={{ defaultValue: moment('23:59:59', 'HH:mm:ss') }} showTime={{ defaultValue: moment('00', 'ss') }}
showNow={false} showNow={false}
style={{ width: "90%" }} style={{ width: "90%" }}
/> />

12
src/pages/ElecEvaluation/EvalSiteManage/SiteUser/components/SiteUserModal.tsx
View File

@ -42,6 +42,7 @@ const SitePersonModal: React.FC<SitePersonModalProps> = (props) => {
useEffect(() => { useEffect(() => {
console.log(type)
if (JSON.stringify(values) !== "{}") { if (JSON.stringify(values) !== "{}") {
setGroupValue(values.groupStatus); setGroupValue(values.groupStatus);
form.setFieldsValue({ form.setFieldsValue({
@ -75,13 +76,15 @@ const SitePersonModal: React.FC<SitePersonModalProps> = (props) => {
const renderFooter = () => { const renderFooter = () => {
console.log(type == "edit")
console.log(type == "insert")
if (type == "read") { if (type == "read") {
return ( return (
<> <>
<Button onClick={onCancel}>关闭</Button> <Button onClick={onCancel}>关闭</Button>
</> </>
); );
} else { } else if (type == "edit") {
return ( return (
<> <>
<Popconfirm <Popconfirm
@ -95,6 +98,13 @@ const SitePersonModal: React.FC<SitePersonModalProps> = (props) => {
<Button onClick={onCancel}>取消</Button> <Button onClick={onCancel}>取消</Button>
</> </>
); );
} else {
return (
<>
<Button type="primary" loading={loading} onClick={onOk}>确认</Button>
<Button onClick={onCancel}>取消</Button>
</>
);
} }
} }