dev_1.0.1
parent
02ddc49c19
commit
9073e492bc
|
|
@ -2,6 +2,7 @@ import { Connect } from "@cqsjjb/jjb-dva-runtime";
|
||||||
import { Button, DatePicker, Descriptions, Form, Input, message, Modal, Select, Table, Upload } from "antd";
|
import { Button, DatePicker, Descriptions, Form, Input, message, Modal, Select, Table, Upload } from "antd";
|
||||||
import { UploadOutlined } from "@ant-design/icons";
|
import { UploadOutlined } from "@ant-design/icons";
|
||||||
import { useEffect, useState } from "react";
|
import { useEffect, useState } from "react";
|
||||||
|
import dayjs from "dayjs";
|
||||||
import PageLayout from "@cqsjjb/jjb-react-admin-component/PageLayout";
|
import PageLayout from "@cqsjjb/jjb-react-admin-component/PageLayout";
|
||||||
import SearchForm from "@cqsjjb/jjb-react-admin-component/SearchForm";
|
import SearchForm from "@cqsjjb/jjb-react-admin-component/SearchForm";
|
||||||
import ControlWrapper from "@cqsjjb/jjb-react-admin-component/ControlWrapper";
|
import ControlWrapper from "@cqsjjb/jjb-react-admin-component/ControlWrapper";
|
||||||
|
|
@ -186,9 +187,16 @@ function CertModal({
|
||||||
const res = await staffCertificateInfo({ id: currentId });
|
const res = await staffCertificateInfo({ id: currentId });
|
||||||
if (cancelled || !res?.data) return;
|
if (cancelled || !res?.data) return;
|
||||||
const data = { ...res.data };
|
const data = { ...res.data };
|
||||||
// 将 validStartDate/validEndDate 合并为 validDate(RangePicker)
|
// 将 validStartDate/validEndDate 合并为 validDate(RangePicker 需要 dayjs 对象)
|
||||||
if (data.validStartDate || data.validEndDate) {
|
if (data.validStartDate || data.validEndDate) {
|
||||||
data.validDate = [data.validStartDate, data.validEndDate];
|
data.validDate = [
|
||||||
|
data.validStartDate ? dayjs(data.validStartDate) : undefined,
|
||||||
|
data.validEndDate ? dayjs(data.validEndDate) : undefined,
|
||||||
|
];
|
||||||
|
}
|
||||||
|
// 复核日期需要转为 dayjs 对象
|
||||||
|
if (data.reviewDate) {
|
||||||
|
data.reviewDate = dayjs(data.reviewDate);
|
||||||
}
|
}
|
||||||
// 处理证书附件 fileList
|
// 处理证书附件 fileList
|
||||||
let fileList = [];
|
let fileList = [];
|
||||||
|
|
@ -231,8 +239,9 @@ function CertModal({
|
||||||
const payload = {
|
const payload = {
|
||||||
...values,
|
...values,
|
||||||
personnelId: staffId,
|
personnelId: staffId,
|
||||||
validStartDate: values.validDate?.[0],
|
validStartDate: values.validDate?.[0] ? dayjs(values.validDate[0]).format("YYYY-MM-DD") : undefined,
|
||||||
validEndDate: values.validDate?.[1],
|
validEndDate: values.validDate?.[1] ? dayjs(values.validDate[1]).format("YYYY-MM-DD") : undefined,
|
||||||
|
reviewDate: values.reviewDate ? dayjs(values.reviewDate).format("YYYY-MM-DD") : undefined,
|
||||||
certAttachmentUrl: Array.isArray(values.certAttachmentUrl)
|
certAttachmentUrl: Array.isArray(values.certAttachmentUrl)
|
||||||
? values.certAttachmentUrl.map((f) => f.url || f.response?.url).filter(Boolean).join(",")
|
? values.certAttachmentUrl.map((f) => f.url || f.response?.url).filter(Boolean).join(",")
|
||||||
: "",
|
: "",
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue