From 651dfb24aa82ea28e6348907bc02dc8c84a6e13f Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期四, 29 六月 2023 19:33:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
igds-web/src/main/resources/static/admin/inout/in-handle.js | 46 ++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 42 insertions(+), 4 deletions(-)
diff --git a/igds-web/src/main/resources/static/admin/inout/in-handle.js b/igds-web/src/main/resources/static/admin/inout/in-handle.js
index 479ab57..1fd1bd7 100644
--- a/igds-web/src/main/resources/static/admin/inout/in-handle.js
+++ b/igds-web/src/main/resources/static/admin/inout/in-handle.js
@@ -201,6 +201,9 @@
// 琛ㄥ崟娓呯┖
function resetForm() {
$("#form-data")[0].reset();
+ $('#kccz-r-img1').removeAttr('src');
+ $('#kccz-r-img2').removeAttr('src');
+ $('#kccz-r-img3').removeAttr('src');
form.render();
recordData = null;
$("#text-param").val(null);
@@ -270,11 +273,11 @@
// 鑾峰彇鐓х墖
var files = [{
- fileName: snapData.fileName1
+ fileName: img1
}, {
- fileName: snapData.fileName2
+ fileName: img2
}, {
- fileName: snapData.fileName3
+ fileName: img3
}];
data.files = files;
@@ -286,16 +289,51 @@
contentType: "application/json;charset=UTF-8",
data: JSON.stringify(data),
success: function (result) {
+ layer.close(index);
if (result.code != "0000") {
notify(result.msg, result.data);
} else {
notify("鏁版嵁鎻愪氦鎴愬姛", result.data);
}
- layer.close(index);
},
error: function () {
layer.close(index);
alertError("鎻愪氦澶辫触锛岃閲嶆柊灏濊瘯");
}
});
+}
+
+/**
+ * 寮瑰嚭鎻愰啋妗�
+ * @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']});
+ }
}
\ No newline at end of file
--
Gitblit v1.9.3