fix
parent
2c4344b69a
commit
e9fbc2ddc5
|
|
@ -1,338 +1,115 @@
|
|||
/** 资质备案：接口定义与前后端字段适配 */
|
||||
|
||||
import { declareRequest } from "@cqsjjb/jjb-dva-runtime";
|
||||
import { fromPageResponse, fromSingleResponse, toPageQuery } from "../../utils/enterpriseInfo/adapter";
|
||||
import { apiGet, apiPost, apiPostDelete, safeAction, safePageResult } from "../../utils/enterpriseInfo/http";
|
||||
import { asId, normalizeQueryIds } from "../../utils/enterpriseInfo/idUtil";
|
||||
import { formatDate, toApiDate, toDayjs } from "../../utils/dateFormat";
|
||||
import { parseUploadFileList, resolveUploadFileId } from "../../utils/mockUpload";
|
||||
|
||||
// ─── 工具 ───
|
||||
|
||||
const APPLY_TYPE_APPLICATION = 1;
|
||||
|
||||
// ─── 字段映射：列表行 ───
|
||||
|
||||
export function toFilingListRow(data = {}) {
|
||||
return {
|
||||
id: asId(data.id),
|
||||
filingId: data.filingId,
|
||||
filingTerritoryCode: data.filingTerritoryCode,
|
||||
filingTerritoryName: data.filingTerritoryName,
|
||||
filingUnitName: data.filingUnitName,
|
||||
filingNo: data.filingNo || (data.id ? String(data.id) : ""),
|
||||
businessScope: data.businessScope,
|
||||
filingStatusCode: data.filingStatusCode,
|
||||
filingStatusName: data.filingStatusName,
|
||||
applyTypeCode: data.applyTypeCode,
|
||||
applyTypeName: data.applyTypeName,
|
||||
changeCount: Number(data.changeCount ?? 0),
|
||||
originFilingId: asId(data.originFilingId),
|
||||
rejectReason: data.rejectReason,
|
||||
submitTime: formatDate(data.submitTime),
|
||||
approveTime: formatDate(data.approveTime),
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
|
||||
export function fromFilingBasicForm(values = {}) {
|
||||
const territoryName = values.filingTerritoryName || values.filingTerritoryCode;
|
||||
const unitTypeName = values.filingUnitTypeName || values.filingUnitTypeCode;
|
||||
return normalizeQueryIds({
|
||||
id: asId(values.id),
|
||||
businessScope: values.businessScope,
|
||||
filingTerritoryCode: territoryName,
|
||||
filingTerritoryName: territoryName,
|
||||
filingUnitName: values.filingUnitName,
|
||||
filingUnitTypeCode: unitTypeName,
|
||||
filingUnitTypeName: unitTypeName,
|
||||
filingNo: values.filingNo,
|
||||
registerAddress: values.registerAddress,
|
||||
officeAddress: values.officeAddress,
|
||||
creditCode: values.creditCode,
|
||||
qualCertNo: values.qualCertNo,
|
||||
legalPersonPhone: values.legalPersonPhone,
|
||||
contactPhone: values.contactPhone,
|
||||
infoDisclosureUrl: values.infoDisclosureUrl,
|
||||
fixedAssetAmount: values.fixedAssetAmount,
|
||||
workplaceArea: values.workplaceArea,
|
||||
archiveRoomArea: values.archiveRoomArea,
|
||||
fulltimeEvaluatorCount: values.fulltimeEvaluatorCount,
|
||||
registeredEngineerCount: values.registeredEngineerCount,
|
||||
unitIntro: values.unitIntro,
|
||||
attachmentUrl: values.attachmentUrl,
|
||||
});
|
||||
}
|
||||
|
||||
// ─── 字段映射：详情 ───
|
||||
|
||||
export function toFilingDetail(data = {}) {
|
||||
return {
|
||||
...data,
|
||||
materials: (data.materials || []),
|
||||
commitment: data.commitment ? toFilingCommitmentForm(data.commitment, data.filingUnitName) : null,
|
||||
personnelList: (data.personnelList || []).map(toFilingPersonnelRow),
|
||||
equipmentList: (data.equipmentList || []).map(toFilingEquipmentRow),
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
|
||||
// ─── 字段映射：承诺书 ───
|
||||
|
||||
export function parseCommitmentNames(content = "", filingUnitName = "") {
|
||||
const withComma = String(content).match(/本人是(.+?)，是(.+?)法定代表人/);
|
||||
if (withComma) {
|
||||
return {
|
||||
legalRepName: withComma[1]?.trim() || "",
|
||||
filingUnitName: withComma[2]?.trim() || filingUnitName || "",
|
||||
};
|
||||
}
|
||||
const legacy = String(content).match(/本人是(.+?)是(.+?)法定代表人/);
|
||||
return {
|
||||
legalRepName: legacy?.[1]?.trim() || "",
|
||||
filingUnitName: legacy?.[2]?.trim() || filingUnitName || "",
|
||||
};
|
||||
}
|
||||
|
||||
export function toFilingCommitmentForm(data = {}, filingUnitName = "") {
|
||||
const parsed = parseCommitmentNames(data.commitmentContent, filingUnitName);
|
||||
const legalRepPersonnelId = data.legalRepPersonnelId ? String(asId(data.legalRepPersonnelId)) : "";
|
||||
return {
|
||||
id: asId(data.id),
|
||||
filingId: asId(data.filingId),
|
||||
commitmentContent: data.commitmentContent,
|
||||
legalRepPersonnelId,
|
||||
legalRepName: data.legalRepName || parsed.legalRepName,
|
||||
filingUnitName: parsed.filingUnitName || filingUnitName,
|
||||
legalRepSignatureUrl: data.legalRepSignatureUrl,
|
||||
signDate: toDayjs(data.signDate),
|
||||
signatureFiles: parseUploadFileList(data.legalRepSignatureUrl, "电子签名.jpg"),
|
||||
};
|
||||
}
|
||||
|
||||
export function fromFilingCommitmentForm(values = {}, filingId) {
|
||||
const personnelId = asId(values.legalRepPersonnelId);
|
||||
return {
|
||||
id: asId(values.id),
|
||||
filingId: asId(filingId),
|
||||
commitmentContent: values.commitmentContent,
|
||||
legalRepSignatureUrl: values.legalRepSignatureUrl,
|
||||
signDate: toApiDate(values.signDate),
|
||||
legalRepPersonnelId: personnelId || null,
|
||||
legalRepName: values.legalRepName || "",
|
||||
};
|
||||
}
|
||||
|
||||
// ─── 字段映射：人员 / 装备 ───
|
||||
|
||||
export function toFilingPersonnelRow(data = {}) {
|
||||
const personName = data.personName || data.userName || data.staffName;
|
||||
return {
|
||||
id: asId(data.id),
|
||||
filingId: asId(data.filingId),
|
||||
sourcePersonnelId: asId(data.sourcePersonnelId),
|
||||
personName,
|
||||
userName: personName,
|
||||
personTypeCode: data.personTypeCode,
|
||||
personTypeName: data.personTypeName,
|
||||
positionName: data.positionName,
|
||||
titleName: data.titleName,
|
||||
genderCode: data.genderCode,
|
||||
genderName: data.genderName,
|
||||
birthDate: data.birthDate,
|
||||
joinWorkDate: data.joinWorkDate,
|
||||
idCardNo: data.idCardNo,
|
||||
currentAddress: data.currentAddress,
|
||||
officeAddress: data.officeAddress,
|
||||
educationCode: data.educationCode,
|
||||
educationName: data.educationName,
|
||||
graduateSchool: data.graduateSchool,
|
||||
major: data.major,
|
||||
qualScope: data.qualScope,
|
||||
publications: data.publications,
|
||||
professionalLevelCert: data.professionalLevelCert,
|
||||
registerEngineerFlag: data.registerEngineerFlag,
|
||||
abilityDeclaration: data.abilityDeclaration,
|
||||
workExperience: data.workExperience,
|
||||
proofMaterialUrl: data.proofMaterialUrl,
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
|
||||
export function toFilingEquipmentRow(data = {}) {
|
||||
return {
|
||||
id: asId(data.id),
|
||||
filingId: asId(data.filingId),
|
||||
sourceEquipmentId: asId(data.sourceEquipmentId),
|
||||
deviceName: data.deviceName,
|
||||
deviceModel: data.deviceModel,
|
||||
manufacturer: data.manufacturer,
|
||||
calibrationReportUrl: data.calibrationReportUrl,
|
||||
};
|
||||
}
|
||||
|
||||
// ─── 字段映射：变更历史 ───
|
||||
|
||||
export function toChangeHistory(data = {}) {
|
||||
return {
|
||||
changeCount: Number(data.changeCount ?? 0),
|
||||
records: (data.records || []).map((item, index) => ({
|
||||
id: asId(item.id),
|
||||
index: index + 1,
|
||||
changeItemName: item.changeItemName,
|
||||
changeTime: formatDate(item.changeTime),
|
||||
operatorName: item.operatorName,
|
||||
})),
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
|
||||
// ─── 分页查询参数映射 ───
|
||||
|
||||
function toFilingPageQuery(params = {}) {
|
||||
const { filingTerritoryName, filingTerritoryCode, filingStatus, ...rest } = params;
|
||||
const query = toPageQuery(rest, {
|
||||
filingUnitName: "filingUnitName",
|
||||
filingNo: "filingNo",
|
||||
applyTypeCode: "applyTypeCode",
|
||||
});
|
||||
const territory = filingTerritoryCode || filingTerritoryName;
|
||||
if (territory) {
|
||||
query.filingTerritoryCode = territory;
|
||||
}
|
||||
if (filingStatus !== undefined && filingStatus !== null && filingStatus !== "") {
|
||||
query.filingStatusCode = Number(filingStatus);
|
||||
}
|
||||
return query;
|
||||
}
|
||||
import { apiGet } from "../../utils/enterpriseInfo/http";
|
||||
|
||||
// ═══════════════════════════════════════════════════
|
||||
// 接口 Action
|
||||
// 详情查询
|
||||
// ═══════════════════════════════════════════════════
|
||||
|
||||
export async function fetchQualFilingDetail(id) {
|
||||
const res = await apiGet("/safetyEval/qual-filing/detail", { id: asId(id) });
|
||||
return fromSingleResponse(res, toFilingDetail);
|
||||
return apiGet("/safetyEval/qual-filing/detail", { id });
|
||||
}
|
||||
|
||||
export async function fetchQualChangeDetail(id) {
|
||||
const res = await apiGet("/safetyEval/qual-filing-change/detail", { id: asId(id) });
|
||||
return fromSingleResponse(res, toFilingDetail);
|
||||
return apiGet("/safetyEval/qual-filing-change/detail", { id });
|
||||
}
|
||||
|
||||
export async function fetchQualFilingChangeHistory(filingId) {
|
||||
const res = await apiGet("/safetyEval/qual-filing-change/history", {
|
||||
filingId: asId(filingId),
|
||||
});
|
||||
return fromSingleResponse(res, toChangeHistory);
|
||||
return apiGet("/safetyEval/qual-filing-change/history", { filingId });
|
||||
}
|
||||
|
||||
export const qualFilingPage = declareRequest("qualFilingLoading", safePageResult(async (params) => {
|
||||
const res = await apiGet("/safetyEval/qual-filing/page", toFilingPageQuery(params));
|
||||
return fromPageResponse(res, toFilingListRow);
|
||||
}));
|
||||
// ═══════════════════════════════════════════════════
|
||||
// 分页列表
|
||||
// ═══════════════════════════════════════════════════
|
||||
|
||||
export const qualFilingFiledPage = declareRequest("qualFilingLoading", safePageResult(async (params) => {
|
||||
const res = await apiGet("/safetyEval/qual-filing/filed/page", toFilingPageQuery(params));
|
||||
return fromPageResponse(res, toFilingListRow);
|
||||
}));
|
||||
export const qualFilingPage = declareRequest("qualFilingLoading", "Get > /safetyEval/qual-filing/page");
|
||||
|
||||
export const qualFilingChangePage = declareRequest("qualFilingLoading", safePageResult(async (params) => {
|
||||
const res = await apiGet("/safetyEval/qual-filing-change/org/page", toFilingPageQuery(params));
|
||||
return fromPageResponse(res, toFilingListRow);
|
||||
}));
|
||||
export const qualFilingFiledPage = declareRequest("qualFilingLoading", "Get > /safetyEval/qual-filing/filed/page");
|
||||
|
||||
export const qualFilingDraft = declareRequest("qualFilingLoading", safeAction(async () => {
|
||||
const res = await apiPost("/safetyEval/qual-filing/draft?applyTypeCode=1", {});
|
||||
return fromSingleResponse(res, toFilingListRow);
|
||||
}));
|
||||
export const qualFilingChangePage = declareRequest("qualFilingLoading", "Get > /safetyEval/qual-filing-change/org/page");
|
||||
|
||||
export const qualFilingFiledDraft = declareRequest("qualFilingLoading", safeAction(async () => {
|
||||
const res = await apiPost("/safetyEval/qual-filing/filed/draft", {});
|
||||
return fromSingleResponse(res, toFilingListRow);
|
||||
}));
|
||||
// ═══════════════════════════════════════════════════
|
||||
// 草稿 / 提交
|
||||
// ═══════════════════════════════════════════════════
|
||||
|
||||
export const qualFilingSaveDraft = declareRequest("qualFilingLoading", safeAction(async (values) => {
|
||||
const res = await apiPost("/safetyEval/qual-filing/save-draft", fromFilingBasicForm(values));
|
||||
return fromSingleResponse(res, toFilingListRow);
|
||||
}));
|
||||
export const qualFilingDraft = declareRequest(
|
||||
"qualFilingLoading",
|
||||
"Post > @/safetyEval/qual-filing/draft?applyTypeCode=1",
|
||||
);
|
||||
|
||||
export const qualFilingSubmit = declareRequest("qualFilingLoading", safeAction(async ({ id }) => {
|
||||
const res = await apiPost(`/safetyEval/qual-filing/submit?id=${encodeURIComponent(asId(id))}`, {});
|
||||
return fromSingleResponse(res, toFilingListRow);
|
||||
}));
|
||||
export const qualFilingFiledDraft = declareRequest(
|
||||
"qualFilingLoading",
|
||||
"Post > @/safetyEval/qual-filing/filed/draft",
|
||||
);
|
||||
|
||||
export const qualFilingDelete = declareRequest("qualFilingLoading", safeAction(async ({ id }) => {
|
||||
return apiPostDelete("/safetyEval/qual-filing/delete", id);
|
||||
}));
|
||||
export const qualFilingSaveDraft = declareRequest(
|
||||
"qualFilingLoading",
|
||||
"Post > @/safetyEval/qual-filing/save-draft",
|
||||
);
|
||||
|
||||
export const qualFilingMaterialInitTemplate = declareRequest("qualFilingLoading", safeAction(async ({ filingId }) => {
|
||||
return apiPost(`/safetyEval/qual-filing-material/init-template?filingId=${encodeURIComponent(asId(filingId))}`, {});
|
||||
}));
|
||||
export const qualFilingSubmit = declareRequest(
|
||||
"qualFilingLoading",
|
||||
"Post > @/safetyEval/qual-filing/submit",
|
||||
);
|
||||
|
||||
export const qualFilingMaterialUpload = declareRequest("qualFilingLoading", safeAction(async ({ id, attachmentUrl, files }) => {
|
||||
const url = attachmentUrl || resolveUploadFileId(files);
|
||||
const res = await apiPost("/safetyEval/qual-filing-material/upload", { id: asId(id), attachmentUrl: url });
|
||||
return fromSingleResponse(res);
|
||||
}));
|
||||
export const qualFilingDelete = declareRequest(
|
||||
"qualFilingLoading",
|
||||
"Post > @/safetyEval/qual-filing/delete",
|
||||
);
|
||||
|
||||
export const qualFilingUploadAttachment = declareRequest("qualFilingLoading", safeAction(async ({ id, attachmentUrl, files }) => {
|
||||
const url = attachmentUrl || resolveUploadFileId(files);
|
||||
const res = await apiPost("/safetyEval/qual-filing/upload-attachment", { id: asId(id), attachmentUrl: url });
|
||||
return fromSingleResponse(res, toFilingListRow);
|
||||
}));
|
||||
export const qualFilingMaterialInitTemplate = declareRequest(
|
||||
"qualFilingLoading",
|
||||
"Post > @/safetyEval/qual-filing-material/init-template",
|
||||
);
|
||||
|
||||
export const qualFilingCommitmentSaveOrUpdate = declareRequest("qualFilingLoading", safeAction(async (values) => {
|
||||
const payload = fromFilingCommitmentForm(values, values.filingId);
|
||||
const res = await apiPost("/safetyEval/qual-filing-commitment/save-or-update", payload);
|
||||
return fromSingleResponse(res);
|
||||
}));
|
||||
export const qualFilingMaterialUpload = declareRequest(
|
||||
"qualFilingLoading",
|
||||
"Post > @/safetyEval/qual-filing-material/upload",
|
||||
);
|
||||
|
||||
export const qualFilingCommitmentUploadSignature = declareRequest("qualFilingLoading", safeAction(async ({ id, attachmentUrl, files }) => {
|
||||
const url = attachmentUrl || resolveUploadFileId(files);
|
||||
const res = await apiPost("/safetyEval/qual-filing-commitment/upload-signature", { id: asId(id), attachmentUrl: url });
|
||||
return fromSingleResponse(res);
|
||||
}));
|
||||
export const qualFilingUploadAttachment = declareRequest(
|
||||
"qualFilingLoading",
|
||||
"Post > @/safetyEval/qual-filing/upload-attachment",
|
||||
);
|
||||
|
||||
export const qualFilingPersonnelBatchAdd = declareRequest("qualFilingLoading", safeAction(async ({ filingId, sourcePersonnelIds }) => {
|
||||
const res = await apiPost("/safetyEval/qual-filing-personnel/batch-add-from-org", {
|
||||
filingId: asId(filingId),
|
||||
sourcePersonnelIds: (sourcePersonnelIds || []).map(asId),
|
||||
});
|
||||
return res;
|
||||
}));
|
||||
export const qualFilingCommitmentSaveOrUpdate = declareRequest(
|
||||
"qualFilingLoading",
|
||||
"Post > @/safetyEval/qual-filing-commitment/save-or-update",
|
||||
);
|
||||
|
||||
export const qualFilingPersonnelDelete = declareRequest("qualFilingLoading", safeAction(async ({ id }) => {
|
||||
return apiPostDelete("/safetyEval/qual-filing-personnel/delete", id);
|
||||
}));
|
||||
export const qualFilingCommitmentUploadSignature = declareRequest(
|
||||
"qualFilingLoading",
|
||||
"Post > @/safetyEval/qual-filing-commitment/upload-signature",
|
||||
);
|
||||
|
||||
export const qualFilingEquipmentBatchAdd = declareRequest("qualFilingLoading", safeAction(async ({ filingId, sourceEquipmentIds }) => {
|
||||
const res = await apiPost("/safetyEval/qual-filing-equipment/batch-add-from-org", {
|
||||
filingId: asId(filingId),
|
||||
sourceEquipmentIds: (sourceEquipmentIds || []).map(asId),
|
||||
});
|
||||
return res;
|
||||
}));
|
||||
export const qualFilingPersonnelBatchAdd = declareRequest(
|
||||
"qualFilingLoading",
|
||||
"Post > @/safetyEval/qual-filing-personnel/batch-add-from-org",
|
||||
);
|
||||
|
||||
export const qualFilingEquipmentUploadCalibration = declareRequest("qualFilingLoading", safeAction(async ({ id, attachmentUrl, files }) => {
|
||||
const url = attachmentUrl || resolveUploadFileId(files);
|
||||
const res = await apiPost("/safetyEval/qual-filing-equipment/upload-calibration", { id: asId(id), attachmentUrl: url });
|
||||
return fromSingleResponse(res);
|
||||
}));
|
||||
export const qualFilingPersonnelDelete = declareRequest(
|
||||
"qualFilingLoading",
|
||||
"Post > @/safetyEval/qual-filing-personnel/delete",
|
||||
);
|
||||
|
||||
export const qualFilingEquipmentDelete = declareRequest("qualFilingLoading", safeAction(async ({ id }) => {
|
||||
return apiPostDelete("/safetyEval/qual-filing-equipment/delete", id);
|
||||
}));
|
||||
export const qualFilingEquipmentBatchAdd = declareRequest(
|
||||
"qualFilingLoading",
|
||||
"Post > @/safetyEval/qual-filing-equipment/batch-add-from-org",
|
||||
);
|
||||
|
||||
export const qualFilingEquipmentUploadCalibration = declareRequest(
|
||||
"qualFilingLoading",
|
||||
"Post > @/safetyEval/qual-filing-equipment/upload-calibration",
|
||||
);
|
||||
|
||||
export const qualFilingEquipmentDelete = declareRequest(
|
||||
"qualFilingLoading",
|
||||
"Post > @/safetyEval/qual-filing-equipment/delete",
|
||||
);
|
||||
|
||||
export const qualFilingChangeSubmit = declareRequest("qualFilingLoading", safeAction(async ({ draftFilingId }) => {
|
||||
return apiPost("/safetyEval/qual-filing-change/submit", { draftFilingId: asId(draftFilingId) });
|
||||
}));
|
||||
export const qualFilingChangeSubmit = declareRequest(
|
||||
"qualFilingLoading",
|
||||
"Post > @/safetyEval/qual-filing-change/submit",
|
||||
);
|
||||
|
||||
export const qualFilingReviewGet = declareRequest(
|
||||
"qualFilingLoading",
|
||||
|
|
@ -348,4 +125,3 @@ export const submitQualFilingChange = declareRequest(
|
|||
"qualFilingSubmitLoading",
|
||||
"Post > @/safetyEval/qual-filing-change/aggregationSaveOrEdit",
|
||||
);
|
||||
|
||||
|
|
|
|||
|
|
@ -7,7 +7,6 @@ import { AntdTableFuncControl } from "@cqsjjb/jjb-common-decorator/antd";
|
|||
import { NS_QUAL_FILING } from "~/enumerate/namespace";
|
||||
import { FILING_FORM_MODE } from "~/enumerate/qualFilingOptions";
|
||||
import FilingListTable from "../../FilingListTable";
|
||||
import { goFilingForm } from "../../filingPaths";
|
||||
|
||||
const { router } = tools;
|
||||
|
||||
|
|
@ -56,7 +55,7 @@ function FiledManageListPage(props) {
|
|||
};
|
||||
|
||||
const handleCreate = () => {
|
||||
goFilingForm({ mode: FILING_FORM_MODE.FILED });
|
||||
props.history.push(`/container/qualApplication/filingForm?mode=${FILING_FORM_MODE.FILED}`);
|
||||
};
|
||||
|
||||
const [reviewModalOpen, setReviewModalOpen] = useState(false);
|
||||
|
|
@ -98,6 +97,7 @@ function FiledManageListPage(props) {
|
|||
total={total}
|
||||
loading={loading}
|
||||
scrollY={props.scrollY}
|
||||
history={props.history}
|
||||
searchForm={searchForm}
|
||||
onSearch={handleSearch}
|
||||
onPageChange={handlePageChange}
|
||||
|
|
|
|||
|
|
@ -93,6 +93,7 @@ function FilingApplicationListPage(props) {
|
|||
total={total}
|
||||
loading={loading}
|
||||
scrollY={props.scrollY}
|
||||
history={props.history}
|
||||
searchForm={searchForm}
|
||||
onSearch={handleSearch}
|
||||
onPageChange={handlePageChange}
|
||||
|
|
|
|||
|
|
@ -48,9 +48,8 @@ function FilingChangeListPage(props) {
|
|||
}, []);
|
||||
|
||||
const handleSearch = (values) => {
|
||||
const { filingNo, ...rest } = values;
|
||||
const { filingNo: _omit, ...restQuery } = router.query;
|
||||
router.query = { ...restQuery, ...rest, ...(filingNo != null && filingNo !== "" ? { id: filingNo } : {}), current: 1, size: 10 };
|
||||
|
||||
router.query = { ...values, current: 1, size: 10 };
|
||||
getData();
|
||||
};
|
||||
|
||||
|
|
@ -86,6 +85,7 @@ function FilingChangeListPage(props) {
|
|||
total={total}
|
||||
loading={loading}
|
||||
scrollY={props.scrollY}
|
||||
history={props.history}
|
||||
searchForm={searchForm}
|
||||
onSearch={handleSearch}
|
||||
onPageChange={handlePageChange}
|
||||
|
|
|
|||
|
|
@ -48,12 +48,12 @@ export default function ChangeHistoryModal({ open, filingId, onCancel }) {
|
|||
<Table
|
||||
size="small"
|
||||
loading={loading}
|
||||
rowKey={(row) => row.id || row.index}
|
||||
rowKey="id"
|
||||
pagination={false}
|
||||
dataSource={records}
|
||||
locale={{ emptyText: changeCount ? "暂无明细" : "暂无变更记录" }}
|
||||
columns={[
|
||||
{ title: "序号", dataIndex: "index", width: 60 },
|
||||
{ title: "序号", width: 60, render: (_, __, index) => index + 1 },
|
||||
{ title: "变更事项", dataIndex: "changeItemName" },
|
||||
{ title: "变更时间", dataIndex: "changeTime", width: 120 },
|
||||
{ title: "操作人", dataIndex: "operatorName", width: 100, render: (val) => val || "-" },
|
||||
|
|
|
|||
|
|
@ -1,9 +1,10 @@
|
|||
import { Connect } from "@cqsjjb/jjb-dva-runtime";
|
||||
import { tools } from "@cqsjjb/jjb-common-lib";
|
||||
import { Button, Form, message, Modal, Space, Spin, Tabs } from "antd";
|
||||
import dayjs from "dayjs";
|
||||
import { useCallback, useEffect, useRef, useState } from "react";
|
||||
import PageLayout from "@cqsjjb/jjb-react-admin-component/PageLayout";
|
||||
import { fetchQualFilingDetail, fetchQualChangeDetail, } from "~/api/qualFiling";
|
||||
import { fetchQualFilingDetail, fetchQualChangeDetail } from "~/api/qualFiling";
|
||||
import { NS_QUAL_FILING } from "~/enumerate/namespace";
|
||||
import { FILING_FORM_MODE } from "~/enumerate/qualFilingOptions";
|
||||
import { FILING_MATERIAL_TEMPLATE } from "../filingMaterialTemplate";
|
||||
|
|
@ -79,9 +80,12 @@ function FilingFormPage(props) {
|
|||
}
|
||||
aciotn(query.id).then((res) => {
|
||||
setDetail((prev) => ({ ...prev, ...(res?.data || {}) }));
|
||||
console.log(res?.data, "res.data");
|
||||
basicForm.setFieldsValue(res?.data || {});
|
||||
commitmentForm.setFieldsValue(res?.data?.commitment || {});
|
||||
const commitment = res?.data?.commitment || {};
|
||||
commitmentForm.setFieldsValue({
|
||||
...commitment,
|
||||
signDate: commitment.signDate ? dayjs(commitment.signDate) : undefined,
|
||||
});
|
||||
});
|
||||
} else {
|
||||
setDetail((prev) => ({ ...prev, materials: FILING_MATERIAL_TEMPLATE }));
|
||||
|
|
@ -176,7 +180,7 @@ function FilingFormPage(props) {
|
|||
body[`qualFilingPersonnel${word}AddCmds`] = params.personnelList.map(item=>{
|
||||
return {
|
||||
...item,
|
||||
personName: item.userName,
|
||||
personName: item.userName || item.personName,
|
||||
sourcePersonnelId: item.id,
|
||||
};
|
||||
});
|
||||
|
|
|
|||
|
|
@ -6,11 +6,11 @@ import { CHONGQING_DISTRICTS } from "~/enumerate/enterpriseOptions";
|
|||
import {
|
||||
FILING_FORM_MODE,
|
||||
getFilingStatusOptions,
|
||||
|
||||
isQualFilingEditable,
|
||||
QUAL_FILING_STATUS_COLOR,
|
||||
} from "~/enumerate/qualFilingOptions";
|
||||
import { CHANGE_COUNT_STYLE, getChangeCount } from "~/utils/enterpriseForm";
|
||||
import { goFilingForm } from "./filingPaths";
|
||||
|
||||
export default function FilingListTable({
|
||||
dataSource,
|
||||
|
|
@ -30,18 +30,21 @@ export default function FilingListTable({
|
|||
PageLayout,
|
||||
onDelete,
|
||||
extraActions,
|
||||
history,
|
||||
}) {
|
||||
const statusOptions = getFilingStatusOptions(mode);
|
||||
|
||||
const canEditRow = (record) => {
|
||||
|
||||
if (mode === FILING_FORM_MODE.FILED) {
|
||||
return record.filingStatusCode === 2;
|
||||
}
|
||||
return isQualFilingEditable(record.filingStatusCode);
|
||||
};
|
||||
|
||||
const columns = [
|
||||
{ title: "备案属地", dataIndex: "filingTerritoryName", width: 120, ellipsis: true },
|
||||
{ title: "备案单位", dataIndex: "filingUnitName", ellipsis: true },
|
||||
{ title: "备案编号", dataIndex: "filingNo", width: 200, render: (val, record) => val || record.id || "-" },
|
||||
{ title: "备案编号", dataIndex: "filingNo", width: 200},
|
||||
{ title: "安全评价业务范围", dataIndex: "businessScope", ellipsis: true },
|
||||
];
|
||||
|
||||
|
|
@ -93,7 +96,7 @@ export default function FilingListTable({
|
|||
<Button
|
||||
type="link"
|
||||
size="small"
|
||||
onClick={() => goFilingForm({ mode, id: record.id, readOnly: true })}
|
||||
onClick={() => history.push(`/container/qualApplication/filingForm?mode=${mode}&id=${record.id}&readOnly=1`)}
|
||||
>
|
||||
查看
|
||||
</Button>
|
||||
|
|
@ -102,7 +105,7 @@ export default function FilingListTable({
|
|||
<Button
|
||||
type="link"
|
||||
size="small"
|
||||
onClick={() => goFilingForm({ mode, id: record.id })}
|
||||
onClick={() => history.push(`/container/qualApplication/filingForm?mode=${mode}&id=${record.id}`)}
|
||||
>
|
||||
修改
|
||||
</Button>
|
||||
|
|
@ -138,7 +141,7 @@ export default function FilingListTable({
|
|||
<Form.Item key="filingUnitName" name="filingUnitName">
|
||||
<ControlWrapper.Input label="备案单位" placeholder="关键字搜索" allowClear />
|
||||
</Form.Item>,
|
||||
<Form.Item key="filingTerritoryName" name="filingTerritoryName">
|
||||
<Form.Item key="filingTerritoryCode" name="filingTerritoryCode">
|
||||
<ControlWrapper.Select
|
||||
label="备案属地"
|
||||
placeholder="请输入"
|
||||
|
|
@ -150,14 +153,15 @@ export default function FilingListTable({
|
|||
))}
|
||||
</ControlWrapper.Select>
|
||||
</Form.Item>,
|
||||
<Form.Item key="filingNo" name="filingNo" normalize={(v) => (v ? v.replace(/\D/g, "").slice(0, 20) : v)}>
|
||||
<ControlWrapper.Input label="备案编号" placeholder="请输入" allowClear maxLength={20} />
|
||||
<Form.Item key="filingNo" name="filingNo">
|
||||
<ControlWrapper.Input label="备案编号" placeholder="关键字搜索" allowClear />
|
||||
</Form.Item>,
|
||||
<Form.Item key="filingStatus" name="filingStatus">
|
||||
<Form.Item key="filingStatusCode" name="filingStatusCode">
|
||||
<ControlWrapper.Select
|
||||
label="备案状态"
|
||||
placeholder="全部"
|
||||
|
||||
allowClear={false}
|
||||
showSearch={false}
|
||||
style={{ width: "100%" }}
|
||||
>
|
||||
{statusOptions.map((opt) => (
|
||||
|
|
|
|||
|
|
@ -6,19 +6,7 @@ export const FILING_LIST_PATH = {
|
|||
change: "/safetyEval/container/qualApplication/filingChange/list",
|
||||
};
|
||||
|
||||
export function goFilingForm({ mode, id, originFilingId, readOnly }) {
|
||||
const params = new URLSearchParams({ mode });
|
||||
if (id) {
|
||||
params.set("id", String(id));
|
||||
}
|
||||
if (originFilingId) {
|
||||
params.set("originFilingId", String(originFilingId));
|
||||
}
|
||||
if (readOnly) {
|
||||
params.set("readOnly", "1");
|
||||
}
|
||||
window.location.href = `${FILING_FORM_PATH}?${params.toString()}`;
|
||||
}
|
||||
|
||||
|
||||
export function goFilingList(mode) {
|
||||
window.location.href = FILING_LIST_PATH[mode] || FILING_LIST_PATH.application;
|
||||
|
|
|
|||
Loading…
Reference in New Issue