From 08cea428e888b6fdd2a3c3783e87e4f828385783 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期四, 08 六月 2023 08:55:47 +0800
Subject: [PATCH] 出入库优化-提交优化
---
igds-web/src/main/resources/static/admin/inout/in-handle.js | 561 ++++++++++++++++++++++++++-----------------------------
1 files changed, 265 insertions(+), 296 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 530ee1e..342373c 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
@@ -1,327 +1,296 @@
-//鍊间粨
+//绉伴噸-鍖呮嫭绌鸿溅鍜屾弧杞︾О閲�
var layer;
var form;
var upload;
-var plateNum = null;
var recordData = null;// 涓氬姟鏁版嵁淇℃伅
+var paramIntelCard;//璁惧璇嗗埆缁撴灉
+var paramIdCard;//璁惧璇嗗埆缁撴灉
var img1, img2, img3;// 椤甸潰涓殑鍥剧墖涓婁紶鍚嶇О
-$(function() {
- layui.use([ 'layer', 'laydate', 'form', 'upload'], function() {
- upload = layui.upload;
- layer = layui.layer;
- form = layui.form;
+$(function () {
+ layui.use(['layer', 'laydate', 'form', 'upload'], function () {
+ upload = layui.upload;
+ layer = layui.layer;
+ form = layui.form;
- layui.laydate.render({
- elem : '#handleEnd',
- type : "datetime",
- theme : '#7b8e9f'
- });
- layui.laydate.render({
- elem : '#handleStart',
- type : "datetime",
- theme : '#7b8e9f'
- });
+ //涓婁紶
+ upload.render({
+ elem: '#kccz-r-btn1',
+ url: '../file/update-file', //涓婁紶鎺ュ彛
+ size: 4 * 1024, //闄愬埗鏂囦欢澶у皬锛屽崟浣岾B, 鏈�澶т笂浼�4MB
+ accept: 'images',
+ before: function (obj) {
+ var plateNum = $("#plateNum").val();
+ this.data = {"plateNum": plateNum, "type": "1"};//鎼哄甫鍙傛暟
+ //棰勮鏈湴鏂囦欢绀轰緥锛屼笉鏀寔ie8
+ obj.preview(function (index, file, result) {
+ $('#kccz-r-img1').attr('src', result); //鍥剧墖閾炬帴锛坆ase64锛�
+ });
+ },
+ done: function (res) {
+ //濡傛灉涓婁紶澶辫触
+ if (res.code > 0) {
+ layer.msg("鍥剧墖涓婁紶澶辫触锛�");
+ }
+ //涓婁紶鎴愬姛
+ img1 = res.msg;
+ layer.msg("鍥剧墖涓婁紶鎴愬姛锛�");
+ //console.log(img1);
+ }
+ });
+ upload.render({
+ elem: '#kccz-r-btn2',
+ url: '../file/update-file', //涓婁紶鎺ュ彛
+ size: 4 * 1024, //闄愬埗鏂囦欢澶у皬锛屽崟浣岾B, 鏈�澶т笂浼�4MB
+ accept: 'images',
+ before: function (obj) {
+ var plateNum = $("#plateNum").val();
+ this.data = {"plateNum": plateNum, "type": "1"};//鎼哄甫鍙傛暟
+ //棰勮鏈湴鏂囦欢绀轰緥锛屼笉鏀寔ie8
+ obj.preview(function (index, file, result) {
+ $('#kccz-r-img2').attr('src', result); //鍥剧墖閾炬帴锛坆ase64锛�
+ });
+ },
+ done: function (res) {
+ //濡傛灉涓婁紶澶辫触
+ if (res.code > 0) {
+ layer.msg("鍥剧墖涓婁紶澶辫触锛�");
+ }
+ //涓婁紶鎴愬姛
+ img2 = res.msg;
+ layer.msg("鍥剧墖涓婁紶鎴愬姛锛�");
+ // console.log(img2);
+ }
+ });
+ upload.render({
+ elem: '#kccz-r-btn3',
+ url: '../file/update-file', //涓婁紶鎺ュ彛
+ size: 4 * 1024, //闄愬埗鏂囦欢澶у皬锛屽崟浣岾B, 鏈�澶т笂浼�4MB
+ accept: 'images',
+ before: function (obj) {
+ var plateNum = $("#plateNum").val();
+ this.data = {"plateNum": plateNum}; //鎼哄甫鍙傛暟
+ //棰勮鏈湴鏂囦欢绀轰緥锛屼笉鏀寔ie8
+ obj.preview(function (index, file, result) {
+ $('#kccz-r-img3').attr('src', result); //鍥剧墖閾炬帴锛坆ase64锛�
+ });
+ },
+ done: function (res) {
+ //濡傛灉涓婁紶澶辫触
+ if (res.code > 0) {
+ layer.msg("鍥剧墖涓婁紶澶辫触锛�");
+ }
+ //涓婁紶鎴愬姛
+ img3 = res.msg;
+ layer.msg("鍥剧墖涓婁紶鎴愬姛锛�");
+ }
+ });
- //涓婁紶
- upload.render({
- elem: '#kccz-r-btn1',
- url: '../file/update-file', //涓婁紶鎺ュ彛
- size: 4*1024, //闄愬埗鏂囦欢澶у皬锛屽崟浣岾B, 鏈�澶т笂浼�4MB
- accept : 'images',
- before: function(obj){
- var plateNum = $("#plateNum").val();
- this.data={"plateNum":plateNum,"type":"1"};//鎼哄甫鍙傛暟
- //棰勮鏈湴鏂囦欢绀轰緥锛屼笉鏀寔ie8
- obj.preview(function(index, file, result){
- $('#kccz-r-img1').attr('src', result); //鍥剧墖閾炬帴锛坆ase64锛�
- });
- },
- done: function(res){
- //濡傛灉涓婁紶澶辫触
- if(res.code > 0){
- layer.msg("鍥剧墖涓婁紶澶辫触锛�");
- }
- //涓婁紶鎴愬姛
- img1 = res.msg;
- layer.msg("鍥剧墖涓婁紶鎴愬姛锛�");
- //console.log(img1);
- }
- });
- upload.render({
- elem: '#kccz-r-btn2',
- url: '../file/update-file', //涓婁紶鎺ュ彛
- size: 4*1024, //闄愬埗鏂囦欢澶у皬锛屽崟浣岾B, 鏈�澶т笂浼�4MB
- accept : 'images',
- before: function(obj){
- var plateNum = $("#plateNum").val();
- this.data={"plateNum":plateNum,"type":"1"};//鎼哄甫鍙傛暟
- //棰勮鏈湴鏂囦欢绀轰緥锛屼笉鏀寔ie8
- obj.preview(function(index, file, result){
- $('#kccz-r-img2').attr('src', result); //鍥剧墖閾炬帴锛坆ase64锛�
- });
- },
- done: function(res){
- //濡傛灉涓婁紶澶辫触
- if(res.code > 0){
- layer.msg("鍥剧墖涓婁紶澶辫触锛�");
- }
- //涓婁紶鎴愬姛
- img2 = res.msg;
- layer.msg("鍥剧墖涓婁紶鎴愬姛锛�");
- // console.log(img2);
- }
- });
- upload.render({
- elem: '#kccz-r-btn3',
- url: '../file/update-file', //涓婁紶鎺ュ彛
- size: 4*1024, //闄愬埗鏂囦欢澶у皬锛屽崟浣岾B, 鏈�澶т笂浼�4MB
- accept : 'images',
- before: function(obj){
- var plateNum = $("#plateNum").val();
- this.data={"plateNum":plateNum}; //鎼哄甫鍙傛暟
- //棰勮鏈湴鏂囦欢绀轰緥锛屼笉鏀寔ie8
- obj.preview(function(index, file, result){
- $('#kccz-r-img3').attr('src', result); //鍥剧墖閾炬帴锛坆ase64锛�
- });
- },
- done: function(res){
- //濡傛灉涓婁紶澶辫触
- if(res.code > 0){
- layer.msg("鍥剧墖涓婁紶澶辫触锛�");
- }
- //涓婁紶鎴愬姛
- img3 = res.msg;
- layer.msg("鍥剧墖涓婁紶鎴愬姛锛�");
- }
- });
- });
+ });
- showProgress();
-
- //璋冩暣瀛楁涓嶇紪杈�
- $("#depotId").attr("disabled",true);
- $("#foodVariety").attr("disabled",true);
- $("#foodLevel").attr("disabled",true);
+ //鏄剧ず娴佺▼鐜妭
+ 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() {
- $("#intelCard").val(null);
- resetForm();
- $.ajax({
- type: "GET",
- async: true,
- url: "http://127.0.0.1:9111/ICCARD",
- data: {},
- dataType: "jsonp",
- jsonp: "callback",
- jsonpCallback: "jsonpCallback",
- success: function (json) {
- //console.log(json);
- var data = json.no;
- //console.log(data);
- if (data === "not found") {
- layer.alert("璇烽噸鏂拌鍗★紒", {offset: ['300px', '300px']});
- } else {
- $("#intelCard").val(data);
- flushData();
- }
- },
- error: function () {
- layer.alert("IC鍗¤鍙栧嚭閿欙紒", {offset: ['300px', '300px']});
- }
- });
+ if (!cardDto.protocol) {
+ flushICCard1();
+ } else {
+ flushICCard2();
+ }
}
-// 浣跨敤鎻掍欢鑾峰彇鐪佷唤璇�
+/**
+ * 鍗忚璇诲彇鏅烘収鍗�
+ */
+function flushICCard2() {
+ var index = layer.load();
+ var param = JSON.stringify(cardDto);
+ $.ajax({
+ type: "POST",
+ url: "../../inout/api/get-icCard",
+ dataType: "json",
+ contentType: "application/json;charset=UTF-8",
+ data: param,
+ success: function (result) {
+ layer.close(index);
+ if (result.code != "0000") {
+ alertError(result.msg);
+ } else {
+ paramIntelCard = data;
+ $("#text-param").text("璇嗗埆鍗″彿锛�" + paramIntelCard);
+ flushData(paramIntelCard, null);
+ }
+ },
+ error: function () {
+ layer.close(index);
+ alertError("IC鍗¤鍙栧け璐�");
+ }
+ });
+}
+
+/**
+ * 鏈湴璇诲彇鏅烘収鍗�
+ */
+function flushICCard1() {
+ var index = layer.load();
+ $("#text-param").val(null);
+ $("#form-data")[0].reset();
+ form.render();
+ recordData = null;
+ $.ajax({
+ type: "GET",
+ async: true,
+ url: "http://127.0.0.1:9111/ICCARD",
+ data: {},
+ dataType: "jsonp",
+ jsonp: "callback",
+ jsonpCallback: "jsonpCallback",
+ success: function (json) {
+ var data = json.no;
+ layer.close(index);
+ if (data === "not found") {
+ alertError("璇烽噸鏂拌鍗★紒");
+ } else {
+ paramIntelCard = data;
+ $("#text-param").text("璇嗗埆鍗″彿锛�" + paramIntelCard);
+ flushData(paramIntelCard, null);
+ }
+ },
+ error: function () {
+ layer.close(index);
+ alertError("IC鍗¤鍙栧嚭閿欙紒");
+ }
+ });
+}
+
+// 浣跨敤鎻掍欢鑾峰彇韬唤璇�
function flushIdCard() {
- var index = layer.load();
- $.ajax({
- type: "GET",
- async: true,
- url: "http://127.0.0.1:9111/IDCARD",
- data: {},
- dataType: "jsonp",
- jsonp: "callback",
- jsonpCallback: "jsonpCallback",
- success: function (json) {
- layer.close(index);
- var data = json.content;
- if (data === "not found") {
- layer.alert("娌℃湁璇诲彇鍒拌韩浠借瘉淇℃伅锛岃鎵嬪姩褰曞叆锛�", {
- offset: ['300px', '300px']
- });
- return;
- }
- $("#userId").val(data.idNum);
- flushData();
- },
- error: function () {
- layer.alert("韬唤璇佽鍙栧け璐ワ紝璇锋墜鍔ㄥ綍鍏ワ紒", {
- offset: ['300px', '300px']
- });
- layer.close(index);
- }
- });
+ var index = layer.load();
+ $.ajax({
+ type: "GET",
+ async: true,
+ url: "http://127.0.0.1:9111/IDCARD",
+ data: {},
+ dataType: "jsonp",
+ jsonp: "callback",
+ jsonpCallback: "jsonpCallback",
+ success: function (json) {
+ layer.close(index);
+ var data = json.content;
+ if (data === "not found") {
+ alertError("娌℃湁璇诲彇鍒拌韩浠借瘉淇℃伅锛�");
+ return;
+ }
+ paramIdCard = data;
+ $("#text-param").text("璇嗗埆韬唤璇侊細" + paramIdCard);
+ flushData(null, paramIdCard);
+ },
+ error: function () {
+ alertError("娌℃湁璇诲彇鍒拌韩浠借瘉淇℃伅锛�");
+ layer.close(index);
+ }
+ });
}
-// 鎵撳嵃鎶芥牱鍗�
-function printBill() {
- layer.alert("鎵撳嵃鏍煎紡寰呭畾涔夆�︹��");
+function flushByHand() {
+ flushData(null, null);
}
// 琛ㄥ崟娓呯┖
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;
+ $("#form-data")[0].reset();
+ form.render();
+ recordData = null;
+ $("#text-param").val(null);
}
-// 鏇存柊鏁版嵁淇℃伅
-function flushData() {
- var userId2 = $("#userId").val();
- var plateNum = $("#plateNum").val();
- var intelCard = $("#intelCard").val();
- var param = {
- type : type,
- progress : progress,
- userId:userId2,
- intelCard:intelCard,
- plateNum : plateNum
- };
- var index = layer.load();
- $.ajax({
- type : "POST",
- url : "../../basic/inout/inout-query",
- dataType : "json",
- contentType : "application/json;charset=UTF-8",
- data : JSON.stringify(param),
- success : function(result) {
- layer.close(index);
- if (result.code != "0000") {
- notify(result.msg,result.data);
- } else {
- recordData = result.data;
- // 杩斿洖鐨勬暟鎹繘琛岃祴鍊�
- form.val("form-data", recordData);
- form.render();
- }
- },
- error : function() {
- layer.close(index);
- layer.alert("鏌ヨ澶辫触锛岃閲嶆柊灏濊瘯锛侊紒");
- }
- });
+function flushPage() {
+ layer.confirm('纭畾瑕佸埛鏂伴〉闈㈠悧锛�', {icon: 3, title: '鎻愮ず'}, function (index) {
+ resetForm();
+ layer.close(index);
+ });
+}
+
+// --鏌ヨ鏂规硶,鑾峰彇韬唤璇佸彿銆佸崱鍙枫�佽溅鐗屽彿锛岃繘琛屾煡璇�
+function flushData(intelCard, userIdCard) {
+ var index = layer.load();
+ var userIdCard = userIdCard;
+ var intelCard = intelCard;
+ var plateNum = $("#plateNum").val();
+ var param = {
+ type: type,
+ progress: progress,
+ intelCard: intelCard,
+ userId: userIdCard,
+ plateNum: plateNum
+ };
+ $.ajax({
+ type: "POST",
+ url: "../../basic/inout/inout-query",
+ dataType: "json",
+ contentType: "application/json;charset=UTF-8",
+ data: JSON.stringify(param),
+ success: function (result) {
+ layer.close(index);
+ if (result.code != "0000") {
+ notifyProgress(result.msg, result.data);
+ } else {
+ recordData = result.data;
+ // 杩斿洖鐨勬暟鎹繘琛岃祴鍊�
+ form.val("form-data", recordData);
+ form.render();
+ }
+ },
+ error: function () {
+ layer.close(index);
+ alertError("鏌ヨ澶辫触锛岃閲嶆柊灏濊瘯");
+ }
+ });
}
// 褰撳墠瀹屾垚
function submit() {
- if (null == recordData) {
- layer.alert("娌℃湁鏁版嵁鍙互鎻愪氦锛侊紒锛�");
- return;
- }
- var index = layer.load();
- var data = form.val("form-data");
+ if (!recordData) {
+ alertError("娌℃湁涓氬姟鏁版嵁淇℃伅锛屾墽琛岃鎷掔粷");
+ return;
+ }
+ var data = form.val("form-data");
- // 鍚堝苟鏇存柊鐣跺墠缂栬緫鏁版嵁
- Object.assign(recordData, data);
+ if (!data.handleUser) {
+ alertError("鎻愮ず锛氬�间粨浜轰笉鍙负绌�");
+ return;
+ }
- // 鑾峰彇鍥剧墖鍚嶇О
- recordData.files = [{
- fileName: img1
- }, {
- fileName: img2
- }, {
- fileName: img3
- }];
+ // 鑾峰彇鐓х墖
+ var files = [{
+ fileName: snapData.fileName1
+ }, {
+ fileName: snapData.fileName2
+ }, {
+ fileName: snapData.fileName3
+ }];
+ data.files = files;
- console.log(recordData);
-
- $.ajax({
- type : "POST",
- url : "../../basic/inout/inout-next-step",
- dataType : "json",
- contentType : "application/json;charset=UTF-8",
- data : JSON.stringify(recordData),
- success : function(result) {
- if (result.code != "0000") {
- notify(result.msg,result.data);
- } else {
- notify("鍊间粨瀹屾垚",result.data);
- // 閲嶇疆椤甸潰
- resetForm();
- }
- layer.close(index);
- },
- error : function() {
- layer.close(index);
- layer.alert("鎻愪氦澶辫触锛岃閲嶆柊灏濊瘯锛侊紒");
- }
- });
-}
-
-/**
- * 寮瑰嚭鎻愰啋妗�
- * @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']});
- }
+ var index = layer.load();
+ $.ajax({
+ type: "POST",
+ url: "../../basic/inout/submit-handle",
+ dataType: "json",
+ contentType: "application/json;charset=UTF-8",
+ data: JSON.stringify(data),
+ success: function (result) {
+ if (result.code != "0000") {
+ notify(result.msg, result.data);
+ } else {
+ notify("鏁版嵁鎻愪氦鎴愬姛", result.data);
+ }
+ layer.close(index);
+ },
+ error: function () {
+ layer.close(index);
+ alertError("鎻愪氦澶辫触锛岃閲嶆柊灏濊瘯");
+ }
+ });
}
\ No newline at end of file
--
Gitblit v1.9.3