巡检详情

pages/inspection/inspectionDetail/inspectionDetail.vue

@@ -39,6 +39,9 @@
 
         <view class="detail_head">
           <text class="title">执行信息</text>
+          <view class="other">
+            <view class="status" :style="{ color: dataInfo.inspectionTaskData.exception === 1 ? 'red' : '#49B856' }">{{dataInfo.inspectionTaskData.exception === 1 ? '异常' : '正常'}}</view>
+          </view>
         </view>
         <view class="detail_item_wrap">
           <view class="deital_item">
@@ -54,15 +57,17 @@
             <text class="value">{{formatDate(dataInfo.inspectionTaskData.completeTime, 'yyyy-MM-dd HH:mm')}}</text>
             <text class="value text_right">执行人：{{ dataInfo.inspectionTaskData.userDTO?.name || dataInfo.inspectionTaskData.groupDTO?.groupName }}</text>
           </view>
-          <view class="deital_item">
-            <text class="name">故障单号：</text>
-            <text class="value">{{dataInfo.inspectionTaskData.incidentDTO?.incidentsign}}</text>
-            <text class="value text_right">{{dataInfo.inspectionTaskData.incidentDTO?.state?.name}}</text>
-          </view>
-          <view class="deital_item">
-            <text class="name">处理人/组：</text>
-            <text class="value">{{dataInfo.inspectionTaskData.incidentDTO?.groupORHandlerUser}}</text>
-          </view>
+          <template v-if="dataInfo.inspectionTaskData.incidentDTO">
+            <view class="deital_item">
+              <text class="name">故障单号：</text>
+              <text class="value">{{dataInfo.inspectionTaskData.incidentDTO?.incidentsign}}</text>
+              <text class="value text_right">{{dataInfo.inspectionTaskData.incidentDTO?.state?.name}}</text>
+            </view>
+            <view class="deital_item">
+              <text class="name">处理人/组：</text>
+              <text class="value">{{dataInfo.inspectionTaskData.incidentDTO?.groupORHandlerUser}}</text>
+            </view>
+          </template>
         </view>
       </template>
 

pages/inspection/inspectionScanning/inspectionScanning.vue

@@ -7,7 +7,7 @@
       </view>
     </view>
     <view class="body" v-if="dataInfo.list.length">
-      <view class="body_item" v-for="data in dataInfo.list" :key="data.id">
+      <view class="body_item" v-for="data in dataInfo.list" :key="data.id" @click="toInspectionTaskDetail(data)">
         <view class="body_item_head ellipsis-multiline">
           <text class="sign" v-if="data.status.value == 2" :class="{signRed: data.exception == 1}">{{data.exception == 1 ? '异常' : '正常'}}</text>{{ data.inspectionDTO?.inspectionFormDTO?.name }}-{{ data.inspectionNodeDTO?.name }}-{{ data.batchNo }}
         </view>
@@ -98,6 +98,13 @@
     inspectionNodeName: '',
   })
   
+  // 详情
+  function toInspectionTaskDetail(data){
+    uni.navigateTo({
+      url: `/pages/inspection/inspectionDetail/inspectionDetail?inspectionTaskId=${data.id}`
+    })
+  }
+  
   // 获取故障来源列表
   function getSources(){
     let postData = {