bug:13799、13396
parent
01566aa377
commit
e839798cd6
|
|
@ -287,7 +287,7 @@ function Add(props) {
|
|||
|
||||
const onSubmit = async (values, isDraft) => {
|
||||
// 检查重复选择
|
||||
await isExistenceDuplicateSelection({ data: values.inspectorList, key: "userId" });
|
||||
await isExistenceDuplicateSelection({ data: values.inspectorList, key: "userId", message: "检查人员存在重复项" });
|
||||
|
||||
// 处理签名
|
||||
const signatureResult = await handleSignature(values);
|
||||
|
|
|
|||
|
|
@ -13,9 +13,9 @@ import { FORM_ITEM_RENDER_ENUM } from "zy-react-library/enum/formItemRender";
|
|||
import { UPLOAD_FILE_TYPE_ENUM } from "zy-react-library/enum/uploadFile/gwj";
|
||||
import useTable from "zy-react-library/hooks/useTable";
|
||||
import useUploadFile from "zy-react-library/hooks/useUploadFile";
|
||||
import { formatDate } from "~/utils/dateFormat";
|
||||
import { INSPECTION_QUESTION_ENUM } from "~/enumerate/constant";
|
||||
import { NS_INSPECTION } from "~/enumerate/namespace";
|
||||
import { formatDate } from "~/utils/dateFormat";
|
||||
|
||||
function List(props) {
|
||||
const [verifyModalOpen, setVerifyModalOpen] = useState(false);
|
||||
|
|
@ -24,8 +24,8 @@ function List(props) {
|
|||
const { tableProps, getData } = useTable(props["inspectionList"], {
|
||||
form,
|
||||
transform: formData => ({
|
||||
checkStartTime: formData.checkTime?.[0] ? (formData.checkTime[0] + " 00:00:00") : "",
|
||||
checkEndTime: formData.checkTime?.[1] ? (formData.checkTime[1] + " 23:59:59") : "",
|
||||
checkStartTime: formData.checkTime?.[0] ? (formData.checkTime[0]) : "",
|
||||
checkEndTime: formData.checkTime?.[1] ? (formData.checkTime[1]) : "",
|
||||
}),
|
||||
params: { status: "200" },
|
||||
});
|
||||
|
|
@ -44,7 +44,7 @@ function List(props) {
|
|||
{ name: "inspectionDeptId", label: "检查部门", render: <DepartmentSelectTree /> },
|
||||
{ name: "inspectionUserName", label: "检查人" },
|
||||
{ name: "type", label: "检查类型", render: <DictionarySelectTree dictValue="inspectionType" onlyLastLevel /> },
|
||||
{ name: "checkTime", label: "检查时间", render: FORM_ITEM_RENDER_ENUM.DATE_RANGE },
|
||||
{ name: "checkTime", label: "检查时间", render: FORM_ITEM_RENDER_ENUM.DATETIME_RANGE },
|
||||
{ name: "inspectedDepartmentId", label: "被检查单位", render: <DepartmentSelectTree searchType={props.searchType} /> },
|
||||
{ name: "inspectedUserName", label: "被检查单位现场负责人" },
|
||||
]}
|
||||
|
|
|
|||
Loading…
Reference in New Issue