feature_20251015_主管任务门店扫码签到

src/views/week/ActivityQRCode.vue

@@ -5,7 +5,7 @@
         <span class="van-f-red">*</span>
         <van-field
           v-model="activityForm.summaryEventName"
-          name="name"
+          name="summaryEventName"
           label="活动名称"
           placeholder="请输入活动名称"
           :rules="[{ required: true, message: '请输入活动名称' }]" />
@@ -15,8 +15,8 @@
         <van-field
           readonly
           clickable
-          name="activityDate"
-          :value="activityForm.activityDate"
+          name="summaryEventDate"
+          :value="activityForm.summaryEventDate"
           label="活动日期"
           placeholder="请选择活动日期"
           @click="activityShowCalendar = true"
@@ -27,8 +27,8 @@
         <van-field
           readonly
           clickable
-          name="validDateStart"
-          :value="activityForm.validDateStart"
+          name="qrStartTime"
+          :value="activityForm.qrStartTime"
           label="生效开始日期"
           placeholder="请选择开始日期"
           @click="clickValidDateShow('start')"
@@ -39,8 +39,8 @@
         <van-field
           readonly
           clickable
-          name="validDateEnd"
-          :value="activityForm.validDateEnd"
+          name="qrEndTime"
+          :value="activityForm.qrEndTime"
           label="生效结束日期"
           placeholder="请选择结束日期"
           @click="clickValidDateShow('end')"
@@ -101,14 +101,14 @@
     <div class="QRCodeBox" v-if="QRCodeBox">
       <div class="centerBox">
         <div class="title">{{ activityForm.summaryEventName }}</div>
-        <div class="activityDate">{{ activityForm.activityDate }}</div>
+        <div class="activityDate">{{ activityForm.summaryEventDate }}</div>
         <img class="QRCodeUrl" :src="require('@/assets/QRcode.png')" />
         <div class="validTimeBox">
           <div class="text">二维码有效期</div>
           <div class="validTime">
-            {{ activityForm.validDateStart }}
+            {{ activityForm.qrStartTime }}
             ~
-            {{ activityForm.validDateEnd }}
+            {{ activityForm.qrEndTime }}
           </div>
         </div>
         <div class="close" @click="QRCodeBox = false">关闭</div>
@@ -129,9 +129,9 @@ export default {
       // 活动数据
       activityForm: {
         summaryEventName: '',
-        activityDate: '',
-        validDateStart: '',
-        validDateEnd: '',
+        summaryEventDate: '',
+        qrStartTime: '',
+        qrEndTime: '',
       },
       activityShowCalendar: false,
       validDateShow: false,
@@ -154,7 +154,7 @@ export default {
   },
   methods: {
     activityOnConfirm(date) {
-      this.activityForm.activityDate = this.formatDate(date);
+      this.activityForm.summaryEventDate = this.formatDate(date);
       this.activityShowCalendar = false;
     },
     // 打开二维码
@@ -176,13 +176,13 @@ export default {
         this.activate = {
           type: type,
           title: '请选择结束日期',
-          minDate: this.activityForm.validDateStart
-            ? new Date(this.activityForm.validDateStart)
+          minDate: this.activityForm.qrStartTime
+            ? new Date(this.activityForm.qrStartTime)
             : new Date(),
           maxDate: new Date(2026, 9, 1),
         };
-        this.validDate = this.activityForm.validDateEnd
-          ? new Date(this.activityForm.validDateEnd)
+        this.validDate = this.activityForm.qrEndTime
+          ? new Date(this.activityForm.qrEndTime)
           : new Date();
       }
       this.validDateShow = true;
@@ -190,15 +190,15 @@ export default {
     onValidDateConfirm(date) {
       let time = this.parseTime(new Date(date), '{y}-{m}-{d} {h}:{i}:{s}') + '';
       if (this.activate.type == 'start') {
-        this.activityForm.validDateStart = time;
+        this.activityForm.qrStartTime = time;
         if (
-          new Date(this.activityForm.validDateStart).getTime() >
-          new Date(this.activityForm.validDateEnd).getTime()
+          new Date(this.activityForm.qrStartTime).getTime() >
+          new Date(this.activityForm.qrEndTime).getTime()
         ) {
-          this.activityForm.validDateEnd = null;
+          this.activityForm.qrEndTime = null;
         }
       } else {
-        this.activityForm.validDateEnd = time;
+        this.activityForm.qrEndTime = time;
       }
       this.validDateShow = false;
     },

src/views/week/VisitSummaryAdd.vue

@@ -485,7 +485,7 @@ export default {
       return val.slice(0, 4) + '-' + val.slice(4, 6) + '-' + val.slice(6, 8);
     },
     onLoad() {},
-    onSubmit(ActivityQRCodeData, callback) {
+    onSubmit(ActivityQRCodeData = {}, callback) {
       this.setParams(() => {
         if (this.flagclick) {
           this.flagclick = false;
@@ -497,7 +497,8 @@ export default {
             userSummaryId: '', //	Long	用户总结id，如果为新增则不填，编辑则必填
             summaryId: this.$route.query.summaryId, //Long	主管任务id
             customItemList: this.collectionItemList, //List<Object>	答案列表
-            ...ActivityQRCodeData,
+            ...ActivityQRCodeData, //任务名称、活动日期、签到时间
+            getQrCode: callback ? true : false, //是否需要反馈二维码（是：任务名称、活动日期、签到时间必填）
           })
             .then((res) => {
               if (res.code == 200) {