完成2023-09-01周的功能

src/pages/budgetMana/personnelSalaryBudget/index.tsx

@@ -2,7 +2,7 @@
  * @Author: code4eat awesomedema@gmail.com
  * @Date: 2023-01-03 14:20:22
  * @LastEditors: code4eat awesomedema@gmail.com
- * @LastEditTime: 2023-08-11 09:37:42
+ * @LastEditTime: 2023-08-25 17:55:28
  * @FilePath: /BudgetManaSystem/src/pages/budgetMana/personnelSalaryBudget/index.tsx
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
@@ -77,7 +77,7 @@ const PersonnelSalaryBudget = () => {
             ellipsis:true
         },
         {
-            title: '奖金占比',
+            title: ifEditTable?'绩效奖金占比':'人事成本占比',
             dataIndex: 'percent',
             key: 'percent',
         },
@@ -87,13 +87,22 @@ const PersonnelSalaryBudget = () => {
             key: 'effectiveRate',
         },
         {
-            title: '人事成本',
+            title:ifEditTable?'绩效奖金':'人事成本',
             dataIndex: 'cost',
             key: 'cost',
             renderText(num, record, index, action) {
                 return formatMoneyNumber(num)
             },
         },
+        {
+            title: '固定工资',
+            dataIndex: 'salary',
+            hideInTable:ifEditTable,
+            key: 'salary',
+            renderText(num, record, index, action) {
+                return formatMoneyNumber(num)
+            },
+        },
         {
             title: '基金',
             dataIndex: 'fundBonus',
@@ -102,14 +111,7 @@ const PersonnelSalaryBudget = () => {
                 return formatMoneyNumber(num)
             },
         },
-        // {
-        //     title: '固定工资',
-        //     dataIndex: 'salary',
-        //     key: 'salary',
-        //     renderText(num, record, index, action) {
-        //         return formatMoneyNumber(num)
-        //     },
-        // },
+       
         {
             title: '专项补助',
             dataIndex: 'subsidies',
@@ -282,9 +284,9 @@ const PersonnelSalaryBudget = () => {
             const needItems = resp.list.filter((a:any)=>a.code =='1686657454764597248' );
             if(needItems.length>0){
                   if(needItems[0].value == '2'){
-                       set_ifEditTable(true);
+                       set_ifEditTable(false);
                   }else{
-                    set_ifEditTable(false);
+                    set_ifEditTable(true);
                   }
             }
         }
@@ -299,13 +301,14 @@ const PersonnelSalaryBudget = () => {
         }
     },[ifEditIncome,ifEditCost,ifEditRate]);
 
-
+    
     useEffect(() => {
         currentComputeDate && getCheckStatus(currentComputeDate);
         currentComputeDate && getJiezhuanStatusHandle();
     }, [currentComputeDate]);
 
 
