修改整体样式

master
LiuJiaNan 2026-01-04 10:21:02 +08:00
parent fc9af4faf8
commit be9eb8c279
42 changed files with 1015 additions and 1056 deletions

View File

@ -2,6 +2,7 @@ import { Permission } from "@cqsjjb/jjb-common-decorator/permission";
import { Connect } from "@cqsjjb/jjb-dva-runtime"; import { Connect } from "@cqsjjb/jjb-dva-runtime";
import { Button, Descriptions, Form, Modal, Space } from "antd"; import { Button, Descriptions, Form, Modal, Space } from "antd";
import { useState } from "react"; import { useState } from "react";
import Page from "zy-react-library/components/Page";
import Search from "zy-react-library/components/Search"; import Search from "zy-react-library/components/Search";
import DictionarySelect from "zy-react-library/components/Select/Dictionary"; import DictionarySelect from "zy-react-library/components/Select/Dictionary";
import Table from "zy-react-library/components/Table"; import Table from "zy-react-library/components/Table";
@ -29,7 +30,7 @@ function List(props) {
}; };
return ( return (
<div style={{ padding: 20 }}> <Page isShowAllAction={false}>
<Search <Search
labelCol={{ span: 8 }} labelCol={{ span: 8 }}
options={[ options={[
@ -91,14 +92,14 @@ function List(props) {
{...tableProps} {...tableProps}
/> />
{rejectReasonModalOpen && <RejectReason rejectReason={rejectReason} onCancel={() => setRejectReasonModalOpen(false)} />} {rejectReasonModalOpen && <RejectReason rejectReason={rejectReason} onCancel={() => setRejectReasonModalOpen(false)} />}
</div> </Page>
); );
} }
const RejectReason = (props) => { const RejectReason = (props) => {
return ( return (
<Modal <Modal
title="查看驳回原因" title="查看驳回原因"
width={800} width={600}
open open
maskClosable={false} maskClosable={false}
onCancel={props.onCancel} onCancel={props.onCancel}

View File

@ -1,6 +1,7 @@
import { Permission } from "@cqsjjb/jjb-common-decorator/permission"; import { Permission } from "@cqsjjb/jjb-common-decorator/permission";
import { Connect } from "@cqsjjb/jjb-dva-runtime"; import { Connect } from "@cqsjjb/jjb-dva-runtime";
import { Button, Form, Space } from "antd"; import { Button, Form, Space } from "antd";
import Page from "zy-react-library/components/Page";
import Search from "zy-react-library/components/Search"; import Search from "zy-react-library/components/Search";
import DictionarySelect from "zy-react-library/components/Select/Dictionary"; import DictionarySelect from "zy-react-library/components/Select/Dictionary";
import Table from "zy-react-library/components/Table"; import Table from "zy-react-library/components/Table";
@ -20,7 +21,7 @@ function List(props) {
}); });
return ( return (
<div style={{ padding: 20 }}> <Page isShowAllAction={false}>
<Search <Search
labelCol={{ span: 8 }} labelCol={{ span: 8 }}
options={[ options={[
@ -100,7 +101,7 @@ function List(props) {
]} ]}
{...tableProps} {...tableProps}
/> />
</div> </Page>
); );
} }

View File

@ -4,7 +4,7 @@ import dayjs from "dayjs";
import { cloneDeep } from "lodash-es"; import { cloneDeep } from "lodash-es";
import { useEffect, useState } from "react"; import { useEffect, useState } from "react";
import FormBuilder from "zy-react-library/components/FormBuilder"; import FormBuilder from "zy-react-library/components/FormBuilder";
import HeaderBack from "zy-react-library/components/HeaderBack"; import Page from "zy-react-library/components/Page";
import DictionarySelect from "zy-react-library/components/Select/Dictionary"; import DictionarySelect from "zy-react-library/components/Select/Dictionary";
import PersonnelSelect from "zy-react-library/components/Select/Personnel/Gwj"; import PersonnelSelect from "zy-react-library/components/Select/Personnel/Gwj";
import DepartmentSelectTree from "zy-react-library/components/SelectTree/Department/Gwj"; import DepartmentSelectTree from "zy-react-library/components/SelectTree/Department/Gwj";
@ -42,12 +42,9 @@ function Add(props) {
}, []); }, []);
return ( return (
<div> <Page headerTitle={query.resubmit ? "重新提交" : (query.id ? "编辑" : "新增")} isShowFooter={false}>
<HeaderBack title={query.resubmit ? "重新提交" : (query.id ? "编辑" : "新增")} />
<div style={{ padding: 20 }}>
{currentStep === 1 {currentStep === 1
&& && <StepOne setFormValues={setFormValues} setCurrentStep={setCurrentStep} formValues={formValues} form={form} />}
<StepOne setFormValues={setFormValues} setCurrentStep={setCurrentStep} formValues={formValues} form={form} />}
{currentStep === 2 {currentStep === 2
&& ( && (
<StepTwo <StepTwo
@ -58,8 +55,7 @@ function Add(props) {
specialList={specialList} specialList={specialList}
/> />
)} )}
</div> </Page>
</div>
); );
} }
@ -225,38 +221,6 @@ const StepTwoComponent = (props) => {
const { loading: deleteFileLoading, deleteFile } = useDeleteFile(); const { loading: deleteFileLoading, deleteFile } = useDeleteFile();
const { loading: getFileLoading, getFile } = useGetFile(); const { loading: getFileLoading, getFile } = useGetFile();
const getData = async () => {
if (!props.formValues.qualificationsId)
return;
if (specialList.length === 0) {
const { data } = await props["qualificationMaintenanceInfo"]({ id: props.formValues.qualificationsId });
await getTypeGroup(data.details)
setSpecialList(data.details || []);
} else {
const { data } = await props["qualificationMaintenanceInfo"]({ id: props.formValues.qualificationsId });
const newSpecialList = data.details.map(item => {
const existsItem = specialList.find(specialItem => specialItem.qualificationsDetailId === item.id);
if (existsItem) {
return { ...item, ...existsItem };
}
return item;
})
await getTypeGroup(newSpecialList)
for (let i = 0; i < newSpecialList.length; i++) {
if (newSpecialList[i].applyDetailId) {
newSpecialList[i].files = await getFile({
eqType: UPLOAD_FILE_TYPE_ENUM["148"],
eqForeignKey: newSpecialList[i].applyDetailId
});
}
}
setSpecialList(newSpecialList);
}
};
const getTypeGroup = async (details) => { const getTypeGroup = async (details) => {
const typeMap = new Map(); const typeMap = new Map();
for (let i = 0; i < details.length; i++) { for (let i = 0; i < details.length; i++) {
@ -266,7 +230,38 @@ const StepTwoComponent = (props) => {
} }
} }
setTypeGroup(Array.from(typeMap.values())); setTypeGroup(Array.from(typeMap.values()));
};
const getData = async () => {
if (!props.formValues.qualificationsId)
return;
if (specialList.length === 0) {
const { data } = await props["qualificationMaintenanceInfo"]({ id: props.formValues.qualificationsId });
await getTypeGroup(data.details);
setSpecialList(data.details || []);
} }
else {
const { data } = await props["qualificationMaintenanceInfo"]({ id: props.formValues.qualificationsId });
const newSpecialList = data.details.map((item) => {
const existsItem = specialList.find(specialItem => specialItem.qualificationsDetailId === item.id);
if (existsItem) {
return { ...item, ...existsItem };
}
return item;
});
await getTypeGroup(newSpecialList);
for (let i = 0; i < newSpecialList.length; i++) {
if (newSpecialList[i].applyDetailId) {
newSpecialList[i].files = await getFile({
eqType: UPLOAD_FILE_TYPE_ENUM["148"],
eqForeignKey: newSpecialList[i].applyDetailId,
});
}
}
setSpecialList(newSpecialList);
}
};
useEffect(() => { useEffect(() => {
getData(); getData();
@ -337,11 +332,11 @@ const StepTwoComponent = (props) => {
<Spin <Spin
spinning={props.qualificationApply.qualificationApplyLoading || uploadFileLoading || deleteFileLoading || getFileLoading} spinning={props.qualificationApply.qualificationApplyLoading || uploadFileLoading || deleteFileLoading || getFileLoading}
> >
{typeGroup.map((item) => ( {typeGroup.map(item => (
<div key={item.dataType}> <div key={item.dataType}>
<Divider orientation="left">{item.dataTypeName}</Divider> <Divider orientation="left">{item.dataTypeName}</Divider>
<Table <Table
dataSource={specialList.filter((record) => record.dataType === item.dataType)} dataSource={specialList.filter(record => record.dataType === item.dataType)}
pagination={false} pagination={false}
options={false} options={false}
disabledResizer={true} disabledResizer={true}
@ -388,8 +383,7 @@ const StepTwoComponent = (props) => {
]} ]}
/> />
</div> </div>
)) ))}
}
<div style={{ textAlign: "center", marginTop: 20 }}> <div style={{ textAlign: "center", marginTop: 20 }}>
<Space> <Space>
<Button onClick={() => { <Button onClick={() => {

View File

@ -3,6 +3,7 @@ import { Connect } from "@cqsjjb/jjb-dva-runtime";
import { Button, Descriptions, Form, Modal, Space } from "antd"; import { Button, Descriptions, Form, Modal, Space } from "antd";
import { useState } from "react"; import { useState } from "react";
import AddIcon from "zy-react-library/components/Icon/AddIcon"; import AddIcon from "zy-react-library/components/Icon/AddIcon";
import Page from "zy-react-library/components/Page";
import Search from "zy-react-library/components/Search"; import Search from "zy-react-library/components/Search";
import DictionarySelect from "zy-react-library/components/Select/Dictionary"; import DictionarySelect from "zy-react-library/components/Select/Dictionary";
import Table from "zy-react-library/components/Table"; import Table from "zy-react-library/components/Table";
@ -26,7 +27,7 @@ function List(props) {
}; };
return ( return (
<div style={{ padding: 20 }}> <Page isShowAllAction={false}>
<Search <Search
labelCol={{ span: 8 }} labelCol={{ span: 8 }}
options={[ options={[
@ -111,7 +112,7 @@ function List(props) {
{...tableProps} {...tableProps}
/> />
{rejectReasonModalOpen && <RejectReason rejectReason={rejectReason} onCancel={() => setRejectReasonModalOpen(false)} />} {rejectReasonModalOpen && <RejectReason rejectReason={rejectReason} onCancel={() => setRejectReasonModalOpen(false)} />}
</div> </Page>
); );
} }
@ -119,7 +120,7 @@ const RejectReason = (props) => {
return ( return (
<Modal <Modal
title="查看驳回原因" title="查看驳回原因"
width={800} width={600}
open open
maskClosable={false} maskClosable={false}
onCancel={props.onCancel} onCancel={props.onCancel}

View File

@ -1,7 +1,7 @@
import { Connect } from "@cqsjjb/jjb-dva-runtime"; import { Connect } from "@cqsjjb/jjb-dva-runtime";
import { Button, Descriptions, Divider, Spin } from "antd"; import { Button, Descriptions, Divider, Spin } from "antd";
import { useEffect, useState } from "react"; import { useEffect, useState } from "react";
import HeaderBack from "zy-react-library/components/HeaderBack"; import Page from "zy-react-library/components/Page";
import Table from "zy-react-library/components/Table"; import Table from "zy-react-library/components/Table";
import { UPLOAD_FILE_TYPE_ENUM } from "zy-react-library/enum/uploadFile/gwj"; import { UPLOAD_FILE_TYPE_ENUM } from "zy-react-library/enum/uploadFile/gwj";
import useGetFile from "zy-react-library/hooks/useGetFile"; import useGetFile from "zy-react-library/hooks/useGetFile";
@ -19,6 +19,17 @@ function View(props) {
const [viewQualificationDetailsModalOpen, setViewQualificationDetailsModalOpen] = useState(false); const [viewQualificationDetailsModalOpen, setViewQualificationDetailsModalOpen] = useState(false);
const [viewQualificationDetailsModalData, setViewQualificationDetailsModalData] = useState({}); const [viewQualificationDetailsModalData, setViewQualificationDetailsModalData] = useState({});
const getTypeGroup = async (details) => {
const typeMap = new Map();
for (let i = 0; i < details.length; i++) {
const { dataType, dataTypeName } = details[i];
if (dataType && dataTypeName) {
typeMap.set(dataType, { dataType, dataTypeName });
}
}
setTypeGroup(Array.from(typeMap.values()));
};
const getData = async () => { const getData = async () => {
const { data } = await props["qualificationApplyInfo"]({ id: query.id }); const { data } = await props["qualificationApplyInfo"]({ id: query.id });
await getTypeGroup(data.specialList); await getTypeGroup(data.specialList);
@ -33,25 +44,12 @@ function View(props) {
setSpecialList(data.specialList); setSpecialList(data.specialList);
}; };
const getTypeGroup = async (details) => {
const typeMap = new Map();
for (let i = 0; i < details.length; i++) {
const { dataType, dataTypeName } = details[i];
if (dataType && dataTypeName) {
typeMap.set(dataType, { dataType, dataTypeName });
}
}
setTypeGroup(Array.from(typeMap.values()));
}
useEffect(() => { useEffect(() => {
getData(); getData();
}, []); }, []);
return ( return (
<div> <Page headerTitle="查看">
<HeaderBack title="查看" />
<div style={{ padding: 20 }}>
<Spin <Spin
spinning={props.qualificationApply.qualificationApplyLoading || getFileLoading} spinning={props.qualificationApply.qualificationApplyLoading || getFileLoading}
> >
@ -76,11 +74,11 @@ function View(props) {
]} ]}
/> />
</div> </div>
{typeGroup.map((item) => ( {typeGroup.map(item => (
<div key={item.dataType}> <div key={item.dataType}>
<Divider orientation="left">{item.dataTypeName}</Divider> <Divider orientation="left">{item.dataTypeName}</Divider>
<Table <Table
dataSource={specialList.filter((detail) => detail.dataType === item.dataType)} dataSource={specialList.filter(detail => detail.dataType === item.dataType)}
pagination={false} pagination={false}
options={false} options={false}
disabledResizer={true} disabledResizer={true}
@ -110,13 +108,11 @@ function View(props) {
]} ]}
/> />
</div> </div>
)) ))}
}
</Spin> </Spin>
{viewQualificationDetailsModalOpen {viewQualificationDetailsModalOpen
&& <ViewQualificationDetailsModal onCancel={() => setViewQualificationDetailsModalOpen(false)} data={viewQualificationDetailsModalData} />} && <ViewQualificationDetailsModal onCancel={() => setViewQualificationDetailsModalOpen(false)} data={viewQualificationDetailsModalData} />}
</div> </Page>
</div>
); );
} }

View File

@ -3,6 +3,7 @@ import { Permission } from "@cqsjjb/jjb-common-decorator/permission";
import { Connect } from "@cqsjjb/jjb-dva-runtime"; import { Connect } from "@cqsjjb/jjb-dva-runtime";
import { Button, Form, Space, Tooltip } from "antd"; import { Button, Form, Space, Tooltip } from "antd";
import { useState } from "react"; import { useState } from "react";
import Page from "zy-react-library/components/Page";
import Search from "zy-react-library/components/Search"; import Search from "zy-react-library/components/Search";
import DictionarySelect from "zy-react-library/components/Select/Dictionary"; import DictionarySelect from "zy-react-library/components/Select/Dictionary";
import Table from "zy-react-library/components/Table"; import Table from "zy-react-library/components/Table";
@ -28,7 +29,7 @@ function List(props) {
}); });
return ( return (
<div style={{ padding: 20 }}> <Page isShowAllAction={false}>
<Search <Search
labelCol={{ span: 8 }} labelCol={{ span: 8 }}
options={[ options={[
@ -146,7 +147,7 @@ function List(props) {
]} ]}
{...tableProps} {...tableProps}
/> />
</div> </Page>
); );
} }

View File

@ -1,6 +1,7 @@
import { Permission } from "@cqsjjb/jjb-common-decorator/permission"; import { Permission } from "@cqsjjb/jjb-common-decorator/permission";
import { Connect } from "@cqsjjb/jjb-dva-runtime"; import { Connect } from "@cqsjjb/jjb-dva-runtime";
import { Button, Form, Space } from "antd"; import { Button, Form, Space } from "antd";
import Page from "zy-react-library/components/Page";
import Search from "zy-react-library/components/Search"; import Search from "zy-react-library/components/Search";
import DictionarySelect from "zy-react-library/components/Select/Dictionary"; import DictionarySelect from "zy-react-library/components/Select/Dictionary";
import Table from "zy-react-library/components/Table"; import Table from "zy-react-library/components/Table";
@ -14,7 +15,7 @@ function List(props) {
}); });
return ( return (
<div style={{ padding: 20 }}> <Page isShowAllAction={false}>
<Search <Search
labelCol={{ span: 8 }} labelCol={{ span: 8 }}
options={[ options={[
@ -98,7 +99,7 @@ function List(props) {
]} ]}
{...tableProps} {...tableProps}
/> />
</div> </Page>
); );
} }

