From d9557dfa7a1622e1bab2bc80ba72c43b9487e5d0 Mon Sep 17 00:00:00 2001 From: shijing Date: Thu, 18 Dec 2025 13:58:08 +0800 Subject: [PATCH 01/11] =?UTF-8?q?fix:=E7=A6=85=E9=81=93245?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/bigScreen/index_photon.vue | 47 +++++++++++----------------- 1 file changed, 18 insertions(+), 29 deletions(-) diff --git a/src/views/bigScreen/index_photon.vue b/src/views/bigScreen/index_photon.vue index cc6a3e25..7eceb216 100644 --- a/src/views/bigScreen/index_photon.vue +++ b/src/views/bigScreen/index_photon.vue @@ -966,41 +966,30 @@ export default { }, getMaterialList() { let that = this; - this.$API.mtm.material.list - .req({ page: 0, type: 20, count__gte: 1 }) - .then((res) => { - let data = []; - if (res.length > 0) { - res.forEach((item) => { + let obj = { + query: { + "select_dept": "", + "groupby_dept": "", + "material_types": "20", + "select_material": "material.name as material_name", + "groupby_material": "material.name", + "select_material_name": "", + "groupby_material_name": "" + } + }; + that.$API.bi.dataset.exec.req("materialCount", obj).then((res) => { + let data = []; + let list = res.data2.ds0; + if (list.length > 0) { + list.forEach((item) => { let arr = []; - let colorText = ""; - if ( - item.count_safe !== null && - item.count_safe < item.count - ) { - colorText = - '' + - item.count + - ""; - } else { - colorText = - '' + - item.count + - ""; - } - arr[0] = - item.name + - "|" + - item.specification + - "|" + - item.model; + arr[0] = item.material_name ; arr[1] = item.count; data.push(arr); }); } that.taskBoard.data = data; - // console.log('getMaterialList', data) - }); + }) }, showTime() { this.currentTime = this.$TOOL.dateFormat(new Date(), "hh:mm:ss"); From 49173d00286efbb37bee8cca20e2eeb210e6a364 Mon Sep 17 00:00:00 2001 From: shijing Date: Thu, 18 Dec 2025 15:27:50 +0800 Subject: [PATCH 02/11] =?UTF-8?q?fix:=E5=96=B7=E7=A0=81=E5=88=86=E6=89=B9?= =?UTF-8?q?=E6=97=B6=E5=BD=95=E5=85=A5=E6=9D=BF=E6=AE=B5=E5=8F=B7=E4=B8=8D?= =?UTF-8?q?=E6=98=AF=E8=AF=A5=E6=89=B9=E6=AC=A1=E7=9A=84=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E5=B9=B6=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wpm_bx/handover_form2.vue | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/src/views/wpm_bx/handover_form2.vue b/src/views/wpm_bx/handover_form2.vue index d6d2c92b..ca2cd6cf 100644 --- a/src/views/wpm_bx/handover_form2.vue +++ b/src/views/wpm_bx/handover_form2.vue @@ -59,6 +59,9 @@ {{ item2.number }} +
+ {{ item3 }} +
@@ -229,8 +232,11 @@ export default { }) //如果arrs里有不是这个批次的wpr,提示错误 let diff = arrs.filter(item => !barchArrs.includes(item)); + that.diff = diff; + console.log('diff',diff) if(diff.length>0){ - that.$confirm("物料"+diff.join(",")+"不在该批次中", "提示", {type: "warning",}).then(() => {}); + that.$message.warning("物料"+diff.join(",")+"不在该批次中"); + // that.$confirm("物料"+diff.join(",")+"不在该批次中", "提示", {type: "warning",}).then(() => {}); } }else{ //放入对应的行中的handoverb中，并且在列表中disabled @@ -251,7 +257,8 @@ export default { } }) } - this.$refs.codeInput.focus(); + console.log('this.$refs.codeInput',this.$refs.codeInput) + this.$refs.codeInput[index].focus(); }, deleteWpr(index1,index2,wpr){ let that = this; @@ -356,6 +363,10 @@ export default { margin-right: 20px; margin-top: 5px; } +.disabledItem{ + color: #fff; + background: #f56c6c; +} .circleCloseFilled{ position: absolute; top: -7px; From 434cf4bfda391f16988f67227ddadf7cde2550df Mon Sep 17 00:00:00 2001 From: shijing Date: Thu, 18 Dec 2025 15:32:15 +0800 Subject: [PATCH 03/11] =?UTF-8?q?fix:=E7=A6=85=E9=81=93249?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/statistics/statistics_bang.vue | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/views/statistics/statistics_bang.vue b/src/views/statistics/statistics_bang.vue index 13eb26db..03faef88 100644 --- a/src/views/statistics/statistics_bang.vue +++ b/src/views/statistics/statistics_bang.vue @@ -509,7 +509,8 @@ @@ -519,17 +520,17 @@ From 18c1320a165e84d72284a802f5a2bd84f062e5b0 Mon Sep 17 00:00:00 2001 From: shijing Date: Fri, 19 Dec 2025 08:40:34 +0800 Subject: [PATCH 04/11] =?UTF-8?q?fix:mioitem=5Fcheck=E7=89=A9=E6=96=99?= =?UTF-8?q?=E7=BC=96=E5=8F=B7=E5=B7=A6=E5=9B=BA=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/inm/mioitem_check.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/inm/mioitem_check.vue b/src/views/inm/mioitem_check.vue index 38db64f5..20fa0bde 100644 --- a/src/views/inm/mioitem_check.vue +++ b/src/views/inm/mioitem_check.vue @@ -816,8 +816,8 @@ - - + + + + + @@ -671,6 +721,14 @@ export default { count_qt = data.管料退火_count_notok - count; return count_qt; } + }else if(type=='工前检验'){ + if(data.六车间_工前检验_count_notok){ + if (data.六车间_工前检验_count_n_dl !== undefined) { + count += data.六车间_工前检验_count_n_dl ; + } + count_qt = data.六车间_工前检验_count_notok - count; + return count_qt; + } }else if(type=='开槽'){ if(data.六车间_开槽_count_notok){ if (data.六车间_开槽_count_n_dl !== undefined) { From 981e87d386069275d108f7bbcb63de75fd921972 Mon Sep 17 00:00:00 2001 From: shijing Date: Fri, 19 Dec 2025 09:30:35 +0800 Subject: [PATCH 06/11] =?UTF-8?q?fix:=E7=A6=85=E9=81=93224?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/statistics/bxerp/zhongjian1.vue | 78 +++++++++++------------ 1 file changed, 39 insertions(+), 39 deletions(-) diff --git a/src/views/statistics/bxerp/zhongjian1.vue b/src/views/statistics/bxerp/zhongjian1.vue index 2a29e3d9..d9aa9810 100644 --- a/src/views/statistics/bxerp/zhongjian1.vue +++ b/src/views/statistics/bxerp/zhongjian1.vue @@ -43,6 +43,21 @@ + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - + - + + + + + + + + + + @@ -128,6 +123,11 @@ {{ scope.row.data.中检一_缺陷项_掉皮?scope.row.data.中检一_缺陷项_掉皮:0 }} + + + @@ -307,6 +307,10 @@ export default { handleSaveSuccess() { this.$refs.table.refresh(); }, + closedFun(){ + this.visibleDrawer = false; + this.$refs.table.refresh(); + }, }, }; From 53e2d487bf10273eb70a6147606049d9088d70bd Mon Sep 17 00:00:00 2001 From: shijing Date: Fri, 19 Dec 2025 11:03:37 +0800 Subject: [PATCH 08/11] =?UTF-8?q?fix:=E6=8E=92=E6=89=B3=E5=8A=A0=E5=B7=A5?= =?UTF-8?q?=E7=8E=87=EF=BC=8C=E5=90=88=E6=A0=BC=E7=8E=87=E7=BA=A0=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/statistics/bxerp/defect.vue | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/views/statistics/bxerp/defect.vue b/src/views/statistics/bxerp/defect.vue index 1f7d1459..433b7545 100644 --- a/src/views/statistics/bxerp/defect.vue +++ b/src/views/statistics/bxerp/defect.vue @@ -53,7 +53,7 @@ {{((scope.row.剪切合格/scope.row.总切片数)*100).toFixed(2) }}% - + - + + @@ -87,7 +88,6 @@