质量修改

dev-scheduling
jinna 3 weeks ago
parent 4e1925060c
commit 78077b794e
  1. 52
      src/views/productionTesting/productionQuality.vue

@ -141,7 +141,7 @@
<el-table <el-table
:data="scope.row.wpItemDetailList" :data="scope.row.wpItemDetailList"
show-overflow-tooltip show-overflow-tooltip
v-if="scope.row.item.specialType == 3 && scope.row.wpItemDetailList.length > 0" v-if="scope.row.item.name == '尺寸检测' && scope.row.wpItemDetailList && scope.row.wpItemDetailList.length > 0"
style="margin: 12px" style="margin: 12px"
> >
<el-table-column label="镀前镀后" prop="testType" align="center"></el-table-column> <el-table-column label="镀前镀后" prop="testType" align="center"></el-table-column>
@ -203,7 +203,7 @@
<el-table <el-table
:data="thicknessData" :data="thicknessData"
show-overflow-tooltip show-overflow-tooltip
v-if="scope.row.item.specialType == 1" v-if="scope.row.item.name == '厚度检测'"
style="margin: 12px" style="margin: 12px"
> >
<el-table-column width="57px"> <el-table-column width="57px">
@ -323,13 +323,13 @@
width="150px" width="150px"
> >
<template #default="scope"> <template #default="scope">
<div v-if="scope.row.item.specialType == '1'"> <div v-if="scope.row.item.name == '厚度检测'">
<el-button @click="testMeasurementData(scope.row, scope.$index)" link type="primary"> <el-button @click="testMeasurementData(scope.row, scope.$index)" link type="primary">
<!-- {{!isStart ? '测厚数据' : '结束查询'}} --> <!-- {{!isStart ? '测厚数据' : '结束查询'}} -->
测厚数据 测厚数据
</el-button> </el-button>
</div> </div>
<div v-else-if="scope.row.item.specialType == '3'"> <div v-else-if="scope.row.item.name == '尺寸检测'">
<el-button @click="testValue(scope.row, scope.$index)" link type="primary" <el-button @click="testValue(scope.row, scope.$index)" link type="primary"
>测试值填写</el-button >测试值填写</el-button
> >
@ -459,7 +459,7 @@ export default {
secondInderval:null, secondInderval:null,
form: {}, form: {},
getDChyData:[], getDChyData:[],
showDialog: true, showDialog: false,
page: { page: {
pageSize: 10, pageSize: 10,
currentPage: 1, currentPage: 1,
@ -959,7 +959,7 @@ export default {
}, },
getRowClass(row, index) { getRowClass(row, index) {
let res = []; let res = [];
if (row.row.item.specialType != '3' && row.row.item.specialType != '1') if (row.row.item.name != '尺寸检测' && row.row.item.name != '厚度检测')
//row-expand-cover //row-expand-cover
// res.push('row-expand-cover') // res.push('row-expand-cover')
return 'row-expand-cover'; return 'row-expand-cover';
@ -1054,22 +1054,22 @@ export default {
// endTime:endTime, // endTime:endTime,
allData, allData,
// count:val // count:val
}).catch(res =>{ }).then(res =>{
console.log('res111111111111',res) console.log('res111111111111',res)
// if (res.data.data != null) { if (res.data.data != null) {
// const resultList = res.data.data; const resultList = res.data.data;
const resultList = [{ // const resultList = [{
IP:"10.15.3.26", // IP:"10.15.3.26",
devCode:"Ni/CuZn59", // devCode:"Ni/CuZn59",
devId:"LG020029", // devId:"LG020029",
fi1etime: "2025/11/21 16:38:32", // fi1etime: "2025/11/21 16:38:32",
measurings: [ // measurings: [
{unit: "um", name: "Ni", value: "8.92142"}, // {unit: "um", name: "Ni", value: "8.92142"},
{unit: "/", name: "Cu", value: "/"}, // {unit: "/", name: "Cu", value: "/"},
{unit: "/", name: "Cu", value: "/"} // {unit: "/", name: "Cu", value: "/"}
] // ]
}] // }]
console.log('resultList--------------',resultList) console.log('resultList--------------',resultList)
console.log('getDChyData--------------',this.getDChyData) console.log('getDChyData--------------',this.getDChyData)
if (resultList.length > 0) { if (resultList.length > 0) {
@ -1139,7 +1139,7 @@ export default {
} }
this.getDChyData = [...map.values()]; this.getDChyData = [...map.values()];
console.log('this.getDChyData',this.getDChyData) console.log('this.getDChyData',this.getDChyData)
// } }
}) })
}, },
testValue(row, index) { testValue(row, index) {
@ -1174,7 +1174,7 @@ export default {
gainYDValue(){ gainYDValue(){
this.vxeTableData.forEach(item => { this.vxeTableData.forEach(item => {
console.log('item---------------------',item) console.log('item---------------------',item)
if ((item.item.specialType == '2') && (item.checkUserRealName == '')) { if ((item.item.name == '硬度检测') && (item.checkUserRealName == '')) {
refreshHardness().then(res =>{ refreshHardness().then(res =>{
console.log('refre--------------',res) console.log('refre--------------',res)
if(res.data.data.length > 0){ if(res.data.data.length > 0){
@ -1200,7 +1200,7 @@ export default {
submit(){ submit(){
let params = {} let params = {}
this.detailInfo.wpItemList.map(item =>{ this.detailInfo.wpItemList.map(item =>{
if(item.item.specialType == '1'){ if(item.item.name == '厚度检测'){
item.wpItemDetailList = [...this.thicknessData] item.wpItemDetailList = [...this.thicknessData]
} }
}) })
@ -1234,7 +1234,7 @@ export default {
this.vxeTableData.map(item1 =>{ this.vxeTableData.map(item1 =>{
if(item1.checkUserRealName == ''){ if(item1.checkUserRealName == ''){
if(item.item.name == item1.item.name){ if(item.item.name == item1.item.name){
if(item.item.specialType != '1' && item.item.specialType != '2' && item.item.specialType != '3'){ if(item.item.name != '厚度检测' && item.item.name != '硬度检测' && item.item.name != '尺寸检测'){
item1.checkValue = item.checkValue item1.checkValue = item.checkValue
} }
item1.testQty = item.testQty item1.testQty = item.testQty
@ -1324,7 +1324,7 @@ export default {
if(this.dialogData.ppsName != '烧结包装防护'){ if(this.dialogData.ppsName != '烧结包装防护'){
this.vxeTableData.forEach(item =>{ this.vxeTableData.forEach(item =>{
console.log('item--------------',item) console.log('item--------------',item)
if(item.item.specialType == '2' && (item.checkUserId == -1 || item.checkUserRealName == '')){ if(item.item.name == '硬度检测' && (item.checkUserId == -1 || item.checkUserRealName == '')){
// this.ydInterval = setInterval(() =>{ // this.ydInterval = setInterval(() =>{
refreshHardness().then(res =>{ refreshHardness().then(res =>{
console.log('res2--------------------------',res) console.log('res2--------------------------',res)
@ -1335,7 +1335,7 @@ export default {
}) })
// },window.YINGDU_Trigger) // },window.YINGDU_Trigger)
} }
if(item.item.specialType == 1){ if(item.item.name == '厚度检测'){
console.log('item------------------',item) console.log('item------------------',item)
this.thicknessData = item.wpItemDetailList this.thicknessData = item.wpItemDetailList
} }

Loading…
Cancel
Save