zcloud_gbs
/
zcloud_gbs_inspection-react
13
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bug：13799、13396

master
LiuJiaNan 2026-01-16 09:00:07 +08:00
parent 01566aa377
commit e839798cd6
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/pages/Container/BranchCompany/Inspection/Inspection/Add/index.js
View File

@ -287,7 +287,7 @@ function Add(props) {
const onSubmit = async (values, isDraft) => { 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); const signatureResult = await handleSignature(values);
@ -320,8 +320,8 @@ function Add(props) {
values={{ values={{
planType: query.planId ? 1 : 0, planType: query.planId ? 1 : 0,
planId: query.planId, planId: query.planId,
type:query.type, type: query.type,
typeName:query.typeName, typeName: query.typeName,
situationList: [{ content: undefined }], situationList: [{ content: undefined }],
}} }}
loading={deleteFileLoading || getFileLoading || uploadFileLoading || props.inspection.inspectionLoading} loading={deleteFileLoading || getFileLoading || uploadFileLoading || props.inspection.inspectionLoading}
@ -438,7 +438,7 @@ function Add(props) {
render: ( render: (
<DepartmentSelectTree <DepartmentSelectTree
searchType={props.corpSearchType} searchType={props.corpSearchType}
params={{ inType: [0,1,2,6] }} params={{ inType: [0, 1, 2, 6] }}
onChange={() => { onChange={() => {
form.setFieldValue(["inspectorList", field.name, "userId"], ""); form.setFieldValue(["inspectorList", field.name, "userId"], "");
form.setFieldValue(["inspectorList", field.name, "userName"], ""); form.setFieldValue(["inspectorList", field.name, "userName"], "");

8
src/pages/Container/BranchCompany/Inspection/Inspector/List/index.js
View File

@ -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 { UPLOAD_FILE_TYPE_ENUM } from "zy-react-library/enum/uploadFile/gwj";
import useTable from "zy-react-library/hooks/useTable"; import useTable from "zy-react-library/hooks/useTable";
import useUploadFile from "zy-react-library/hooks/useUploadFile"; import useUploadFile from "zy-react-library/hooks/useUploadFile";
import { formatDate } from "~/utils/dateFormat";
import { INSPECTION_QUESTION_ENUM } from "~/enumerate/constant"; import { INSPECTION_QUESTION_ENUM } from "~/enumerate/constant";
import { NS_INSPECTION } from "~/enumerate/namespace"; import { NS_INSPECTION } from "~/enumerate/namespace";
import { formatDate } from "~/utils/dateFormat";
function List(props) { function List(props) {
const [verifyModalOpen, setVerifyModalOpen] = useState(false); const [verifyModalOpen, setVerifyModalOpen] = useState(false);
@ -24,8 +24,8 @@ function List(props) {
const { tableProps, getData } = useTable(props["inspectionList"], { const { tableProps, getData } = useTable(props["inspectionList"], {
form, form,
transform: formData => ({ transform: formData => ({
checkStartTime: formData.checkTime?.[0] ? (formData.checkTime[0] + " 00:00:00") : "", checkStartTime: formData.checkTime?.[0] ? (formData.checkTime[0]) : "",
checkEndTime: formData.checkTime?.[1] ? (formData.checkTime[1] + " 23:59:59") : "", checkEndTime: formData.checkTime?.[1] ? (formData.checkTime[1]) : "",
}), }),
params: { status: "200" }, params: { status: "200" },
}); });
@ -44,7 +44,7 @@ function List(props) {
{ name: "inspectionDeptId", label: "检查部门", render: <DepartmentSelectTree /> }, { name: "inspectionDeptId", label: "检查部门", render: <DepartmentSelectTree /> },
{ name: "inspectionUserName", label: "检查人" }, { name: "inspectionUserName", label: "检查人" },
{ name: "type", label: "检查类型", render: <DictionarySelectTree dictValue="inspectionType" onlyLastLevel /> }, { 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: "inspectedDepartmentId", label: "被检查单位", render: <DepartmentSelectTree searchType={props.searchType} /> },
{ name: "inspectedUserName", label: "被检查单位现场负责人" }, { name: "inspectedUserName", label: "被检查单位现场负责人" },
]} ]}