Merge branch 'feature_20241120_图像识别' into uat(dev)

# Conflicts:
#	src/views/week/index.vue

src/views/AIImage/AIImageDetail.vue

@@ -127,23 +127,23 @@ export default {
         this.toastLoading().clear();
         if (res.code == 200) {
           this.data = res.data;
-          this.approveState = res.data.approveState;
+          this.approveState = res.data.approveState; //反馈状态：0 未审批 1已审批
           if (this.approveState == '0') {
-            this.$dialog
-              .confirm({
-                title: '系统提示',
-                message:
-                  res.data.approveTime +
-                  '时间已反馈该店拜访照异常原因及解决方案，此次拜访照仍异常，请及时跟进',
-                confirmButtonText: '确定',
-                showCancelButton: false,
-              })
-              .then(() => {});
             let latestPhotoApprove = res.data.latestPhotoApprove;
             if (latestPhotoApprove) {
               this.AIResult = latestPhotoApprove.resultCorrect || '1';
               this.causeMessage =
                 latestPhotoApprove.reasonsSolutions || latestPhotoApprove.feedbackError;
+              this.$dialog
+                .confirm({
+                  title: '系统提示',
+                  message:
+                    latestPhotoApprove.approveTime +
+                    '时间已反馈该店拜访照异常原因及解决方案，此次拜访照仍异常，请及时跟进',
+                  confirmButtonText: '确定',
+                  showCancelButton: false,
+                })
+                .then(() => {});
             }
           } else {
             this.AIResult = res.data.resultCorrect || '1';
@@ -167,7 +167,7 @@ export default {
         feedbackError: this.AIResult == '2' ? this.causeMessage : '', //	string	反馈AI识别不正确
       }).then((res) => {
         if (res.code == 200) {
-          this.$toast('提交成功');
+          this.$toast('已反馈给本部');
           this.onClickLeft();
         } else {
           this.$toast('提交失败');