暂提

pages/inspection/inspectionExecute/inspectionExecute.vue

@@ -11,7 +11,7 @@
     <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_head ellipsis-multiline">
-          {{ data.inspectionDTO?.inspectionFormDTO?.name }}-{{ data.inspectionNodeDTO?.name }}-{{ data.batchNo }}
+          <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>
 
         <view class="body_item_content">
@@ -33,6 +33,7 @@
         <view class="body_item_foot">
           <view class="btns pt0">
             <button v-if="data.status.value === '1'" @click.stop="toInspectionValue(data)" type="default" class="primaryButton btn">执行</button>
+            <button v-if="data.status.value === '2' && data.exception == 1 && !data.incidentId" @click.stop="toBuildIncident(data)" type="default" class="primaryButton btn">生成维修单</button>
           </view>
         </view>
       </view>
@@ -67,6 +68,7 @@
   import { useInspectionListSearchStore } from '@/stores/inspectionListSearch'
   import { useInspectionValueStore } from '@/stores/inspectionValue'
   import { useSetTabbar } from '@/share/useSetTabbar.js'
+  import { useIncidentBuildStore } from '@/stores/incidentBuild'
 
   useSetTitle();
   const loginUserStore = useLoginUserStore();
@@ -79,6 +81,7 @@
   const { currentLogOverTime }  = computedCurrentLogOverTime();
   const { makePhoneCall }  = useMakePhoneCall();
   const { setTabbar }  = useSetTabbar();
+  const incidentBuildStore = useIncidentBuildStore();
 
   // 主题颜色
   const primaryColor = ref(defaultColor)
@@ -162,6 +165,14 @@
       uni.hideLoading();
     });
   }
+  
+  // 新建事件
+  function toBuildIncident(data){
+  	incidentBuildStore.clearIncidentBuildData();
+    uni.navigateTo({
+      url: '/pages/buildIncident/buildIncident'
+    })
+  }
 
   // 巡检项
   function toInspectionValue(data){
@@ -431,6 +442,14 @@ page{
         text-align: left;
         margin: 24rpx;
         font-size: 30rpx;
+        .sign{
+          margin-right: 16rpx;
+          font-weight: bold;
+          color: #49B856;
+          &.signRed{
+            color: #FF0000;
+          }
+        }
       }
       .body_item_content{
         border-top: 1rpx solid #D8D8D8;

pages/inspection/inspectionScanning/inspectionScanning.vue

@@ -9,7 +9,7 @@
     <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_head ellipsis-multiline">
-          <text class="sign" v-if="dataInfo.tabActiveId == 1" :class="{signRed: data.exception == 1}">{{data.exception == 1 ? '异常' : '正常'}}</text>{{ data.inspectionDTO?.inspectionFormDTO?.name }}-{{ data.inspectionNodeDTO?.name }}-{{ data.batchNo }}
+          <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>
 
         <view class="body_item_content">

pages/inspection/inspectionValue/inspectionValue.vue

@@ -194,10 +194,38 @@
             Object.values(itemRefs.value).forEach(v => {
               v && v.uploadFn();
             })
-            inspectionValueStore.clearInspectionValueData();
-            uni.reLaunch({
-              url: `/pages/inspection/inspectionExecute/inspectionExecute`
-            })
+
+            if(res.exception){
+              // 异常
+              if(true){
+                uni.showToast({
+                  icon: 'none',
+                  title: "巡检提交成功，有异常",
+                  duration: 2000,
+                  mask: true,
+                })
+                setTimeout(() => {
+                  inspectionValueStore.clearInspectionValueData();
+                  uni.reLaunch({
+                    url: `/pages/inspection/inspectionExecute/inspectionExecute`
+                  })
+                }, 2000)
+              }
+            }else{
+              // 无异常
+              uni.showToast({
+                icon: 'none',
+                title: "巡检提交成功，无异常",
+                duration: 2000,
+                mask: true,
+              })
+              setTimeout(() => {
+                inspectionValueStore.clearInspectionValueData();
+                uni.reLaunch({
+                  url: `/pages/inspection/inspectionExecute/inspectionExecute`
+                })
+              }, 2000)
+            }
           } else {
             uni.showToast({
               icon: 'none',