From 2495e9ab75e6c45af1d6e14414711d8cc79fe2ca Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期二, 30 五月 2023 16:13:13 +0800
Subject: [PATCH] 出入库优化-登记2
---
igds-web/src/main/resources/static/admin/inout/in-register.js | 91 ++++++++++-----------------------------------
1 files changed, 20 insertions(+), 71 deletions(-)
diff --git a/igds-web/src/main/resources/static/admin/inout/in-register.js b/igds-web/src/main/resources/static/admin/inout/in-register.js
index db6dead..b33dec3 100644
--- a/igds-web/src/main/resources/static/admin/inout/in-register.js
+++ b/igds-web/src/main/resources/static/admin/inout/in-register.js
@@ -78,9 +78,7 @@
layer.close(index);
var data = json.content;
if (data === "not found") {
- layer.alert("娌℃湁鑾峰彇鍒拌韩浠借瘉淇℃伅锛�", {
- offset: ['300px', '300px']
- });
+ alertError("娌℃湁鑾峰彇鍒拌韩浠借瘉淇℃伅锛�");
return;
}
// 涓存椂璧嬪��
@@ -100,16 +98,15 @@
}
},
error: function () {
- layer.alert("韬唤璇佽鍙栧け璐ワ紒", {
- offset: ['300px', '300px']
- });
layer.close(index);
+ alertError("韬唤璇佽鍙栧け璐ワ紒");
}
});
}
//浣跨敤鎻掍欢璇诲彇鏅烘収鍗″彿
function flushICCard() {
+ var index = layer.load();
$("#intelCard").val(null);
$.ajax({
type: "GET",
@@ -120,23 +117,25 @@
jsonp: "callback",
jsonpCallback: "jsonpCallback",
success: function (json) {
+ layer.close(index);
//console.log(json);
var data = json.no;
//console.log(data);
if (data === "not found") {
- layer.alert("璇烽噸鏂拌鍗★紒", {offset: ['300px', '300px']});
+ alertError("璇烽噸鏂拌鍗★紒");
} else {
$("#intelCard").val(data);
}
},
error: function () {
- layer.alert("IC鍗¤鍙栧嚭閿欙紒", {offset: ['300px', '300px']});
+ layer.close(index);
+ alertError("IC鍗¤鍙栧嚭閿欙紒");
}
});
}
//璇诲彇杞︾墝鍙�
-function flushPlateNum() {
+function getPlateNum() {
var index = layer.load();
$.ajax({
type: "POST",
@@ -146,26 +145,16 @@
data: JSON.stringify(lprDto),
success: function (result) {
if (result.code != "0000") {
- layer.alert(result.msg, {
- offset: ['300px', '300px']
- });
+ alertError(result.msg);
} else {
- if (result.data.errorMsg) {
- layer.alert(result.data.errorMsg, {
- offset: ['300px', '300px']
- });
- } else {
- $("#plateNum").val(result.data.plateNum);
- $("#plateNum2").val(result.data.plateNum);
- }
+ $("#plateNum").val(result.data.plateNum);
+ $("#plateNum2").val(result.data.plateNum);
}
layer.close(index);
},
error: function () {
layer.close(index);
- layer.alert("杞︾墝璇嗗埆澶辫触锛�", {
- offset: ['300px', '300px']
- });
+ alertError("杞︾墝璇嗗埆澶辫触锛�");
}
});
}
@@ -183,15 +172,15 @@
function submit() {
var data = form.val("form-data");
if (!data.userName) {
- notify("鎵胯繍浜轰俊鎭笉鑳戒负绌�", null);
+ alertError("鎵胯繍浜轰俊鎭笉鑳戒负绌�");
return;
}
if (!data.plateNum) {
- notify("杞︾墝鍙蜂笉鑳戒负绌�", null);
+ alertError("杞︾墝鍙蜂笉鑳戒负绌�");
return;
}
if (!data.userId) {
- notify("韬唤璇佸彿涓嶈兘涓虹┖", null);
+ alertError("韬唤璇佸彿涓嶈兘涓虹┖");
return;
}
@@ -214,14 +203,12 @@
data: JSON.stringify(snapData),
success: function (result) {
if (result.code != "0000") {
- layer.alert(result.msg);
+ alertError(result.msg);
submitData(data);
} else {
snapData = result.data;
-
$("#pz-img").addClass("kccz-r-img-red");
$("#pz-text").text("宸叉媿鐓�");
-
submitData(data);
}
},
@@ -235,66 +222,28 @@
//鎵ц淇濆瓨鏁版嵁
function submitData(data) {
var index = layer.load();
-
var files = [{
fileName: snapData.fileName1
}];
data.files = files;
-
$.ajax({
type: "POST",
- url: "../../basic/inout/inout-next-step",
+ url: "../../basic/inout/submit-register",
dataType: "json",
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);
+ notifyProgress(result.msg, result.data);
} else {
- notify("鏁版嵁鎻愪氦鎴愬姛", result.data);
- // 閲嶇疆椤甸潰
+ notifyProgress("鏁版嵁鎻愪氦鎴愬姛", result.data);
resetForm();
}
},
error: function () {
layer.close(index);
- layer.alert("鎻愪氦澶辫触锛岃閲嶆柊灏濊瘯锛侊紒");
+ 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