fix: 修复多处表单与接口适配问题,优化钢卷状态筛选逻辑
1. 修复SalaryPanel输入框边框缺失样式 2. 调整wms报表日期范围计算与视图类型默认值 3. 统一多页面钢卷状态筛选组件:替换为下拉选项新增历史卷,新增状态转换逻辑,修正接口传参格式 4. 同步crm合同、业务员页面的钢卷筛选适配改动
This commit is contained in:
@@ -524,7 +524,12 @@ export default {
|
||||
endDate = `${dateStr}-${lastDayOfMonth.toString().padStart(2, '0')}`;
|
||||
} else if (dayPattern.test(dateStr)) {
|
||||
startDate = dateStr;
|
||||
endDate = dateStr;
|
||||
const nextDay = new Date(dateStr);
|
||||
nextDay.setDate(nextDay.getDate() + 1);
|
||||
const nextYear = nextDay.getFullYear();
|
||||
const nextMonth = String(nextDay.getMonth() + 1).padStart(2, '0');
|
||||
const nextDayNum = String(nextDay.getDate()).padStart(2, '0');
|
||||
endDate = `${nextYear}-${nextMonth}-${nextDayNum}`;
|
||||
} else {
|
||||
throw new Error('输入格式错误,请传入 yyyy、yyyy-MM 或 yyyy-MM-dd 格式的字符串');
|
||||
}
|
||||
@@ -552,7 +557,7 @@ export default {
|
||||
defaultEndTime,
|
||||
getDayTimeRange,
|
||||
// all 类型专用
|
||||
viewType: 'custom',
|
||||
viewType: 'day',
|
||||
yesterdaySummary: {},
|
||||
monthChart: null,
|
||||
dayChart: null,
|
||||
@@ -734,9 +739,9 @@ export default {
|
||||
this.queryParams.byCreateTimeStart = start;
|
||||
this.queryParams.byCreateTimeEnd = end;
|
||||
} else if (this.reportType === 'all') {
|
||||
// all 类型默认使用当前月份作为自定义时间范围
|
||||
this.viewType = 'custom';
|
||||
const { start, end } = this.getDayTimeRange(this.monthDate);
|
||||
// all 类型默认使用日视图,选中今天,筛选今天07:00到明天07:00的数据
|
||||
this.viewType = 'day';
|
||||
const { start, end } = this.getDayTimeRange(this.dayDate);
|
||||
this.queryParams.startTime = start;
|
||||
this.queryParams.endTime = end;
|
||||
} else {
|
||||
|
||||
Reference in New Issue
Block a user