From 7afdc701075b2508a1a9207f943745459c47cb91 Mon Sep 17 00:00:00 2001 From: shijing Date: Wed, 2 Apr 2025 13:30:02 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E6=89=AD=E8=BD=AC=E5=B7=A5=E6=AE=B5mlog?= =?UTF-8?q?=E4=B8=AD=E4=B8=8D=E5=A1=AB=E8=AE=BE=E5=A4=87=E5=92=8C=E4=BA=BA?= =?UTF-8?q?=E5=91=98=EF=BC=9Bmlogb=E4=B8=AD=E9=80=89=E6=8B=A9=E8=AE=BE?= =?UTF-8?q?=E5=A4=87=E3=80=81=E6=93=8D=E4=BD=9C=E4=BA=BA=E3=80=81=E5=BC=80?= =?UTF-8?q?=E5=A7=8B=E6=97=B6=E9=97=B4=E5=92=8C=E7=BB=93=E6=9D=9F=E6=97=B6?= =?UTF-8?q?=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wpm_bx/mlog_detail.vue | 3 + src/views/wpm_bx/mlog_form.vue | 17 ++- src/views/wpm_bx/mlogb_form.vue | 198 ++++++++++++++++++++++--------- 3 files changed, 158 insertions(+), 60 deletions(-) diff --git a/src/views/wpm_bx/mlog_detail.vue b/src/views/wpm_bx/mlog_detail.vue index c24ff130..a3420f7b 100644 --- a/src/views/wpm_bx/mlog_detail.vue +++ b/src/views/wpm_bx/mlog_detail.vue @@ -727,6 +727,9 @@ export default { //表单提交方法 mlogSubmit() { let that = this; + if(that.mlogItem.work_end_time==''||that.mlogItem.work_end_time==null){ + that.mlogItem.handle_date = that.$TOOL.dateFormat2(new Date()); + } that.$API.wpm.mlog.submit.req(that.mlogItem.id).then((res) => { that.isSaveing = false; that.visible = false; diff --git a/src/views/wpm_bx/mlog_form.vue b/src/views/wpm_bx/mlog_form.vue index 7b1a35d7..326d0e44 100644 --- a/src/views/wpm_bx/mlog_form.vue +++ b/src/views/wpm_bx/mlog_form.vue @@ -96,7 +96,7 @@ - + - + - - + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {{item.name}} + {{item.number}} + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + 提交 @@ -144,8 +215,10 @@ export default { ] }, wm_in:'', + route_code:"", mlogbIns:[], options: [], + optionsEq: [], mlogbInOptions:[], materialOptions: [], mgroup_code:'', @@ -168,6 +241,7 @@ export default { }; }, mounted() { + this.route_code = this.$route.path.split("/")[2]; this.form.mlog = this.mlog; this.params.mlog = this.mlog; let arr = this.$route.path.split("/"); @@ -176,6 +250,7 @@ export default { this.getMtask(); this.getMaterial(); this.getParentList(); + this.getEquipment(); }, methods: { open() { @@ -195,6 +270,17 @@ export default { that.mlogbIns = res; }) }, + getEquipment() { + let that = this; + this.$API.em.equipment.list.req({ page: 0, type: 10,mgroup:that.mgroup}).then((res) => { + res.forEach((item) => { + let obj = {}; + Object.assign(obj, item); + obj.label = item.name+'-'+item.number; + that.optionsEq.push(obj); + }); + }); + }, getParentList(){ let that = this; that.$API.wpm.mlogb.list.req(that.params).then((res) => {