From d17c6023842bab13d81af495f6b730ee8a2b64d7 Mon Sep 17 00:00:00 2001 From: shijing Date: Wed, 3 Dec 2025 09:31:11 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix:=E7=8E=BB=E7=BA=A4=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E8=BE=93=E5=85=A5=E8=AF=A6=E6=83=85=E6=89=AD=E8=BD=AC=E5=B7=A5?= =?UTF-8?q?=E6=AE=B5=E5=8F=AF=E6=96=B0=E5=A2=9Ewpr?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wpm_bx/mlogbw_check.vue | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/src/views/wpm_bx/mlogbw_check.vue b/src/views/wpm_bx/mlogbw_check.vue index 89110c5d..b2947711 100644 --- a/src/views/wpm_bx/mlogbw_check.vue +++ b/src/views/wpm_bx/mlogbw_check.vue @@ -36,6 +36,7 @@ :addTemplate="addTemplate" placeholder="暂无数据" :hideAdd="hideAdd" + :pushType="pushType" :canMultiple = "canMultiple" @selectChange="selectChange" @selectAllChange="selectAllChange" @@ -46,10 +47,11 @@ {{ scope.row.number }} ——{{ scope.row.wpr_number_out }} @@ -507,6 +509,7 @@ export default { wprNumber:"", route_code:"", wprInputText:"", + pushType:"unshift", params: {mlogb:'',page:0}, insInput:false, canMultiple:false, @@ -582,7 +585,9 @@ export default { } if(that.mode == 'ins'){ if(that.route_code=='niuzhuan'){ + that.getEquipment4(); that.gettestitem(); + that.getOptions(); }else{ that.getOptions(); that.getList(); @@ -910,9 +915,9 @@ export default { }, formTableEdit(row) { let that = this; - if(that.route_code=='niuzhuan'&&that.optionsEq.length==0){ - that.getEquipment4(); - } + // if(that.route_code=='niuzhuan'&&that.optionsEq.length==0){ + // that.getEquipment4(); + // } that.mlogbwlist.forEach((item, index) => { if (item.id == row.id) { that.mlogbwlist[index].isEdit = true; @@ -1170,9 +1175,9 @@ export default { that.mlogbwlist[0].work_start_time = that.$TOOL.dateFormat(date, 'yyyy-MM-dd hh:mm:ss'); that.timeChange(that.mlogbwlist[0]); } - if(that.optionsEq.length==0){ - that.getEquipment4(); - } + // if(that.optionsEq.length==0){ + // that.getEquipment4(); + // } } if(that.setForm.cd_req_addr!==null&&!that.insInput){ //执行cd_req_addr,获取检测设备的数据 From bedc4b0d454a147bd3d9c8cb3a877db5a07a4e06 Mon Sep 17 00:00:00 2001 From: shijing Date: Wed, 3 Dec 2025 09:32:20 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix:=E7=8E=BB=E7=BA=A4=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E5=AD=90=E5=B7=A5=E5=BA=8F=E6=96=B0=E5=A2=9E=E6=97=B6=E6=8A=A5?= =?UTF-8?q?=E9=94=99=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wpm_bx/mlog_detail.vue | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/views/wpm_bx/mlog_detail.vue b/src/views/wpm_bx/mlog_detail.vue index 1c4fa3d8..00475a9f 100644 --- a/src/views/wpm_bx/mlog_detail.vue +++ b/src/views/wpm_bx/mlog_detail.vue @@ -882,7 +882,8 @@ export default { saveMuserSubmit(row){ let that = this; that.isSaveing = true; - that.$API.wpm.mloguser.create.req(that.addTemplate).then((res) => { + row.mlog = that.mlogId; + that.$API.wpm.mloguser.create.req(row).then((res) => { that.isSaveing = false; that.$message.success("操作成功"); that.getProcessList(); @@ -895,7 +896,7 @@ export default { that.$confirm("确定删除吗？").then(res=>{ that.$API.wpm.mloguser.delete.req(row.id).then((res) => { that.$message.success("删除成功"); - that.$refs.tableMuser.refresh(); + that.getProcessList(); }) }) }, From 69c63eea06542dad325530d127c848dd6b365055 Mon Sep 17 00:00:00 2001 From: shijing Date: Wed, 3 Dec 2025 13:17:27 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix:=E7=94=9F=E4=BA=A7=E6=89=A7=E8=A1=8C?= =?UTF-8?q?=E5=87=BA=E5=85=A5=E5=BA=93=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wpm_gx/inmrecord.vue | 61 ++++++++++------------------------ 1 file changed, 17 insertions(+), 44 deletions(-) diff --git a/src/views/wpm_gx/inmrecord.vue b/src/views/wpm_gx/inmrecord.vue index 17039e88..5199b1b9 100644 --- a/src/views/wpm_gx/inmrecord.vue +++ b/src/views/wpm_gx/inmrecord.vue @@ -2,9 +2,9 @@
- 领料 + >领料 --> 入库 -