From d320b9ae40b3dfc1942ea484c8893ba1404c73ec Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期三, 21 六月 2023 23:36:19 +0800
Subject: [PATCH] 调整卡回收页面操作逻辑
---
igds-web/src/main/resources/static/admin/inout/in-card-back.js | 99 +++++++------------------------------------------
1 files changed, 15 insertions(+), 84 deletions(-)
diff --git a/igds-web/src/main/resources/static/admin/inout/in-card-back.js b/igds-web/src/main/resources/static/admin/inout/in-card-back.js
index 16cba9e..2eca8e8 100644
--- a/igds-web/src/main/resources/static/admin/inout/in-card-back.js
+++ b/igds-web/src/main/resources/static/admin/inout/in-card-back.js
@@ -16,36 +16,10 @@
showProgress();
});
-//鎺у埗娴佺▼鐜妭鏄剧ず
-function showProgress() {
- if(!inoutProgress){
- return;
- }
-
- if(inoutProgress.indexOf("REGISTER") == -1){
- $("#progress-register").css("display", "none");
- }
- if(inoutProgress.indexOf("CHECK") == -1){
- $("#progress-check").css("display", "none");
- }
- if(inoutProgress.indexOf("WEIGHT_FULL") == -1){
- $("#progress-fullWeight").css("display", "none");
- }
- if(inoutProgress.indexOf("HANDLE") == -1){
- $("#progress-hand").css("display", "none");
- }
- if(inoutProgress.indexOf("WEIGHT_EMPTY") == -1){
- $("#progress-emptyWeight").css("display", "none");
- }
- if(inoutProgress.indexOf("CARD_BACK") == -1){
- $("#progress-cardBack").css("display", "none");
- }
-}
-
-//鏂扮殑璇诲崱鏂瑰紡
+//浣跨敤鎻掍欢璇诲彇鏅烘収鍗″彿
function flushICCard() {
+ var index = layer.load();
$("#intelCard").val(null);
- resetForm();
$.ajax({
type: "GET",
async: true,
@@ -55,23 +29,26 @@
jsonp: "callback",
jsonpCallback: "jsonpCallback",
success: function (json) {
- //console.log(json);
+ layer.close(index);
var data = json.no;
- //console.log(data);
if (data === "not found") {
- layer.alert("璇烽噸鏂拌鍗★紒", {offset: ['300px', '300px']});
+ alertError("璇烽噸鏂拌鍗★紒");
} else {
$("#intelCard").val(data);
+
+ //鐩存帴鍒锋柊鏁版嵁
flushData();
}
},
error: function () {
- layer.alert("IC鍗¤鍙栧嚭閿欙紒", {offset: ['300px', '300px']});
+ layer.close(index);
+ alertError("IC鍗¤鍙栧嚭閿欙紒");
}
});
}
-// 浣跨敤鎻掍欢鑾峰彇鐪佷唤璇�
+
+//浣跨敤鎻掍欢璇诲彇韬唤璇�
function flushIdCard() {
var index = layer.load();
$.ajax({
@@ -86,64 +63,17 @@
layer.close(index);
var data = json.content;
if (data === "not found") {
- layer.alert("娌℃湁璇诲彇鍒拌韩浠借瘉淇℃伅锛岃鎵嬪姩褰曞叆锛�", {
- offset: ['300px', '300px']
- });
+ alertError("娌℃湁鑾峰彇鍒拌韩浠借瘉淇℃伅锛�");
return;
}
$("#userId").val(data.idNum);
flushData();
},
error: function () {
- layer.alert("韬唤璇佽鍙栧け璐ワ紝璇锋墜鍔ㄥ綍鍏ワ紒", {
- offset: ['300px', '300px']
- });
layer.close(index);
+ alertError("韬唤璇佽鍙栧け璐ワ紒");
}
});
-}
-
-// 鎵撳嵃杩囩鍗�
-function printBill() {
- if (!recordData) {
- layer.alert("娌℃湁鑾峰彇鍒颁笟鍔℃暟鎹紝涓嶆敮鎸佹墦鍗帮紒");
- return;
- }
-
- if(InoutProgress.CARD_BACK != recordData.progress){
- layer.alert("褰撳墠鏁版嵁涓嶅畬鏁达紝涓嶆敮鎸佹墦鍗帮紒");
- return;
- }
-
- //浠庡悗鍙拌幏鍙栨ā鐗堝苟鎵撳嵃
- var index = layer.load();
- $.ajax({
- type : "POST",
- url : "../../basic/inout-report/inout-bill-weight",
- dataType : "json",
- contentType : "application/json;charset=UTF-8",
- data : JSON.stringify(recordData),
- success : function(result) {
- if (result.code != "0000") {
- layer.msg(result.msg);
- } else {
- layer.msg("寮�濮嬫覆鏌撴墦鍗板崟鈥︹��");
- printWeight(result.data);
- }
- layer.close(index);
- },
- error : function() {
- layer.close(index);
- layer.msg("鑾峰彇鎵撳嵃妯＄増澶辫触锛岃鑱旂郴绠＄悊鍛樻煡鐪嬪師鍥狅紒锛�");
- }
- });
-}
-
-// 鎵撳嵃鎶芥牱鍗�
-function showCheck() {
- if (null == recordData) {
- layer.alert("娌℃湁鑾峰彇鍒颁笟鍔℃暟鎹紝鏃犳硶鏌ョ湅锛�");
- }
}
// 琛ㄥ崟娓呯┖
@@ -162,6 +92,7 @@
var plateNum = $("#plateNum").val();
var userId2 = $("#userId").val();
var intelCard = $("#intelCard").val();
+
var param = {
type : type,
progress : progress,
@@ -190,7 +121,7 @@
},
error : function() {
layer.close(index);
- layer.alert("鏌ヨ澶辫触锛岃閲嶆柊灏濊瘯锛侊紒");
+ alertError("鏌ヨ澶辫触锛岃閲嶆柊灏濊瘯锛�")
}
});
}
@@ -198,7 +129,7 @@
// 褰撳墠瀹屾垚
function submit() {
if (!recordData) {
- layer.alert("娌℃湁鏁版嵁鍙互鎻愪氦锛侊紒锛�");
+ alertError("娌℃湁鏁版嵁鍙互鎻愪氦锛�");
return;
}
--
Gitblit v1.9.3