diff --git a/api/app/lib/controllers/report/index.js b/api/app/lib/controllers/report/index.js index 8a4f5fc9..da07caf1 100644 --- a/api/app/lib/controllers/report/index.js +++ b/api/app/lib/controllers/report/index.js @@ -866,8 +866,13 @@ async function roadSpotDetail (ctx) { where: { ...(keyword ? { routeName: { $ilike: `%${keyword}%` } } : {}) }, - - + }, { + model: models.RoadSpotCheckPreview, + attributes: ['id'], + include: [{ + model: models.RoadSpotCheckChangeLog, + attributes: ['id', 'changeRoadId'], + }] }] }) diff --git a/weapp/src/packages/maintenanceSpotCheck/index.jsx b/weapp/src/packages/maintenanceSpotCheck/index.jsx index cac10c08..2b8ffe63 100644 --- a/weapp/src/packages/maintenanceSpotCheck/index.jsx +++ b/weapp/src/packages/maintenanceSpotCheck/index.jsx @@ -87,10 +87,10 @@ function Index() { enhanced pagingEnabled > - {roadSpotList.length ? roadSpotList.map(item => navigateTo(`/packages/maintenanceSpotCheck/spotCheckRoadDetail/index?item=${encodeURIComponent(JSON.stringify(item))}` + onClick={() => navigateTo(`/packages/maintenanceSpotCheck/spotCheckRoadDetail/index?item=${encodeURIComponent(JSON.stringify(item))}&isOld=${index !== 0}` )} > 抽查县道比例(%):{item.countyPercentage} diff --git a/weapp/src/packages/maintenanceSpotCheck/spotCheckRoadDetail/index.jsx b/weapp/src/packages/maintenanceSpotCheck/spotCheckRoadDetail/index.jsx index 71e050ab..c3831876 100644 --- a/weapp/src/packages/maintenanceSpotCheck/spotCheckRoadDetail/index.jsx +++ b/weapp/src/packages/maintenanceSpotCheck/spotCheckRoadDetail/index.jsx @@ -9,7 +9,7 @@ import { getRoadSpotDetail } from '@/services/api' import './index.scss' function Index() { - const { item } = useRouter().params + const { item, isOld } = useRouter().params const spotItem = item ? JSON.parse(decodeURIComponent(item)) : null const [keyword, setKeyword] = useState('') @@ -63,6 +63,10 @@ function Index() { type='primary' size='small' onClick={() => Taro.navigateTo({ url: `/packages/maintenanceSpotCheck/spotChange/index?detail=${encodeURIComponent(JSON.stringify(item))}&spot=${encodeURIComponent(JSON.stringify(spotItem))}` })} + disabled={ + isOld === 'true' || + item.roadSpotCheckPreview?.roadSpotCheckChangeLogs?.some(l => l.changeRoadId == item.roadId) + } >调整