From d587e1a8b1564906ea7257f1df171359c5bfb7a0 Mon Sep 17 00:00:00 2001 From: yangk Date: Fri, 26 Jun 2026 10:41:44 +0800 Subject: [PATCH] =?UTF-8?q?style(asset):=20=E4=BC=98=E5=8C=96=E7=9B=98?= =?UTF-8?q?=E7=82=B9=E7=BB=93=E6=9E=9C=E9=A1=B5=E9=9D=A2=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E5=92=8C=E5=93=8D=E5=BA=94=E5=BC=8F=E5=B8=83=E5=B1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 添加完整的CSS样式定义，包括页面高度、滚动条和表单布局 - 重构应盘明细表格为固定头部可滚动表格，提升大数据量显示体验 - 实现盘盈录入表单的网格布局，支持响应式断点适配 - 调整资产编码单元格样式，支持长文本换行显示 - 优化模态框尺寸计算逻辑，根据视口大小动态调整宽高 - 简化盘点确认提示信息，提升用户体验 --- .../templates/asset/task/result.html | 178 ++++++++++++++---- .../resources/templates/asset/task/task.html | 14 +- 2 files changed, 152 insertions(+), 40 deletions(-) diff --git a/ruoyi-asset/src/main/resources/templates/asset/task/result.html b/ruoyi-asset/src/main/resources/templates/asset/task/result.html index 4f5d573..9a5d3a1 100644 --- a/ruoyi-asset/src/main/resources/templates/asset/task/result.html +++ b/ruoyi-asset/src/main/resources/templates/asset/task/result.html @@ -2,12 +2,122 @@ + -
-
+
+ -
+
@@ -29,8 +139,8 @@

应盘明细结果

-
- +
+
@@ -45,7 +155,7 @@ - @@ -88,42 +198,36 @@

盘盈明细

- -
-
- -
-
-
-
-
- -
-
- -
+
+ + + + + +
-
-
-
新增盘盈
+
+ + 新增盘盈
-
-
资产编码
+
+
+
diff --git a/ruoyi-asset/src/main/resources/templates/asset/task/task.html b/ruoyi-asset/src/main/resources/templates/asset/task/task.html index d2ca349..ecc1dc8 100644 --- a/ruoyi-asset/src/main/resources/templates/asset/task/task.html +++ b/ruoyi-asset/src/main/resources/templates/asset/task/task.html @@ -187,16 +187,24 @@ } function openResult(taskId) { + var viewportWidth = $(top.window).width(); + var viewportHeight = $(top.window).height(); + var modalWidth = Math.min(1200, Math.max(860, viewportWidth - 120)); + var modalHeight = Math.min(720, Math.max(460, viewportHeight - 96)); $.modal.openOptions({ title: "录入盘点结果", url: prefix + "/result/" + taskId, - width: "1200", - height: "720" + width: modalWidth, + height: modalHeight, + callBack: function(index, layero) { + var iframeWindow = layero.find("iframe")[0].contentWindow; + iframeWindow.submitHandler(index, layero); + } }); } function confirmTask(taskId) { - $.modal.confirm("确认后只完成盘点任务，不会自动调整资产台账，也不会写资产履历，是否继续？", function() { + $.modal.confirm("确认完成盘点任务，是否继续？", function() { $.operate.post(prefix + "/confirm/" + taskId, {}); }); }
类型