dumoCheck
This commit is contained in:
parent
37b874036f
commit
08dc30c659
|
@ -272,6 +272,13 @@ export function createUsedstep(data) {
|
||||||
data
|
data
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
export function updateUsedstep(id,data) {
|
||||||
|
return request({
|
||||||
|
url: `/mtm/usedstep/${id}/`,
|
||||||
|
method: 'put',
|
||||||
|
data
|
||||||
|
})
|
||||||
|
}
|
||||||
export function deleteUsedstep(id, data) {
|
export function deleteUsedstep(id, data) {
|
||||||
return request({
|
return request({
|
||||||
url: `/mtm/usedstep/${id}/`,
|
url: `/mtm/usedstep/${id}/`,
|
||||||
|
|
|
@ -196,10 +196,6 @@
|
||||||
isDisabled:{
|
isDisabled:{
|
||||||
type:Boolean,
|
type:Boolean,
|
||||||
default:false
|
default:false
|
||||||
},
|
|
||||||
isMidTesting:{
|
|
||||||
type:Boolean,
|
|
||||||
default:false
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
mounted() {
|
mounted() {
|
||||||
|
@ -235,13 +231,11 @@
|
||||||
let listJudge = this.formData.filter(item => {
|
let listJudge = this.formData.filter(item => {
|
||||||
return item.need_judge === true;
|
return item.need_judge === true;
|
||||||
});
|
});
|
||||||
debugger;
|
|
||||||
listJudge.forEach(item => {
|
listJudge.forEach(item => {
|
||||||
let obj = new Object();
|
let obj = new Object();
|
||||||
obj = item;
|
obj = item;
|
||||||
that.judgeList.push(obj)
|
that.judgeList.push(obj)
|
||||||
});
|
});
|
||||||
debugger;
|
|
||||||
let imag= this.formData.filter(item => {
|
let imag= this.formData.filter(item => {
|
||||||
return item.field_type === 'draw';
|
return item.field_type === 'draw';
|
||||||
});
|
});
|
||||||
|
@ -727,7 +721,7 @@
|
||||||
that.testrecord.record_data = that.field;//检查项列表
|
that.testrecord.record_data = that.field;//检查项列表
|
||||||
that.testrecord.is_testok = that.is_testok;//检查表检查结果
|
that.testrecord.is_testok = that.is_testok;//检查表检查结果
|
||||||
that.testrecord.id = that.recordId;//记录id
|
that.testrecord.id = that.recordId;//记录id
|
||||||
if(submit&&that.isMidTesting!==true){//提交
|
if(submit){//提交
|
||||||
this.$emit('recordSubmit',that.testrecord);
|
this.$emit('recordSubmit',that.testrecord);
|
||||||
}else {//保存
|
}else {//保存
|
||||||
this.$emit('recordSave',that.testrecord);
|
this.$emit('recordSave',that.testrecord);
|
||||||
|
|
|
@ -818,7 +818,8 @@
|
||||||
that.testrecord.is_testok = that.is_testok;//检查表检查结果
|
that.testrecord.is_testok = that.is_testok;//检查表检查结果
|
||||||
that.testrecord.id = that.recordId;
|
that.testrecord.id = that.recordId;
|
||||||
// debugger;
|
// debugger;
|
||||||
if(submit&&that.isMidTesting!==true){//提交
|
// if(submit&&that.isMidTesting!==true){//提交
|
||||||
|
if(submit){//提交
|
||||||
this.$emit('recordSubmit',that.testrecord);
|
this.$emit('recordSubmit',that.testrecord);
|
||||||
}else {//保存
|
}else {//保存
|
||||||
this.$emit('recordSave',that.testrecord);
|
this.$emit('recordSave',that.testrecord);
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -1011,7 +1011,9 @@
|
||||||
this.innerIndex = index;
|
this.innerIndex = index;
|
||||||
// this.outerVisible = true;
|
// this.outerVisible = true;
|
||||||
this.wproduct = scope.row.id;//半成品ID
|
this.wproduct = scope.row.id;//半成品ID
|
||||||
this.listQueryrecordform.material = scope.row.material_check!==null ? scope.row.material_check :scope.row.material_.id;//
|
debugger;
|
||||||
|
console.log(scope.row.material_check);
|
||||||
|
this.listQueryrecordform.material = scope.row.material_check!==null ? scope.row.material_check :scope.row.material;//
|
||||||
this.listQueryrecordform.type = 2;
|
this.listQueryrecordform.type = 2;
|
||||||
this.listQueryrecordform.enabled = true;
|
this.listQueryrecordform.enabled = true;
|
||||||
this.recordform = null;
|
this.recordform = null;
|
||||||
|
|
Loading…
Reference in New Issue