zcloud_gbs
/
zcloud_gbs_hidden-react
14
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

内测bug修复：隐患打回之后重新获取一下相关方的负责人，隐患确认验收人显示不正确

master
LiuJiaNan 2026-03-17 16:31:36 +08:00
parent 64cf00eccf
commit 82595a5c03
4 changed files with 122 additions and 115 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -32,7 +32,7 @@
"react": "^18.2.0", "react": "^18.2.0",
"react-dom": "^18.2.0", "react-dom": "^18.2.0",
"react-to-print": "^3.2.0", "react-to-print": "^3.2.0",
"zy-react-library": "^1.1.28" "zy-react-library": "^1.2.6"
}, },
"devDependencies": { "devDependencies": {
"@antfu/eslint-config": "^5.4.1", "@antfu/eslint-config": "^5.4.1",

5
src/main.js
View File

@ -2,19 +2,22 @@ import { setJJBCommonAntdMessage } from "@cqsjjb/jjb-common-lib";
import { setup } from "@cqsjjb/jjb-dva-runtime"; import { setup } from "@cqsjjb/jjb-dva-runtime";
import { message } from "antd"; import { message } from "antd";
import dayjs from "dayjs"; import dayjs from "dayjs";
import { getFileUrlFromServer } from "zy-react-library/utils";
import "dayjs/locale/zh-cn"; import "dayjs/locale/zh-cn";
import "../blessed_by_buddha"; import "../blessed_by_buddha";
require("antd/dist/reset.css"); require("antd/dist/reset.css");
require("zy-react-library/css/common.less"); require("zy-react-library/css/common.less");
window.mapLongitude = "119.69457721306945"; window.mapLongitude = "119.69457721306945";
window.mapLatitude = "39.940504336846665"; window.mapLatitude = "39.940504336846665";
window.mapBaiDuKey = "OElqFYoKiAH8KFtph8ftLKF5NlNrbCUr";
dayjs.locale("zh-cn"); dayjs.locale("zh-cn");
setJJBCommonAntdMessage(message); setJJBCommonAntdMessage(message);
const app = setup(); const app = setup();
getFileUrlFromServer();
// 非底座环境运行 // 非底座环境运行
if (!window.__POWERED_BY_QIANKUN__) { if (!window.__POWERED_BY_QIANKUN__) {
// 云组件默认依赖 // 云组件默认依赖

205
src/pages/Container/BranchCompany/Average/Confirm/Review/index.js
View File

@ -1,14 +1,14 @@
import {Connect} from "@cqsjjb/jjb-dva-runtime"; import { Connect } from "@cqsjjb/jjb-dva-runtime";
import {Button, Divider, Form, message, Modal} from "antd"; import { Button, Divider, Form, message, Modal } from "antd";
import {useRef, useState} from "react"; import { useRef, useState } from "react";
import FormBuilder from "zy-react-library/components/FormBuilder"; import FormBuilder from "zy-react-library/components/FormBuilder";
import HiddenInfo from "zy-react-library/components/HiddenInfo/gwj"; import HiddenInfo from "zy-react-library/components/HiddenInfo/gwj";
import Page from "zy-react-library/components/Page"; import Page from "zy-react-library/components/Page";
import PersonnelSelect from "zy-react-library/components/Select/Personnel/Gwj"; import PersonnelSelect from "zy-react-library/components/Select/Personnel/Gwj";
import DepartmentSelectTree from "zy-react-library/components/SelectTree/Department/Gwj"; import DepartmentSelectTree from "zy-react-library/components/SelectTree/Department/Gwj";
import HiddenLevelSelectTree from "zy-react-library/components/SelectTree/HiddenLevel/Gwj"; import HiddenLevelSelectTree from "zy-react-library/components/SelectTree/HiddenLevel/Gwj";
import {FORM_ITEM_RENDER_ENUM} from "zy-react-library/enum/formItemRender"; import { FORM_ITEM_RENDER_ENUM } from "zy-react-library/enum/formItemRender";
import {NS_CONFIRM, NS_LEDGER} from "~/enumerate/namespace"; import { NS_CONFIRM, NS_LEDGER } from "~/enumerate/namespace";
function Confirm(props) { function Confirm(props) {
const [form] = Form.useForm(); const [form] = Form.useForm();
@ -24,7 +24,7 @@ function Confirm(props) {
const xgfProjectInfo = useRef({}); const xgfProjectInfo = useRef({});
const getXgfProjectInfo = async (id) => { const getXgfProjectInfo = async (id) => {
const {data} = await props["xgfProjectInfo"]({id}); const { data } = await props["xgfProjectInfo"]({ id });
xgfProjectInfo.current = data; xgfProjectInfo.current = data;
}; };
@ -33,55 +33,56 @@ function Confirm(props) {
...( ...(
data.isRelated === 0 data.isRelated === 0
? [ ? [
{ {
name: "deptId", name: "deptId",
label: "整改部门", label: "整改部门",
render: ( render: (
<DepartmentSelectTree <DepartmentSelectTree
onChange={() => { onChange={() => {
form.setFieldValue("userId", ""); form.setFieldValue("userId", "");
form.setFieldValue("userName", ""); form.setFieldValue("userName", "");
}} }}
onGetLabel={(label) => { onGetLabel={(label) => {
form.setFieldValue("deptName", label); form.setFieldValue("deptName", label);
}} }}
/> />
), ),
}, },
{name: "deptName", label: "整改部门名称", onlyForLabel: true}, { name: "deptName", label: "整改部门名称", onlyForLabel: true },
{ {
name: "userId", name: "userId",
label: "整改人", label: "整改人",
render: ( render: (
<PersonnelSelect <PersonnelSelect
params={{departmentId: deptId}} params={{ departmentId: deptId }}
onGetLabel={label => form.setFieldValue("userName", label)} onGetLabel={label => form.setFieldValue("userName", label)}
/> />
), ),
}, },
{name: "userName", label: "整改人名称", onlyForLabel: true}, { name: "userName", label: "整改人名称", onlyForLabel: true },
] ]
: [ : [
{name: "deptName", label: "整改单位", componentProps: {disabled: true}}, { name: "deptName", label: "整改单位", componentProps: { disabled: true } },
{name: "deptId", label: "整改单位id", onlyForLabel: true}, { name: "deptId", label: "整改单位id", onlyForLabel: true },
{name: "userName", label: "整改人", componentProps: {disabled: true}}, { name: "userName", label: "整改人", componentProps: { disabled: true } },
{name: "userId", label: "整改人id", onlyForLabel: true}, { name: "userId", label: "整改人id", onlyForLabel: true },
] ]
), ),
]; ];
if (hiddenLevel !== "hiddenLevel1001") { if (hiddenLevel !== "hiddenLevel1001") {
if (data.rectificationType === 2) { if (data.rectificationType === 2) {
return [ return [
...commonDeptUserFields, ...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 [ return [
{ {
name: "rectificationType", name: "rectificationType",
label: "是否立即整改", label: "是否立即整改",
render: FORM_ITEM_RENDER_ENUM.RADIO, render: FORM_ITEM_RENDER_ENUM.RADIO,
items: [{bianma: 1, name: "是"}, {bianma: 2, name: "否"}], items: [{ bianma: 1, name: "是" }, { bianma: 2, name: "否" }],
span: 24, span: 24,
}, },
...commonDeptUserFields, ...commonDeptUserFields,
@ -101,8 +102,8 @@ function Confirm(props) {
hidden: formValues => !(formValues.rectificationType === 1), hidden: formValues => !(formValues.rectificationType === 1),
render: ( render: (
<DepartmentSelectTree <DepartmentSelectTree
isNeedCorpInfoId={data.isRelated === 1} // isNeedCorpInfoId={data.isRelated === 1}
params={{eqCorpinfoId: data.isRelated === 1 ? data.hiddenFindDept : ""}} // params={{ eqCorpinfoId: data.isRelated === 1 ? data.hiddenFindDept : "" }}
onChange={() => { onChange={() => {
form.setFieldValue("checkUserId", ""); form.setFieldValue("checkUserId", "");
form.setFieldValue("checkUserName", ""); form.setFieldValue("checkUserName", "");
@ -113,7 +114,7 @@ function Confirm(props) {
/> />
), ),
}, },
{name: "checkDeptName", label: "验收部门名称", onlyForLabel: true}, { name: "checkDeptName", label: "验收部门名称", onlyForLabel: true },
{ {
name: "checkUserId", name: "checkUserId",
label: "验收人", label: "验收人",
@ -122,12 +123,12 @@ function Confirm(props) {
hidden: formValues => !(formValues.rectificationType === 1), hidden: formValues => !(formValues.rectificationType === 1),
render: ( render: (
<PersonnelSelect <PersonnelSelect
params={{departmentId: checkDeptId}} params={{ departmentId: checkDeptId }}
onGetLabel={label => form.setFieldValue("checkUserName", label)} onGetLabel={label => form.setFieldValue("checkUserName", label)}
/> />
), ),
}, },
{name: "checkUserName", label: "验收人名称", onlyForLabel: true}, { name: "checkUserName", label: "验收人名称", onlyForLabel: true },
]; ];
} }
} }
@ -139,7 +140,7 @@ function Confirm(props) {
title: "提示", title: "提示",
content: "是否确认隐患？", content: "是否确认隐患？",
onOk: async () => { onOk: async () => {
const {success} = await props["confirmSubmit"]({ const { success } = await props["confirmSubmit"]({
status: "1", status: "1",
rectificationType: data.rectificationType, rectificationType: data.rectificationType,
...values, ...values,
@ -168,10 +169,10 @@ function Confirm(props) {
form.setFieldValue("deptName", hiddenUserPresetsCO.rectifyDeptName || data.hiddenFindDeptName); form.setFieldValue("deptName", hiddenUserPresetsCO.rectifyDeptName || data.hiddenFindDeptName);
form.setFieldValue("userId", hiddenUserPresetsCO.rectifyUserId || data.creatorId); form.setFieldValue("userId", hiddenUserPresetsCO.rectifyUserId || data.creatorId);
form.setFieldValue("userName", hiddenUserPresetsCO.rectifyUserName || data.creatorName); form.setFieldValue("userName", hiddenUserPresetsCO.rectifyUserName || data.creatorName);
form.setFieldValue("checkDeptId", hiddenUserPresetsCO.rectifyDeptId || data.hiddenFindDept); form.setFieldValue("checkDeptId", hiddenUserPresetsCO.checkDeptId || data.hiddenFindDept);
form.setFieldValue("checkDeptName", hiddenUserPresetsCO.rectifyDeptName || data.hiddenFindDeptName); form.setFieldValue("checkDeptName", hiddenUserPresetsCO.checkDeptName || data.hiddenFindDeptName);
form.setFieldValue("checkUserId", hiddenUserPresetsCO.rectifyUserId || data.creatorId); form.setFieldValue("checkUserId", hiddenUserPresetsCO.checkUserId || data.creatorId);
form.setFieldValue("checkUserName", hiddenUserPresetsCO.rectifyUserName || data.creatorName); form.setFieldValue("checkUserName", hiddenUserPresetsCO.checkUserName || data.creatorName);
} }
}} }}
/> />
@ -180,57 +181,57 @@ function Confirm(props) {
{ {
Object.keys(data).length > 0 Object.keys(data).length > 0
? ( ? (
<FormBuilder <FormBuilder
form={form} form={form}
loading={props.confirm.confirmLoading} loading={props.confirm.confirmLoading}
showCancelButton={false} showCancelButton={false}
submitButtonText="通过" submitButtonText="通过"
onFinish={onSubmit} onFinish={onSubmit}
extraActionButtons={[ extraActionButtons={[
!isFromInspection && !isFromInspection
<Button key="reject" type="primary" danger onClick={() => setRejectModalOpen(true)}>打回</Button>, && <Button key="reject" type="primary" danger onClick={() => setRejectModalOpen(true)}>打回</Button>,
]} ]}
values={{ values={{
rectificationType: 1, rectificationType: 1,
}} }}
options={[ options={[
...(!isFromInspection ...(!isFromInspection
? [ ? [
{ {
name: "hiddenLevel", name: "hiddenLevel",
label: "隐患级别", label: "隐患级别",
span: 24, span: 24,
render: ( render: (
<HiddenLevelSelectTree <HiddenLevelSelectTree
isShowMajor={false} isShowMajor={false}
isShowLarger={false} isShowLarger={false}
isShowNeglect={data.rectificationType === 2} isShowNeglect={data.rectificationType === 2}
onChange={(event) => { onChange={(event) => {
if (event === "hiddenLevel1001") { if (event === "hiddenLevel1001") {
form.setFieldValue("deptName", ""); form.setFieldValue("deptName", "");
form.setFieldValue("userName", ""); form.setFieldValue("userName", "");
form.setFieldValue("checkDeptName", ""); form.setFieldValue("checkDeptName", "");
form.setFieldValue("checkUserName", ""); form.setFieldValue("checkUserName", "");
} }
}} }}
onGetLabel={(label) => { onGetLabel={(label) => {
form.setFieldValue("hiddenLevelName", label); form.setFieldValue("hiddenLevelName", label);
}} }}
/> />
), ),
}, },
] ]
: []), : []),
{name: "hiddenLevelName", label: "隐患级别名称", onlyForLabel: true}, { name: "hiddenLevelName", label: "隐患级别名称", onlyForLabel: true },
...decideOption(), ...decideOption(),
]} ]}
/> />
) )
: null : null
} }
</div> </div>
</Page> </Page>
{rejectModalOpen && <RejectModal onCancel={() => setRejectModalOpen(false)} data={data}/>} {rejectModalOpen && <RejectModal onCancel={() => setRejectModalOpen(false)} data={data} />}
</div> </div>
); );
} }
@ -238,7 +239,7 @@ function Confirm(props) {
const RejectModalComponent = (props) => { const RejectModalComponent = (props) => {
const [form] = Form.useForm(); const [form] = Form.useForm();
const onSubmit = async (values) => { const onSubmit = async (values) => {
const {success} = await props["confirmSubmit"]({ const { success } = await props["confirmSubmit"]({
status: "0", status: "0",
...values, ...values,
id: props.data.id, id: props.data.id,
@ -268,9 +269,9 @@ const RejectModalComponent = (props) => {
onFinish={onSubmit} onFinish={onSubmit}
showActionButtons={false} showActionButtons={false}
span={24} span={24}
labelCol={{span: 6}} labelCol={{ span: 6 }}
options={[ options={[
{name: "repulseCause", label: "意见", render: FORM_ITEM_RENDER_ENUM.TEXTAREA}, { name: "repulseCause", label: "意见", render: FORM_ITEM_RENDER_ENUM.TEXTAREA },
]} ]}
/> />
</Modal> </Modal>

25
src/pages/Container/BranchCompany/Average/Ledger/Add/index.js
View File

@ -60,6 +60,15 @@ function Add(props) {
const { loading: uploadFileLoading, uploadFile } = useUploadFile(); const { loading: uploadFileLoading, uploadFile } = useUploadFile();
const { loading: getFileLoading, getFile } = useGetFile(); 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 () => { const getData = async () => {
if (query.id) { if (query.id) {
const { data } = await props["hiddenView"]({ id: query.id }); const { data } = await props["hiddenView"]({ id: query.id });
@ -94,6 +103,9 @@ function Add(props) {
// checkUserName: hiddenAcceptUserCO.userName, // checkUserName: hiddenAcceptUserCO.userName,
rectificationDescr: hiddenRectifyUserCO.descr, rectificationDescr: hiddenRectifyUserCO.descr,
}); });
if (data.isRelated === 1) {
getXgfProjectInfo(data.projectId);
}
} }
else { else {
userInfo.current = await getUserInfo(); userInfo.current = await getUserInfo();
@ -116,11 +128,6 @@ function Add(props) {
setXgfProjectList(data); setXgfProjectList(data);
}; };
const getXgfProjectInfo = async (id) => {
const { data } = await props["xgfProjectInfo"]({ id });
xgfProjectInfo.current = data;
};
useEffect(() => { useEffect(() => {
getData(); getData();
getConfirmUserList(); getConfirmUserList();
@ -425,18 +432,14 @@ function Add(props) {
labelKey: "projectName", labelKey: "projectName",
}, },
componentProps: { componentProps: {
onChange: async (value) => { onChange: (value) => {
form.setFieldValue("projectName", getLabelName({ form.setFieldValue("projectName", getLabelName({
list: xgfProjectList, list: xgfProjectList,
status: value, status: value,
idKey: "id", idKey: "id",
nameKey: "projectName", nameKey: "projectName",
})); }));
await getXgfProjectInfo(value); 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);
}, },
}, },
}, },