From 1fffa8765e003b2ef73d283fcc1570e1e97dca5a Mon Sep 17 00:00:00 2001 From: “wangming” <“wangming@antissoft.com”> Date: Mon, 22 Dec 2025 23:25:59 +0800 Subject: [PATCH] 优化储扣列表接口：增加门店、时间、品项分类筛选，并添加统计数据查询 --- antis-ncc-admin/.env.development | 4 ++-- antis-ncc-admin/src/api/extend/annualSummary.js | 129 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ antis-ncc-admin/src/utils/request.js | 4 +++- antis-ncc-admin/src/views/extend/annualSummary/dashboard/index.vue | 1906 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ antis-ncc-admin/src/views/extend/annualSummary/dataManage/index.vue | 437 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ antis-ncc-admin/src/views/lqTkjlb/Report.vue | 1 + antis-ncc-admin/src/views/personalPerformanceStatistics/index.vue | 7 ++----- antis-ncc-admin/src/views/salaryCalculation/index.vue | 8 ++++---- antis-ncc-admin/src/views/statisticsList/form9_backup.vue | 2041 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ excel/历史数据归档.xlsx | Bin 0 -> 50363 bytes netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqAnnualSummary/AnnualStatDto.cs | 121 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqAnnualSummary/AnnualSummaryDto.cs | 46 ++++++++++++++++++++++++++++++++++++++++++++++ netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqBusinessUnitManagerSalary/BusinessUnitManagerSalaryOutput.cs | 30 ++++++++++++++++++++++++++++++ netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdDeductinfo/LqKdDeductinfoListQueryInput.cs | 26 ++++++++++++++++++++++++++ netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdKdjlb/HealthCoachStatisticsOutput.cs | 10 ++++++++++ netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKhxx/LqKhxxInfoOutput.cs | 5 +++++ netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKhxx/LqKhxxListOutput.cs | 5 +++++ netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXmzl/ItemStoreStatisticsOutput.cs | 22 +++++++++++++++++++++- netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXmzl/LqXmzlStatisticsInput.cs | 7 ++++++- netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXmzl/LqXmzlStatisticsOutput.cs | 15 +++++++++++++++ netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_annual_summary/LqAnnualSummaryEntity.cs | 116 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_business_unit_manager_salary_statistics/LqBusinessUnitManagerSalaryStatisticsEntity.cs | 36 ++++++++++++++++++++++++++++++++++++ netcore/src/Modularity/Extend/NCC.Extend.Entitys/Mapper/LqKhxxMapper.cs | 1 + netcore/src/Modularity/Extend/NCC.Extend/LqAnnualSummaryService.cs | 1358 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ netcore/src/Modularity/Extend/NCC.Extend/LqAssistantSalaryService.cs | 117 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------ netcore/src/Modularity/Extend/NCC.Extend/LqBusinessUnitManagerSalaryService.cs | 270 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------------------------------------------- netcore/src/Modularity/Extend/NCC.Extend/LqKdKdjlbService.cs | 230 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------- netcore/src/Modularity/Extend/NCC.Extend/LqKhxxService.cs | 1 + netcore/src/Modularity/Extend/NCC.Extend/LqMajorProjectDirectorSalaryService.cs | 37 ++++++++++++++++++++++++++++++------- netcore/src/Modularity/Extend/NCC.Extend/LqStatisticsService.cs | 471 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------------------------------ netcore/src/Modularity/Extend/NCC.Extend/LqTechGeneralManagerSalaryService.cs | 94 +++++++++++++++++++++++++++++++++++++++++++--------------------------------------------------- netcore/src/Modularity/Extend/NCC.Extend/LqTechTeacherSalaryService.cs | 59 ++++++++++++++++++++++++++++++++++++++++++++--------------- netcore/src/Modularity/Extend/NCC.Extend/LqTkjlbService.cs | 3 +++ netcore/src/Modularity/Extend/NCC.Extend/LqXmzlService.cs | 203 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------- netcore/src/Modularity/Extend/NCC.Extend/NCC.Extend.csproj | 1 + sql/事业部总经理经理工资表新增毛利相关字段.sql | 46 ++++++++++++++++++++++++++++++++++++++++++++++ sql/年度经营数据菜单配置.sql | 30 ++++++++++++++++++++++++++++++ sql/排查生美业绩统计差异-简化版.sql | 3 +++ sql/排查生美业绩统计差异详细.sql | 3 +++ sql/检查生美业绩统计差异.sql | 3 +++ test_deduct_list.sh | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ test_gold_triangle.sh | 47 +++++++++++++++++++++++++++++++++++++++++++++++ test_health_coach_statistics.sh | 95 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ test_item_statistics.sh | 107 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ test_personal_performance_api.sh | 127 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ test_store_customer_details.sh | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++ test_store_total_performance_performance.sh | 114 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ test_store_total_performance_statistics.sh | 93 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ test_tianwang_api.py | 3 +++ verify_store_total_performance_data.sh | 94 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 事业部总经理经理工资计算规则梳理.md | 192 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------------------------- 大项目主管工资计算规则梳理.md | 75 +++++++++++++++++++++++++++++++++++++++------------------------------------ 年度汇总表建表.sql | 21 +++++++++++++++++++++ 店助主任工资计算规则梳理.md | 116 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------- 科技部总经理工资计算规则梳理.md | 126 ++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------------------------ 科技部老师工资计算规则.md | 47 ++++++++++++++++++++++++++++------------------- 56 files changed, 8689 insertions(+), 582 deletions(-) create mode 100644 antis-ncc-admin/src/api/extend/annualSummary.js create mode 100644 antis-ncc-admin/src/views/extend/annualSummary/dashboard/index.vue create mode 100644 antis-ncc-admin/src/views/extend/annualSummary/dataManage/index.vue create mode 100644 antis-ncc-admin/src/views/statisticsList/form9_backup.vue create mode 100644 excel/历史数据归档.xlsx create mode 100644 netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqAnnualSummary/AnnualStatDto.cs create mode 100644 netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqAnnualSummary/AnnualSummaryDto.cs create mode 100644 netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_annual_summary/LqAnnualSummaryEntity.cs create mode 100644 netcore/src/Modularity/Extend/NCC.Extend/LqAnnualSummaryService.cs create mode 100644 sql/事业部总经理经理工资表新增毛利相关字段.sql create mode 100644 sql/年度经营数据菜单配置.sql create mode 100755 test_deduct_list.sh create mode 100755 test_gold_triangle.sh create mode 100755 test_health_coach_statistics.sh create mode 100755 test_item_statistics.sh create mode 100755 test_personal_performance_api.sh create mode 100644 test_store_customer_details.sh create mode 100755 test_store_total_performance_performance.sh create mode 100755 test_store_total_performance_statistics.sh create mode 100755 verify_store_total_performance_data.sh create mode 100644 年度汇总表建表.sql 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/api/extend/annualSummary.js b/antis-ncc-admin/src/api/extend/annualSummary.js new file mode 100644 index 0000000..ff58089 --- /dev/null +++ b/antis-ncc-admin/src/api/extend/annualSummary.js @@ -0,0 +1,129 @@ +import request from '@/utils/request' + +// 获取年度汇总列表 +export function getList(params) { + return request({ + url: '/api/Extend/LqAnnualSummary/list', + method: 'get', + params + }) +} + +// 保存（新增或更新） +export function save(data) { + return request({ + url: '/api/Extend/LqAnnualSummary/save', + method: 'post', + data + }) +} + +// 删除 +export function del(data) { + return request({ + url: '/api/Extend/LqAnnualSummary/delete', + method: 'post', + data + }) +} + +// 导入 +export function importData(data) { + return request({ + url: '/api/Extend/LqAnnualSummary/import', + method: 'post', + data + }) +} + +// ========== 统计接口 ========== + +// 4.1 全年门店业绩表 +export function getTotalPerformanceStat(data) { + return request({ + url: '/api/Extend/LqAnnualSummary/GetTotalPerformanceStat', + method: 'post', + data + }) +} + +// 4.2 全年门店消耗表 +export function getTotalConsumeStat(data) { + return request({ + url: '/api/Extend/LqAnnualSummary/GetTotalConsumeStat', + method: 'post', + data + }) +} + +// 4.3 年度门店人头表 +export function getHeadCountStat(data) { + return request({ + url: '/api/Extend/LqAnnualSummary/GetHeadCountStat', + method: 'post', + data + }) +} + +// 4.4 年度门店项目数表 +export function getProjectCountStat(data) { + return request({ + url: '/api/Extend/LqAnnualSummary/GetProjectCountStat', + method: 'post', + data + }) +} + +// 4.5 年度门店人次表 +export function getPersonTimeStat(params) { + return request({ + url: '/api/Extend/LqAnnualSummary/GetPersonTimeStat', + method: 'get', + params + }) +} + +// 通用月度趋势统计 +export function getMonthlyTrend(params) { + return request({ + url: '/api/Extend/LqAnnualSummary/GetMonthlyTrend', + method: 'get', + params + }) +} + +// 4.6 门店五项指标统计图 +export function getStoreIndicatorsStat(data) { + return request({ + url: '/api/Extend/LqAnnualSummary/GetStoreIndicatorsStat', + method: 'post', + data + }) +} + +// 获取门店指标详情 +export function getStoreIndicatorDetail(params) { + return request({ + url: '/api/Extend/LqAnnualSummary/GetStoreIndicatorDetail', + method: 'get', + params + }) +} + +// 4.7 事业部五项指标总计图 +export function getBusinessUnitIndicatorsStat(params) { + return request({ + url: '/api/Extend/LqAnnualSummary/GetBusinessUnitIndicatorsStat', + method: 'get', + params + }) +} + +// 4.8 事业部内部汇总 (宽表) +export function getBusinessUnitSummaryStat(data) { + return request({ + url: '/api/Extend/LqAnnualSummary/GetBusinessUnitSummaryStat', + method: 'post', + data + }) +} diff --git a/antis-ncc-admin/src/utils/request.js b/antis-ncc-admin/src/utils/request.js index 7bba7f3..9f6fd62 100644 --- a/antis-ncc-admin/src/utils/request.js +++ b/antis-ncc-admin/src/utils/request.js @@ -29,7 +29,9 @@ service.interceptors.request.use( if (store.getters.token) { config.headers['Authorization'] = getToken() } - if (config.method == 'get') { + // GET 请求时，如果传入了 data 但没有 params，则将其转换为 params + // 如果已经有 params，则保留 params，不覆盖 + if (config.method == 'get' && config.data && !config.params) { config.params = config.data } let timestamp = Date.parse(new Date()) / 1000 diff --git a/antis-ncc-admin/src/views/extend/annualSummary/dashboard/index.vue b/antis-ncc-admin/src/views/extend/annualSummary/dashboard/index.vue new file mode 100644 index 0000000..8258192 --- /dev/null +++ b/antis-ncc-admin/src/views/extend/annualSummary/dashboard/index.vue @@ -0,0 +1,1906 @@ + + + + + diff --git a/antis-ncc-admin/src/views/extend/annualSummary/dataManage/index.vue b/antis-ncc-admin/src/views/extend/annualSummary/dataManage/index.vue new file mode 100644 index 0000000..20b9a64 --- /dev/null +++ b/antis-ncc-admin/src/views/extend/annualSummary/dataManage/index.vue @@ -0,0 +1,437 @@ + + + + + diff --git a/antis-ncc-admin/src/views/lqTkjlb/Report.vue b/antis-ncc-admin/src/views/lqTkjlb/Report.vue index 1f28eb5..3e415e7 100644 --- a/antis-ncc-admin/src/views/lqTkjlb/Report.vue +++ b/antis-ncc-admin/src/views/lqTkjlb/Report.vue @@ -652,6 +652,7 @@ + diff --git a/antis-ncc-admin/src/views/personalPerformanceStatistics/index.vue b/antis-ncc-admin/src/views/personalPerformanceStatistics/index.vue index aa584a5..a8f7f56 100644 --- a/antis-ncc-admin/src/views/personalPerformanceStatistics/index.vue +++ b/antis-ncc-admin/src/views/personalPerformanceStatistics/index.vue @@ -41,13 +41,10 @@ -
- 健康师个人开单业绩列表 -
- + @@ -79,7 +76,7 @@ diff --git a/antis-ncc-admin/src/views/salaryCalculation/index.vue b/antis-ncc-admin/src/views/salaryCalculation/index.vue index 07cbe1f..0fcc55b 100644 --- a/antis-ncc-admin/src/views/salaryCalculation/index.vue +++ b/antis-ncc-admin/src/views/salaryCalculation/index.vue @@ -58,7 +58,7 @@
-
+ -
+ -
+