From 7cd05f5a0b9215b25b99663428381ac172a196c6 Mon Sep 17 00:00:00 2001 From: FCD <2453864257@qq.com> Date: Wed, 2 Jul 2025 14:20:29 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E6=97=A5=E6=8A=A5?= =?UTF-8?q?=E8=A1=A8=E5=B7=A5=E5=8D=95=E5=8F=B7=E8=B0=83=E6=95=B4=E4=B8=BA?= =?UTF-8?q?"1"=E5=BC=80=E5=A4=B4=E7=9A=84=E7=BC=96=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/mes/dailyReportNew/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/mes/dailyReportNew/index.vue b/src/views/mes/dailyReportNew/index.vue index 3a749d5..363580a 100644 --- a/src/views/mes/dailyReportNew/index.vue +++ b/src/views/mes/dailyReportNew/index.vue @@ -93,7 +93,7 @@ - + From a1c9ae38b1a004601f7ff006a3accbdf6269c3fb Mon Sep 17 00:00:00 2001 From: FCD <2453864257@qq.com> Date: Wed, 2 Jul 2025 14:25:21 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E6=88=90=E5=93=81=E4=BA=A7=E9=87=8F?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=BC=98=E5=8C=96=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/mes/production/index.vue | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/src/views/mes/production/index.vue b/src/views/mes/production/index.vue index 8ea5433..3e35da7 100644 --- a/src/views/mes/production/index.vue +++ b/src/views/mes/production/index.vue @@ -19,24 +19,17 @@ clearable /> - + - + - - - @@ -87,7 +80,9 @@ - + + @@ -250,6 +245,9 @@ export default { const { columns, data } = param; const sums = []; columns.forEach((column, index) => { + if (column.label === "工厂编码"){ + return; + } if (index === 0) { sums[index] = '合计'; return; From e92549a72b13dd39ae284806c87b31685e5ddd91 Mon Sep 17 00:00:00 2001 From: FCD <2453864257@qq.com> Date: Wed, 2 Jul 2025 14:27:54 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E8=AE=A1=E7=AE=97=E5=BD=93=E5=89=8D?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=9C=80=E5=A4=A7=E8=A1=A8=E6=A0=BC=E9=AB=98?= =?UTF-8?q?=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/useTableMaxHeight.js | 43 ++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 src/utils/useTableMaxHeight.js diff --git a/src/utils/useTableMaxHeight.js b/src/utils/useTableMaxHeight.js new file mode 100644 index 0000000..a6537a1 --- /dev/null +++ b/src/utils/useTableMaxHeight.js @@ -0,0 +1,43 @@ +export default { + data() { + return { + tableHeight: 100 + } + }, + methods: { + calculateHeight() { + let conditionHeight = 0 + if (this.pageHeaderRef && this.pageHeaderRef.offsetHeight) { + conditionHeight = this.pageHeaderRef.offsetHeight + } + + + const remainingHeight = window.innerHeight - this.fixedHeight - conditionHeight + this.tableHeight = Math.max(remainingHeight, this.minHeight) + } + }, + mounted() { + this.$nextTick(() => { + this.calculateHeight() + window.addEventListener('resize', this.calculateHeight) + }); + + }, + beforeDestroy() { + window.removeEventListener('resize', this.calculateHeight) + }, + props: { + pageHeaderRef: { + type: HTMLElement, + default: null + }, + fixedHeight: { + type: Number, + default: 200 + }, + minHeight: { + type: Number, + default: 350 + } + } +} From 7235aa8ff6ab09fe8d844bb0152433126664b814 Mon Sep 17 00:00:00 2001 From: FCD <2453864257@qq.com> Date: Wed, 2 Jul 2025 14:33:47 +0800 Subject: [PATCH 4/7] =?UTF-8?q?sap=E5=BA=93=E5=AD=98=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=8A=BD=E5=8F=96=E6=97=B6=E9=97=B4=E3=80=81?= =?UTF-8?q?=E7=89=A9=E6=96=99=E7=BB=84=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wms/matetowsnsap/index.vue | 33 ++++++++++++++++++++++++---- 1 file changed, 29 insertions(+), 4 deletions(-) diff --git a/src/views/wms/matetowsnsap/index.vue b/src/views/wms/matetowsnsap/index.vue index 29d6060..2c50247 100644 --- a/src/views/wms/matetowsnsap/index.vue +++ b/src/views/wms/matetowsnsap/index.vue @@ -1,5 +1,6 @@ - + @@ -122,6 +134,11 @@ lgort + + + @@ -144,8 +161,8 @@ - Date: Wed, 2 Jul 2025 14:39:26 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E5=8C=85=E6=9D=90=E5=88=B0=E8=B4=A7?= =?UTF-8?q?=E5=8D=95=E6=96=B0=E5=A2=9E=E5=8D=95=E6=8D=AE=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E3=80=81=E6=94=B6=E8=B4=A7=E6=97=B6=E9=97=B4=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wms/odsRawOrderIn/index.vue | 56 +++++++++++++++++++++------ 1 file changed, 44 insertions(+), 12 deletions(-) diff --git a/src/views/wms/odsRawOrderIn/index.vue b/src/views/wms/odsRawOrderIn/index.vue index 132489c..02b2bc4 100644 --- a/src/views/wms/odsRawOrderIn/index.vue +++ b/src/views/wms/odsRawOrderIn/index.vue @@ -1,6 +1,7 @@