From 1cbc8da78cbd097f9a24dab67dfbf5f4987c9ac9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= <2178503051@qq.com> Date: Thu, 21 May 2026 13:37:58 +0800 Subject: [PATCH 1/4] =?UTF-8?q?fix(wms):=20=E8=B0=83=E6=95=B4=E9=80=80?= =?UTF-8?q?=E7=81=AB=E7=BB=A9=E6=95=88=E5=92=8C=E5=BC=82=E5=B8=B8=E6=8A=A5?= =?UTF-8?q?=E8=A1=A8=E9=BB=98=E8=AE=A4=E6=9F=A5=E8=AF=A2=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E4=B8=BA=E6=98=A8=E6=97=A5=E5=88=B0=E4=BB=8A=E6=97=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 统一两个报表页面的默认查询时间范围,将初始默认时间改为昨日00:00:00到当日00:00:00,简化了异常报表的时间处理逻辑,移除冗余的日期范围工具函数。 --- .../views/wms/anneal/performance/report.vue | 10 +++- klp-ui/src/views/wms/report/abnormal.vue | 46 ++----------------- 2 files changed, 12 insertions(+), 44 deletions(-) diff --git a/klp-ui/src/views/wms/anneal/performance/report.vue b/klp-ui/src/views/wms/anneal/performance/report.vue index 0a416038..d3a39318 100644 --- a/klp-ui/src/views/wms/anneal/performance/report.vue +++ b/klp-ui/src/views/wms/anneal/performance/report.vue @@ -81,8 +81,14 @@ export default { return { loading: false, queryParams: { - startTime: undefined, - endTime: undefined, + startTime: (() => { + const d = new Date(); d.setDate(d.getDate() - 1); + return `${d.getFullYear()}-${String(d.getMonth()+1).padStart(2,'0')}-${String(d.getDate()).padStart(2,'0')} 00:00:00`; + })(), + endTime: (() => { + const d = new Date(); + return `${d.getFullYear()}-${String(d.getMonth()+1).padStart(2,'0')}-${String(d.getDate()).padStart(2,'0')} 00:00:00`; + })(), targetFurnaceId: undefined, planNo: undefined, enterCoilNo: undefined, diff --git a/klp-ui/src/views/wms/report/abnormal.vue b/klp-ui/src/views/wms/report/abnormal.vue index 24d5a068..c5c35b73 100644 --- a/klp-ui/src/views/wms/report/abnormal.vue +++ b/klp-ui/src/views/wms/report/abnormal.vue @@ -155,52 +155,14 @@ export default { }, dicts: ['product_coil_status', 'coil_material', 'coil_itemname', 'coil_manufacturer', 'coil_quality_status'], data() { - // 工具函数:个位数补零 const addZero = (num) => num.toString().padStart(2, '0') - // 获取当前日期(默认选中当天) const now = new Date() - const currentDate = `${now.getFullYear()}-${addZero(now.getMonth() + 1)}` + const yesterday = new Date(now) + yesterday.setDate(yesterday.getDate() - 1) - /** - * 生成指定日期/月份的时间范围字符串 - * @param {string} dateStr - 支持格式:yyyy-MM(月份) 或 yyyy-MM-dd(具体日期) - * @returns {object} 包含start(开始时间)和end(结束时间)的对象 - */ - const getDayTimeRange = (dateStr) => { - // 先校验输入格式是否合法 - const monthPattern = /^\d{4}-\d{2}$/; // yyyy-MM 正则 - const dayPattern = /^\d{4}-\d{2}-\d{2}$/; // yyyy-MM-dd 正则 - - if (!monthPattern.test(dateStr) && !dayPattern.test(dateStr)) { - throw new Error('输入格式错误,请传入 yyyy-MM 或 yyyy-MM-dd 格式的字符串'); - } - - let startDate, endDate; - - if (monthPattern.test(dateStr)) { - // 处理 yyyy-MM 格式:获取本月第一天和最后一天 - const [year, month] = dateStr.split('-').map(Number); - // 月份是0基的(0=1月,1=2月...),所以要减1 - // 第一天:yyyy-MM-01 - startDate = `${dateStr}-01`; - // 最后一天:通过 new Date(year, month, 0) 计算(month是原始月份,比如2代表2月,传2则取3月0日=2月最后一天) - const lastDayOfMonth = new Date(year, month, 0).getDate(); - endDate = `${dateStr}-${lastDayOfMonth.toString().padStart(2, '0')}`; - } else { - // 处理 yyyy-MM-dd 格式:直接使用传入的日期 - startDate = dateStr; - endDate = dateStr; - } - - // 拼接时间部分 - return { - start: `${startDate} 00:00:00`, - end: `${endDate} 23:59:59` - }; - }; - - const { start, end } = getDayTimeRange(currentDate) + const start = `${yesterday.getFullYear()}-${addZero(yesterday.getMonth() + 1)}-${addZero(yesterday.getDate())} 00:00:00` + const end = `${now.getFullYear()}-${addZero(now.getMonth() + 1)}-${addZero(now.getDate())} 00:00:00` return { lossList: [], outList: [], From 96b49e71f42fa6267b50a97d95c904ef3f9d4acb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= <2178503051@qq.com> Date: Thu, 21 May 2026 13:38:35 +0800 Subject: [PATCH 2/4] =?UTF-8?q?feat(KLPService=E9=80=89=E6=8B=A9=E7=BB=84?= =?UTF-8?q?=E4=BB=B6):=20=E6=96=B0=E5=A2=9E=E9=BB=98=E8=AE=A4=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E5=8F=82=E6=95=B0=E6=94=AF=E6=8C=81=E5=B9=B6=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E9=92=A2=E5=8D=B7=E5=BD=95=E5=85=A5=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1. 为ProductSelect和RawMaterialSelect组件新增defaultQueryParams属性,支持传入默认查询参数合并到请求参数中 2. 优化钢卷录入页面:默认选中成品类型,根据解析的钢卷数据自动设置物料选择器的查询参数 3. 移除页面冗余空行和注释代码 --- .../KLPService/ProductSelect/index.vue | 7 +++ .../KLPService/RawMaterialSelect/index.vue | 7 +++ .../views/wms/anneal/performance/report.vue | 55 ++++++++++++------- klp-ui/src/views/wms/coil/typing.vue | 33 +++++------ 4 files changed, 64 insertions(+), 38 deletions(-) diff --git a/klp-ui/src/components/KLPService/ProductSelect/index.vue b/klp-ui/src/components/KLPService/ProductSelect/index.vue index 69890d26..389537a4 100644 --- a/klp-ui/src/components/KLPService/ProductSelect/index.vue +++ b/klp-ui/src/components/KLPService/ProductSelect/index.vue @@ -163,6 +163,10 @@ export default { filters: { type: Object, default: () => ({}) + }, + defaultQueryParams: { + type: Object, + default: () => ({}) } }, data() { @@ -235,6 +239,9 @@ export default { this.getList(); this.listRecentlySelected(); } + }, + defaultQueryParams(val) { + this.queryParams = { ...this.queryParams, ...val }; } }, methods: { diff --git a/klp-ui/src/components/KLPService/RawMaterialSelect/index.vue b/klp-ui/src/components/KLPService/RawMaterialSelect/index.vue index 89d9a7aa..4e4a9de2 100644 --- a/klp-ui/src/components/KLPService/RawMaterialSelect/index.vue +++ b/klp-ui/src/components/KLPService/RawMaterialSelect/index.vue @@ -151,6 +151,10 @@ export default { filters: { type: Object, default: () => ({}) + }, + defaultQueryParams: { + type: Object, + default: () => ({}) } }, data() { @@ -234,6 +238,9 @@ export default { this.listRecentlySelected(); this.getList(); } + }, + defaultQueryParams(val) { + this.queryParams = { ...this.queryParams, ...val }; } }, methods: { diff --git a/klp-ui/src/views/wms/anneal/performance/report.vue b/klp-ui/src/views/wms/anneal/performance/report.vue index d3a39318..1e1499b5 100644 --- a/klp-ui/src/views/wms/anneal/performance/report.vue +++ b/klp-ui/src/views/wms/anneal/performance/report.vue @@ -1,13 +1,10 @@