+
     useEffect(() => {
 
         getCurrentComputeDate();
@@ -341,7 +344,7 @@ const PersonnelSalaryBudget = () => {
                         </div>
                     </div>
                     <div className='card'>
-                        <span>{ifEditTable?'奖金占比':'合理人事成本比例系数'}</span>
+                        <span>{ifEditTable?'绩效占有效收入比':'人事成本占比'}</span>
                         <div className='count'>
                             <span onClick={()=>auditType == '0'?set_ifEditRate(true):()=>{}}>{!ifEditRate&&pageData.rate}</span>
                             {(ifEditRate&&ifEditTable)&&<InputNumber precision={4} onChange={(num)=>{set_pageData({...pageData,rate:num?num:0})}}  style={{width:160}} autoFocus defaultValue={pageData.rate} onBlur={()=>{

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-08-18 17:47:59
+ * @LastEditTime: 2023-08-21 16:27:13
  * @FilePath: /BudgetManaSystem/src/pages/budgetMana/oneBatch/index.tsx
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
@@ -29,6 +29,7 @@ import 'moment/locale/zh-cn';
 import locale from 'antd/es/date-picker/locale/zh_CN';
 import moment from 'moment';
 import { formatMoneyNumber } from '@/utils/format';
+import { number } from 'mathjs';
 
 
 
@@ -62,7 +63,6 @@ const ReportTemplate = () => {
 
   const [reportName, set_reportName] = useState('')
 
-
   const reportJumphandle = (reportData: any) => {
 
     let parameter: { [key: string]: any } = {};
@@ -91,6 +91,7 @@ const ReportTemplate = () => {
       }
       ]
     );
+
     set_step(_step);
 
     set_tableDataFilterParams({
@@ -128,7 +129,7 @@ const ReportTemplate = () => {
 
       const { title, data: assignmentData, reportName } = resp;
       set_reportName(reportName);
-      const columns = title.map((item: any, index: number) => {
+      const columns:ProColumns[] = title.map((item: any, index: number) => {
         return {
           title: item.name,
           dataIndex: `${item.columnName}`,
@@ -154,17 +155,17 @@ const ReportTemplate = () => {
                 return <Dropdown menu={{ items }}>
                   <a onClick={(e) => e.preventDefault()}>
                     <Space>
-                      {_}
+                      {(item.dataType&&item.dataType == 2&&_)?formatMoneyNumber(Number(Number(_).toFixed(2))):_}
                       <DownOutlined />
                     </Space>
                   </a>
                 </Dropdown>
               } else {
-                return <a className='active' onClick={() => reportJumphandle({ ...item.redirectData[0], ...record })}>{_}</a>
+                return <a className='active' onClick={() => reportJumphandle({ ...item.redirectData[0], ...record })}>{(item.dataType&&item.dataType == 2 && _)?formatMoneyNumber(Number(Number(_).toFixed(2))):_}</a>
               }
             }
 
-            return <span >{(item.dataType&&item.dataType == 2)?formatMoneyNumber(_):_}</span>
+            return <span >{(item.dataType&&item.dataType == 2&& _)?formatMoneyNumber(Number(Number(_).toFixed(2))):_}</span>
           }
 
         }
@@ -222,7 +223,6 @@ const ReportTemplate = () => {
     let headers: { [key: string]: any } = {};
     let data: any[] = [];
     tableColumn.forEach(a => {
-      console.log({ a });
       if (a.hideInTable != 1) {
         headers[`${a.dataIndex}`] = a.title;
       }
@@ -301,7 +301,6 @@ const ReportTemplate = () => {
         {
           breadCrumbList.length > 1 && breadCrumbList.map((item: any, index: number) => {
             return (
-
               <span className={index != step ? 'tab' : 'tab actived'} key={index} onClick={() => { index != step && switchHandle(item) }}>{item.name}{index == breadCrumbList.length - 1 ? '' : ' / '}</span>
             )
           })

src/pages/setting/manaPerformanceSet/unitIndicTargetSet/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-06 19:56:49
+ * @LastEditTime: 2023-08-25 10:32:44
  * @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
  */
@@ -373,6 +373,7 @@ const UnitIndicTargetSet = () => {
                             dataSource={filteredItems}
                             size="small"
                             rowKey={'code'}
+                            scroll={{y:345}}
                             tableAlertRender={false}
                             pagination={{simple:true,pageSize:10}}
                             style={{ pointerEvents: listDisabled ? 'none' : undefined }}

src/pages/setting/projectSetting/costIncomeProjectSet/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-06 19:58:46
+ * @LastEditTime: 2023-09-01 16:10:22
  * @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
  */
@@ -50,7 +50,7 @@ export default function CostIncomeProjectSet() {
 
         {
             title: '项目代码',
-            dataIndex: 'code',
+            dataIndex: 'itemCode',
         },
         {
             title: '项目名称',
@@ -99,6 +99,10 @@ export default function CostIncomeProjectSet() {
             title: '项目名称',
             dataIndex: 'name',
         },
+        {
+            title: '项目代码',
+            dataIndex: 'itemCode',
+        },
         {
             title: '类型',
             dataIndex: 'itemTypeName',
@@ -197,15 +201,14 @@ export default function CostIncomeProjectSet() {
 
     const updateTable = async (formVal: any, type: 'EDIT' | "ADD") => {
 
-        console.log({ formVal });
-
         if (currentSelectedTabKey == '1') {
             const result = {
                 name: formVal.name,
                 opdFlag: formVal.scope.includes('门诊') ? 1 : 0,
                 inpFlag: formVal.scope.includes('住院') ? 1 : 0,
                 statFlag: formVal.statFlag,
-                seqNo: formVal.seqNo
+                seqNo: formVal.seqNo,
+                itemCode:formVal.itemCode
             }
 
             if (type == 'ADD') {
@@ -231,7 +234,8 @@ export default function CostIncomeProjectSet() {
                 summaryFlag: formVal.summaryFlag,
                 ctrlFlag: formVal.ctrlFlag,
                 statFlag: formVal.statFlag,
-                seqNo: formVal.seqNo
+                seqNo: formVal.seqNo,
+                itemCode:formVal.itemCode
             }
 
             if (type == 'ADD') {
@@ -297,6 +301,12 @@ export default function CostIncomeProjectSet() {
                                 placeholder="请输入"
                                 rules={[{ required: true, message: '名称不能为空!' }]}
                             />
+                            <ProFormText
+                                name="itemCode"
+                                label="项目代码："
+                                placeholder="请输入"
+                                rules={[{ required: true, message: '项目代码不能为空!' }]}
+                            />
                             <ProFormCheckbox.Group
                                 name="scope"
                                 label="适应范围："
@@ -337,6 +347,12 @@ export default function CostIncomeProjectSet() {
                                 placeholder="请输入"
                                 rules={[{ required: true, message: '名称不能为空!' }]}
                             />
+                            <ProFormText
+                                name="itemCode"
+                                label="项目代码："
+                                placeholder="请输入"
+                                rules={[{ required: true, message: '项目代码不能为空!' }]}
+                            />
                             <ProFormSelect
                                 name="itemType"
                                 label="类型："
@@ -498,8 +514,8 @@ export default function CostIncomeProjectSet() {
                 </div>
             </div>
             <div style={{ marginTop: 16 }}>
-                {currentSelectedTabKey == '2' ? (<BMSTable columns={columns as ProColumns[]} pagination={false} actionRef={tableRef} rowKey='id' params={tableDataFilterParams} request={(params) => getTableData(params)} />) : (
-                    <BMSTable columns={columns as ProColumns[]} actionRef={tableRef} rowKey='id' params={tableDataFilterParams} request={(params) => getTableData(params)} />
+                {currentSelectedTabKey == '2' ? (<BMSTable scroll={{y:690}} columns={columns as ProColumns[]} pagination={false} actionRef={tableRef} rowKey='id' params={tableDataFilterParams} request={(params) => getTableData(params)} />) : (
+                    <BMSTable scroll={{y:690}} columns={columns as ProColumns[]} actionRef={tableRef} rowKey='id' params={tableDataFilterParams} request={(params) => getTableData(params)} />
                 )}
             </div>
         </BMSPagecontainer>

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-08-18 16:03:12
+ * @LastEditTime: 2023-09-05 15:08:17
  * @FilePath: /BudgetManaSystem/src/utils/tableToExcel.ts
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
@@ -50,8 +50,13 @@ function getMerges(columns: Column[], startRow = 0, startCol = 0): Merge[] {
   return merges;
 }
 
-function exportTableToExcel(tableData: DataType[], columns: any[], fileName = 'data') {
-  const dataValues = tableData.map(row => Object.values(row));
+function exportTableToExcel(tableData: DataType[], columns: Column[], fileName = 'data') {
+  // 获取列标题
+  const columnHeaders = columns.map(column => column.title);
+  
+  // 将列标题和表格数据合并
+  const allData = [columnHeaders as any].concat(tableData.map(row => Object.values(row)));
+
 
   // 获取合并项
   const merges = getMerges(columns);
@@ -60,7 +65,7 @@ function exportTableToExcel(tableData: DataType[], columns: any[], fileName = 'd
   const wb = XLSX.utils.book_new();
 
   // 将数据转化为工作表
-  const ws = XLSX.utils.aoa_to_sheet(dataValues);
+  const ws = XLSX.utils.aoa_to_sheet(allData);
 
   // 设置合并项
   ws['!merges'] = merges;
@@ -76,4 +81,5 @@ function exportTableToExcel(tableData: DataType[], columns: any[], fileName = 'd
   saveAs(blob, `${fileName}.xlsx`);
 }
 
+
 export default exportTableToExcel;