diff --git a/src/pages/Container/BranchCompany/ProjectReview/ProjectApproval/List/index.js b/src/pages/Container/BranchCompany/ProjectReview/ProjectApproval/List/index.js
index 486c3ab..408678e 100644
--- a/src/pages/Container/BranchCompany/ProjectReview/ProjectApproval/List/index.js
+++ b/src/pages/Container/BranchCompany/ProjectReview/ProjectApproval/List/index.js
@@ -2,6 +2,7 @@ import { Permission } from "@cqsjjb/jjb-common-decorator/permission";
import { Connect } from "@cqsjjb/jjb-dva-runtime";
import { Button, Descriptions, Form, Modal, Space } from "antd";
import { useState } from "react";
+import Page from "zy-react-library/components/Page";
import Search from "zy-react-library/components/Search";
import DictionarySelect from "zy-react-library/components/Select/Dictionary";
import Table from "zy-react-library/components/Table";
@@ -29,7 +30,7 @@ function List(props) {
};
return (
-
+
{rejectReasonModalOpen && setRejectReasonModalOpen(false)} />}
-
+
);
}
const RejectReason = (props) => {
return (
+
-
+
);
}
diff --git a/src/pages/Container/BranchCompany/Qualification/Apply/Add/index.js b/src/pages/Container/BranchCompany/Qualification/Apply/Add/index.js
index f2706fe..dc27189 100644
--- a/src/pages/Container/BranchCompany/Qualification/Apply/Add/index.js
+++ b/src/pages/Container/BranchCompany/Qualification/Apply/Add/index.js
@@ -4,7 +4,7 @@ import dayjs from "dayjs";
import { cloneDeep } from "lodash-es";
import { useEffect, useState } from "react";
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 PersonnelSelect from "zy-react-library/components/Select/Personnel/Gwj";
import DepartmentSelectTree from "zy-react-library/components/SelectTree/Department/Gwj";
@@ -42,24 +42,20 @@ function Add(props) {
}, []);
return (
-
-
-
- {currentStep === 1
- &&
- }
- {currentStep === 2
- && (
-
- )}
-
-
+
+ {currentStep === 1
+ && }
+ {currentStep === 2
+ && (
+
+ )}
+
);
}
@@ -225,38 +221,6 @@ const StepTwoComponent = (props) => {
const { loading: deleteFileLoading, deleteFile } = useDeleteFile();
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 typeMap = new Map();
for (let i = 0; i < details.length; i++) {
@@ -266,7 +230,38 @@ const StepTwoComponent = (props) => {
}
}
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(() => {
getData();
@@ -337,11 +332,11 @@ const StepTwoComponent = (props) => {
- {typeGroup.map((item) => (
+ {typeGroup.map(item => (
{item.dataTypeName}
record.dataType === item.dataType)}
+ dataSource={specialList.filter(record => record.dataType === item.dataType)}
pagination={false}
options={false}
disabledResizer={true}
@@ -362,25 +357,25 @@ const StepTwoComponent = (props) => {
{
record.files?.length > 0
? (
-
- )
+
+ )
: (
-
- )
+
+ )
}
),
@@ -388,8 +383,7 @@ const StepTwoComponent = (props) => {
]}
/>
- ))
- }
+ ))}