From 0abc3c38816816156b5dac6d8c8ecee300da16ba Mon Sep 17 00:00:00 2001 From: "853931625@qq.com" Date: Wed, 27 May 2026 10:54:45 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jjb.config.js | 5 +-- package.json | 4 +-- src/api/approverUser/index.js | 5 +++ .../PersonnelApplication/Add/index.js | 34 +++++++++---------- .../PersonnelApplication/List/index.js | 9 ++++- .../VehicleApplication/List/index.js | 6 ++-- .../FirstLevelDoor/ApproverUser/index.js | 12 +++++++ .../Camera/BatchPlay/index.js | 4 +-- .../FirstLevelDoorInfo/Camera/List/index.js | 4 ++- .../Channel/FareGate/index.js | 12 +++---- .../FirstLevelDoorInfo/Channel/List/index.js | 14 ++++---- .../FirstLevelDoorInfo/List/index.js | 12 +++---- .../InspectDepartmentVehicles/List/index.js | 31 ++++++++++++++--- .../PersonalVehicle/List/index.js | 2 +- .../List/index.js | 3 +- .../RelatedPersonnel/index.js | 4 +-- 16 files changed, 105 insertions(+), 56 deletions(-) diff --git a/jjb.config.js b/jjb.config.js index afb0aa2..496764b 100644 --- a/jjb.config.js +++ b/jjb.config.js @@ -20,13 +20,14 @@ module.exports = { }, }, // 应用唯一标识符 - appIdentifier: "primeport-h5", + appIdentifier: "primeport", // 应用上下文注入全局变量 contextInject: { // 应用Key appKey: "", // fileUrl: "http://192.168.20.240:9787/mnt/", - fileUrl: "https://jpfz.qhdsafety.com/gbsFileTest/", + // fileUrl: "https://jpfz.qhdsafety.com/gbsFileTest/", + fileUrl: "https://skqhdg.porthebei.com:9004/file/uploadFiles2/", }, // public/index.html注入全局变量 windowInject: { diff --git a/package.json b/package.json index d833e10..1242d55 100644 --- a/package.json +++ b/package.json @@ -6,8 +6,8 @@ "license": "MIT", "main": "index.js", "scripts": { - "serve": "node node_modules/@cqsjjb/scripts/webpack.dev.server.js", - "build": "node node_modules/@cqsjjb/scripts/webpack.build.js", + "serve": "node node_modules/@cqsjjb/scripts/rspack.dev.server.js", + "build": "node node_modules/@cqsjjb/scripts/rspack.build.js", "push": "jjb-cmd push java production", "clean-cache": "rimraf node_modules/.cache/webpack", "serve:development": "cross-env NODE_ENV=development npm run serve", diff --git a/src/api/approverUser/index.js b/src/api/approverUser/index.js index 592f1ae..b1ba71f 100644 --- a/src/api/approverUser/index.js +++ b/src/api/approverUser/index.js @@ -24,3 +24,8 @@ export const approvalUserAdd = declareRequest( "approvalUserLoading", `Post > @/primeport/mkmjApprovalUser/save`, ); + +export const checkExistByUserId = declareRequest( + "approvalUserLoading", + `Get > /primeport/mkmjApprovalUser/checkExistByUserId/{userId}`, +); diff --git a/src/pages/Container/Stakeholder/FirstLevelDoor/PersonnelApplication/Add/index.js b/src/pages/Container/Stakeholder/FirstLevelDoor/PersonnelApplication/Add/index.js index 6c64fbf..6182890 100644 --- a/src/pages/Container/Stakeholder/FirstLevelDoor/PersonnelApplication/Add/index.js +++ b/src/pages/Container/Stakeholder/FirstLevelDoor/PersonnelApplication/Add/index.js @@ -176,23 +176,23 @@ function Add(props) { ), }, { name: "area", label: "访问港区", onlyForLabel: true }, - { - name: "mkmjId", - label: "访问口门名称", - render: FORM_ITEM_RENDER_ENUM.SELECT, - items: firstLevelDoorInfoListAll, - itemsField: { labelKey: "mkmjName", valueKey: "id" }, - componentProps: { - onChange: event => - form.setFieldValue("mkmjName", getLabelName({ - list: firstLevelDoorInfoListAll, - status: event, - idKey: "id", - nameKey: "mkmjName", - })), - }, - }, - { name: "mkmjName", label: "访问口门名称", onlyForLabel: true }, + // { + // name: "mkmjId", + // label: "访问口门名称", + // render: FORM_ITEM_RENDER_ENUM.SELECT, + // items: firstLevelDoorInfoListAll, + // itemsField: { labelKey: "mkmjName", valueKey: "id" }, + // componentProps: { + // onChange: event => + // form.setFieldValue("mkmjName", getLabelName({ + // list: firstLevelDoorInfoListAll, + // status: event, + // idKey: "id", + // nameKey: "mkmjName", + // })), + // }, + // }, + // { name: "mkmjName", label: "访问口门名称", onlyForLabel: true }, { customizeRender: true, span: 24, diff --git a/src/pages/Container/Stakeholder/FirstLevelDoor/PersonnelApplication/List/index.js b/src/pages/Container/Stakeholder/FirstLevelDoor/PersonnelApplication/List/index.js index a759f49..05ad410 100644 --- a/src/pages/Container/Stakeholder/FirstLevelDoor/PersonnelApplication/List/index.js +++ b/src/pages/Container/Stakeholder/FirstLevelDoor/PersonnelApplication/List/index.js @@ -32,7 +32,7 @@ function List(props) { { { label: "项目人员数", children: info.personApplyList?.length }, { label: "申请时间", children: info.applyTime }, { label: "申请状态", children: getLabelName({ list: ENCLOSED_AREA_AUDIT_STATUS_ENUM, status: info.auditFlag }) }, + ...( + info.auditFlag === 3 ? [ + { label: "驳回原因", children: info.reasonsRefusal }, + ] :[] + ), { label: "申请人签字", children: () }, ]} /> + 人员信息 + { + return ( { const ViewModalComponent = (props) => { const [info, setInfo] = useState({}); - + console.log(props); const { loading: getFileLoading, getFile } = useGetFile(); const getData = async () => { - const { data } = await props["vehicleApplyInfo"]({ vehicleApplyId: props.id }); + const { data } = await props["vehicleApplyInfo"]({ id: props.id }); + const drivingLicenseFile = await getFile({ eqType: UPLOAD_FILE_TYPE_ENUM[601], eqForeignKey: data.drivingLicenseId, diff --git a/src/pages/Container/Supervision/FirstLevelDoor/ApproverUser/index.js b/src/pages/Container/Supervision/FirstLevelDoor/ApproverUser/index.js index 799bba9..a2b0d05 100644 --- a/src/pages/Container/Supervision/FirstLevelDoor/ApproverUser/index.js +++ b/src/pages/Container/Supervision/FirstLevelDoor/ApproverUser/index.js @@ -12,6 +12,7 @@ import Table from "zy-react-library/components/Table"; import { FORM_ITEM_RENDER_ENUM } from "zy-react-library/enum/formItemRender"; import useTable from "zy-react-library/hooks/useTable"; import { NS_APPROVER_USER } from "~/enumerate/namespace"; +import {checkExistByUserId} from "~/api/approverUser"; function ApproverUser(props) { const [addModalVisible, setAddModalVisible] = useState(false); @@ -115,6 +116,7 @@ function ApproverUser(props) { setAddModalVisible(false); setCurrentId(""); }} + checkExistByUserId={props[checkExistByUserId]} id={currentId} getData={getData} /> @@ -191,6 +193,8 @@ function AddModalComponent(props) { form.setFieldValue("deptName", label); }} onChange={() => { + + form.setFieldValue("userId", ""); form.setFieldValue("userName", ""); form.setFieldValue("corpId", ""); @@ -213,6 +217,14 @@ function AddModalComponent(props) { form.setFieldValue("userName", label); }} onGetOption={(option) => { + props.checkExistByUserId({userId:option.id}).then((res) => { + if(res.data){ + if(!res.data.available){ + form.setFieldValue("userId", undefined); + message.warning(res.data.availableMessage) + } + } + }) form.setFieldValue("corpId", option.corpinfoId); form.setFieldValue("corpName", option.corpinfoName); form.setFieldValue("postId", option.postId); diff --git a/src/pages/Container/Supervision/FirstLevelDoor/BasicInfo/FirstLevelDoorInfo/Camera/BatchPlay/index.js b/src/pages/Container/Supervision/FirstLevelDoor/BasicInfo/FirstLevelDoorInfo/Camera/BatchPlay/index.js index 2d95520..6e41c0d 100644 --- a/src/pages/Container/Supervision/FirstLevelDoor/BasicInfo/FirstLevelDoorInfo/Camera/BatchPlay/index.js +++ b/src/pages/Container/Supervision/FirstLevelDoor/BasicInfo/FirstLevelDoorInfo/Camera/BatchPlay/index.js @@ -11,8 +11,8 @@ import useGetUrlQuery from "zy-react-library/hooks/useGetUrlQuery"; import { buildPlayableVideoSource } from "~/utils/video"; const IS_ONLINE_ENUM = [ - { name: "否", bianma: "0" }, - { name: "是", bianma: "1" }, + { name: "离线", bianma: "0" }, + { name: "在线", bianma: "1" }, ]; // 巡屏页： // 1. 左侧树控制参与巡屏的视频范围 diff --git a/src/pages/Container/Supervision/FirstLevelDoor/BasicInfo/FirstLevelDoorInfo/Camera/List/index.js b/src/pages/Container/Supervision/FirstLevelDoor/BasicInfo/FirstLevelDoorInfo/Camera/List/index.js index 7bf9288..8ac94d9 100644 --- a/src/pages/Container/Supervision/FirstLevelDoor/BasicInfo/FirstLevelDoorInfo/Camera/List/index.js +++ b/src/pages/Container/Supervision/FirstLevelDoor/BasicInfo/FirstLevelDoorInfo/Camera/List/index.js @@ -13,7 +13,7 @@ import useTable from "zy-react-library/hooks/useTable"; import { getLabelName } from "zy-react-library/utils"; import { NS_FIRST_LEVEL_DOOR_INFO } from "~/enumerate/namespace"; import VideoPlayModal from "./components/VideoPlay"; - +import { FORM_ITEM_RENDER_ENUM } from "zy-react-library/enum/formItemRender"; const IS_ONLINE_ENUM = [ { name: "否", bianma: "0" }, { name: "是", bianma: "1" }, @@ -92,6 +92,8 @@ function List(props) { onFinish={getData} options={[ { name: "videoResourceName", label: "视频名称" }, + { name: "eqIsOnline", label: "是否在线", render:FORM_ITEM_RENDER_ENUM.SELECT,items:IS_ONLINE_ENUM }, + ]} />
{ { label: "地理位置", children: ( -
+
+ + ), }, { label: "闸机状态", children: getLabelName({ list: FARE_GATE_STATUS_ENUM, status: info.gateStatus }) }, diff --git a/src/pages/Container/Supervision/FirstLevelDoor/BasicInfo/FirstLevelDoorInfo/Channel/List/index.js b/src/pages/Container/Supervision/FirstLevelDoor/BasicInfo/FirstLevelDoorInfo/Channel/List/index.js index 6d0fe81..d4cc8fe 100644 --- a/src/pages/Container/Supervision/FirstLevelDoor/BasicInfo/FirstLevelDoorInfo/Channel/List/index.js +++ b/src/pages/Container/Supervision/FirstLevelDoor/BasicInfo/FirstLevelDoorInfo/Channel/List/index.js @@ -227,7 +227,7 @@ const AddModalComponent = (props) => { label: "通道类型", render: ( form.setFieldValue("passageTypeName", label)} /> ), @@ -276,14 +276,14 @@ const InfoModalComponent = (props) => { { label: "地理位置", children: ( -
+
+ + ), }, ]} diff --git a/src/pages/Container/Supervision/FirstLevelDoor/BasicInfo/FirstLevelDoorInfo/List/index.js b/src/pages/Container/Supervision/FirstLevelDoor/BasicInfo/FirstLevelDoorInfo/List/index.js index b3bf55e..90c25f2 100644 --- a/src/pages/Container/Supervision/FirstLevelDoor/BasicInfo/FirstLevelDoorInfo/List/index.js +++ b/src/pages/Container/Supervision/FirstLevelDoor/BasicInfo/FirstLevelDoorInfo/List/index.js @@ -308,14 +308,14 @@ function InfoModalComponent(props) { { label: "位置", children: ( -
+
+ + ), }, ]} diff --git a/src/pages/Container/Supervision/FirstLevelDoor/ImportAndExportPortInfo/InspectDepartmentVehicles/List/index.js b/src/pages/Container/Supervision/FirstLevelDoor/ImportAndExportPortInfo/InspectDepartmentVehicles/List/index.js index 9f2a541..52964e0 100644 --- a/src/pages/Container/Supervision/FirstLevelDoor/ImportAndExportPortInfo/InspectDepartmentVehicles/List/index.js +++ b/src/pages/Container/Supervision/FirstLevelDoor/ImportAndExportPortInfo/InspectDepartmentVehicles/List/index.js @@ -152,6 +152,19 @@ function List(props) { ); } +const formatSubmitDate = (value) => { + if (!value) { + return value; + } + if (typeof value === "string") { + return value.includes("T") ? value.split("T")[0] : value; + } + if (typeof value?.format === "function") { + return value.format("YYYY-MM-DD"); + } + return value; +}; + const AddModalComponent = (props) => { const { info } = props; const isEdit = !!info.id; @@ -160,9 +173,17 @@ const AddModalComponent = (props) => { const onSubmit = async (values) => { let outsideSuccess = false; + const submitInspectCarList = (values.inspectCarList || []).map((item) => ({ + ...item, + visitEndTime: formatSubmitDate(item.visitEndTime), + })); + const submitValues = { + ...values, + inspectCarList: submitInspectCarList, + }; if (!isEdit) { const { success } = await props["inspectDepartmentVehiclesAdd"]({ - ...values, + ...submitValues, vehicleBelongType: 7, }); outsideSuccess = success; @@ -170,8 +191,8 @@ const AddModalComponent = (props) => { else { const { success } = await props["inspectDepartmentVehiclesUpdate"]({ id: info.id, - ...values, - ...values.inspectCarList[0], + ...submitValues, + ...submitInspectCarList[0], vehicleBelongType: 7, }); outsideSuccess = success; @@ -191,11 +212,11 @@ const AddModalComponent = (props) => { width={600} onCancel={props.onCancel} onOk={form.submit} - // confirmLoading={props.vehicleApply.vehicleApplyLoading} + confirmLoading={props.vehicleApply.vehicleApplyLoading} > )} - {props.permission(props.delBtn || "jgd-io-personal-vehicle-del") && ( + {(props.permission(props.delBtn || "jgd-io-personal-vehicle-del") && record.auditFlag ===2) && (