部分修改

src/pages/Container/Enterprise/CutWork/Homework/View/index.js

@@ -152,11 +152,11 @@ function View(props) {
               signTime={info?.info?.step_22?.signTime}
             />
             <OpinionSign
-              title="审核部门意见"
+              title="消防、安全管理部门意见"
               colSpan={4}
-              remarks={info?.info?.step_23?.remarks}
+              remarks={info?.info?.step_27?.remarks}
-              signPath={info?.info?.step_23?.signPath}
+              signPath={info?.info?.step_27?.signPath}
-              signTime={info?.info?.step_23?.signTime}
+              signTime={info?.info?.step_27?.signTime}
             />
             <OpinionSign
               title="审批部门意见"

src/pages/Container/Enterprise/DigWork/Homework/View/index.js

@@ -152,11 +152,11 @@ function View(props) {
               signTime={info?.info?.step_22?.signTime}
             />
             <OpinionSign
-              title="审核部门意见"
+              title="有关部门意见"
               colSpan={4}
-              remarks={info?.info?.step_23?.remarks}
+              remarks={info?.info?.step_26?.remarks}
-              signPath={info?.info?.step_23?.signPath}
+              signPath={info?.info?.step_26?.signPath}
-              signTime={info?.info?.step_23?.signTime}
+              signTime={info?.info?.step_26?.signTime}
             />
             <OpinionSign
               title="审批部门意见"

src/pages/Container/Enterprise/ElectricWork/Homework/View/index.js

@@ -1,7 +1,7 @@
 import { Connect } from "@cqsjjb/jjb-dva-runtime";
 import { Button, Divider, Image } from "antd";
 import dayjs from "dayjs";
-import { useEffect, useRef, useState } from "react";
+import { Fragment, useEffect, useRef, useState } from "react";
 import { useReactToPrint } from "react-to-print";
 import Page from "zy-react-library/components/Page";
 import useGetUrlQuery from "zy-react-library/hooks/useGetUrlQuery";
@@ -32,10 +32,17 @@ function View(props) {
   });
 
   const [info, setInfo] = useState({});
+  const [gasMonitoringRecord, setGasMonitoringRecord] = useState([]);
 
   const getData = async () => {
     const { data: basicInfo } = await props["eightworkInfo"]({ id: query.id });
     setInfo(basicInfo);
+    const { data: supplementaryInfo } = await props["eightworkSupplementaryInfo"]({
+      eqWorkId: query.workId,
+      pageSize: 999,
+      pageIndex: 1,
+    });
+    setGasMonitoringRecord(supplementaryInfo.filter(item => item.type === "gas"));
   };
 
   useEffect(() => {
@@ -132,6 +139,29 @@ function View(props) {
               <td className="title">实际作业开始时间</td>
               <td colSpan={3}>{info?.info?.workStartTime}</td>
             </tr>
+            <tr>
+              <td className="title center" colSpan={4}>可燃气体分析（运行的生产装置、罐区和具有火灾爆炸危险场所）</td>
+            </tr>
+            {
+              gasMonitoringRecord.length > 0
+                ? gasMonitoringRecord.map(item => (
+                    <Fragment key={item.id}>
+                      <tr>
+                        <td className="title">分析时间</td>
+                        <td>{item?.details?.analysisTime}</td>
+                        <td className="title">分析点</td>
+                        <td>{item?.details?.analysisPointName}</td>
+                      </tr>
+                      <tr>
+                        <td className="title">可燃气体检测结果</td>
+                        <td>{item?.details?.analysisResult}</td>
+                        <td className="title">分析人</td>
+                        <td>{item?.details?.analysisUserName}</td>
+                      </tr>
+                    </Fragment>
+                  ))
+                : <tr><td colSpan={4} className="center">暂无数据</td></tr>
+            }
             <SafetyMeasures colSpan={4} />
             <DisclaimerSign
               colSpan={2}
@@ -150,25 +180,18 @@ function View(props) {
               signTime={info?.info?.step_21?.signTime}
             />
             <OpinionSign
-              title="所在单位意见"
+              title="用电单位意见"
               colSpan={4}
-              remarks={info?.info?.step_22?.remarks}
+              remarks={info?.info?.step_28?.remarks}
-              signPath={info?.info?.step_22?.signPath}
+              signPath={info?.info?.step_28?.signPath}
-              signTime={info?.info?.step_22?.signTime}
+              signTime={info?.info?.step_28?.signTime}
             />
             <OpinionSign
-              title="审核部门意见"
+              title="配送电单位意见"
               colSpan={4}
-              remarks={info?.info?.step_23?.remarks}
+              remarks={info?.info?.step_29?.remarks}
-              signPath={info?.info?.step_23?.signPath}
+              signPath={info?.info?.step_29?.signPath}
-              signTime={info?.info?.step_23?.signTime}
+              signTime={info?.info?.step_29?.signTime}
-            />
-            <OpinionSign
-              title="审批部门意见"
-              colSpan={4}
-              remarks={info?.info?.step_24?.remarks}
-              signPath={info?.info?.step_24?.signPath}
-              signTime={info?.info?.step_24?.signTime}
             />
             <OpinionSign
               title="完工验收"