Browse Source

Merge branch 'feature_20260423_完美门店接口优化bug' into uat(dev)

zhujindu 4 hours ago
parent
commit
e4ab21116d

+ 6 - 6
src/views/historicalVisit/perfectStore.vue

@@ -56,7 +56,7 @@
       <!-- 特殊任务展示 -->
       <!-- 店招 -->
       <div class="shopSign specialTask" v-if="shopSignDetail && shopSignDetail.qualifiedState">
-        <div class="specialTaskLeft" @click="openPerfectStoreSign">
+        <div class="specialTaskLeft" @click="openPerfectStoreSign(shopSignDetail)">
           <div class="SignText">AI 店招识别</div>
           <div class="signContent">
             <div class="" style="display: flex">
@@ -75,7 +75,7 @@
       </div>
       <!-- 调色机 -->
       <div class="TSJBox specialTask" v-if="tiaoSJDetail && tiaoSJDetail.qualifiedState">
-        <div class="specialTaskLeft" @click="openPerfectStoreTSJ">
+        <div class="specialTaskLeft" @click="openPerfectStoreTSJ(tiaoSJDetail)">
           <div class="SignText">AI 调色机识别</div>
           <div class="signContent">
             <div class="" style="display: flex">
@@ -436,16 +436,16 @@ export default {
     previewsImg(url) {
       ImagePreview([url]);
     },
-    openPerfectStoreSign() {
+    openPerfectStoreSign(val) {
       this.$router.push({
         path: '/perfectStoreSign',
-        query: { visitId: this.visitsId },
+        query: { visitId: this.visitsId, taskId: val.taskId },
       });
     },
-    openPerfectStoreTSJ() {
+    openPerfectStoreTSJ(val) {
       this.$router.push({
         path: '/perfectStoreTSJ',
-        query: { visitId: this.visitsId },
+        query: { visitId: this.visitsId, taskId: val.taskId },
       });
     },
   },

+ 7 - 4
src/views/historicalVisit/perfectStoreSign.vue

@@ -52,7 +52,7 @@
 
 <script>
 import deleteUploadImg from '@/components/deleteUploadImg';
-import { getVisitsDetailPerfectStore } from '@/api/index';
+import { getVisitsDetailPerfectStoreByTaskId } from '@/api/index';
 import { ImagePreview } from 'vant';
 export default {
   name: 'perfectStoreSign',
@@ -72,13 +72,16 @@ export default {
   methods: {
     getVisitsDetailFn() {
       this.shopSignDetail = null;
-      getVisitsDetailPerfectStore({ visitsId: this.visitsId })
+      getVisitsDetailPerfectStoreByTaskId({
+        visitsId: this.visitsId,
+        taskId: this.$route.query.taskId,
+      })
         .then((res) => {
           this.toastLoading().clear();
           if (res.code == 200) {
             this.detail = res.data;
-            let shopSignArr = this.detail.sfaTaskList.filter((val) => val.photoIdentifyType == '1');
-            if (shopSignArr.length) this.shopSignDetail = shopSignArr[0];
+            let shopSignArr = this.detail;
+            this.shopSignDetail = shopSignArr;
           } else {
             this.$dialog.alert({
               message: res.msg,

+ 6 - 3
src/views/historicalVisit/perfectStoreTSJ.vue

@@ -257,7 +257,7 @@
 
 <script>
 import deleteUploadImg from '@/components/deleteUploadImg';
-import { getVisitsDetailPerfectStore } from '@/api/index';
+import { getVisitsDetailPerfectStoreByTaskId } from '@/api/index';
 import { ImagePreview } from 'vant';
 export default {
   name: 'perfectStoreTSJ',
@@ -280,12 +280,15 @@ export default {
       this.toastLoading(0, '加载中...', true);
       this.tiaoSJArr = null;
       //   this.collectionItemList = [];
-      getVisitsDetailPerfectStore({ visitsId: this.visitsId })
+      getVisitsDetailPerfectStoreByTaskId({
+        visitsId: this.visitsId,
+        taskId: this.$route.query.taskId,
+      })
         .then((res) => {
           this.toastLoading().clear();
           if (res.code == 200) {
             this.detail = res.data;
-            this.tiaoSJArr = this.detail.sfaTaskList.filter((val) => val.photoIdentifyType == '3');
+            this.tiaoSJArr = this.detail;
             console.log(this.tiaoSJArr);
             for (let i = 0; i < this.tiaoSJArr.length; i++) {
               this.filterCollectionItemLists(this.tiaoSJArr[i].collectionItemList);