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

bug修复

master
LiuJiaNan 2026-01-07 10:41:12 +08:00
parent e91eabcd55
commit 71971d3174
3 changed files with 98 additions and 104 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-dom": "^18.2.0",
"react-to-print": "^3.2.0",
"zy-react-library": "^1.1.15"
"zy-react-library": "^1.1.23"
},
"devDependencies": {
"@antfu/eslint-config": "^5.4.1",

60
src/pages/Container/BranchCompany/Inspection/Inspection/Add/components/HiddenAdd/index.js
View File

@ -45,35 +45,6 @@ function HiddenAddModal(props) {
onFinish={onSubmit}
options={[
{ name: "hiddenDesc", label: "隐患描述", render: FORM_ITEM_RENDER_ENUM.TEXTAREA, span: 24 },
{
name: "hiddenPart",
customizeRender: true,
render: (
<Form.Item label="隐患部位" required labelCol={{ span: 4 }} wrapperCol={{ span: 20 }}>
<div style={{ display: "flex", gap: 10 }}>
<Form.Item name="hiddenPart" noStyle rules={[{ required: true, message: "请选择隐患部位" }]}>
{
hiddenPartType === "select"
? <HiddenPartSelectTree />
: <Input placeholder="请输入隐患部位" />
}
</Form.Item>
<Button
type="primary"
onClick={() => {
if (hiddenPartType === "select")
setHiddenPartType("input");
if (hiddenPartType === "input")
setHiddenPartType("select");
form.setFieldValue("hiddenPart", "");
}}
>
{hiddenPartType === "select" ? "输入" : "选择"}
</Button>
</div>
</Form.Item>
),
},
{
name: "hiddenLevel",
label: "隐患级别",
@ -105,8 +76,37 @@ function HiddenAddModal(props) {
{ name: "hiddenTypeName", label: "隐患类型名称", onlyForLabel: true },
{ name: "hiddenType2", label: "隐患类型名称", onlyForLabel: true },
{ name: "hiddenType2Name", label: "隐患类型名称", onlyForLabel: true },
{ name: "map", customizeRender: true, render: <Map required={false} />, span: 24 },
{
name: "hiddenPart",
customizeRender: true,
render: (
<Form.Item label="隐患部位" labelCol={{ span: 4 }} wrapperCol={{ span: 20 }}>
<div style={{ display: "flex", gap: 10 }}>
<Form.Item name="hiddenPart" noStyle>
{
hiddenPartType === "select"
? <HiddenPartSelectTree />
: <Input placeholder="请输入隐患部位" />
}
</Form.Item>
<Button
type="primary"
onClick={() => {
if (hiddenPartType === "select")
setHiddenPartType("input");
if (hiddenPartType === "input")
setHiddenPartType("select");
form.setFieldValue("hiddenPart", "");
}}
>
{hiddenPartType === "select" ? "输入" : "选择"}
</Button>
</div>
</Form.Item>
),
},
{ name: "positionDesc", label: "隐患位置描述", required: false, span: 24 },
{ name: "map", customizeRender: true, render: <Map required={false} />, span: 24 },
{
name: "hiddenImageFiles",
label: "隐患图片",

62
src/pages/Container/BranchCompany/Plan/Management/List/index.js
View File

@ -22,10 +22,14 @@ function List(props) {
const query = useGetUrlQuery();
const [form] = Form.useForm();
const defaultParams = {};
if (query.corpId) defaultParams.corpId = query.corpId;
if (query.startTime) defaultParams.startTime = query.startTime;
if (query.endTime) defaultParams.endTime = query.endTime;
if (query.completedOnly) defaultParams.completedOnly = query.completedOnly;
if (query.corpId)
defaultParams.corpId = query.corpId;
if (query.startTime)
defaultParams.startTime = query.startTime;
if (query.endTime)
defaultParams.endTime = query.endTime;
if (query.completedOnly)
defaultParams.completedOnly = query.completedOnly;
const { tableProps, getData } = useTable(props["planList"], {
form,
params: { ...defaultParams },
@ -126,12 +130,15 @@ function List(props) {
if (planExecuteTotal === userExecuteNum && planExecuteTotal > 0) {
statusText = "已完成";
} else if (currentTime.isBefore(planStartTime, "day")) {
}
else if (currentTime.isBefore(planStartTime, "day")) {
statusText = "未开始";
} else if ((currentTime.isAfter(planStartTime, "day") || currentTime.isSame(planStartTime, "day"))
}
else if ((currentTime.isAfter(planStartTime, "day") || currentTime.isSame(planStartTime, "day"))
&& (currentTime.isBefore(planEndTime, "day") || currentTime.isSame(planEndTime, "day"))) {
statusText = "执行中";
} else if (currentTime.isAfter(planEndTime, "day")) {
}
else if (currentTime.isAfter(planEndTime, "day")) {
statusText = "已过期";
}
@ -320,7 +327,7 @@ const AddModalComponent = (props) => {
list: corpInfoList,
status: event,
idKey: "id",
nameKey: "corpName"
nameKey: "corpName",
}));
form.setFieldValue("userId", []);
form.setFieldValue("userName", []);
@ -335,14 +342,18 @@ const AddModalComponent = (props) => {
{
name: "userId",
label: "计划执行人员",
render: (() => {
const commonProps = {
mode: "multiple",
labelRender: item => `${item.name}（${[item.departmentName, item.postName].filter(Boolean).join("-")}）`,
onGetLabel: (label) => {
render: (
<PersonnelSelect
params={{ corpinfoId: props.supervision === "1" ? corpId : userInfo.corpinfoId }}
isNeedCorpInfoId={true}
isNeedDepartmentId={false}
extraParams={{ noMain: 1 }}
mode="multiple"
labelRender={item => `${item.name}（${[item.departmentName, item.postName].filter(Boolean).join("-")}）`}
onGetLabel={(label) => {
form.setFieldValue("userName", label);
},
onGetOption: (option) => {
}}
onGetOption={(option) => {
const departmentId = [];
const departmentName = [];
const postId = [];
@ -357,26 +368,9 @@ const AddModalComponent = (props) => {
form.setFieldValue("departmentName", departmentName);
form.setFieldValue("postId", postId);
form.setFieldValue("postName", postName);
},
};
return props.supervision === "1"
? (
<PersonnelSelect
params={{corpinfoId: corpId}}
isNeedCorpInfoId={true}
isNeedDepartmentId={false}
extraParams={{noMain: 1}}
{...commonProps}
}}
/>
)
: (
<PersonnelSelect
params={{departmentId: userInfo.departmentId}}
extraParams={{noMain: 1}}
{...commonProps}
/>
);
})(),
),
},
{ name: "userName", label: "计划执行人员名称", onlyForLabel: true },
{ name: "departmentId", label: "计划执行人员部门", onlyForLabel: true },