@@ -149,19 +175,6 @@ function QualificationCertPage(props) {
}}
/>
-
- }
- onClick={() => {
- setCurrentId("");
- setAddModalOpen(true);
- }}
- >
- 新增证书
-
-
-
`${record.validStartDate ?? ""} ~ ${record.validEndDate ?? ""}`,
+ render: (_, record) =>
+ `${record.validStartDate ?? ""} ~ ${record.validEndDate ?? ""}`,
},
{ title: "证书编号", dataIndex: "certNo" },
{
title: "状态",
width: 80,
- render: (_, record) => (isQualificationEnabled(record) ? "启用" : "禁用"),
+ render: (_, record) =>
+ isQualificationEnabled(record) ? "启用" : "禁用",
},
{
title: "照片",
width: 100,
render: (_, record) =>
- record.certImgFiles?.length ? : 无,
+ record.certImgFiles?.length ? (
+
+ ) : (
+ 无
+ ),
},
{
title: "操作",
@@ -303,8 +322,13 @@ function CertFormModal({
}
const data = { ...res.data };
data.issueDate = toDayjs(data.issueDate);
- data.validDate = [toDayjs(data.validStartDate), toDayjs(data.validEndDate)];
- data.certImgs = data.certImgFiles?.length ? data.certImgFiles : mockUploadFileList("证书图片.jpg");
+ data.validDate = [
+ toDayjs(data.validStartDate),
+ toDayjs(data.validEndDate),
+ ];
+ data.certImgs = data.certImgFiles?.length
+ ? data.certImgFiles
+ : mockUploadFileList("证书图片.jpg");
form.setFieldsValue(data);
setDetailLoading(false);
@@ -376,10 +400,15 @@ function CertFormModal({
showActionButtons={false}
onFinish={handleSubmit}
options={[
- formSelectField("certType", "证照类型", QUALIFICATION_INDUSTRY_OPTIONS, {
- rules: [{ required: true, message: "请选择证照类型" }],
- colProps: { span: 24 },
- }),
+ formSelectField(
+ "certType",
+ "证照类型",
+ QUALIFICATION_INDUSTRY_OPTIONS,
+ {
+ rules: [{ required: true, message: "请选择证照类型" }],
+ colProps: { span: 24 },
+ },
+ ),
{
name: "certName",
label: "证书名称",
@@ -405,7 +434,10 @@ function CertFormModal({
name: "validDate",
label: "证书有效期",
render: FORM_ITEM_RENDER_ENUM.DATE_RANGE,
- rules: [{ required: true, message: "请选择证书有效期" }, dateRangeRule()],
+ rules: [
+ { required: true, message: "请选择证书有效期" },
+ dateRangeRule(),
+ ],
},
{
name: "remark",
@@ -500,4 +532,7 @@ function CertViewModal({ open, currentId, requestDetails, onCancel }) {
);
}
-export default Connect([NS_ORG_QUALIFICATION_CERT], true)(AntdTableFuncControl(QualificationCertPage));
+export default Connect(
+ [NS_ORG_QUALIFICATION_CERT],
+ true,
+)(AntdTableFuncControl(QualificationCertPage));
diff --git a/src/pages/Container/EnterpriseInfo/index.js b/src/pages/Container/EnterpriseInfo/index.js
index 51cdfa0..e113348 100644
--- a/src/pages/Container/EnterpriseInfo/index.js
+++ b/src/pages/Container/EnterpriseInfo/index.js
@@ -13,10 +13,11 @@ function EnterpriseInfo(props) {
if (!orgInfoId) {
props.orgInfoGet().then((res) => {
setOrgInfoId(res?.data?.id);
+ sessionStorage.setItem("orgInfoId", res?.data?.id);
});
}
}, []);
- console.log(props.location.pathname);
+
if(props.location.pathname.includes('EnterpriseInfo/OrgInfo')){
return props.children;
diff --git a/src/pages/Container/QualApplication/FilingForm/index.js b/src/pages/Container/QualApplication/FilingForm/index.js
index 7130c10..b6a1f7c 100644
--- a/src/pages/Container/QualApplication/FilingForm/index.js
+++ b/src/pages/Container/QualApplication/FilingForm/index.js
@@ -49,12 +49,7 @@ function FilingFormPage(props) {
const detailRef = useRef(null);
const readOnly = query.readOnly;
- const listMode =
- mode === FILING_FORM_MODE.FILED
- ? "filed"
- : mode === FILING_FORM_MODE.CHANGE
- ? "change"
- : "application";
+
const saveActionHint =
mode === FILING_FORM_MODE.FILED
@@ -143,28 +138,30 @@ function FilingFormPage(props) {
setSubmitting(true);
const currentDetail = collectCurrentDetail();
+ const word= mode === "change" ? "Change" : "";
const body = {
- [`qualFiling${mode === "change" ? "Change" : ""}AddCmd`]: {
+ [`qualFiling${word}AddCmd`]: {
...currentDetail,
filingStatusCode: config.isSaveDraft ? 5 : 2,
- applyTypeCode: mode === "application" ? 1 : 2,
+ applyTypeCode: mode === "application" ? 1 : 3,
},
};
- const params = body[`qualFiling${mode === "change" ? "Change" : ""}AddCmd`];
+
+ const params = body[`qualFiling${word}AddCmd`];
if (params.materials) {
- body[`qualFilingMaterial${mode === "change" ? "Change" : ""}AddCmds`] = params.materials;
+ body[`qualFilingMaterial${word}AddCmds`] = params.materials;
delete params.materials;
}
if (params.personnelList) {
- body[`qualFilingPersonnel${mode === "change" ? "Change" : ""}AddCmds`] = params.personnelList;
+ body[`qualFilingPersonnel${word}AddCmds`] = params.personnelList;
delete params.personnelList;
}
if (params.equipmentList) {
- body[`qualFilingEquipment${mode === "change" ? "Change" : ""}AddCmds`] = params.equipmentList;
+ body[`qualFilingEquipment${word}AddCmds`] = params.equipmentList;
delete params.equipmentList;
}
if (params.commitment) {
- body[`qualFilingCommitment${mode === "change" ? "Change" : ""}AddCmd`] = params.commitment;
+ body[`qualFilingCommitment${word}AddCmd`] = params.commitment;
delete params.commitment;
}
diff --git a/src/pages/Container/QualApplication/index.js b/src/pages/Container/QualApplication/index.js
index 28c467c..60b848d 100644
--- a/src/pages/Container/QualApplication/index.js
+++ b/src/pages/Container/QualApplication/index.js
@@ -12,6 +12,7 @@ function QualApplication(props) {
if (!orgInfoId) {
props.orgInfoGet().then((res) => {
setOrgInfoId(res?.data?.id);
+ sessionStorage.setItem("orgInfoId", res?.data?.id);
});
}
}, []);