diff --git a/src/views/wpm/mlog_dept10.vue b/src/views/wpm/mlog_dept10.vue index f109d72c..f04d7fab 100644 --- a/src/views/wpm/mlog_dept10.vue +++ b/src/views/wpm/mlog_dept10.vue @@ -458,20 +458,7 @@ export default { }); }, table_edit(row) { - // let arr = []; - // let mlogb = row.mlogb; - // this.brothersListorigin.forEach(item => { - // let obj = {}; - // obj.count_ok = null; - // obj.material_out = item; - // for (let i = 0; i < mlogb.length; i++) { - // if (mlogb[i].material_out == item) { - // obj.count_ok = mlogb[i].count_ok; - // } - // } - // arr.push(obj) - // }) - // this.brothersList = arr; + this.brothersList = row.mlogb; this.dialogSave = true; this.$nextTick(() => { this.$refs.saveDialog.open("edit").setData(row); diff --git a/src/views/wpm/worktask_form.vue b/src/views/wpm/worktask_form.vue index b4e49f2b..95f95e5c 100644 --- a/src/views/wpm/worktask_form.vue +++ b/src/views/wpm/worktask_form.vue @@ -661,16 +661,7 @@ export default { this.getShiftOptions(); this.getRouteOptions(); this.getWorkShopMaterial(); - if (this.activeType == "10车间") { - let mlogb = []; - this.brothersList.forEach((item) => { - let obj = {}; - obj.material_out = item.material_out; - obj.count_ok = item.count_ok; - mlogb.push(obj); - }); - this.mlogb = mlogb; - } + this.mlogb = this.brothersList; if (this.activeType == "10车间") { this.getMaterial(0); } else { @@ -906,6 +897,7 @@ export default { }); this.form.mlogb = newArr; } + console.log(this.form.mlogb) let sun = this.form.count_ok + this.form.count_notok; if ((this.activeType == "7车间" || this.activeType == "10车间") && sun != this.form.count_real) { this.isSaveing = false;