更新2023-08-18周功能

src/pages/budgetMana/monthlyDataCheck/index.tsx

@@ -4,7 +4,7 @@
  * @Author: code4eat awesomedema@gmail.com
  * @Date: 2022-12-16 09:42:52
  * @LastEditors: code4eat awesomedema@gmail.com
- * @LastEditTime: 2023-07-27 14:45:47
+ * @LastEditTime: 2023-08-15 10:22:08
  * @FilePath: /BudgetManaSystem/src/pages/budgetMana/monthlySet/index.tsx
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
@@ -179,7 +179,6 @@ const MonthlyDataCheck: React.FC = () => {
             title: '工资类型',
             dataIndex: 'salaryType',
             key: 'salaryType',
-
         },
 
     ]
@@ -329,7 +328,7 @@ const MonthlyDataCheck: React.FC = () => {
             width: 200,
             render: (text: any, record: any) => {
 
-                if(ifBanAllAction)return text;
+                if(ifBanAllAction)return formatMoneyNumber(text);
 
                 return (
                     <div style={{ display: 'flex', flexDirection: 'row', width: '100%', justifyContent: 'flex-start', alignItems: 'center' }}>
@@ -1496,13 +1495,13 @@ const MonthlyDataCheck: React.FC = () => {
                                                     align: 'center',
                                                     width: '10%',
                                                     render: (text: any, record: any) => {
-                                                        if (ifBanAllAction) return text;
+                                                        if (ifBanAllAction) return formatMoneyNumber(text);
                                                         return (
                                                             <div style={{ display: 'flex', flexDirection: 'row', width: '100%', justifyContent: 'center', alignItems: 'center' }}>
 
                                                                 <div style={{ width: '80px', height: 16, display: 'flex', flexDirection: 'row', justifyContent: 'center', alignItems: 'center' }}>
                                                                     {
-                                                                        editTableCellId == record.id ? <Input size='small' defaultValue={record.salary} placeholder='请输入' onChange={(e) => { set_inputSalaryNum(Number(e.target.value)) }} style={{ width: '80px' }} /> : <span>{text}</span>
+                                                                        editTableCellId == record.id ? <Input size='small' defaultValue={record.salary} placeholder='请输入' onChange={(e) => { set_inputSalaryNum(Number(e.target.value)) }} style={{ width: '80px' }} /> : <span>{formatMoneyNumber(text)}</span>
                                                                     }
                                                                 </div>
                                                                 {auditType == '0' && <img onClick={() => editHandle(record, '1')} style={{ width: 16, height: 16, cursor: 'pointer', marginLeft: 8 }} src={editTableCellId == record.id ? conformIcon : editIcon} alt="" />}
@@ -1537,13 +1536,13 @@ const MonthlyDataCheck: React.FC = () => {
                                                         width: '10%',
                                                         // shouldCellUpdate:(record:any, prevRecord:any) => true,
                                                         render: (text: any, record: any) => {
-                                                            if (ifBanAllAction) return text;
+                                                            if (ifBanAllAction) return formatMoneyNumber(text);
                                                             return (
                                                                 <div style={{ display: 'flex', flexDirection: 'row', width: '100%', justifyContent: 'center', alignItems: 'center' }}>
 
                                                                     <div style={{ width: '80px', height: 16, display: 'flex', flexDirection: 'row', justifyContent: 'center', alignItems: 'center' }}>
                                                                         {
-                                                                            editTableCellId == record.id ? <Input size='small' defaultValue={record.salary} placeholder='请输入' onChange={(e) => { set_inputSalaryNum(Number(e.target.value)) }} style={{ width: '80px' }} /> : <span>{text}</span>
+                                                                            editTableCellId == record.id ? <Input size='small' defaultValue={record.salary} placeholder='请输入' onChange={(e) => { set_inputSalaryNum(Number(e.target.value)) }} style={{ width: '80px' }} /> : <span>{formatMoneyNumber(text)}</span>
                                                                         }
                                                                     </div>
                                                                     {auditType == '0' && <img onClick={() => editHandle(record, '1')} style={{ width: 16, height: 16, cursor: 'pointer', marginLeft: 8 }} src={editTableCellId == record.id ? conformIcon : editIcon} alt="" />}
@@ -2039,6 +2038,3 @@ const MonthlyDataCheck: React.FC = () => {
 
 export default MonthlyDataCheck;
 
-function whatCanIDoInThisPage(pathname: string) {
-    throw new Error('Function not implemented.');
-}

src/pages/budgetMana/oneBatch/index.tsx

@@ -2,7 +2,7 @@
  * @Author: code4eat awesomedema@gmail.com
  * @Date: 2023-01-04 14:12:31
  * @LastEditors: code4eat awesomedema@gmail.com
- * @LastEditTime: 2023-07-24 13:30:07
+ * @LastEditTime: 2023-08-15 10:47:59
  * @FilePath: /BudgetManaSystem/src/pages/budgetMana/oneBatch/index.tsx
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
@@ -27,6 +27,7 @@ import { convertToColumns } from '@/utils/tooljs';
 import * as XLSX from 'xlsx';
 import exportTableToMultiExcel from '@/utils/tableToMultiHeaderExcel';
 import { getJiezhuanStatus } from '../monthlySet/service';
+import { formatMoneyNumber } from '@/utils/format';
 
 
 const config = {
@@ -49,6 +50,7 @@ type Column = {
   key: string;
   ellipsis: boolean;
   width: number;
+  renderText?:any,
   children?: Column[];
 };
 
@@ -255,6 +257,9 @@ const OneBatch = () => {
         key: `key-${item.code}`,
         ellipsis: true,
         width: 200,
+        renderText(text:any){
+             return formatMoneyNumber(text)
+        }
       };
 
       const isExpanded = expandedkeys.includes(item.code);
@@ -339,7 +344,10 @@ const OneBatch = () => {
           key: 'totalScore',
           width: 140,
           fixed: 'right',
-          ellipsis: true
+          ellipsis: true,
+          renderText(text, record, index, action) {
+                return formatMoneyNumber(text)
+          },
 
         }]);
 
@@ -374,7 +382,10 @@ const OneBatch = () => {
           key: 'totalScore',
           width: 140,
           fixed: 'right',
-          ellipsis: true
+          ellipsis: true,
+          renderText(text, record, index, action) {
+            return formatMoneyNumber(text)
+          },
 
         }]);
 

src/pages/reportCheck/report/index.tsx

@@ -2,7 +2,7 @@
  * @Author: code4eat awesomedema@gmail.com
  * @Date: 2023-01-04 14:12:31
  * @LastEditors: code4eat awesomedema@gmail.com
- * @LastEditTime: 2023-07-12 16:25:52
+ * @LastEditTime: 2023-08-18 17:47:59
  * @FilePath: /BudgetManaSystem/src/pages/budgetMana/oneBatch/index.tsx
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
@@ -12,7 +12,7 @@ import BMSPagecontainer from '@/components/BMSPageContainer'
 import { BMSTable } from '@/components/BMSTable';
 import { getComputeDate } from '@/pages/Home/service';
 import { ActionType, ProColumns } from '@ant-design/pro-components';
-import { Space, Dropdown, MenuProps,DatePicker } from 'antd';
+import { Space, Dropdown, MenuProps, DatePicker } from 'antd';
 import { useEffect, useRef, useState } from 'react';
 import { getData, getRedirReportData } from './service';
 
@@ -28,6 +28,7 @@ import exportTableToExcel from '@/utils/tableToExcel';
 import 'moment/locale/zh-cn';
 import locale from 'antd/es/date-picker/locale/zh_CN';
 import moment from 'moment';
+import { formatMoneyNumber } from '@/utils/format';
 
 
 
@@ -163,7 +164,7 @@ const ReportTemplate = () => {
               }
             }
 
-            return <span >{_}</span>
+            return <span >{(item.dataType&&item.dataType == 2)?formatMoneyNumber(_):_}</span>
           }
 
         }
@@ -240,13 +241,13 @@ const ReportTemplate = () => {
       ...data
     ];
 
-    exportTableToExcel(excelTableData, headers, reportName);
+    exportTableToExcel(excelTableData, tableColumn, reportName);
   }
 
 
   //面包屑跳转
   const switchHandle = (data: any) => {
-
+    console.log({ data });
     set_step(data.index);
     const _breadCrumbList = breadCrumbList.filter((a: any) => a.index <= data.index);
     set_breadCrumbList([..._breadCrumbList]);
@@ -256,13 +257,18 @@ const ReportTemplate = () => {
 
   useEffect(() => {
     // 在这里处理路由参数变化的逻辑
-    set_tableDataFilterParams({ reportCode: urlReportCode, parameter: { compute_date: currentComputeDate } });
-    set_breadCrumbList([{
-      name: '首页',
-      index: 0,
-      params: { reportCode: urlReportCode, parameter: { compute_date: currentComputeDate } }
-    }])
-  }, [urlReportCode]);
+    if (currentComputeDate) {
+
+      set_tableDataFilterParams({ reportCode: urlReportCode, parameter: { compute_date: currentComputeDate } });
+      set_breadCrumbList([{
+        name: '首页',
+        index: 0,
+        params: { reportCode: urlReportCode, parameter: { compute_date: currentComputeDate } }
+      }])
+
+    }
+
+  }, [urlReportCode, currentComputeDate]);
 
 
   useEffect(() => {

src/pages/secondaryDistribute/employeeInfoCheck/index.tsx

@@ -4,7 +4,7 @@
  * @Author: code4eat awesomedema@gmail.com
  * @Date: 2022-12-16 09:42:52
  * @LastEditors: code4eat awesomedema@gmail.com
- * @LastEditTime: 2023-08-10 15:47:05
+ * @LastEditTime: 2023-08-17 15:16:36
  * @FilePath: /BudgetManaSystem/src/pages/budgetMana/monthlySet/index.tsx
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
@@ -16,7 +16,7 @@ import BMSPagecontainer from '@/components/BMSPageContainer';
 import { useEffect, useImperativeHandle, useRef, useState } from 'react';
 import './style.less';
 
-import { TreeProps, Input, Modal, Transfer, Popconfirm, message, Popover } from 'antd';
+import { TreeProps, Input, Modal, Transfer, Popconfirm, message, Popover, DatePicker } from 'antd';
 import { DataNode } from 'antd/es/tree';
 
 import expandedIcon from '../../../../static/treenode_open.png';
@@ -28,6 +28,10 @@ import { commitRequest, delPersonRequest, generateDataRequest, getCurrentCommitS
 import { TransferItem, TransferProps } from 'antd/es/transfer';
 import { getComputeDate } from '@/pages/Home/service';
 
+import 'moment/locale/zh-cn';
+import locale from 'antd/es/date-picker/locale/zh_CN';
+import moment from 'moment';
+
 
 import 'dayjs/locale/zh-cn';
 import React from 'react';
@@ -619,29 +623,47 @@ const EmployeeInfoCheck: React.FC = () => {
             </div>
             {/* <div style={{width:16,height:'92vh',background:'#F5F7FA'}}></div> */}
             <div className='rightContent'>
-                <BMSPagecontainer title={`核算年月：${currentComputeDate}`} ghost>
+                <BMSPagecontainer title={false} ghost>
                     <div className='tabContent'>
                         <div className='tableToolbar'>
                             <div className='search'>
-                                <span>人员：</span><Input className='searchInput' allowClear onChange={(e) => {
-
-                                    set_empInfoSearchKeywords(e.target.value)
-                                    if (e.target.value.length == 0) {
-                                        set_empFilterParams({
-                                            ...empFilterParams,
-                                            empInfo: ''
-                                        });
-                                    }
-                                }} placeholder="输入工号/姓名" suffix={
-                                    <IconFont type="iconsousuo" onClick={() => searchEmpHandle()} />
-                                } />
+                                <div style={{ marginRight: 16 }}>
+                                    <span>核算年月：</span>
+                                    {currentComputeDate&&<DatePicker
+                                        onChange={(data, dateString) => {
+                                            if (dateString) {
+                                                set_empFilterParams({ ...empFilterParams, computeDate: dateString })
+                                            } else {
+                                                set_empFilterParams({ ...empFilterParams, computeDate: currentComputeDate })
+                                            }
+                                        }}
+                                        allowClear={true}
+                                        picker='month'
+                                        locale={locale}
+                                        defaultValue={moment(currentComputeDate,'YYYY-MM')} 
+                                        format='YYYY-MM' placeholder="请选择核算年月" />}
+                                </div>
+                                <>
+                                    <span>人员：</span><Input className='searchInput' allowClear onChange={(e) => {
+
+                                        set_empInfoSearchKeywords(e.target.value)
+                                        if (e.target.value.length == 0) {
+                                            set_empFilterParams({
+                                                ...empFilterParams,
+                                                empInfo: ''
+                                            });
+                                        }
+                                    }} placeholder="输入工号/姓名" suffix={
+                                        <IconFont type="iconsousuo" onClick={() => searchEmpHandle()} />
+                                    } />
+                                </>
                             </div>
 
                             <div className='btnGroupWrap'>
                                 {
                                     !ifBanAllAction && (
                                         <Popover open={ifShowTip} content={'当前处于提交中，无法操作！'} >
-                                            <div className={commitStatus != '0'? 'btnGroup disabled' : 'btnGroup'}
+                                            <div className={commitStatus != '0' ? 'btnGroup disabled' : 'btnGroup'}
                                                 /**
                                                  * 当审核中，三个操作按钮都不可点击
                                                  * 当非审核中，生成和添加不可操作
@@ -649,14 +671,14 @@ const EmployeeInfoCheck: React.FC = () => {
                                                 onMouseEnter={() => commitStatus == '1' ? set_ifShowTip(true) : set_ifShowTip(false)}
                                                 onMouseLeave={() => set_ifShowTip(false)}
                                             >
-                                                <span key="2" onClick={commitStatus == '0'? () => generateFunc() : () => { }}>生成</span>
-                                                <span key="3" onClick={commitStatus == '0'? () => addPersonFunc() : () => { }}>添加</span>
+                                                <span key="2" onClick={commitStatus == '0' ? () => generateFunc() : () => { }}>生成</span>
+                                                <span key="3" onClick={commitStatus == '0' ? () => addPersonFunc() : () => { }}>添加</span>
                                             </div>
                                         </Popover>
                                     )
                                 }
 
-                                {!ifBanAllAction&&<div key="4" className={'commit'} onClick={() => commitBtnhandle() }>{commitStatus == '1' ? '取消提交' : '提交'}</div>}
+                                {!ifBanAllAction && <div key="4" className={'commit'} onClick={() => commitBtnhandle()}>{commitStatus == '1' ? '取消提交' : '提交'}</div>}
                             </div>
 
                         </div>

src/pages/secondaryDistribute/employeeInfoCheck/style.less

@@ -51,6 +51,7 @@
         border-radius: 4px;
         width: calc(100% - 220px);
         padding: 16px;
+        padding-top: 0;
         margin-left: 236px;
         background: #FFF;
 

src/pages/secondaryDistribute/nonCheckProjectApprove/index.tsx

@@ -4,7 +4,7 @@
  * @Author: code4eat awesomedema@gmail.com
  * @Date: 2022-12-16 09:42:52
  * @LastEditors: code4eat awesomedema@gmail.com
- * @LastEditTime: 2023-07-21 17:59:16
+ * @LastEditTime: 2023-08-17 15:11:34
  * @FilePath: /BudgetManaSystem/src/pages/budgetMana/monthlySet/index.tsx
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
@@ -13,10 +13,10 @@
 
 import BMSPagecontainer from '@/components/BMSPageContainer';
 
-import { useEffect, useImperativeHandle, useRef, useState } from 'react';
+import { useEffect, useRef, useState } from 'react';
 import './style.less';
 
-import { TreeProps, Input, Modal, Transfer, Popconfirm, message, Popover } from 'antd';
+import { TreeProps, Input, Modal, Popconfirm, message, Popover, DatePicker } from 'antd';
 import { DataNode } from 'antd/es/tree';
 
 import expandedIcon from '../../../../static/treenode_open.png';
@@ -34,6 +34,10 @@ import React from 'react';
 import DirectoryTree from 'antd/es/tree/DirectoryTree';
 import { getDeepestTreeData } from '@/utils/tooljs';
 
+import 'moment/locale/zh-cn';
+import locale from 'antd/es/date-picker/locale/zh_CN';
+import moment from 'moment';
+
 
 import { getCheckUnitDepMapTableDataByUnitClass } from '@/pages/setting/checkUnitSet/checkUnitDepMap/service';
 import { getPersonInfoTableData } from '../employeeInfoCheck/service';
@@ -602,22 +606,42 @@ const NonCheckProjectApprove: React.FC = () => {
             </div>
             {/* <div style={{width:16,height:'92vh',background:'#F5F7FA'}}></div> */}
             <div className='rightContent'>
-                <BMSPagecontainer title={`核算年月：${currentComputeDate}`} ghost>
+                <BMSPagecontainer title={false} ghost>
                     <div className='tabContent'>
                         <div className='tableToolbar'>
                             <div className='search'>
-                                <span>检索：</span><Input className='searchInput' allowClear onChange={(e) => {
+                                <div style={{ marginRight: 16 }}>
+                                    <span>核算年月：</span>
+                                    {currentComputeDate&&<DatePicker
+                                        onChange={(data, dateString) => {
+                                            if (dateString) {
+                                                set_empFilterParams({ ...empFilterParams, computeDate: dateString });
+                                            } else {
+                                                set_empFilterParams({ ...empFilterParams, computeDate: currentComputeDate });
+                                            }
+
+                                        }}
+                                        allowClear={true}
+                                        picker='month'
+                                        locale={locale}
+                                        defaultValue={moment(currentComputeDate,'YYYY-MM')} 
+                                        format='YYYY-MM' placeholder="请选择核算年月" />}
+                                </div>
+                                <>
+                                    <span>检索：</span><Input className='searchInput' allowClear onChange={(e) => {
+
+                                        set_empInfoSearchKeywords(e.target.value)
+                                        if (e.target.value.length == 0) {
+                                            set_empFilterParams({
+                                                ...empFilterParams,
+                                                name: ''
+                                            });
+                                        }
+                                    }} placeholder="输入工号/姓名" suffix={
+                                        <IconFont type="iconsousuo" onClick={() => searchEmpHandle()} />
+                                    } />
+                                </>
 
-                                    set_empInfoSearchKeywords(e.target.value)
-                                    if (e.target.value.length == 0) {
-                                        set_empFilterParams({
-                                            ...empFilterParams,
-                                            name: ''
-                                        });
-                                    }
-                                }} placeholder="输入工号/姓名" suffix={
-                                    <IconFont type="iconsousuo" onClick={() => searchEmpHandle()} />
-                                } />
                             </div>
 
                             <div className='btnGroupWrap'>

src/pages/secondaryDistribute/nonCheckProjectApprove/style.less

@@ -51,6 +51,7 @@
         border-radius: 4px;
         width: calc(100% - 220px);
         padding: 16px;
+        padding-top: 0;
         margin-left: 236px;
         background: #FFF;
 

src/pages/secondaryDistribute/secondaryDitriComputed/index.tsx

@@ -4,7 +4,7 @@
  * @Author: code4eat awesomedema@gmail.com
  * @Date: 2022-12-16 09:42:52
  * @LastEditors: code4eat awesomedema@gmail.com
- * @LastEditTime: 2023-08-08 09:41:09
+ * @LastEditTime: 2023-08-18 10:52:47
  * @FilePath: /BudgetManaSystem/src/pages/budgetMana/monthlySet/index.tsx
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
@@ -44,6 +44,7 @@ import 'moment/locale/zh-cn';
 import locale from 'antd/es/date-picker/locale/zh_CN';
 import moment from 'moment';
 import { getJiezhuanStatus } from '@/pages/budgetMana/monthlySet/service';
+import { formatMoneyNumber } from '@/utils/format';
 
 
 
@@ -179,7 +180,7 @@ const SecondaryDitriComputed: React.FC = () => {
             return {
                 title: item.name,
                 dataIndex: `${item.code}`,
-                width: 120,
+                width: 160,
                 renderText: (_: any, record: any) => {
                     if (ifEditMode) {
 
@@ -245,9 +246,9 @@ const SecondaryDitriComputed: React.FC = () => {
                             onFocus: () => set_currentInputRefKeys(`${record.account}-${item.code}`),
                             defaultValue: _,
 
-                        }} width={80} />
+                        }} width={120} />
                     } else {
-                        return <span style={{ display: 'inline-block', width: 80 }}>{_}</span>
+                        return <span style={{ display: 'inline-block', width: 80 }}>{formatMoneyNumber(_)}</span>
                     }
                 },
             }
@@ -257,15 +258,11 @@ const SecondaryDitriComputed: React.FC = () => {
             dataIndex: 'totalScore',
             width: 120,
             fixed: 'right',
+            renderText(text, record, index, action) {
+                    return formatMoneyNumber(text);
+            },
+            
         },
-            // {
-            //     title: '状态',
-            //     width:120,
-            //     dataIndex: 'submitName',
-            //     renderText(text, record, index, action) {
-            //         return record.submit == 1 ? text : <span style={{ color: '#FF8C19' }}>{text}</span>
-            //     },
-            // },
         ]);
 
 
@@ -315,48 +312,6 @@ const SecondaryDitriComputed: React.FC = () => {
         set_dataSource(data)
     }
 
-    const checkIfCommit = (type: number) => {
-        // type 1 当前 2 全部
-        //检查当前单元是否提交
-        if (type == 1) {
-            //currentUnitAuditType == 1 时是取消操作无需校验
-            return currentUnitAuditType == '1' ? true : currentSelectedTreeNode.map
-        }
-        if (type == 2 && auditType == '0') {
-            //auditType == 1 时是取消操作无需校验
-            interface Node {
-                map: boolean;
-                child?: Node[];
-            }
-
-            function filterNodes(node: Node): Node | null {
-                if (node.map === false && (!node.child || node.child.length === 0)) {
-                    return node; // 如果节点map为false并且是叶子节点，返回该节点
-                }
-
-                if (Array.isArray(node.child)) {
-                    // 对每个子节点递归执行此过程
-                    let child = node.child.map(filterNodes).filter((n): n is Node => n !== null);
-                    if (child.length > 0) {
-                        // 如果有任何子节点的map属性为false，返回包含这些子节点的新节点
-                        return { ...node, child: child };
-                    }
-                }
-
-                // 如果节点map为true，或者所有子节点的map都为true，返回null
-                return null;
-            }
-
-            const result = treeData.map(a => {
-                return filterNodes(a);
-            });
-
-            return result.length == 0
-
-        } else {
-            return true
-        }
-    }
 
     const commitBtnhandle = async (type?: number) => {
         //console.log({type});
@@ -905,7 +860,7 @@ const SecondaryDitriComputed: React.FC = () => {
                                     }, 0);
                                     if (dataIndex != 'account' && dataIndex != 'name' && dataIndex != 'submitName') {
                                         return (
-                                            <span>{Number(total.toFixed(2))}</span>
+                                            <span>{formatMoneyNumber(Number(total.toFixed(2)))}</span>
                                         )
                                     }
                                     if (dataIndex == 'name') {
@@ -915,7 +870,6 @@ const SecondaryDitriComputed: React.FC = () => {
 
                                 }
 
-
                                 return (
                                     <Table.Summary fixed>
                                         <Table.Summary.Row>

src/pages/secondaryDistribute/unitCheckProjectScore/index.tsx

@@ -4,7 +4,7 @@
  * @Author: code4eat awesomedema@gmail.com
  * @Date: 2022-12-16 09:42:52
  * @LastEditors: code4eat awesomedema@gmail.com
- * @LastEditTime: 2023-08-11 11:30:07
+ * @LastEditTime: 2023-08-18 10:51:05
  * @FilePath: /BudgetManaSystem/src/pages/budgetMana/monthlySet/index.tsx
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
@@ -16,7 +16,7 @@ import BMSPagecontainer from '@/components/BMSPageContainer';
 import { useEffect, useRef, useState } from 'react';
 import './style.less';
 
-import { TreeProps, Input, Modal, message, Popover, Table, Switch, Tooltip } from 'antd';
+import { TreeProps, Input, Modal, message, Popover, DatePicker, Tooltip } from 'antd';
 import { DataNode } from 'antd/es/tree';
 
 import { TransferItem, TransferProps } from 'antd/es/transfer';
@@ -166,7 +166,8 @@ const UnitCheckProjectScore: React.FC = () => {
             const resp = await getWorkData({
                 computeDate: currentComputeDate as string,
                 unitCode: currentSelectedTreeNode.code,
-                empNo: currentComputeEmp.empNo
+                empNo: currentComputeEmp.empNo,
+                code: currentComputeEmp.colCode
             });
             if (resp) {
                 set_datasource(resp);
@@ -186,13 +187,13 @@ const UnitCheckProjectScore: React.FC = () => {
             const total = needData.reduce((prev: number, cur: any) => prev + cur.indicatorValue, 0);
 
             const value = total.toFixed(4);
-           
+
             const resp = await saveWorkLang({
                 computeDate: currentComputeDate as string,
                 unitCode: currentSelectedTreeNode.code,
-                empNo:currentComputeEmp.empNo,
-                code:currentComputeEmp.colCode,
-                value:value
+                empNo: currentComputeEmp.empNo,
+                code: currentComputeEmp.colCode,
+                value: value
             });
 
             if (resp) {
@@ -232,7 +233,7 @@ const UnitCheckProjectScore: React.FC = () => {
                         },
                     }}
                     rowKey='id'
-                    scroll={{y:400}}
+                    scroll={{ y: 400 }}
                     tableAlertRender={false}
                     rowSelection={{
                         // 自定义选择项参考: https://ant.design/components/table-cn/#components-table-demo-row-selection-custom
@@ -240,7 +241,7 @@ const UnitCheckProjectScore: React.FC = () => {
                         // selections: [Table.SELECTION_ALL, Table.SELECTION_INVERT],
                         onChange: onSelectChange,
                     }}
-                    pagination={{  showTitle: false,showSizeChanger:true }}
+                    pagination={{ showTitle: false, showSizeChanger: true }}
                     dataSource={showList}
                 />
                 <div className='footer'>
@@ -354,7 +355,7 @@ const UnitCheckProjectScore: React.FC = () => {
             return {
                 title: <div>{item.name}{item.source == 2 && <span style={{ display: 'inline-flex', marginLeft: 5, justifyContent: 'center', alignItems: 'center', width: 14, height: 14, borderRadius: 4, background: '#80BFFF', color: '#fff' }}>A</span>}</div>,
                 dataIndex: `${item.code}`,
-                width: 120,
+                width: 160,
                 renderText: (_: any, record: any) => {
                     if (ifEditMode) {
 
@@ -401,13 +402,13 @@ const UnitCheckProjectScore: React.FC = () => {
                             />
                         }
 
-                        return <ProFormDigit noStyle min={-1000000000} fieldProps={{
+                        return <ProFormDigit noStyle min={-1000000000} width={120} fieldProps={{
                             ref: ref => {
                                 inputsRef.current[`${record.empNo}-${item.code}`] = ref;
                                 inputsRefKeys?.push(`${record.empNo}-${item.code}`);
                                 //console.log({ref});
                             },
-                            
+
                             onBlur: () => {
                                 const updatedList = needSaveData.secondValueVos.map((a: any) => {
                                     if (a.empNo == record.empNo) {
@@ -481,10 +482,10 @@ const UnitCheckProjectScore: React.FC = () => {
                                     }
                                 }
                             },
-                            onFocus: () => {set_currentInputRefKeys(`${record.empNo}-${item.code}`);currentComputeEmp = { ...record, colCode: item.code };},
+                            onFocus: () => { set_currentInputRefKeys(`${record.empNo}-${item.code}`); currentComputeEmp = { ...record, colCode: item.code }; },
                             defaultValue: _,
 
-                        }} width={80} />
+                        }} />
                     } else {
                         return <span style={{ display: 'block' }}>{_}{item.source == 3 && <img onClick={() => calcuHanle({ ...record, colCode: item.code })} style={{ width: 16, height: 16, cursor: 'pointer', marginLeft: 8 }} src={require('../../../../static/calcu.png')} />}</span>
                     }
@@ -951,26 +952,47 @@ const UnitCheckProjectScore: React.FC = () => {
             </div>
             {/* <div style={{width:16,height:'92vh',background:'#F5F7FA'}}></div> */}
             <div className='rightContent'>
-                <BMSPagecontainer title={`核算年月：${currentComputeDate}`} ghost>
+                <BMSPagecontainer title={false} ghost>
                     <div className='tabContent'>
                         <div className='tableToolbar'>
                             <div className='search'>
-                                <span className='label'>检索：</span>
-                                <Input placeholder={'请输入姓名'} allowClear
-                                    suffix={
-                                        <IconFont style={{ color: '#99A6BF' }} type="iconsousuo" />
-                                    }
-                                    onChange={(e) => {
-                                        if (e.target.value.length > 0) {
-                                            const result = tableData.filter((a: any) => a.Employee.indexOf(e.target.value) != -1);
-                                            set_dataSource(result);
-                                        } else {
-                                            set_dataSource(tableData);
+                                <div style={{ marginRight: 16 }}>
+                                    <span>核算年月：</span>
+                                    {currentComputeDate&&<DatePicker
+                                        onChange={(data, dateString) => {
+                                            if (dateString) {
+                                                set_currentComputeDate(dateString)
+                                            } else {
+                                                getCurrentComputeDate();
+                                            }
+
+                                        }}
+                                        allowClear={true}
+                                        picker='month'
+                                        defaultValue={moment(currentComputeDate,'YYYY-MM')} 
+                                        locale={locale}
+                                        format='YYYY-MM' placeholder="请选择核算年月" />}
+                                    
+                                </div>
+                                <>
+                                    <span className='label'>检索：</span>
+                                    <Input placeholder={'请输入姓名'} allowClear
+                                        style={{ width: 160 }}
+                                        suffix={
+                                            <IconFont style={{ color: '#99A6BF' }} type="iconsousuo" />
                                         }
+                                        onChange={(e) => {
+                                            if (e.target.value.length > 0) {
+                                                const result = tableData.filter((a: any) => a.Employee.indexOf(e.target.value) != -1);
+                                                set_dataSource(result);
+                                            } else {
+                                                set_dataSource(tableData);
+                                            }
 
-                                    }}
+                                        }}
 
-                                />
+                                    />
+                                </>
                             </div>
 
                             <div className='btnGroupWrap'>

src/pages/secondaryDistribute/unitCheckProjectScore/style.less

@@ -179,6 +179,7 @@
         border-radius: 4px;
         width: calc(100% - 220px);
         padding: 16px;
+        padding-top: 0;
         margin-left: 236px;
         background: #FFF;
 

src/pages/setting/checkUnitSet/medicalGroupSet/service.ts

@@ -2,7 +2,7 @@
  * @Author: code4eat awesomedema@gmail.com
  * @Date: 2023-03-07 11:12:10
  * @LastEditors: code4eat awesomedema@gmail.com
- * @LastEditTime: 2023-08-10 17:31:00
+ * @LastEditTime: 2023-08-15 10:02:59
  * @FilePath: /KC-MiddlePlatform/src/pages/platform/setting/pubDicMana/service.ts
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
@@ -107,7 +107,7 @@ export const getMedicalAllEmp = (params:{medicalGroupCode:string}) => {
 
 
 //获取工作量
-export const getWorkData = (params:{computeDate:string,unitCode:string,empNo:string}) => {
+export const getWorkData = (params:{computeDate:string,unitCode:string,empNo:string,code:string}) => {
   return request('/performance/secondSetting/getEmpWorkload', {
     method: 'GET',
     params

src/pages/setting/projectSetting/secondaryDistriGroupSet/index.tsx

@@ -2,7 +2,7 @@
  * @Author: code4eat awesomedema@gmail.com
  * @Date: 2023-03-03 11:30:33
  * @LastEditors: code4eat awesomedema@gmail.com
- * @LastEditTime: 2023-08-11 15:49:51
+ * @LastEditTime: 2023-08-18 10:28:59
  * @FilePath: /KC-MiddlePlatform/src/pages/platform/setting/pubDicTypeMana/index.tsx
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
@@ -519,7 +519,7 @@ const SecondaryDistriGroupSet = () => {
 
                                     return (
                                         <div className='item' key={index}>
-                                            <ProFormSelect label="管理指标：" width={160} 
+                                            <ProFormSelect label="二次分配项目：" width={160} 
                                                 name={`secondItemCode${item.id}`}
                                                  request={async () => {
                                                     const resp = await getSecondaryProjectDistriData({pageSize:1000,current:1});

src/pages/setting/projectSetting/secondaryProjectDistribute/index.tsx

@@ -2,7 +2,7 @@
  * @Author: code4eat awesomedema@gmail.com
  * @Date: 2023-03-03 11:30:33
  * @LastEditors: code4eat awesomedema@gmail.com
- * @LastEditTime: 2023-08-10 16:44:19
+ * @LastEditTime: 2023-08-18 10:25:27
  * @FilePath: /KC-MiddlePlatform/src/pages/platform/setting/pubDicTypeMana/index.tsx
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
@@ -277,7 +277,7 @@ export default function BilingProjectMana() {
         return (
             <ModalForm
                 className='SecondaryProjectDistriSet-ModalForm'
-                title={`${type == 'EDIT' ? '编辑' : '新增'}${type == 'SCORE' ? '级别' : '二次分配项目'}`}
+                title={`${type == 'EDIT' ? '编辑' : '新增'}${type == 'SCORE' ? '项目评级设定' : '二次分配项目'}`}
                 width={352}
                 initialValues={type == 'EDIT' ? { ...record } : type == 'SCORE' ? { ...scoreInitList } : {}}
                 trigger={

src/pages/setting/reportSet/reportListMana/index.tsx

@@ -2,7 +2,7 @@
  * @Author: code4eat awesomedema@gmail.com
  * @Date: 2023-03-03 11:30:33
  * @LastEditors: code4eat awesomedema@gmail.com
- * @LastEditTime: 2023-07-31 15:00:48
+ * @LastEditTime: 2023-08-17 10:08:21
  * @FilePath: /KC-MiddlePlatform/src/pages/platform/setting/pubDicTypeMana/index.tsx
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
@@ -65,7 +65,10 @@ export default function ReportListMana() {
             title: '取数类型',
             dataIndex: 'dataSource',
             ellipsis:true,
-            render: (_: any) => _ == 1 ? '指标' : '自定义SQL'
+            //render: (_: any) => _ == 1 ? '指标' : '自定义SQL',
+            renderText(num, record, index, action) {
+                return num == 1 ? '指标' : '自定义SQL'
+            },
         },
         {
             title: '取数来源',

src/utils/tableToExcel.ts

@@ -2,7 +2,7 @@
  * @Author: code4eat awesomedema@gmail.com
  * @Date: 2023-05-31 11:18:30
  * @LastEditors: code4eat awesomedema@gmail.com
- * @LastEditTime: 2023-07-12 15:45:33
+ * @LastEditTime: 2023-08-18 16:03:12
  * @FilePath: /BudgetManaSystem/src/utils/tableToExcel.ts
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
@@ -50,7 +50,7 @@ function getMerges(columns: Column[], startRow = 0, startCol = 0): Merge[] {
   return merges;
 }
 
-function exportTableToExcel(tableData: DataType[], columns: Column[], fileName = 'data') {
+function exportTableToExcel(tableData: DataType[], columns: any[], fileName = 'data') {
   const dataValues = tableData.map(row => Object.values(row));
 
   // 获取合并项

src/utils/tableToMultiHeaderExcel.ts

@@ -79,7 +79,6 @@ function processColumns(columns: Column[], startRow = 0, startCol = 0, maxDepth
         colIndex = endCol + 1;
     }
      
-    console.log({headers, merges,colIndex});
     return { headers, merges };
 }