Merge branch 'master' of http://120.55.44.4:10080/xujunjie/WorkloadWeb

src/pages/PurchaseAdmin/PurchaseList/Approval/MemberModal.js

@@ -8,7 +8,8 @@ const { TabPane } = Tabs;
 const STATUS = [
   { value: 1, label: '售前' },
   { value: 2, label: '执行' },
-  { value: 4, label: '运营' },
+  { value: 4, label: '研发' },
+  { value: 5, label: '运营' },
   { value: 6, label: '质保' },
 ];
 

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) {
@@ -269,6 +281,11 @@ function List(props) {
         .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: {
@@ -315,6 +332,11 @@ function List(props) {
           .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: {
@@ -349,14 +371,12 @@ function List(props) {
     };
   }, [currentUser.ID]);
 
-  // useEffect(() => {
-  //   onChangeDate(current.date);
-  // }, [dataList]);
   useEffect(() => {
     dispatch({
       type: 'workload/fetchDepV2',
     });
   }, []);
+
   return (
     <div>
       <Spin spinning={loading}>