From 82595a5c03726ee2bf1477100180703231aaa970 Mon Sep 17 00:00:00 2001 From: LiuJiaNan <15703339975@163.com> Date: Tue, 17 Mar 2026 16:31:36 +0800 Subject: [PATCH] =?UTF-8?q?=E5=86=85=E6=B5=8Bbug=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=EF=BC=9A=E9=9A=90=E6=82=A3=E6=89=93=E5=9B=9E=E4=B9=8B=E5=90=8E?= =?UTF-8?q?=E9=87=8D=E6=96=B0=E8=8E=B7=E5=8F=96=E4=B8=80=E4=B8=8B=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E6=96=B9=E7=9A=84=E8=B4=9F=E8=B4=A3=E4=BA=BA=EF=BC=8C?= =?UTF-8?q?=E9=9A=90=E6=82=A3=E7=A1=AE=E8=AE=A4=E9=AA=8C=E6=94=B6=E4=BA=BA?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E4=B8=8D=E6=AD=A3=E7=A1=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- src/main.js | 5 +- .../Average/Confirm/Review/index.js | 205 +++++++++--------- .../BranchCompany/Average/Ledger/Add/index.js | 25 ++- 4 files changed, 122 insertions(+), 115 deletions(-) diff --git a/package.json b/package.json index e0206fe..2e3a8ec 100644 --- a/package.json +++ b/package.json @@ -32,7 +32,7 @@ "react": "^18.2.0", "react-dom": "^18.2.0", "react-to-print": "^3.2.0", - "zy-react-library": "^1.1.28" + "zy-react-library": "^1.2.6" }, "devDependencies": { "@antfu/eslint-config": "^5.4.1", diff --git a/src/main.js b/src/main.js index c576a90..8eb4fed 100644 --- a/src/main.js +++ b/src/main.js @@ -2,19 +2,22 @@ import { setJJBCommonAntdMessage } from "@cqsjjb/jjb-common-lib"; import { setup } from "@cqsjjb/jjb-dva-runtime"; import { message } from "antd"; import dayjs from "dayjs"; +import { getFileUrlFromServer } from "zy-react-library/utils"; import "dayjs/locale/zh-cn"; import "../blessed_by_buddha"; require("antd/dist/reset.css"); require("zy-react-library/css/common.less"); + window.mapLongitude = "119.69457721306945"; window.mapLatitude = "39.940504336846665"; +window.mapBaiDuKey = "OElqFYoKiAH8KFtph8ftLKF5NlNrbCUr"; dayjs.locale("zh-cn"); setJJBCommonAntdMessage(message); const app = setup(); - +getFileUrlFromServer(); // 非底座环境运行 if (!window.__POWERED_BY_QIANKUN__) { // 云组件默认依赖 diff --git a/src/pages/Container/BranchCompany/Average/Confirm/Review/index.js b/src/pages/Container/BranchCompany/Average/Confirm/Review/index.js index 90e3089..e33a2de 100644 --- a/src/pages/Container/BranchCompany/Average/Confirm/Review/index.js +++ b/src/pages/Container/BranchCompany/Average/Confirm/Review/index.js @@ -1,14 +1,14 @@ -import {Connect} from "@cqsjjb/jjb-dva-runtime"; -import {Button, Divider, Form, message, Modal} from "antd"; -import {useRef, useState} from "react"; +import { Connect } from "@cqsjjb/jjb-dva-runtime"; +import { Button, Divider, Form, message, Modal } from "antd"; +import { useRef, useState } from "react"; import FormBuilder from "zy-react-library/components/FormBuilder"; import HiddenInfo from "zy-react-library/components/HiddenInfo/gwj"; import Page from "zy-react-library/components/Page"; import PersonnelSelect from "zy-react-library/components/Select/Personnel/Gwj"; import DepartmentSelectTree from "zy-react-library/components/SelectTree/Department/Gwj"; import HiddenLevelSelectTree from "zy-react-library/components/SelectTree/HiddenLevel/Gwj"; -import {FORM_ITEM_RENDER_ENUM} from "zy-react-library/enum/formItemRender"; -import {NS_CONFIRM, NS_LEDGER} from "~/enumerate/namespace"; +import { FORM_ITEM_RENDER_ENUM } from "zy-react-library/enum/formItemRender"; +import { NS_CONFIRM, NS_LEDGER } from "~/enumerate/namespace"; function Confirm(props) { const [form] = Form.useForm(); @@ -24,7 +24,7 @@ function Confirm(props) { const xgfProjectInfo = useRef({}); const getXgfProjectInfo = async (id) => { - const {data} = await props["xgfProjectInfo"]({id}); + const { data } = await props["xgfProjectInfo"]({ id }); xgfProjectInfo.current = data; }; @@ -33,55 +33,56 @@ function Confirm(props) { ...( data.isRelated === 0 ? [ - { - name: "deptId", - label: "整改部门", - render: ( - { - form.setFieldValue("userId", ""); - form.setFieldValue("userName", ""); - }} - onGetLabel={(label) => { - form.setFieldValue("deptName", label); - }} - /> - ), - }, - {name: "deptName", label: "整改部门名称", onlyForLabel: true}, - { - name: "userId", - label: "整改人", - render: ( - form.setFieldValue("userName", label)} - /> - ), - }, - {name: "userName", label: "整改人名称", onlyForLabel: true}, - ] + { + name: "deptId", + label: "整改部门", + render: ( + { + form.setFieldValue("userId", ""); + form.setFieldValue("userName", ""); + }} + onGetLabel={(label) => { + form.setFieldValue("deptName", label); + }} + /> + ), + }, + { name: "deptName", label: "整改部门名称", onlyForLabel: true }, + { + name: "userId", + label: "整改人", + render: ( + form.setFieldValue("userName", label)} + /> + ), + }, + { name: "userName", label: "整改人名称", onlyForLabel: true }, + ] : [ - {name: "deptName", label: "整改单位", componentProps: {disabled: true}}, - {name: "deptId", label: "整改单位id", onlyForLabel: true}, - {name: "userName", label: "整改人", componentProps: {disabled: true}}, - {name: "userId", label: "整改人id", onlyForLabel: true}, - ] + { name: "deptName", label: "整改单位", componentProps: { disabled: true } }, + { name: "deptId", label: "整改单位id", onlyForLabel: true }, + { name: "userName", label: "整改人", componentProps: { disabled: true } }, + { name: "userId", label: "整改人id", onlyForLabel: true }, + ] ), ]; if (hiddenLevel !== "hiddenLevel1001") { if (data.rectificationType === 2) { return [ ...commonDeptUserFields, - {name: "rectificationDeadline", label: "整改完成期限", render: FORM_ITEM_RENDER_ENUM.DATE, span: 24}, + { name: "rectificationDeadline", label: "整改完成期限", render: FORM_ITEM_RENDER_ENUM.DATE, span: 24 }, ]; - } else { + } + else { return [ { name: "rectificationType", label: "是否立即整改", render: FORM_ITEM_RENDER_ENUM.RADIO, - items: [{bianma: 1, name: "是"}, {bianma: 2, name: "否"}], + items: [{ bianma: 1, name: "是" }, { bianma: 2, name: "否" }], span: 24, }, ...commonDeptUserFields, @@ -101,8 +102,8 @@ function Confirm(props) { hidden: formValues => !(formValues.rectificationType === 1), render: ( { form.setFieldValue("checkUserId", ""); form.setFieldValue("checkUserName", ""); @@ -113,7 +114,7 @@ function Confirm(props) { /> ), }, - {name: "checkDeptName", label: "验收部门名称", onlyForLabel: true}, + { name: "checkDeptName", label: "验收部门名称", onlyForLabel: true }, { name: "checkUserId", label: "验收人", @@ -122,12 +123,12 @@ function Confirm(props) { hidden: formValues => !(formValues.rectificationType === 1), render: ( form.setFieldValue("checkUserName", label)} /> ), }, - {name: "checkUserName", label: "验收人名称", onlyForLabel: true}, + { name: "checkUserName", label: "验收人名称", onlyForLabel: true }, ]; } } @@ -139,7 +140,7 @@ function Confirm(props) { title: "提示", content: "是否确认隐患？", onOk: async () => { - const {success} = await props["confirmSubmit"]({ + const { success } = await props["confirmSubmit"]({ status: "1", rectificationType: data.rectificationType, ...values, @@ -168,10 +169,10 @@ function Confirm(props) { form.setFieldValue("deptName", hiddenUserPresetsCO.rectifyDeptName || data.hiddenFindDeptName); form.setFieldValue("userId", hiddenUserPresetsCO.rectifyUserId || data.creatorId); form.setFieldValue("userName", hiddenUserPresetsCO.rectifyUserName || data.creatorName); - form.setFieldValue("checkDeptId", hiddenUserPresetsCO.rectifyDeptId || data.hiddenFindDept); - form.setFieldValue("checkDeptName", hiddenUserPresetsCO.rectifyDeptName || data.hiddenFindDeptName); - form.setFieldValue("checkUserId", hiddenUserPresetsCO.rectifyUserId || data.creatorId); - form.setFieldValue("checkUserName", hiddenUserPresetsCO.rectifyUserName || data.creatorName); + form.setFieldValue("checkDeptId", hiddenUserPresetsCO.checkDeptId || data.hiddenFindDept); + form.setFieldValue("checkDeptName", hiddenUserPresetsCO.checkDeptName || data.hiddenFindDeptName); + form.setFieldValue("checkUserId", hiddenUserPresetsCO.checkUserId || data.creatorId); + form.setFieldValue("checkUserName", hiddenUserPresetsCO.checkUserName || data.creatorName); } }} /> @@ -180,57 +181,57 @@ function Confirm(props) { { Object.keys(data).length > 0 ? ( - setRejectModalOpen(true)}>打回, - ]} - values={{ - rectificationType: 1, - }} - options={[ - ...(!isFromInspection - ? [ - { - name: "hiddenLevel", - label: "隐患级别", - span: 24, - render: ( - { - if (event === "hiddenLevel1001") { - form.setFieldValue("deptName", ""); - form.setFieldValue("userName", ""); - form.setFieldValue("checkDeptName", ""); - form.setFieldValue("checkUserName", ""); - } - }} - onGetLabel={(label) => { - form.setFieldValue("hiddenLevelName", label); - }} - /> - ), - }, - ] - : []), - {name: "hiddenLevelName", label: "隐患级别名称", onlyForLabel: true}, - ...decideOption(), - ]} - /> - ) + setRejectModalOpen(true)}>打回, + ]} + values={{ + rectificationType: 1, + }} + options={[ + ...(!isFromInspection + ? [ + { + name: "hiddenLevel", + label: "隐患级别", + span: 24, + render: ( + { + if (event === "hiddenLevel1001") { + form.setFieldValue("deptName", ""); + form.setFieldValue("userName", ""); + form.setFieldValue("checkDeptName", ""); + form.setFieldValue("checkUserName", ""); + } + }} + onGetLabel={(label) => { + form.setFieldValue("hiddenLevelName", label); + }} + /> + ), + }, + ] + : []), + { name: "hiddenLevelName", label: "隐患级别名称", onlyForLabel: true }, + ...decideOption(), + ]} + /> + ) : null } - {rejectModalOpen && setRejectModalOpen(false)} data={data}/>} + {rejectModalOpen && setRejectModalOpen(false)} data={data} />} ); } @@ -238,7 +239,7 @@ function Confirm(props) { const RejectModalComponent = (props) => { const [form] = Form.useForm(); const onSubmit = async (values) => { - const {success} = await props["confirmSubmit"]({ + const { success } = await props["confirmSubmit"]({ status: "0", ...values, id: props.data.id, @@ -268,9 +269,9 @@ const RejectModalComponent = (props) => { onFinish={onSubmit} showActionButtons={false} span={24} - labelCol={{span: 6}} + labelCol={{ span: 6 }} options={[ - {name: "repulseCause", label: "意见", render: FORM_ITEM_RENDER_ENUM.TEXTAREA}, + { name: "repulseCause", label: "意见", render: FORM_ITEM_RENDER_ENUM.TEXTAREA }, ]} /> diff --git a/src/pages/Container/BranchCompany/Average/Ledger/Add/index.js b/src/pages/Container/BranchCompany/Average/Ledger/Add/index.js index 58f07fc..6a61159 100644 --- a/src/pages/Container/BranchCompany/Average/Ledger/Add/index.js +++ b/src/pages/Container/BranchCompany/Average/Ledger/Add/index.js @@ -60,6 +60,15 @@ function Add(props) { const { loading: uploadFileLoading, uploadFile } = useUploadFile(); const { loading: getFileLoading, getFile } = useGetFile(); + const getXgfProjectInfo = async (id) => { + const { data } = await props["xgfProjectInfo"]({ id }); + xgfProjectInfo.current = data; + form.setFieldValue("rectificationDeptId", xgfProjectInfo.current.corpinfoId); + form.setFieldValue("rectificationUserId", xgfProjectInfo.current.userId); + form.setFieldValue("rectificationDeptName", xgfProjectInfo.current.corpinfoName); + form.setFieldValue("rectificationUserName", xgfProjectInfo.current.userName); + }; + const getData = async () => { if (query.id) { const { data } = await props["hiddenView"]({ id: query.id }); @@ -94,6 +103,9 @@ function Add(props) { // checkUserName: hiddenAcceptUserCO.userName, rectificationDescr: hiddenRectifyUserCO.descr, }); + if (data.isRelated === 1) { + getXgfProjectInfo(data.projectId); + } } else { userInfo.current = await getUserInfo(); @@ -116,11 +128,6 @@ function Add(props) { setXgfProjectList(data); }; - const getXgfProjectInfo = async (id) => { - const { data } = await props["xgfProjectInfo"]({ id }); - xgfProjectInfo.current = data; - }; - useEffect(() => { getData(); getConfirmUserList(); @@ -425,18 +432,14 @@ function Add(props) { labelKey: "projectName", }, componentProps: { - onChange: async (value) => { + onChange: (value) => { form.setFieldValue("projectName", getLabelName({ list: xgfProjectList, status: value, idKey: "id", nameKey: "projectName", })); - await getXgfProjectInfo(value); - form.setFieldValue("rectificationDeptId", xgfProjectInfo.current.corpinfoId); - form.setFieldValue("rectificationUserId", xgfProjectInfo.current.userId); - form.setFieldValue("rectificationDeptName", xgfProjectInfo.current.corpinfoName); - form.setFieldValue("rectificationUserName", xgfProjectInfo.current.userName); + getXgfProjectInfo(value); }, }, },