fix:wpr检验修正
This commit is contained in:
parent
44ff595cb1
commit
eb4590f6b9
|
|
@ -40,8 +40,8 @@
|
||||||
>
|
>
|
||||||
<el-table-column prop="number" label="物料编号" fixed min-width="80px">
|
<el-table-column prop="number" label="物料编号" fixed min-width="80px">
|
||||||
<template #default="scope">
|
<template #default="scope">
|
||||||
<span v-if="!scope.row.isEdit&&mode == 'outs'">{{ scope.row.number }}</span>
|
<span v-if="mode == 'outs'">{{ scope.row.number }}</span>
|
||||||
<el-input v-if="scope.row.isEdit&&mode == 'outs'" v-model="scope.row.number" placeholder="物料编号"></el-input>
|
<!-- <el-input v-if="scope.row.isEdit&&mode == 'outs'" v-model="scope.row.number" placeholder="物料编号"></el-input> -->
|
||||||
<el-select
|
<el-select
|
||||||
v-if="scope.row.isEdit&&mode == 'ins'&&route_code!=='niuzhuan'"
|
v-if="scope.row.isEdit&&mode == 'ins'&&route_code!=='niuzhuan'"
|
||||||
v-model="scope.row.wpr"
|
v-model="scope.row.wpr"
|
||||||
|
|
@ -628,7 +628,7 @@ export default {
|
||||||
res.qct_defects.forEach((item) => {
|
res.qct_defects.forEach((item) => {
|
||||||
that.addTemplate[item.defect_name] = false;
|
that.addTemplate[item.defect_name] = false;
|
||||||
let obj = Object.assign({}, item);
|
let obj = Object.assign({}, item);
|
||||||
obj.canEdit = that.process_type=='20'?false:true;
|
obj.canEdit = that.process_type=='10'?false:true;
|
||||||
that.qct_defects.push(obj);
|
that.qct_defects.push(obj);
|
||||||
})
|
})
|
||||||
that.qct_defects_origin = that.qct_defects;
|
that.qct_defects_origin = that.qct_defects;
|
||||||
|
|
@ -636,7 +636,7 @@ export default {
|
||||||
res.qct_testitems.forEach((item2) => {
|
res.qct_testitems.forEach((item2) => {
|
||||||
let obj2 = Object.assign({}, item2);
|
let obj2 = Object.assign({}, item2);
|
||||||
obj2.value = '';
|
obj2.value = '';
|
||||||
obj2.canEdit = that.process_type=='20'?false:true;
|
obj2.canEdit = that.process_type=='10'?false:true;
|
||||||
|
|
||||||
obj2.addto_wpr = item2.addto_wpr;
|
obj2.addto_wpr = item2.addto_wpr;
|
||||||
if(item2.testitem_field_type=='input-number'||item2.testitem_field_type=='input-int'){
|
if(item2.testitem_field_type=='input-number'||item2.testitem_field_type=='input-int'){
|
||||||
|
|
@ -808,11 +808,8 @@ export default {
|
||||||
formTableEdit(row) {
|
formTableEdit(row) {
|
||||||
this.mlogbwlist.forEach((item, index) => {
|
this.mlogbwlist.forEach((item, index) => {
|
||||||
if (item.id == row.id) {
|
if (item.id == row.id) {
|
||||||
console.log('row',row);
|
|
||||||
console.log('new Date()',new Date());
|
|
||||||
this.mlogbwlist[index].isEdit = true;
|
this.mlogbwlist[index].isEdit = true;
|
||||||
let date = new Date();
|
let date = new Date();
|
||||||
console.log('new Date()',this.$TOOL.dateFormat(date));
|
|
||||||
if(this.mlogbwlist[index].work_start_time==''||this.mlogbwlist[index].work_start_time==null){
|
if(this.mlogbwlist[index].work_start_time==''||this.mlogbwlist[index].work_start_time==null){
|
||||||
this.mlogbwlist[index].work_start_time = this.$TOOL.dateFormat(date, 'yyyy-MM-dd hh:mm:ss');
|
this.mlogbwlist[index].work_start_time = this.$TOOL.dateFormat(date, 'yyyy-MM-dd hh:mm:ss');
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue