Merge remote-tracking branch 'origin/master'

master
zhaoxiaolin 5 months ago
commit ff381433bf

@ -129,6 +129,24 @@ export function getHourProductionList(query) {
}); });
} }
// 查询成型机表头
export function getMachineProductionTitle(query) {
return request({
url: '/mes/reportWork/getMachineProductionTitle',
method: 'get',
params: query
});
}
// 查询成型机产品产量
export function getMachineProductionList(query) {
return request({
url: '/mes/reportWork/getMachineProductionList',
method: 'get',
params: query
});
}
// 获取班次信息 // 获取班次信息
export function getProShifts() { export function getProShifts() {
return request({ return request({

@ -0,0 +1,268 @@
<template>
<div class="app-container">
<el-form
:model="queryParams"
ref="queryForm"
size="small"
:inline="true"
v-show="showSearch"
label-width="98px"
>
<el-form-item label="生产时间" prop="productDateArray">
<el-date-picker
v-model="queryParams.productDateArray"
format="yyyy-MM-dd"
type="daterange"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
>
</el-date-picker>
</el-form-item>
<el-form-item label="产品编号" prop="productCode">
<el-input
v-model="queryParams.productCode"
placeholder="请输入产品编码"
clearable
/>
</el-form-item>
<el-form-item label="产品名称" prop="productName">
<el-input
v-model="queryParams.productName"
placeholder="请输入产品名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item>
<el-button
type="primary"
icon="el-icon-search"
size="mini"
@click="handleQuery"
>搜索</el-button
>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
>重置</el-button
>
</el-form-item>
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
>导出</el-button
>
</el-col>
<right-toolbar
:showSearch.sync="showSearch"
@queryTable="getList"
></right-toolbar>
</el-row>
<el-table
v-loading="loading"
:data="machineProList"
:summary-method="getSummaries"
show-summary
>
<el-table-column
label="日期"
align="center"
prop="date"
min-width="100"
/>
<template v-for="(column, index) in products">
<el-table-column align="center" min-width="120" :prop="column.code" :key="column.code" :label="column.label"/>
</template>
<el-table-column label="总产量" align="center" prop="totalQuantity"
min-width="100"
/>
</el-table>
</div>
</template>
<script>
import { getMachineProductionTitle, getMachineProductionList, getProShifts,} from "@/api/mes/reportWork";
import moment from "moment";
export default {
name: "Prepare",
data() {
return {
//
loading: true,
//
ids: [],
//
single: true,
//
multiple: true,
//
showSearch: true,
//
machineProList: [],
//
products: [],
//
title: "",
//
open: false,
//
queryParams: {
productDateArray: [],
pageNum: 1,
pageSize: 10,
workorderCode: null,
workorderName: null,
parentOrder: null,
orderId: null,
orderCode: null,
productId: null,
productCode: null,
prodType: null,
productName: null,
productSpc: null,
productDate: null,
},
//
form: {},
};
},
created() {
this.getDate();
this.getList();
},
methods: {
/**获取默认查询时间段**/
getDate() {
let start = this.Fungetdate(0);
let end = this.Fungetdate(1);
this.queryParams.productDateArray.push(start, end);
},
Fungetdate(num) {
var dd = new Date();
dd.setDate(dd.getDate() + num);
var y = dd.getFullYear();
var m = dd.getMonth() + 1; //
var d = dd.getDate();
return y + "-" + m + "-" + d ;
},
/** 查询设备小时产量列表 */
getList() {
if (this.queryParams.productDateArray != null) {
this.queryParams.productDateStart = moment(
this.queryParams.productDateArray[0]
).format("YYYY-MM-DD");
this.queryParams.productDateEnd = moment(
this.queryParams.productDateArray[1]
).format("YYYY-MM-DD");
}
this.loading = true;
//Table
getMachineProductionTitle(this.queryParams).then((response) => {
this.products = [];
this.products = response;
});
//Table
getMachineProductionList(this.queryParams).then((response) => {
this.machineProList = response;
this.loading = false;
});
},
//
cancel() {
this.open = false;
this.reset();
},
//
reset() {
this.form = {
productId: null,
productCode: null,
prodType: null,
productName: null,
productSpc: null,
wetDetailPlanId: null,
productDate: null,
shiftId: null,
ancestors: null,
status: null,
remark: null,
attr1: null,
attr2: null,
attr3: null,
attr4: null,
createBy: null,
createTime: null,
updateBy: null,
updateTime: null,
factoryCode: null,
};
this.resetForm("form");
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
},
/** 导出按钮操作 */
handleExport() {
this.download(
"mes/reportWork/getMachineProductionExport",
{
...this.queryParams,
},
`machineProduction_${new Date().getTime()}.xlsx`
);
},
getSummaries(param) {
const { columns, data } = param;
const sums = [];
columns.forEach((column, index) => {
if (index === 0) {
sums[index] = "合计";
return;
}
const values = data.map((item) => Number(item[column.property]));
if (!values.every((value) => isNaN(value))) {
sums[index] = values.reduce((prev, curr) => {
const value = Number(curr);
if (!isNaN(value)) {
return prev + curr;
} else {
return prev;
}
}, 0);
sums[index] += "";
if (sums[index] > 1000000) {
sums[index] = "";
}
} else {
sums[index] = ""; //N/A
}
});
return sums;
},
},
};
</script>
Loading…
Cancel
Save