diff --git a/src/views/inm/mioitem.vue b/src/views/inm/mioitem.vue index 23c6035b..fd907c3c 100644 --- a/src/views/inm/mioitem.vue +++ b/src/views/inm/mioitem.vue @@ -113,21 +113,6 @@ - - - @@ -655,8 +640,10 @@ export default { //尺寸检验 if(index == 6){ propert = 'count'; - }else if(index == 7){ + }else if(index == 7&&this.mioObj.type == 'sale_out'&&this.project_code=='gx'){ propert = 'count_send'; + }else if((index == 7||index == 8)&&column.label=='不合格数量'){ + propert = 'count_notok'; } if (propert!=='') { const values = data.map((item) => @@ -674,7 +661,7 @@ export default { }, 0); } } - if(index==8){ + if(index==8&&this.mioObj.type == 'sale_out'&&this.project_code=='gx'){ if(sums[6]){ if(sums[7]){ sums[index] = sums[6]-sums[7]; diff --git a/src/views/ofm/mroombooking_form.vue b/src/views/ofm/mroombooking_form.vue index ede39d11..b0b2cd8f 100644 --- a/src/views/ofm/mroombooking_form.vue +++ b/src/views/ofm/mroombooking_form.vue @@ -222,7 +222,11 @@ export default { }) that.$API.ofm.mroomslot.list.req(form).then(res=>{ res.forEach(item=>{ - that.timesList[item.slot].sloted = true; + if (item.booking == that.form.id) { + that.timesList[item.slot].isSelect = true; + }else{ + that.timesList[item.slot].sloted = true; + } }) }) }, diff --git a/src/views/wpm_bx/handover_form.vue b/src/views/wpm_bx/handover_form.vue index 709cfb1a..a39a5a1b 100644 --- a/src/views/wpm_bx/handover_form.vue +++ b/src/views/wpm_bx/handover_form.vue @@ -434,8 +434,14 @@ export default { that.totalCount = totalCount; }, showbw(index){ - this.bwIndex = index; - this.bwVisible = true; + let that = this; + that.bwIndex = index; + if(that.form.handoverb[index].handoverbw&&that.form.handoverb[index].handoverbw.length>0){ + that.bwVisible = true; + }else{ + that.$message.warning("正在加载，请稍后..."); + that.bwVisible = true; + } }, bwVisibleClose(){ this.bwVisible = false; @@ -600,13 +606,21 @@ export default { }, //显示 open(mode = "add",data,mtype) { - this.mode = mode; - this.mtype = mtype; + let that = this; + that.mode = mode; + that.mtype = mtype; if(mtype==30){ - this.change_batch = true; + that.change_batch = true; } - this.form.handoverb = data?data:[]; - this.visible = true; + that.form.handoverb = data?data:[]; + if(data.length>0){ + that.totalCount = 0; + data.forEach((item,index)=>{ + that.totalCount += Number(item.count); + that.getWprList(item.wm,index); + }) + } + that.visible = true; return this; }, clearSelect(){ @@ -657,7 +671,7 @@ export default { getWprList(id,index){ let that = this; let handoverbw = []; - that.$API.wpm.wpr.list.req({wm:id,page:0,can_use:'yes'}).then((res) => { + that.$API.wpm.wpr.list.req({wm:id,page:0,can_use:'yes',query:'{id,number}'}).then((res) => { res.forEach(wpritem=>{ let obj = {}; obj.wpr = wpritem.id; diff --git a/src/views/wpm_bx/inmIn.vue b/src/views/wpm_bx/inmIn.vue index 62f5b22e..63331af3 100644 --- a/src/views/wpm_bx/inmIn.vue +++ b/src/views/wpm_bx/inmIn.vue @@ -149,9 +149,10 @@ type="primary" style="margin-left: 10px;" >检验 - 添加物料 + >混批加料 diff --git a/src/views/wpm_bx/mlog_detail.vue b/src/views/wpm_bx/mlog_detail.vue index a861af9f..1c4fa3d8 100644 --- a/src/views/wpm_bx/mlog_detail.vue +++ b/src/views/wpm_bx/mlog_detail.vue @@ -58,142 +58,91 @@ header="子工序操作记录" shadow="never" > - 新增 - - - - - - - - - - - - - + - + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - { that.tableData = res; }) @@ -595,6 +550,7 @@ export default { that.getPreocess(); that.getShift(); that.getEquipment(); + that.getProcessList(); }, methods: { open() { @@ -664,6 +620,12 @@ export default { } }) }, + getProcessList(){ + let that = this; + that.$API.wpm.mloguser.list.req({page:0,mlog:that.mlogId}).then((res) => { + that.processLists = res; + }) + }, getShift(){ let that = this; that.$API.mtm.shift.list.req({ page: 0 }).then((res) => { @@ -917,25 +879,15 @@ export default { that.isSaveing = false; }); }, - table_muser_add(){ - let that = this; - let userInfo = that.$TOOL.data.get("USER_INFO"); - that.muserForm.mlog = that.mlogItem.id; - that.muserForm.handle_user = userInfo.id; - that.muserForm.handle_user_name = userInfo.name; - that.muserForm.work_start_time = this.$TOOL.dateFormat(new Date()); - that.saveMuserDialog = true; - }, - saveMuserSubmit (){ + saveMuserSubmit(row){ let that = this; that.isSaveing = true; - that.$API.wpm.mloguser.create.req(that.muserForm).then((res) => { + that.$API.wpm.mloguser.create.req(that.addTemplate).then((res) => { that.isSaveing = false; - that.saveMuserDialog = false; that.$message.success("操作成功"); - that.$refs.tableMuser.refresh(); + that.getProcessList(); }).catch(() => { - that.isSaveing = false; + that.isSaveing = false; }) }, table_muser_del(row){ @@ -947,6 +899,14 @@ export default { }) }) }, + table_muser_edit(row){ + let that = this; + console.log('row',row); + let index = that.processLists.indexOf(row); + console.log('index',index); + that.processLists[index].isEdit = true; + + }, handleSaveSuccess() { this.$refs.tableIn.refresh(); if(this.mlogItem.material_out_&&this.mlogItem.material_out_.tracking==10){ diff --git a/src/views/wpm_bx/mlogbw_check_table.vue b/src/views/wpm_bx/mlogbw_check_table.vue index 7eaa429a..37a8cc28 100644 --- a/src/views/wpm_bx/mlogbw_check_table.vue +++ b/src/views/wpm_bx/mlogbw_check_table.vue @@ -24,7 +24,10 @@ - + + @@ -38,6 +41,9 @@ +
+ + 序号 物料批次 物料编号 {{ item.testitem_name }} + {{ index + 1 }} + {{ row.mlogb__batch }} @@ -66,7 +72,7 @@ {{ row.note }} - + @@ -318,6 +324,7 @@ export default { route_code:"", wprInputText:"", canMultiple:false, + selectedAll:false, checkAll: false, hideAdd: false, visible: false, @@ -402,17 +409,23 @@ export default { selectChange(){ let that = this; that.selectWprList = []; - console.log('selectedindexes',that.selectedindexes); that.mlogbwlist.forEach((item) => { if(that.selectedindexes.indexOf(item.id)>-1){ that.selectWprList.push(item); } }) - console.log('selectWprList',that.selectWprList); }, - selectAllChange(datas){ + selectAllChange(){ let that = this; - that.selectWprList = datas; + if(that.selectedAll){ + that.mlogbwlist.forEach((item) => { + that.selectedindexes.push(item.id); + that.selectWprList.push(item); + }) + }else{ + that.selectedindexes=[]; + that.selectWprList=[]; + } }, getEquipment4() { let that = this; @@ -527,7 +540,6 @@ export default { } that.mlogbwlist.push(obj); }) - // console.log('that.mlogbwlist',that.mlogbwlist); } }) }, @@ -624,7 +636,7 @@ export default { let getEd = false; if(that.qct_testitems.length>0){ for(let i=0;i0){ this.selectWpr = this.selectWprList; } - console.log('this.selectWpr',this.selectWpr); this.setVisible=true; }, //扫描物料将这一行放到第一行并编辑这一行 @@ -847,12 +858,13 @@ export default { that.wprInputText = ""; that.mlogbwlist.unshift(obj); that.$nextTick(() => { - that.$refs.mlogbwTable.setCurrentRows(obj); // 选中第一行 + that.selectedindexes.push(obj.id); + that.selectWprList.push(item); }) let getEd = false; if(that.qct_testitems.length>0){ for(let i=0;i { - console.log(err); this.$notify.error({ title: '获取数据失败', message: err.data @@ -919,6 +930,9 @@ export default { that.$refs.dialogForm.validate((valid) => { if (valid) { that.selectWpr.forEach(item => { + if(!item.ftest){ + item.ftest = {}; + } item.ftest.ftestdefects = []; if(that.defectlists.length>0){ that.defectlists.forEach((item1) => { @@ -928,18 +942,12 @@ export default { item.ftest.ftestdefects.push(obj); }) } - - // item.ftest.ftestdefects.forEach(defect => { - // let defectindex = that.setForm.defectids.indexOf(defect.defect); - // if(defectindex > -1){ - // defect.has = that.defectlists[defectindex].value; - // } - // }) }); that.$API.wpm.mlogbw.update.req("bulk",that.selectWpr).then((res) => { that.setVisible = false; + that.selectedAll = false; that.selectWprList = []; - that.$refs.mlogbwTable.clearSelection(); + that.selectedindexes = []; that.defectlists.forEach(item => { item.value = false; });