suojin
/
jonhon-mes-web
24
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

生产质量检验页面修改

Browse Source
dev-scheduling
jinna 3 weeks ago
parent bc1d5dee13
commit f73ac8d2b6
1 changed files with 43 additions and 32 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 75
      src/views/productionTesting/productionQuality.vue

75
src/views/productionTesting/productionQuality.vue
Unescape View File

@ -136,7 +136,15 @@
@expand-change="handleExpandChange" @expand-change="handleExpandChange"
:default-expand-all="false" :default-expand-all="false"
> >
<el-table-column type="expand" v-if="dialogData.ppsName != '烧结包装防护'"> <el-table-column type="expand"
v-if="dialogData.ppsName != '烧结包装防护' &&
(
(
vxeTableData.find(item => item.item.name == '尺寸检测') && vxeTableData.find(item => item.item.name == '尺寸检测').wpItemDetailList &&
vxeTableData.find(item => item.item.name == '尺寸检测').wpItemDetailList.length > 0
) ||
vxeTableData.find(item => item.item.name == '厚度检测')
)">
<template #default="scope"> <template #default="scope">
<el-table <el-table
:data="scope.row.wpItemDetailList" :data="scope.row.wpItemDetailList"
@ -154,49 +162,49 @@
<el-table-column label="量具编号" prop="trialNo" align="center"> <el-table-column label="量具编号" prop="trialNo" align="center">
<template #default="scope1"> <template #default="scope1">
<!-- {{scope.row}} --> <!-- {{scope.row}} -->
<el-select v-model="scope1.row.actMtId" placeholder="请输入" :disabled="scope.row.checkUserRealName != ''"> <el-select v-model="scope1.row.actMtId" placeholder="请输入" :disabled="scope.row.checkUserRealName && scope.row.checkUserRealName != '' ">
<el-option v-for="item in measureList" :key="item.id" :label="item.mcName" :value="item.id" /> <el-option v-for="item in measureList" :key="item.id" :label="item.mcName" :value="item.id" />
</el-select> </el-select>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="测量值1" prop="gaugeValue1" align="center"> <el-table-column label="测量值1" prop="gaugeValue1" align="center">
<template #default="scope1"> <template #default="scope1">
<el-input v-model="scope1.row.gaugeValue1" :disabled="scope.row.checkUserRealName != ''"></el-input> <el-input v-model="scope1.row.gaugeValue1" :disabled="scope.row.checkUserRealName && scope.row.checkUserRealName != '' "></el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="测量值2" prop="gaugeValue2" align="center"> <el-table-column label="测量值2" prop="gaugeValue2" align="center">
<template #default="scope1"> <template #default="scope1">
<el-input v-model="scope1.row.gaugeValue2" :disabled="scope.row.checkUserRealName != ''"></el-input> <el-input v-model="scope1.row.gaugeValue2" :disabled="scope.row.checkUserRealName && scope.row.checkUserRealName != '' "></el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="测量值3" prop="gaugeValue3" align="center"> <el-table-column label="测量值3" prop="gaugeValue3" align="center">
<template #default="scope1"> <template #default="scope1">
<el-input v-model="scope1.row.gaugeValue3" :disabled="scope.row.checkUserRealName != ''"></el-input> <el-input v-model="scope1.row.gaugeValue3" :disabled="scope.row.checkUserRealName && scope.row.checkUserRealName != '' "></el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="测量值4" prop="gaugeValue4" align="center"> <el-table-column label="测量值4" prop="gaugeValue4" align="center">
<template #default="scope1"> <template #default="scope1">
<el-input v-model="scope1.row.gaugeValue4" :disabled="scope.row.checkUserRealName != ''"></el-input> <el-input v-model="scope1.row.gaugeValue4" :disabled="scope.row.checkUserRealName && scope.row.checkUserRealName != '' "></el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="测量值5" prop="gaugeValue5" align="center"> <el-table-column label="测量值5" prop="gaugeValue5" align="center">
<template #default="scope1"> <template #default="scope1">
<el-input v-model="scope1.row.gaugeValue5" :disabled="scope.row.checkUserRealName != ''"></el-input> <el-input v-model="scope1.row.gaugeValue5" :disabled="scope.row.checkUserRealName && scope.row.checkUserRealName != '' "></el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="测量值6" prop="gaugeValue6" align="center"> <el-table-column label="测量值6" prop="gaugeValue6" align="center">
<template #default="scope1"> <template #default="scope1">
<el-input v-model="scope1.row.gaugeValue6" :disabled="scope.row.checkUserRealName != ''"></el-input> <el-input v-model="scope1.row.gaugeValue6" :disabled="scope.row.checkUserRealName && scope.row.checkUserRealName != '' "></el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="测量值7" prop="gaugeValue7" align="center"> <el-table-column label="测量值7" prop="gaugeValue7" align="center">
<template #default="scope1"> <template #default="scope1">
<el-input v-model="scope1.row.gaugeValue7" :disabled="scope.row.checkUserRealName != ''"></el-input> <el-input v-model="scope1.row.gaugeValue7" :disabled="scope.row.checkUserRealName && scope.row.checkUserRealName != '' "></el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="测量值8" prop="gaugeValue8" align="center"> <el-table-column label="测量值8" prop="gaugeValue8" align="center">
<template #default="scope1"> <template #default="scope1">
<el-input v-model="scope1.row.gaugeValue8" :disabled="scope.row.checkUserRealName != ''"></el-input> <el-input v-model="scope1.row.gaugeValue8" :disabled="scope.row.checkUserRealName && scope.row.checkUserRealName != '' "></el-input>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -240,49 +248,49 @@
</div> </div>
</template> </template>
<template #default="subScope"> <template #default="subScope">
<el-input v-model="subScope.row.gaugeValue7" :disabled="scope.row.checkUserRealName != ''"></el-input> <el-input v-model="subScope.row.gaugeValue7" :disabled="scope.row.checkUserRealName && scope.row.checkUserRealName != '' "></el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="名称1" prop="gaugeValue1" align="center"> <el-table-column label="名称1" prop="gaugeValue1" align="center">
<template #default="subScope"> <template #default="subScope">
<el-input v-model="subScope.row.gaugeValue1" :disabled="scope.row.checkUserRealName != ''"></el-input> <el-input v-model="subScope.row.gaugeValue1" :disabled="scope.row.checkUserRealName && scope.row.checkUserRealName != '' "></el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="参数1(um)" prop="gaugeValue2" align="center"> <el-table-column label="参数1(um)" prop="gaugeValue2" align="center">
<template #default="subScope"> <template #default="subScope">
<el-input v-model="subScope.row.gaugeValue2" :disabled="scope.row.checkUserRealName != ''"></el-input> <el-input v-model="subScope.row.gaugeValue2" :disabled="scope.row.checkUserRealName && scope.row.checkUserRealName != '' "></el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="名称2" prop="gaugeValue3" align="center"> <el-table-column label="名称2" prop="gaugeValue3" align="center">
<template #default="subScope"> <template #default="subScope">
<el-input v-model="subScope.row.gaugeValue3" :disabled="scope.row.checkUserRealName != ''"></el-input> <el-input v-model="subScope.row.gaugeValue3" :disabled="scope.row.checkUserRealName && scope.row.checkUserRealName != '' "></el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="参数2(um)" prop="gaugeValue4" align="center"> <el-table-column label="参数2(um)" prop="gaugeValue4" align="center">
<template #default="subScope"> <template #default="subScope">
<el-input v-model="subScope.row.gaugeValue4" :disabled="scope.row.checkUserRealName != ''"></el-input> <el-input v-model="subScope.row.gaugeValue4" :disabled="scope.row.checkUserRealName && scope.row.checkUserRealName != '' "></el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="名称3" prop="gaugeValue5" align="center"> <el-table-column label="名称3" prop="gaugeValue5" align="center">
<template #default="subScope"> <template #default="subScope">
<el-input v-model="subScope.row.gaugeValue5" :disabled="scope.row.checkUserRealName != ''"></el-input> <el-input v-model="subScope.row.gaugeValue5" :disabled="scope.row.checkUserRealName && scope.row.checkUserRealName != '' "></el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="参数3(um)" prop="gaugeValue6" align="center"> <el-table-column label="参数3(um)" prop="gaugeValue6" align="center">
<template #default="subScope"> <template #default="subScope">
<el-input v-model="subScope.row.gaugeValue6" :disabled="scope.row.checkUserRealName != ''"></el-input> <el-input v-model="subScope.row.gaugeValue6" :disabled="scope.row.checkUserRealName && scope.row.checkUserRealName != '' "></el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="设备编码" prop="gaugeValue8" align="center"> <el-table-column label="设备编码" prop="gaugeValue8" align="center">
<template #default="subScope"> <template #default="subScope">
<el-input v-model="subScope.row.gaugeValue8" :disabled="scope.row.checkUserRealName != ''"></el-input> <el-input v-model="subScope.row.gaugeValue8" :disabled="scope.row.checkUserRealName && scope.row.checkUserRealName != '' "></el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="检测时间" prop="updateTime" align="center" width="260"> <el-table-column label="检测时间" prop="updateTime" align="center" width="260">
<template #default="subScope"> <template #default="subScope">
<el-date-picker type="datetime" style="width:90%" v-model="subScope.row.updateTime" <el-date-picker type="datetime" style="width:90%" v-model="subScope.row.updateTime"
format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择时间" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择时间"
:disabled="scope.row.checkUserRealName != ''"></el-date-picker> :disabled="scope.row.checkUserRealName && scope.row.checkUserRealName != '' "></el-date-picker>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -308,10 +316,10 @@
width="200px" width="200px"
align="center" align="center"
> >
<template #default="scope"> {{scope.row.standard.name}} </template> <template #default="scope"> {{scope.row.standard && scope.row.standard.name}} </template>
</el-table-column> </el-table-column>
<el-table-column label="标准值" prop="trialStandard" align="center" width="150px"> <el-table-column label="标准值" prop="trialStandard" align="center" width="150px">
<template #default="scope"> {{scope.row.standard.standardValue}} {{'(' + scope.row.standard.downValue + '~' + scope.row.standard.upValue+ ')'}} </template> <template #default="scope"> {{scope.row.standard && scope.row.standard.standardValue}} {{'(' + scope.row.standard && scope.row.standard.downValue + '~' + scope.row.standard && scope.row.standard.upValue+ ')'}} </template>
</el-table-column> </el-table-column>
<!-- <el-table-column label="上下限" prop="trialStandard" align="center"></el-table-column>、 <!-- <el-table-column label="上下限" prop="trialStandard" align="center"></el-table-column>、
<el-table-column label="下限" prop="trialStandard" align="center"></el-table-column> --> <el-table-column label="下限" prop="trialStandard" align="center"></el-table-column> -->
@ -335,7 +343,7 @@
> >
</div> </div>
<div v-else> <div v-else>
<el-input v-model="scope.row.checkValue" :disabled=" scope.row.checkUserRealName != ''"></el-input> <el-input v-model="scope.row.checkValue" :disabled=" scope.row.checkUserRealName && scope.row.checkUserRealName != '' "></el-input>
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
@ -347,7 +355,7 @@
align="center" align="center"
> >
<template #default="scope"> <template #default="scope">
<el-input v-model="scope.row.testQty" :disabled=" scope.row.checkUserRealName != ''"></el-input> <el-input v-model="scope.row.testQty" :disabled=" scope.row.checkUserRealName && scope.row.checkUserRealName != '' "></el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@ -358,12 +366,12 @@
align="center" align="center"
> >
<template #default="scope"> <template #default="scope">
<el-input v-model="scope.row.lossQty" :disabled=" scope.row.checkUserRealName != ''"></el-input> <el-input v-model="scope.row.lossQty" :disabled=" scope.row.checkUserRealName && scope.row.checkUserRealName != '' "></el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="检验数量" prop="checkQty" width="100px" align="center"> <el-table-column label="检验数量" prop="checkQty" width="100px" align="center">
<template #default="scope"> <template #default="scope">
<el-input v-model="scope.row.checkQty" :disabled=" scope.row.checkUserRealName != ''"></el-input> <el-input v-model="scope.row.checkQty" :disabled=" scope.row.checkUserRealName && scope.row.checkUserRealName != '' "></el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="检验结果" prop="checkResult" width="300px" align="center"> <el-table-column label="检验结果" prop="checkResult" width="300px" align="center">
@ -371,7 +379,7 @@
<el-radio-group <el-radio-group
v-model="scope.row.checkResult" v-model="scope.row.checkResult"
@change="val => changeQty(val, scope.$index)" @change="val => changeQty(val, scope.$index)"
:disabled=" scope.row.checkUserRealName != ''" :disabled=" scope.row.checkUserRealName && scope.row.checkUserRealName != '' "
> >
<el-radio :label="1">合格</el-radio> <el-radio :label="1">合格</el-radio>
<el-radio :label="2">不合格</el-radio> <el-radio :label="2">不合格</el-radio>
@ -959,13 +967,16 @@ export default {
}, },
getRowClass(row, index) { getRowClass(row, index) {
let res = []; let res = [];
if (row.row.item.name != '尺寸检测' && row.row.item.name != '厚度检测') if (row.row.item.name != '尺寸检测' && row.row.item.name != '厚度检测'){
//即改行没有子元素时，添加row-expand-cover类
// res.push('row-expand-cover')
return 'row-expand-cover'; return 'row-expand-cover';
/* if (row.operate == 2) }else if(
res.push('hide-row') row.row.item.name == '尺寸检测' &&
return res.join(' ') */ (!row.row.wpItemDetailList || row.row.wpItemDetailList.length === 0)
){
return 'row-expand-cover';
}
return '';
}, },
testMeasurementData(row, index) { testMeasurementData(row, index) {
const itemDetail = { const itemDetail = {

Write Preview
Loading…
Cancel
Save