zcloud_gbs
/
zcloud_gbs_hidden-react
13
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

优化

master
LiuJiaNan 2025-11-20 17:12:27 +08:00
parent b405645b2c
commit d97a24ed2b
8 changed files with 83 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -31,7 +31,7 @@
"react": "^18.2.0", "react": "^18.2.0",
"react-dom": "^18.2.0", "react-dom": "^18.2.0",
"react-to-print": "^3.2.0", "react-to-print": "^3.2.0",
"zy-react-library": "^1.0.118" "zy-react-library": "^1.0.119"
}, },
"devDependencies": { "devDependencies": {
"@antfu/eslint-config": "^5.4.1", "@antfu/eslint-config": "^5.4.1",

5
src/pages/Container/BranchCompany/Average/Confirm/Review/index.js
View File

@ -211,7 +211,7 @@ function Confirm(props) {
]} ]}
/> />
</div> </div>
<RejectModal open={rejectModalOpen} onCancel={() => setRejectModalOpen(false)} data={data} /> {rejectModalOpen && <RejectModal onCancel={() => setRejectModalOpen(false)} data={data} />}
</div> </div>
); );
} }
@ -236,7 +236,8 @@ const RejectModalComponent = (props) => {
return ( return (
<Modal <Modal
title="驳回原因" title="驳回原因"
open={props.open} open
maskClosable={false}
onCancel={props.onCancel} onCancel={props.onCancel}
onOk={form.submit} onOk={form.submit}
confirmLoading={props.confirm.confirmLoading} confirmLoading={props.confirm.confirmLoading}

11
src/pages/Container/BranchCompany/Average/ConfirmUser/index.js
View File

@ -77,7 +77,7 @@ function HiddenConfirmUser(props) {
]} ]}
{...tableProps} {...tableProps}
/> />
<AddModal open={addModalOpen} onCancel={() => setAddModalOpen(false)} getData={getData} /> {addModalOpen && <AddModal onCancel={() => setAddModalOpen(false)} getData={getData} />}
</div> </div>
); );
} }
@ -90,7 +90,6 @@ const AddModalComponent = (props) => {
if (success) { if (success) {
message.success("操作成功"); message.success("操作成功");
props.onCancel(); props.onCancel();
form.resetFields();
props.getData(); props.getData();
} }
}; };
@ -99,11 +98,9 @@ const AddModalComponent = (props) => {
<Modal <Modal
title="新增隐患确认人" title="新增隐患确认人"
width={800} width={800}
open={props.open} open
onCancel={() => { maskClosable={false}
props.onCancel(); onCancel={props.onCancel}
form.resetFields();
}}
onOk={form.submit} onOk={form.submit}
loading={props.confirmUser.confirmUserLoading} loading={props.confirmUser.confirmUserLoading}
> >

34
src/pages/Container/BranchCompany/Average/Ledger/List/index.js
View File

@ -244,19 +244,21 @@ function List(props) {
{...tableProps} {...tableProps}
/> />
</Spin> </Spin>
<ExportByColumnModal {exportByColumnModalOpen && (
open={exportByColumnModalOpen} <ExportByColumnModal
hiddenFindTime={form.getFieldValue("hiddenFindTime")} hiddenFindTime={form.getFieldValue("hiddenFindTime")}
onCancel={() => setExportByColumnModalOpen(false)} onCancel={() => setExportByColumnModalOpen(false)}
/> />
<PrintModal )}
open={printModalOpen} {printModalOpen && (
data={printData} <PrintModal
onCancel={() => { data={printData}
setPrintModalOpen(false); onCancel={() => {
setPrintData([]); setPrintModalOpen(false);
}} setPrintData([]);
/> }}
/>
)}
</div> </div>
); );
} }
@ -289,7 +291,8 @@ const ExportByColumnModalComponent = (props) => {
<Modal <Modal
title="按列导出" title="按列导出"
width={800} width={800}
open={props.open} open
maskClosable={false}
onCancel={props.onCancel} onCancel={props.onCancel}
onOk={form.submit} onOk={form.submit}
loading={loading} loading={loading}
@ -345,7 +348,8 @@ const PrintModal = (props) => {
title="打印" title="打印"
width={1500} width={1500}
okText="打印" okText="打印"
open={props.open} open
maskClosable={false}
onCancel={props.onCancel} onCancel={props.onCancel}
onOk={handlePrint} onOk={handlePrint}
> >

37
src/pages/Container/BranchCompany/Average/Part/index.js
View File

@ -160,18 +160,19 @@ function Part(props) {
/> />
</div> </div>
</div> </div>
<AddModal {addModalOpen && (
open={addModalOpen} <AddModal
id={currentId} id={currentId}
parentName={parentName} parentName={parentName}
parentId={parentId} parentId={parentId}
getData={getData} getData={getData}
getTreeData={getTreeData} getTreeData={getTreeData}
onCancel={() => { onCancel={() => {
setAddModalOpen(false); setAddModalOpen(false);
setCurrentId(""); setCurrentId("");
}} }}
/> />
)}
</div> </div>
); );
} }
@ -185,8 +186,8 @@ const AddModalComponent = (props) => {
form.setFieldsValue(data); form.setFieldsValue(data);
}; };
useEffect(() => { useEffect(() => {
props.id && getData(); getData();
}, [props.id]); }, []);
const onSubmit = async (values) => { const onSubmit = async (values) => {
const { success } = await props[!props.id ? "partAdd" : "partEdit"]({ ...values, parentId: props.parentId, id: props.id }); const { success } = await props[!props.id ? "partAdd" : "partEdit"]({ ...values, parentId: props.parentId, id: props.id });
if (success) { if (success) {
@ -201,11 +202,9 @@ const AddModalComponent = (props) => {
<Modal <Modal
title={props.id ? "编辑" : "新增"} title={props.id ? "编辑" : "新增"}
width={800} width={800}
open={props.open} open
onCancel={() => { maskClosable={false}
props.onCancel(); onCancel={props.onCancel}
form.resetFields();
}}
onOk={form.submit} onOk={form.submit}
loading={props.part.partLoading} loading={props.part.partLoading}
> >

5
src/pages/Container/BranchCompany/Average/Postponement/Review/index.js
View File

@ -39,7 +39,7 @@ function Review(props) {
<Button key="back" onClick={() => props.history.goBack()}>取消</Button> <Button key="back" onClick={() => props.history.goBack()}>取消</Button>
</Space> </Space>
</div> </div>
<RejectModal open={rejectModalOpen} onCancel={() => setRejectModalOpen(false)} data={{ id: query.id, hiddenId: query.hiddenId }} /> {rejectModalOpen && <RejectModal onCancel={() => setRejectModalOpen(false)} data={{ id: query.id, hiddenId: query.hiddenId }} />}
</div> </div>
); );
} }
@ -63,7 +63,8 @@ const RejectModalComponent = (props) => {
return ( return (
<Modal <Modal
title="驳回原因" title="驳回原因"
open={props.open} open
maskClosable={false}
onCancel={props.onCancel} onCancel={props.onCancel}
onOk={form.submit} onOk={form.submit}
confirmLoading={props.specialDisposal.specialDisposalLoading} confirmLoading={props.specialDisposal.specialDisposalLoading}

44
src/pages/Container/BranchCompany/Average/Rectification/List/index.js
View File

@ -141,24 +141,26 @@ function List(props) {
]} ]}
{...tableProps} {...tableProps}
/> />
<TemporarySafetyMeasuresModal {temporarySafetyMeasuresModalOpen && (
id={currentId} <TemporarySafetyMeasuresModal
open={temporarySafetyMeasuresModalOpen} id={currentId}
onCancel={() => { onCancel={() => {
setTemporarySafetyMeasuresModalOpen(false); setTemporarySafetyMeasuresModalOpen(false);
setCurrentId(""); setCurrentId("");
}} }}
getData={getData} getData={getData}
/> />
<RequestAnExtensionModal )}
id={currentId} {requestAnExtensionModalOpen && (
open={requestAnExtensionModalOpen} <RequestAnExtensionModal
onCancel={() => { id={currentId}
setRequestAnExtensionModalOpen(false); onCancel={() => {
setCurrentId(""); setRequestAnExtensionModalOpen(false);
}} setCurrentId("");
getData={getData} }}
/> getData={getData}
/>
)}
</div> </div>
); );
} }
@ -178,7 +180,8 @@ const TemporarySafetyMeasuresModalComponent = (props) => {
<Modal <Modal
title="添加临时安全措施" title="添加临时安全措施"
width={800} width={800}
open={props.open} open
maskClosable={false}
onCancel={props.onCancel} onCancel={props.onCancel}
onOk={form.submit} onOk={form.submit}
loading={props.rectification.rectificationLoading} loading={props.rectification.rectificationLoading}
@ -214,7 +217,8 @@ const RequestAnExtensionModalComponent = (props) => {
<Modal <Modal
title="申请延期" title="申请延期"
width={800} width={800}
open={props.open} open
maskClosable={false}
onCancel={props.onCancel} onCancel={props.onCancel}
onOk={form.submit} onOk={form.submit}
loading={props.rectification.rectificationLoading || uploadFileLoading} loading={props.rectification.rectificationLoading || uploadFileLoading}

20
src/pages/Container/Supervision/Average/Average/HiddenList/index.js
View File

@ -187,14 +187,15 @@ function HiddenList(props) {
/> />
</Spin> </Spin>
</div> </div>
<PrintModal {printModalOpen && (
open={printModalOpen} <PrintModal
data={printData} data={printData}
onCancel={() => { onCancel={() => {
setPrintModalOpen(false); setPrintModalOpen(false);
setPrintData([]); setPrintData([]);
}} }}
/> />
)}
</div> </div>
); );
} }
@ -221,7 +222,8 @@ const PrintModal = (props) => {
title="打印" title="打印"
width={1500} width={1500}
okText="打印" okText="打印"
open={props.open} open
maskClosable={false}
onCancel={props.onCancel} onCancel={props.onCancel}
onOk={handlePrint} onOk={handlePrint}
> >