diff --git a/src/pages/Container/BranchCompany/Inspection/Inspection/Add/index.js b/src/pages/Container/BranchCompany/Inspection/Inspection/Add/index.js index 865db2d..120e3f6 100644 --- a/src/pages/Container/BranchCompany/Inspection/Inspection/Add/index.js +++ b/src/pages/Container/BranchCompany/Inspection/Inspection/Add/index.js @@ -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); @@ -320,8 +320,8 @@ function Add(props) { values={{ planType: query.planId ? 1 : 0, planId: query.planId, - type:query.type, - typeName:query.typeName, + type: query.type, + typeName: query.typeName, situationList: [{ content: undefined }], }} loading={deleteFileLoading || getFileLoading || uploadFileLoading || props.inspection.inspectionLoading} @@ -438,7 +438,7 @@ function Add(props) { render: ( { form.setFieldValue(["inspectorList", field.name, "userId"], ""); form.setFieldValue(["inspectorList", field.name, "userName"], ""); diff --git a/src/pages/Container/BranchCompany/Inspection/Inspector/List/index.js b/src/pages/Container/BranchCompany/Inspection/Inspector/List/index.js index 710f82c..31cd7e5 100644 --- a/src/pages/Container/BranchCompany/Inspection/Inspector/List/index.js +++ b/src/pages/Container/BranchCompany/Inspection/Inspector/List/index.js @@ -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: }, { name: "inspectionUserName", label: "检查人" }, { name: "type", label: "检查类型", render: }, - { name: "checkTime", label: "检查时间", render: FORM_ITEM_RENDER_ENUM.DATE_RANGE }, + { name: "checkTime", label: "检查时间", render: FORM_ITEM_RENDER_ENUM.DATETIME_RANGE }, { name: "inspectedDepartmentId", label: "被检查单位", render: }, { name: "inspectedUserName", label: "被检查单位现场负责人" }, ]}