seimin 6 日 前
コミット
92c4ddeb03
共有2 個のファイルを変更した22 個の追加10 個の削除を含む
  1. 14 9
      pages/inspection/inspectionDetail/inspectionDetail.vue
  2. 8 1
      pages/inspection/inspectionScanning/inspectionScanning.vue

+ 14 - 9
pages/inspection/inspectionDetail/inspectionDetail.vue

@@ -39,6 +39,9 @@
39 39
 
40 40
         <view class="detail_head">
41 41
           <text class="title">执行信息</text>
42
+          <view class="other">
43
+            <view class="status" :style="{ color: dataInfo.inspectionTaskData.exception === 1 ? 'red' : '#49B856' }">{{dataInfo.inspectionTaskData.exception === 1 ? '异常' : '正常'}}</view>
44
+          </view>
42 45
         </view>
43 46
         <view class="detail_item_wrap">
44 47
           <view class="deital_item">
@@ -54,15 +57,17 @@
54 57
             <text class="value">{{formatDate(dataInfo.inspectionTaskData.completeTime, 'yyyy-MM-dd HH:mm')}}</text>
55 58
             <text class="value text_right">执行人:{{ dataInfo.inspectionTaskData.userDTO?.name || dataInfo.inspectionTaskData.groupDTO?.groupName }}</text>
56 59
           </view>
57
-          <view class="deital_item">
58
-            <text class="name">故障单号:</text>
59
-            <text class="value">{{dataInfo.inspectionTaskData.incidentDTO?.incidentsign}}</text>
60
-            <text class="value text_right">{{dataInfo.inspectionTaskData.incidentDTO?.state?.name}}</text>
61
-          </view>
62
-          <view class="deital_item">
63
-            <text class="name">处理人/组:</text>
64
-            <text class="value">{{dataInfo.inspectionTaskData.incidentDTO?.groupORHandlerUser}}</text>
65
-          </view>
60
+          <template v-if="dataInfo.inspectionTaskData.incidentDTO">
61
+            <view class="deital_item">
62
+              <text class="name">故障单号:</text>
63
+              <text class="value">{{dataInfo.inspectionTaskData.incidentDTO?.incidentsign}}</text>
64
+              <text class="value text_right">{{dataInfo.inspectionTaskData.incidentDTO?.state?.name}}</text>
65
+            </view>
66
+            <view class="deital_item">
67
+              <text class="name">处理人/组:</text>
68
+              <text class="value">{{dataInfo.inspectionTaskData.incidentDTO?.groupORHandlerUser}}</text>
69
+            </view>
70
+          </template>
66 71
         </view>
67 72
       </template>
68 73
 

+ 8 - 1
pages/inspection/inspectionScanning/inspectionScanning.vue

@@ -7,7 +7,7 @@
7 7
       </view>
8 8
     </view>
9 9
     <view class="body" v-if="dataInfo.list.length">
10
-      <view class="body_item" v-for="data in dataInfo.list" :key="data.id">
10
+      <view class="body_item" v-for="data in dataInfo.list" :key="data.id" @click="toInspectionTaskDetail(data)">
11 11
         <view class="body_item_head ellipsis-multiline">
12 12
           <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 }}
13 13
         </view>
@@ -98,6 +98,13 @@
98 98
     inspectionNodeName: '',
99 99
   })
100 100
   
101
+  // 详情
102
+  function toInspectionTaskDetail(data){
103
+    uni.navigateTo({
104
+      url: `/pages/inspection/inspectionDetail/inspectionDetail?inspectionTaskId=${data.id}`
105
+    })
106
+  }
107
+  
101 108
   // 获取故障来源列表
102 109
   function getSources(){
103 110
     let postData = {