|
|
|
|
@ -43,7 +43,7 @@ |
|
|
|
|
</template> |
|
|
|
|
</avue-crud> |
|
|
|
|
|
|
|
|
|
<el-dialog append-to-body title="检验结果" width="90%" v-model="showDialog" fullscreen> |
|
|
|
|
<el-dialog append-to-body title="检验结果" width="90%" v-model="showDialog" fullscreen @close="handleClose"> |
|
|
|
|
<div style="display: flex; align-items: center; justify-content: space-between"> |
|
|
|
|
<el-descriptions title="订单信息" :column="5" border style="width: 100%" :label-width="110"> |
|
|
|
|
<el-descriptions-item label="车间订单号" class="fixed-width-item">{{ |
|
|
|
|
@ -136,7 +136,7 @@ |
|
|
|
|
@expand-change="handleExpandChange" |
|
|
|
|
:default-expand-all="false" |
|
|
|
|
> |
|
|
|
|
<el-table-column type="expand"> |
|
|
|
|
<el-table-column type="expand" v-if="dialogData.ppsName != '烧结包装防护'"> |
|
|
|
|
<template #default="scope"> |
|
|
|
|
<el-table |
|
|
|
|
:data="scope.row.wpItemDetailList" |
|
|
|
|
@ -405,7 +405,7 @@ |
|
|
|
|
|
|
|
|
|
<script> |
|
|
|
|
import {dateFormat} from '@/utils/date' |
|
|
|
|
import {createInspection,getInspectionList,getInspectionDetail,fillInspection,getSameLotList,applySameLot,getHardnessList, |
|
|
|
|
import {createInspection,getInspectionList,getInspectionDetail,fillInspection,getSameLotList,applySameLot, |
|
|
|
|
refreshHardness,getThicknessList,goQualityRecord,goCertificate,getSubPackageList, getSupplierList,getMeasurement} from '@/api/qualityManagement/productionTesting/productionQuality.js' |
|
|
|
|
import sametankView from './components/sametankView.vue'; |
|
|
|
|
export default { |
|
|
|
|
@ -885,9 +885,7 @@ export default { |
|
|
|
|
}; |
|
|
|
|
}, |
|
|
|
|
mounted() { |
|
|
|
|
getMeasurement().then(res =>{ |
|
|
|
|
this.measureList = res.data.data |
|
|
|
|
}) |
|
|
|
|
|
|
|
|
|
}, |
|
|
|
|
methods: { |
|
|
|
|
handleCreate(){ |
|
|
|
|
@ -938,9 +936,13 @@ export default { |
|
|
|
|
if (!tmp) { |
|
|
|
|
this.expandedRowKeys = [...this.expandedRowKeys, row.id]; |
|
|
|
|
} |
|
|
|
|
if((row.checkUserId != -1 || row.checkUserRealName != '')){ |
|
|
|
|
this.thicknessData = row.wpItemDetailList |
|
|
|
|
return |
|
|
|
|
} |
|
|
|
|
this.isStart = !this.isStart; |
|
|
|
|
if(this.isStart){ |
|
|
|
|
this.thicknessData = [] |
|
|
|
|
this.thicknessData = this.thicknessData.length > 0 ? this.thicknessData : [] |
|
|
|
|
this.startTime = dateFormat(new Date(),'yyyy-MM-dd hh:mm:ss') |
|
|
|
|
this.firstInterval = setInterval(() =>{ |
|
|
|
|
this.getThickness(0,true,dateFormat(new Date(),'yyyy-MM-dd hh:mm:ss'),itemDetail) |
|
|
|
|
@ -993,14 +995,26 @@ export default { |
|
|
|
|
getThickness(val,allData,endTime,itemDetail){ |
|
|
|
|
|
|
|
|
|
getThicknessList({ |
|
|
|
|
startTime:this.startTime, |
|
|
|
|
endTime:endTime, |
|
|
|
|
// startTime:this.startTime, |
|
|
|
|
// endTime:endTime, |
|
|
|
|
allData, |
|
|
|
|
count:val |
|
|
|
|
// count:val |
|
|
|
|
}).then(res =>{ |
|
|
|
|
console.log('res111111111111',res) |
|
|
|
|
if (res.data.data != null) { |
|
|
|
|
const resultList = res.data.data; |
|
|
|
|
|
|
|
|
|
// const resultList = [{ |
|
|
|
|
// IP:"10.15.3.26", |
|
|
|
|
// devCode:"Ni/CuZn59", |
|
|
|
|
// devId:"LG020029", |
|
|
|
|
// fi1etime: "2025/11/21 16:38:32", |
|
|
|
|
// measurings: [ |
|
|
|
|
// {unit: "um", name: "Ni", value: "8.92142"}, |
|
|
|
|
// {unit: "/", name: "Cu", value: "/"}, |
|
|
|
|
// {unit: "/", name: "Cu", value: "/"} |
|
|
|
|
// ] |
|
|
|
|
// }] |
|
|
|
|
console.log('resultList--------------',resultList) |
|
|
|
|
if (resultList.length > 0) { |
|
|
|
|
resultList.forEach((item) => { |
|
|
|
|
@ -1012,7 +1026,7 @@ export default { |
|
|
|
|
}); |
|
|
|
|
if (isExist) return; |
|
|
|
|
console.log('item------------',item) |
|
|
|
|
const { measurings, devId, devCode, filetime } = JSON.parse(item.data); |
|
|
|
|
const { measurings, devId, devCode, filetime } = item; |
|
|
|
|
const obj1 = { ...itemDetail }; |
|
|
|
|
// this.devCode = devCode; |
|
|
|
|
obj1.gaugeValue7 = devCode; |
|
|
|
|
@ -1029,7 +1043,8 @@ export default { |
|
|
|
|
obj1['gaugeValue5'] = measurings[2].name; |
|
|
|
|
obj1['gaugeValue6'] = this.getValue(measurings[2].value); |
|
|
|
|
} |
|
|
|
|
if (JSON.parse(item.data).measurings.length > 0) { |
|
|
|
|
console.log('obj1------------',obj1) |
|
|
|
|
if (item.measurings.length > 0) { |
|
|
|
|
obj1.updateTime = dateFormat(new Date(),'yyyy-MM-dd hh:mm:ss'); |
|
|
|
|
// obj1.updateTime = filetime; |
|
|
|
|
const index = this.provingObjIsNull(); |
|
|
|
|
@ -1053,6 +1068,7 @@ export default { |
|
|
|
|
}) |
|
|
|
|
} |
|
|
|
|
console.log('this.thicknessData',this.thicknessData) |
|
|
|
|
console.log('resultList',resultList) |
|
|
|
|
const arr = [...this.getDChyData, ...resultList]; |
|
|
|
|
const obj = {}; |
|
|
|
|
this.getDChyData = arr.reduce((cur, next) => { |
|
|
|
|
@ -1236,6 +1252,9 @@ export default { |
|
|
|
|
handleResult(row) { |
|
|
|
|
console.log('row------------------',row) |
|
|
|
|
this.checkedId = row.id |
|
|
|
|
getMeasurement().then(res =>{ |
|
|
|
|
this.measureList = res.data.data |
|
|
|
|
}) |
|
|
|
|
getInspectionDetail({ |
|
|
|
|
id: row.id, |
|
|
|
|
}).then(res => { |
|
|
|
|
@ -1246,19 +1265,23 @@ export default { |
|
|
|
|
this.remindMsgList = res.data.data.remindMsgList; |
|
|
|
|
this.vxeTableData = res.data.data.wpItemList; |
|
|
|
|
this.getSameList(row.id) |
|
|
|
|
this.vxeTableData.forEach(item =>{ |
|
|
|
|
if(item.item.specialType == '2'){ |
|
|
|
|
this.ydInterval = setInterval(() =>{ |
|
|
|
|
getHardnessList().then(res =>{ |
|
|
|
|
console.log('res2--------------------------',res) |
|
|
|
|
if (res.data.data.length > 0) { |
|
|
|
|
item.checkValue = JSON.parse(res.data.data[0].data).formatted_hardness |
|
|
|
|
clearInterval(this.ydInterval) |
|
|
|
|
} |
|
|
|
|
}) |
|
|
|
|
},window.YINGDU_Trigger) |
|
|
|
|
} |
|
|
|
|
}) |
|
|
|
|
if(this.dialogData.ppsName != '烧结包装防护'){ |
|
|
|
|
this.vxeTableData.forEach(item =>{ |
|
|
|
|
console.log('item--------------',item) |
|
|
|
|
if(item.item.specialType == '2' && (item.checkUserId == -1 || item.checkUserRealName == '')){ |
|
|
|
|
this.ydInterval = setInterval(() =>{ |
|
|
|
|
refreshHardness().then(res =>{ |
|
|
|
|
console.log('res2--------------------------',res) |
|
|
|
|
if (res.data.data.length > 0) { |
|
|
|
|
item.checkValue = res.data.data[0].formatted_hardness |
|
|
|
|
clearInterval(this.ydInterval) |
|
|
|
|
} |
|
|
|
|
}) |
|
|
|
|
},window.YINGDU_Trigger) |
|
|
|
|
} |
|
|
|
|
}) |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if(this.dialogData.ppsName === '烧结包装防护'){ |
|
|
|
|
getSubPackageList({ |
|
|
|
|
@ -1275,6 +1298,7 @@ export default { |
|
|
|
|
}, |
|
|
|
|
onLoad() { |
|
|
|
|
console.log('query----------------',this.query) |
|
|
|
|
this.loading = true |
|
|
|
|
if(this.query.receiveDate){ |
|
|
|
|
delete this.query.receiveDate |
|
|
|
|
} |
|
|
|
|
@ -1288,6 +1312,7 @@ export default { |
|
|
|
|
}) |
|
|
|
|
this.data = res.data.data.records |
|
|
|
|
this.page.total = res.data.data.total |
|
|
|
|
this.loading = false |
|
|
|
|
}) |
|
|
|
|
}, |
|
|
|
|
}, |
|
|
|
|
|
jinna
1 month ago