From 93bd5784309145cd20cd9e2641c0753c5db4eae8 Mon Sep 17 00:00:00 2001
From: vince <757871790@qq.com>
Date: 星期三, 28 六月 2023 15:20:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
igds-web/src/main/resources/static/admin/inout/in-weight.js | 37 +++++++++++++++++++++++++++++++++++--
1 files changed, 35 insertions(+), 2 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 50fc731..df5b067 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
@@ -145,11 +145,9 @@
alertError("鍚庡彴璋冪敤鎴浘澶辫触锛岃閲嶆柊灏濊瘯");
}
});
- console.log(recordData.progress, "绌鸿溅绉伴噸")
//濡傛灉鏄浜屾绉伴噸锛岄粯璁ゆ墽琛岃嚜鍔ㄨ绠�
if (InoutProgress.WEIGHT_EMPTY == recordData.progress) {
deAutoByIn("emptyWeight");
- console.log("绌鸿溅绉伴噸")
}
}
@@ -546,6 +544,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