Merge remote-tracking branch 'origin/master'

master
mengjiao 6 months ago
commit 6c062c67ed

@ -16,7 +16,7 @@ export function getProductTraceList(query) {
}); });
} }
//查询烘房产列表 //查询烘房列表
export function getHFProductionList(query) { export function getHFProductionList(query) {
return request({ return request({
url: '/mes/reportWorks/getHFProductionList', url: '/mes/reportWorks/getHFProductionList',
@ -31,3 +31,18 @@ export function getHFProductionTitle(query) {
params: query params: query
}); });
} }
//查询成型机产量列表
export function getCXJProductionList(query) {
return request({
url: '/mes/reportWorks/getCXJProductionList',
method: 'get',
params: query
});
}
export function getCXJProductionTitle(query) {
return request({
url: '/mes/reportWorks/getCXJProductionTitle',
method: 'get',
params: query
});
}

@ -74,10 +74,11 @@ export function getProjectInfoList(query) {
}); });
} }
//方案下拉 //方案下拉
export function getProjectOptions(query) { export function getAutoDataOption(query) {
return request({ return request({
url: '/quality/checkTypeProject/getProjectOptions', url: '/quality/checkTypeProject/getAutoDataOption',
method: 'get', method: 'get',
params: query params: query
}); });
} }

