d6e30d4d50
新增综合报表模板，支持按不同仓库类型展示统计信息。添加M卷处理功能，在统计中自动过滤并计算M卷数据。优化报表展示顺序，默认显示产出钢卷。修复异常率计算问题，完善统计信息展示。 新增仓库特定报表页面，包括镀铬、拉矫、脱脂、双机架、镀锌和酸连轧成品库报表。调整KLPTable组件支持高度设置，优化基础面板显示逻辑。 修复API请求超时问题，统一设置超时时间为10分钟。调整标签显示文本，优化用户体验。
402 lines
16 KiB
Vue
402 lines
16 KiB
Vue
<template>
|
||
<div class="app-container" v-loading="loading">
|
||
<el-row>
|
||
<el-form label-width="80px" inline>
|
||
<el-form-item label="开始时间" prop="startDate">
|
||
<el-date-picker style="width: 200px;" v-model="queryParams.startDate" type="date" value-format="yyyy-MM-dd"
|
||
placeholder="选择开始日期" @change="handleDateChange"></el-date-picker>
|
||
</el-form-item>
|
||
<el-form-item label="结束时间" prop="endDate">
|
||
<el-date-picker style="width: 200px;" v-model="queryParams.endDate" type="date" value-format="yyyy-MM-dd"
|
||
placeholder="选择结束日期" @change="handleDateChange"></el-date-picker>
|
||
</el-form-item>
|
||
<el-form-item label="入场钢卷号" prop="enterCoilNo">
|
||
<el-input style="width: 200px; display: inline-block;" v-model="queryParams.enterCoilNo"
|
||
placeholder="请输入入场钢卷号" clearable @keyup.enter.native="handleQuery" />
|
||
</el-form-item>
|
||
<el-form-item label="当前钢卷号" prop="currentCoilNo">
|
||
<el-input style="width: 200px;" v-model="queryParams.currentCoilNo" placeholder="请输入当前钢卷号" clearable
|
||
@keyup.enter.native="handleQuery" />
|
||
</el-form-item>
|
||
<el-form-item label="逻辑库位" prop="warehouseIds">
|
||
<el-select v-model="warehouseIds" collapse-tags multiple placeholder="请选择逻辑库位" style="width: 200px;">
|
||
<el-option v-for="item in warehouseOptions" :key="item.value" :label="item.label" :value="item.value" />
|
||
</el-select>
|
||
</el-form-item>
|
||
<el-form-item label="产品名称" prop="itemName">
|
||
<el-input style="width: 200px;" v-model="queryParams.itemName" placeholder="请输入产品名称" clearable
|
||
@keyup.enter.native="handleQuery" />
|
||
</el-form-item>
|
||
<el-form-item label="规格" prop="itemSpecification">
|
||
<memo-input style="width: 200px;" v-model="queryParams.itemSpecification" storageKey="coilSpec"
|
||
placeholder="请选择规格" clearable @keyup.enter.native="handleQuery" />
|
||
</el-form-item>
|
||
<el-form-item label="材质" prop="itemMaterial">
|
||
<muti-select style="width: 200px;" v-model="queryParams.itemMaterial" :options="dict.type.coil_material"
|
||
placeholder="请选择材质" clearable @keyup.enter.native="handleQuery" />
|
||
</el-form-item>
|
||
<el-form-item label="厂家" prop="itemManufacturer">
|
||
<muti-select style="width: 200px;" v-model="queryParams.itemManufacturer"
|
||
:options="dict.type.coil_manufacturer" placeholder="请选择厂家" clearable @keyup.enter.native="handleQuery" />
|
||
</el-form-item>
|
||
<el-form-item>
|
||
<el-button type="primary" @click="handleQuery">查询</el-button>
|
||
<el-button type="primary" @click="exportData">导出产出钢卷</el-button>
|
||
<el-button type="primary" @click="exportLossData">导出消耗钢卷</el-button>
|
||
<el-button type="primary" @click="settingVisible = true">列设置</el-button>
|
||
</el-form-item>
|
||
</el-form>
|
||
</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.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.totalCount }}</el-descriptions-item>
|
||
<el-descriptions-item label="合计总重">{{ summary.totalWeight }}t</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.abRate }}</el-descriptions-item>
|
||
<!-- 正品率 -->
|
||
<el-descriptions-item label="正品率">{{ summary.passRate2 }}</el-descriptions-item>
|
||
</el-descriptions>
|
||
|
||
<!-- 已处理M统计信息 -->
|
||
<el-descriptions title="已处理M统计信息" :column="3" border>
|
||
<el-descriptions-item label="产出数量">{{ mSummary.outCount }}</el-descriptions-item>
|
||
<el-descriptions-item label="产出总重">{{ mSummary.outTotalWeight }}t</el-descriptions-item>
|
||
<el-descriptions-item label="产出均重">{{ mSummary.outAvgWeight }}t</el-descriptions-item>
|
||
|
||
<el-descriptions-item label="消耗数量">{{ mSummary.lossCount }}</el-descriptions-item>
|
||
<el-descriptions-item label="消耗总重">{{ mSummary.lossTotalWeight }}t</el-descriptions-item>
|
||
<el-descriptions-item label="消耗均重">{{ mSummary.lossAvgWeight }}t</el-descriptions-item>
|
||
|
||
<el-descriptions-item label="合计数量">{{ mSummary.totalCount }}</el-descriptions-item>
|
||
<el-descriptions-item label="合计总重">{{ mSummary.totalWeight }}t</el-descriptions-item>
|
||
<el-descriptions-item label="合计均重">{{ mSummary.totalAvgWeight }}t</el-descriptions-item>
|
||
|
||
<!-- 成品率 -->
|
||
<el-descriptions-item label="成品率">{{ mSummary.passRate }}</el-descriptions-item>
|
||
<el-descriptions-item label="损耗率">{{ mSummary.lossRate }}</el-descriptions-item>
|
||
<!-- 异常率 -->
|
||
<el-descriptions-item label="异常率">{{ mSummary.abRate }}</el-descriptions-item>
|
||
<!-- 正品率 -->
|
||
<el-descriptions-item label="正品率">{{ mSummary.passRate2 }}</el-descriptions-item>
|
||
</el-descriptions>
|
||
|
||
<!-- 异常统计 -->
|
||
<el-descriptions title="异常统计" :column="4" border>
|
||
<el-descriptions-item v-for="item in abSummary" :key="item.label" :label="item.label">{{ item.value
|
||
}}</el-descriptions-item>
|
||
</el-descriptions>
|
||
|
||
<el-descriptions title="明细信息" :column="3" border>
|
||
</el-descriptions>
|
||
<el-tabs v-model="activeTab">
|
||
<el-tab-pane label="产出钢卷" name="output">
|
||
<coil-table :columns="outputColumns" :data="list"></coil-table>
|
||
</el-tab-pane>
|
||
<el-tab-pane label="投入钢卷" name="loss">
|
||
<coil-table :columns="lossColumns" :data="lossList"></coil-table>
|
||
</el-tab-pane>
|
||
</el-tabs>
|
||
|
||
<el-dialog title="列设置" :visible.sync="settingVisible" width="50%">
|
||
<el-radio-group v-model="activeColumnConfig">
|
||
<el-radio-button label="coil-report-loss">投入明细配置</el-radio-button>
|
||
<el-radio-button label="coil-report-output">产出明细配置</el-radio-button>
|
||
</el-radio-group>
|
||
<columns-setting :reportType="activeColumnConfig"></columns-setting>
|
||
</el-dialog>
|
||
</div>
|
||
</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";
|
||
import MemoInput from "@/components/MemoInput";
|
||
import MutiSelect from "@/components/MutiSelect";
|
||
import WarehouseSelect from "@/components/KLPService/WarehouseSelect";
|
||
import { calcSummary, calcAbSummary, calcMSummary } from "@/views/wms/report/js/calc";
|
||
import ColumnsSetting from "@/views/wms/report/components/setting/columns.vue";
|
||
import CoilTable from "@/views/wms/report/components/coilTable/index.vue";
|
||
|
||
export default {
|
||
name: 'ComprehensiveTemplate',
|
||
components: {
|
||
ProductInfo,
|
||
RawMaterialInfo,
|
||
CoilNo,
|
||
MemoInput,
|
||
MutiSelect,
|
||
WarehouseSelect,
|
||
ColumnsSetting,
|
||
CoilTable,
|
||
},
|
||
props: {
|
||
actionTypes: {
|
||
type: Array,
|
||
default: () => [],
|
||
},
|
||
actionQueryParams: {
|
||
type: Object,
|
||
default: () => { },
|
||
},
|
||
baseQueryParams: {
|
||
type: Object,
|
||
default: () => ({})
|
||
},
|
||
warehouseOptions: {
|
||
type: Array,
|
||
default: () => []
|
||
}
|
||
},
|
||
dicts: ['product_coil_status', 'coil_material', 'coil_itemname', 'coil_manufacturer'],
|
||
data() {
|
||
// 工具函数：个位数补零
|
||
const addZero = (num) => num.toString().padStart(2, '0')
|
||
|
||
// 获取当前日期（默认选中当天）
|
||
const now = new Date()
|
||
const currentDate = `${now.getFullYear()}-${addZero(now.getMonth() + 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)
|
||
|
||
return {
|
||
activeTab: 'output',
|
||
activeColumnConfig: 'coil-report-loss',
|
||
settingVisible: false,
|
||
list: [],
|
||
lossList: [],
|
||
queryParams: {
|
||
pageNum: 1,
|
||
pageSize: 9999,
|
||
date: currentDate, // 绑定日期选择器的默认值（当天）
|
||
byCreateTimeStart: start, // 默认当天0点
|
||
byCreateTimeEnd: end, // 默认当天23:59:59
|
||
selectType: 'product',
|
||
enterCoilNo: '',
|
||
currentCoilNo: '',
|
||
warehouseId: '',
|
||
itemName: '', // 修正原代码的productName为itemName（和表单绑定一致）
|
||
itemSpecification: '',
|
||
itemMaterial: '',
|
||
itemManufacturer: '',
|
||
},
|
||
loading: false,
|
||
warehouseIds: [
|
||
'1988150099140866050',
|
||
'1988150263284953089',
|
||
'1988150545175736322',
|
||
'1988150150521090049',
|
||
'2019583656787259393',
|
||
'2019583325311414274',
|
||
'2019583429955104769',
|
||
'2019583137616310273',
|
||
],
|
||
getDayTimeRange, // 挂载时间范围生成函数
|
||
|
||
lossColumns: [],
|
||
outputColumns: [],
|
||
}
|
||
},
|
||
watch: {
|
||
warehouseOptions: {
|
||
handler(newVal, oldVal) {
|
||
if (newVal !== oldVal) {
|
||
this.warehouseIds = newVal.map(item => item.value)
|
||
}
|
||
},
|
||
immediate: true,
|
||
}
|
||
},
|
||
computed: {
|
||
summary() {
|
||
return calcSummary(this.list, this.lossList)
|
||
},
|
||
abSummary() {
|
||
return calcAbSummary(this.list)
|
||
},
|
||
mSummary() {
|
||
return calcMSummary(this.list, this.lossList)
|
||
}
|
||
},
|
||
methods: {
|
||
// 加载列设置
|
||
loadColumns() {
|
||
this.lossColumns = JSON.parse(localStorage.getItem('preference-tableColumns-coil-report-loss') || '[]') || []
|
||
this.outputColumns = JSON.parse(localStorage.getItem('preference-tableColumns-coil-report-output') || '[]') || []
|
||
},
|
||
// 日期变更处理：更新开始/结束时间
|
||
handleDateChange() {
|
||
if (this.queryParams.startDate && this.queryParams.endDate) {
|
||
this.queryParams.byCreateTimeStart = `${this.queryParams.startDate} 00:00:00`
|
||
this.queryParams.byCreateTimeEnd = `${this.queryParams.endDate} 23:59:59`
|
||
// 日期变更后自动查询
|
||
this.handleQuery()
|
||
}
|
||
},
|
||
// 统一查询入口（兼容回车和按钮点击）
|
||
handleQuery() {
|
||
this.getList()
|
||
},
|
||
// 核心查询逻辑
|
||
getList() {
|
||
this.loading = true
|
||
Promise.all([
|
||
listCoilWithIds({
|
||
selectType: 'raw_material',
|
||
itemType: 'raw_material',
|
||
warehouseIds: this.warehouseIds.join(','),
|
||
...this.queryParams,
|
||
...this.baseQueryParams,
|
||
}),
|
||
listCoilWithIds({
|
||
selectType: 'product',
|
||
itemType: 'product',
|
||
warehouseIds: this.warehouseIds.join(','),
|
||
...this.queryParams,
|
||
...this.baseQueryParams,
|
||
}),
|
||
]).then((resList) => {
|
||
console.log(resList)
|
||
const list = resList.flatMap(res => res.rows)
|
||
// 按照createTime 降序排序
|
||
this.list = list.sort(
|
||
(a, b) => new Date(b.createTime) - new Date(a.createTime)
|
||
).map(item => {
|
||
// 计算宽度和厚度，将规格按照*分割，*前的是厚度，*后的是宽度
|
||
const [thickness, width] = item.specification.split('*')
|
||
return {
|
||
...item,
|
||
computedThickness: parseFloat(thickness),
|
||
computedWidth: parseFloat(width),
|
||
}
|
||
})
|
||
this.getLossList()
|
||
})
|
||
},
|
||
async getLossList() {
|
||
this.loading = true
|
||
const resultList = await Promise.all(this.actionTypes.map(actionType => {
|
||
return listPendingAction({
|
||
actionStatus: 2,
|
||
warehouseId: this.queryParams.planId,
|
||
actionType,
|
||
pageSize: 9999,
|
||
pageNum: 1,
|
||
startTime: this.queryParams.byCreateTimeStart,
|
||
endTime: this.queryParams.byCreateTimeEnd,
|
||
...this.actionQueryParams,
|
||
})
|
||
}))
|
||
const actions = resultList.flatMap(item => item.rows)
|
||
const coilIds = actions.map(item => item.coilId).join(',')
|
||
console.log(coilIds)
|
||
if (!coilIds) {
|
||
this.$message({
|
||
message: '暂无数据',
|
||
type: 'warning',
|
||
})
|
||
this.lossList = []
|
||
this.loading = false
|
||
return
|
||
}
|
||
listCoilWithIds({
|
||
...this.queryParams,
|
||
byCreateTimeStart: undefined,
|
||
byCreateTimeEnd: undefined,
|
||
coilIds: coilIds,
|
||
}).then(res => {
|
||
this.lossList = res.rows.map(item => {
|
||
// 计算宽度和厚度，将规格按照*分割，*前的是厚度，*后的是宽度
|
||
const [thickness, width] = item.specification.split('*')
|
||
return {
|
||
...item,
|
||
computedThickness: parseFloat(thickness),
|
||
computedWidth: parseFloat(width),
|
||
}
|
||
})
|
||
this.loading = false
|
||
})
|
||
},
|
||
// 导出
|
||
exportData() {
|
||
if (this.list.length === 0) {
|
||
this.$message.warning('暂无数据可导出')
|
||
return
|
||
}
|
||
this.download('wms/materialCoil/export', {
|
||
coilIds: this.list.map(item => item.coilId).join(',')
|
||
}, `materialCoil_${this.queryParams.startDate}_${this.queryParams.endDate}_${new Date().getTime()}.xlsx`)
|
||
},
|
||
exportLossData() {
|
||
if (this.lossList.length === 0) {
|
||
this.$message.warning('暂无数据可导出')
|
||
return
|
||
}
|
||
this.download('wms/materialCoil/export', {
|
||
coilIds: this.lossList.map(item => item.coilId).join(',')
|
||
}, `materialCoil_${this.queryParams.startDate}_${this.queryParams.endDate}_${new Date().getTime()}.xlsx`)
|
||
},
|
||
},
|
||
mounted() {
|
||
this.getList()
|
||
this.loadColumns()
|
||
}
|
||
}
|
||
</script>
|
||
|
||
<style scoped></style> |