From cf89f8583ff73e7981df114c5930740fb846de61 Mon Sep 17 00:00:00 2001 From: shijing Date: Mon, 23 Jun 2025 16:40:28 +0800 Subject: [PATCH 01/52] =?UTF-8?q?fix:=E7=8E=BB=E7=BA=A4=E5=B8=A6=E6=9D=BF?= =?UTF-8?q?=E6=AE=B5=E5=8F=B7=E6=89=B9=E6=AC=A1=E6=89=93=E5=8D=B0=E6=A8=A1?= =?UTF-8?q?=E6=9D=BF=E6=B7=BB=E5=8A=A0=E5=8E=9F=E5=A7=8B=E7=89=A9=E6=96=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wpm_bx/inmIn.vue | 2 +- src/views/wpm_bx/inmOut.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/wpm_bx/inmIn.vue b/src/views/wpm_bx/inmIn.vue index 6a731c4b..5e4e4476 100644 --- a/src/views/wpm_bx/inmIn.vue +++ b/src/views/wpm_bx/inmIn.vue @@ -493,7 +493,7 @@ export default { } } } - params.extra_data={materialname:materialname,specification:specification,count:row.count,slicecount:slice_count,numbers0:numbers[0],numbers1:numbers[1],numbers2:numbers[2],numbers3:numbers[3],numbers4:numbers[4],numbers5:numbers[5],numbers6:numbers[6]}; + params.extra_data={orimaterial:row.material_ofrom_name,materialname:materialname,specification:specification,count:row.count,slicecount:slice_count,numbers0:numbers[0],numbers1:numbers[1],numbers2:numbers[2],numbers3:numbers[3],numbers4:numbers[4],numbers5:numbers[5],numbers6:numbers[6]}; that.apiObjPrint.req(params).then((res) => { let obj = {}; obj.printer_commands = res.commands; diff --git a/src/views/wpm_bx/inmOut.vue b/src/views/wpm_bx/inmOut.vue index 37cb02de..d7fb7f30 100644 --- a/src/views/wpm_bx/inmOut.vue +++ b/src/views/wpm_bx/inmOut.vue @@ -495,7 +495,7 @@ export default { } } } - params.extra_data={materialname:materialname,specification:specification,count:row.count,slicecount:slice_count,numbers0:numbers[0],numbers1:numbers[1],numbers2:numbers[2],numbers3:numbers[3],numbers4:numbers[4],numbers5:numbers[5],numbers6:numbers[6]}; + params.extra_data={orimaterial:row.material_ofrom_name,materialname:materialname,specification:specification,count:row.count,slicecount:slice_count,numbers0:numbers[0],numbers1:numbers[1],numbers2:numbers[2],numbers3:numbers[3],numbers4:numbers[4],numbers5:numbers[5],numbers6:numbers[6]}; that.apiObjPrint.req(params).then((res) => { let obj = {}; obj.printer_commands = res.commands; From b505568d643c2ac62ddbd930838d9efa4012b1a9 Mon Sep 17 00:00:00 2001 From: shijing Date: Mon, 23 Jun 2025 16:41:23 +0800 Subject: [PATCH 02/52] fix:coding#858 --- src/views/wpm_bx/mlog_detail.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/views/wpm_bx/mlog_detail.vue b/src/views/wpm_bx/mlog_detail.vue index 536355e4..d8fd2e18 100644 --- a/src/views/wpm_bx/mlog_detail.vue +++ b/src/views/wpm_bx/mlog_detail.vue @@ -210,8 +210,9 @@ @click="table_add" style="position: absolute; left: 100px; top: 5px" >新增 - 注：请扫码录入单个棒！一个棒对应一个日志，方便于采集数据对应 + 注：请扫码录入单个棒！一个棒对应一个日志，方便于采集数据对应 注：请输入单个棒的料！一个棒的料对应一个日志，方便于自动排号 + 请扫码录入单个板段，一个板段对应一个日志，方便于采集数据对应 Date: Mon, 23 Jun 2025 16:43:09 +0800 Subject: [PATCH 03/52] =?UTF-8?q?fix:=E7=BC=96=E8=BE=91=E6=9F=A5=E7=9C=8B?= =?UTF-8?q?=E4=BA=A4=E6=8E=A5=E8=AE=B0=E5=BD=95=E6=97=B6=E4=BA=BA=E5=91=98?= =?UTF-8?q?=E6=98=BE=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 | 36 ++++++++++++++---------------- 1 file changed, 17 insertions(+), 19 deletions(-) diff --git a/src/views/wpm_bx/handover_form.vue b/src/views/wpm_bx/handover_form.vue index faf791d8..e4aab573 100644 --- a/src/views/wpm_bx/handover_form.vue +++ b/src/views/wpm_bx/handover_form.vue @@ -698,25 +698,23 @@ export default { let that = this; this.totalCount = data.count?data.count:data.handoverb.count; Object.assign(this.form, data); - if(data.type==30){ - this.getUserList3(); - }else{ - this.$API.system.user.list.req({ depts: data.recive_dept, page: 0 }).then((res) => { - that.userList2 = res; - }); - setTimeout(() => { - let arr =that.userList2.filter((item) => { - return item.id == data.recive_user - }) - if(arr.length>0){}else{ - let obj = {}; - obj.id = data.recive_user; - obj.name = data.recive_user_name; - that.userList2.push(obj); - } - },500) - - } + this.$API.system.user.list.req({ depts: data.send_dept, page: 0 }).then((res) => { + that.userList = res; + }); + this.$API.system.user.list.req({ depts: data.recive_dept, page: 0 }).then((res) => { + that.userList2 = res; + }); + setTimeout(() => { + let arr =that.userList2.filter((item) => { + return item.id == data.recive_user + }) + if(arr.length>0){}else{ + let obj = {}; + obj.id = data.recive_user; + obj.name = data.recive_user_name; + that.userList2.push(obj); + } + },500) if(data.new_batch!==''&&data.new_batch!==undefined&&data.new_batch!==null){ this.change_batch = true; } From 9fd9cf99837cd1b3cf8fdfa7b8501d36b0b87cd2 Mon Sep 17 00:00:00 2001 From: shijing Date: Mon, 23 Jun 2025 17:21:51 +0800 Subject: [PATCH 04/52] =?UTF-8?q?fix:=E8=BE=85=E6=96=99=E5=87=BA=E5=85=A5?= =?UTF-8?q?=E5=BA=93=E8=AE=B0=E5=BD=95=E6=92=A4=E5=9B=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/inm/helpso_mio.vue | 45 +++++++++++++++++++++++++----------- 1 file changed, 31 insertions(+), 14 deletions(-) diff --git a/src/views/inm/helpso_mio.vue b/src/views/inm/helpso_mio.vue index 8f371074..1f8cb145 100644 --- a/src/views/inm/helpso_mio.vue +++ b/src/views/inm/helpso_mio.vue @@ -124,6 +124,15 @@ > 删除 + + 撤回 + @@ -216,20 +225,28 @@ export default { table_del(row) { this.$confirm(`确定删除吗？`, "提示", { type: "warning", - }) - .then(() => { - this.$API.inm.mio.delete - .req(row.id) - .then((res) => { - this.$message.success("删除成功"); - this.$refs.table.refresh(); - return res; - }) - .catch((err) => { - return err; - }); - }) - .catch(() => {}); + }).then(() => { + this.$API.inm.mio.delete.req(row.id).then((res) => { + this.$message.success("删除成功"); + this.$refs.table.refresh(); + return res; + }).catch((err) => { + return err; + }); + }).catch(() => {}); + }, + table_revert(row){ + this.$confirm(`确定撤回吗？`, "提示", { + type: "warning", + }).then(() => { + this.$API.inm.mio.revert.req(row.id).then((res) => { + this.$message.success("撤回成功"); + this.$refs.table.refresh(); + return res; + }).catch((err) => { + return err; + }); + }).catch(() => {}); }, table_submit(row) { this.$API.inm.mio.submit.req(row.id).then((res) => { From 75c8a19fb3b62affb06c9a6bb4b21a0012741542 Mon Sep 17 00:00:00 2001 From: shijing Date: Tue, 24 Jun 2025 09:20:29 +0800 Subject: [PATCH 05/52] =?UTF-8?q?fix:=E7=8E=BB=E7=BA=A4=E6=89=B9=E6=AC=A1?= =?UTF-8?q?=E6=89=93=E5=8D=B0=E6=A8=A1=E6=9D=BF=E6=B7=BB=E5=8A=A0=E5=8E=9F?= =?UTF-8?q?=E5=A7=8B=E7=89=A9=E6=96=99?= 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 5e4e4476..cb1baca6 100644 --- a/src/views/wpm_bx/inmIn.vue +++ b/src/views/wpm_bx/inmIn.vue @@ -505,9 +505,10 @@ export default { }) }else{ if(that.route_code=='paiyicibang'){ + params.extra_data={orimaterial:row.material_ofrom_name}; params.label_template_name = '排一次棒打印模板'; }else{ - params.extra_data={count:row.count}; + params.extra_data={orimaterial:row.material_ofrom_name,count:row.count}; params.label_template_name = '其他工序打印模板'; } that.apiObjPrint.req(params).then((res) => { diff --git a/src/views/wpm_bx/inmOut.vue b/src/views/wpm_bx/inmOut.vue index d7fb7f30..d1b70a58 100644 --- a/src/views/wpm_bx/inmOut.vue +++ b/src/views/wpm_bx/inmOut.vue @@ -507,9 +507,10 @@ export default { }) }else{ if(that.route_code=='paiyicibang'){ + params.extra_data={orimaterial:row.material_ofrom_name}; params.label_template_name = '排一次棒打印模板'; }else{ - params.extra_data={count:row.count}; + params.extra_data={orimaterial:row.material_ofrom_name,count:row.count}; params.label_template_name = '其他工序打印模板'; } that.apiObjPrint.req(params).then((res) => { From f9b3f0c269b3e4346a2cb81a1cb1c90ee880085a Mon Sep 17 00:00:00 2001 From: shijing Date: Tue, 24 Jun 2025 14:20:07 +0800 Subject: [PATCH 06/52] =?UTF-8?q?fix:=E5=B7=A5=E5=BA=8F=E4=B8=8D=E5=90=88?= =?UTF-8?q?=E6=A0=BC=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../statistics/process_statistics_gx.vue | 652 ++++++++++++++++++ 1 file changed, 652 insertions(+) create mode 100644 src/views/statistics/process_statistics_gx.vue diff --git a/src/views/statistics/process_statistics_gx.vue b/src/views/statistics/process_statistics_gx.vue new file mode 100644 index 00000000..38f5b5ab --- /dev/null +++ b/src/views/statistics/process_statistics_gx.vue @@ -0,0 +1,652 @@ + + + + From 0093661dd0fbe08172bfbf361db1da8262ea248d Mon Sep 17 00:00:00 2001 From: shijing Date: Tue, 24 Jun 2025 14:20:31 +0800 Subject: [PATCH 07/52] =?UTF-8?q?fix:=E8=A1=A8=E5=A4=B4=E9=A2=9C=E8=89=B2?= =?UTF-8?q?=E9=87=8D=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/App.vue | 30 ++++++++++++++++++++++++++---- 1 file changed, 26 insertions(+), 4 deletions(-) diff --git a/src/App.vue b/src/App.vue index 6f7dbbd7..642d8171 100644 --- a/src/App.vue +++ b/src/App.vue @@ -162,17 +162,39 @@ export default { padding: 0 20px 20px; } + +// .el-table thead.is-group th.el-table__cell.colorheader1{ +// background-color: rgb(255, 243, 202)!important; +// } +// .el-table thead.is-group th.el-table__cell.colorheader2{ +// background-color: rgb(227, 242, 217)!important; +// } +// .el-table thead.is-group th.el-table__cell.colorheader3{ +// background-color: rgb(250, 218, 222)!important; +// } +// .el-table thead.is-group th.el-table__cell.colorheader4{ +// background-color: rgb(168, 218, 228)!important; +// } .el-table thead.is-group th.el-table__cell.colorheader1{ - background-color: rgb(255, 243, 202)!important; + background-color: rgba(246, 98, 98, 0.323)!important; } .el-table thead.is-group th.el-table__cell.colorheader2{ - background-color: rgb(227, 242, 217)!important; + background-color: rgba(250, 130, 11, 0.325)!important; } .el-table thead.is-group th.el-table__cell.colorheader3{ - background-color: rgb(250, 218, 222)!important; + background-color: rgba(247, 235, 9, 0.311)!important; } .el-table thead.is-group th.el-table__cell.colorheader4{ - background-color: rgb(168, 218, 228)!important; + background-color: rgba(30, 252, 10, 0.202)!important; +} +.el-table thead.is-group th.el-table__cell.colorheader5{ + background-color: rgba(11, 251, 231, 0.326)!important; +} +.el-table thead.is-group th.el-table__cell.colorheader6{ + background-color: rgba(12, 85, 255, 0.326)!important; +} +.el-table thead.is-group th.el-table__cell.colorheader7{ + background-color: rgba(51, 15, 253, 0.317)!important; } // 排放系统 From 0d532cccb919e61b46fcaf3e363e954675e0e2c5 Mon Sep 17 00:00:00 2001 From: shijing Date: Tue, 24 Jun 2025 14:21:05 +0800 Subject: [PATCH 08/52] =?UTF-8?q?fix:=E5=85=89=E8=8A=AF=E8=BE=85=E6=96=99?= =?UTF-8?q?=E8=A1=A8=E5=A4=B4=E5=8F=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/inm/helpso.vue | 63 ++++++++++++++++++++++++++++++++++++---- 1 file changed, 58 insertions(+), 5 deletions(-) diff --git a/src/views/inm/helpso.vue b/src/views/inm/helpso.vue index 85cc2972..5fc82454 100644 --- a/src/views/inm/helpso.vue +++ b/src/views/inm/helpso.vue @@ -38,6 +38,63 @@ row-key="id" stripe :params="params" + v-if="project_code=='gx'" + > + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -57,11 +114,6 @@ - Date: Tue, 24 Jun 2025 14:25:07 +0800 Subject: [PATCH 09/52] =?UTF-8?q?fix:=E5=87=BA=E5=85=A5=E5=BA=93=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E8=A1=A8=E5=8D=95=E9=A2=86=E6=96=99=E6=97=B6=EF=BC=8C?= =?UTF-8?q?=E4=BB=93=E5=BA=93=E4=B8=8D=E5=8F=AF=E9=80=89=EF=BC=8C=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E8=BE=85=E6=96=99=E8=AF=A6=E6=83=85=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/inm/mioitem_form.vue | 9 +++++---- src/views/inm/mioitemlist.vue | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/views/inm/mioitem_form.vue b/src/views/inm/mioitem_form.vue index 5f938f52..9faf5db2 100644 --- a/src/views/inm/mioitem_form.vue +++ b/src/views/inm/mioitem_form.vue @@ -108,7 +108,7 @@ v-model="form.warehouse" clearable style="width: 100%" - :disabled="warehouseDisable" + :disabled="form.type == 'do_out'||form.type=='sale_out'" > Date: Wed, 25 Jun 2025 10:44:06 +0800 Subject: [PATCH 10/52] =?UTF-8?q?fix:=E6=A3=92=E7=AE=A1=E7=BB=BC=E5=90=88?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E7=9B=B8=E5=85=B3=E6=94=B9=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/statistics/statistics_bang.vue | 50 +++++- src/views/statistics/statistics_guan.vue | 204 ++++++++++++++-------- src/views/statistics/stock_statistics.vue | 22 +-- 3 files changed, 173 insertions(+), 103 deletions(-) diff --git a/src/views/statistics/statistics_bang.vue b/src/views/statistics/statistics_bang.vue index 8eecf8de..11215941 100644 --- a/src/views/statistics/statistics_bang.vue +++ b/src/views/statistics/statistics_bang.vue @@ -138,7 +138,7 @@ @@ -320,6 +320,11 @@ {{ scope.row.data.六车间_抛光_count_use }} + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + @@ -405,6 +407,21 @@ export default { }); }).catch(() => {}); }, + //撤回并删除 + check_revert(row){ + let that = this; + that.$confirm(`该记录已提交，确定撤回吗？`, "提示", { + type: "warning", + }).then(() => { + console.log('确定删除'); + that.$API.inm.mioitem.revertDel.req(row.id).then((res) => { + that.$message.success("撤回成功"); + that.$refs.table.refresh(); + }).catch((err) => { + return err; + }); + }).catch(() => {}); + }, //检验 table_check(row) { this.mioitemId = row.id; From 254beea5f89e6b6edc469cca1f56b99484cfc66e Mon Sep 17 00:00:00 2001 From: shijing Date: Fri, 27 Jun 2025 14:53:07 +0800 Subject: [PATCH 21/52] =?UTF-8?q?fix:=E5=85=89=E8=8A=AF=E6=A3=80=E9=AA=8C?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E6=A0=B9=E6=8D=AE=E8=A6=81=E6=B1=82=E6=94=B9?= =?UTF-8?q?=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/statistics/good_check_gx.vue | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/src/views/statistics/good_check_gx.vue b/src/views/statistics/good_check_gx.vue index d466f1fd..6b81493a 100644 --- a/src/views/statistics/good_check_gx.vue +++ b/src/views/statistics/good_check_gx.vue @@ -85,9 +85,9 @@ - + @@ -153,9 +153,9 @@ - + @@ -237,8 +237,14 @@ + + + + + + - + + - + - - + + @@ -239,7 +238,7 @@ - - + + @@ -271,14 +270,14 @@ - + - - + + @@ -315,14 +314,14 @@ - + - - + + @@ -359,7 +358,7 @@ - + @@ -379,7 +378,7 @@ - - + + @@ -423,7 +422,7 @@ - + @@ -462,7 +461,7 @@ - + From 7986a9793df1c6f4747590ddb0ebc49a154d9819 Mon Sep 17 00:00:00 2001 From: shijing Date: Fri, 27 Jun 2025 17:17:38 +0800 Subject: [PATCH 23/52] =?UTF-8?q?fix:=E6=9B=B4=E6=8D=A2=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/statistics/wpr_statistics.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/statistics/wpr_statistics.vue b/src/views/statistics/wpr_statistics.vue index c160ab1d..2eb6b32c 100644 --- a/src/views/statistics/wpr_statistics.vue +++ b/src/views/statistics/wpr_statistics.vue @@ -246,7 +246,7 @@ export default { item_mio__w_mioitem__number:'', }, params_mlog:{ - b_mlog__w_mlogb__number:'', + cnumber:'', }, params_handover:{ b_handover__w_handoverb__number:'', @@ -289,7 +289,7 @@ export default { that.wprItem.number = row.number; } that.params_mio.item_mio__w_mioitem__number = row.number; - that.params_mlog.b_mlog__w_mlogb__number = row.number; + that.params_mlog.cnumber = row.number; that.params_handover.b_handover__w_handoverb__number = row.number; that.apiObj_mlog = that.$API.wpm.mlog.list; that.apiObj_handover = that.$API.wpm.handover.list; From 0b263f076b69d874ef6ea540cf574caaff3b057e Mon Sep 17 00:00:00 2001 From: shijing Date: Mon, 30 Jun 2025 17:00:11 +0800 Subject: [PATCH 24/52] =?UTF-8?q?fix:=E6=89=B9=E6=AC=A1=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/statistics/batch_statistics.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/views/statistics/batch_statistics.vue b/src/views/statistics/batch_statistics.vue index 6680d21b..03b9b871 100644 --- a/src/views/statistics/batch_statistics.vue +++ b/src/views/statistics/batch_statistics.vue @@ -163,6 +163,7 @@ 返工 报废 改版 + 退料 From bace29ba45602b9f54690a3f1a84f6d8c3f99546 Mon Sep 17 00:00:00 2001 From: shijing Date: Tue, 1 Jul 2025 15:06:46 +0800 Subject: [PATCH 25/52] =?UTF-8?q?fix:=E5=85=89=E8=8A=AF=E5=A4=A7=E5=B1=8F?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AE=9A=E6=97=B6=E6=9B=B4=E6=96=B0=EF=BC=88?= =?UTF-8?q?5=E5=88=86=E9=92=9F=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/bigScreen/index_gx.vue | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/views/bigScreen/index_gx.vue b/src/views/bigScreen/index_gx.vue index 5ed56cb2..491e9de3 100644 --- a/src/views/bigScreen/index_gx.vue +++ b/src/views/bigScreen/index_gx.vue @@ -524,6 +524,7 @@ export default { lineWidth:0, pieHeight:0, lineHeight:0, + setIntervals:null, }; }, mounted() { @@ -604,12 +605,19 @@ export default { that.getMaterials(); that.getMgroup(); that.getTaskNumber(); - that.addListener(); that.getArticles(); that.getpurinrate(); that.initFactory(); that.addListener(); }) + that.setIntervals = setInterval(function () { + that.getCountnotok(); + that.getMaterials(); + that.getMgroup(); + that.getTaskNumber(); + that.getArticles(); + that.getpurinrate(); + }, 300000); }, //获取公告和视频 getArticles(){ @@ -998,16 +1006,20 @@ export default { this.scene = null; clearInterval(that.timerTime); clearInterval(that.scrollInterval); + clearInterval(that.setIntervals); that.timerTime = null; that.scrollInterval = null; + that.setIntervals = null; }, beforeDestoryed() { let that = this; this.scene = null; clearInterval(that.timerTime); clearInterval(that.scrollInterval); + clearInterval(that.setIntervals); that.timerTime = null; that.scrollInterval = null; + that.setIntervals = null; }, }; From 1d234fefe5284ab6891cdcebd288a650a15f24fa Mon Sep 17 00:00:00 2001 From: shijing Date: Tue, 1 Jul 2025 15:08:48 +0800 Subject: [PATCH 26/52] =?UTF-8?q?fix:=E8=B4=A8=E6=A3=80=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/statistics/good_check_gx.vue | 18 +- src/views/statistics/good_check_gx2.vue | 622 ++++++++++++++++++++++++ 2 files changed, 631 insertions(+), 9 deletions(-) create mode 100644 src/views/statistics/good_check_gx2.vue diff --git a/src/views/statistics/good_check_gx.vue b/src/views/statistics/good_check_gx.vue index 6b81493a..7d53af0d 100644 --- a/src/views/statistics/good_check_gx.vue +++ b/src/views/statistics/good_check_gx.vue @@ -85,9 +85,9 @@ - + @@ -153,9 +153,9 @@ - + @@ -244,7 +244,7 @@ - - + + - + - + @@ -210,12 +204,12 @@ export default { }) .then(async () => { if (that.handleTitle === "撤回工单") { - res = that.$API.wf.ticket.ticketRetreat.req( + res = await that.$API.wf.ticket.ticketRetreat.req( that.ticketId, that.handleForm ); } else { - res = that.$API.wf.ticket.ticketClose.req( + res = await that.$API.wf.ticket.ticketClose.req( that.ticketId, that.handleForm ); From 22bdea774ae7f1e02dbaef86d729fdc678beba8b Mon Sep 17 00:00:00 2001 From: shijing Date: Tue, 1 Jul 2025 15:21:20 +0800 Subject: [PATCH 28/52] =?UTF-8?q?fix:=E5=85=89=E8=8A=AF=E8=BE=85=E6=96=99?= =?UTF-8?q?=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/inm/helpso.vue | 6 +- src/views/inm/helpso_mioitem.vue | 398 +++++++++++++++++++++++++++++++ src/views/inm/materials.vue | 247 +++++++++++++++++++ src/views/inm/mioitem.vue | 2 +- 4 files changed, 649 insertions(+), 4 deletions(-) create mode 100644 src/views/inm/helpso_mioitem.vue create mode 100644 src/views/inm/materials.vue diff --git a/src/views/inm/helpso.vue b/src/views/inm/helpso.vue index 5fc82454..564b9419 100644 --- a/src/views/inm/helpso.vue +++ b/src/views/inm/helpso.vue @@ -1,7 +1,7 @@ + diff --git a/src/views/inm/materials.vue b/src/views/inm/materials.vue new file mode 100644 index 00000000..73eaf947 --- /dev/null +++ b/src/views/inm/materials.vue @@ -0,0 +1,247 @@ + + + diff --git a/src/views/inm/mioitem.vue b/src/views/inm/mioitem.vue index 482ffa35..cf595d8d 100644 --- a/src/views/inm/mioitem.vue +++ b/src/views/inm/mioitem.vue @@ -211,7 +211,7 @@ type="danger" @click="check_revert(scope.row)" v-if="mioObj.state == 20&&(mioObj.type=='do_out'||mioObj.type=='other_in'||mioObj.type=='pur_in')" - v-auth="'mioitem.update'" + v-auth="'mio.update'" > 撤回 From bb806e4fb408e5a2af729eb454a914b67f40bd4b Mon Sep 17 00:00:00 2001 From: shijing Date: Tue, 1 Jul 2025 15:23:06 +0800 Subject: [PATCH 29/52] =?UTF-8?q?fix:=E5=85=89=E8=8A=AF=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E5=8F=AF=E9=80=89=E6=8B=A9=E5=B7=A5=E8=89=BA=E6=AD=A5=E9=AA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wpm_gx/f_mlogs_form.vue | 130 ++++++++++++++++++++---------- src/views/wpm_gx/fmlog_detail.vue | 8 +- src/views/wpm_gx/mlog_detail.vue | 13 ++- src/views/wpm_gx/mlog_form.vue | 3 +- src/views/wpm_gx/mlogb_form.vue | 117 ++++++++++++++++----------- src/views/wpm_gx/mlogs.vue | 50 ++++++------ 6 files changed, 201 insertions(+), 120 deletions(-) diff --git a/src/views/wpm_gx/f_mlogs_form.vue b/src/views/wpm_gx/f_mlogs_form.vue index c87f9ce0..81d9263d 100644 --- a/src/views/wpm_gx/f_mlogs_form.vue +++ b/src/views/wpm_gx/f_mlogs_form.vue @@ -17,6 +17,27 @@ style="padding: 0" > + + + + + [{{ item.routepack_name }}]{{ item.name }} + + + + { + // that.routeOptions = res; + // }); + // }, + changeRoute(){ + let that = this; + that.routeOptions.forEach(item=>{ + if(item.id==that.form.route){ + console.log('item',item) + that.getdefects(item.id,item.material_in,item.material_out); + } + }) + }, getTeam() { let that = this; let form = {}; @@ -475,9 +511,11 @@ export default { that.getUserList(); }); }, - getdefects(){ + getdefects(route,material_in,material_out){ let that = this; - if(that.is_fix){ + console.log('getdefects') + if(that.is_fix&&that.materialFix!==null&&that.materialFix!==''){ + console.log('that.materialFix',that.materialFix) that.$API.qm.qct.getQct.req({material: that.materialFix,tag:'process'}).then((res) => { res.qct_defects.forEach((item) => { that.defectform[item.defect_name] = 0; @@ -494,37 +532,42 @@ export default { } }) }else{ - that.$API.qm.qct.getQct.req({material: that.material_in,tag:'process'}).then((res) => { - res.qct_defects.forEach((item) => { - that.defectinform[item.defect_name] = 0; - }) - that.qct_indefects=res.qct_defects; - if(that.mlogindefect.length>0){ - that.qct_indefects.forEach(item => { - that.mlogindefect.forEach(item2=>{ - if(item.defect==item2.defect){ - that.defectinform[item.defect_name] = item2.count; - } - }) + console.log('route',route) + if(route!==null){ + console.log('material_in',material_in) + console.log('material_out',material_out) + that.$API.qm.qct.getQct.req({material:material_in,tag:'process'}).then((res) => { + res.qct_defects.forEach((item) => { + that.defectinform[item.defect_name] = 0; }) - } - }) - //material_out - that.$API.qm.qct.getQct.req({material: that.material_out,tag:'process'}).then((res) => { - res.qct_defects.forEach((item) => { - that.defectform[item.defect_name] = 0; - }) - that.qct_defects=res.qct_defects; - if(that.mlogdefect.length>0){ - that.qct_defects.forEach(item => { - that.mlogdefect.forEach(item2=>{ - if(item.defect==item2.defect){ - that.defectform[item.defect_name] = item2.count; - } + that.qct_indefects=res.qct_defects; + if(that.mlogindefect.length>0){ + that.qct_indefects.forEach(item => { + that.mlogindefect.forEach(item2=>{ + if(item.defect==item2.defect){ + that.defectinform[item.defect_name] = item2.count; + } + }) }) + } + }) + //material_out + that.$API.qm.qct.getQct.req({material:material_out,tag:'process'}).then((res) => { + res.qct_defects.forEach((item) => { + that.defectform[item.defect_name] = 0; }) - } - }) + that.qct_defects=res.qct_defects; + if(that.mlogdefect.length>0){ + that.qct_defects.forEach(item => { + that.mlogdefect.forEach(item2=>{ + if(item.defect==item2.defect){ + that.defectform[item.defect_name] = item2.count; + } + }) + }) + } + }) + } } }, getEquipment() { @@ -542,18 +585,23 @@ export default { getRoute() { let that = this; if(!that.is_fix){//正常生产 - that.$API.mtm.route.item.req(that.route).then(res=>{ - that.material_in = res.material_in; - that.material_out = that.form.material_out = res.material_out; - if(that.mlogId){ - that.getMlogObj(); - }else{ - that.getdefects(); - } - - }); + if(that.route==null){ + that.$API.mtm.route.list.req({ process: that.process, page: 0, routepack__state: 30 }).then((res) => { + that.routeOptions = res; + }); + }else{ + that.$API.mtm.route.item.req(that.route).then(res=>{ + that.material_in = res.material_in; + that.material_out = that.form.material_out = res.material_out; + }); + } + if(that.mlogId){ + that.getMlogObj(); + } }else{ - // that.getdefects(); + that.$API.mtm.route.list.req({ process: that.process, page: 0, routepack__state: 30 }).then((res) => { + that.routeOptions = res; + }); } }, //获取工段人员 diff --git a/src/views/wpm_gx/fmlog_detail.vue b/src/views/wpm_gx/fmlog_detail.vue index c80029da..b0880946 100644 --- a/src/views/wpm_gx/fmlog_detail.vue +++ b/src/views/wpm_gx/fmlog_detail.vue @@ -11,7 +11,7 @@ 打印 - {{ + {{ fmlogItem.route_name }} {{ @@ -29,8 +29,7 @@ v-if="fmlogItem.submit_time == null" icon="el-icon-plus" @click="table_add" - >新增 + >新增 打印 - {{ - mlogItem.routepack_name - }} + + 返工 + {{mlogItem.material_in_name}}-> + {{mlogItem.material_out_name}} + {{ mlogItem.material_in_name }} @@ -344,6 +346,8 @@ :mgroupName = "mgroupName" :codeText = "codeText" :materialIn="materialIn" + :process = "process" + :hasRoute = "hasRoute" @success="handleSaveSuccess" @closed="dialog.save = false" > @@ -603,6 +607,9 @@ export default { let that = this; that.$API.wpm.mlog.item.req(that.mlogId).then((res) => { that.mlogItem = res; + if(res.route!==null){ + this.hasRoute = true; + } that.mgroupName = res.mgroup_name; if(res.test_file!==null){ that.fileList = [{name:res.test_file,url:res.test_file}]; diff --git a/src/views/wpm_gx/mlog_form.vue b/src/views/wpm_gx/mlog_form.vue index 7bd1c45a..4c13d8b0 100644 --- a/src/views/wpm_gx/mlog_form.vue +++ b/src/views/wpm_gx/mlog_form.vue @@ -57,7 +57,7 @@ - + + [{{ item.routepack_name }}]{{ item.name }} diff --git a/src/views/wpm_gx/mlogb_form.vue b/src/views/wpm_gx/mlogb_form.vue index 8e5cec68..5219d286 100644 --- a/src/views/wpm_gx/mlogb_form.vue +++ b/src/views/wpm_gx/mlogb_form.vue @@ -16,6 +16,28 @@ label-width="100px" > + + + + + [{{ item.routepack_name }}]{{ item.name }} + + + + {{ scope.row.defect_name }} - + + - @@ -100,7 +96,8 @@