From dbbd8b7066092b3ce4eab44fa0e2b746dad16a95 Mon Sep 17 00:00:00 2001
From: vince <757871790@qq.com>
Date: 星期五, 07 七月 2023 19:15:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
igds-web/src/main/resources/static/admin/inout/out-register.js | 61 +++++++++++++++++++-----------
1 files changed, 39 insertions(+), 22 deletions(-)
diff --git a/igds-web/src/main/resources/static/admin/inout/out-register.js b/igds-web/src/main/resources/static/admin/inout/out-register.js
index f356f99..c47ef6f 100644
--- a/igds-web/src/main/resources/static/admin/inout/out-register.js
+++ b/igds-web/src/main/resources/static/admin/inout/out-register.js
@@ -29,7 +29,7 @@
shadeClose: true,
shade: 0.3,
closeBtn: 2,
- offset: ['50px','50px'],
+ offset: ['50px', '50px'],
area: ['1000px', '640px'],
content: '../../basic/inout/inout-progress?type=' + type + "&t=" + Math.random()
});
@@ -101,9 +101,10 @@
layer.close(index);
var data = json.content;
if (data === "not found") {
- layer.alert("娌℃湁鑾峰彇鍒拌韩浠借瘉淇℃伅锛�", {
- offset: ['300px', '300px']
- });
+ // layer.alert("娌℃湁鑾峰彇鍒拌韩浠借瘉淇℃伅锛�", {
+ // offset: ['300px', '300px']
+ // });
+ alertError("娌℃湁鑾峰彇鍒拌韩浠借瘉淇℃伅锛�");
return;
}
// 涓存椂璧嬪��
@@ -165,32 +166,45 @@
var index = layer.load();
$.ajax({
type: "POST",
- url: "../../inout/api/flush-lpr",
+ url: "../../inout/api/get-plateNum",
dataType: "json",
contentType: "application/json;charset=UTF-8",
data: param,
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);
- }
+ $("#plateNum").val(result.data.plateNum);
+ $("#plateNum2").val(result.data.plateNum);
}
layer.close(index);
},
error: function () {
layer.close(index);
- layer.alert("杞︾墝璇嗗埆澶辫触锛�", {
- offset: ['300px', '300px']
- });
+ alertError("杞︾墝璇嗗埆澶辫触锛�");
}
+ // success: function (result) {
+ // if (result.code != "0000") {
+ // layer.alert(result.msg, {
+ // offset: ['300px', '300px']
+ // });
+ // } else {
+ // if (result.data.errorMsg) {
+ // layer.alert(result.data.errorMsg, {
+ // offset: ['300px', '300px']
+ // });
+ // } else {
+ // $("#plateNum").val(result.data.plateNum);
+ // }
+ // }
+ // layer.close(index);
+ // },
+ // error: function () {
+ // layer.close(index);
+ // layer.alert("杞︾墝璇嗗埆澶辫触锛�", {
+ // offset: ['300px', '300px']
+ // });
+ // }
});
}
@@ -239,15 +253,18 @@
function submit() {
var data = form.val("form-data");
if (!data.userName) {
- notify("鎵胯繍浜轰俊鎭笉鑳戒负绌�", null);
+ // notify("鎵胯繍浜轰俊鎭笉鑳戒负绌�", null);
+ alertError("鎵胯繍浜轰俊鎭笉鑳戒负绌�");
return;
}
if (!data.plateNum) {
- notify("杞︾墝鍙蜂笉鑳戒负绌�", null);
+ alertError("杞︾墝鍙蜂笉鑳戒负绌�");
+ // notify("杞︾墝鍙蜂笉鑳戒负绌�", null);
return;
}
if (!data.intelCard && !data.userId) {
- notify("鏅烘収鍗″彿涓庤韩浠借瘉鍙蜂笉鑳藉悓鏃朵负绌�", null);
+ alertError("鏅烘収鍗″彿涓庤韩浠借瘉鍙蜂笉鑳藉悓鏃朵负绌�");
+ // notify("鏅烘収鍗″彿涓庤韩浠借瘉鍙蜂笉鑳藉悓鏃朵负绌�", null);
return;
}
@@ -299,7 +316,7 @@
$.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),
--
Gitblit v1.9.3