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

bug：13787、13786、13785、13783、13771、13768、13761、13759、13756、13754、13229

master
LiuJiaNan 2026-01-16 11:01:07 +08:00
parent 9376421e73
commit 43241ad17c
7 changed files with 14 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

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

7
src/pages/Container/BranchCompany/Average/Ignore/List/index.js
View File

@ -6,7 +6,6 @@ import Page from "zy-react-library/components/Page";
import Search from "zy-react-library/components/Search";
import DepartmentSelectTree from "zy-react-library/components/SelectTree/Department/Gwj";
import DictionarySelectTree from "zy-react-library/components/SelectTree/Dictionary";
import HiddenPartSelectTree from "zy-react-library/components/SelectTree/HiddenPart/Gwj";
import Table from "zy-react-library/components/Table";
import { FORM_ITEM_RENDER_ENUM } from "zy-react-library/enum/formItemRender";
import { HIDDEN_SOURCE_ENUM } from "zy-react-library/enum/hidden/gwj";
@ -38,11 +37,6 @@ function List(props) {
label: "隐患类型",
render: <DictionarySelectTree dictValue="hiddenType" onlyLastLevel />,
},
{
name: "hiddenPart",
label: "隐患部位",
render: <HiddenPartSelectTree />,
},
{ name: "creatorName", label: "隐患发现人" },
{ name: "confirmUserName", label: "确认人" },
{
@ -64,7 +58,6 @@ function List(props) {
},
{ title: "隐患描述", dataIndex: "hiddenDesc" },
{ title: "隐患类型", dataIndex: "hiddenTypeName" },
{ title: "隐患部位", dataIndex: "hiddenPartName" },
{ title: "隐患发现部门", dataIndex: "hiddenFindDeptName" },
{ title: "隐患发现人", dataIndex: "createName", width: 130 },
{

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

@ -277,7 +277,7 @@ function Add(props) {
form.setFieldValue("creatorName", userInfo.current.name);
}
else {
if (getUnprocessedImagesCount() > 0 && form.getFieldValue("isAi") === 1) {
if (getUnprocessedImagesCount() > 0 && form.getFieldValue("isAi") === 1 && !query.id) {
Modal.confirm({
title: "温馨提示",
content: "当前有未处理完的隐患图片，是否继续处理",

7
src/pages/Container/BranchCompany/Average/Postponement/List/index.js
View File

@ -7,7 +7,6 @@ import Search from "zy-react-library/components/Search";
import DepartmentSelectTree from "zy-react-library/components/SelectTree/Department/Gwj";
import DictionarySelectTree from "zy-react-library/components/SelectTree/Dictionary";
import HiddenLevelSelectTree from "zy-react-library/components/SelectTree/HiddenLevel/Gwj";
import HiddenPartSelectTree from "zy-react-library/components/SelectTree/HiddenPart/Gwj";
import Table from "zy-react-library/components/Table";
import { FORM_ITEM_RENDER_ENUM } from "zy-react-library/enum/formItemRender";
import { HIDDEN_RECTIFICATION_TYPE_ENUM, HIDDEN_SOURCE_ENUM, HIDDEN_STATE_ENUM } from "zy-react-library/enum/hidden/gwj";
@ -40,11 +39,6 @@ function List(props) {
label: "隐患类型",
render: <DictionarySelectTree dictValue="hiddenType" onlyLastLevel />,
},
{
name: "hiddenPart",
label: "隐患部位",
render: <HiddenPartSelectTree />,
},
{
name: "hiddenLevel",
label: "隐患级别",
@ -74,7 +68,6 @@ function List(props) {
{ title: "隐患描述", dataIndex: "hiddenDesc" },
{ title: "隐患级别", dataIndex: "hiddenLevelName", width: 100 },
{ title: "隐患类型", dataIndex: "hiddenTypeName" },
{ title: "隐患部位", dataIndex: "hiddenPartName" },
{ title: "隐患发现部门", dataIndex: "hiddenFindDeptName" },
{ title: "隐患发现人", dataIndex: "createName", width: 130 },
{

9
src/pages/Container/BranchCompany/Average/Rectification/List/index.js
View File

@ -9,7 +9,6 @@ import Search from "zy-react-library/components/Search";
import DepartmentSelectTree from "zy-react-library/components/SelectTree/Department/Gwj";
import DictionarySelectTree from "zy-react-library/components/SelectTree/Dictionary";
import HiddenLevelSelectTree from "zy-react-library/components/SelectTree/HiddenLevel/Gwj";
import HiddenPartSelectTree from "zy-react-library/components/SelectTree/HiddenPart/Gwj";
import Table from "zy-react-library/components/Table";
import Upload from "zy-react-library/components/Upload";
import { FORM_ITEM_RENDER_ENUM } from "zy-react-library/enum/formItemRender";
@ -47,11 +46,6 @@ function List(props) {
label: "隐患类型",
render: <DictionarySelectTree dictValue="hiddenType" onlyLastLevel />,
},
{
name: "hiddenPart",
label: "隐患部位",
render: <HiddenPartSelectTree />,
},
{
name: "hiddenLevel",
label: "隐患级别",
@ -81,7 +75,6 @@ function List(props) {
{ title: "隐患描述", dataIndex: "hiddenDesc" },
{ title: "隐患级别", dataIndex: "hiddenLevelName", width: 100 },
{ title: "隐患类型", dataIndex: "hiddenTypeName" },
{ title: "隐患部位", dataIndex: "hiddenPartName" },
{ title: "隐患发现部门", dataIndex: "hiddenFindDeptName" },
{ title: "隐患发现人", dataIndex: "createName", width: 130 },
{
@ -139,7 +132,7 @@ function List(props) {
临时安全措施
</Button>
)}
{props.permission("fgs-yqzg-sqyq") && !!record.noReviewExtensionNum &&(
{props.permission("fgs-yqzg-sqyq") && !record.noReviewExtensionNum && (
<Button
type="link"
onClick={() => {

17
src/pages/Container/BranchCompany/Average/Rectification/Review/index.js
View File

@ -173,13 +173,18 @@ function Rectification(props) {
span: 12,
rules: [{
validator: (_, value) => {
// 获取已存在的用户名
const confirmUserName = data.hiddenConfirmUserCO?.[0]?.rectifyUserId;
const presetUserName = data?.hiddenUserPresetsCO?.rectifyUserId;
const confirmUser = data.hiddenConfirmUserCO?.at(-1)?.rectifyUserId;
const presetUser = data?.hiddenUserPresetsCO?.rectifyUserId;
// 验证是否与已有用户名相同
if (value && (value === confirmUserName || value === presetUserName)) {
return Promise.reject(new Error("验收人不能与整改人相同"));
if (confirmUser) {
if (value && (value === confirmUser)) {
return Promise.reject(new Error("验收人不能与整改人相同"));
}
}
else {
if (value && (value === presetUser)) {
return Promise.reject(new Error("验收人不能与整改人相同"));
}
}
return Promise.resolve();

7
src/pages/Container/BranchCompany/Average/SpecialDisposal/List/index.js
View File

@ -7,7 +7,6 @@ import Search from "zy-react-library/components/Search";
import DepartmentSelectTree from "zy-react-library/components/SelectTree/Department/Gwj";
import DictionarySelectTree from "zy-react-library/components/SelectTree/Dictionary";
import HiddenLevelSelectTree from "zy-react-library/components/SelectTree/HiddenLevel/Gwj";
import HiddenPartSelectTree from "zy-react-library/components/SelectTree/HiddenPart/Gwj";
import Table from "zy-react-library/components/Table";
import { FORM_ITEM_RENDER_ENUM } from "zy-react-library/enum/formItemRender";
import { HIDDEN_RECTIFICATION_TYPE_ENUM, HIDDEN_SOURCE_ENUM } from "zy-react-library/enum/hidden/gwj";
@ -40,11 +39,6 @@ function List(props) {
label: "隐患类型",
render: <DictionarySelectTree dictValue="hiddenType" onlyLastLevel />,
},
{
name: "hiddenPart",
label: "隐患部位",
render: <HiddenPartSelectTree />,
},
{
name: "hiddenLevel",
label: "隐患级别",
@ -74,7 +68,6 @@ function List(props) {
{ title: "隐患描述", dataIndex: "hiddenDesc" },
{ title: "隐患级别", dataIndex: "hiddenLevelName", width: 100 },
{ title: "隐患类型", dataIndex: "hiddenTypeName" },
{ title: "隐患部位", dataIndex: "hiddenPartName" },
{ title: "隐患发现部门", dataIndex: "hiddenFindDeptName" },
{ title: "隐患发现人", dataIndex: "createName", width: 130 },
{