From 83a6fd1fc847bfe396a04e8f6dc9cfddc8e88358 Mon Sep 17 00:00:00 2001 From: “wangming” <“wangming@antissoft.com”> Date: Mon, 12 Jan 2026 18:01:38 +0800 Subject: [PATCH] feat: 添加员工确认状态及相关字段到薪酬统计实体 --- ExportFiles/客户资料导出_20260108143247.xls | Bin 0 -> 16205312 bytes ExportFiles/工资导入/主任工资_20260109211907.xlsx | Bin 0 -> 27436 bytes ExportFiles/工资导入/事业部总经理经理工资_20260109212128.xlsx | Bin 0 -> 30520 bytes ExportFiles/工资导入/健康师工资_20260109211750.xlsx | Bin 0 -> 468037 bytes ExportFiles/工资导入/健康师工资_临时.xlsx | Bin 0 -> 5712 bytes ExportFiles/工资导入/健康师工资_带ID.xlsx | Bin 0 -> 45711 bytes ExportFiles/工资导入/健康师工资_带ID_待填入.xlsx | Bin 0 -> 5713 bytes ExportFiles/工资导入/健康师工资_带ID_模板.xlsx | Bin 0 -> 5713 bytes ExportFiles/工资导入/健康师工资_测试_带ID.xlsx | Bin 0 -> 5712 bytes ExportFiles/工资导入/大项目主管工资_20260109212145.xlsx | Bin 0 -> 22581 bytes ExportFiles/工资导入/大项目部老师工资_20260109212108.xlsx | Bin 0 -> 24320 bytes ExportFiles/工资导入/店助工资_20260109211851.xlsx | Bin 0 -> 63704 bytes ExportFiles/工资导入/店长工资_20260109212049.xlsx | Bin 0 -> 67804 bytes ExportFiles/工资导入/科技老师工资_20260109212032.xlsx | Bin 0 -> 51556 bytes ExportFiles/工资导入/科技老师工资_带ID.xlsx | Bin 0 -> 8886 bytes ExportFiles/工资导入/科技部总经理工资_20260109212159.xlsx | Bin 0 -> 22979 bytes antis-ncc-admin/.env.development | 4 ++-- antis-ncc-admin/src/views/LqLaundryFlow/detail-dialog.vue | 455 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------------------------------------------------------------------------------------------- antis-ncc-admin/src/views/extend/financialReport/index.vue | 1069 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------------------------------------------------------------------------------------------------------------------------ docs/工资导入逻辑说明.md | 203 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ docs/工资条确认功能完整方案.md | 313 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ docs/工资条确认功能完整测试报告.md | 112 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ docs/工资条确认功能实施进度.md | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ docs/工资条确认功能导入接口测试报告.md | 89 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ docs/工资条确认功能方案分析.md | 171 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ docs/工资条确认功能测试报告_LqSalaryService.md | 143 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ docs/工资计算服务梳理.md | 95 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ docs/报销流程配置表设计说明.md | 315 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ excel/工资全字段.xlsx | Bin 0 -> 10543 bytes excel/考勤统计导入模板_1767939399813(12月）.xlsx | Bin 0 -> 50110 bytes netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqLaundryFlow/LqLaundryFlowCancelInput.cs | 21 +++++++++++++++++++++ netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqReimbursementWorkflowConfig/LqReimbursementWorkflowConfigCrInput.cs | 67 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqReimbursementWorkflowConfig/LqReimbursementWorkflowConfigInfoOutput.cs | 118 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqReimbursementWorkflowConfig/LqReimbursementWorkflowConfigListOutput.cs | 45 +++++++++++++++++++++++++++++++++++++++++++++ netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqReimbursementWorkflowConfig/LqReimbursementWorkflowConfigUpInput.cs | 36 ++++++++++++++++++++++++++++++++++++ netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqSalary/SalaryConfirmInput.cs | 23 +++++++++++++++++++++++ netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqSalary/SalaryLockByMonthInput.cs | 23 +++++++++++++++++++++++ netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqSalary/SalaryLockInput.cs | 18 ++++++++++++++++++ netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqSalary/SalaryQueryByEmployeeInput.cs | 23 +++++++++++++++++++++++ netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_assistant_salary_statistics/LqAssistantSalaryStatisticsEntity.cs | 18 ++++++++++++++++++ netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_business_unit_manager_salary_statistics/LqBusinessUnitManagerSalaryStatisticsEntity.cs | 18 ++++++++++++++++++ netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_director_salary_statistics/LqDirectorSalaryStatisticsEntity.cs | 18 ++++++++++++++++++ netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_major_project_director_salary_statistics/LqMajorProjectDirectorSalaryStatisticsEntity.cs | 18 ++++++++++++++++++ netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_major_project_teacher_salary_statistics/LqMajorProjectTeacherSalaryStatisticsEntity.cs | 18 ++++++++++++++++++ netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_reimbursement_workflow_config/LqReimbursementWorkflowConfigEntity.cs | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_reimbursement_workflow_node/LqReimbursementWorkflowNodeEntity.cs | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_reimbursement_workflow_node_user/LqReimbursementWorkflowNodeUserEntity.cs | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_salary_statistics/LqSalaryStatisticsEntity.cs | 18 ++++++++++++++++++ netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_store_manager_salary_statistics/LqStoreManagerSalaryStatisticsEntity.cs | 18 ++++++++++++++++++ netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_tech_general_manager_salary_statistics/LqTechGeneralManagerSalaryStatisticsEntity.cs | 18 ++++++++++++++++++ netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_tech_teacher_salary_statistics/LqTechTeacherSalaryStatisticsEntity.cs | 18 ++++++++++++++++++ netcore/src/Modularity/Extend/NCC.Extend.Interfaces/ILqReimbursementWorkflowConfigService.cs | 6 ++++++ netcore/src/Modularity/Extend/NCC.Extend/LqKdKdjlbService.cs | 6 +----- netcore/src/Modularity/Extend/NCC.Extend/LqLaundryFlowService.cs | 118 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ netcore/src/Modularity/Extend/NCC.Extend/LqReimbursementWorkflowConfigService.cs | 662 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ netcore/src/Modularity/Extend/NCC.Extend/LqStoreExpenseService.cs | 46 ++++++++++++++++++++++++++++++++-------------- netcore/src/Modularity/Message/NCC.Message.Entitys/D:/wesley/project/git/antis-food-alliance/netcore/src/Modularity/Message/NCC.Message.Entitys/NCC.Message.Entitys.xml | 924 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ scripts/py/add_id_to_salary_excel.py | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ scripts/py/read_excel_fields.py | 61 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ scripts/sh/test_lq_salary_complete.sh | 163 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ scripts/sh/test_lq_salary_service.sh | 99 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ scripts/sh/test_salary_service.sh | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ sql/修复送洗记录金额为0的问题.sql | 103 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ sql/创建健康师工资统计表.sql | 229 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ sql/创建员工工资统计表.sql | 236 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ sql/创建报销流程配置表.sql | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ sql/删除员工工资统计表.sql | 11 +++++++++++ test_employee_salary_apis.py | 538 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ test_lock_by_month_api.py | 240 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ test_lock_by_month_api.sh | 237 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ test_reimbursement_workflow_config_api.py | 472 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 合作成本在店长工资计算中未统计问题分析.md | 203 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 工资服务接口检查报告.md | 101 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 工资查询接口实现总结.md | 105 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 工资查询接口测试结果_202511.md | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 工资锁定解锁接口实现总结.md | 121 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 工资锁定解锁接口测试报告.md | 140 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 工资锁定解锁接口测试结果.md | 104 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 工资锁定解锁接口测试结果_完整版.md | 128 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 工资锁定解锁接口测试结果_最终版.md | 121 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 店内支出接口测试报告.md | 164 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 批量锁定当月工资接口测试报告.md | 311 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 接口测试准备说明.md | 175 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 流程配置接口测试报告.md | 156 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 测试流程配置接口说明.md | 208 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 送洗记录作废接口实现总结.md | 168 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 送洗记录作废接口测试报告.md | 139 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 送洗记录金额为0问题分析.md | 289 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 送洗记录金额修复执行说明.md | 191 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 魏柯店长工资数据问题分析.md | 258 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 90 files changed, 10878 insertions(+), 329 deletions(-) create mode 100644 ExportFiles/客户资料导出_20260108143247.xls create mode 100644 ExportFiles/工资导入/主任工资_20260109211907.xlsx create mode 100644 ExportFiles/工资导入/事业部总经理经理工资_20260109212128.xlsx create mode 100644 ExportFiles/工资导入/健康师工资_20260109211750.xlsx create mode 100644 ExportFiles/工资导入/健康师工资_临时.xlsx create mode 100644 ExportFiles/工资导入/健康师工资_带ID.xlsx create mode 100644 ExportFiles/工资导入/健康师工资_带ID_待填入.xlsx create mode 100644 ExportFiles/工资导入/健康师工资_带ID_模板.xlsx create mode 100644 ExportFiles/工资导入/健康师工资_测试_带ID.xlsx create mode 100644 ExportFiles/工资导入/大项目主管工资_20260109212145.xlsx create mode 100644 ExportFiles/工资导入/大项目部老师工资_20260109212108.xlsx create mode 100644 ExportFiles/工资导入/店助工资_20260109211851.xlsx create mode 100644 ExportFiles/工资导入/店长工资_20260109212049.xlsx create mode 100644 ExportFiles/工资导入/科技老师工资_20260109212032.xlsx create mode 100644 ExportFiles/工资导入/科技老师工资_带ID.xlsx create mode 100644 ExportFiles/工资导入/科技部总经理工资_20260109212159.xlsx create mode 100644 docs/工资导入逻辑说明.md create mode 100644 docs/工资条确认功能完整方案.md create mode 100644 docs/工资条确认功能完整测试报告.md create mode 100644 docs/工资条确认功能实施进度.md create mode 100644 docs/工资条确认功能导入接口测试报告.md create mode 100644 docs/工资条确认功能方案分析.md create mode 100644 docs/工资条确认功能测试报告_LqSalaryService.md create mode 100644 docs/工资计算服务梳理.md create mode 100644 docs/报销流程配置表设计说明.md create mode 100644 excel/工资全字段.xlsx create mode 100644 excel/考勤统计导入模板_1767939399813(12月）.xlsx create mode 100644 netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqLaundryFlow/LqLaundryFlowCancelInput.cs create mode 100644 netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqReimbursementWorkflowConfig/LqReimbursementWorkflowConfigCrInput.cs create mode 100644 netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqReimbursementWorkflowConfig/LqReimbursementWorkflowConfigInfoOutput.cs create mode 100644 netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqReimbursementWorkflowConfig/LqReimbursementWorkflowConfigListOutput.cs create mode 100644 netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqReimbursementWorkflowConfig/LqReimbursementWorkflowConfigUpInput.cs create mode 100644 netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqSalary/SalaryConfirmInput.cs create mode 100644 netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqSalary/SalaryLockByMonthInput.cs create mode 100644 netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqSalary/SalaryLockInput.cs create mode 100644 netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqSalary/SalaryQueryByEmployeeInput.cs create mode 100644 netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_reimbursement_workflow_config/LqReimbursementWorkflowConfigEntity.cs create mode 100644 netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_reimbursement_workflow_node/LqReimbursementWorkflowNodeEntity.cs create mode 100644 netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_reimbursement_workflow_node_user/LqReimbursementWorkflowNodeUserEntity.cs create mode 100644 netcore/src/Modularity/Extend/NCC.Extend.Interfaces/ILqReimbursementWorkflowConfigService.cs create mode 100644 netcore/src/Modularity/Extend/NCC.Extend/LqReimbursementWorkflowConfigService.cs create mode 100644 netcore/src/Modularity/Message/NCC.Message.Entitys/D:/wesley/project/git/antis-food-alliance/netcore/src/Modularity/Message/NCC.Message.Entitys/NCC.Message.Entitys.xml create mode 100644 scripts/py/add_id_to_salary_excel.py create mode 100644 scripts/py/read_excel_fields.py create mode 100644 scripts/sh/test_lq_salary_complete.sh create mode 100644 scripts/sh/test_lq_salary_service.sh create mode 100644 scripts/sh/test_salary_service.sh create mode 100644 sql/修复送洗记录金额为0的问题.sql create mode 100644 sql/创建健康师工资统计表.sql create mode 100644 sql/创建员工工资统计表.sql create mode 100644 sql/创建报销流程配置表.sql create mode 100644 sql/删除员工工资统计表.sql create mode 100644 test_employee_salary_apis.py create mode 100755 test_lock_by_month_api.py create mode 100755 test_lock_by_month_api.sh create mode 100755 test_reimbursement_workflow_config_api.py create mode 100644 合作成本在店长工资计算中未统计问题分析.md create mode 100644 工资服务接口检查报告.md create mode 100644 工资查询接口实现总结.md create mode 100644 工资查询接口测试结果_202511.md create mode 100644 工资锁定解锁接口实现总结.md create mode 100644 工资锁定解锁接口测试报告.md create mode 100644 工资锁定解锁接口测试结果.md create mode 100644 工资锁定解锁接口测试结果_完整版.md create mode 100644 工资锁定解锁接口测试结果_最终版.md create mode 100644 店内支出接口测试报告.md create mode 100644 批量锁定当月工资接口测试报告.md create mode 100644 接口测试准备说明.md create mode 100644 流程配置接口测试报告.md create mode 100644 测试流程配置接口说明.md create mode 100644 送洗记录作废接口实现总结.md create mode 100644 送洗记录作废接口测试报告.md create mode 100644 送洗记录金额为0问题分析.md create mode 100644 送洗记录金额修复执行说明.md create mode 100644 魏柯店长工资数据问题分析.md diff --git a/ExportFiles/客户资料导出_20260108143247.xls b/ExportFiles/客户资料导出_20260108143247.xls new file mode 100644 index 0000000..c7a0e27 Binary files /dev/null and b/ExportFiles/客户资料导出_20260108143247.xls differ diff --git a/ExportFiles/工资导入/主任工资_20260109211907.xlsx b/ExportFiles/工资导入/主任工资_20260109211907.xlsx new file mode 100644 index 0000000..299760b Binary files /dev/null and b/ExportFiles/工资导入/主任工资_20260109211907.xlsx differ diff --git a/ExportFiles/工资导入/事业部总经理经理工资_20260109212128.xlsx b/ExportFiles/工资导入/事业部总经理经理工资_20260109212128.xlsx new file mode 100644 index 0000000..66d3509 Binary files /dev/null and b/ExportFiles/工资导入/事业部总经理经理工资_20260109212128.xlsx differ diff --git a/ExportFiles/工资导入/健康师工资_20260109211750.xlsx b/ExportFiles/工资导入/健康师工资_20260109211750.xlsx new file mode 100644 index 0000000..e22a2f3 Binary files /dev/null and b/ExportFiles/工资导入/健康师工资_20260109211750.xlsx differ diff --git a/ExportFiles/工资导入/健康师工资_临时.xlsx b/ExportFiles/工资导入/健康师工资_临时.xlsx new file mode 100644 index 0000000..200315f Binary files /dev/null and b/ExportFiles/工资导入/健康师工资_临时.xlsx differ diff --git a/ExportFiles/工资导入/健康师工资_带ID.xlsx b/ExportFiles/工资导入/健康师工资_带ID.xlsx new file mode 100644 index 0000000..a2f5190 Binary files /dev/null and b/ExportFiles/工资导入/健康师工资_带ID.xlsx differ diff --git a/ExportFiles/工资导入/健康师工资_带ID_待填入.xlsx b/ExportFiles/工资导入/健康师工资_带ID_待填入.xlsx new file mode 100644 index 0000000..a9ba283 Binary files /dev/null and b/ExportFiles/工资导入/健康师工资_带ID_待填入.xlsx differ diff --git a/ExportFiles/工资导入/健康师工资_带ID_模板.xlsx b/ExportFiles/工资导入/健康师工资_带ID_模板.xlsx new file mode 100644 index 0000000..5d09d24 Binary files /dev/null and b/ExportFiles/工资导入/健康师工资_带ID_模板.xlsx differ diff --git a/ExportFiles/工资导入/健康师工资_测试_带ID.xlsx b/ExportFiles/工资导入/健康师工资_测试_带ID.xlsx new file mode 100644 index 0000000..5a04331 Binary files /dev/null and b/ExportFiles/工资导入/健康师工资_测试_带ID.xlsx differ diff --git a/ExportFiles/工资导入/大项目主管工资_20260109212145.xlsx b/ExportFiles/工资导入/大项目主管工资_20260109212145.xlsx new file mode 100644 index 0000000..0a97c67 Binary files /dev/null and b/ExportFiles/工资导入/大项目主管工资_20260109212145.xlsx differ diff --git a/ExportFiles/工资导入/大项目部老师工资_20260109212108.xlsx b/ExportFiles/工资导入/大项目部老师工资_20260109212108.xlsx new file mode 100644 index 0000000..dc0ab73 Binary files /dev/null and b/ExportFiles/工资导入/大项目部老师工资_20260109212108.xlsx differ diff --git a/ExportFiles/工资导入/店助工资_20260109211851.xlsx b/ExportFiles/工资导入/店助工资_20260109211851.xlsx new file mode 100644 index 0000000..b51f104 Binary files /dev/null and b/ExportFiles/工资导入/店助工资_20260109211851.xlsx differ diff --git a/ExportFiles/工资导入/店长工资_20260109212049.xlsx b/ExportFiles/工资导入/店长工资_20260109212049.xlsx new file mode 100644 index 0000000..f6a7f03 Binary files /dev/null and b/ExportFiles/工资导入/店长工资_20260109212049.xlsx differ diff --git a/ExportFiles/工资导入/科技老师工资_20260109212032.xlsx b/ExportFiles/工资导入/科技老师工资_20260109212032.xlsx new file mode 100644 index 0000000..8a89fce Binary files /dev/null and b/ExportFiles/工资导入/科技老师工资_20260109212032.xlsx differ diff --git a/ExportFiles/工资导入/科技老师工资_带ID.xlsx b/ExportFiles/工资导入/科技老师工资_带ID.xlsx new file mode 100644 index 0000000..e2eafed Binary files /dev/null and b/ExportFiles/工资导入/科技老师工资_带ID.xlsx differ diff --git a/ExportFiles/工资导入/科技部总经理工资_20260109212159.xlsx b/ExportFiles/工资导入/科技部总经理工资_20260109212159.xlsx new file mode 100644 index 0000000..a6e9fe0 Binary files /dev/null and b/ExportFiles/工资导入/科技部总经理工资_20260109212159.xlsx differ diff --git a/antis-ncc-admin/.env.development b/antis-ncc-admin/.env.development index 198955a..6462393 100644 --- a/antis-ncc-admin/.env.development +++ b/antis-ncc-admin/.env.development @@ -2,8 +2,8 @@ VUE_CLI_BABEL_TRANSPILE_MODULES = true # VUE_APP_BASE_API = 'https://erp.lvqianmeiye.com' -VUE_APP_BASE_API = 'http://erp_test.lvqianmeiye.com' -# VUE_APP_BASE_API = 'http://localhost:2011' +# VUE_APP_BASE_API = 'http://erp_test.lvqianmeiye.com' +VUE_APP_BASE_API = 'http://localhost:2011' # VUE_APP_BASE_API = 'http://localhost:2011' VUE_APP_IMG_API = '' VUE_APP_BASE_WSS = 'ws://192.168.110.45:2011/websocket' diff --git a/antis-ncc-admin/src/views/LqLaundryFlow/detail-dialog.vue b/antis-ncc-admin/src/views/LqLaundryFlow/detail-dialog.vue index 1e7b299..9db9909 100644 --- a/antis-ncc-admin/src/views/LqLaundryFlow/detail-dialog.vue +++ b/antis-ncc-admin/src/views/LqLaundryFlow/detail-dialog.vue @@ -1,5 +1,5 @@ @@ -238,15 +244,78 @@ export default { diff --git a/antis-ncc-admin/src/views/extend/financialReport/index.vue b/antis-ncc-admin/src/views/extend/financialReport/index.vue index bb7211d..0615c6f 100644 --- a/antis-ncc-admin/src/views/extend/financialReport/index.vue +++ b/antis-ncc-admin/src/views/extend/financialReport/index.vue @@ -3,25 +3,25 @@ - + - + 按日 按月 - + - + 查询 重置 @@ -29,7 +29,7 @@ - +
@@ -89,7 +89,7 @@ - + @@ -116,7 +116,7 @@ - + @@ -157,11 +157,43 @@
- - - + +
+ + + + + + + + + + + + + + + + + + + + +
+
+ + + +
@@ -215,7 +247,21 @@ export default { // 表格数据 activeTab: 'totalIncome', tableData: [], - tableColumns: [] + tableColumns: [], + // 筛选选项 + filterOptions: { + paymentMethods: [], // 付款方式列表 + cooperationNames: [], // 合作机构列表 + hospitalNames: [] // 付款医院列表 + }, + // 当前筛选值 + currentFilters: { + paymentMethod: '', // 付款方式筛选 + cooperationName: '', // 合作机构筛选 + hospitalName: '' // 付款医院筛选 + }, + // 原始表格数据（未筛选） + rawTableData: [] } }, async mounted() { @@ -330,8 +376,9 @@ export default { // 后端接口返回的是 List，直接就是数组 const data = Array.isArray(res.data) ? res.data : [] console.log('总收入数据:', data) - this.totalIncome = data.reduce((sum, item) => sum + (item.totalIncome || 0), 0) - this.totalBillingCount = data.reduce((sum, item) => sum + (item.billingCount || 0), 0) + // 接口返回字段名是 PascalCase：TotalIncome, BillingCount, PeriodDate, StoreId, StoreName + this.totalIncome = data.reduce((sum, item) => sum + (item.TotalIncome || item.totalIncome || 0), 0) + this.totalBillingCount = data.reduce((sum, item) => sum + (item.BillingCount || item.billingCount || 0), 0) this.totalIncomeData = data console.log('总收入汇总:', this.totalIncome, '笔数:', this.totalBillingCount) } else { @@ -354,10 +401,12 @@ export default { let totalChannelIncome = 0 const channelSet = new Set() data.forEach(store => { - totalChannelIncome += store.totalIncome || 0 - if (store.paymentChannels && Array.isArray(store.paymentChannels)) { - store.paymentChannels.forEach(ch => { - channelSet.add(ch.paymentMethod) + totalChannelIncome += (store.TotalIncome || store.totalIncome || 0) + const paymentChannels = store.PaymentChannels || store.paymentChannels + if (paymentChannels && Array.isArray(paymentChannels)) { + paymentChannels.forEach(ch => { + const method = ch.PaymentMethod || ch.paymentMethod + if (method) channelSet.add(method) }) } }) @@ -385,10 +434,12 @@ export default { let totalPayable = 0 const cooperationSet = new Set() data.forEach(store => { - totalPayable += store.totalPayable || 0 - if (store.cooperationItems && Array.isArray(store.cooperationItems)) { - store.cooperationItems.forEach(item => { - cooperationSet.add(item.cooperationId) + totalPayable += (store.TotalPayable || store.totalPayable || 0) + const cooperationItems = store.CooperationItems || store.cooperationItems + if (cooperationItems && Array.isArray(cooperationItems)) { + cooperationItems.forEach(item => { + const id = item.CooperationId || item.cooperationId + if (id) cooperationSet.add(id) }) } }) @@ -416,10 +467,12 @@ export default { let totalReceivable = 0 const hospitalSet = new Set() data.forEach(store => { - totalReceivable += store.totalReceivable || 0 - if (store.hospitalItems && Array.isArray(store.hospitalItems)) { - store.hospitalItems.forEach(item => { - hospitalSet.add(item.hospitalId) + totalReceivable += (store.TotalReceivable || store.totalReceivable || 0) + const hospitalItems = store.HospitalItems || store.hospitalItems + if (hospitalItems && Array.isArray(hospitalItems)) { + hospitalItems.forEach(item => { + const id = item.HospitalId || item.hospitalId + if (id) hospitalSet.add(id) }) } }) @@ -529,8 +582,8 @@ export default { // 按日期聚合数据 const dateMap = new Map() this.totalIncomeData.forEach(item => { - const date = item.periodDate - const income = item.totalIncome || 0 + const date = item.PeriodDate || item.periodDate + const income = item.TotalIncome || item.totalIncome || 0 if (dateMap.has(date)) { dateMap.set(date, dateMap.get(date) + income) } else { @@ -628,10 +681,11 @@ export default { // 按渠道聚合数据 const channelMap = new Map() this.channelData.forEach(store => { - if (store.paymentChannels && Array.isArray(store.paymentChannels)) { - store.paymentChannels.forEach(ch => { - const method = ch.paymentMethod || '未填写' - const amount = ch.amount || 0 + const paymentChannels = store.PaymentChannels || store.paymentChannels + if (paymentChannels && Array.isArray(paymentChannels)) { + paymentChannels.forEach(ch => { + const method = ch.PaymentMethod || ch.paymentMethod || '未填写' + const amount = ch.Amount || ch.amount || 0 if (channelMap.has(method)) { channelMap.set(method, channelMap.get(method) + amount) } else { @@ -728,8 +782,8 @@ export default { const dateMap = new Map() this.payableData.forEach(item => { - const date = item.periodDate - const amount = item.totalPayable || 0 + const date = item.PeriodDate || item.periodDate + const amount = item.TotalPayable || item.totalPayable || 0 if (dateMap.has(date)) { dateMap.set(date, dateMap.get(date) + amount) } else { @@ -814,8 +868,8 @@ export default { const dateMap = new Map() this.receivableData.forEach(item => { - const date = item.periodDate - const amount = item.totalReceivable || 0 + const date = item.PeriodDate || item.periodDate + const amount = item.TotalReceivable || item.totalReceivable || 0 if (dateMap.has(date)) { dateMap.set(date, dateMap.get(date) + amount) } else { @@ -897,8 +951,54 @@ export default { }, // 切换表格Tab handleTabClick(tab) { + // 重置筛选 + this.currentFilters = { + paymentMethod: '', + cooperationName: '', + hospitalName: '' + } this.updateTable() }, + // 计算是否显示筛选器 + get showFilter() { + return this.activeTab === 'channel' || this.activeTab === 'payable' || this.activeTab === 'receivable' + }, + // 筛选变化处理 + handleFilterChange() { + this.applyFilters() + }, + // 应用筛选 + applyFilters() { + if (!this.rawTableData || this.rawTableData.length === 0) { + this.tableData = [] + return + } + + let filteredData = [...this.rawTableData] + + // 根据当前Tab应用不同的筛选 + if (this.activeTab === 'channel') { + if (this.currentFilters.paymentMethod) { + filteredData = filteredData.filter(item => + (item.PaymentMethod || item.paymentMethod) === this.currentFilters.paymentMethod + ) + } + } else if (this.activeTab === 'payable') { + if (this.currentFilters.cooperationName) { + filteredData = filteredData.filter(item => + (item.CooperationName || item.cooperationName) === this.currentFilters.cooperationName + ) + } + } else if (this.activeTab === 'receivable') { + if (this.currentFilters.hospitalName) { + filteredData = filteredData.filter(item => + (item.HospitalName || item.hospitalName) === this.currentFilters.hospitalName + ) + } + } + + this.tableData = filteredData + }, // 更新表格数据 updateTable() { this.tableLoading = true @@ -917,145 +1017,205 @@ export default { this.updateReceivableTable() break } + // 更新筛选选项 + this.updateFilterOptions() + // 应用当前筛选 + this.applyFilters() this.tableLoading = false }, 100) }, + // 更新筛选选项 + updateFilterOptions() { + if (this.activeTab === 'channel') { + // 从原始数据中提取所有付款方式 + const methods = new Set() + this.channelData.forEach(store => { + const paymentChannels = store.PaymentChannels || store.paymentChannels + if (paymentChannels && Array.isArray(paymentChannels)) { + paymentChannels.forEach(ch => { + const method = ch.PaymentMethod || ch.paymentMethod + if (method) methods.add(method) + }) + } + }) + this.filterOptions.paymentMethods = Array.from(methods).sort() + } else if (this.activeTab === 'payable') { + // 从原始数据中提取所有合作机构 + const names = new Set() + this.payableData.forEach(store => { + const cooperationItems = store.CooperationItems || store.cooperationItems + if (cooperationItems && Array.isArray(cooperationItems)) { + cooperationItems.forEach(item => { + const name = item.CooperationName || item.cooperationName + if (name) names.add(name) + }) + } + }) + this.filterOptions.cooperationNames = Array.from(names).sort() + } else if (this.activeTab === 'receivable') { + // 从原始数据中提取所有付款医院 + const names = new Set() + this.receivableData.forEach(store => { + const hospitalItems = store.HospitalItems || store.hospitalItems + if (hospitalItems && Array.isArray(hospitalItems)) { + hospitalItems.forEach(item => { + const name = item.HospitalName || item.hospitalName + if (name) names.add(name) + }) + } + }) + this.filterOptions.hospitalNames = Array.from(names).sort() + } + }, // 更新总收入表格 updateTotalIncomeTable() { if (!this.totalIncomeData) { + this.rawTableData = [] this.tableData = [] return } this.tableColumns = [ - { prop: 'storeName', label: '门店名称', width: 150 }, - { prop: 'periodDate', label: '统计日期', width: 120 }, + { prop: 'StoreName', label: '门店名称', minWidth: 150 }, + { prop: 'PeriodDate', label: '统计日期', minWidth: 120 }, { - prop: 'totalIncome', + prop: 'TotalIncome', label: '总收入', - width: 150, - formatter: (row) => this.formatCurrency(row.totalIncome) + minWidth: 150, + formatter: (row) => this.formatCurrency(row.TotalIncome || row.totalIncome) }, - { prop: 'billingCount', label: '开单笔数', width: 120 }, + { prop: 'BillingCount', label: '开单笔数', minWidth: 120 }, { - prop: 'averageAmount', + prop: 'AverageAmount', label: '平均单笔', - width: 150, - formatter: (row) => this.formatCurrency(row.averageAmount) + minWidth: 150, + formatter: (row) => this.formatCurrency(row.AverageAmount || row.averageAmount) } ] - this.tableData = this.totalIncomeData.map(item => ({ + this.rawTableData = this.totalIncomeData.map(item => ({ ...item, - averageAmount: item.billingCount > 0 ? item.totalIncome / item.billingCount : 0 + AverageAmount: (item.BillingCount || item.billingCount || 0) > 0 + ? (item.TotalIncome || item.totalIncome || 0) / (item.BillingCount || item.billingCount) + : 0 })) + this.tableData = [...this.rawTableData] }, // 更新收款渠道表格 updateChannelTable() { if (!this.channelData) { + this.rawTableData = [] this.tableData = [] return } this.tableColumns = [ - { prop: 'storeName', label: '门店名称', width: 150 }, - { prop: 'periodDate', label: '统计日期', width: 120 }, - { prop: 'paymentMethod', label: '付款方式', width: 120 }, + { prop: 'StoreName', label: '门店名称', minWidth: 150 }, + { prop: 'PeriodDate', label: '统计日期', minWidth: 120 }, + { prop: 'PaymentMethod', label: '付款方式', minWidth: 120 }, { - prop: 'amount', + prop: 'Amount', label: '收款金额', - width: 150, - formatter: (row) => this.formatCurrency(row.amount) + minWidth: 150, + formatter: (row) => this.formatCurrency(row.Amount || row.amount) }, - { prop: 'count', label: '笔数', width: 100 }, + { prop: 'Count', label: '笔数', minWidth: 100 }, { - prop: 'percentage', + prop: 'Percentage', label: '占比', - width: 100, - formatter: (row) => (row.percentage || 0) + '%' + minWidth: 100, + formatter: (row) => (row.Percentage || row.percentage || 0) + '%' } ] const list = [] this.channelData.forEach(store => { - if (store.paymentChannels) { - store.paymentChannels.forEach(ch => { + const paymentChannels = store.PaymentChannels || store.paymentChannels + if (paymentChannels) { + paymentChannels.forEach(ch => { list.push({ - storeName: store.storeName, - periodDate: store.periodDate, - paymentMethod: ch.paymentMethod, - amount: ch.amount, - count: ch.count, - percentage: ch.percentage + StoreName: store.StoreName || store.storeName, + PeriodDate: store.PeriodDate || store.periodDate, + PaymentMethod: ch.PaymentMethod || ch.paymentMethod, + Amount: ch.Amount || ch.amount, + Count: ch.Count || ch.count, + Percentage: ch.Percentage || ch.percentage }) }) } }) - this.tableData = list + this.rawTableData = list + this.tableData = [...this.rawTableData] }, // 更新应付表格 updatePayableTable() { if (!this.payableData) { + this.rawTableData = [] this.tableData = [] return } this.tableColumns = [ - { prop: 'storeName', label: '门店名称', width: 150 }, - { prop: 'periodDate', label: '统计日期', width: 120 }, - { prop: 'cooperationName', label: '合作机构', width: 200 }, + { prop: 'StoreName', label: '门店名称', minWidth: 150 }, + { prop: 'PeriodDate', label: '统计日期', minWidth: 120 }, + { prop: 'CooperationName', label: '合作机构', minWidth: 200 }, { - prop: 'payableAmount', + prop: 'PayableAmount', label: '应付金额', - width: 150, - formatter: (row) => this.formatCurrency(row.payableAmount) + minWidth: 150, + formatter: (row) => this.formatCurrency(row.PayableAmount || row.payableAmount) }, - { prop: 'billingCount', label: '开单笔数', width: 120 } + { prop: 'BillingCount', label: '开单笔数', minWidth: 120 } ] const list = [] this.payableData.forEach(store => { - if (store.cooperationItems) { - store.cooperationItems.forEach(item => { + const cooperationItems = store.CooperationItems || store.cooperationItems + if (cooperationItems) { + cooperationItems.forEach(item => { list.push({ - storeName: store.storeName, - periodDate: store.periodDate, - cooperationName: item.cooperationName, - payableAmount: item.payableAmount, - billingCount: item.billingCount + StoreName: store.StoreName || store.storeName, + PeriodDate: store.PeriodDate || store.periodDate, + CooperationName: item.CooperationName || item.cooperationName, + PayableAmount: item.PayableAmount || item.payableAmount, + BillingCount: item.BillingCount || item.billingCount }) }) } }) - this.tableData = list + this.rawTableData = list + this.tableData = [...this.rawTableData] }, // 更新应收表格 updateReceivableTable() { if (!this.receivableData) { + this.rawTableData = [] this.tableData = [] return } this.tableColumns = [ - { prop: 'storeName', label: '门店名称', width: 150 }, - { prop: 'periodDate', label: '统计日期', width: 120 }, - { prop: 'hospitalName', label: '付款医院', width: 200 }, + { prop: 'StoreName', label: '门店名称', minWidth: 150 }, + { prop: 'PeriodDate', label: '统计日期', minWidth: 120 }, + { prop: 'HospitalName', label: '付款医院', minWidth: 200 }, { - prop: 'receivableAmount', + prop: 'ReceivableAmount', label: '应收金额', - width: 150, - formatter: (row) => this.formatCurrency(row.receivableAmount) + minWidth: 150, + formatter: (row) => this.formatCurrency(row.ReceivableAmount || row.receivableAmount) }, - { prop: 'billingCount', label: '开单笔数', width: 120 } + { prop: 'BillingCount', label: '开单笔数', minWidth: 120 } ] const list = [] this.receivableData.forEach(store => { - if (store.hospitalItems) { - store.hospitalItems.forEach(item => { + const hospitalItems = store.HospitalItems || store.hospitalItems + if (hospitalItems) { + hospitalItems.forEach(item => { list.push({ - storeName: store.storeName, - periodDate: store.periodDate, - hospitalName: item.hospitalName, - receivableAmount: item.receivableAmount, - billingCount: item.billingCount + StoreName: store.StoreName || store.storeName, + PeriodDate: store.PeriodDate || store.periodDate, + HospitalName: item.HospitalName || item.hospitalName, + ReceivableAmount: item.ReceivableAmount || item.receivableAmount, + BillingCount: item.BillingCount || item.billingCount }) }) } }) - this.tableData = list + this.rawTableData = list + this.tableData = [...this.rawTableData] }, // 格式化货币 formatCurrency(value) { @@ -1073,56 +1233,135 @@ export default {