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 2c746ce615
commit 423ceef242
5 changed files with 50 additions and 35 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. 4
      src/views/oem/baseTemplate/components/maintenanceDialog.vue
  2. 10
      src/views/oem/facInnerApproval/index.vue
  3. 10
      src/views/oem/oemApproval/index.vue
  4. 4
      src/views/oem/oemOrder/index.vue
  5. 57
      src/views/productionTesting/productionQuality.vue

4
src/views/oem/baseTemplate/components/maintenanceDialog.vue
Unescape View File

@ -27,7 +27,7 @@
<!-- <el-input v-model="scope.row.shuliang" size="small" controls-position="right" <!-- <el-input v-model="scope.row.shuliang" size="small" controls-position="right"
@change="handleChange" /> --> @change="handleChange" /> -->
<el-form-item :prop="`tableData[${scope.$index}].caId`" :rules="formRules.caId"> <el-form-item :prop="`tableData[${scope.$index}].caId`" :rules="formRules.caId">
<el-select v-model="scope.row.caId" placeholder="请选择" style="margin:0 auto;margin-top:15px;" > <el-select v-model="scope.row.caId" filterable placeholder="请选择" style="margin:0 auto;margin-top:15px;" >
<el-option v-for="item in abilityList" :key="item.id" :label="item.caName" :value="item.id" value-key="value" /> <el-option v-for="item in abilityList" :key="item.id" :label="item.caName" :value="item.id" value-key="value" />
<!-- <el-option label="镀铬" :value="2" value-key="value" /> --> <!-- <el-option label="镀铬" :value="2" value-key="value" /> -->
</el-select> </el-select>
@ -40,7 +40,7 @@
</template> </template>
<template #default="scope"> <template #default="scope">
<el-form-item :prop="`tableData[${scope.$index}].ocId`" :rules="formRules.ocId"> <el-form-item :prop="`tableData[${scope.$index}].ocId`" :rules="formRules.ocId">
<el-select v-model="scope.row.ocId" placeholder="请选择" style="margin:0 auto;margin-top:15px;" > <el-select v-model="scope.row.ocId" filterable placeholder="请选择" style="margin:0 auto;margin-top:15px;" >
<el-option v-for="item in outOptions" :key="item.id" :label="item.ocName" :value="item.id" value-key="value" /> <el-option v-for="item in outOptions" :key="item.id" :label="item.ocName" :value="item.id" value-key="value" />
</el-select> </el-select>
</el-form-item> </el-form-item>

10
src/views/oem/facInnerApproval/index.vue
Unescape View File

@ -22,7 +22,7 @@
</template> </template>
<template #menu-right> </template> <template #menu-right> </template>
<template #menu="scope"> <template #menu="scope">
<el-button type="text" @click="handleApproval('one',scope.row)">审批</el-button> <el-button type="text" v-if="scope.row.approvalStatus == 2" @click="handleApproval('one',scope.row)">审批</el-button>
</template> </template>
</avue-crud> </avue-crud>
@ -292,11 +292,17 @@ export default {
return return
} }
if(type == 'batch'){ if(type == 'batch'){
let tmp = this.selectionList.find(item => item.approvalStatus != 2)
if(tmp){
this.$message.error('请选择状态为【待审核】的数据！')
return
}
this.woId = this.selectionList.map(item => item.id).join(',') this.woId = this.selectionList.map(item => item.id).join(',')
this.isOpen = true;
}else{ }else{
this.woId = row.id this.woId = row.id
this.isOpen = true;
} }
this.isOpen = true;
}, },
closeDialog(val) { closeDialog(val) {
this.isOpen = false; this.isOpen = false;

10
src/views/oem/oemApproval/index.vue
Unescape View File

@ -22,7 +22,7 @@
</template> </template>
<template #menu-right> </template> <template #menu-right> </template>
<template #menu="scope"> <template #menu="scope">
<el-button type="text" @click="handleApproval('one',scope.row)" <el-button type="text" v-if="scope.row.approvalStatus == 2" @click="handleApproval('one',scope.row)"
>审批</el-button >审批</el-button
> >
</template> </template>
@ -292,11 +292,17 @@ export default {
return return
} }
if(type == 'batch'){ if(type == 'batch'){
let tmp = this.selectionList.find(item => item.approvalStatus != 2)
if(tmp){
this.$message.error("请选择状态为【待审核】的数据");
return
}
this.woId = this.selectionList.map(item => item.id).join(',') this.woId = this.selectionList.map(item => item.id).join(',')
this.isOpen = true;
}else{ }else{
this.woId = row.id this.woId = row.id
this.isOpen = true;
} }
this.isOpen = true;
}, },
closeDialog(val) { closeDialog(val) {
this.isOpen = false; this.isOpen = false;

4
src/views/oem/oemOrder/index.vue
Unescape View File

@ -398,7 +398,7 @@ export default {
overHidden: true, overHidden: true,
width: 120, width: 120,
headerAlign: "center", headerAlign: "center",
align: "left", // align: "left",
}, },
{ {
label: "流程卡号", label: "流程卡号",
@ -446,7 +446,7 @@ export default {
width: 120, width: 120,
type: "select", type: "select",
headerAlign: "center", headerAlign: "center",
align: "left", // align: "left",
dicUrl:"/api/blade-system/dict/dictionary?code=orderPriority", dicUrl:"/api/blade-system/dict/dictionary?code=orderPriority",
props:{ props:{
label:"dictValue", label:"dictValue",

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

@ -162,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 && scope.row.checkUserRealName != '' "> <el-select v-model="scope1.row.actMtId" placeholder="请输入" :disabled="scope.row.checkUserRealName != null && 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 && scope.row.checkUserRealName != '' "></el-input> <el-input v-model="scope1.row.gaugeValue1" :disabled="scope.row.checkUserRealName != null && 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 && scope.row.checkUserRealName != '' "></el-input> <el-input v-model="scope1.row.gaugeValue2" :disabled="scope.row.checkUserRealName != null && 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 && scope.row.checkUserRealName != '' "></el-input> <el-input v-model="scope1.row.gaugeValue3" :disabled="scope.row.checkUserRealName != null && 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 && scope.row.checkUserRealName != '' "></el-input> <el-input v-model="scope1.row.gaugeValue4" :disabled="scope.row.checkUserRealName != null && 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 && scope.row.checkUserRealName != '' "></el-input> <el-input v-model="scope1.row.gaugeValue5" :disabled="scope.row.checkUserRealName != null && 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 && scope.row.checkUserRealName != '' "></el-input> <el-input v-model="scope1.row.gaugeValue6" :disabled="scope.row.checkUserRealName != null && 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 && scope.row.checkUserRealName != '' "></el-input> <el-input v-model="scope1.row.gaugeValue7" :disabled="scope.row.checkUserRealName != null && 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 && scope.row.checkUserRealName != '' "></el-input> <el-input v-model="scope1.row.gaugeValue8" :disabled="scope.row.checkUserRealName != null && scope.row.checkUserRealName != '' "></el-input>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -248,49 +248,49 @@
</div> </div>
</template> </template>
<template #default="subScope"> <template #default="subScope">
<el-input v-model="subScope.row.gaugeValue7" :disabled="scope.row.checkUserRealName && scope.row.checkUserRealName != '' "></el-input> <el-input v-model="subScope.row.gaugeValue7" :disabled="scope.row.checkUserRealName != null && 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 && scope.row.checkUserRealName != '' "></el-input> <el-input v-model="subScope.row.gaugeValue1" :disabled="scope.row.checkUserRealName != null && 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 && scope.row.checkUserRealName != '' "></el-input> <el-input v-model="subScope.row.gaugeValue2" :disabled="scope.row.checkUserRealName != null && 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 && scope.row.checkUserRealName != '' "></el-input> <el-input v-model="subScope.row.gaugeValue3" :disabled="scope.row.checkUserRealName != null && 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 && scope.row.checkUserRealName != '' "></el-input> <el-input v-model="subScope.row.gaugeValue4" :disabled="scope.row.checkUserRealName != null && 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 && scope.row.checkUserRealName != '' "></el-input> <el-input v-model="subScope.row.gaugeValue5" :disabled="scope.row.checkUserRealName != null && 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 && scope.row.checkUserRealName != '' "></el-input> <el-input v-model="subScope.row.gaugeValue6" :disabled="scope.row.checkUserRealName != null && 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 && scope.row.checkUserRealName != '' "></el-input> <el-input v-model="subScope.row.gaugeValue8" :disabled="scope.row.checkUserRealName != null && 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 && scope.row.checkUserRealName != '' "></el-date-picker> :disabled="scope.row.checkUserRealName != null && scope.row.checkUserRealName != '' "></el-date-picker>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -345,13 +345,14 @@
测厚数据 测厚数据
</el-button> </el-button>
</div> </div>
<div v-else-if="scope.row.item.name == '尺寸检测'"> <div v-else-if="scope.row.item.name == '尺寸检测' && scope.row.item.wpItemDetailList && scope.row.item.wpItemDetailList.length > 0">
<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
> >
</div> </div>
<div v-else> <div v-else>
<el-input v-model="scope.row.checkValue" :disabled=" scope.row.checkUserRealName && scope.row.checkUserRealName != '' "></el-input> <!-- {{scope.row.checkUserRealName != null && scope.row.checkUserRealName != ''}} -->
<el-input v-model="scope.row.checkValue" :disabled="scope.row.checkUserRealName != null && scope.row.checkUserRealName !== '' "></el-input>
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
@ -363,7 +364,7 @@
align="center" align="center"
> >
<template #default="scope"> <template #default="scope">
<el-input v-model="scope.row.testQty" :disabled=" scope.row.checkUserRealName && scope.row.checkUserRealName != '' "></el-input> <el-input v-model="scope.row.testQty" :disabled=" scope.row.checkUserRealName != null && scope.row.checkUserRealName != '' "></el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@ -374,12 +375,12 @@
align="center" align="center"
> >
<template #default="scope"> <template #default="scope">
<el-input v-model="scope.row.lossQty" :disabled=" scope.row.checkUserRealName && scope.row.checkUserRealName != '' "></el-input> <el-input v-model="scope.row.lossQty" :disabled=" scope.row.checkUserRealName != null && 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 && scope.row.checkUserRealName != '' "></el-input> <el-input v-model="scope.row.checkQty" :disabled=" scope.row.checkUserRealName != null && 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">
@ -387,7 +388,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 && scope.row.checkUserRealName != '' " :disabled=" scope.row.checkUserRealName != null && 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>
@ -1002,7 +1003,7 @@ export default {
this.expandedRowKeys = [...this.expandedRowKeys, row.id]; this.expandedRowKeys = [...this.expandedRowKeys, row.id];
} }
if((row.checkUserId != -1 || row.checkUserRealName != '')){ if((row.checkUserId != -1 || row.checkUserRealName != '')){
this.thicknessData = row.wpItemDetailList this.thicknessData = row.wpItemDetailList ? row.wpItemDetailList : []
return return
} }
}, },
@ -1223,7 +1224,7 @@ export default {
item.wpItemDetailList = [...this.thicknessData] item.wpItemDetailList = [...this.thicknessData]
} }
}) })
console.log('detailInfo------------------',this.detailInfo) console.log('detailInfo------------------',this.detailInfo)
fillInspection(this.detailInfo).then(res =>{ fillInspection(this.detailInfo).then(res =>{
if(res.data.code == 200){ if(res.data.code == 200){
this.$message.success('保存成功') this.$message.success('保存成功')
@ -1343,6 +1344,8 @@ export default {
// standardValue:null, // standardValue:null,
// downValue:null // downValue:null
// } // }
// res.data.data.wpItemList[0].item.name = '厚度检测'
// res.data.data.wpItemList[0].checkUserRealName = null
this.vxeTableData = res.data.data.wpItemList; this.vxeTableData = res.data.data.wpItemList;
this.getSameList(row.id) this.getSameList(row.id)
if(this.dialogData.ppsName != '烧结包装防护'){ if(this.dialogData.ppsName != '烧结包装防护'){
@ -1361,7 +1364,7 @@ export default {
} }
if(item.item.name == '厚度检测'){ if(item.item.name == '厚度检测'){
console.log('item------------------',item) console.log('item------------------',item)
this.thicknessData = item.wpItemDetailList this.thicknessData = item.wpItemDetailList ? item.wpItemDetailList : []
} }
}) })
} }

Write Preview
Loading…
Cancel
Save