-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
+
-
-
+
+
| 类型 |
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, {});
});
}