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-weight.js | 42 +++++++++++++++++++++++++++++++++++++++---
1 files changed, 39 insertions(+), 3 deletions(-)
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 3f8b20e..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
@@ -115,6 +115,7 @@
deptId: deptId,
progress: recordData.progress,
bizType: bizType,
+ bizId: recordData.id,
plateNum: recordData.plateNum,
id1: snapDto1.id,
id2: snapDto2.id,
@@ -145,7 +146,6 @@
alertError("鍚庡彴璋冪敤鎴浘澶辫触锛岃閲嶆柊灏濊瘯");
}
});
-
//濡傛灉鏄浜屾绉伴噸锛岄粯璁ゆ墽琛岃嚜鍔ㄨ绠�
if (InoutProgress.WEIGHT_EMPTY == recordData.progress) {
deAutoByIn("emptyWeight");
@@ -255,7 +255,8 @@
}
function flushByHand() {
- flushData(null, null);
+ var intelCard = $("#intelCard").val();
+ flushData(intelCard, null);
}
function flushWeight() {
@@ -492,7 +493,7 @@
//鏄剧ず璐ㄦ淇℃伅
function showCheck() {
- if(!recordData){
+ if (!recordData) {
alertError("娌℃湁涓氬姟鏁版嵁淇℃伅锛屾墽琛岃鎷掔粷");
return;
}
@@ -545,6 +546,41 @@
}
/**
+ * 寮瑰嚭鎻愰啋妗�
+ * @param msg 鎻愰啋淇℃伅
+ * @param data 鏁版嵁淇℃伅锛屽彲鑳戒负绌�
+ */
+function notify(msg, data) {
+ if (data) {
+ //璧嬪��
+ $("#resultMsg").text(msg);
+ $("#resultUserName").text(data.userName);
+ $("#resultPlateNum").text(data.plateNum);
+ if ("IN" == data.type) {
+ $("#resultType").text("鍏ュ簱-" + INOUT_PROGRESS_MSG(data.progress));
+ } else {
+ $("#resultType").text("鍑哄簱-" + INOUT_PROGRESS_MSG(data.progress));
+ }
+ $("#resultIntelCard").text(data.intelCard);
+
+ layer.open({
+ type: 1,
+ offset: ['150px', '200px'],
+ area: '450px;',
+ shade: 0.8,
+ id: 'dialog_notify_info',
+ btn: ['纭畾'],
+ content: $('#dialog-from-notify'),
+ yes: function (index) {
+ layer.closeAll();
+ }
+ });
+ } else {
+ layer.alert(msg, {offset: ['300px', '300px']});
+ }
+}
+
+/**
* 娓叉煋琛ㄦ牸
*/
function renderTableCheckItem() {
--
Gitblit v1.9.3