3
0

2 Revīzijas 92ac168d65 ... 7972be4c18

Autors SHA1 Ziņojums Datums
  qiny 7972be4c18 Merge branch 'master' of http://114.55.67.98:8070/Natural_p1/zjugis_OA 1 gadu atpakaļ
  qiny 14c3410ff9 feat: 移动端周日报暂存和发送增加loading 1 gadu atpakaļ

+ 29 - 3
client_h5/src/pages/myLogs/Daily/index.vue

@@ -25,15 +25,29 @@
     <SelectUser v-model="formData.receiveUserIds" />
     <div class="blank-line"></div>
     <div class="send-btn-group" v-if="formData.isUpdate">
-      <van-button type="primary" block @click="onSubmit(false)"
+      <van-button
+        type="primary"
+        block
+        @click="onSubmit(false)"
+        :loading="submitLoading"
         >更新</van-button
       >
     </div>
     <div class="send-btn-group" v-else>
-      <van-button type="success" block class="send-btn" @click="onSubmit(true)"
+      <van-button
+        type="success"
+        block
+        class="send-btn"
+        @click="onSubmit(true)"
+        :loading="tempLoading"
         >暂存</van-button
       >
-      <van-button type="primary" block class="send-btn" @click="onSubmit(false)"
+      <van-button
+        type="primary"
+        block
+        class="send-btn"
+        @click="onSubmit(false)"
+        :loading="submitLoading"
         >发送</van-button
       >
     </div>
@@ -214,6 +228,8 @@ const projectChange = (data: any) => {
 
 // 提交
 const { replace } = useRouter();
+const tempLoading = ref(false);
+const submitLoading = ref(false);
 const onSubmit = throttle(async (isTemp: boolean, isRouteLeave?: boolean) => {
   const userInfo = getUserInfo();
   const params: IReport = {
@@ -234,6 +250,14 @@ const onSubmit = throttle(async (isTemp: boolean, isRouteLeave?: boolean) => {
     });
     return;
   }
+  // 提交或暂存时loading
+  if (!isRouteLeave) {
+    if (isTemp) {
+      tempLoading.value = true;
+    } else {
+      submitLoading.value = true;
+    }
+  }
   // return
   const result: any = await http.submitReport(params);
   // 如果暂存且有返回id
@@ -255,6 +279,8 @@ const onSubmit = throttle(async (isTemp: boolean, isRouteLeave?: boolean) => {
   } else {
     showToast(`${type}失败,请稍后重试`);
   }
+  tempLoading.value = false;
+  submitLoading.value = false;
 }, 5000);
 
 // 获取是否工作日

+ 29 - 3
client_h5/src/pages/myLogs/Weekly/index.vue

@@ -31,15 +31,29 @@
     <SelectUser v-model="formData.receiveUserIds" />
     <div class="blank-line"></div>
     <div class="send-btn-group" v-if="formData.isUpdate">
-      <van-button type="primary" block @click="onSubmit(false)"
+      <van-button
+        type="primary"
+        block
+        @click="onSubmit(false)"
+        :loading="submitLoading"
         >更新</van-button
       >
     </div>
     <div class="send-btn-group" v-else>
-      <van-button type="success" block class="send-btn" @click="onSubmit(true)"
+      <van-button
+        type="success"
+        block
+        class="send-btn"
+        @click="onSubmit(true)"
+        :loading="tempLoading"
         >暂存</van-button
       >
-      <van-button type="primary" block class="send-btn" @click="onSubmit(false)"
+      <van-button
+        type="primary"
+        block
+        class="send-btn"
+        @click="onSubmit(false)"
+        :loading="submitLoading"
         >发送</van-button
       >
     </div>
@@ -200,6 +214,8 @@ const projectChange = (data: any) => {
 
 // 提交
 const { replace } = useRouter();
+const tempLoading = ref(false);
+const submitLoading = ref(false);
 const onSubmit = throttle(async (isTemp: boolean, isRouteLeave?: boolean) => {
   const date = thisWeek.value.split(" ~ ");
   const userInfo = getUserInfo();
@@ -221,6 +237,14 @@ const onSubmit = throttle(async (isTemp: boolean, isRouteLeave?: boolean) => {
     });
     return;
   }
+  // 提交或暂存时loading
+  if (!isRouteLeave) {
+    if (isTemp) {
+      tempLoading.value = true;
+    } else {
+      submitLoading.value = true;
+    }
+  }
   const result: any = await http.submitReport(params);
   // 如果暂存且有返回id
   if (result.data) {
@@ -241,6 +265,8 @@ const onSubmit = throttle(async (isTemp: boolean, isRouteLeave?: boolean) => {
   } else {
     showToast(`${type}失败,请稍后重试`);
   }
+  tempLoading.value = false;
+  submitLoading.value = false;
 }, 5000);
 
 // 获取是否工作日