From 5d4300fcb6384b592300bee955ad3202ea3f459a Mon Sep 17 00:00:00 2001 From: shijing Date: Mon, 1 Dec 2025 13:14:56 +0800 Subject: [PATCH 1/8] =?UTF-8?q?fix:=E7=8E=BB=E7=BA=A4=E6=B7=B7=E6=89=B9?= =?UTF-8?q?=E5=8A=A0=E6=96=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wpm_bx/inmIn.vue | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/views/wpm_bx/inmIn.vue b/src/views/wpm_bx/inmIn.vue index 62f5b22e..5f378b8d 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;" >检验 - 添加物料 + >混批加料 @@ -697,7 +698,7 @@ export default { }, handleAddWpr(row){ this.dialog.scrap = true; - this.type = 50; + this.type = 10; let obj = {}; obj.wm = row.id; obj.batch = row.batch; @@ -707,7 +708,7 @@ export default { obj.material_name = row.material_name; this.wmItem = obj; this.$nextTick(() => { - this.$refs.scrapDialog.open("add"); + this.$refs.scrapDialog.open("add",[],30); }); }, handleWprSuccess(row){}, From 15d3e64f02bfe1c7a09aa5fea87ee11f7e0d390b Mon Sep 17 00:00:00 2001 From: caoqianming Date: Mon, 1 Dec 2025 13:49:03 +0800 Subject: [PATCH 2/8] =?UTF-8?q?fix:=20mroombooking=E5=9C=A8=E5=88=9D?= =?UTF-8?q?=E5=A7=8B=E7=8A=B6=E6=80=81=E7=BC=96=E8=BE=91=E6=97=B6slot?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ofm/mroombooking_form.vue | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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; + } }) }) }, From ccad811e328ee76c96e23dbf44a83b1581502ccf Mon Sep 17 00:00:00 2001 From: shijing Date: Mon, 1 Dec 2025 14:23:18 +0800 Subject: [PATCH 3/8] =?UTF-8?q?fix:=E7=8E=BB=E7=BA=A4=E6=B7=B7=E6=89=B9?= =?UTF-8?q?=E5=8A=A0=E6=96=99=E5=8E=9F=E7=90=86=E4=B8=BA=E6=94=B9=E7=89=88?= =?UTF-8?q?=EF=BC=8C=E6=92=A4=E9=94=80=E5=8F=98=E5=8A=A8=EF=BC=88=E6=9C=89?= =?UTF-8?q?=E5=8F=AF=E8=83=BD=E6=98=AF=E4=B8=8D=E5=90=8C=E5=B7=A5=E6=AE=B5?= =?UTF-8?q?=E7=9A=84=E6=9D=BF=E6=AE=B5=E5=90=88=E6=89=B9=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wpm_bx/inmIn.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/wpm_bx/inmIn.vue b/src/views/wpm_bx/inmIn.vue index 5f378b8d..63331af3 100644 --- a/src/views/wpm_bx/inmIn.vue +++ b/src/views/wpm_bx/inmIn.vue @@ -698,7 +698,7 @@ export default { }, handleAddWpr(row){ this.dialog.scrap = true; - this.type = 10; + this.type = 50; let obj = {}; obj.wm = row.id; obj.batch = row.batch; @@ -708,7 +708,7 @@ export default { obj.material_name = row.material_name; this.wmItem = obj; this.$nextTick(() => { - this.$refs.scrapDialog.open("add",[],30); + this.$refs.scrapDialog.open("add"); }); }, handleWprSuccess(row){}, From 97c71723067c3a076dda33897374a9ab1f698710 Mon Sep 17 00:00:00 2001 From: shijing Date: Mon, 1 Dec 2025 14:33:21 +0800 Subject: [PATCH 4/8] =?UTF-8?q?fix:=E7=8E=BB=E7=BA=A4=E5=8B=BE=E9=80=89?= =?UTF-8?q?=E5=90=8E=E7=82=B9=E5=87=BB=E2=80=9C=E5=90=88=E6=89=B9=E2=80=9D?= =?UTF-8?q?=E5=90=8E=E8=8E=B7=E5=8F=96wpr=E5=88=97=E8=A1=A8=E5=B1=95?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wpm_bx/handover_form.vue | 30 ++++++++++++++++++++++-------- 1 file changed, 22 insertions(+), 8 deletions(-) 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; From 99f6c740c899983d83f73e3e0c87397a18f30e47 Mon Sep 17 00:00:00 2001 From: shijing Date: Mon, 1 Dec 2025 16:49:27 +0800 Subject: [PATCH 5/8] =?UTF-8?q?fix:=20=E5=AD=90=E5=B7=A5=E5=BA=8F=E6=93=8D?= =?UTF-8?q?=E4=BD=9C=E8=AE=B0=E5=BD=95=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wpm_bx/mlog_detail.vue | 243 ++++++++++++------------------- 1 file changed, 93 insertions(+), 150 deletions(-) diff --git a/src/views/wpm_bx/mlog_detail.vue b/src/views/wpm_bx/mlog_detail.vue index a861af9f..698493bd 100644 --- a/src/views/wpm_bx/mlog_detail.vue +++ b/src/views/wpm_bx/mlog_detail.vue @@ -58,142 +58,74 @@ header="子工序操作记录" shadow="never" > - 新增 - - - - - - - - - - - - - + - + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - { that.tableData = res; }) @@ -595,6 +533,7 @@ export default { that.getPreocess(); that.getShift(); that.getEquipment(); + that.getProcessList(); }, methods: { open() { @@ -664,6 +603,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 +862,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 +882,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){ From b2f0a4f74ac864bb69673bd255879e040087f07e Mon Sep 17 00:00:00 2001 From: shijing Date: Tue, 2 Dec 2025 11:01:26 +0800 Subject: [PATCH 6/8] =?UTF-8?q?fix:=E5=96=B7=E7=A0=81=E6=97=B6=E5=8F=AF?= =?UTF-8?q?=E4=BB=A5=E9=80=89=E6=8B=A9=E8=AE=BE=E5=A4=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wpm_bx/mlog_detail.vue | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/src/views/wpm_bx/mlog_detail.vue b/src/views/wpm_bx/mlog_detail.vue index 698493bd..1c4fa3d8 100644 --- a/src/views/wpm_bx/mlog_detail.vue +++ b/src/views/wpm_bx/mlog_detail.vue @@ -116,6 +116,23 @@ + + + From 13e32911acc4a4979dca4cb10a94e1d57ec21a0a Mon Sep 17 00:00:00 2001 From: shijing Date: Tue, 2 Dec 2025 11:03:53 +0800 Subject: [PATCH 7/8] =?UTF-8?q?fix:=E8=A1=A8=E6=A0=BC=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wpm_bx/mlogbw_check_table.vue | 48 ++++++++++++++----------- 1 file changed, 28 insertions(+), 20 deletions(-) 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; }); From 4f2162d4964235461140124b9754c7b6b53e835a Mon Sep 17 00:00:00 2001 From: shijing Date: Tue, 2 Dec 2025 11:06:29 +0800 Subject: [PATCH 8/8] =?UTF-8?q?fix:mioitem=E7=BB=9F=E8=AE=A1=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/inm/mioitem.vue | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-) 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];