DeXun/klp-oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(报表): 添加月视图折线图并优化分条线显示逻辑

Browse Source 
添加月视图日数据趋势折线图展示产出和消耗数据
优化分条信息统计组件仅在分条线时显示
在日视图中添加昨日数据对比显示
重构日期选择逻辑支持多种视图模式
This commit is contained in:
砂糖
2026-04-15 14:07:42 +08:00
parent d15f57ae6d
commit f68167b102
5 changed files with 628 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

170
klp-ui/src/views/wms/report/template/day.vue
View File

@@ -3,7 +3,7 @@
<el-row>
<el-form label-width="80px" inline>
<el-form-item label="日期" prop="date">
<el-date-picker style="width: 200px;" v-model="queryParams.date" type="date" value-format="yyyy-MM-dd"
<el-date-picker style="width: 200px;" v-model="dayDate" type="date" value-format="yyyy-MM-dd"
placeholder="选择日期" @change="handleDateChange"></el-date-picker>
</el-form-item>
<el-form-item label="入场钢卷号" prop="enterCoilNo">
@@ -47,26 +47,26 @@
</el-row>
<el-descriptions title="统计信息" :column="3" border>
<el-descriptions-item label="产出数量">{{ summary.outCount }}</el-descriptions-item>
<el-descriptions-item label="产出总重">{{ summary.outTotalWeight }}t</el-descriptions-item>
<el-descriptions-item label="产出均重">{{ summary.outAvgWeight }}t</el-descriptions-item>
<el-descriptions-item label="产出数量">{{ summary.outCount }}<span v-if="yesterdaySummary.outCount" style="margin-left: 10px; font-size: 12px; color: #999;">(昨日: {{ yesterdaySummary.outCount }})</span></el-descriptions-item>
<el-descriptions-item label="产出总重">{{ summary.outTotalWeight }}t<span v-if="yesterdaySummary.outTotalWeight" style="margin-left: 10px; font-size: 12px; color: #999;">(昨日: {{ yesterdaySummary.outTotalWeight }}t)</span></el-descriptions-item>
<el-descriptions-item label="产出均重">{{ summary.outAvgWeight }}t<span v-if="yesterdaySummary.outAvgWeight" style="margin-left: 10px; font-size: 12px; color: #999;">(昨日: {{ yesterdaySummary.outAvgWeight }}t)</span></el-descriptions-item>
<el-descriptions-item label="消耗数量">{{ summary.lossCount }}</el-descriptions-item>
<el-descriptions-item label="消耗总重">{{ summary.lossTotalWeight }}t</el-descriptions-item>
<el-descriptions-item label="消耗均重">{{ summary.lossAvgWeight }}t</el-descriptions-item>
<el-descriptions-item label="消耗数量">{{ summary.lossCount }}<span v-if="yesterdaySummary.lossCount" style="margin-left: 10px; font-size: 12px; color: #999;">(昨日: {{ yesterdaySummary.lossCount }})</span></el-descriptions-item>
<el-descriptions-item label="消耗总重">{{ summary.lossTotalWeight }}t<span v-if="yesterdaySummary.lossTotalWeight" style="margin-left: 10px; font-size: 12px; color: #999;">(昨日: {{ yesterdaySummary.lossTotalWeight }}t)</span></el-descriptions-item>
<el-descriptions-item label="消耗均重">{{ summary.lossAvgWeight }}t<span v-if="yesterdaySummary.lossAvgWeight" style="margin-left: 10px; font-size: 12px; color: #999;">(昨日: {{ yesterdaySummary.lossAvgWeight }}t)</span></el-descriptions-item>
<el-descriptions-item label="数量差值">{{ summary.countDiff }}</el-descriptions-item>
<el-descriptions-item label="总重差值">{{ summary.weightDiff }}</el-descriptions-item>
<el-descriptions-item label="均重差值">{{ summary.avgWeightDiff }}t</el-descriptions-item>
<el-descriptions-item label="数量差值">{{ summary.countDiff }}<span v-if="yesterdaySummary.countDiff" style="margin-left: 10px; font-size: 12px; color: #999;">(昨日: {{ yesterdaySummary.countDiff }})</span></el-descriptions-item>
<el-descriptions-item label="总重差值">{{ summary.weightDiff }}<span v-if="yesterdaySummary.weightDiff" style="margin-left: 10px; font-size: 12px; color: #999;">(昨日: {{ yesterdaySummary.weightDiff }})</span></el-descriptions-item>
<el-descriptions-item label="均重差值">{{ summary.avgWeightDiff }}t<span v-if="yesterdaySummary.avgWeightDiff" style="margin-left: 10px; font-size: 12px; color: #999;">(昨日: {{ yesterdaySummary.avgWeightDiff }}t)</span></el-descriptions-item>
<!-- <el-descriptions-item label="合计均重">{{ summary.totalAvgWeight }}t</el-descriptions-item> -->
<!-- 成品率 -->
<el-descriptions-item label="成品率">{{ summary.passRate }}</el-descriptions-item>
<el-descriptions-item label="损耗率">{{ summary.lossRate }}</el-descriptions-item>
<el-descriptions-item label="成品率">{{ summary.passRate }}<span v-if="yesterdaySummary.passRate" style="margin-left: 10px; font-size: 12px; color: #999;">(昨日: {{ yesterdaySummary.passRate }})</span></el-descriptions-item>
<el-descriptions-item label="损耗率">{{ summary.lossRate }}<span v-if="yesterdaySummary.lossRate" style="margin-left: 10px; font-size: 12px; color: #999;">(昨日: {{ yesterdaySummary.lossRate }})</span></el-descriptions-item>
<!-- 异常率 -->
<el-descriptions-item label="异常率">{{ summary.abRate }}</el-descriptions-item>
<el-descriptions-item label="异常率">{{ summary.abRate }}<span v-if="yesterdaySummary.abRate" style="margin-left: 10px; font-size: 12px; color: #999;">(昨日: {{ yesterdaySummary.abRate }})</span></el-descriptions-item>
<!-- 正品率 -->
<el-descriptions-item label="正品率">{{ summary.passRate2 }}</el-descriptions-item>
<el-descriptions-item label="正品率">{{ summary.passRate2 }}<span v-if="yesterdaySummary.passRate2" style="margin-left: 10px; font-size: 12px; color: #999;">(昨日: {{ yesterdaySummary.passRate2 }})</span></el-descriptions-item>
</el-descriptions>
<!-- 已处理M统计信息 -->
@@ -98,7 +98,7 @@
</el-descriptions>
<!-- 分条信息统计 -->
<split-summary :origin-outputlist="list" :origin-loss-list="lossList" :common-coil-ids="commonCoilIds"></split-summary>
<split-summary v-if="productionLine == '分条线'" :origin-outputlist="list" :origin-loss-list="lossList" :common-coil-ids="commonCoilIds"></split-summary>
<el-descriptions title="明细信息" :column="3" border>
</el-descriptions>
@@ -122,6 +122,10 @@
</template>
<script>
import { listCoilWithIds } from "@/api/wms/coil";
import {
listPendingAction,
} from '@/api/wms/pendingAction';
import ProductInfo from "@/components/KLPService/Renderer/ProductInfo";
import RawMaterialInfo from "@/components/KLPService/Renderer/RawMaterialInfo";
import CoilNo from "@/components/KLPService/Renderer/CoilNo.vue";
@@ -180,13 +184,43 @@ export default {
const now = new Date()
const currentDate = `${now.getFullYear()}-${addZero(now.getMonth() + 1)}-${addZero(now.getDate())}`
// 生成指定日期的 00:00:00 和 23:59:59 时间字符串
/**
* 生成指定日期/月份的时间范围字符串
* @param {string} dateStr - 支持格式：yyyy-MM（月份） 或 yyyy-MM-dd（具体日期）
* @returns {object} 包含start（开始时间）和end（结束时间）的对象
*/
const getDayTimeRange = (dateStr) => {
return {
start: `${dateStr} 00:00:00`,
end: `${dateStr} 23:59:59`
// 先校验输入格式是否合法
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)
@@ -196,10 +230,11 @@ export default {
settingVisible: false,
list: [],
lossList: [],
// 日视图日期
dayDate: currentDate,
queryParams: {
pageNum: 1,
pageSize: 9999,
// date: currentDate, // 绑定日期选择器的默认值（当天）
byCreateTimeStart: start, // 默认当天0点
byCreateTimeEnd: end, // 默认当天23:59:59
enterCoilNo: '',
@@ -226,6 +261,8 @@ export default {
lossColumns: [],
outputColumns: [],
actionIds: '',
// 昨日数据
yesterdaySummary: {},
}
},
watch: {
@@ -277,9 +314,9 @@ export default {
this.outputColumns = JSON.parse(localStorage.getItem('preference-tableColumns-coil-report-output') || '[]') || []
},
// 日期变更处理：更新开始/结束时间
handleDateChange(date) {
if (!date) return
const { start, end } = this.getDayTimeRange(date)
handleDateChange() {
if (!this.dayDate) return
const { start, end } = this.getDayTimeRange(this.dayDate)
this.queryParams.byCreateTimeStart = start
this.queryParams.byCreateTimeEnd = end
// 日期变更后自动查询
@@ -301,6 +338,7 @@ export default {
]).then(([lossList, outputList]) => {
this.lossList = lossList
this.list = outputList
this.getYesterdayData()
this.loading = false
})
},
@@ -310,18 +348,98 @@ export default {
this.$message.warning('暂无数据可导出')
return
}
// 格式化日期用于文件名
const startDate = this.queryParams.byCreateTimeStart.split(' ')[0];
const endDate = this.queryParams.byCreateTimeEnd.split(' ')[0];
this.download('wms/materialCoil/export', {
coilIds: this.list.map(item => item.coilId).join(',')
}, `materialCoil_${this.queryParams.date}_${new Date().getTime()}.xlsx`)
}, `materialCoil_${startDate}_${endDate}_${new Date().getTime()}.xlsx`)
},
exportLossData() {
if (this.lossList.length === 0) {
this.$message.warning('暂无数据可导出')
return
}
// 格式化日期用于文件名
const startDate = this.queryParams.byCreateTimeStart.split(' ')[0];
const endDate = this.queryParams.byCreateTimeEnd.split(' ')[0];
this.download('wms/materialCoil/export', {
actionIds: this.actionIds
}, `materialCoil_${this.queryParams.date}_${new Date().getTime()}.xlsx`)
}, `materialCoil_${startDate}_${endDate}_${new Date().getTime()}.xlsx`)
},
// 获取昨日数据
getYesterdayData() {
const yesterday = new Date(this.dayDate)
yesterday.setDate(yesterday.getDate() - 1)
const year = yesterday.getFullYear()
const month = String(yesterday.getMonth() + 1).padStart(2, '0')
const day = String(yesterday.getDate()).padStart(2, '0')
const yesterdayDate = `${year}-${month}-${day}`
const { start, end } = this.getDayTimeRange(yesterdayDate)
Promise.all([
listCoilWithIds({
selectType: 'raw_material',
itemType: 'raw_material',
warehouseIds: this.warehouseIds.join(','),
...this.queryParams,
...this.baseQueryParams,
byCreateTimeStart: start,
byCreateTimeEnd: end,
}),
listCoilWithIds({
selectType: 'product',
itemType: 'product',
warehouseIds: this.warehouseIds.join(','),
...this.queryParams,
...this.baseQueryParams,
byCreateTimeStart: start,
byCreateTimeEnd: end,
}),
]).then((resList) => {
const list = resList.flatMap(res => res.rows)
// 按照createTime 降序排序
const yesterdayList = list.sort(
(a, b) => new Date(b.createTime) - new Date(a.createTime)
).map(item => {
// 确保每个项目都有 selectType 字段
if (!item.selectType) {
item.selectType = item.itemType === 'product' ? 'product' : 'raw_material'
}
return item
})
// 获取昨日消耗数据
Promise.all(this.actionTypes.map(actionType => {
return listPendingAction({
actionStatus: 2,
warehouseId: this.queryParams.planId,
actionType,
pageSize: 99999,
pageNum: 1,
startTime: start,
endTime: end,
...this.actionQueryParams,
})
})).then((lossResList) => {
const lossActions = lossResList.flatMap(item => item.rows)
const lossCoilIds = lossActions.map(item => item.coilId).join(',')
if (lossCoilIds) {
listCoilWithIds({
...this.queryParams,
byCreateTimeStart: undefined,
byCreateTimeEnd: undefined,
coilIds: lossCoilIds,
}).then(res => {
const yesterdayLossList = res.rows
this.yesterdaySummary = calcSummary(yesterdayList, yesterdayLossList)
})
} else {
this.yesterdaySummary = calcSummary(yesterdayList, [])
}
})
})
},
// 保存产出报表
saveOutputReport() {