7月28日需求变更,准入资质申请 增加暂存
parent
6842d0dde2
commit
a5e239da7e
|
|
@ -31,7 +31,7 @@
|
||||||
"react": "^18.2.0",
|
"react": "^18.2.0",
|
||||||
"react-dom": "^18.2.0",
|
"react-dom": "^18.2.0",
|
||||||
"react-pdf": "^10.4.1",
|
"react-pdf": "^10.4.1",
|
||||||
"zy-react-library": "^1.3.26"
|
"zy-react-library": "^1.3.28"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@antfu/eslint-config": "^5.4.1",
|
"@antfu/eslint-config": "^5.4.1",
|
||||||
|
|
|
||||||
|
|
@ -46,14 +46,14 @@ function Add(props) {
|
||||||
|
|
||||||
const getData = async () => {
|
const getData = async () => {
|
||||||
const { data } = await props["qualificationApplyInfo"]({ id: query.id });
|
const { data } = await props["qualificationApplyInfo"]({ id: query.id });
|
||||||
data.maintain = data.maintain && data.maintain.split(",")
|
data.maintain = data.maintain && data.maintain.split(",");
|
||||||
data.detection = data.detection && data.detection.split(",")
|
data.detection = data.detection && data.detection.split(",");
|
||||||
data.otherHighRisk = data.otherHighRisk && data.otherHighRisk.split(",")
|
data.otherHighRisk = data.otherHighRisk && data.otherHighRisk.split(",");
|
||||||
data.serviceEnterprise = data.serviceEnterprise && data.serviceEnterprise.split(",")
|
data.serviceEnterprise = data.serviceEnterprise && data.serviceEnterprise.split(",");
|
||||||
data.detectionName = data.detectionName && data.detectionName.split(",")
|
data.detectionName = data.detectionName && data.detectionName.split(",");
|
||||||
data.maintainName = data.maintainName && data.maintainName.split(",")
|
data.maintainName = data.maintainName && data.maintainName.split(",");
|
||||||
data.otherHighRiskName = data.otherHighRiskName && data.otherHighRiskName.split(",")
|
data.otherHighRiskName = data.otherHighRiskName && data.otherHighRiskName.split(",");
|
||||||
data.serviceEnterpriseName = data.serviceEnterpriseName && data.serviceEnterpriseName.split(",")
|
data.serviceEnterpriseName = data.serviceEnterpriseName && data.serviceEnterpriseName.split(",");
|
||||||
// 重新提交时,删除id
|
// 重新提交时,删除id
|
||||||
if (query.resubmit) {
|
if (query.resubmit) {
|
||||||
delete data.id;
|
delete data.id;
|
||||||
|
|
@ -92,7 +92,16 @@ function Add(props) {
|
||||||
type="primary"
|
type="primary"
|
||||||
loading={stepTwoLoading}
|
loading={stepTwoLoading}
|
||||||
onClick={() => {
|
onClick={() => {
|
||||||
stepTwoRef.current?.onSubmit();
|
stepTwoRef.current?.onSubmit(0);
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
暂存
|
||||||
|
</Button>
|
||||||
|
<Button
|
||||||
|
type="primary"
|
||||||
|
loading={stepTwoLoading}
|
||||||
|
onClick={() => {
|
||||||
|
stepTwoRef.current?.onSubmit(1);
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
提交审核
|
提交审核
|
||||||
|
|
@ -142,7 +151,6 @@ const StepOneComponent = (props) => {
|
||||||
const getQualificationsListAll = async () => {
|
const getQualificationsListAll = async () => {
|
||||||
const { data } = await props["qualificationsListAll"]({ qualificationsTypeId, stakeholderLevel, status: 0 });
|
const { data } = await props["qualificationsListAll"]({ qualificationsTypeId, stakeholderLevel, status: 0 });
|
||||||
|
|
||||||
|
|
||||||
setQualificationsListAll(data);
|
setQualificationsListAll(data);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
@ -151,14 +159,13 @@ const StepOneComponent = (props) => {
|
||||||
setCorpInfoList(data);
|
setCorpInfoList(data);
|
||||||
};
|
};
|
||||||
const getFgscorpFun = async () => {
|
const getFgscorpFun = async () => {
|
||||||
const { data } = await props["corpInfoListAll"]({inType:[0,6]});
|
const { data } = await props["corpInfoListAll"]({ inType: [0, 6] });
|
||||||
setFgsCorpInfoList(data);
|
setFgsCorpInfoList(data);
|
||||||
}
|
};
|
||||||
|
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
getCorpInfoList(1, 0);
|
getCorpInfoList(1, 0);
|
||||||
getFgscorpFun()
|
getFgscorpFun();
|
||||||
|
|
||||||
form.setFieldsValue(props.formValues);
|
form.setFieldsValue(props.formValues);
|
||||||
}, []);
|
}, []);
|
||||||
|
|
@ -313,8 +320,8 @@ const StepOneComponent = (props) => {
|
||||||
{
|
{
|
||||||
name: "maintain",
|
name: "maintain",
|
||||||
label: "维修、保养(多选)",
|
label: "维修、保养(多选)",
|
||||||
hidden:qualificationsTypeId !=="sbl",
|
hidden: qualificationsTypeId !== "sbl",
|
||||||
required:false,
|
required: false,
|
||||||
render: (
|
render: (
|
||||||
<DictionarySelect
|
<DictionarySelect
|
||||||
dictValue="maintain"
|
dictValue="maintain"
|
||||||
|
|
@ -330,8 +337,8 @@ const StepOneComponent = (props) => {
|
||||||
{
|
{
|
||||||
name: "detection",
|
name: "detection",
|
||||||
label: "检测(多选)",
|
label: "检测(多选)",
|
||||||
hidden:qualificationsTypeId !=="sbl",
|
hidden: qualificationsTypeId !== "sbl",
|
||||||
required:false,
|
required: false,
|
||||||
render: (
|
render: (
|
||||||
<DictionarySelect
|
<DictionarySelect
|
||||||
dictValue="detection"
|
dictValue="detection"
|
||||||
|
|
@ -346,8 +353,8 @@ const StepOneComponent = (props) => {
|
||||||
{
|
{
|
||||||
name: "otherHighRisk",
|
name: "otherHighRisk",
|
||||||
label: "其它高风险业务(多选)",
|
label: "其它高风险业务(多选)",
|
||||||
required:false,
|
required: false,
|
||||||
hidden:qualificationsTypeId !=="sbl",
|
hidden: qualificationsTypeId !== "sbl",
|
||||||
render: (
|
render: (
|
||||||
<DictionarySelect
|
<DictionarySelect
|
||||||
dictValue="otherHighRisk"
|
dictValue="otherHighRisk"
|
||||||
|
|
@ -363,23 +370,23 @@ const StepOneComponent = (props) => {
|
||||||
{
|
{
|
||||||
name: "serviceEnterprise",
|
name: "serviceEnterprise",
|
||||||
label: "服务企业(多选)",
|
label: "服务企业(多选)",
|
||||||
hidden:qualificationsTypeId !=="sbl",
|
hidden: qualificationsTypeId !== "sbl",
|
||||||
items: fgsCorpInfoList,
|
items: fgsCorpInfoList,
|
||||||
render: FORM_ITEM_RENDER_ENUM.SELECT,
|
render: FORM_ITEM_RENDER_ENUM.SELECT,
|
||||||
itemsField: { valueKey: "id", labelKey: "corpName" },
|
itemsField: { valueKey: "id", labelKey: "corpName" },
|
||||||
componentProps: {
|
componentProps: {
|
||||||
mode:"multiple",
|
mode: "multiple",
|
||||||
onChange: (event) => {
|
onChange: (event) => {
|
||||||
const arr = []
|
const arr = [];
|
||||||
if(event.length >0){
|
if (event.length > 0) {
|
||||||
event.forEach(item => {
|
event.forEach((item) => {
|
||||||
arr.push(getLabelName({
|
arr.push(getLabelName({
|
||||||
list: fgsCorpInfoList,
|
list: fgsCorpInfoList,
|
||||||
status: item,
|
status: item,
|
||||||
idKey: "id",
|
idKey: "id",
|
||||||
nameKey: "corpName",
|
nameKey: "corpName",
|
||||||
}));
|
}));
|
||||||
})
|
});
|
||||||
}
|
}
|
||||||
form.setFieldValue("serviceEnterpriseName", arr);
|
form.setFieldValue("serviceEnterpriseName", arr);
|
||||||
},
|
},
|
||||||
|
|
@ -464,7 +471,7 @@ const StepTwoComponent = forwardRef((props, ref) => {
|
||||||
isValidity: record.isValidity,
|
isValidity: record.isValidity,
|
||||||
qualificationsTermStart: record.qualificationsTermStart,
|
qualificationsTermStart: record.qualificationsTermStart,
|
||||||
qualificationsTermEnd: record.qualificationsTermEnd,
|
qualificationsTermEnd: record.qualificationsTermEnd,
|
||||||
isRequired:record.isRequired,
|
isRequired: record.isRequired,
|
||||||
});
|
});
|
||||||
setUploadFileModalOpen(true);
|
setUploadFileModalOpen(true);
|
||||||
};
|
};
|
||||||
|
|
@ -482,7 +489,7 @@ const StepTwoComponent = forwardRef((props, ref) => {
|
||||||
|
|
||||||
const validateFileList = (list) => {
|
const validateFileList = (list) => {
|
||||||
for (let i = 0; i < list.length; i++) {
|
for (let i = 0; i < list.length; i++) {
|
||||||
if(list[i].isRequired == null || list[i].isRequired === 1) {
|
if (list[i].isRequired == null || list[i].isRequired === 1) {
|
||||||
if (!list[i].files || list[i].files.length === 0) {
|
if (!list[i].files || list[i].files.length === 0) {
|
||||||
message.error(`请上传${list[i].dataName}的资质`);
|
message.error(`请上传${list[i].dataName}的资质`);
|
||||||
return false;
|
return false;
|
||||||
|
|
@ -492,11 +499,11 @@ const StepTwoComponent = forwardRef((props, ref) => {
|
||||||
return true;
|
return true;
|
||||||
};
|
};
|
||||||
|
|
||||||
const onSubmit = async () => {
|
const onSubmit = async (saveType) => {
|
||||||
if (!validateQualificationBusiness(props.formValues))
|
if (saveType === 1 && !validateQualificationBusiness(props.formValues))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
if (!validateFileList(specialList))
|
if (saveType === 1 && !validateFileList(specialList))
|
||||||
return;
|
return;
|
||||||
for (let i = 0; i < specialList.length; i++) {
|
for (let i = 0; i < specialList.length; i++) {
|
||||||
await deleteFile({ single: false, files: specialList[i].deleteFiles });
|
await deleteFile({ single: false, files: specialList[i].deleteFiles });
|
||||||
|
|
@ -524,6 +531,7 @@ const StepTwoComponent = forwardRef((props, ref) => {
|
||||||
...data,
|
...data,
|
||||||
resubmitId,
|
resubmitId,
|
||||||
id: query.id,
|
id: query.id,
|
||||||
|
saveType,
|
||||||
});
|
});
|
||||||
if (success) {
|
if (success) {
|
||||||
message.success("提交成功,请等待审核");
|
message.success("提交成功,请等待审核");
|
||||||
|
|
@ -561,9 +569,10 @@ const StepTwoComponent = forwardRef((props, ref) => {
|
||||||
render: (_, record) => record.qualificationsTermStart ? `${record.qualificationsTermStart}至${record.qualificationsTermEnd}` : "-",
|
render: (_, record) => record.qualificationsTermStart ? `${record.qualificationsTermStart}至${record.qualificationsTermEnd}` : "-",
|
||||||
},
|
},
|
||||||
{ title: "是否必填", dataIndex: "isRequired", render: (_, record) => {
|
{ title: "是否必填", dataIndex: "isRequired", render: (_, record) => {
|
||||||
if (record.isRequired == null) return "必填";
|
if (record.isRequired == null)
|
||||||
return record.isRequired ? "必填" : "非必填";
|
return "必填";
|
||||||
} },
|
return record.isRequired ? "必填" : "非必填";
|
||||||
|
} },
|
||||||
{
|
{
|
||||||
title: "操作",
|
title: "操作",
|
||||||
width: 150,
|
width: 150,
|
||||||
|
|
@ -648,7 +657,7 @@ const FileUpload = (props) => {
|
||||||
{
|
{
|
||||||
name: "files",
|
name: "files",
|
||||||
label: "资质",
|
label: "资质",
|
||||||
required:props.data.isRequired,
|
required: props.data.isRequired,
|
||||||
render: (
|
render: (
|
||||||
<Upload
|
<Upload
|
||||||
fileType="image"
|
fileType="image"
|
||||||
|
|
|
||||||
|
|
@ -66,6 +66,7 @@ function List(props) {
|
||||||
// { title: "备注", dataIndex: "remarks" },
|
// { title: "备注", dataIndex: "remarks" },
|
||||||
{ title: "审核状态", dataIndex: "status", render: (_, record) => (
|
{ title: "审核状态", dataIndex: "status", render: (_, record) => (
|
||||||
<>
|
<>
|
||||||
|
{record.status === 100 && `暂存`}
|
||||||
{record.status === 200 && `${record.auditProcess === 100 ? "集团单位" : "审核部门"}审核中`}
|
{record.status === 200 && `${record.auditProcess === 100 ? "集团单位" : "审核部门"}审核中`}
|
||||||
{record.status === 300 && `${record.auditProcess === 100 ? "集团单位" : "审核部门"}已驳回`}
|
{record.status === 300 && `${record.auditProcess === 100 ? "集团单位" : "审核部门"}已驳回`}
|
||||||
{record.status === 400 && "已通过"}
|
{record.status === 400 && "已通过"}
|
||||||
|
|
@ -90,7 +91,7 @@ function List(props) {
|
||||||
{props.permission("zrzz-xgf-zrzzsq-btn-xg") && (
|
{props.permission("zrzz-xgf-zrzzsq-btn-xg") && (
|
||||||
<Button
|
<Button
|
||||||
type="link"
|
type="link"
|
||||||
disabled={record.status !== 300}
|
disabled={![100, 300].includes(record.status)}
|
||||||
onClick={() => {
|
onClick={() => {
|
||||||
props.history.push(`./add?id=${record.id}`);
|
props.history.push(`./add?id=${record.id}`);
|
||||||
}}
|
}}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue