Merge remote-tracking branch 'origin/master'

client/.env.dev

@@ -5,8 +5,7 @@ VITE_DEV=false
 
 # 请求路径
 # VITE_BASE_URL='http://10.10.9.113:48080'
-# VITE_BASE_URL='http://10.10.10.7:18080'
-VITE_BASE_URL='https://oa.zjugis.com:28080'
+VITE_BASE_URL='http://10.10.10.7:18080'
 
 # VITE_BASE_URL='http://10.10.9.168:48080'
 

client/src/store/modules/projectPermis.ts

@@ -7,6 +7,7 @@ export interface ProjectPermiss {
   all: boolean
   xmLeader: boolean
   xsLeader: boolean
+  projectMember: boolean
   childButton: { [key: string]: boolean }
 }
 export const useProjectPermis = defineStore('project', () => {
@@ -15,6 +16,7 @@ export const useProjectPermis = defineStore('project', () => {
     all: false,
     xmLeader: false,
     xsLeader: false,
+    projectMember: false,
     childButton: {}
   })
   const initProjectPermis = (projectId: ProjectId) => {

client/src/views/OaSystem/projectCenter/projectDetail/components/xmht/index.vue

@@ -62,7 +62,9 @@
             </li>
             <li
               v-if="
-                projectPermis.projectPermisState.all || projectPermis.projectPermisState.xsLeader
+                projectPermis.projectPermisState.all ||
+                projectPermis.projectPermisState.xsLeader ||
+                projectPermis.projectPermisState.projectMember
               "
               @click="() => startContractInvoiceMuate(mContractDetail?.id)"
               >开票申请</li

client_h5/src/pages/myLogs/Daily/index.vue

@@ -25,15 +25,23 @@
     <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="throttle(onSubmit(false))"
         >更新</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="throttle(onSubmit(true))"
         >暂存</van-button
       >
-      <van-button type="primary" block class="send-btn" @click="onSubmit(false)"
+      <van-button
+        type="primary"
+        block
+        class="send-btn"
+        @click="throttle(onSubmit(false))"
         >发送</van-button
       >
     </div>
@@ -48,7 +56,7 @@ import { reactive, watch } from "vue";
 import { showSuccessToast, showToast } from "vant";
 import SelectUser from "@/components/UserSelect.vue";
 import ProjectList from "../components/ProjectList.vue";
-import { getUserInfo } from "@/utils/tools";
+import { getUserInfo, throttle } from "@/utils/tools";
 import { http } from "../http";
 import { IReport } from "../interface";
 import { onSubmitCheck } from "../service";

client_h5/src/pages/myLogs/Weekly/index.vue

@@ -31,15 +31,23 @@
     <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="throttle(onSubmit(false))"
         >更新</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="throttle(onSubmit(true))"
         >暂存</van-button
       >
-      <van-button type="primary" block class="send-btn" @click="onSubmit(false)"
+      <van-button
+        type="primary"
+        block
+        class="send-btn"
+        @click="throttle(onSubmit(false))"
         >发送</van-button
       >
     </div>
@@ -54,7 +62,7 @@ import { reactive, watch } from "vue";
 import { showSuccessToast, showToast } from "vant";
 import SelectUser from "@/components/UserSelect.vue";
 import ProjectList from "../components/ProjectList.vue";
-import { getUserInfo } from "@/utils/tools";
+import { getUserInfo, throttle } from "@/utils/tools";
 import { http } from "../http";
 import { IReport } from "../interface";
 import { onSubmitCheck, setWorkDayListToWeek } from "../service";

client_h5/src/utils/tools.ts

@@ -17,3 +17,28 @@ export const getUserInfo = () => {
   // return userInfo;
   return JSON.parse(localStorage.getItem("_userInfo") as string);
 };
+
+// 节流函数
+export const throttle = (fn: any, delay = 3000) => {
+  let preTime = Date.now();
+  return (event: any) => {
+    const context = this;
+    event.persist && event.persist(); // 保留对事件的引用
+    const doTime = Date.now();
+    if (doTime - preTime >= delay) {
+      fn.apply(context);
+      preTime = Date.now();
+    }
+  };
+};
+// 防抖函数
+export const debounce = (fn: any, wait = 3000) => {
+  let timeout: any = null;
+  return function (event: any) {
+    clearTimeout(timeout);
+    event.persist && event.persist(); // 保留对事件的引用
+    timeout = setTimeout(() => {
+      fn(event);
+    }, wait);
+  };
+};