From cd918e0e11b2a84373b419abed73691e814161bd Mon Sep 17 00:00:00 2001 From: shijing Date: Fri, 5 Sep 2025 14:34:36 +0800 Subject: [PATCH 01/73] =?UTF-8?q?fix:=E9=BB=98=E8=AE=A4=E5=8F=82=E6=95=B0n?= =?UTF-8?q?ull?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wpm_bx/mlogbw_check_table.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/wpm_bx/mlogbw_check_table.vue b/src/views/wpm_bx/mlogbw_check_table.vue index d69fa142..670934f0 100644 --- a/src/views/wpm_bx/mlogbw_check_table.vue +++ b/src/views/wpm_bx/mlogbw_check_table.vue @@ -373,7 +373,7 @@ export default { //表单数据 form: { test_user:"", - equipment:"", + equipment:null, cd_req_addr:null,//请求数据接口地址 equipment_name:"", testitemids : [], From 519c370cee51df4ebcb6dadc1b88c19c96b5aa51 Mon Sep 17 00:00:00 2001 From: shijing Date: Fri, 5 Sep 2025 14:52:02 +0800 Subject: [PATCH 02/73] =?UTF-8?q?fix:=E8=BE=85=E6=96=99=E5=BA=93=E7=89=A9?= =?UTF-8?q?=E6=96=99=E5=90=8D=E7=A7=B0=E5=8F=AA=E6=98=BE=E7=A4=BAname?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/inm/helpso.vue | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/views/inm/helpso.vue b/src/views/inm/helpso.vue index 90101858..4f69b8f6 100644 --- a/src/views/inm/helpso.vue +++ b/src/views/inm/helpso.vue @@ -34,7 +34,10 @@ {{ scope.row.material_.number }} - + + + + + - - - Date: Mon, 8 Sep 2025 09:46:18 +0800 Subject: [PATCH 07/73] =?UTF-8?q?fix:=E8=8B=A5=E6=97=A5=E5=BF=97=E6=B2=A1?= =?UTF-8?q?=E6=9C=89=E7=BB=93=E6=9D=9F=E6=97=B6=E9=97=B4=EF=BC=8C=E6=8F=90?= =?UTF-8?q?=E4=BA=A4=E6=97=B6=E9=97=B4=E4=BD=9C=E4=B8=BA=E7=BB=93=E6=9D=9F?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E5=92=8C=E5=A4=84=E7=90=86=E6=97=B6=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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/wpm_bx/mlog_detail.vue b/src/views/wpm_bx/mlog_detail.vue index 0ed77657..224ed554 100644 --- a/src/views/wpm_bx/mlog_detail.vue +++ b/src/views/wpm_bx/mlog_detail.vue @@ -928,11 +928,11 @@ export default { that.$refs.checkDialogSingle.open(type,that.qct); }); }, - //表单提交方法 mlogSubmit() { let that = this; if(that.mlogItem.work_end_time==''||that.mlogItem.work_end_time==null){ + that.mlogItem.work_end_time = that.$TOOL.dateFormat1(new Date()); that.mlogItem.handle_date = that.$TOOL.dateFormat2(new Date()); } that.$API.wpm.mlog.submit.req(that.mlogItem.id).then((res) => { From 44d7a0856f7cd0971db6fc2c8b33bbdd127fab93 Mon Sep 17 00:00:00 2001 From: shijing Date: Mon, 8 Sep 2025 16:44:11 +0800 Subject: [PATCH 08/73] =?UTF-8?q?fix:=E7=82=B9=E5=87=BB=E6=89=B9=E6=AC=A1?= =?UTF-8?q?=E5=8F=B7=E5=88=86=E6=89=B9=E5=8F=AA=E5=9C=A8=E5=85=89=E9=94=A5?= =?UTF-8?q?=E4=B8=80=E4=BD=93=E5=88=80=E5=8F=AF=E4=BB=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wpm_bx/inmIn.vue | 3 ++- src/views/wpm_bx/inmOut.vue | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/views/wpm_bx/inmIn.vue b/src/views/wpm_bx/inmIn.vue index 93a20d89..5dad22e8 100644 --- a/src/views/wpm_bx/inmIn.vue +++ b/src/views/wpm_bx/inmIn.vue @@ -83,7 +83,8 @@ min-width="150" > Date: Mon, 8 Sep 2025 17:01:00 +0800 Subject: [PATCH 09/73] =?UTF-8?q?fix:=E6=89=B9=E6=AC=A1=E7=BB=9F=E8=AE=A1?= =?UTF-8?q?=E4=B8=AD=E7=94=9F=E4=BA=A7=E6=97=A5=E5=BF=97=E4=BB=A5=E5=B7=A5?= =?UTF-8?q?=E5=BA=8F=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/statistics/batch_statistics.vue | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/views/statistics/batch_statistics.vue b/src/views/statistics/batch_statistics.vue index 44aeac89..9865a9d9 100644 --- a/src/views/statistics/batch_statistics.vue +++ b/src/views/statistics/batch_statistics.vue @@ -352,6 +352,7 @@ export default { //mlog\handover params_mlog:{ cbatch:'', + ordering:'create_time', with_mlogb:'yes', query: " { id,material_out_name,mlogb_full,count_real,count_ok,is_fix,belong_dept_name,mgroup_name,handle_user_name,handle_date,reminder_interval_list,mstate_json,work_start_time,work_end_time,oinfo_json,submit_time,submit_user_name}" }, @@ -365,6 +366,7 @@ export default { item_mio__batch:'', }, query:{ + ordering:'-update_time', batch:'', // material_start__type:30, }, From e092dacb4da6145be7d040a8a07cb89b8661e731 Mon Sep 17 00:00:00 2001 From: shijing Date: Mon, 8 Sep 2025 17:01:51 +0800 Subject: [PATCH 10/73] =?UTF-8?q?fix:=E4=BA=A4=E6=8E=A5=E4=B8=AD=E6=95=B0?= =?UTF-8?q?=E9=87=8F=E5=BB=B6=E6=97=B6=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wpm_bx/handover_form.vue | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/views/wpm_bx/handover_form.vue b/src/views/wpm_bx/handover_form.vue index 7f0ba8f9..c55080f4 100644 --- a/src/views/wpm_bx/handover_form.vue +++ b/src/views/wpm_bx/handover_form.vue @@ -898,7 +898,9 @@ export default { }) } } - this.countChange(); + setTimeout(() => { + this.countChange(); + }, 500); }, }, }; From 67794e166974c77a9bdc3fe920184b900b2d3620 Mon Sep 17 00:00:00 2001 From: shijing Date: Mon, 8 Sep 2025 17:02:45 +0800 Subject: [PATCH 11/73] =?UTF-8?q?fix:=E6=97=A5=E5=BF=97=E4=B8=AD=E4=B8=BB?= =?UTF-8?q?=E8=A6=81=E6=89=B9=E6=AC=A1=E5=92=8C=E6=AC=A1=E8=A6=81=E6=89=B9?= =?UTF-8?q?=E6=AC=A1=E5=B1=95=E7=A4=BA=E9=97=AE=E9=A2=98=E4=BF=AE=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 | 1 + 1 file changed, 1 insertion(+) diff --git a/src/views/wpm_bx/mlog_detail.vue b/src/views/wpm_bx/mlog_detail.vue index 224ed554..8d2d8a75 100644 --- a/src/views/wpm_bx/mlog_detail.vue +++ b/src/views/wpm_bx/mlog_detail.vue @@ -502,6 +502,7 @@ export default { paramsIn: { page: 0, mlog: "", + parent__isnull:true, with_children:'yes', material_in__isnull: 0, }, From eef14ca7eb1c2ce314cb78a85839c5a5f87b05fe Mon Sep 17 00:00:00 2001 From: shijing Date: Tue, 9 Sep 2025 13:25:06 +0800 Subject: [PATCH 12/73] =?UTF-8?q?fix:=E7=8E=BB=E7=BA=A4=E5=B7=A5=E6=AE=B5?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=98=BE=E7=A4=BA=E7=8F=AD=E6=AC=A1=E8=A7=84?= =?UTF-8?q?=E5=88=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/mtm/mgroup.vue | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/views/mtm/mgroup.vue b/src/views/mtm/mgroup.vue index 68625176..64b9d5d0 100644 --- a/src/views/mtm/mgroup.vue +++ b/src/views/mtm/mgroup.vue @@ -70,17 +70,10 @@ min-width="80" > - Date: Tue, 9 Sep 2025 13:26:07 +0800 Subject: [PATCH 13/73] =?UTF-8?q?fix:=E8=8B=A5=E6=97=A0=E7=BB=93=E6=9D=9F?= =?UTF-8?q?=E6=97=A5=E6=9C=9F=E6=97=A5=E5=BF=97=E6=8F=90=E4=BA=A4=E5=89=8D?= =?UTF-8?q?=EF=BC=8C=E5=85=88=E4=BF=9D=E5=AD=98=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 | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/views/wpm_bx/mlog_detail.vue b/src/views/wpm_bx/mlog_detail.vue index 8d2d8a75..901afeef 100644 --- a/src/views/wpm_bx/mlog_detail.vue +++ b/src/views/wpm_bx/mlog_detail.vue @@ -932,14 +932,19 @@ export default { //表单提交方法 mlogSubmit() { let that = this; + that.isSaveing = true; + let obj = {}; if(that.mlogItem.work_end_time==''||that.mlogItem.work_end_time==null){ - that.mlogItem.work_end_time = that.$TOOL.dateFormat1(new Date()); - that.mlogItem.handle_date = that.$TOOL.dateFormat2(new Date()); + obj.work_end_time = that.mlogItem.work_end_time = that.$TOOL.dateFormat1(new Date()); + obj.handle_date = that.mlogItem.handle_date = that.$TOOL.dateFormat2(new Date()); + that.$API.wpm.mlog.change.req(that.mlogItem.id, obj).then((res) => {}); } that.$API.wpm.mlog.submit.req(that.mlogItem.id).then((res) => { that.isSaveing = false; that.visible = false; that.$message.success("操作成功"); + }).catch(() => { + that.isSaveing = false; }); }, table_muser_add(){ From c85bac30e487f82704dcbc4ffb88289b52d97615 Mon Sep 17 00:00:00 2001 From: shijing Date: Tue, 9 Sep 2025 13:27:01 +0800 Subject: [PATCH 14/73] =?UTF-8?q?fix:=E6=A8=A1=E6=9D=BF=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E6=A8=AA=E5=8E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wpm_bx/wprList.vue | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/views/wpm_bx/wprList.vue b/src/views/wpm_bx/wprList.vue index b0aec277..4329d3dc 100644 --- a/src/views/wpm_bx/wprList.vue +++ b/src/views/wpm_bx/wprList.vue @@ -288,7 +288,7 @@ export default { for(let key in row.oinfo){ oinfo.push(row.oinfo[key]) } - let data = {sigao:'',duibian:'',moban:'',istest:'否',number:row.number,name:name,ofrom_name:that.ofromName,ofrom_batch:that.ofromBatch}; + let data = {sigao:'',duibian:'',moban:'',hengya:'',istest:'否',number:row.number,name:name,ofrom_name:that.ofromName,ofrom_batch:that.ofromBatch}; if(that.route_code=='zhuangmo'||that.route_code=='zlybcl'||that.route_code=='tuomoceliang'||that.route_code=='reyatuihuo'||that.route_code=='banduangunyuan'){ params.label_template_name = '脱膜测量单件标签模板'; }else{ @@ -298,6 +298,8 @@ export default { oinfo.forEach((item)=>{ if(item.name=="丝高"){ data.sigao = item.val; + }else if(item.name=="横压"){ + data.hengya = item.val; }else if(item.name=="对边"){ data.duibian = item.val; }else if(item.name=="模具号"){ From b20337454c6b8294300dd2dbbd7947a7b1ef88f8 Mon Sep 17 00:00:00 2001 From: shijing Date: Tue, 9 Sep 2025 14:57:47 +0800 Subject: [PATCH 15/73] =?UTF-8?q?fix:=E5=8F=AA=E6=9C=89=E5=90=88=E6=89=B9?= =?UTF-8?q?=E6=89=8D=E5=B1=95=E7=A4=BA=E6=9B=B4=E6=94=B9=E6=89=B9=E6=AC=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wpm_gx/handover_form.vue | 37 +++++++++++++++++------------- 1 file changed, 21 insertions(+), 16 deletions(-) diff --git a/src/views/wpm_gx/handover_form.vue b/src/views/wpm_gx/handover_form.vue index 9291f587..84f437c4 100644 --- a/src/views/wpm_gx/handover_form.vue +++ b/src/views/wpm_gx/handover_form.vue @@ -161,7 +161,7 @@ - + @@ -171,7 +171,7 @@ - + @@ -327,6 +327,7 @@ export default { fileList:[], userList: [], userList2: [], + handoverbIds:[], mgroupOptions: [], materialOptions: [], addShow: false, @@ -519,24 +520,28 @@ export default { this.visible = true; return this; }, + //选中物料批次后，放入handoverb materialChange0(){ let that = this; - that.form.handoverb = []; + // that.form.handoverb = []; + // that.handoverbIds = []; that.totalCount = 0; that.selectObjs.forEach(item=>{ - let obj = {}; - obj.wm = item.id; - obj.state = item.state; - obj.batch = item.batch; - obj.label = item.defect !== null?item.batch+'('+item.material_name+')'+item.defect_name:item.batch+'('+item.material_name+')'; - obj.count = item.count_canhandover; - obj.defect = item.defect; - obj.defect_name = item.defect_name; - obj.count_cando = item.count_canhandover; - obj.material = item.material; - that.totalCount += Number(obj.count); - that.form.handoverb.push(obj); - that.getResaveMgroups(obj.material); + if(that.handoverbIds.indexOf(item.id)==-1){ + let obj = {}; + obj.wm = item.id; + obj.state = item.state; + obj.batch = item.batch; + obj.label = item.defect !== null?item.batch+'('+item.material_name+')'+item.defect_name:item.batch+'('+item.material_name+')'; + obj.count = item.count_canhandover; + obj.defect = item.defect; + obj.defect_name = item.defect_name; + obj.count_cando = item.count_canhandover; + obj.material = item.material; + that.totalCount += Number(obj.count); + that.form.handoverb.push(obj); + that.getResaveMgroups(obj.material); + } }) }, countChange(){ From 333fbfaf846d8d067aee9da5937e178150dd5da7 Mon Sep 17 00:00:00 2001 From: shijing Date: Tue, 9 Sep 2025 14:58:18 +0800 Subject: [PATCH 16/73] =?UTF-8?q?fix:=E7=8E=BB=E7=BA=A4=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=B1=95=E7=A4=BA=E6=9D=BF=E6=AE=B5=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wpm_bx/mlogs.vue | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/src/views/wpm_bx/mlogs.vue b/src/views/wpm_bx/mlogs.vue index 1ddf455a..95147e5f 100644 --- a/src/views/wpm_bx/mlogs.vue +++ b/src/views/wpm_bx/mlogs.vue @@ -71,7 +71,9 @@ label="预计工时" prop="hour_work" width="80" - > --> + > + + --> + + + - + Date: Wed, 10 Sep 2025 14:08:35 +0800 Subject: [PATCH 20/73] =?UTF-8?q?fix:=E4=BA=A4=E6=8E=A5=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E6=8E=A5=E6=94=B6=E5=B7=A5=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wpm_bx/handover.vue | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/src/views/wpm_bx/handover.vue b/src/views/wpm_bx/handover.vue index c69e0b29..00ec3ee5 100644 --- a/src/views/wpm_bx/handover.vue +++ b/src/views/wpm_bx/handover.vue @@ -101,15 +101,6 @@ - - - + Date: Thu, 11 Sep 2025 14:05:23 +0800 Subject: [PATCH 21/73] =?UTF-8?q?fix:=E7=89=B9=E6=AE=8Aswitch=E9=A2=9C?= =?UTF-8?q?=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/App.vue | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/App.vue b/src/App.vue index 36b16a06..b03993b4 100644 --- a/src/App.vue +++ b/src/App.vue @@ -161,8 +161,12 @@ export default { .el-calendar > .el-calendar__body { padding: 0 20px 20px; } - - +.asyncColorSwitch .el-switch__label--right.is-active{ + color: #67c23a!important; /* 开启状态的文本颜色 */ +} +.asyncColorSwitch .el-switch__label--left.is-active{ + color: #0052d9!important; /* 关闭状态的文本颜色 */ +} // .el-table thead.is-group th.el-table__cell.colorheader1{ // background-color: rgb(255, 243, 202)!important; // } From 4b27653e18de3dfdfb0dc3c51d06994d1168a65b Mon Sep 17 00:00:00 2001 From: shijing Date: Thu, 11 Sep 2025 14:06:25 +0800 Subject: [PATCH 22/73] =?UTF-8?q?fix:=E6=9B=B4=E6=96=B0=E7=BB=93=E6=9D=9F?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E5=90=8E=E5=86=8D=E6=89=A7=E8=A1=8C=E6=8F=90?= =?UTF-8?q?=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wpm_bx/mlog_detail.vue | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/views/wpm_bx/mlog_detail.vue b/src/views/wpm_bx/mlog_detail.vue index 901afeef..aa827499 100644 --- a/src/views/wpm_bx/mlog_detail.vue +++ b/src/views/wpm_bx/mlog_detail.vue @@ -937,8 +937,15 @@ export default { if(that.mlogItem.work_end_time==''||that.mlogItem.work_end_time==null){ obj.work_end_time = that.mlogItem.work_end_time = that.$TOOL.dateFormat1(new Date()); obj.handle_date = that.mlogItem.handle_date = that.$TOOL.dateFormat2(new Date()); - that.$API.wpm.mlog.change.req(that.mlogItem.id, obj).then((res) => {}); + that.$API.wpm.mlog.change.req(that.mlogItem.id, obj).then((res) => { + that.submitMlog(); + }); + }else{ + that.submitMlog(); } + }, + submitMlog(){ + let that = this; that.$API.wpm.mlog.submit.req(that.mlogItem.id).then((res) => { that.isSaveing = false; that.visible = false; From 5d4b61e8937f126ce2b879b6c9dc179c013ab799 Mon Sep 17 00:00:00 2001 From: shijing Date: Thu, 11 Sep 2025 14:07:24 +0800 Subject: [PATCH 23/73] =?UTF-8?q?fix:=E9=98=B2=E6=AD=A2=E7=BD=91=E7=BB=9C?= =?UTF-8?q?=E6=85=A2=E6=97=B6=E6=89=AB=E7=A0=81=E4=B9=B1=E6=89=B9=E5=A4=84?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wpm_bx/handover_form.vue | 236 ++++++++++++++--------------- 1 file changed, 117 insertions(+), 119 deletions(-) diff --git a/src/views/wpm_bx/handover_form.vue b/src/views/wpm_bx/handover_form.vue index f284322a..ba533c47 100644 --- a/src/views/wpm_bx/handover_form.vue +++ b/src/views/wpm_bx/handover_form.vue @@ -17,8 +17,10 @@ 手动添加 @@ -344,6 +346,7 @@ export default { bwVisible:false, scanVisible:false, isSaveing: false, + imputDisable:false, change_batch:false, setFiltersVisible: false, }; @@ -733,69 +736,73 @@ export default { let that = this; that.scanVisible = true; }, - formWminChange(data){ + async formWminChange(data){ + this.imputDisable = true; + await this.getInputText(data); + this.imputDisable = false; + this.$refs.codeInput.focus(); + }, + async getInputText(data){ if(data==''){ return; } let that = this; + that.wm_in = ''; if(data.indexOf('#')>-1){ let id = data.split('#')[1]; - this.$API.cm.labelmat.item.req(id).then((res) => { - let arr = []; - if(that.form.handoverb&&that.form.handoverb.length>0){ - that.form.handoverb.forEach((item) => { - if(item.batch == res.batch&&item.state==res.state&&item.defect==res.defect){ - arr.push(item); - } - }) - } - if(arr.length>0){ - that.wm_in = ""; - that.$message.error("该批次已存在") - }else{ - let hasArr = []; - that.materialOptions.forEach((item) => { - if(item.batch == res.batch){ - hasArr.push(item); - let params = {material: item.material,type: that.type}; - that.$API.wpm.handover.mgroups.req(params).then((res0) => { - that.mgroupOptions = res0; - if(res0.length==1){ - that.form.recive_mgroup = res0[0].id; - that.getUserList2(); - } - }) - let obj = {}; - obj.wm = item.id; - obj.batch = item.batch; - if(item.material_.process_name){ - obj.process = item.material_.process_name; - } - obj.count_cando = item.count_canhandover; - obj.count = item.count_canhandover; - obj.state = res.state; - obj.defect = res.defect; - obj.handoverbw = []; - that.$API.wpm.wpr.list.req({wm:item.id,page:0}).then((res) => { - let handoverbw = []; - let list = res; - list.forEach(item1=>{ - let obj1 = {}; - obj1.wpr = item1.id; - obj1.number = item1.number; - handoverbw.push(obj1); - }) - obj.handoverbw = handoverbw; - that.form.handoverb.push(obj); - that.wm_in = ""; - }) - } - }) - if(hasArr.length>0){}else{ - that.$message.error("该批次不存在") + let res = await this.$API.cm.labelmat.item.req(id); + let arr = []; + if(that.form.handoverb&&that.form.handoverb.length>0){ + that.form.handoverb.forEach((item) => { + if(item.batch == res.batch&&item.state==res.state&&item.defect==res.defect){ + arr.push(item); } + }) + } + if(arr.length>0){ + that.$message.error("该批次已存在") + }else{ + let hasArr = []; + that.materialOptions.forEach((item) => { + if(item.batch == res.batch){ + hasArr.push(item); + let params = {material: item.material,type: that.type}; + that.$API.wpm.handover.mgroups.req(params).then((res0) => { + that.mgroupOptions = res0; + if(res0.length==1){ + that.form.recive_mgroup = res0[0].id; + that.getUserList2(); + } + }) + let obj = {}; + obj.wm = item.id; + obj.batch = item.batch; + if(item.material_.process_name){ + obj.process = item.material_.process_name; + } + obj.count_cando = item.count_canhandover; + obj.count = item.count_canhandover; + obj.state = res.state; + obj.defect = res.defect; + obj.handoverbw = []; + that.$API.wpm.wpr.list.req({wm:item.id,page:0}).then((res) => { + let handoverbw = []; + let list = res; + list.forEach(item1=>{ + let obj1 = {}; + obj1.wpr = item1.id; + obj1.number = item1.number; + handoverbw.push(obj1); + }) + obj.handoverbw = handoverbw; + that.form.handoverb.push(obj); + }) + } + }) + if(hasArr.length>0){}else{ + that.$message.error("该批次不存在") } - }) + } }else{//wpr的number let arr = []; arr = that.materialOptions.filter((item) => { @@ -809,7 +816,6 @@ export default { }) } if(arr2.length>0){ - that.wm_in = ""; that.$message.error("该批次已存在") }else{ let params = {material: arr[0].material,type: that.type}; @@ -825,79 +831,71 @@ export default { obj2.count_cando = arr[0].count_canhandover; obj2.count = arr[0].count_canhandover; that.form.handoverb.push(obj2); - that.wm_in = ""; } }else{//单件 - that.$API.wpm.wpr.list.req({number:data,page:0}).then((res) => { - if(res.length>0){ - let indexs = 0,arr =[]; - if( that.form.handoverb&&that.form.handoverb.length>0){ - arr = that.form.handoverb.filter((item,index) => { - if(item.wm == res[0].wm){ - indexs = index; - } - return item.wm == res[0].wm; + let res = await that.$API.wpm.wpr.list.req({number:data,page:0}); + if(res.length>0){ + let indexs = 0,arr =[]; + if( that.form.handoverb&&that.form.handoverb.length>0){ + that.form.handoverb.forEach((item,index) => { + if(item.wm == res[0].wm){ + indexs = index; + arr.push(item); + } + }) + } + //handoverb里有这个物料批次 + if(arr.length>0){ + //判断是否有wpr，若无将wpr放进去 + if(that.form.handoverb[indexs].handoverbw&&that.form.handoverb[indexs].handoverbw.length>0){ + let arr1 = []; + arr1 = that.form.handoverb[indexs].handoverbw.filter((item1) => { + return item1.wpr == res[0].id; }) - } - //handoverb里有这个物料批次 - if(arr.length>0){ - //判断是否有wpr，若无将wpr放进去 - if(that.form.handoverb[indexs].handoverbw&&that.form.handoverb[indexs].handoverbw.length>0){ - let arr1 = []; - arr1 = that.form.handoverb[indexs].handoverbw.filter((item1) => { - return item1.wpr == res[0].id; - }) - if(arr1.length>0){ - that.wm_in = ""; - that.$message.error("该物料已存在"); - }else{ - let obj1 = {}; - obj1.wpr = res[0].id; - obj1.number = res[0].number; - that.form.handoverb[indexs].count+=1; - that.form.handoverb[indexs].handoverbw.push(obj1); - that.wm_in = ""; - } + if(arr1.length>0){ + that.$message.error("该物料已存在"); }else{ - that.form.handoverb[indexs].handoverbw = []; let obj1 = {}; obj1.wpr = res[0].id; obj1.number = res[0].number; - that.form.handoverb[indexs].count=1; + that.form.handoverb[indexs].count+=1; that.form.handoverb[indexs].handoverbw.push(obj1); - that.wm_in = ""; } - }else{//handoverb里没有有这个物料批次 - that.materialOptions.forEach((item) => { - if(item.id == res[0].wm){ - let params = {material: item.material,type: that.type}; - that.$API.wpm.handover.mgroups.req(params).then((res1) => { - that.mgroupOptions = res1; - }) - let obj2 = {}; - obj2.wm = item.id; - obj2.batch = item.batch; - if(item.material_.process_name){ - obj2.process = item.material_.process_name; - } - obj2.count_cando = item.count_canhandover; - obj2.handoverbw = []; - obj2.count = 1; - let obj3 = {}; - obj3.wpr = res[0].id; - obj3.number = res[0].number; - obj2.handoverbw.push(obj3); - // that.form.handoverb = []; - that.form.handoverb.push(obj2); - } - }) - that.wm_in = ""; + }else{ + that.form.handoverb[indexs].handoverbw = []; + let obj1 = {}; + obj1.wpr = res[0].id; + obj1.number = res[0].number; + that.form.handoverb[indexs].count=1; + that.form.handoverb[indexs].handoverbw.push(obj1); } - }else{ - that.wm_in = ""; - that.$message.error("该批次不存在") + }else{//handoverb里没有有这个物料批次 + that.materialOptions.forEach((item) => { + if(item.id == res[0].wm){ + let params = {material: item.material,type: that.type}; + that.$API.wpm.handover.mgroups.req(params).then((res1) => { + that.mgroupOptions = res1; + }) + let obj2 = {}; + obj2.wm = item.id; + obj2.batch = item.batch; + if(item.material_.process_name){ + obj2.process = item.material_.process_name; + } + obj2.count_cando = item.count_canhandover; + obj2.handoverbw = []; + obj2.count = 1; + let obj3 = {}; + obj3.wpr = res[0].id; + obj3.number = res[0].number; + obj2.handoverbw.push(obj3); + that.form.handoverb.push(obj2); + } + }) } - }) + }else{ + that.$message.error("该批次不存在") + } } } setTimeout(() => { From a30e7e0dccbbfb8dda9761ceb2702494a6997c5e Mon Sep 17 00:00:00 2001 From: shijing Date: Thu, 11 Sep 2025 14:08:26 +0800 Subject: [PATCH 24/73] =?UTF-8?q?fix:=E8=BD=A6=E9=97=B4=E7=89=A9=E6=96=99?= =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E6=89=B9=E6=AC=A1&=E6=9D=BF=E6=AE=B5?= =?UTF-8?q?=E5=88=87=E6=8D=A2=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wpm_bx/inmIn.vue | 166 ++++++++++++++++++++++++++++++++++- src/views/wpm_bx/inmOut.vue | 168 +++++++++++++++++++++++++++++++++++- 2 files changed, 327 insertions(+), 7 deletions(-) diff --git a/src/views/wpm_bx/inmIn.vue b/src/views/wpm_bx/inmIn.vue index 5dad22e8..48b87f11 100644 --- a/src/views/wpm_bx/inmIn.vue +++ b/src/views/wpm_bx/inmIn.vue @@ -7,6 +7,15 @@ 合批
+ + + + + + + + + + + + + + + + + + + + + + { @@ -457,10 +543,11 @@ export default { }); }, //打印物料标签 - printMaterial(row){ + printMaterial(row,type){ let that = this; if(that.printer_name!==''&&that.printer_name!==null&&that.printer_name!==undefined){ - let params = {}; + if(type=='wm'){ + let params = {}; params.tid = row.id; let materialname = row.material_.name + '|' + row.material_.process_name; let specification = row.material_.specification; @@ -517,6 +604,79 @@ export default { }); }) } + + }else if(type=='wpr'){ + that.ofromBatch = row.wm_batch; + that.ofromName = row.wm_material_ofrom_name; + let params = {}; + let name = row.material_name.split('|')[0]; + if(that.route_code=='paiyicibang'||that.route_code=='kunbang'){ + console.log('that.route_code',that.route_code); + console.log('that.ofromName',that.ofromName); + that.$API.mtm.route.list.req({material_out:row.material,page:0}).then((res) => { + let data = res[0].params_json; + data.number = row.number; + data.name=name; + data.ofrom_name=that.ofromName; + params.data = data; + if(that.route_code=='paiyicibang'){ + params.label_template_name = '排一次棒单件打印模板'; + }else{ + params.label_template_name = '捆棒单件打印模板'; + } + that.$API.cm.labeltemplate.commands.req(params).then((res) => { + let obj = {}; + obj.printer_commands = res.commands; + obj.printer_name = that.printer_name; + that.$API.wpm.prints.req(obj).then((response) => { + that.$message.success("打印成功"); + }); + }); + }) + }else{ + if(that.route_code=='paiban'||that.route_code=='zhuangmo'||that.route_code=='zlybcl'||that.route_code=='tuomoceliang'|| + that.route_code=='reyatuihuo'||that.route_code=='banduangunyuan'||that.route_code=='banduangunyuanhoudama'||that.route_code=='banduangunyuantuihuo' + ){ + let oinfo = []; + for(let key in row.oinfo){ + oinfo.push(row.oinfo[key]) + } + let data = {sigao:'',duibian:'',moban:'',hengya:'',istest:'否',number:row.number,name:name,ofrom_name:that.ofromName,ofrom_batch:that.ofromBatch}; + if(that.route_code=='zhuangmo'||that.route_code=='zlybcl'||that.route_code=='tuomoceliang'||that.route_code=='reyatuihuo'||that.route_code=='banduangunyuan'){ + params.label_template_name = '脱膜测量单件标签模板'; + }else{ + params.label_template_name = '排扳单件打印模板'; + } + if(oinfo.length>0){ + oinfo.forEach((item)=>{ + if(item.name=="丝高"){ + data.sigao = item.val; + }else if(item.name=="横压"){ + data.hengya = item.val; + }else if(item.name=="对边"){ + data.duibian = item.val; + }else if(item.name=="模具号"){ + data.moban = item.val; + }else if(item.name=="实验板段"){ + data.istest = item.val?'是':'否'; + } + }) + } + params.data = data; + }else{ + params.label_template_name = '单件打印模板'; + params.data = {number:row.number,name:name}; + } + that.$API.cm.labeltemplate.commands.req(params).then((res) => { + let obj = {}; + obj.printer_commands = res.commands; + obj.printer_name = that.printer_name; + that.$API.wpm.prints.req(obj).then((response) => { + that.$message.success("打印成功"); + }); + }); + } + } }else{ that.$message.warning("请先设置打印机"); } diff --git a/src/views/wpm_bx/inmOut.vue b/src/views/wpm_bx/inmOut.vue index 193d18c7..b4248808 100644 --- a/src/views/wpm_bx/inmOut.vue +++ b/src/views/wpm_bx/inmOut.vue @@ -8,6 +8,15 @@ 入库
+ - + + + + + + + + + + + + + + + + + + + + + + { @@ -492,7 +578,8 @@ export default { printMaterial(row,type){ let that = this; if(that.printer_name!==''&&that.printer_name!==null&&that.printer_name!==undefined){ - let params = {}; + if(type=='wm'){ + let params = {}; params.tid = row.id; let materialname = row.material_.name + '|' + row.material_.process_name; let specification = row.material_.specification; @@ -563,6 +650,78 @@ export default { }); }) } + }else if(type=='wpr'){ + that.ofromBatch = row.wm_batch; + that.ofromName = row.wm_material_ofrom_name; + let params = {}; + let name = row.material_name.split('|')[0]; + if(that.route_code=='paiyicibang'||that.route_code=='kunbang'){ + console.log('that.route_code',that.route_code); + console.log('that.ofromName',that.ofromName); + that.$API.mtm.route.list.req({material_out:row.material,page:0}).then((res) => { + let data = res[0].params_json; + data.number = row.number; + data.name=name; + data.ofrom_name=that.ofromName; + params.data = data; + if(that.route_code=='paiyicibang'){ + params.label_template_name = '排一次棒单件打印模板'; + }else{ + params.label_template_name = '捆棒单件打印模板'; + } + that.$API.cm.labeltemplate.commands.req(params).then((res) => { + let obj = {}; + obj.printer_commands = res.commands; + obj.printer_name = that.printer_name; + that.$API.wpm.prints.req(obj).then((response) => { + that.$message.success("打印成功"); + }); + }); + }) + }else{ + if(that.route_code=='paiban'||that.route_code=='zhuangmo'||that.route_code=='zlybcl'||that.route_code=='tuomoceliang'|| + that.route_code=='reyatuihuo'||that.route_code=='banduangunyuan'||that.route_code=='banduangunyuanhoudama'||that.route_code=='banduangunyuantuihuo' + ){ + let oinfo = []; + for(let key in row.oinfo){ + oinfo.push(row.oinfo[key]) + } + let data = {sigao:'',duibian:'',moban:'',hengya:'',istest:'否',number:row.number,name:name,ofrom_name:that.ofromName,ofrom_batch:that.ofromBatch}; + if(that.route_code=='zhuangmo'||that.route_code=='zlybcl'||that.route_code=='tuomoceliang'||that.route_code=='reyatuihuo'||that.route_code=='banduangunyuan'){ + params.label_template_name = '脱膜测量单件标签模板'; + }else{ + params.label_template_name = '排扳单件打印模板'; + } + if(oinfo.length>0){ + oinfo.forEach((item)=>{ + if(item.name=="丝高"){ + data.sigao = item.val; + }else if(item.name=="横压"){ + data.hengya = item.val; + }else if(item.name=="对边"){ + data.duibian = item.val; + }else if(item.name=="模具号"){ + data.moban = item.val; + }else if(item.name=="实验板段"){ + data.istest = item.val?'是':'否'; + } + }) + } + params.data = data; + }else{ + params.label_template_name = '单件打印模板'; + params.data = {number:row.number,name:name}; + } + that.$API.cm.labeltemplate.commands.req(params).then((res) => { + let obj = {}; + obj.printer_commands = res.commands; + obj.printer_name = that.printer_name; + that.$API.wpm.prints.req(obj).then((response) => { + that.$message.success("打印成功"); + }); + }); + } + } }else{ that.$message.warning("请先设置打印机"); } @@ -579,4 +738,5 @@ export default { }, }; - + From 3d53796fa5f4c39675a52ec57800c9652cca0bc2 Mon Sep 17 00:00:00 2001 From: shijing Date: Thu, 11 Sep 2025 14:09:06 +0800 Subject: [PATCH 25/73] =?UTF-8?q?fix:wpr=E6=8A=BD=E5=B1=89=E5=85=88?= =?UTF-8?q?=E6=B8=85=E7=A9=BA=EF=BC=8C=E5=86=8D=E8=8E=B7=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wpm_bx/wprList.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/views/wpm_bx/wprList.vue b/src/views/wpm_bx/wprList.vue index 4329d3dc..67320515 100644 --- a/src/views/wpm_bx/wprList.vue +++ b/src/views/wpm_bx/wprList.vue @@ -136,6 +136,7 @@ export default { methods: { open(mode) { let that = this; + that.wprList = []; this.mode = mode; this.params.wm = this.wm; this.visible = true; From 698114767020328d59caa7fd7e165062ab47b73d Mon Sep 17 00:00:00 2001 From: shijing Date: Thu, 11 Sep 2025 15:23:10 +0800 Subject: [PATCH 26/73] =?UTF-8?q?fix:=E6=97=A5=E5=BF=97=E6=8F=90=E4=BA=A4?= =?UTF-8?q?=E6=97=B6=E8=8B=A5=E6=97=A0=E7=BB=93=E6=9D=9F=E6=97=B6=E9=97=B4?= =?UTF-8?q?=EF=BC=8C=E5=88=99=E8=8E=B7=E5=8F=96=E6=9C=8D=E5=8A=A1=E5=99=A8?= =?UTF-8?q?=E5=BD=93=E5=89=8D=E6=97=B6=E9=97=B4=EF=BC=8C=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E5=90=8E=E5=86=8D=E6=8F=90=E4=BA=A4=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/model/bi.js | 6 ++++++ src/views/wpm_bx/mlog_detail.vue | 14 ++++++++------ 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/src/api/model/bi.js b/src/api/model/bi.js index 3802307d..6d812d78 100644 --- a/src/api/model/bi.js +++ b/src/api/model/bi.js @@ -96,4 +96,10 @@ export default { }, }, }, + servertime: { + name: "获取服务器时间", + req: async function () { + return await http.get(`${config.API_URL}/develop/server_time/`); + }, + } }; diff --git a/src/views/wpm_bx/mlog_detail.vue b/src/views/wpm_bx/mlog_detail.vue index aa827499..754610a7 100644 --- a/src/views/wpm_bx/mlog_detail.vue +++ b/src/views/wpm_bx/mlog_detail.vue @@ -933,13 +933,15 @@ export default { mlogSubmit() { let that = this; that.isSaveing = true; - let obj = {}; if(that.mlogItem.work_end_time==''||that.mlogItem.work_end_time==null){ - obj.work_end_time = that.mlogItem.work_end_time = that.$TOOL.dateFormat1(new Date()); - obj.handle_date = that.mlogItem.handle_date = that.$TOOL.dateFormat2(new Date()); - that.$API.wpm.mlog.change.req(that.mlogItem.id, obj).then((res) => { - that.submitMlog(); - }); + that.$API.bi.servertime.req().then((res) => { + let obj = {}; + obj.work_end_time = res.server_time; + obj.handle_date = this.$TOOL.dateFormat2(new Date()); + that.$API.wpm.mlog.change.req(that.mlogItem.id, obj).then((res) => { + that.submitMlog(); + }); + }) }else{ that.submitMlog(); } From 68d346bc42a26d29b5a16de1f675e6d9732773af Mon Sep 17 00:00:00 2001 From: shijing Date: Fri, 12 Sep 2025 09:25:41 +0800 Subject: [PATCH 27/73] =?UTF-8?q?fix=EF=BC=9Abug=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/inmIn.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/wpm_bx/inmIn.vue b/src/views/wpm_bx/inmIn.vue index 48b87f11..6c6c493d 100644 --- a/src/views/wpm_bx/inmIn.vue +++ b/src/views/wpm_bx/inmIn.vue @@ -140,7 +140,7 @@ width="120" > - + - + - + - + From f95fcaed908af236b558c787309be2942e4f4e49 Mon Sep 17 00:00:00 2001 From: shijing Date: Mon, 15 Sep 2025 15:31:21 +0800 Subject: [PATCH 34/73] =?UTF-8?q?fix:=E6=B5=8B=E7=82=B9=E8=A1=A8=E5=8D=95?= =?UTF-8?q?=E6=94=B9=E5=8F=98=E8=AE=BE=E5=A4=87=E9=80=89=E6=8B=A9=E7=BB=84?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/em/mpoint_form.vue | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/src/views/em/mpoint_form.vue b/src/views/em/mpoint_form.vue index 04b39002..655f5adb 100644 --- a/src/views/em/mpoint_form.vue +++ b/src/views/em/mpoint_form.vue @@ -261,21 +261,16 @@ - - - + + + @@ -465,6 +460,7 @@ export default { mpointOptions: [], epOptions: [], materials: [], + apiObjEq:this.$API.em.equipment.list, }; }, mounted() { From 34b2d4b4f0dfcff245c80f680326c9402f94e037 Mon Sep 17 00:00:00 2001 From: shijing Date: Mon, 15 Sep 2025 16:27:15 +0800 Subject: [PATCH 35/73] =?UTF-8?q?fix:=E5=85=89=E5=AD=90=E9=87=87=E8=B4=AD?= =?UTF-8?q?=E5=85=A5=E5=BA=93=E6=97=B6=E6=89=B9=E6=AC=A1=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E4=B8=BA=E2=80=9C=E6=97=A0=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/inm/mioitem_form.vue | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/views/inm/mioitem_form.vue b/src/views/inm/mioitem_form.vue index 0313534a..f7ff9cb3 100644 --- a/src/views/inm/mioitem_form.vue +++ b/src/views/inm/mioitem_form.vue @@ -38,6 +38,7 @@ @@ -500,6 +501,9 @@ export default { } else { this.getBatchOptions(); } + if(that.project_code=='gx'&&that.type == 'pur_in'){ + that.form.batch = '无' + } }, getItem(options, id) { for (var i = 0; i < options.length; i++) { From 8c885e4cfcda5cf6b796220c1f79a47459f10293 Mon Sep 17 00:00:00 2001 From: shijing Date: Mon, 15 Sep 2025 16:38:37 +0800 Subject: [PATCH 36/73] =?UTF-8?q?fix:=E7=9B=91=E6=B5=8B=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=B5=8B=E7=82=B9=E5=B1=95=E7=A4=BAnickname=EF=BC=8C=E5=9D=90?= =?UTF-8?q?=E6=A0=87=E8=BD=B4=E4=BB=8E=E5=B0=8F=E5=88=B0=E5=A4=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wpm_bx/monitor_detail.vue | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/views/wpm_bx/monitor_detail.vue b/src/views/wpm_bx/monitor_detail.vue index 45189607..087f0b3d 100644 --- a/src/views/wpm_bx/monitor_detail.vue +++ b/src/views/wpm_bx/monitor_detail.vue @@ -9,7 +9,7 @@ >
- + { if(res.length>0){ that.mpointList = res; - that.activeName = res[0].name; + that.activeName = res[0].nickname; that.params.mpoint = res[0].id; that.apiObj = that.$API.enm.mplogx; that.handleClick(); @@ -116,7 +116,7 @@ export default { console.log('handleClick',val) let that = this; that.mpointList.forEach(item=>{ - if(item.name == that.activeName){ + if(item.nickname == that.activeName){ that.query.mpoint = item.id; that.query.page = 1; that.option.title.text = that.activeName; @@ -129,9 +129,9 @@ export default { params.page = 0; that.$API.enm.mplogx.req(params).then((res) => { res.forEach(item=>{ - that.option.xAxis.data.push(item.timex); + that.option.xAxis.data.unshift(item.timex); let value = Number(item.val_float).toFixed(3); - that.option.series.data.push(value); + that.option.series.data.unshift(value); }) }) } From 6ff7e79c2279d9c01ceb562d0bd2f584109c731d Mon Sep 17 00:00:00 2001 From: shijing Date: Tue, 16 Sep 2025 10:08:01 +0800 Subject: [PATCH 37/73] =?UTF-8?q?fix:=E6=8E=92=E4=B8=80=E6=AC=A1=E6=A3=92?= =?UTF-8?q?=E6=97=A5=E5=BF=97=E5=B1=95=E7=A4=BA=E6=A3=92=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wpm_bx/mlogs.vue | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/views/wpm_bx/mlogs.vue b/src/views/wpm_bx/mlogs.vue index d81a932b..5e6bfae5 100644 --- a/src/views/wpm_bx/mlogs.vue +++ b/src/views/wpm_bx/mlogs.vue @@ -83,6 +83,15 @@
+ + + @@ -191,12 +191,12 @@ min-width="150" > diff --git a/src/views/wpm_bx/inmOut.vue b/src/views/wpm_bx/inmOut.vue index 925af7a8..c7a7b2cf 100644 --- a/src/views/wpm_bx/inmOut.vue +++ b/src/views/wpm_bx/inmOut.vue @@ -89,7 +89,7 @@ @@ -206,12 +206,12 @@ min-width="150" > diff --git a/src/views/wpm_bx/mlog_detail.vue b/src/views/wpm_bx/mlog_detail.vue index 5c632343..cd642b9d 100644 --- a/src/views/wpm_bx/mlog_detail.vue +++ b/src/views/wpm_bx/mlog_detail.vue @@ -1,12 +1,10 @@