Squashed commit of the following:

解决冲突
commit b38d9a1427ccf1ca48d766958402770395155076
Author: Renxy <18510891294@163.com>
Date:   Thu Dec 21 14:34:15 2023 +0800

    修改展示当月数据、上报上月26到本月25

commit 42dbc6fc6e7bba681bb90aabe4c4e53aa41f2e9e
Author: Renxy <18510891294@163.com>
Date:   Mon Nov 27 14:53:24 2023 +0800

    修改上报所有工时时间为上个月26到这个月25

commit 15dd115773fa496a30cebc9bcee9d5e0b9fcb90b
Author: Renxy <18510891294@163.com>
Date:   Thu Oct 26 10:21:18 2023 +0800

    修改项目成员flow_id

# Conflicts:
#	src/pages/PurchaseAdmin/PurchaseList/WorkingHours/index.js

src/pages/PurchaseAdmin/PurchaseList/WorkingHours/index.js

@@ -4,6 +4,7 @@ import AddModal from './AddModal';
 import WorkList from './WorkList';
 import { connect } from 'dva';
 import moment from 'moment';
+import { queryWorkHours } from '@/services/workHours';
 
 function List(props) {
   const {
@@ -64,16 +65,27 @@ function List(props) {
   };
 
   const MultiAuth = () => {
+    const curMonth = moment(current.date).format('MM');
+    const upMonth = moment(curMonth)
+      .add('month', -1)
+      .format('MM');
     Modal.confirm({
       title: '提示',
-      content: '是否上报全部审批?',
+      content: `是否上报${upMonth}月26至${curMonth}月25全部工时?`,
       okText: '确认',
       cancelText: '取消',
-      onOk() {
+      onOk: async () => {
         let params = [];
-        debugger;
-        for (let i = 0; i < dataList.length; i++) {
-          const element = dataList[i];
+        const e_time = current.date.format('YYYY-MM') + '-25 23:59:59';
+        const s_time =
+          moment(e_time)
+            .add('month', -1)
+            .format('YYYY-MM') + '-26 00:00:00';
+        const queryData = { s_time, e_time, pageSize: 9999, user_id: currentUser.ID };
+        const res = await queryWorkHours(queryData);
+        console.log(res.data.list);
+        for (let i = 0; i < res.data.list.length; i++) {
+          const element = res.data.list[i];
           if (element.audit_state != 0) continue;
           var arr = params.find(arr => arr.type_id == element.type_id);
           if (arr) {
@@ -264,11 +276,16 @@ function List(props) {
   const onChangeDate = value => {
     let time = value.format('YYYY-MM-DD');
     if (current.date.format('YYYY-MM') != value.format('YYYY-MM')) {
-      const e_date = value.format('YYYY-MM') + '-25';
-      const s_date =
-        moment(e_date)
-          .add('month', -1)
-          .format('YYYY-MM') + '-26';
+      const s_date = value.format('YYYY-MM') + '-01';
+      const e_date = moment(s_date)
+        .add('month', 1)
+        .add('days', -1)
+        .format('YYYY-MM-DD');
+      // const e_date = value.format('YYYY-MM') + '-25';
+      // const s_date =
+      //   moment(e_date)
+      //     .add('month', -1)
+      //     .format('YYYY-MM') + '-26';
       dispatch({
         type: 'workload/queryWorkHours',
         payload: {
@@ -310,16 +327,16 @@ function List(props) {
     dispatch({
       type: 'workload/queryWorkType',
       callback: () => {
-        // const s_date = current.date.format('YYYY-MM') + '-01';
-        // const e_date = moment(s_date)
-        //   .add('month', 1)
-        //   .add('days', -1)
-        //   .format('YYYY-MM-DD');
-        const e_date = current.date.format('YYYY-MM') + '-25';
-        const s_date =
-          moment(e_date)
-            .add('month', -1)
-            .format('YYYY-MM') + '-26';
+        const s_date = current.date.format('YYYY-MM') + '-01';
+        const e_date = moment(s_date)
+          .add('month', 1)
+          .add('days', -1)
+          .format('YYYY-MM-DD');
+        // const e_date = current.date.format('YYYY-MM') + '-25';
+        // const s_date =
+        //   moment(e_date)
+        //     .add('month', -1)
+        //     .format('YYYY-MM') + '-26';
         dispatch({
           type: 'workload/queryWorkHours',
           payload: {