@ -228,10 +228,7 @@
fixed fixed
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column label="审核状态" align="center" prop="orderStatus">
label="审核状态"
align="center"
prop="orderStatus">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag <dict-tag
:options="dict.type.device_audit_status" :options="dict.type.device_audit_status"
@ -239,10 +236,7 @@
/> />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column label="报修来源" align="center" prop="orderSource" />
label="报修来源"
align="center"
prop="orderSource" />
<el-table-column <el-table-column
label="报修去向" label="报修去向"
align="center" align="center"
@ -491,8 +485,14 @@
<el-col :span="24"> <el-col :span="24">
<el-form-item label="报修去向" prop="repairDestination"> <el-form-item label="报修去向" prop="repairDestination">
<el-radio-group v-model="form.repairDestination"> <el-radio-group v-model="form.repairDestination">
<el-radio label="计划性维修" @click.native="timeBackFillingReset">计划性维修</el-radio> <el-radio
<el-radio label="立即维修" @click.native="timeBackFilling">立即维修</el-radio> label="计划性维修"
@click.native="timeBackFillingReset"
>计划性维修</el-radio
>
<el-radio label="立即维修" @click.native="timeBackFilling"
>立即维修</el-radio
>
<el-radio label="不维修">不维修</el-radio> <el-radio label="不维修">不维修</el-radio>
<el-radio label="委外维修">委外维修</el-radio> <el-radio label="委外维修">委外维修</el-radio>
</el-radio-group> </el-radio-group>
@ -539,7 +539,9 @@
<el-form-item label="是否停机维修" prop="workDownMachine"> <el-form-item label="是否停机维修" prop="workDownMachine">
<el-radio-group v-model="form.workDownMachine"> <el-radio-group v-model="form.workDownMachine">
<el-radio label="1"></el-radio> <el-radio label="1"></el-radio>
<el-radio label="0" @click.native="monitorRadio"></el-radio> <el-radio label="0" @click.native="monitorRadio"
></el-radio
>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -617,11 +619,19 @@
<el-form-item label="是否停机维修" prop="workDownMachine"> <el-form-item label="是否停机维修" prop="workDownMachine">
<el-radio-group v-model="form.workDownMachine"> <el-radio-group v-model="form.workDownMachine">
<el-radio label="1"></el-radio> <el-radio label="1"></el-radio>
<el-radio label="0" @click.native="monitorRadio"></el-radio> <el-radio label="0" @click.native="monitorRadio"
></el-radio
>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8" v-if=" form.repairDestination == '立即维修' && form.workDownMachine == '1'"> <el-col
:span="8"
v-if="
form.repairDestination == '立即维修' &&
form.workDownMachine == '1'
"
>
<el-form-item prop="workPlanDownTime" label="计划停机时间"> <el-form-item prop="workPlanDownTime" label="计划停机时间">
<el-date-picker <el-date-picker
clearable clearable
@ -633,7 +643,13 @@
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8" v-if="form.repairDestination == '立即维修' && form.workDownMachine == '0'"> <el-col
:span="8"
v-if="
form.repairDestination == '立即维修' &&
form.workDownMachine == '0'
"
>
<el-form-item prop="workPlanDownTime" label="计划停机时间"> <el-form-item prop="workPlanDownTime" label="计划停机时间">
<el-date-picker <el-date-picker
clearable clearable
@ -690,7 +706,7 @@
v-model="form.auditOpinion" v-model="form.auditOpinion"
placeholder="请填写审核意见" placeholder="请填写审核意见"
type="textarea" type="textarea"
:autosize="{ minRows: 2, maxRows: 4}" :autosize="{ minRows: 2, maxRows: 4 }"
style="width: 420px" style="width: 420px"
/> />
</el-form-item> </el-form-item>
@ -947,11 +963,43 @@
> >
<el-form ref="form" :model="form" :rules="rules" label-width="100px"> <el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="8"> <el-col :span="8" >
<el-form-item label="设备编码" prop="equipmentCode" v-if = "openAdd == true && openUpdate == false">
<el-input
v-model="form.equipmentCode"
placeholder="请选择设备编码"
style="width: 200px"
>
<el-button
slot="append"
@click="handleSelectEquipment"
icon="el-icon-search"
></el-button>
</el-input>
<ItemSelect
ref="itemSelect"
@onSelected="onItemSelectedEquipment"
>
</ItemSelect>
</el-form-item>
<el-form-item label="设备编码" prop="equipmentCode" v-if = "openAdd == false && openUpdate == true">
<el-input
v-model="form.equipmentCode"
placeholder="请选择设备编码"
style="width: 200px"
disabled
>
</el-input>
</el-form-item>
</el-col>
<!-- <el-col :span="8" v-if = "openUpdate = true">
<el-form-item label="设备编码" prop="equipmentCode"> <el-form-item label="设备编码" prop="equipmentCode">
<el-input <el-input
v-model="form.equipmentCode" v-model="form.equipmentCode"
placeholder="请选择设备编码" placeholder="请选择设备编码"
disabled
style="width: 200px" style="width: 200px"
> >
<el-button <el-button
@ -966,7 +1014,7 @@
> >
</ItemSelect> </ItemSelect>
</el-form-item> </el-form-item>
</el-col> </el-col> -->
<el-col :span="8"> <el-col :span="8">
<el-form-item label="故障时间" prop="orderBreakdownTime"> <el-form-item label="故障时间" prop="orderBreakdownTime">
<el-date-picker <el-date-picker
@ -1226,7 +1274,13 @@ import { listFaultDescription } from "@/api/device/faultDescription";
export default { export default {
name: "FaultReport", name: "FaultReport",
components: { ItemSelect, ItemSelectPerson }, components: { ItemSelect, ItemSelectPerson },
dicts: ["device_order_source", "device_reach_standard", "device_audit_status", "device_repair_destination", "device_audit_status"], dicts: [
"device_order_source",
"device_reach_standard",
"device_audit_status",
"device_repair_destination",
"device_audit_status",
],
data() { data() {
return { return {
CS: { CS: {
@ -1277,6 +1331,8 @@ export default {
title: "", title: "",
// //
open: false, open: false,
openAdd: false,
openUpdate: false,
// //
openView: false, openView: false,
// //
@ -1413,8 +1469,8 @@ export default {
}, },
//radio //radio
monitorRadio(){ monitorRadio() {
if(this.form.workDownMachine == '0'){ if (this.form.workDownMachine == "0") {
this.form.workPlanDownTime = null; this.form.workPlanDownTime = null;
} }
}, },
@ -1443,14 +1499,14 @@ export default {
second second
); );
} }
this.form.workPlanTime = nowDate(time); // this.form.workPlanTime = nowDate(time); //
this.form.workPlanDownTime = nowDate(time); this.form.workPlanDownTime = nowDate(time);
this.form.workDownMachine = '1'; this.form.workDownMachine = "1";
}, },
// //
timeBackFillingReset() { timeBackFillingReset() {
this.form.workPlanTime = null; // this.form.workPlanTime = null; //
this.form.workPlanDownTime = null; this.form.workPlanDownTime = null;
this.form.workDownMachine = null; this.form.workDownMachine = null;
}, },
@ -1559,36 +1615,60 @@ export default {
this.reset(); this.reset();
this.form.orderSource = "PC"; this.form.orderSource = "PC";
this.open = true; this.open = true;
this.openUpdate = false;
this.openAdd = true;
this.title = "添加故障报修"; this.title = "添加故障报修";
}, },
/** 修改按钮操作 */ /** 修改按钮操作 */
handleUpdate(row) { handleUpdate(row) {
this.reset(); this.reset();
const orderId = row.orderId || this.ids; const orderId = row.orderId || this.ids;
getFaultReport(orderId).then((response) => { const orderStatus = row.orderStatus;
this.form = response.data; const orderSource = row.orderSource;
if (response.data.files != null) { if (orderStatus === "1" || orderStatus === "0") {
var newFiles = []; Message.warning("该报修单已经审核过,不可修改!");
response.data.files.forEach((item) => { } else if (orderSource === "点检" || orderSource === "巡检") {
var newFile = {}; Message.warning("点检、巡检报修信息自动生成,不可修改!");
newFile.name = item.fileName; } else {
newFile.url = item.fileAddress; getFaultReport(orderId).then((response) => {
newFiles.push(newFile); this.form = response.data;
}); if (response.data.files != null) {
this.form.fileList = newFiles; var newFiles = [];
} response.data.files.forEach((item) => {
var newFile = {};
newFile.name = item.fileName;
newFile.url = item.fileAddress;
newFiles.push(newFile);
});
this.form.fileList = newFiles;
}
});
if ( this.open = true;
this.form.orderSource == "点检" || this.openUpdate = true;
this.form.orderSource == "巡检" this.openAdd = false;
) { this.title = "修改故障报修";
Message.warning("点检、巡检报修信息自动生成,不可修改!"); }
} else {
this.open = true; // if (
this.title = "修改故障报修"; // this.form.orderSource == "" ||
} // this.form.orderSource == ""
}); // ) {
// Message.warning(",!");
// } else {
// this.open = true;
// this.title = "";
// }
// if (this.form.orderStatus != "2" ) {
// Message.warning("!");
// } else {
// this.open = true;
// this.title = "";
// }
}, },
/** 查看按钮操作 */ /** 查看按钮操作 */
handleView(row) { handleView(row) {
this.reset(); this.reset();
@ -1781,7 +1861,11 @@ export default {
if (valid) { if (valid) {
if (this.form.orderId != null) { if (this.form.orderId != null) {
checkFaultReport(this.form).then((response) => { checkFaultReport(this.form).then((response) => {
this.$modal.msgSuccess("审核成功"); if(response.code == 200){
this.$modal.msgSuccess("审核成功");
}else{
Message.warning(response.msg);
}
this.openCheck = false; this.openCheck = false;
this.getList(); this.getList();
}); });

@ -0,0 +1,264 @@
<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="shiftId">
<el-select v-model="queryParams.shiftId" placeholder="请选择班次" clearable>
<el-option v-for="item in shiftList" :key="item.shiftId" :label="item.shiftDesc"
:value="item.shiftId"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="成型机名称" prop="equName">
<el-input
v-model="queryParams.equName"
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"
height="500"
:data="machineProList"
:summary-method="getSummaries"
show-summary
>
<el-table-column label="日期" align="center" prop="ymd" min-width="100"/>
<template v-for="(column, index) in products">
<el-table-column align="center" min-width="100" :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 {getCXJProductionList,getCXJProductionTitle} from "@/api/mes/reportWorks";
import {getProShifts} from "@/api/mes/reportWork";
import moment from "moment";
export default {
name: "CxjProduction",
data() {
return {
//
loading: true,
//
ids: [],
//
single: true,
//
multiple: true,
//
showSearch: true,
//
machineProList: [],
//
products: [],
shiftList: [],
//
title: "",
//
open: false,
//
queryParams: {
productDateArray: [],
pageNum: 1,
pageSize: 10,
workorderCode: null,
workorderName: null,
parentOrder: null,
orderId: null,
shiftId: null,
orderCode: null,
productId: null,
productCode: null,
prodType: null,
productName: null,
productSpc: null,
productDate: null,
},
//
form: {},
};
},
created() {
this.getDate();
this.getList();
//
getProShifts().then(response => {
this.shiftList = response.data
})
},
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.ymArrayStart = moment(this.queryParams.productDateArray[0]).format('YYYY-MM-DD');
this.queryParams.ymArrayEnd = moment(this.queryParams.productDateArray[1]).format('YYYY-MM-DD');
}
this.loading = true;
//Table
getCXJProductionTitle(this.queryParams).then((response) => {
this.products = [];
this.products = response;
});
//Table
getCXJProductionList(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/reportWorks/getCXJProductionExport",
{
...this.queryParams,
},
`HFProduction_${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>

@ -445,7 +445,7 @@ export default {
// lineCodecheckDate // lineCodecheckDate
headerParameters: { headerParameters: {
handler(newVal) { handler(newVal) {
if (newVal.lineCode && newVal.checkDate) { if (newVal.lineCode || newVal.checkDate) {
this.getProductList(); // this.getProductList(); //
} }
}, },
@ -464,7 +464,7 @@ export default {
} }
}, },
// //
handleSelectProductChange(value) { handleSelectProductChange(value) {
const selectedOption = this.productCodeOption.find( const selectedOption = this.productCodeOption.find(
(option) => option.id === value (option) => option.id === value
@ -559,6 +559,19 @@ export default {
getProductList() { getProductList() {
getProductList(this.headerParameters).then((response) => { getProductList(this.headerParameters).then((response) => {
this.productCodeOption = response; this.productCodeOption = response;
if (response.length === 0) {
this.headerParameters.id = null;
// this.productCodeOption = null;
} else {
const found = this.productCodeOption.some(
(item) => item.id === this.headerParameters.id
);
if (!found) {
this.headerParameters.id = null;
}
}
}); });
}, },

@ -11,8 +11,8 @@
<el-form-item label="生产时间" prop="productDateArray"> <el-form-item label="生产时间" prop="productDateArray">
<el-date-picker <el-date-picker
v-model="queryParams.productDateArray" v-model="queryParams.productDateArray"
format="yyyy-MM-dd" format="yyyy-MM-dd HH:mm:00"
type="daterange" type="datetimerange"
range-separator="至" range-separator="至"
start-placeholder="开始日期" start-placeholder="开始日期"
end-placeholder="结束日期" end-placeholder="结束日期"
@ -133,29 +133,25 @@ export default {
}, },
methods: { methods: {
/**获取默认查询时间段**/ /**获取默认查询时间段**/
getDate() { getDate() {
let start = this.Fungetdate(0); let start = this.Fungetdate (0)
let end = this.Fungetdate(1); let end = this.Fungetdate (1)
this.queryParams.productDateArray.push(start, end); this.queryParams.productDateArray.push(start,end)
}, },
Fungetdate(num) { Fungetdate (num) {
var dd = new Date(); var dd = new Date();
dd.setDate(dd.getDate() + num); dd.setDate(dd.getDate() + num);
var y = dd.getFullYear(); var y = dd.getFullYear();
var m = dd.getMonth() + 1; // var m = dd.getMonth() + 1;//
var d = dd.getDate(); var d = dd.getDate();
return y + "-" + m + "-" + d + " 00:00:00"; return y + "-" + m + "-" + d+" 00:00:00";
}, },
/** 查询设备小时产量列表 */ /** 查询设备小时产量列表 */
getList() { getList() {
if (this.queryParams.productDateArray != null) { if (this.queryParams.productDateArray != null) {
this.queryParams.ymArrayStart = moment( this.queryParams.ymArrayStart = moment(this.queryParams.productDateArray[0]).format('YYYY-MM-DD HH:mm:00');
this.queryParams.productDateArray[0] this.queryParams.ymArrayEnd = moment(this.queryParams.productDateArray[1]).format('YYYY-MM-DD HH:mm:00');
).format("YYYY-MM-DD HH:mm:ss");
this.queryParams.ymArrayEnd = moment(
this.queryParams.productDateArray[1]
).format("YYYY-MM-DD HH:mm:ss");
} }
this.loading = true; this.loading = true;

@ -11,6 +11,31 @@
end-placeholder="结束日期"> end-placeholder="结束日期">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<!--
<el-form-item label="设备类型" prop="equipmentTypeCode">
<el-select
v-model="queryParams.equipmentTypeCode"
placeholder="请选择设备类型"
@change="changeEquType"
filterable
style="width: 200px"
>
<el-option
v-for="item in equipmentTypeOption"
:key="item.equipmentTypeCode"
:label="item.equipmentTypeName"
:value="item.equipmentTypeCode"
></el-option>
</el-select>
</el-form-item>-->
<el-form-item label="设备名称" prop="equName">
<el-input
v-model="queryParams.equName"
placeholder="请输入设备名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="班次" prop="shiftId"> <el-form-item label="班次" prop="shiftId">
<el-select v-model="queryParams.shiftId" placeholder="请选择班次" clearable> <el-select v-model="queryParams.shiftId" placeholder="请选择班次" clearable>
<el-option v-for="item in workShift" :key="item.shiftId" :label="item.shiftDesc" <el-option v-for="item in workShift" :key="item.shiftId" :label="item.shiftDesc"
@ -47,14 +72,6 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="设备名称" prop="equName">
<el-input
v-model="queryParams.equName"
placeholder="请输入设备名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery"></el-button> <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery"></el-button>
@ -136,7 +153,11 @@ export default {
// //
form: {}, form: {},
// list // list
workShift: [] workShift: [],
equipmentTypeOption:[
{equipmentTypeCode:"equ_type_cxj",equipmentTypeCode:"成型机"},
{equipmentTypeCode:"equ_type_hf",equipmentTypeCode:"烘房"}
]
}; };
}, },
created() { created() {
@ -270,7 +291,13 @@ export default {
}); });
return sums; return sums;
} },
//
//changeEquType(value) {
// if (value =='equ_type_cxj') {
// this.headerParameters.lineName = selectedOption.equipmentName;
// }
//}
} }
}; };
</script> </script>

@ -130,7 +130,7 @@
@change=" @change="
handleCheckboxChange( handleCheckboxChange(
item, item,
'openLine', 'clearLine',
key, key,
$event.target.checked $event.target.checked
) )
@ -214,7 +214,7 @@
</tr> </tr>
</table> </table>
</div> </div>
<br> <br />
<div> <div>
<el-row>填写要求</el-row> <el-row>填写要求</el-row>
<el-row>1.产线组长在开线品种转换时填写该表</el-row> <el-row>1.产线组长在开线品种转换时填写该表</el-row>
@ -251,7 +251,7 @@
<div class="formCode">表单编号:08GL05C001-014A</div> <div class="formCode">表单编号:08GL05C001-014A</div>
<br /> <br />
</el-row> </el-row>
<row> <el-row>
<el-col :span="24"> <el-col :span="24">
<table class="bordered-table-print" border="1"> <table class="bordered-table-print" border="1">
<tr> <tr>
@ -263,7 +263,9 @@
<th <th
v-for="(item, key) in tableData[0]" v-for="(item, key) in tableData[0]"
:key="item.key" :key="item.key"
v-if="key !== '序号' && key !== '点检内容' && key !== '点检项目'" v-if="
key !== '序号' && key !== '点检内容' && key !== '点检项目'
"
:width="tableTittleWidth" :width="tableTittleWidth"
> >
<el-row> <el-row>
@ -354,9 +356,9 @@
</tr> </tr>
</table> </table>
</el-col> </el-col>
</row> </el-row>
<br> <br />
<br> <br />
<el-row>填写要求</el-row> <el-row>填写要求</el-row>
<el-row>1.产线组长在开线品种转换时填写该表</el-row> <el-row>1.产线组长在开线品种转换时填写该表</el-row>
<el-row> <el-row>
@ -385,6 +387,7 @@ export default {
printable: "printPage", printable: "printPage",
ignore: ["no-print"], ignore: ["no-print"],
}, },
currentSelectedRow: null,
showPrintPage: false, showPrintPage: false,
showTable: false, showTable: false,
lineCodeOption: [], lineCodeOption: [],
@ -444,19 +447,16 @@ export default {
this.$set(item, "whetherOpenLine", false); this.$set(item, "whetherOpenLine", false);
} }
this.tableData.forEach((dataItem) => { this.$nextTick(() => {
Object.keys(dataItem).forEach((key) => { console.log("item", item);
if (key === transKey) { this.tableData.forEach((dataItem) => {
this.$set(dataItem[transKey], "whetherOpenLine", newBz); Object.keys(dataItem).forEach((key) => {
} if (key === transKey) {
this.$set(dataItem[transKey], "whetherOpenLine", newBz);
}
});
}); });
}); });
// this.tableData.forEach((dataItem) => {
// if (dataItem.hasOwnProperty(transKey)) {
// dataItem[transKey][whetherOpenLine] = newBz;
// }
// });
}, },
//线线 //线线

@ -136,6 +136,11 @@
<el-table-column label="SAP报工时间" align="center" prop="uploadTime" width="150" /> <el-table-column label="SAP报工时间" align="center" prop="uploadTime" width="150" />
<el-table-column label="SAP报工信息" align="center" prop="uploadMsg" width="150" <el-table-column label="SAP报工信息" align="center" prop="uploadMsg" width="150"
:show-overflow-tooltip="true" /> :show-overflow-tooltip="true" />
<el-table-column label="工单状态" align="center" prop="status" width="90">
<template slot-scope="scope">
<dict-tag :options="dict.type.workorder_type" :value="scope.row.status"/>
</template>
</el-table-column>
</el-table> </el-table>
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
@ -704,7 +709,7 @@ import moment from "moment";
import { getlistCK } from "@/api/wms/outorder"; import { getlistCK } from "@/api/wms/outorder";
export default { export default {
name: "ReportWork", name: "ReportWork",
dicts: ["report_type", "report_sap_status"], dicts: ["report_type", "report_sap_status", 'workorder_type'],
components: { components: {
ReportWorkConsume, ReportWorkConsume,
ItemSelectUser, ItemSelectUser,

@ -445,7 +445,7 @@ export default {
// lineCodecheckDate // lineCodecheckDate
headerParameters: { headerParameters: {
handler(newVal) { handler(newVal) {
if (newVal.lineCode && newVal.checkDate) { if (newVal.lineCode || newVal.checkDate) {
this.getProductList(); // this.getProductList(); //
} }
}, },
@ -559,6 +559,19 @@ export default {
getProductList() { getProductList() {
getProductList(this.headerParameters).then((response) => { getProductList(this.headerParameters).then((response) => {
this.productCodeOption = response; this.productCodeOption = response;
if (response.length === 0) {
this.headerParameters.id = null;
// this.productCodeOption = null;
} else {
const found = this.productCodeOption.some(
(item) => item.id === this.headerParameters.id
);
if (!found) {
this.headerParameters.id = null;
}
}
}); });
}, },
@ -722,7 +735,9 @@ export default {
checkTimeS === null || checkTimeS === null ||
checkTimeS === "" checkTimeS === ""
) { ) {
this.$modal.msg("您填入的检查时间存在开始时间为空的情况,请再次进行填写!"); this.$modal.msg(
"您填入的检查时间存在开始时间为空的情况,请再次进行填写!"
);
return; return;
} }
} }

@ -251,6 +251,7 @@
</el-popover> </el-popover>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column width="130" label="SAP设备编码" align="center" prop="sapCode"/>
<el-table-column label="班次" align="center" prop="shiftId" :formatter="shiftFormat"/> <el-table-column label="班次" align="center" prop="shiftId" :formatter="shiftFormat"/>
<el-table-column width="150" label="工艺编码" align="center" prop="routeCode"/> <el-table-column width="150" label="工艺编码" align="center" prop="routeCode"/>
<el-table-column width="200" label="工艺名称" align="center" prop="routeName" :show-overflow-tooltip="true"/> <el-table-column width="200" label="工艺名称" align="center" prop="routeName" :show-overflow-tooltip="true"/>

@ -103,6 +103,7 @@
v-loading="loading" v-loading="loading"
:data="checkTypeProjectList" :data="checkTypeProjectList"
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
height="500"
> >
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column <el-table-column
@ -114,8 +115,8 @@
<span>{{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}</span> <span>{{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="检验规则编码" width="110" align="center" prop="projectNo" /> <el-table-column label="检验规则编码" width="110" align="center" prop="projectNo" fixed/>
<el-table-column label="检验规则名称" align="left" prop="ruleName" :show-overflow-tooltip="true" width="250"/> <el-table-column label="检验规则名称" align="left" prop="ruleName" :show-overflow-tooltip="true" width="250" fixed/>
<el-table-column label="标准值" align="left" prop="standardValue" :show-overflow-tooltip="true" width="250"/> <el-table-column label="标准值" align="left" prop="standardValue" :show-overflow-tooltip="true" width="250"/>
<el-table-column label="上差值" align="left" prop="upperDiff" /> <el-table-column label="上差值" align="left" prop="upperDiff" />
<el-table-column label="下差值" align="left" prop="downDiff" /> <el-table-column label="下差值" align="left" prop="downDiff" />
@ -222,8 +223,14 @@
<el-input type="number" v-model="form.sort" placeholder="请输入排序" /> <el-input type="number" v-model="form.sort" placeholder="请输入排序" />
</el-form-item> </el-form-item>
<el-form-item label="是否称重" prop="weight"> <el-form-item label="是否称重" prop="weight">
<el-radio v-model="form.weight" label="1"></el-radio> <el-select v-model="form.weight" placeholder="自动设备取数请选择数据类型">
<el-radio v-model="form.weight" label="0"></el-radio> <el-option
v-for="item in autoDataOption"
:key="item.dictValue"
:label="item.dictLabel"
:value="item.dictValue"
></el-option>
</el-select>
</el-form-item> </el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
@ -247,7 +254,8 @@ import {
addCheckTypeProject, addCheckTypeProject,
updateCheckTypeProject, updateCheckTypeProject,
changeStatus, changeStatus,
submitProjects submitProjects,
getAutoDataOption
} from "@/api/quality/checkTypeProject"; } from "@/api/quality/checkTypeProject";
import MaterialGroupAdd from "./MaterialGroupAdd.vue"; import MaterialGroupAdd from "./MaterialGroupAdd.vue";
import {listCheckType} from "@/api/quality/checkType"; import {listCheckType} from "@/api/quality/checkType";
@ -318,10 +326,15 @@ export default {
{ required: true, message: "检验项目id不能为空", trigger: "blur" }, { required: true, message: "检验项目id不能为空", trigger: "blur" },
], ],
}, },
autoDataOption:[],
}; };
}, },
created() { created() {
this.getProjectList(); this.getProjectList();
//
getAutoDataOption({dictType:'auto_data'}).then(response => {
this.autoDataOption = response
})
}, },
methods: { methods: {
/**获取检测项目列表**/ /**获取检测项目列表**/

@ -97,6 +97,16 @@
v-hasPermi="['quality:produceReport:export']" v-hasPermi="['quality:produceReport:export']"
>首检报告Excel下载</el-button> >首检报告Excel下载</el-button>
</el-col> </el-col>
<el-col :span="1.5">
<el-button
type="warning"
plain
icon="el-icon-document-checked"
size="mini"
@click="handleSCXJReportExport"
v-hasPermi="['quality:produceReport:export']"
>巡检报告Excel下载</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>
@ -184,7 +194,7 @@
</el-row> </el-row>
<!-- 导航栏 --> <!-- 导航栏 -->
<el-row class="my-print-nav" gutter="10"> <el-row class="my-print-nav" gutter="10">
<el-col :span="3">车间:{{form.supplierName}}</el-col> <el-col :span="3">车间:{{form.supplierName}}</el-col>
<el-col :span="3">生成线体:{{form.lineName}}</el-col> <el-col :span="3">生成线体:{{form.lineName}}</el-col>
<el-col :span="3">检查日期:{{form.checkTimeStart}}</el-col> <el-col :span="3">检查日期:{{form.checkTimeStart}}</el-col>
<el-col :span="4">产品名称:{{form.materialName}}</el-col> <el-col :span="4">产品名称:{{form.materialName}}</el-col>
@ -842,6 +852,7 @@ export default {
}, },
spanArr: [], spanArr: [],
position: 0, position: 0,
excelFlag:''
}; };
}, },
created() { created() {
@ -981,6 +992,7 @@ export default {
// //
handleSelectionChange(selection) { handleSelectionChange(selection) {
this.selectRow = selection this.selectRow = selection
this.excelFlag = selection[0].checkName
this.ids = selection.map(item => item.recordId) this.ids = selection.map(item => item.recordId)
this.single = selection.length!==1 this.single = selection.length!==1
this.multiple = !selection.length this.multiple = !selection.length
@ -1077,11 +1089,31 @@ export default {
}, },
/** 导出报告按钮操作 */ /** 导出报告按钮操作 */
handleSCReportExport() { handleSCReportExport() {
if(this.excelFlag!='首件检验'){
this.$modal.msgSuccess("请选择首件检验任务");
return
}
const recordId =this.ids[0]; const recordId =this.ids[0];
this.queryParams.recordId = recordId; this.queryParams.recordId = recordId;
this.download('quality/qcProduceReport/SCReportExport', { this.download('quality/qcProduceReport/SCReportExport', {
...this.queryParams ...this.queryParams
}, `SCReportExport_${new Date().getTime()}.xlsx`) }, `SCReportExport_${new Date().getTime()}.xlsx`);
this.queryParams.recordId = '';
},
/** 导出报告按钮操作 */
handleSCXJReportExport() {
if(this.excelFlag!='巡检检验'){
this.$modal.msgSuccess("请选择巡检任务");
return
}
this.queryParams.orderNo = this.selectRow[0].orderNo;
this.queryParams.shiftId = this.selectRow[0].shiftId;
this.download('quality/qcProduceReport/SCXJReportExport', {
...this.queryParams
}, `SCXJReportExport_${new Date().getTime()}.xlsx`);
this.queryParams.orderNo = '';
this.queryParams.shiftId = '';
}, },
/**获取检验项目列表 */ /**获取检验项目列表 */
getCheckedProjectList(){ getCheckedProjectList(){

Loading…
Cancel
Save