Browse Source

feature_20251015_主管任务门店扫码签到

zhujindu 1 month ago
parent
commit
da082ce11d
2 changed files with 35 additions and 31 deletions
  1. 1 1
      src/views/week/ActivityQRCode.vue
  2. 34 30
      src/views/week/VisitSummaryAdd.vue

+ 1 - 1
src/views/week/ActivityQRCode.vue

@@ -159,7 +159,7 @@ export default {
     },
     // 打开二维码
     openQRCode(values) {
-      this.$emit('onSubmit', values, () => {
+      this.$emit('onSubmit', () => {
         this.QRCodeBox = true;
       });
     },

+ 34 - 30
src/views/week/VisitSummaryAdd.vue

@@ -12,7 +12,7 @@
     <div class="lineGrey" style="height: 6px"></div>
     <div class="container" style="width: 94%; margin: 0px auto; border-radius: 6px">
       <!-- 活动扫码 -->
-      <ActivityQRCode @onSubmit="onSubmit"></ActivityQRCode>
+      <ActivityQRCode @onSubmit="onStorage" ref="ActivityQRCode"></ActivityQRCode>
       <van-form ref="tabstoreVal">
         <div v-for="(item, index) in collectionItemList" :key="index">
           <div v-if="item.answerType == 'sz'" class="formLabel z-cell">
@@ -214,7 +214,9 @@
     </div>
     <br />
     <div class="tc" style="padding: 0 16px">
-      <van-button class="submitBtn" block type="primary" @click="onStorage"> 暂存 </van-button>
+      <van-button class="submitBtn" block type="primary" @click="onStorage(null)">
+        暂存
+      </van-button>
       <van-button class="submitBtn" block type="info" color="#0057ba" @click="onSubmit">
         提交汇报
       </van-button>
@@ -485,7 +487,35 @@ export default {
       return val.slice(0, 4) + '-' + val.slice(4, 6) + '-' + val.slice(6, 8);
     },
     onLoad() {},
-    onSubmit(ActivityQRCodeData = {}, callback) {
+    // 暂存 不校验答案是否必填
+    onStorage(callback) {
+      let ActivityQRCodeData = this.$refs.ActivityQRCode.activityForm || {};
+      debugger;
+      this.setParams(() => {
+        temporarilyCustomAnswer({
+          userSummaryId: '', //	Long	用户总结id,如果为新增则不填,编辑则必填
+          summaryId: this.$route.query.summaryId, //Long	主管任务id
+          customItemList: this.collectionItemList, //List<Object>	答案列表
+          ...ActivityQRCodeData, //任务名称、活动日期、签到时间
+          getQrCode: callback ? true : false, //是否需要反馈二维码(是:任务名称、活动日期、签到时间必填)
+        })
+          .then((res) => {
+            if (res.code == 200) {
+              if (callback) {
+                callback();
+              } else {
+                this.$router.go(-1);
+              }
+            } else {
+              this.$toast(res.msg);
+            }
+          })
+          .catch((err) => {
+            this.$toast(err.msg);
+          });
+      });
+    },
+    onSubmit(callback) {
       this.setParams(() => {
         if (this.flagclick) {
           this.flagclick = false;
@@ -497,16 +527,10 @@ export default {
             userSummaryId: '', //	Long	用户总结id,如果为新增则不填,编辑则必填
             summaryId: this.$route.query.summaryId, //Long	主管任务id
             customItemList: this.collectionItemList, //List<Object>	答案列表
-            ...ActivityQRCodeData, //任务名称、活动日期、签到时间
-            getQrCode: callback ? true : false, //是否需要反馈二维码(是:任务名称、活动日期、签到时间必填)
           })
             .then((res) => {
               if (res.code == 200) {
-                if (callback) {
-                  callback();
-                } else {
-                  this.$router.go(-1);
-                }
+                this.$router.go(-1);
               } else {
                 this.$toast(res.msg);
               }
@@ -964,26 +988,6 @@ export default {
         }
       }
     },
-    // 暂存 不校验答案是否必填
-    onStorage() {
-      this.setParams(() => {
-        temporarilyCustomAnswer({
-          userSummaryId: '', //	Long	用户总结id,如果为新增则不填,编辑则必填
-          summaryId: this.$route.query.summaryId, //Long	主管任务id
-          customItemList: this.collectionItemList, //List<Object>	答案列表
-        })
-          .then((res) => {
-            if (res.code == 200) {
-              this.$router.go(-1);
-            } else {
-              this.$toast(res.msg);
-            }
-          })
-          .catch((err) => {
-            this.$toast(err.msg);
-          });
-      });
-    },
   },
 };
 </script>