From 44f571b9e0d2b2ac927d7165c9c8775d090f3718 Mon Sep 17 00:00:00 2001
From: liujiangyong <liu.jiangyong@free-sun.com.cn>
Date: Fri, 15 Dec 2023 11:15:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E6=8A=BD=E6=9F=A5?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=80=BB=E8=BE=91=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/app/lib/controllers/report/index.js                  | 9 +++++++--
 weapp/src/packages/maintenanceSpotCheck/index.jsx        | 4 ++--
 .../maintenanceSpotCheck/spotCheckRoadDetail/index.jsx   | 6 +++++-
 3 files changed, 14 insertions(+), 5 deletions(-)

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 => <View
+        {roadSpotList.length ? roadSpotList.map((item, index) => <View
           key={item.id}
           className='card'
-          onClick={() => navigateTo(`/packages/maintenanceSpotCheck/spotCheckRoadDetail/index?item=${encodeURIComponent(JSON.stringify(item))}`
+          onClick={() => navigateTo(`/packages/maintenanceSpotCheck/spotCheckRoadDetail/index?item=${encodeURIComponent(JSON.stringify(item))}&isOld=${index !== 0}`
           )}
         >
           <View className='item'>抽查县道比例（%）：{item.countyPercentage}</View>
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)
+            }
           >调整</AtButton>
         </View>
       </View>