فهرست منبع

修复人员单元对照展示数据bug

code4eat 1 سال پیش
والد
کامیت
75cc00b239

BIN
.DS_Store


+ 1 - 0
src/pages/budgetMana/specialDataImport/index.tsx

@@ -177,6 +177,7 @@ export default function DicClassfication() {
                     request={async () => {
                         const resp = await getSpecialImportTable();
                         if (resp) {
+                            
                             return resp.list.map((a: any) => ({
                                 label: a.name,
                                 value: a.code

+ 13 - 15
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-10-09 09:52:50
+ * @LastEditTime: 2023-11-28 11:21:59
  * @FilePath: /BudgetManaSystem/src/pages/budgetMana/oneBatch/index.tsx
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
@@ -80,7 +80,6 @@ const ReportTemplate = () => {
         params: {
           reportCode: reportData.redirectReportCode,
           parameter: {
-            compute_date: currentComputeDate,
             ...parameter
           }
         }
@@ -117,7 +116,7 @@ const ReportTemplate = () => {
       //首次获取表格数据
       resp = await getData(
         reportCode,
-        parameter
+        {...parameter,compute_date: currentComputeDate,}
       );
     }
 
@@ -246,7 +245,6 @@ const ReportTemplate = () => {
 
   //面包屑跳转
   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,19 +254,19 @@ const ReportTemplate = () => {
 
   useEffect(() => {
     // 在这里处理路由参数变化的逻辑
-    if (currentComputeDate) {
-
-      set_tableDataFilterParams({ reportCode: urlReportCode, parameter: { compute_date: currentComputeDate } });
-      set_breadCrumbList([{
-        name: '首页',
-        index: 0,
-        params: { reportCode: urlReportCode, parameter: { compute_date: currentComputeDate } }
-      }])
+    set_tableDataFilterParams({ reportCode: urlReportCode, parameter: { compute_date: currentComputeDate } });
+    set_breadCrumbList([{
+      name: '首页',
+      index: 0,
+      params: { reportCode: urlReportCode, parameter: { compute_date: currentComputeDate } }
+    }])
 
-    }
+  }, [urlReportCode]);
 
-  }, [urlReportCode, currentComputeDate]);
 
+  useEffect(()=>{
+    set_tableDataFilterParams({ reportCode: urlReportCode, parameter: { compute_date: currentComputeDate } });
+  },[currentComputeDate])
 
   useEffect(() => {
     getCurrentComputeDate();
@@ -302,7 +300,7 @@ const ReportTemplate = () => {
           <span>核算年月:</span>
           <DatePicker
             onChange={(data, dateString) => {
-              set_tableDataFilterParams({ ...tableDataFilterParams, parameter: { ...tableDataFilterParams.parameter, compute_date: dateString } });
+              set_currentComputeDate(dateString);
             }}
             allowClear={false}
             picker='month'

+ 1 - 0
src/pages/setting/checkUnitSet/checkUnitClassMana/index.tsx

@@ -164,6 +164,7 @@ export default function CheckUnitClassficationMana() {
                     type == 'EDIT' ? <a key="edit" >编辑</a> : type == 'ADDCHILD' ? <a className='add'>添加</a> : <span className='add'>新增</span>
                 }
                 onFinish={(val) => {
+                    
                     return updateTable(type == 'EDIT' ? { ...record, ...val } : type == 'ADDCHILD' ? { ...val, parentClassCode: record.code,unitType:record.unitType} : { ...val }, type);
                 }}
                 modalProps={{ destroyOnClose: true }}

+ 5 - 2
src/pages/setting/checkUnitSet/checkUnitEmpSet/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-09-25 15:24:45
+ * @LastEditTime: 2023-12-05 20:51:47
  * @FilePath: /BudgetManaSystem/src/pages/budgetMana/monthlySet/index.tsx
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
@@ -227,8 +227,11 @@ const CheckUnitDepMap: React.FC = () => {
                 if (resp) {
                     set_tableData(resp);
                     return {
-                        data: resp,
+                        data: resp.list,
                         success: true,
+                        total: resp.totalCount,
+                        pageSize: resp.pageSize,
+                        totalPage: resp.totalPage,
                     }
                 }
             }

BIN
绩效管理系统_2023_09_22.zip