Explorar el Código

feature_20251015_主管任务门店扫码签到

zhujindu hace 1 mes
padre
commit
010b598fbb
Se han modificado 2 ficheros con 7 adiciones y 5 borrados
  1. 4 2
      src/views/week/ActivityQRCode.vue
  2. 3 3
      src/views/week/VisitSummaryDetail.vue

+ 4 - 2
src/views/week/ActivityQRCode.vue

@@ -3,7 +3,7 @@
     <van-form
       ref="tabstoreVal"
       class="QRCodeActivity"
-      :readonly="approvalStatus == '1' || approvalStatus == '2'">
+      :disabled="approvalStatus == '1' || approvalStatus == '2'">
       <div class="activityItem">
         <span class="van-f-red">*</span>
         <van-field
@@ -174,10 +174,12 @@ export default {
     },
     // 打开二维码
     openQRCode(value) {
+      this.toastLoading(0, '加载中...', true);
       // approvalStatus//1-待审批 2-审批通过 不支持修改,直接查看二维码
       if (this.approvalStatus == '1' || this.approvalStatus == '2' || this.approvalStatus == '3') {
         getSummaryQrCodeUUID({ qrUuid: this.qrUuid, userSummaryId: this.userSummaryId }).then(
           (res) => {
+            this.toastLoading().clear();
             this.QRCodeUrl = res.data.base64Png;
             this.QRCodeBox = true;
           }
@@ -187,7 +189,6 @@ export default {
           .validate()
           .then(() => {
             // 验证通过
-            this.toastLoading(0, '加载中...', true);
             this.$emit('onSubmit', (res) => {
               this.toastLoading().clear();
               this.QRCodeBox = true;
@@ -196,6 +197,7 @@ export default {
             });
           })
           .catch((errors) => {
+            this.toastLoading().clear();
             //验证失败
             window.scrollTo(0, 0);
           });

+ 3 - 3
src/views/week/VisitSummaryDetail.vue

@@ -298,7 +298,7 @@ export default {
           .then(() => {
             // 验证通过
             let ActivityQRCodeData = this.$refs.ActivityQRCode.activityForm || {};
-            this.submitApproval(ActivityQRCodeData);
+            this.submitApprovalFun(ActivityQRCodeData);
           })
           .catch((errors) => {
             //验证失败
@@ -306,10 +306,10 @@ export default {
             return;
           });
       } else {
-        this.submitApproval();
+        this.submitApprovalFun();
       }
     },
-    submitApproval(ActivityQRCodeData = {}) {
+    submitApprovalFun(ActivityQRCodeData = {}) {
       let collectionAnswerlisd = this.$refs.componVisitSummary.collectionAnswerlisd;
       let collectionItemList = this.$refs.componVisitSummary.collectionItemList;
       for (var c = 0; c < collectionAnswerlisd.length; c++) {