Merge branch 'feature_20260423_完美门店接口优化bug' into master-20260422

# Conflicts:
#	src/views/historicalVisit/perfectStoreTSJ.vue

src/views/historicalVisit/perfectStore.vue

@@ -74,7 +74,7 @@
         </div>
       </div>
       <!-- 调色机 -->
-      <div class="TSJBox specialTask" v-if="tiaoSJDetail && tiaoSJDetail.qualifiedState">
+      <div class="TSJBox specialTask" v-if="tiaoSJDetail">
         <div class="specialTaskLeft" @click="openPerfectStoreTSJ(tiaoSJDetail)">
           <div class="SignText">AI 调色机识别</div>
           <div class="signContent">
@@ -351,7 +351,15 @@ export default {
           if (shopSignArr.length) this.shopSignDetail = shopSignArr[0];
           let tiaoSJArr = this.list.sfaTaskList.filter((val) => val.photoIdentifyType == '3');
           if (tiaoSJArr.length) {
-            this.tiaoSJDetail = tiaoSJArr[0];
+            let TSJqualifiedState0 = tiaoSJArr.filter((val) => val.qualifiedState == '0');
+            let TSJqualifiedState1 = tiaoSJArr.filter((val) => val.qualifiedState == '1');
+            if (TSJqualifiedState0 && TSJqualifiedState0.length) {
+              this.tiaoSJDetail = TSJqualifiedState0[0];
+            } else if (TSJqualifiedState1 && TSJqualifiedState1.length) {
+              this.tiaoSJDetail = TSJqualifiedState1[0];
+            } else {
+              this.tiaoSJDetail = tiaoSJArr[0];
+            }
             console.log(this.tiaoSJDetail);
           }
           if (res.data.visitSource != 2) {
@@ -443,9 +451,11 @@ export default {
       });
     },
     openPerfectStoreTSJ(val) {
+      let tiaoSJArr = this.list.sfaTaskList.filter((val) => val.photoIdentifyType == '3');
+      let taskIds = tiaoSJArr.map((item) => item.taskId).join(',');
       this.$router.push({
         path: '/perfectStoreTSJ',
-        query: { visitId: this.visitsId, taskId: val.taskId },
+        query: { visitId: this.visitsId, taskId: taskIds },
       });
     },
   },

src/views/historicalVisit/perfectStoreSign.vue

@@ -74,12 +74,12 @@ export default {
       this.shopSignDetail = null;
       getVisitsDetailPerfectStoreByTaskId({
         visitsId: this.visitsId,
-        taskId: this.$route.query.taskId,
+        taskIdList: this.$route.query.taskId,
       })
         .then((res) => {
           this.toastLoading().clear();
-          if (res.code == 200) {
-            this.detail = res.data;
+          if (res.code == 200 && res.data && res.data.length > 0) {
+            this.detail = res.data[0];
             let shopSignArr = this.detail;
             this.shopSignDetail = shopSignArr;
           } else {

src/views/historicalVisit/perfectStoreTSJ.vue

@@ -2,37 +2,32 @@
   <div class="perfectStoreTSJ">
     <van-nav-bar class="navBar" title="AI 调色机识别" left-arrow @click-left="onClickLeft" />
     <div class="content">
-      <!-- <div class="contentBox" v-for="val in tiaoSJArr"> -->
-      <div class="contentBox" v-if="tiaoSJArr">
+      <div class="contentBox" v-for="val in tiaoSJArr">
         <div class="deviceCode">
           <div class="vertical"></div>
           <div class="codeData">
-            <p style="margin: 13px 0">设备编号：{{ tiaoSJArr.deviceCode || '' }}</p>
-            <p style="margin: 13px 0">投放编号：{{ tiaoSJArr.putInCode || '' }}</p>
+            <p style="margin: 13px 0">设备编号：{{ val.deviceCode || '' }}</p>
+            <p style="margin: 13px 0">投放编号：{{ val.putInCode || '' }}</p>
           </div>
         </div>
-        <div class="shopSign specialTask" v-if="tiaoSJArr && tiaoSJArr.qualifiedState">
+        <div class="shopSign specialTask">
           <div class="specialTaskLeft">
             <div class="SignText">识别结果:</div>
             <div class="signContent">
-              <div class="icon">
-                <van-icon name="checked" color="#07c160" v-if="tiaoSJArr.qualifiedState == '1'" />
+              <div class="icon" v-if="val.qualifiedState">
+                <van-icon name="checked" color="#07c160" v-if="val.qualifiedState == '1'" />
                 <van-icon name="warning" color="#ee0a24" v-else />
               </div>
-              <div :style="{ color: tiaoSJArr.qualifiedState == '1' ? '#07c160' : '#ee0a24' }">
-                {{
-                  tiaoSJArr.qualifiedState == '1'
-                    ? '调色机完整，投放号正确'
-                    : tiaoSJArr.unqualifiedReason
-                }}
+              <div
+                :style="{ color: val.qualifiedState == '1' ? '#07c160' : '#ee0a24' }"
+                v-if="val.qualifiedState">
+                {{ val.qualifiedState == '1' ? '调色机完整，投放号正确' : val.unqualifiedReason }}
               </div>
             </div>
             <div class="shopSignButton">
               <div class="" style="display: flex">
-                <van-button round type="primary" v-if="tiaoSJArr.qualifiedState == '1'"
-                  >通过</van-button
-                >
-                <van-button round type="danger" v-else>不通过</van-button>
+                <van-button round type="primary" v-if="val.qualifiedState == '1'">通过</van-button>
+                <van-button round type="danger" v-if="val.qualifiedState == '0'">不通过</van-button>
               </div>
             </div>
           </div>
@@ -41,9 +36,9 @@
         <div
           class="container containert"
           style="font-size: 16px; width: 100%; margin: 0 auto; padding-bottom: 10px"
-          v-if="tiaoSJArr.collectionItemList.length">
+          v-if="val.collectionItemList.length">
           <van-form ref="tabstoreVal">
-            <div v-for="(item, index) in tiaoSJArr.collectionItemList" :key="index">
+            <div v-for="(item, index) in val.collectionItemList" :key="index">
               <div v-if="item.answerType == 'tel_send_code'" class="formLabel z-cell z-cells">
                 <van-cell>
                   <template #title> {{ index + 1 }}.{{ item.collectionName }} </template>
@@ -289,11 +284,11 @@ export default {
       //   this.collectionItemList = [];
       getVisitsDetailPerfectStoreByTaskId({
         visitsId: this.visitsId,
-        taskId: this.$route.query.taskId,
+        taskIdList: this.$route.query.taskId,
       })
         .then((res) => {
           this.toastLoading().clear();
-          if (res.code == 200) {
+          if (res.code == 200 && res.data && res.data.length > 0) {
             this.detail = res.data;
             this.tiaoSJArr = this.detail;
             console.log(this.tiaoSJArr);

src/views/historicalVisit/perfectStoreTask.vue

@@ -242,11 +242,11 @@ export default {
       this.toastLoading(0, '加载中...', true);
       getVisitsDetailPerfectStoreByTaskId({
         visitsId: this.visitsId,
-        taskId: this.$route.query.taskId,
+        taskIdList: this.$route.query.taskId,
       }).then((res) => {
         this.toastLoading().clear();
-        if (res.code == 200 && res.data) {
-          this.formData = res.data;
+        if (res.code == 200 && res.data && res.data.length > 0) {
+          this.formData = res.data[0];
           console.log(this.formData.taskPhotoRecognitionResult);
           this.getSpanArr(this.formData.taskPhotoRecognitionResult);
           console.log(this.formData);