Ver código fonte

feature_20251015_主管任务门店扫码签到

zhujindu 1 mês atrás
pai
commit
c87c60860e

+ 18 - 6
src/views/week/ActivityQRCode.vue

@@ -55,15 +55,22 @@
       </div>
       <div class="activityItem">
         <div class="van-cell QRCodeBtnBox">
-          <van-button class="QRCodeBtn" color="#0057ba" @click="openQRCode">
-            签到二维
+          <van-button style="width: 90px" class="QRCodeBtn" color="#0057ba" @click="openQRCode">
+            生成签到码
           </van-button>
-          <div class="tips">必须门店老板现场,使用企业微信扫码</div>
+          <div class="tips">
+            1、点击【暂存】后签到码生效;<br />2、请门店老板使用企微扫码签到
+            <!-- <div>1、点击【暂存】后签到码生效;</div>
+            <div>2、请门店老板使用企微扫码签到</div> -->
+          </div>
         </div>
       </div>
       <div class="activityItem">
         <div class="van-cell refreshBtnBox" style="padding: 5px 16px" @click="getQRChainList">
-          <div style="font-size: 16px; margin-right: 10px">已签到成功</div>
+          <div style="font-size: 16px; margin-right: 10px">
+            已签到成功门店:
+            <span style="margin-left: 5px">{{ QRChainList.length }}家 </span>
+          </div>
           <div class="refresh">
             <van-icon
               style="font-weight: 600; margin-top: 1px"
@@ -178,7 +185,6 @@ export default {
     // 打开二维码
     openQRCode(value) {
       this.toastLoading(0, '加载中...', true);
-      debugger;
       // approvalStatus//1-待审批 2-审批通过 不支持修改,直接查看二维码
       if (
         this.approvalStatus == '1' ||
@@ -284,7 +290,9 @@ export default {
       getSummaryQrCheckList({ qrUuid: this.qrUuids }).then((res) => {
         this.toastLoading().clear();
         if (res.code == 200) {
-          this.QRChainList = res.data;
+          this.QRChainList = res.data || [];
+        } else {
+          this.QRChainList = [];
         }
       });
     },
@@ -312,7 +320,11 @@ export default {
           border-radius: 10px;
         }
         .tips {
+          flex: 1;
           font-size: 11px;
+          margin-left: 15px;
+          line-height: 15px;
+          text-align: right;
         }
         .van-button--normal {
           padding: 0 8px;

+ 7 - 2
src/views/week/VisitSummaryAdd.vue

@@ -385,8 +385,12 @@ export default {
       chainName: '',
       chainCode: '',
       jxsList: [],
+      userSummaryId: null,
     };
   },
+  activated() {
+    this.userSummaryId = null;
+  },
   created() {
     this.activaFlag = true;
     // this.formData.startTime = this.GetPreMonthDay(this.parseTime(new Date(), '{y}-{m}-{d}'),2)
@@ -494,7 +498,7 @@ export default {
       let ActivityQRCodeData = this.$refs.ActivityQRCode.activityForm || {};
       this.setParams(() => {
         temporarilyCustomAnswer({
-          userSummaryId: '', //	Long	用户总结id,如果为新增则不填,编辑则必填
+          userSummaryId: this.userSummaryId, //	Long	用户总结id,如果为新增则不填,编辑则必填
           summaryId: this.$route.query.summaryId, //Long	主管任务id
           customItemList: this.collectionItemList, //List<Object>	答案列表
           ...ActivityQRCodeData, //任务名称、活动日期、签到时间
@@ -503,6 +507,7 @@ export default {
           .then((res) => {
             if (res.code == 200) {
               if (callback) {
+                this.userSummaryId = res.data.userSummaryId ? res.data.userSummaryId : null;
                 // 回传二维码
                 callback(res);
               } else {
@@ -545,7 +550,7 @@ export default {
             this.flagclick = true;
           }, 2000);
           insertCustomAnswer({
-            userSummaryId: '', //	Long	用户总结id,如果为新增则不填,编辑则必填
+            userSummaryId: this.userSummaryId, //	Long	用户总结id,如果为新增则不填,编辑则必填
             summaryId: this.$route.query.summaryId, //Long	主管任务id
             customItemList: this.collectionItemList, //List<Object>	答案列表
             ...ActivityQRCodeData,