From e4a102acbd91e300497572404866f2a5f16571ab Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期日, 29 十月 2023 20:49:33 +0800
Subject: [PATCH] 化验项展示不全问题修改
---
igds-web/src/main/resources/static/admin/inout/in-check.js | 3 ++-
igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager.java | 5 ++++-
igds-web/src/main/resources/static/admin/inout/in-weight.js | 3 ++-
3 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager.java b/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager.java
index 7b88614..e4a9896 100644
--- a/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager.java
+++ b/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager.java
@@ -256,7 +256,9 @@
}
if (InoutConstant.PROGRESS_CHECK.equals(data.getProgress())) {
- data.setCheckUser(ContextUtil.getLoginUserCName());
+ if (StringUtils.isEmpty(data.getCheckUser())) {
+ data.setCheckUser(ContextUtil.getLoginUserCName());
+ }
data.setProgress(nextProgress);
return data;
}
@@ -875,6 +877,7 @@
curData.setCheckTime(new Date());
data.setCheckTime(new Date());
}
+ curData.setCheckUser(data.getCheckUser());
curData.setCheckStatus(data.getCheckStatus());
curData.setFoodYear(data.getFoodYear());
diff --git a/igds-web/src/main/resources/static/admin/inout/in-check.js b/igds-web/src/main/resources/static/admin/inout/in-check.js
index bbc1403..da2f1d2 100644
--- a/igds-web/src/main/resources/static/admin/inout/in-check.js
+++ b/igds-web/src/main/resources/static/admin/inout/in-check.js
@@ -362,7 +362,8 @@
title: '澶囨敞璇存槑',
align: 'center',
edit: 'text'
- }]]
+ }]],
+ limit: this.curCheckItems.length //鏄剧ず鐨勬暟閲�
});
$("thead tr").css({
diff --git a/igds-web/src/main/resources/static/admin/inout/in-weight.js b/igds-web/src/main/resources/static/admin/inout/in-weight.js
index 93b01f3..ef6d28e 100644
--- a/igds-web/src/main/resources/static/admin/inout/in-weight.js
+++ b/igds-web/src/main/resources/static/admin/inout/in-weight.js
@@ -255,7 +255,8 @@
}
function flushByHand() {
- flushData(null, null);
+ var intelCard = $("#intelCard").val();
+ flushData(intelCard, null);
}
function flushWeight() {
--
Gitblit v1.9.3