Merge branch 'feature_20251205_图片识别任务通过条件配置' into uat(dev)

src/views/deviceOutside/index.vue

@@ -2043,6 +2043,29 @@ export default {
                                 .catch(() => {
                                   // that.abnormalVisit(val)
                                 });
+                            } else {
+                              that.$router.push({
+                                path: '/outabnormalVisit',
+                                query: {
+                                  storeId: val.storeId,
+                                  rdId: val.rdId,
+                                  lat: that.lat,
+                                  lon: that.lon,
+                                  visitId: val.visitId,
+                                  pageType: 'out',
+                                  visitModel: '3',
+                                  storeCode: val.storeCode,
+                                  tabVal: that.tabVal,
+                                  latNew: location.lat,
+                                  lonNew: location.lon,
+                                  PointSum: PointSum,
+                                  marklat: res.latitude,
+                                  marklon: res.longitude,
+                                },
+                              });
+                              localStorage.setItem('startTime', new Date());
+                              localStorage.setItem('ORGName', val.deptName);
+                              localStorage.setItem('chainNameR', val.storeName);
                             }
                           }
                           addVisitsPosition({

src/views/historicalVisit/historicalDetails.vue

@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div class="historicalDetails">
     <!--        顶部条-->
     <van-nav-bar class="navBar" title="拜访任务" left-arrow @click-left="onClickLeft">
       <template #right>
@@ -96,15 +96,17 @@
       <template v-if="list.isSku == '是'">
         <div style="padding: 10px 16px; font-size: 16px; font-weight: bold">SKU图像识别结果</div>
         <div class="card">
-          <div class="info" @click="toSkuRecognize">
+          <div
+            class="info"
+            @click="toSkuRecognize"
+            style="
+              display: flex;
+              align-items: center;
+              justify-content: space-between;
+              padding: 3px;
+            ">
             <p
-              style="
-                width: 94%;
-                margin: 0;
-                line-height: 24px;
-                padding: 10px 0;
-                display: inline-block;
-              ">
+              style="flex: 1; margin: 0; line-height: 24px; padding: 10px 0; display: inline-block">
               拍摄的所有产品陈列照识别结果：<span v-if="list.skuTotal" style="color: red"
                 >{{ list.skuTotal }}个</span
               >
@@ -119,20 +121,27 @@
       <div class="card" v-if="list.visitSource != 2">
         <div
           class="info"
-          style="line-height: 44px; font-size: 14px"
+          style="
+            font-size: 14px;
+            display: flex;
+            align-items: center;
+            justify-content: space-between;
+            padding: 3px;
+          "
           v-for="(item, index) in list.sfaTaskList"
           :key="index"
           @click="historiStoreVisit(item, index)">
-          <p
-            style="
-              width: 94%;
-              margin: 0;
-              line-height: 24px;
-              padding: 10px 0;
-              display: inline-block;
-            ">
+          <p style="flex: 1; margin: 0">
             {{ item.taskName }}
           </p>
+          <div class="taskPhotoConditionPassed">
+            <img
+              v-if="item.taskPhotoConditionPassed == 1"
+              :src="require('@/assets/taskPhotoSu.png')" />
+            <img
+              v-if="item.taskPhotoConditionPassed == 0"
+              :src="require('@/assets/taskPhotoErr.png')" />
+          </div>
           <p class="arrowdetils1">
             <van-icon name="arrow" />
           </p>
@@ -441,6 +450,8 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
+.historicalDetails {
+}
 .container {
   padding-bottom: 50px;
 }
@@ -485,13 +496,17 @@ export default {
       font-size: 14px;
       margin-top: 9px;
     }
+    .taskPhotoConditionPassed {
+      img {
+        width: 40px;
+        height: 30px;
+      }
+    }
     .arrowdetils1 {
       background: #fff;
-      position: absolute;
-      top: 50%;
       color: #444;
-      right: 0;
-      margin-top: -22px;
+      margin: 0;
+      margin-left: 5px;
     }
   }
 }