diff --git a/src/api/canteen/canteenDailyMenu.ts b/src/api/canteen/canteenDailyMenu.ts index 5a2c8d96..d8f41627 100644 --- a/src/api/canteen/canteenDailyMenu.ts +++ b/src/api/canteen/canteenDailyMenu.ts @@ -158,6 +158,15 @@ export function setDayLock(data: Object) { }) } +/** 按订单净销量重算当日线上/线下 sold(不改配额) */ +export function syncChannelSold(params: { merchantId: string | number; mealDate: string }) { + return request({ + url: "/canteen/canteenDailyMenu/syncChannelSold", + method: "put", + params, + }) +} + /** 分页查询导入日志 */ export function pageImportLog(params: Object) { return request({ diff --git a/src/utils/formatTime.ts b/src/utils/formatTime.ts index 82b6610c..a335a9de 100644 --- a/src/utils/formatTime.ts +++ b/src/utils/formatTime.ts @@ -234,9 +234,11 @@ export const dateStr: string = "YYYY-MM-DD" export const timeStr: string = "HH:mm:ss" -/** 当前自然月,格式 yyyy-MM(报表业务月默认值) */ +/** 报表业务月默认值:上一个自然月(本月统计上月),格式 yyyy-MM */ export function currentBizMonth(): string { const d = new Date() + d.setDate(1) + d.setMonth(d.getMonth() - 1) const m = d.getMonth() + 1 return `${d.getFullYear()}-${m < 10 ? `0${m}` : m}` } diff --git a/src/views/canteen/canteenDailyMenu/importConfirmDialog.vue b/src/views/canteen/canteenDailyMenu/importConfirmDialog.vue index f4a98dba..2cf59e56 100644 --- a/src/views/canteen/canteenDailyMenu/importConfirmDialog.vue +++ b/src/views/canteen/canteenDailyMenu/importConfirmDialog.vue @@ -16,12 +16,12 @@ 更新 {{ preview?.totalUpdate || 0 }} 锁定跳过 {{ preview?.totalSkipLocked || 0 }} | - 已勾选导入 {{ selectedCount }} / 共 {{ rows.length }} 行 + 已勾选导入 {{ selectedMenuCount }} 道 / Excel {{ rows.length }} 行
-
点击日期查看当天数据
+
点击日期查看当天数据(计数按排菜道数:套餐整组算 1)