Просмотр исходного кода

Merge branch 'feature_20260330_拜访连拍速度优化' into uat(dev)

# Conflicts:
#	src/api/index.js
#	src/views/deviceOutside/suishenbangOutstoreVisit.vue
zhujindu 8 часов назад
Родитель
Сommit
0812fa2829
2 измененных файлов с 27 добавлено и 11 удалено
  1. 9 0
      src/api/index.js
  2. 18 11
      src/views/deviceOutside/suishenbangOutstoreVisit.vue

+ 9 - 0
src/api/index.js

@@ -1196,3 +1196,12 @@ export function getVisitsDetailPerfectStoreByTaskId(query) {
     params: query,
   });
 }
+
+// 获取陈列奖励案入库标识接口
+export function getCljlaToDBLabel(query) {
+  return request({
+    url: 'mobile/storeGroup/getCljlaToDBLabel',
+    method: 'get',
+    params: query,
+  });
+}

+ 18 - 11
src/views/deviceOutside/suishenbangOutstoreVisit.vue

@@ -160,6 +160,7 @@ import {
   buryingPoint,
   getMaterialHistory,
   getVisitTasks,
+  getCljlaToDBLabel,
 } from '@/api/index';
 import axios from 'axios';
 import { saveVisitsParams, getOrderUrlByStoreId } from '@/api/inventory';
@@ -629,17 +630,23 @@ export default {
       localStorage.setItem('getRequestFlage', 'false');
       console.log(this.visitId);
       if (val.taskType == '5') {
-        this.$router.push({
-          path: '/taskPhotoTaking',
-          query: {
-            storeCode: this.urlParameter.storeCode,
-            visitsId: this.visitId,
-            taskIds: val.taskIds.join(','),
-            storeGroupId: this.storeGroupId,
-            photoType: val.photoType,
-            insert: true,
-            storeId: this.storeId,
-          },
+        getCljlaToDBLabel({ visitsId: this.visitId }).then((res) => {
+          if (res.code == 200) {
+            this.$router.push({
+              path: '/taskPhotoTaking',
+              query: {
+                storeCode: this.urlParameter.storeCode,
+                visitsId: this.visitId,
+                taskIds: val.taskIds.join(','),
+                storeGroupId: this.storeGroupId,
+                photoType: val.photoType,
+                insert: 1,
+                storeId: this.storeId,
+              },
+            });
+          } else {
+            this.$toast(res.msg);
+          }
         });
       } else {
         this.$router.push({