Merge branch 'dev' of https://gitea.anxinyun.cn/free-sun/Highways4Good into dev

web/client/src/sections/fillion/containers/maintenanceSpotCheck-new.js

@@ -199,7 +199,7 @@ const MaintenanceSpotCheck = (props) => {
                                  title: '操作',
                                  key: 'action',
                                  dataIndex: 'action',
-                                 render: (_, r, index) => <Button disabled={reportData[0]?.id == record?.id ? false : true} type="link" onClick={() => {
+                                 render: (_, r, index) => <Button disabled={(reportData[0]?.id == record?.id && !r.roadSpotCheckPreview?.roadSpotCheckChangeLogs?.some(s => s.changeRoadId == r.roadId)) ? false : true} type="link" onClick={() => {
                                     setEditData({
                                        ...r, alterId: r?.road?.level == '县' ? record?.countyRoadId
                                           : r?.road?.level == '乡' ? record?.townshipRoadId
@@ -291,7 +291,7 @@ const MaintenanceSpotCheck = (props) => {
                   setIsAdjustment(false)
                }}
                onOk={() => {
-                  detailData({ previewId: expandedRowKeys[0] })
+                  detailData({ previewId: expandedRowKeys[0], keyword: keyword })
                }}
             />
          }