diff --git a/hb_client/src/api/mtm.js b/hb_client/src/api/mtm.js index bac34b9..e1adb34 100644 --- a/hb_client/src/api/mtm.js +++ b/hb_client/src/api/mtm.js @@ -272,6 +272,13 @@ export function createUsedstep(data) { data }) } +export function updateUsedstep(id,data) { + return request({ + url: `/mtm/usedstep/${id}/`, + method: 'put', + data + }) +} export function deleteUsedstep(id, data) { return request({ url: `/mtm/usedstep/${id}/`, diff --git a/hb_client/src/components/customForm/index.vue b/hb_client/src/components/customForm/index.vue index fc336cf..961af55 100644 --- a/hb_client/src/components/customForm/index.vue +++ b/hb_client/src/components/customForm/index.vue @@ -196,10 +196,6 @@ isDisabled:{ type:Boolean, default:false - }, - isMidTesting:{ - type:Boolean, - default:false } }, mounted() { @@ -235,13 +231,11 @@ let listJudge = this.formData.filter(item => { return item.need_judge === true; }); - debugger; listJudge.forEach(item => { let obj = new Object(); obj = item; that.judgeList.push(obj) }); - debugger; let imag= this.formData.filter(item => { return item.field_type === 'draw'; }); @@ -727,7 +721,7 @@ that.testrecord.record_data = that.field;//检查项列表 that.testrecord.is_testok = that.is_testok;//检查表检查结果 that.testrecord.id = that.recordId;//记录id - if(submit&&that.isMidTesting!==true){//提交 + if(submit){//提交 this.$emit('recordSubmit',that.testrecord); }else {//保存 this.$emit('recordSave',that.testrecord); diff --git a/hb_client/src/components/customForm/review.vue b/hb_client/src/components/customForm/review.vue index dd598af..91cc206 100644 --- a/hb_client/src/components/customForm/review.vue +++ b/hb_client/src/components/customForm/review.vue @@ -818,7 +818,8 @@ that.testrecord.is_testok = that.is_testok;//检查表检查结果 that.testrecord.id = that.recordId; // debugger; - if(submit&&that.isMidTesting!==true){//提交 + // if(submit&&that.isMidTesting!==true){//提交 + if(submit){//提交 this.$emit('recordSubmit',that.testrecord); }else {//保存 this.$emit('recordSave',that.testrecord); diff --git a/hb_client/src/views/mtm/productprocess.vue b/hb_client/src/views/mtm/productprocess.vue index 5c7811f..02184bb 100644 --- a/hb_client/src/views/mtm/productprocess.vue +++ b/hb_client/src/views/mtm/productprocess.vue @@ -1,1297 +1,1280 @@ - - - - - - - - - - - - - - - - - - - -
- 取消 - 确认 -
- - - - - 新增 - - - - - - - + + + + + + + + + + + + + + + + + + + + +
+ 取消 + 确认 +
+ + + + + 新增 + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - 上传文件 - - - - -
- 取消 - 确认 -
- - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {{ item.name }} + {{ item.specification }} + + + + + + + + + + +
+ 取消 + 确认 +
+ + + + 新增 + + + + + + + + + + + + + + + + + + + + + + + {{ item.name }} + {{ item.specification }} + + + + + + + +
+ 取消 + 确认 +
+ + + + 新增 + + + + + + + + + + + + + + + + + + + + + 检验 + 不检验 + + + + + + + + + + + + +
+ 取消 + 确认 +
+ + + + 新增 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 上传文件 + + + +
+ 取消 + 确认 +
+ + + + + + diff --git a/hb_client/src/views/wpm/need.vue b/hb_client/src/views/wpm/need.vue index fec2f23..2af65be 100644 --- a/hb_client/src/views/wpm/need.vue +++ b/hb_client/src/views/wpm/need.vue @@ -1011,7 +1011,9 @@ this.innerIndex = index; // this.outerVisible = true; 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.enabled = true; this.recordform = null;