View File

@ -1,5 +1,5 @@
import { Connect } from "@cqsjjb/jjb-dva-runtime"; import { Connect } from "@cqsjjb/jjb-dva-runtime";
import { Button, Form, message, Modal, Space } from "antd"; import { Button, Form, message, Modal } from "antd";
import { useState } from "react"; import { useState } from "react";
import FormBuilder from "zy-react-library/components/FormBuilder"; import FormBuilder from "zy-react-library/components/FormBuilder";
import { FORM_ITEM_RENDER_ENUM } from "zy-react-library/enum/formItemRender"; import { FORM_ITEM_RENDER_ENUM } from "zy-react-library/enum/formItemRender";
@ -11,7 +11,6 @@ function Review(props) {
const query = useGetUrlQuery(); const query = useGetUrlQuery();
const [rejectModalOpen, setRejectModalOpen] = useState(false); const [rejectModalOpen, setRejectModalOpen] = useState(false);
const [passModalOpen, setPassModalOpen] = useState(false);
const onSubmit = async () => { const onSubmit = async () => {
const { success } = await props["qualificationReviewSubmit"]({ id: query.id, status: "400" }); const { success } = await props["qualificationReviewSubmit"]({ id: query.id, status: "400" });
@ -24,9 +23,10 @@ function Review(props) {
return ( return (
<div> <div>
<ViewInfo title="审核"> <ViewInfo
<div style={{ textAlign: "center", marginTop: 10 }}> title="审核"
<Space> extraActionButtons={(
<>
<Button <Button
type="primary" type="primary"
onClick={onSubmit} onClick={onSubmit}
@ -42,11 +42,10 @@ function Review(props) {
> >
驳回 驳回
</Button> </Button>
</Space> </>
</div> )}
</ViewInfo> />
{rejectModalOpen && <RejectModal onCancel={() => setRejectModalOpen(false)} id={query.id} />} {rejectModalOpen && <RejectModal onCancel={() => setRejectModalOpen(false)} id={query.id} />}
{passModalOpen && <PassModal onCancel={() => setPassModalOpen(false)} id={query.id} />}
</div> </div>
); );
} }
@ -65,18 +64,20 @@ const RejectModalComponent = (props) => {
return ( return (
<Modal <Modal
title="驳回" title="驳回"
width={1000} width={600}
open open
maskClosable={false} maskClosable={false}
onCancel={props.onCancel} onCancel={props.onCancel}
onOk={form.submit} onOk={form.submit}
confirmLoading={props.qualificationReview.userQualificationLoading}
> >
<FormBuilder <FormBuilder
form={form} form={form}
span={24} span={24}
labelCol={{ span: 8 }} labelCol={{ span: 10 }}
showActionButtons={false} showActionButtons={false}
onFinish={onSubmit} onFinish={onSubmit}
loading={props.qualificationReview.userQualificationLoading}
options={[ options={[
{ name: "auditRemarks", label: "驳回原因", render: FORM_ITEM_RENDER_ENUM.TEXTAREA }, { name: "auditRemarks", label: "驳回原因", render: FORM_ITEM_RENDER_ENUM.TEXTAREA },
]} ]}

View File

@ -2,6 +2,7 @@ import { Permission } from "@cqsjjb/jjb-common-decorator/permission";
import { Connect } from "@cqsjjb/jjb-dva-runtime"; import { Connect } from "@cqsjjb/jjb-dva-runtime";
import { Button, Descriptions, Form, Modal, Space } from "antd"; import { Button, Descriptions, Form, Modal, Space } from "antd";
import { useState } from "react"; import { useState } from "react";
import Page from "zy-react-library/components/Page";
import Search from "zy-react-library/components/Search"; import Search from "zy-react-library/components/Search";
import DictionarySelect from "zy-react-library/components/Select/Dictionary"; import DictionarySelect from "zy-react-library/components/Select/Dictionary";
import Table from "zy-react-library/components/Table"; import Table from "zy-react-library/components/Table";
@ -30,7 +31,7 @@ function List(props) {
}; };
return ( return (
<div style={{ padding: 20 }}> <Page isShowAllAction={false}>
<Search <Search
labelCol={{ span: 8 }} labelCol={{ span: 8 }}
options={[ options={[
@ -91,14 +92,14 @@ function List(props) {
{...tableProps} {...tableProps}
/> />
{rejectReasonModalOpen && <RejectReason rejectReason={rejectReason} onCancel={() => setRejectReasonModalOpen(false)} />} {rejectReasonModalOpen && <RejectReason rejectReason={rejectReason} onCancel={() => setRejectReasonModalOpen(false)} />}
</div> </Page>
); );
} }
const RejectReason = (props) => { const RejectReason = (props) => {
return ( return (
<Modal <Modal
title="查看驳回原因" title="查看驳回原因"
width={800} width={600}
open open
maskClosable={false} maskClosable={false}
onCancel={props.onCancel} onCancel={props.onCancel}

View File

@ -1,6 +1,7 @@
import { Permission } from "@cqsjjb/jjb-common-decorator/permission"; import { Permission } from "@cqsjjb/jjb-common-decorator/permission";
import { Connect } from "@cqsjjb/jjb-dva-runtime"; import { Connect } from "@cqsjjb/jjb-dva-runtime";
import { Button, Form, Space } from "antd"; import { Button, Form, Space } from "antd";
import Page from "zy-react-library/components/Page";
import Search from "zy-react-library/components/Search"; import Search from "zy-react-library/components/Search";
import DictionarySelect from "zy-react-library/components/Select/Dictionary"; import DictionarySelect from "zy-react-library/components/Select/Dictionary";
import Table from "zy-react-library/components/Table"; import Table from "zy-react-library/components/Table";
@ -21,7 +22,7 @@ function List(props) {
}); });
return ( return (
<div style={{ padding: 20 }}> <Page isShowAllAction={false}>
<Search <Search
labelCol={{ span: 8 }} labelCol={{ span: 8 }}
options={[ options={[
@ -70,7 +71,7 @@ function List(props) {
]} ]}
{...tableProps} {...tableProps}
/> />
</div> </Page>
); );
} }
export default Connect([NS_QUALIFICATION_STATISTICS], true)(Permission(List)); export default Connect([NS_QUALIFICATION_STATISTICS], true)(Permission(List));

View File

@ -2,6 +2,7 @@ import { Permission } from "@cqsjjb/jjb-common-decorator/permission";
import { Connect } from "@cqsjjb/jjb-dva-runtime"; import { Connect } from "@cqsjjb/jjb-dva-runtime";
import { Button, Descriptions, Form, Modal, Space } from "antd"; import { Button, Descriptions, Form, Modal, Space } from "antd";
import { useState } from "react"; import { useState } from "react";
import Page from "zy-react-library/components/Page";
import Search from "zy-react-library/components/Search"; import Search from "zy-react-library/components/Search";
import DictionarySelect from "zy-react-library/components/Select/Dictionary"; import DictionarySelect from "zy-react-library/components/Select/Dictionary";
import Table from "zy-react-library/components/Table"; import Table from "zy-react-library/components/Table";
@ -30,7 +31,7 @@ function List(props) {
}; };
return ( return (
<div style={{ padding: 20 }}> <Page isShowAllAction={false}>
<Search <Search
labelCol={{ span: 8 }} labelCol={{ span: 8 }}
options={[ options={[
@ -91,14 +92,14 @@ function List(props) {
{...tableProps} {...tableProps}
/> />
{rejectReasonModalOpen && <RejectReason rejectReason={rejectReason} onCancel={() => setRejectReasonModalOpen(false)} />} {rejectReasonModalOpen && <RejectReason rejectReason={rejectReason} onCancel={() => setRejectReasonModalOpen(false)} />}
</div> </Page>
); );
} }
const RejectReason = (props) => { const RejectReason = (props) => {
return ( return (
<Modal <Modal
title="查看驳回原因" title="查看驳回原因"
width={800} width={600}
open open
maskClosable={false} maskClosable={false}
onCancel={props.onCancel} onCancel={props.onCancel}

View File

@ -1,6 +1,7 @@
import { Permission } from "@cqsjjb/jjb-common-decorator/permission"; import { Permission } from "@cqsjjb/jjb-common-decorator/permission";
import { Connect } from "@cqsjjb/jjb-dva-runtime"; import { Connect } from "@cqsjjb/jjb-dva-runtime";
import { Button, Form, Space } from "antd"; import { Button, Form, Space } from "antd";
import Page from "zy-react-library/components/Page";
import Search from "zy-react-library/components/Search"; import Search from "zy-react-library/components/Search";
import DictionarySelect from "zy-react-library/components/Select/Dictionary"; import DictionarySelect from "zy-react-library/components/Select/Dictionary";
import Table from "zy-react-library/components/Table"; import Table from "zy-react-library/components/Table";
@ -20,7 +21,7 @@ function List(props) {
}, },
}); });
return ( return (
<div style={{ padding: 20 }}> <Page isShowAllAction={false}>
<Search <Search
labelCol={{ span: 8 }} labelCol={{ span: 8 }}
options={[ options={[
@ -70,7 +71,7 @@ function List(props) {
]} ]}
{...tableProps} {...tableProps}
/> />
</div> </Page>
); );
} }

View File

@ -2,6 +2,7 @@ import { Permission } from "@cqsjjb/jjb-common-decorator/permission";
import { Connect } from "@cqsjjb/jjb-dva-runtime"; import { Connect } from "@cqsjjb/jjb-dva-runtime";
import { Button, Descriptions, Form, Modal, Space } from "antd"; import { Button, Descriptions, Form, Modal, Space } from "antd";
import { useState } from "react"; import { useState } from "react";
import Page from "zy-react-library/components/Page";
import Search from "zy-react-library/components/Search"; import Search from "zy-react-library/components/Search";
import DictionarySelect from "zy-react-library/components/Select/Dictionary"; import DictionarySelect from "zy-react-library/components/Select/Dictionary";
import Table from "zy-react-library/components/Table"; import Table from "zy-react-library/components/Table";
@ -29,7 +30,7 @@ function List(props) {
}; };
return ( return (
<div style={{ padding: 20 }}> <Page isShowAllAction={false}>
<Search <Search
labelCol={{ span: 8 }} labelCol={{ span: 8 }}
options={[ options={[
@ -91,14 +92,14 @@ function List(props) {
{...tableProps} {...tableProps}
/> />
{rejectReasonModalOpen && <RejectReason rejectReason={rejectReason} onCancel={() => setRejectReasonModalOpen(false)} />} {rejectReasonModalOpen && <RejectReason rejectReason={rejectReason} onCancel={() => setRejectReasonModalOpen(false)} />}
</div> </Page>
); );
} }
const RejectReason = (props) => { const RejectReason = (props) => {
return ( return (
<Modal <Modal
title="查看驳回原因" title="查看驳回原因"
width={800} width={600}
open open
maskClosable={false} maskClosable={false}
onCancel={props.onCancel} onCancel={props.onCancel}

View File

@ -1,6 +1,7 @@
import { Permission } from "@cqsjjb/jjb-common-decorator/permission"; import { Permission } from "@cqsjjb/jjb-common-decorator/permission";
import { Connect } from "@cqsjjb/jjb-dva-runtime"; import { Connect } from "@cqsjjb/jjb-dva-runtime";
import { Button, Form, Space } from "antd"; import { Button, Form, Space } from "antd";
import Page from "zy-react-library/components/Page";
import Search from "zy-react-library/components/Search"; import Search from "zy-react-library/components/Search";
import DictionarySelect from "zy-react-library/components/Select/Dictionary"; import DictionarySelect from "zy-react-library/components/Select/Dictionary";
import Table from "zy-react-library/components/Table"; import Table from "zy-react-library/components/Table";
@ -19,7 +20,7 @@ function List(props) {
}, },
}); });
return ( return (
<div style={{ padding: 20 }}> <Page isShowAllAction={false}>
<Search <Search
labelCol={{ span: 8 }} labelCol={{ span: 8 }}
options={[ options={[
@ -69,7 +70,7 @@ function List(props) {
]} ]}
{...tableProps} {...tableProps}
/> />
</div> </Page>
); );
} }

View File

@ -1,6 +1,7 @@
import { Permission } from "@cqsjjb/jjb-common-decorator/permission"; import { Permission } from "@cqsjjb/jjb-common-decorator/permission";
import { Connect } from "@cqsjjb/jjb-dva-runtime"; import { Connect } from "@cqsjjb/jjb-dva-runtime";
import { Button, Form, Space } from "antd"; import { Button, Form, Space } from "antd";
import Page from "zy-react-library/components/Page";
import Search from "zy-react-library/components/Search"; import Search from "zy-react-library/components/Search";
import DictionarySelect from "zy-react-library/components/Select/Dictionary"; import DictionarySelect from "zy-react-library/components/Select/Dictionary";
import Table from "zy-react-library/components/Table"; import Table from "zy-react-library/components/Table";
@ -14,7 +15,7 @@ function List(props) {
}); });
return ( return (
<div style={{ padding: 20 }}> <Page isShowAllAction={false}>
<Search <Search
labelCol={{ span: 8 }} labelCol={{ span: 8 }}
options={[ options={[
@ -98,7 +99,7 @@ function List(props) {
]} ]}
{...tableProps} {...tableProps}
/> />
</div> </Page>
); );
} }

View File

@ -1,5 +1,5 @@
import { Connect } from "@cqsjjb/jjb-dva-runtime"; import { Connect } from "@cqsjjb/jjb-dva-runtime";
import { Button, Form, message, Modal, Space } from "antd"; import { Button, Form, message, Modal } from "antd";
import { useState } from "react"; import { useState } from "react";
import FormBuilder from "zy-react-library/components/FormBuilder"; import FormBuilder from "zy-react-library/components/FormBuilder";
import PersonnelSelect from "zy-react-library/components/Select/Personnel/Gwj"; import PersonnelSelect from "zy-react-library/components/Select/Personnel/Gwj";
@ -17,9 +17,10 @@ function Review() {
return ( return (
<div> <div>
<ViewInfo title="审核"> <ViewInfo
<div style={{ textAlign: "center", marginTop: 10 }}> title="审核"
<Space> extraActionButtons={(
<>
<Button <Button
type="primary" type="primary"
onClick={() => { onClick={() => {
@ -37,9 +38,9 @@ function Review() {
> >
驳回 驳回
</Button> </Button>
</Space> </>
</div> )}
</ViewInfo> />
{rejectModalOpen && <RejectModal onCancel={() => setRejectModalOpen(false)} id={query.id} />} {rejectModalOpen && <RejectModal onCancel={() => setRejectModalOpen(false)} id={query.id} />}
{passModalOpen && <PassModal onCancel={() => setPassModalOpen(false)} id={query.id} />} {passModalOpen && <PassModal onCancel={() => setPassModalOpen(false)} id={query.id} />}
</div> </div>
@ -60,18 +61,20 @@ const RejectModalComponent = (props) => {
return ( return (
<Modal <Modal
title="驳回" title="驳回"
width={1000} width={600}
open open
maskClosable={false} maskClosable={false}
onCancel={props.onCancel} onCancel={props.onCancel}
onOk={form.submit} onOk={form.submit}
confirmLoading={props.qualificationReview.userQualificationLoading}
> >
<FormBuilder <FormBuilder
form={form} form={form}
span={24} span={24}
labelCol={{ span: 8 }} labelCol={{ span: 10 }}
showActionButtons={false} showActionButtons={false}
onFinish={onSubmit} onFinish={onSubmit}
loading={props.qualificationReview.userQualificationLoading}
options={[ options={[
{ name: "auditRemarks", label: "驳回原因", render: FORM_ITEM_RENDER_ENUM.TEXTAREA }, { name: "auditRemarks", label: "驳回原因", render: FORM_ITEM_RENDER_ENUM.TEXTAREA },
]} ]}
@ -96,17 +99,19 @@ const PassModalComponent = (props) => {
return ( return (
<Modal <Modal
title="通过" title="通过"
width={1000} width={600}
open open
maskClosable={false} maskClosable={false}
onCancel={props.onCancel} onCancel={props.onCancel}
onOk={form.submit} onOk={form.submit}
confirmLoading={props.qualificationReview.userQualificationLoading}
> >
<FormBuilder <FormBuilder
form={form} form={form}
labelCol={{ span: 8 }} labelCol={{ span: 10 }}
showActionButtons={false} showActionButtons={false}
onFinish={onSubmit} onFinish={onSubmit}
loading={props.qualificationReview.userQualificationLoading}
span={24} span={24}
options={[ options={[
{ {

View File

@ -3,9 +3,9 @@ import { Button, Divider, Form, message, Modal, Space, Spin } from "antd";
import dayjs from "dayjs"; import dayjs from "dayjs";
import { useEffect, useMemo, useState } from "react"; import { useEffect, useMemo, useState } from "react";
import FormBuilder from "zy-react-library/components/FormBuilder"; import FormBuilder from "zy-react-library/components/FormBuilder";
import HeaderBack from "zy-react-library/components/HeaderBack";
import AddIcon from "zy-react-library/components/Icon/AddIcon"; import AddIcon from "zy-react-library/components/Icon/AddIcon";
import DepartmentLeftTree from "zy-react-library/components/LeftTree/Department/Gwj"; import DepartmentLeftTree from "zy-react-library/components/LeftTree/Department/Gwj";
import Page from "zy-react-library/components/Page";
import Search from "zy-react-library/components/Search"; import Search from "zy-react-library/components/Search";
import DictionarySelect from "zy-react-library/components/Select/Dictionary"; import DictionarySelect from "zy-react-library/components/Select/Dictionary";
import PersonnelSelect from "zy-react-library/components/Select/Personnel/Gwj"; import PersonnelSelect from "zy-react-library/components/Select/Personnel/Gwj";
@ -73,9 +73,8 @@ function Add(props) {
}, []); }, []);
return ( return (
<div> <Page headerTitle={query.id ? "编辑" : "新增"} isShowFooter={false}>
<HeaderBack title={query.id ? "编辑" : "新增"} /> <>
<div style={{ padding: 20 }}>
{currentStep === 1 {currentStep === 1
&& ( && (
<StepOne <StepOne
@ -103,8 +102,8 @@ function Add(props) {
corpinfoId={corpinfoId} corpinfoId={corpinfoId}
/> />
)} )}
</div> </>
</div> </Page>
); );
} }
@ -626,7 +625,6 @@ const StepTwoComponent = (props) => {
}); });
projectFileList[i].projectFileId = id; projectFileList[i].projectFileId = id;
} }
console.log("usercontentList", usercontentList);
const userList = usercontentList.map(item => ({ const userList = usercontentList.map(item => ({
userId: item.id, userId: item.id,
userName: item.name, userName: item.name,
@ -636,7 +634,6 @@ const StepTwoComponent = (props) => {
userPostName: item.postName, userPostName: item.postName,
projectLeader: item.projectLeader, projectLeader: item.projectLeader,
})); }));
console.log("userList", userList);
const data = { ...props.formValues, projectUserAddCmdList: [...userList], projectFileAddCmdList: [...projectFileList], projectLocalCompanyAddCmdList: [...projectLocalCompanyAddCmdList], projectApprovalUserAddCmdList: [...projectApprovalUserAddCmdList], projectApprovalFlowAddCmdList: [...projectApprovalFlowAddCmdList], corpinfoId }; const data = { ...props.formValues, projectUserAddCmdList: [...userList], projectFileAddCmdList: [...projectFileList], projectLocalCompanyAddCmdList: [...projectLocalCompanyAddCmdList], projectApprovalUserAddCmdList: [...projectApprovalUserAddCmdList], projectApprovalFlowAddCmdList: [...projectApprovalFlowAddCmdList], corpinfoId };
const { success } = await props[!query.id ? "projectAdd" : "projectUpdate"]({ const { success } = await props[!query.id ? "projectAdd" : "projectUpdate"]({
...data, ...data,
@ -719,6 +716,7 @@ const StepTwoComponent = (props) => {
</Button> </Button>
<Button <Button
type="link" type="link"
danger
onClick={() => handleDelete(index)} onClick={() => handleDelete(index)}
> >
删除 删除
@ -816,7 +814,7 @@ const StepTwoComponent = (props) => {
/> />
)} )}
{usercontentOpen && ( {usercontentOpen && (
<Usercontent <UserSelect
data={fetchUserList} data={fetchUserList}
onCancel={() => { onCancel={() => {
setUsercontentOpen(false); setUsercontentOpen(false);
@ -845,6 +843,7 @@ const ChooseFilsComponent = (props) => {
params: { params: {
qualificationsTypeId: "", qualificationsTypeId: "",
}, },
useStorageQueryCriteria: false,
}); });
const submit = () => { const submit = () => {
if (props.onSubmit) { if (props.onSubmit) {
@ -874,6 +873,8 @@ const ChooseFilsComponent = (props) => {
onOk={submit} onOk={submit}
> >
<Table <Table
options={false}
disabledResizer={true}
rowSelection={{ rowSelection={{
selectedRowKeys, selectedRowKeys,
preserveSelectedRowKeys: true, preserveSelectedRowKeys: true,
@ -896,7 +897,7 @@ const ChooseFilsComponent = (props) => {
); );
}; };
// 选择项目人员的组件 // 选择项目人员的组件
const UsercontentComponent = (props) => { const UserSelectComponent = (props) => {
const [form] = Form.useForm(); const [form] = Form.useForm();
const [selectedRowKeys, setSelectedRowKeys] = useState([]); // 存储选中的行键 const [selectedRowKeys, setSelectedRowKeys] = useState([]); // 存储选中的行键
const [selectedRows, setSelectedRows] = useState([]); // 存储选中行的完整数据 const [selectedRows, setSelectedRows] = useState([]); // 存储选中行的完整数据
@ -909,6 +910,7 @@ const UsercontentComponent = (props) => {
inDepartmentId, inDepartmentId,
eqEmploymentFlag: 1, // 在职 eqEmploymentFlag: 1, // 在职
}, },
useStorageQueryCriteria: false,
}); });
const projectLeader = useMemo(() => { const projectLeader = useMemo(() => {
if (props.data && Array.isArray(props.data)) { if (props.data && Array.isArray(props.data)) {
@ -969,19 +971,9 @@ const UsercontentComponent = (props) => {
open open
maskClosable={false} maskClosable={false}
onCancel={props.onCancel} onCancel={props.onCancel}
footer={null} okText="确认添加"
onOk={handleConfirmAdd}
> >
<Search
labelCol={{ span: 8 }}
options={[
{ name: "likeName", label: "姓名" },
{ name: "likeUserIdCard", label: "身份证" },
]}
form={form}
onFinish={(values) => {
getData(values);
}}
/>
<div style={{ display: "flex", gap: 20 }}> <div style={{ display: "flex", gap: 20 }}>
<div style={{ width: 300 }}> <div style={{ width: 300 }}>
<DepartmentLeftTree <DepartmentLeftTree
@ -993,7 +985,18 @@ const UsercontentComponent = (props) => {
/> />
</div> </div>
<div style={{ flex: 1 }}> <div style={{ flex: 1 }}>
<Search
labelCol={{ span: 8 }}
options={[
{ name: "likeName", label: "姓名" },
{ name: "likeUserIdCard", label: "身份证" },
]}
form={form}
onFinish={getData}
/>
<Table <Table
options={false}
disabledResizer={true}
rowSelection={{ rowSelection={{
selectedRowKeys, selectedRowKeys,
preserveSelectedRowKeys: true, preserveSelectedRowKeys: true,
@ -1003,17 +1006,6 @@ const UsercontentComponent = (props) => {
disabled: projectLeader && record.id === projectLeader.id, disabled: projectLeader && record.id === projectLeader.id,
}), }),
}} }}
rowKey="id"
toolBarRender={() => (
<>
<Button
type="primary"
onClick={handleConfirmAdd}
>
确认添加
</Button>
</>
)}
columns={[ columns={[
{ title: "手机号", dataIndex: "phone" }, { title: "手机号", dataIndex: "phone" },
{ title: "姓名", dataIndex: "name" }, { title: "姓名", dataIndex: "name" },
@ -1096,7 +1088,7 @@ const FileUpload = (props) => {
const StepOne = Connect([NS_QUALIFICATION_STATISTICS], true)(StepOneComponent); const StepOne = Connect([NS_QUALIFICATION_STATISTICS], true)(StepOneComponent);
const StepTwo = Connect([NS_QUALIFICATION_STATISTICS], true)(StepTwoComponent); const StepTwo = Connect([NS_QUALIFICATION_STATISTICS], true)(StepTwoComponent);
const Usercontent = Connect([NS_QUALIFICATION_STATISTICS], true)(UsercontentComponent); const UserSelect = Connect([NS_QUALIFICATION_STATISTICS], true)(UserSelectComponent);
const ChooseFilsList = Connect([NS_QUALIFICATION_STATISTICS], true)(ChooseFilsComponent); const ChooseFilsList = Connect([NS_QUALIFICATION_STATISTICS], true)(ChooseFilsComponent);
export default Connect([NS_QUALIFICATION_STATISTICS], true)(Add); export default Connect([NS_QUALIFICATION_STATISTICS], true)(Add);

View File

@ -3,6 +3,7 @@ import { Connect } from "@cqsjjb/jjb-dva-runtime";
import { Button, Descriptions, Form, Modal, Space } from "antd"; import { Button, Descriptions, Form, Modal, Space } from "antd";
import { useState } from "react"; import { useState } from "react";
import AddIcon from "zy-react-library/components/Icon/AddIcon"; import AddIcon from "zy-react-library/components/Icon/AddIcon";
import Page from "zy-react-library/components/Page";
import Search from "zy-react-library/components/Search"; import Search from "zy-react-library/components/Search";
import DictionarySelect from "zy-react-library/components/Select/Dictionary"; import DictionarySelect from "zy-react-library/components/Select/Dictionary";
import Table from "zy-react-library/components/Table"; import Table from "zy-react-library/components/Table";
@ -30,7 +31,7 @@ function List(props) {
}; };
return ( return (
<div style={{ padding: 20 }}> <Page isShowAllAction={false}>
<Search <Search
labelCol={{ span: 8 }} labelCol={{ span: 8 }}
options={[ options={[
@ -127,14 +128,14 @@ function List(props) {
{...tableProps} {...tableProps}
/> />
{rejectReasonModalOpen && <RejectReason rejectReason={rejectReason} onCancel={() => setRejectReasonModalOpen(false)} />} {rejectReasonModalOpen && <RejectReason rejectReason={rejectReason} onCancel={() => setRejectReasonModalOpen(false)} />}
</div> </Page>
); );
} }
const RejectReason = (props) => { const RejectReason = (props) => {
return ( return (
<Modal <Modal
title="查看驳回原因" title="查看驳回原因"
width={800} width={600}
open open
maskClosable={false} maskClosable={false}
onCancel={props.onCancel} onCancel={props.onCancel}

View File

@ -1,8 +1,8 @@
import { Connect } from "@cqsjjb/jjb-dva-runtime"; import { Connect } from "@cqsjjb/jjb-dva-runtime";
import { Button, Descriptions, Divider, Form, Input, message, Modal, Space, Spin } from "antd"; import { Button, Descriptions, Divider, Form, Input, message, Modal, Space } from "antd";
import { useEffect, useState } from "react"; import { useEffect, useState } from "react";
import FormBuilder from "zy-react-library/components/FormBuilder"; import FormBuilder from "zy-react-library/components/FormBuilder";
import HeaderBack from "zy-react-library/components/HeaderBack"; import Page from "zy-react-library/components/Page";
import Table from "zy-react-library/components/Table"; import Table from "zy-react-library/components/Table";
import TooltipPreviewImg from "zy-react-library/components/TooltipPreviewImg"; import TooltipPreviewImg from "zy-react-library/components/TooltipPreviewImg";
import { FORM_ITEM_RENDER_ENUM } from "zy-react-library/enum/formItemRender"; import { FORM_ITEM_RENDER_ENUM } from "zy-react-library/enum/formItemRender";
@ -204,9 +204,32 @@ function Review(props) {
getProjectListAll(); getProjectListAll();
}, []); }, []);
return ( return (
<Page
headerTitle="查看"
contentPadding="0 20px 20px 20px"
extraActionButtons={(
<>
{(query.projectStatusLast === "1" || query.projectStatusLast === "3" || query.projectStatusLast === "7")
&& (
<>
<Button onClick={() => auditSubmit(0)}>
驳回
</Button>
<Button type="primary" onClick={() => auditSubmit(1)}>
审核通过
</Button>
</>
)}
{query.projectStatusLast === "2"
&& (
<Button type="primary" onClick={() => auditSubmit(1)}>
确认信息
</Button>
)}
</>
)}
>
<div> <div>
<HeaderBack title="查看" />
<div style={{ padding: "0 20px 20px 20px" }}>
{info.relatedProjectId && ( {info.relatedProjectId && (
<div style={{ "font-size": "16px" }}> <div style={{ "font-size": "16px" }}>
<Divider orientation="left">一级项目信息</Divider> <Divider orientation="left">一级项目信息</Divider>
@ -234,7 +257,6 @@ function Review(props) {
)} )}
<div> <div>
<Divider orientation="left">项目基础信息</Divider> <Divider orientation="left">项目基础信息</Divider>
<Spin spinning="">
<Descriptions <Descriptions
bordered bordered
column={4} column={4}
@ -254,11 +276,9 @@ function Review(props) {
{ label: "安全管理协议", children: <TooltipPreviewImg files={info.files} /> }, { label: "安全管理协议", children: <TooltipPreviewImg files={info.files} /> },
]} ]}
/> />
</Spin>
</div> </div>
<div> <div>
<Divider orientation="left">企业基础信息</Divider> <Divider orientation="left">企业基础信息</Divider>
<Spin spinning="">
<Descriptions <Descriptions
bordered bordered
column={4} column={4}
@ -285,7 +305,6 @@ function Review(props) {
{ label: "", children: "" }, { label: "", children: "" },
]} ]}
/> />
</Spin>
</div> </div>
<div> <div>
<Divider orientation="left">项目资料信息</Divider> <Divider orientation="left">项目资料信息</Divider>
@ -355,7 +374,6 @@ function Review(props) {
{info.subcontractFlag === 1 && ( {info.subcontractFlag === 1 && (
<div> <div>
<Divider orientation="left">分包项目信息详情</Divider> <Divider orientation="left">分包项目信息详情</Divider>
<Spin spinning="">
<Table <Table
options={false} options={false}
pagination={false} pagination={false}
@ -380,12 +398,10 @@ function Review(props) {
}, },
]} ]}
/> />
</Spin>
</div> </div>
)} )}
<div> <div>
<Divider orientation="left">{info.stakeholderLevel === "one-level" ? "一级项目审核信息" : "审核记录"}</Divider> <Divider orientation="left">{info.stakeholderLevel === "one-level" ? "一级项目审核信息" : "审核记录"}</Divider>
<Spin spinning="">
<Table <Table
options={false} options={false}
pagination={false} pagination={false}
@ -399,42 +415,7 @@ function Review(props) {
{ title: "审核结果", dataIndex: "approvalStatus", render: (_, record) => getLabelName({ list: [{ name: "审核中", bianma: "1" }, { name: "已通过", bianma: "2" }, { name: "已驳回", bianma: "3" }], status: record.approvalStatus }) }, { title: "审核结果", dataIndex: "approvalStatus", render: (_, record) => getLabelName({ list: [{ name: "审核中", bianma: "1" }, { name: "已通过", bianma: "2" }, { name: "已驳回", bianma: "3" }], status: record.approvalStatus }) },
]} ]}
/> />
</Spin>
</div> </div>
{(query.projectStatusLast === "1" || query.projectStatusLast === "3" || query.projectStatusLast === "7")
&& (
<div className="btn_bottom">
<Button
onClick={() => auditSubmit(0)}
>
驳回
</Button>
<Button
style={{ marginLeft: "20px" }}
type="primary"
onClick={() => auditSubmit(1)}
>
审核通过
</Button>
</div>
)}
{query.projectStatusLast === "2"
&& (
<div className="btn_bottom">
<Button
onClick={() => props.history.goBack()}
>
返回
</Button>
<Button
style={{ marginLeft: "20px" }}
type="primary"
onClick={() => auditSubmit(1)}
>
确认信息
</Button>
</div>
)}
{viewProjectReviewUserModalOpen {viewProjectReviewUserModalOpen
&& <ViewProjectReviewUserModal onCancel={() => setViewProjectReviewUserModalOpen(false)} data={viewProjectReviewUserModalData} />} && <ViewProjectReviewUserModal onCancel={() => setViewProjectReviewUserModalOpen(false)} data={viewProjectReviewUserModalData} />}
{viewProjectReviewDetailsModalOpen {viewProjectReviewDetailsModalOpen
@ -447,7 +428,7 @@ function Review(props) {
{props.children} {props.children}
</div> </div>
</div> </Page>
); );
} }

View File

@ -47,11 +47,4 @@
} }
} }
} }
}
.btn_bottom{
text-align: center;
margin-top: 20px;
} }

View File

@ -1,6 +1,7 @@
import { Permission } from "@cqsjjb/jjb-common-decorator/permission"; import { Permission } from "@cqsjjb/jjb-common-decorator/permission";
import { Connect } from "@cqsjjb/jjb-dva-runtime"; import { Connect } from "@cqsjjb/jjb-dva-runtime";
import { Button, Form, Space } from "antd"; import { Button, Form, Space } from "antd";
import Page from "zy-react-library/components/Page";
import Search from "zy-react-library/components/Search"; import Search from "zy-react-library/components/Search";
import DictionarySelect from "zy-react-library/components/Select/Dictionary"; import DictionarySelect from "zy-react-library/components/Select/Dictionary";
import Table from "zy-react-library/components/Table"; import Table from "zy-react-library/components/Table";
@ -21,7 +22,7 @@ function List(props) {
}); });
return ( return (
<div style={{ padding: 20 }}> <Page isShowAllAction={false}>
<Search <Search
labelCol={{ span: 8 }} labelCol={{ span: 8 }}
options={[ options={[
@ -101,7 +102,7 @@ function List(props) {
]} ]}
{...tableProps} {...tableProps}
/> />
</div> </Page>
); );
} }

View File

@ -3,9 +3,9 @@ import { Button, Divider, Form, message, Modal, Space, Spin } from "antd";
import dayjs from "dayjs"; import dayjs from "dayjs";
import { useEffect, useMemo, useState } from "react"; import { useEffect, useMemo, useState } from "react";
import FormBuilder from "zy-react-library/components/FormBuilder"; import FormBuilder from "zy-react-library/components/FormBuilder";
import HeaderBack from "zy-react-library/components/HeaderBack";
import AddIcon from "zy-react-library/components/Icon/AddIcon"; import AddIcon from "zy-react-library/components/Icon/AddIcon";
import DepartmentLeftTree from "zy-react-library/components/LeftTree/Department/Gwj"; import DepartmentLeftTree from "zy-react-library/components/LeftTree/Department/Gwj";
import Page from "zy-react-library/components/Page";
import Search from "zy-react-library/components/Search"; import Search from "zy-react-library/components/Search";
import DictionarySelect from "zy-react-library/components/Select/Dictionary"; import DictionarySelect from "zy-react-library/components/Select/Dictionary";
import PersonnelSelect from "zy-react-library/components/Select/Personnel/Gwj"; import PersonnelSelect from "zy-react-library/components/Select/Personnel/Gwj";
@ -73,9 +73,7 @@ function Add(props) {
}, []); }, []);
return ( return (
<div> <Page headerTitle={query.id ? "编辑" : "新增"} isShowFooter={false}>
<HeaderBack title={query.id ? "编辑" : "新增"} />
<div style={{ padding: 20 }}>
{currentStep === 1 {currentStep === 1
&& ( && (
<StepOne <StepOne
@ -103,8 +101,7 @@ function Add(props) {
corpinfoId={corpinfoId} corpinfoId={corpinfoId}
/> />
)} )}
</div> </Page>
</div>
); );
} }
@ -457,7 +454,6 @@ const StepTwoComponent = (props) => {
}); });
projectFileList[i].projectFileId = id; projectFileList[i].projectFileId = id;
} }
console.log("usercontentList", usercontentList);
const userList = usercontentList.map(item => ({ const userList = usercontentList.map(item => ({
userId: item.id, userId: item.id,
userName: item.name, userName: item.name,
@ -467,7 +463,6 @@ const StepTwoComponent = (props) => {
userPostName: item.postName, userPostName: item.postName,
projectLeader: item.projectLeader, projectLeader: item.projectLeader,
})); }));
console.log("userList", userList);
const data = { ...props.formValues, projectUserAddCmdList: [...userList], projectFileAddCmdList: [...projectFileList], projectLocalCompanyAddCmdList: [...projectLocalCompanyAddCmdList], projectApprovalUserAddCmdList: [...projectApprovalUserAddCmdList], projectApprovalFlowAddCmdList: [...projectApprovalFlowAddCmdList], corpinfoId }; const data = { ...props.formValues, projectUserAddCmdList: [...userList], projectFileAddCmdList: [...projectFileList], projectLocalCompanyAddCmdList: [...projectLocalCompanyAddCmdList], projectApprovalUserAddCmdList: [...projectApprovalUserAddCmdList], projectApprovalFlowAddCmdList: [...projectApprovalFlowAddCmdList], corpinfoId };
const { success } = await props[!query.id ? "projectAdd" : "projectUpdate"]({ const { success } = await props[!query.id ? "projectAdd" : "projectUpdate"]({
...data, ...data,
@ -675,6 +670,7 @@ const ChooseFilsComponent = (props) => {
params: { params: {
qualificationsTypeId: "", qualificationsTypeId: "",
}, },
useStorageQueryCriteria: false,
}); });
const submit = () => { const submit = () => {
if (props.onSubmit) { if (props.onSubmit) {
@ -704,6 +700,8 @@ const ChooseFilsComponent = (props) => {
onOk={submit} onOk={submit}
> >
<Table <Table
options={false}
disabledResizer={true}
rowSelection={{ rowSelection={{
selectedRowKeys, selectedRowKeys,
preserveSelectedRowKeys: true, preserveSelectedRowKeys: true,
@ -739,6 +737,7 @@ const UsercontentComponent = (props) => {
inDepartmentId, inDepartmentId,
eqEmploymentFlag: 1, // 在职 eqEmploymentFlag: 1, // 在职
}, },
useStorageQueryCriteria: false,
}); });
const projectLeader = useMemo(() => { const projectLeader = useMemo(() => {
if (props.data && Array.isArray(props.data)) { if (props.data && Array.isArray(props.data)) {
@ -799,19 +798,9 @@ const UsercontentComponent = (props) => {
open open
maskClosable={false} maskClosable={false}
onCancel={props.onCancel} onCancel={props.onCancel}
footer={null} okText="确认添加"
onOk={handleConfirmAdd}
> >
<Search
labelCol={{ span: 8 }}
options={[
{ name: "likeName", label: "姓名" },
{ name: "likeUserIdCard", label: "身份证" },
]}
form={form}
onFinish={(values) => {
getData(values);
}}
/>
<div style={{ display: "flex", gap: 20 }}> <div style={{ display: "flex", gap: 20 }}>
<div style={{ width: 300 }}> <div style={{ width: 300 }}>
<DepartmentLeftTree <DepartmentLeftTree
@ -823,7 +812,20 @@ const UsercontentComponent = (props) => {
/> />
</div> </div>
<div style={{ flex: 1 }}> <div style={{ flex: 1 }}>
<Search
labelCol={{ span: 8 }}
options={[
{ name: "likeName", label: "姓名" },
{ name: "likeUserIdCard", label: "身份证" },
]}
form={form}
onFinish={(values) => {
getData(values);
}}
/>
<Table <Table
options={false}
disabledResizer={true}
rowSelection={{ rowSelection={{
selectedRowKeys, selectedRowKeys,
preserveSelectedRowKeys: true, preserveSelectedRowKeys: true,
@ -833,17 +835,6 @@ const UsercontentComponent = (props) => {
disabled: projectLeader && record.id === projectLeader.id, disabled: projectLeader && record.id === projectLeader.id,
}), }),
}} }}
rowKey="id"
toolBarRender={() => (
<>
<Button
type="primary"
onClick={handleConfirmAdd}
>
确认添加
</Button>
</>
)}
columns={[ columns={[
{ title: "手机号", dataIndex: "phone" }, { title: "手机号", dataIndex: "phone" },
{ title: "姓名", dataIndex: "name" }, { title: "姓名", dataIndex: "name" },

View File

@ -3,6 +3,7 @@ import { Connect } from "@cqsjjb/jjb-dva-runtime";
import { Button, Descriptions, Form, Modal, Space } from "antd"; import { Button, Descriptions, Form, Modal, Space } from "antd";
import { useState } from "react"; import { useState } from "react";
import AddIcon from "zy-react-library/components/Icon/AddIcon"; import AddIcon from "zy-react-library/components/Icon/AddIcon";
import Page from "zy-react-library/components/Page";
import Search from "zy-react-library/components/Search"; import Search from "zy-react-library/components/Search";
import DictionarySelect from "zy-react-library/components/Select/Dictionary"; import DictionarySelect from "zy-react-library/components/Select/Dictionary";
import Table from "zy-react-library/components/Table"; import Table from "zy-react-library/components/Table";
@ -30,7 +31,7 @@ function List(props) {
}; };
return ( return (
<div style={{ padding: 20 }}> <Page isShowAllAction={false}>
<Search <Search
labelCol={{ span: 8 }} labelCol={{ span: 8 }}
options={[ options={[
@ -126,14 +127,14 @@ function List(props) {
{...tableProps} {...tableProps}
/> />
{rejectReasonModalOpen && <RejectReason rejectReason={rejectReason} onCancel={() => setRejectReasonModalOpen(false)} />} {rejectReasonModalOpen && <RejectReason rejectReason={rejectReason} onCancel={() => setRejectReasonModalOpen(false)} />}
</div> </Page>
); );
} }
const RejectReason = (props) => { const RejectReason = (props) => {
return ( return (
<Modal <Modal
title="查看驳回原因" title="查看驳回原因"
width={800} width={600}
open open
maskClosable={false} maskClosable={false}
onCancel={props.onCancel} onCancel={props.onCancel}

View File

@ -1,6 +1,7 @@
import { Permission } from "@cqsjjb/jjb-common-decorator/permission"; import { Permission } from "@cqsjjb/jjb-common-decorator/permission";
import { Connect } from "@cqsjjb/jjb-dva-runtime"; import { Connect } from "@cqsjjb/jjb-dva-runtime";
import { Button, Form, Space } from "antd"; import { Button, Form, Space } from "antd";
import Page from "zy-react-library/components/Page";
import Search from "zy-react-library/components/Search"; import Search from "zy-react-library/components/Search";
import DictionarySelect from "zy-react-library/components/Select/Dictionary"; import DictionarySelect from "zy-react-library/components/Select/Dictionary";
import Table from "zy-react-library/components/Table"; import Table from "zy-react-library/components/Table";
@ -20,7 +21,7 @@ function List(props) {
}); });
return ( return (
<div style={{ padding: 20 }}> <Page isShowAllAction={false}>
<Search <Search
labelCol={{ span: 8 }} labelCol={{ span: 8 }}
options={[ options={[
@ -89,7 +90,7 @@ function List(props) {
]} ]}
{...tableProps} {...tableProps}
/> />
</div> </Page>
); );
} }

View File

@ -3,6 +3,7 @@ import { Connect } from "@cqsjjb/jjb-dva-runtime";
import { Button, Descriptions, Form, Modal, Space } from "antd"; import { Button, Descriptions, Form, Modal, Space } from "antd";
import { useState } from "react"; import { useState } from "react";
import AddIcon from "zy-react-library/components/Icon/AddIcon"; import AddIcon from "zy-react-library/components/Icon/AddIcon";
import Page from "zy-react-library/components/Page";
import Search from "zy-react-library/components/Search"; import Search from "zy-react-library/components/Search";
import DictionarySelect from "zy-react-library/components/Select/Dictionary"; import DictionarySelect from "zy-react-library/components/Select/Dictionary";
import Table from "zy-react-library/components/Table"; import Table from "zy-react-library/components/Table";
@ -26,7 +27,7 @@ function List(props) {
}; };
return ( return (
<div style={{ padding: 20 }}> <Page isShowAllAction={false}>
<Search <Search
labelCol={{ span: 8 }} labelCol={{ span: 8 }}
options={[ options={[
@ -112,7 +113,7 @@ function List(props) {
{...tableProps} {...tableProps}
/> />
{rejectReasonModalOpen && <RejectReason rejectReason={rejectReason} onCancel={() => setRejectReasonModalOpen(false)} />} {rejectReasonModalOpen && <RejectReason rejectReason={rejectReason} onCancel={() => setRejectReasonModalOpen(false)} />}
</div> </Page>
); );
} }
@ -120,7 +121,7 @@ const RejectReason = (props) => {
return ( return (
<Modal <Modal
title="查看驳回原因" title="查看驳回原因"
width={800} width={600}
open open
maskClosable={false} maskClosable={false}
onCancel={props.onCancel} onCancel={props.onCancel}

View File

@ -2,6 +2,7 @@ import { Permission } from "@cqsjjb/jjb-common-decorator/permission";
import { Connect } from "@cqsjjb/jjb-dva-runtime"; import { Connect } from "@cqsjjb/jjb-dva-runtime";
import { Button, Descriptions, Form, Modal, Space } from "antd"; import { Button, Descriptions, Form, Modal, Space } from "antd";
import { useState } from "react"; import { useState } from "react";
import Page from "zy-react-library/components/Page";
import Search from "zy-react-library/components/Search"; import Search from "zy-react-library/components/Search";
import DictionarySelect from "zy-react-library/components/Select/Dictionary"; import DictionarySelect from "zy-react-library/components/Select/Dictionary";
import Table from "zy-react-library/components/Table"; import Table from "zy-react-library/components/Table";
@ -30,7 +31,7 @@ function List(props) {
}; };
return ( return (
<div style={{ padding: 20 }}> <Page isShowAllAction={false}>
<Search <Search
labelCol={{ span: 8 }} labelCol={{ span: 8 }}
options={[ options={[
@ -91,14 +92,14 @@ function List(props) {
{...tableProps} {...tableProps}
/> />
{rejectReasonModalOpen && <RejectReason rejectReason={rejectReason} onCancel={() => setRejectReasonModalOpen(false)} />} {rejectReasonModalOpen && <RejectReason rejectReason={rejectReason} onCancel={() => setRejectReasonModalOpen(false)} />}
</div> </Page>
); );
} }
const RejectReason = (props) => { const RejectReason = (props) => {
return ( return (
<Modal <Modal
title="查看驳回原因" title="查看驳回原因"
width={800} width={600}
open open
maskClosable={false} maskClosable={false}
onCancel={props.onCancel} onCancel={props.onCancel}

View File

@ -2,6 +2,7 @@ import { Permission } from "@cqsjjb/jjb-common-decorator/permission";
import { Connect } from "@cqsjjb/jjb-dva-runtime"; import { Connect } from "@cqsjjb/jjb-dva-runtime";
import { Button, Descriptions, Form, Modal, Space } from "antd"; import { Button, Descriptions, Form, Modal, Space } from "antd";
import { useState } from "react"; import { useState } from "react";
import Page from "zy-react-library/components/Page";
import Search from "zy-react-library/components/Search"; import Search from "zy-react-library/components/Search";
import DictionarySelect from "zy-react-library/components/Select/Dictionary"; import DictionarySelect from "zy-react-library/components/Select/Dictionary";
import Table from "zy-react-library/components/Table"; import Table from "zy-react-library/components/Table";
@ -30,7 +31,7 @@ function List(props) {
}; };
return ( return (
<div style={{ padding: 20 }}> <Page isShowAllAction={false}>
<Search <Search
labelCol={{ span: 8 }} labelCol={{ span: 8 }}
options={[ options={[
@ -91,14 +92,14 @@ function List(props) {
{...tableProps} {...tableProps}
/> />
{rejectReasonModalOpen && <RejectReason rejectReason={rejectReason} onCancel={() => setRejectReasonModalOpen(false)} />} {rejectReasonModalOpen && <RejectReason rejectReason={rejectReason} onCancel={() => setRejectReasonModalOpen(false)} />}
</div> </Page>
); );
} }
const RejectReason = (props) => { const RejectReason = (props) => {
return ( return (
<Modal <Modal
title="查看驳回原因" title="查看驳回原因"
width={800} width={600}
open open
maskClosable={false} maskClosable={false}
onCancel={props.onCancel} onCancel={props.onCancel}

View File

@ -2,6 +2,7 @@ import { Permission } from "@cqsjjb/jjb-common-decorator/permission";
import { Connect } from "@cqsjjb/jjb-dva-runtime"; import { Connect } from "@cqsjjb/jjb-dva-runtime";
import { Button, Descriptions, Form, Modal, Space } from "antd"; import { Button, Descriptions, Form, Modal, Space } from "antd";
import { useState } from "react"; import { useState } from "react";
import Page from "zy-react-library/components/Page";
import Search from "zy-react-library/components/Search"; import Search from "zy-react-library/components/Search";
import DictionarySelect from "zy-react-library/components/Select/Dictionary"; import DictionarySelect from "zy-react-library/components/Select/Dictionary";
import Table from "zy-react-library/components/Table"; import Table from "zy-react-library/components/Table";
@ -29,7 +30,7 @@ function List(props) {
}; };
return ( return (
<div style={{ padding: 20 }}> <Page isShowAllAction={false}>
<Search <Search
labelCol={{ span: 8 }} labelCol={{ span: 8 }}
options={[ options={[
@ -91,14 +92,14 @@ function List(props) {
{...tableProps} {...tableProps}
/> />
{rejectReasonModalOpen && <RejectReason rejectReason={rejectReason} onCancel={() => setRejectReasonModalOpen(false)} />} {rejectReasonModalOpen && <RejectReason rejectReason={rejectReason} onCancel={() => setRejectReasonModalOpen(false)} />}
</div> </Page>
); );
} }
const RejectReason = (props) => { const RejectReason = (props) => {
return ( return (
<Modal <Modal
title="查看驳回原因" title="查看驳回原因"
width={800} width={600}
open open
maskClosable={false} maskClosable={false}
onCancel={props.onCancel} onCancel={props.onCancel}

View File

@ -1,6 +1,7 @@
import { Permission } from "@cqsjjb/jjb-common-decorator/permission"; import { Permission } from "@cqsjjb/jjb-common-decorator/permission";
import { Connect } from "@cqsjjb/jjb-dva-runtime"; import { Connect } from "@cqsjjb/jjb-dva-runtime";
import { Button, Form, Space } from "antd"; import { Button, Form, Space } from "antd";
import Page from "zy-react-library/components/Page";
import Search from "zy-react-library/components/Search"; import Search from "zy-react-library/components/Search";
import DictionarySelect from "zy-react-library/components/Select/Dictionary"; import DictionarySelect from "zy-react-library/components/Select/Dictionary";
import Table from "zy-react-library/components/Table"; import Table from "zy-react-library/components/Table";
@ -20,7 +21,7 @@ function List(props) {
}); });
return ( return (
<div style={{ padding: 20 }}> <Page isShowAllAction={false}>
<Search <Search
labelCol={{ span: 8 }} labelCol={{ span: 8 }}
options={[ options={[
@ -89,7 +90,7 @@ function List(props) {
]} ]}
{...tableProps} {...tableProps}
/> />
</div> </Page>
); );
} }

View File

@ -1,9 +1,9 @@
import { Connect } from "@cqsjjb/jjb-dva-runtime"; import { Connect } from "@cqsjjb/jjb-dva-runtime";
import { Button, Form, message, Modal, Space } from "antd"; import { Button, Form, message, Modal, Space } from "antd";
import { useEffect, useMemo, useState } from "react"; import { useEffect, useMemo, useState } from "react";
import HeaderBack from "zy-react-library/components/HeaderBack";
import AddIcon from "zy-react-library/components/Icon/AddIcon"; import AddIcon from "zy-react-library/components/Icon/AddIcon";
import DepartmentLeftTree from "zy-react-library/components/LeftTree/Department/Gwj"; import DepartmentLeftTree from "zy-react-library/components/LeftTree/Department/Gwj";
import Page from "zy-react-library/components/Page";
import Search from "zy-react-library/components/Search"; import Search from "zy-react-library/components/Search";
import Table from "zy-react-library/components/Table"; import Table from "zy-react-library/components/Table";
import useGetUrlQuery from "zy-react-library/hooks/useGetUrlQuery"; import useGetUrlQuery from "zy-react-library/hooks/useGetUrlQuery";
@ -71,9 +71,7 @@ function UserChange(props) {
}; };
return ( return (
<div> <Page headerTitle="项目人员变更">
<HeaderBack title="项目人员变更" />
<div style={{ padding: "0 20px 20px 20px" }}>
<Table <Table
toolBarRender={() => ( toolBarRender={() => (
<Space> <Space>
@ -124,9 +122,8 @@ function UserChange(props) {
]} ]}
{...tableProps} {...tableProps}
/> />
</div>
{usercontentOpen && ( {usercontentOpen && (
<Usercontent <UserSelect
data={fetchUserList} data={fetchUserList}
projectId={query.id} projectId={query.id}
onCancel={() => { onCancel={() => {
@ -135,12 +132,12 @@ function UserChange(props) {
onConfirm={handleConfirmAdd} onConfirm={handleConfirmAdd}
/> />
)} )}
</div> </Page>
); );
} }
// 选择项目人员的组件 // 选择项目人员的组件
const UsercontentComponent = (props) => { const UserSelectComponent = (props) => {
const [form] = Form.useForm(); const [form] = Form.useForm();
const [selectedRowKeys, setSelectedRowKeys] = useState([]); // 存储选中的行键 const [selectedRowKeys, setSelectedRowKeys] = useState([]); // 存储选中的行键
const [selectedRows, setSelectedRows] = useState([]); // 存储选中行的完整数据 const [selectedRows, setSelectedRows] = useState([]); // 存储选中行的完整数据
@ -155,6 +152,7 @@ const UsercontentComponent = (props) => {
inDepartmentId, inDepartmentId,
eqEmploymentFlag: 1, // 在职 eqEmploymentFlag: 1, // 在职
}, },
useStorageQueryCriteria: false,
}); });
// 合并表格数据:接口返回的数据 + 已存在但可能不在接口数据中的人员 // 合并表格数据:接口返回的数据 + 已存在但可能不在接口数据中的人员
@ -268,19 +266,9 @@ const UsercontentComponent = (props) => {
open open
maskClosable={false} maskClosable={false}
onCancel={props.onCancel} onCancel={props.onCancel}
footer={null} okText="确认添加"
onOk={handleConfirmAdd}
> >
<Search
labelCol={{ span: 8 }}
options={[
{ name: "likeName", label: "姓名" },
{ name: "likeUserIdCard", label: "身份证" },
]}
form={form}
onFinish={(values) => {
getData(values);
}}
/>
<div style={{ display: "flex", gap: 20 }}> <div style={{ display: "flex", gap: 20 }}>
<div style={{ width: 300 }}> <div style={{ width: 300 }}>
<DepartmentLeftTree <DepartmentLeftTree
@ -292,7 +280,18 @@ const UsercontentComponent = (props) => {
/> />
</div> </div>
<div style={{ flex: 1 }}> <div style={{ flex: 1 }}>
<Search
labelCol={{ span: 8 }}
options={[
{ name: "likeName", label: "姓名" },
{ name: "likeUserIdCard", label: "身份证" },
]}
form={form}
onFinish={getData}
/>
<Table <Table
options={false}
disabledResizer={true}
rowSelection={{ rowSelection={{
selectedRowKeys, selectedRowKeys,
preserveSelectedRowKeys: true, preserveSelectedRowKeys: true,
@ -302,17 +301,6 @@ const UsercontentComponent = (props) => {
disabled: projectLeader && record.id === projectLeader.id, disabled: projectLeader && record.id === projectLeader.id,
}), }),
}} }}
rowKey="id"
toolBarRender={() => (
<>
<Button
type="primary"
onClick={handleConfirmAdd}
>
确认添加
</Button>
</>
)}
columns={[ columns={[
{ title: "手机号", dataIndex: "phone" }, { title: "手机号", dataIndex: "phone" },
{ {
@ -331,9 +319,8 @@ const UsercontentComponent = (props) => {
{ title: "所属岗位", dataIndex: "postName" }, { title: "所属岗位", dataIndex: "postName" },
{ title: "是否存在人资系统", dataIndex: "rzFlag", render: (_, record) => record.rzFlag === 1 ? "是" : "否" }, { title: "是否存在人资系统", dataIndex: "rzFlag", render: (_, record) => record.rzFlag === 1 ? "是" : "否" },
]} ]}
{...tableProps}
dataSource={tableDataSource} dataSource={tableDataSource}
pagination={tableProps.pagination}
loading={tableProps.loading}
/> />
</div> </div>
</div> </div>
@ -341,5 +328,5 @@ const UsercontentComponent = (props) => {
); );
}; };
const Usercontent = Connect([NS_QUALIFICATION_STATISTICS], true)(UsercontentComponent); const UserSelect = Connect([NS_QUALIFICATION_STATISTICS], true)(UserSelectComponent);
export default Connect([NS_QUALIFICATION_STATISTICS], true)(UserChange); export default Connect([NS_QUALIFICATION_STATISTICS], true)(UserChange);

View File

@ -1,5 +1,5 @@
import { Connect } from "@cqsjjb/jjb-dva-runtime"; import { Connect } from "@cqsjjb/jjb-dva-runtime";
import HeaderBack from "zy-react-library/components/HeaderBack"; import Page from "zy-react-library/components/Page";
import Table from "zy-react-library/components/Table"; import Table from "zy-react-library/components/Table";
import useGetUrlQuery from "zy-react-library/hooks/useGetUrlQuery"; import useGetUrlQuery from "zy-react-library/hooks/useGetUrlQuery";
import useTable from "zy-react-library/hooks/useTable"; import useTable from "zy-react-library/hooks/useTable";
@ -10,9 +10,7 @@ function UserChange(props) {
const { tableProps } = useTable(props["projectUserChangeRecordList"], { params: { eqProjectId: query.id } }); const { tableProps } = useTable(props["projectUserChangeRecordList"], { params: { eqProjectId: query.id } });
return ( return (
<div> <Page headerTitle="项目人员变更记录">
<HeaderBack title="项目人员变更记录" />
<div style={{ padding: "0 20px 20px 20px" }}>
<Table <Table
columns={[ columns={[
{ title: "姓名", dataIndex: "userName" }, { title: "姓名", dataIndex: "userName" },
@ -22,8 +20,7 @@ function UserChange(props) {
]} ]}
{...tableProps} {...tableProps}
/> />
</div> </Page>
</div>
); );
} }
export default Connect([NS_QUALIFICATION_STATISTICS], true)(UserChange); export default Connect([NS_QUALIFICATION_STATISTICS], true)(UserChange);

View File

@ -2,7 +2,7 @@ import { Connect } from "@cqsjjb/jjb-dva-runtime";
import { Form, message } from "antd"; import { Form, message } from "antd";
import { useEffect } from "react"; import { useEffect } from "react";
import FormBuilder from "zy-react-library/components/FormBuilder"; import FormBuilder from "zy-react-library/components/FormBuilder";
import HeaderBack from "zy-react-library/components/HeaderBack"; import Page from "zy-react-library/components/Page";
import DictionarySelect from "zy-react-library/components/Select/Dictionary"; import DictionarySelect from "zy-react-library/components/Select/Dictionary";
import PersonnelSelect from "zy-react-library/components/Select/Personnel/Gwj"; import PersonnelSelect from "zy-react-library/components/Select/Personnel/Gwj";
import DepartmentSelectTree from "zy-react-library/components/SelectTree/Department/Gwj"; import DepartmentSelectTree from "zy-react-library/components/SelectTree/Department/Gwj";
@ -14,7 +14,6 @@ function Add(props) {
const query = useGetUrlQuery(); const query = useGetUrlQuery();
const [form] = Form.useForm(); const [form] = Form.useForm();
const managerDept = Form.useWatch("managerDept", form); const managerDept = Form.useWatch("managerDept", form);
const supervisionDept = Form.useWatch("supervisionDept", form);
const getData = async () => { const getData = async () => {
const { data } = await props["qualificationMaintenanceInfo"]({ id: query.id }); const { data } = await props["qualificationMaintenanceInfo"]({ id: query.id });
@ -43,9 +42,7 @@ function Add(props) {
}; };
return ( return (
<div> <Page headerTitle={query.id ? "编辑" : "新增"} isShowFooter={false}>
<HeaderBack title={query.id ? "编辑" : "新增"} />
<div style={{ paddingBottom: 20 }}>
<FormBuilder <FormBuilder
form={form} form={form}
values={{ values={{
@ -164,8 +161,7 @@ function Add(props) {
}, },
]} ]}
/> />
</div> </Page>
</div>
); );
} }

View File

@ -2,7 +2,7 @@ import { Connect } from "@cqsjjb/jjb-dva-runtime";
import { Form, message } from "antd"; import { Form, message } from "antd";
import { useEffect } from "react"; import { useEffect } from "react";
import FormBuilder from "zy-react-library/components/FormBuilder"; import FormBuilder from "zy-react-library/components/FormBuilder";
import HeaderBack from "zy-react-library/components/HeaderBack"; import Page from "zy-react-library/components/Page";
import DictionarySelect from "zy-react-library/components/Select/Dictionary"; import DictionarySelect from "zy-react-library/components/Select/Dictionary";
import { FORM_ITEM_RENDER_ENUM } from "zy-react-library/enum/formItemRender"; import { FORM_ITEM_RENDER_ENUM } from "zy-react-library/enum/formItemRender";
import useGetUrlQuery from "zy-react-library/hooks/useGetUrlQuery"; import useGetUrlQuery from "zy-react-library/hooks/useGetUrlQuery";
@ -29,9 +29,7 @@ function AddQualifications(props) {
}; };
return ( return (
<div> <Page headerTitle="添加资质" isShowFooter={false}>
<HeaderBack title="添加资质" />
<div style={{ paddingBottom: 20 }}>
<FormBuilder <FormBuilder
form={form} form={form}
values={{ values={{
@ -82,8 +80,7 @@ function AddQualifications(props) {
}, },
]} ]}
/> />
</div> </Page>
</div>
); );
} }

View File

@ -1,7 +1,7 @@
import { Connect } from "@cqsjjb/jjb-dva-runtime"; import { Connect } from "@cqsjjb/jjb-dva-runtime";
import { Button } from "antd"; import { Button } from "antd";
import { useState } from "react"; import { useState } from "react";
import HeaderBack from "zy-react-library/components/HeaderBack"; import Page from "zy-react-library/components/Page";
import Table from "zy-react-library/components/Table"; import Table from "zy-react-library/components/Table";
import useGetUrlQuery from "zy-react-library/hooks/useGetUrlQuery"; import useGetUrlQuery from "zy-react-library/hooks/useGetUrlQuery";
import useTable from "zy-react-library/hooks/useTable"; import useTable from "zy-react-library/hooks/useTable";
@ -17,9 +17,7 @@ function ChangeLogList(props) {
}); });
return ( return (
<div> <Page headerTitle="变更记录">
<HeaderBack title="变更记录" />
<div style={{ padding: 20 }}>
<Table <Table
rowSelection={{ rowSelection={{
preserveSelectedRowKeys: true, preserveSelectedRowKeys: true,
@ -34,6 +32,7 @@ function ChangeLogList(props) {
toolBarRender={() => ( toolBarRender={() => (
<Button <Button
type="primary" type="primary"
ghost
disabled={selectedRowKeys.length !== 2} disabled={selectedRowKeys.length !== 2}
onClick={() => { onClick={() => {
props.history.push(`./changeLogView?ids=${selectedRowKeys.join(",")}`); props.history.push(`./changeLogView?ids=${selectedRowKeys.join(",")}`);
@ -48,8 +47,7 @@ function ChangeLogList(props) {
]} ]}
{...tableProps} {...tableProps}
/> />
</div> </Page>
</div>
); );
} }

View File

@ -1,7 +1,7 @@
import { Connect } from "@cqsjjb/jjb-dva-runtime"; import { Connect } from "@cqsjjb/jjb-dva-runtime";
import { Descriptions, Divider } from "antd"; import { Descriptions, Divider } from "antd";
import { useEffect, useState } from "react"; import { useEffect, useState } from "react";
import HeaderBack from "zy-react-library/components/HeaderBack"; import Page from "zy-react-library/components/Page";
import Table from "zy-react-library/components/Table"; import Table from "zy-react-library/components/Table";
import useGetUrlQuery from "zy-react-library/hooks/useGetUrlQuery"; import useGetUrlQuery from "zy-react-library/hooks/useGetUrlQuery";
import { getLabelName } from "zy-react-library/utils"; import { getLabelName } from "zy-react-library/utils";
@ -12,7 +12,6 @@ function ChangeLogView(props) {
const { ids } = useGetUrlQuery(); const { ids } = useGetUrlQuery();
const getData = async () => { const getData = async () => {
const { data } = await props["getQualificationMaintenanceChangeLogByIds"]({ ids }); const { data } = await props["getQualificationMaintenanceChangeLogByIds"]({ ids });
console.log(data);
setInfo(data); setInfo(data);
}; };
@ -21,9 +20,7 @@ function ChangeLogView(props) {
}, []); }, []);
return ( return (
<div> <Page headerTitle="版本对比" contentPadding="0 20px 20px 20px">
<HeaderBack title="版本对比" />
<div style={{ padding: "0 20px 20px 20px" }}>
<div style={{ display: "flex" }}> <div style={{ display: "flex" }}>
{ {
info.map((item, index) => ( info.map((item, index) => (
@ -80,8 +77,7 @@ function ChangeLogView(props) {
)) ))
} }
</div> </div>
</div> </Page>
</div>
); );
} }

View File

@ -2,6 +2,7 @@ import { Permission } from "@cqsjjb/jjb-common-decorator/permission";
import { Connect } from "@cqsjjb/jjb-dva-runtime"; import { Connect } from "@cqsjjb/jjb-dva-runtime";
import { Button, Form, message, Modal, Space } from "antd"; import { Button, Form, message, Modal, Space } from "antd";
import AddIcon from "zy-react-library/components/Icon/AddIcon"; import AddIcon from "zy-react-library/components/Icon/AddIcon";
import Page from "zy-react-library/components/Page";
import Search from "zy-react-library/components/Search"; import Search from "zy-react-library/components/Search";
import DictionarySelect from "zy-react-library/components/Select/Dictionary"; import DictionarySelect from "zy-react-library/components/Select/Dictionary";
import Table from "zy-react-library/components/Table"; import Table from "zy-react-library/components/Table";
@ -30,7 +31,7 @@ function List(props) {
}; };
return ( return (
<div style={{ padding: 20 }}> <Page isShowAllAction={false}>
<Search <Search
labelCol={{ span: 8 }} labelCol={{ span: 8 }}
options={[ options={[
@ -105,7 +106,7 @@ function List(props) {
]} ]}
{...tableProps} {...tableProps}
/> />
</div> </Page>
); );
} }

View File

@ -1,6 +1,6 @@
import { Connect } from "@cqsjjb/jjb-dva-runtime"; import { Connect } from "@cqsjjb/jjb-dva-runtime";
import { Button, Space } from "antd"; import { Button, Space, Tooltip } from "antd";
import HeaderBack from "zy-react-library/components/HeaderBack"; import Page from "zy-react-library/components/Page";
import Table from "zy-react-library/components/Table"; import Table from "zy-react-library/components/Table";
import useGetUrlQuery from "zy-react-library/hooks/useGetUrlQuery"; import useGetUrlQuery from "zy-react-library/hooks/useGetUrlQuery";
import useTable from "zy-react-library/hooks/useTable"; import useTable from "zy-react-library/hooks/useTable";
@ -11,9 +11,7 @@ function History(props) {
const { tableProps } = useTable(props["qualificationRecordsHistoryList"], { params: { id: query.id } }); const { tableProps } = useTable(props["qualificationRecordsHistoryList"], { params: { id: query.id } });
return ( return (
<div> <Page headerTitle="过往资料">
<HeaderBack title="过往资料" />
<div style={{ padding: "0 20px 20px 20px" }}>
<Table <Table
columns={[ columns={[
{ title: "相关方名称", dataIndex: "corpName" }, { title: "相关方名称", dataIndex: "corpName" },
@ -22,33 +20,44 @@ function History(props) {
{ title: "资质级别", dataIndex: "stakeholderLevelName" }, { title: "资质级别", dataIndex: "stakeholderLevelName" },
{ title: "材料数", dataIndex: "materialNum" }, { title: "材料数", dataIndex: "materialNum" },
{ {
title: "资质状态", dataIndex: "qualificationsStatus", render: (_, record) => ( title: "资质状态",
dataIndex: "qualificationsStatus",
render: (_, record) => (
<div> <div>
{record.qualificationsStatus === 0 && "正常"} {record.qualificationsStatus === 0 && "正常"}
{record.qualificationsStatus === 1 && "待完善"} {record.qualificationsStatus === 1 && "待完善"}
{record.qualificationsStatus === 2 && ( {record.qualificationsStatus === 2 && (
<Tooltip <Tooltip
overlayStyle={{ width: 'auto', maxWidth: '700px', whiteSpace: 'normal', wordBreak: 'break-word' }} overlayStyle={{ width: "auto", maxWidth: "700px", whiteSpace: "normal", wordBreak: "break-word" }}
title={ title={
record.expireList ? ( record.expireList
<div style={{ width: '100%' }}> ? (
<div style={{ width: "100%" }}>
{record.expireList.map((item, index) => ( {record.expireList.map((item, index) => (
<div key={index}> <div key={index}>
{item.dataName} 已于 {item.qualificationsTermEnd} 过期 {item.dataName}
{" "}
已于
{item.qualificationsTermEnd}
{" "}
过期
</div> </div>
))} ))}
</div> </div>
) : "部分资料已过期" )
: "部分资料已过期"
} }
> >
<span style={{ display: 'inline-flex', alignItems: 'center' }}> <span style={{ display: "inline-flex", alignItems: "center" }}>
存在异常 <WarningOutlined style={{ color: '#faad14', marginLeft: 4 }} /> 存在异常
{" "}
<WarningOutlined style={{ color: "#faad14", marginLeft: 4 }} />
</span> </span>
</Tooltip> </Tooltip>
)} )}
{record.qualificationsStatus === 3 && "资质过期"} {record.qualificationsStatus === 3 && "资质过期"}
</div> </div>
) ),
}, },
{ title: "当前状态", dataIndex: "auditProcess", render: (_, record) => ( { title: "当前状态", dataIndex: "auditProcess", render: (_, record) => (
<div> <div>
@ -80,8 +89,7 @@ function History(props) {
]} ]}
{...tableProps} {...tableProps}
/> />
</div> </Page>
</div>
); );
} }

View File

@ -2,6 +2,7 @@ import { WarningOutlined } from "@ant-design/icons";
import { Permission } from "@cqsjjb/jjb-common-decorator/permission"; import { Permission } from "@cqsjjb/jjb-common-decorator/permission";
import { Connect } from "@cqsjjb/jjb-dva-runtime"; import { Connect } from "@cqsjjb/jjb-dva-runtime";
import { Button, Form, Space, Tooltip } from "antd"; import { Button, Form, Space, Tooltip } from "antd";
import Page from "zy-react-library/components/Page";
import Search from "zy-react-library/components/Search"; import Search from "zy-react-library/components/Search";
import DictionarySelect from "zy-react-library/components/Select/Dictionary"; import DictionarySelect from "zy-react-library/components/Select/Dictionary";
import Table from "zy-react-library/components/Table"; import Table from "zy-react-library/components/Table";
@ -23,7 +24,7 @@ function List(props) {
}); });
return ( return (
<div style={{ padding: 20 }}> <Page isShowAllAction={false}>
<Search <Search
labelCol={{ span: 8 }} labelCol={{ span: 8 }}
options={[ options={[
@ -132,7 +133,7 @@ function List(props) {
]} ]}
{...tableProps} {...tableProps}
/> />
</div> </Page>
); );
} }

View File

@ -1,6 +1,7 @@
import { Permission } from "@cqsjjb/jjb-common-decorator/permission"; import { Permission } from "@cqsjjb/jjb-common-decorator/permission";
import { Connect } from "@cqsjjb/jjb-dva-runtime"; import { Connect } from "@cqsjjb/jjb-dva-runtime";
import { Button, Form, Space } from "antd"; import { Button, Form, Space } from "antd";
import Page from "zy-react-library/components/Page";
import Search from "zy-react-library/components/Search"; import Search from "zy-react-library/components/Search";
import DictionarySelect from "zy-react-library/components/Select/Dictionary"; import DictionarySelect from "zy-react-library/components/Select/Dictionary";
import Table from "zy-react-library/components/Table"; import Table from "zy-react-library/components/Table";
@ -14,7 +15,7 @@ function List(props) {
}); });
return ( return (
<div style={{ padding: 20 }}> <Page isShowAllAction={false}>
<Search <Search
labelCol={{ span: 8 }} labelCol={{ span: 8 }}
options={[ options={[
@ -103,7 +104,7 @@ function List(props) {
]} ]}
{...tableProps} {...tableProps}
/> />
</div> </Page>
); );
} }

View File

@ -1,5 +1,5 @@
import { Connect } from "@cqsjjb/jjb-dva-runtime"; import { Connect } from "@cqsjjb/jjb-dva-runtime";
import { Button, Form, message, Modal, Space } from "antd"; import { Button, Form, message, Modal } from "antd";
import { useState } from "react"; import { useState } from "react";
import FormBuilder from "zy-react-library/components/FormBuilder"; import FormBuilder from "zy-react-library/components/FormBuilder";
import { FORM_ITEM_RENDER_ENUM } from "zy-react-library/enum/formItemRender"; import { FORM_ITEM_RENDER_ENUM } from "zy-react-library/enum/formItemRender";
@ -25,9 +25,11 @@ function Review(props) {
return ( return (
<div> <div>
<ViewInfo onGetData={info => setInfo(info)} title="审核"> <ViewInfo
<div style={{ textAlign: "center", marginTop: 10 }}> onGetData={info => setInfo(info)}
<Space> title="审核"
extraActionButtons={(
<>
<Button <Button
type="primary" type="primary"
onClick={() => { onClick={() => {
@ -50,9 +52,9 @@ function Review(props) {
> >
驳回 驳回
</Button> </Button>
</Space> </>
</div> )}
</ViewInfo> />
{rejectModalOpen && <RejectModal onCancel={() => setRejectModalOpen(false)} id={query.id} />} {rejectModalOpen && <RejectModal onCancel={() => setRejectModalOpen(false)} id={query.id} />}
{passModalOpen && <PassModal onCancel={() => setPassModalOpen(false)} id={query.id} />} {passModalOpen && <PassModal onCancel={() => setPassModalOpen(false)} id={query.id} />}
</div> </div>
@ -73,18 +75,20 @@ const RejectModalComponent = (props) => {
return ( return (
<Modal <Modal
title="驳回" title="驳回"
width={1000} width={600}
open open
maskClosable={false} maskClosable={false}
onCancel={props.onCancel} onCancel={props.onCancel}
onOk={form.submit} onOk={form.submit}
confirmLoading={props.qualificationReview.userQualificationLoading}
> >
<FormBuilder <FormBuilder
form={form} form={form}
span={24} span={24}
labelCol={{ span: 8 }} labelCol={{ span: 10 }}
showActionButtons={false} showActionButtons={false}
onFinish={onSubmit} onFinish={onSubmit}
loading={props.qualificationReview.userQualificationLoading}
options={[ options={[
{ name: "auditRemarks", label: "驳回原因", render: FORM_ITEM_RENDER_ENUM.TEXTAREA }, { name: "auditRemarks", label: "驳回原因", render: FORM_ITEM_RENDER_ENUM.TEXTAREA },
]} ]}
@ -107,18 +111,20 @@ const PassModalComponent = (props) => {
return ( return (
<Modal <Modal
title="通过" title="通过"
width={1000} width={600}
open open
maskClosable={false} maskClosable={false}
onCancel={props.onCancel} onCancel={props.onCancel}
onOk={form.submit} onOk={form.submit}
confirmLoading={props.qualificationReview.userQualificationLoading}
> >
<FormBuilder <FormBuilder
form={form} form={form}
values={{ isLongTerm: 1 }} values={{ isLongTerm: 1 }}
labelCol={{ span: 8 }} labelCol={{ span: 12 }}
showActionButtons={false} showActionButtons={false}
onFinish={onSubmit} onFinish={onSubmit}
loading={props.qualificationReview.userQualificationLoading}
options={[ options={[
{ {
name: "isLongTerm", name: "isLongTerm",

View File

@ -1,6 +1,7 @@
import { Connect } from "@cqsjjb/jjb-dva-runtime"; import { Connect } from "@cqsjjb/jjb-dva-runtime";
import { Descriptions } from "antd"; import { Descriptions } from "antd";
import { useEffect, useState } from "react"; import { useEffect, useState } from "react";
import Page from "zy-react-library/components/Page";
import { NS_QUALIFICATION_STATISTICS } from "~/enumerate/namespace"; import { NS_QUALIFICATION_STATISTICS } from "~/enumerate/namespace";
function Statistics(props) { function Statistics(props) {
@ -15,7 +16,7 @@ function Statistics(props) {
}, []); }, []);
return ( return (
<div style={{ padding: 20 }}> <Page isShowAllAction={false}>
<Descriptions <Descriptions
column={1} column={1}
bordered bordered
@ -34,7 +35,7 @@ function Statistics(props) {
{ label: "其他类相关方数量", children: info.otherStakeholders }, { label: "其他类相关方数量", children: info.otherStakeholders },
]} ]}
/> />
</div> </Page>
); );
} }

View File

@ -1,7 +1,7 @@
import { Connect } from "@cqsjjb/jjb-dva-runtime"; import { Connect } from "@cqsjjb/jjb-dva-runtime";
import { Button, Descriptions, Divider, Spin } from "antd"; import { Button, Descriptions, Divider, Spin } from "antd";
import { Fragment, useEffect, useState } from "react"; import { Fragment, useEffect, useState } from "react";
import HeaderBack from "zy-react-library/components/HeaderBack"; import Page from "zy-react-library/components/Page";
import Table from "zy-react-library/components/Table"; import Table from "zy-react-library/components/Table";
import TooltipPreviewImg from "zy-react-library/components/TooltipPreviewImg"; import TooltipPreviewImg from "zy-react-library/components/TooltipPreviewImg";
import { UPLOAD_FILE_TYPE_ENUM } from "zy-react-library/enum/uploadFile/gwj"; import { UPLOAD_FILE_TYPE_ENUM } from "zy-react-library/enum/uploadFile/gwj";
@ -34,7 +34,16 @@ function ViewInfo(props) {
const [viewQualificationDetailsModalOpen, setViewQualificationDetailsModalOpen] = useState(false); const [viewQualificationDetailsModalOpen, setViewQualificationDetailsModalOpen] = useState(false);
const [viewQualificationDetailsModalData, setViewQualificationDetailsModalData] = useState({}); const [viewQualificationDetailsModalData, setViewQualificationDetailsModalData] = useState({});
const getTypeGroup = async (data) => {
const typeMap = new Map();
for (let i = 0; i < data.specialList.length; i++) {
const { dataType, dataTypeName } = data.specialList[i];
if (dataType && dataTypeName) {
typeMap.set(dataType, { dataType, dataTypeName });
}
}
setTypeGroup(Array.from(typeMap.values()));
};
const getData = async () => { const getData = async () => {
if (!query.id) if (!query.id)
return; return;
@ -61,25 +70,13 @@ function ViewInfo(props) {
corpInfoData.licenseFile = licenseFile; corpInfoData.licenseFile = licenseFile;
setCorpInfoData(corpInfoData); setCorpInfoData(corpInfoData);
}; };
const getTypeGroup = async (data) => {
const typeMap = new Map();
for (let i = 0; i < data.specialList.length; i++) {
const { dataType, dataTypeName } = data.specialList[i];
if (dataType && dataTypeName) {
typeMap.set(dataType, { dataType, dataTypeName });
}
}
setTypeGroup(Array.from(typeMap.values()));
}
useEffect(() => { useEffect(() => {
getData(); getData();
}, []); }, []);
return ( return (
<> <Page headerTitle={props.title || "查看"} contentPadding="0 20px 20px 20px" extraActionButtons={props.extraActionButtons}>
<HeaderBack title={props.title || "查看"} />
<div style={{ padding: "0 20px 20px 20px" }}>
<div className="qualification-view"> <div className="qualification-view">
<div> <div>
<Divider orientation="left">流程信息</Divider> <Divider orientation="left">流程信息</Divider>
@ -173,7 +170,7 @@ function ViewInfo(props) {
/> />
</Spin> </Spin>
</div> </div>
{typeGroup.map((item) => ( {typeGroup.map(item => (
<div key={item.dataType}> <div key={item.dataType}>
<Divider orientation="left">{item.dataTypeName}</Divider> <Divider orientation="left">{item.dataTypeName}</Divider>
<Spin spinning={props.qualificationReview.qualificationReviewLoading}> <Spin spinning={props.qualificationReview.qualificationReviewLoading}>
@ -181,7 +178,7 @@ function ViewInfo(props) {
options={false} options={false}
pagination={false} pagination={false}
disabledResizer={true} disabledResizer={true}
dataSource={info.specialList.filter((i) => i.dataType === item.dataType) || []} dataSource={info.specialList.filter(i => i.dataType === item.dataType) || []}
columns={[ columns={[
{ title: "材料名称", dataIndex: "dataName" }, { title: "材料名称", dataIndex: "dataName" },
{ title: "上传时间", dataIndex: "uploadedTime" }, { title: "上传时间", dataIndex: "uploadedTime" },
@ -218,8 +215,7 @@ function ViewInfo(props) {
/> />
)} )}
{props.children} {props.children}
</div> </Page>
</>
); );
} }