From 381cfbd6632bf952f3615deedbd158a33bfe2f62 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 13 三月 2021 08:51:53 +0800
Subject: [PATCH] #
---
src/main/webapp/views/pda/stockIn.html | 68 ++++++++--------
src/main/webapp/views/pda/stockOut.html | 56 +++++++------
src/main/webapp/views/pda/comb.html | 70 +++++++++--------
3 files changed, 100 insertions(+), 94 deletions(-)
diff --git a/src/main/webapp/views/pda/comb.html b/src/main/webapp/views/pda/comb.html
index 64fb14f..fc91698 100644
--- a/src/main/webapp/views/pda/comb.html
+++ b/src/main/webapp/views/pda/comb.html
@@ -199,41 +199,43 @@
// 缁勬墭
function comb() {
- var zpallet = $('#code').val();
- if (isEmpty(zpallet)) {
- tips("鎵樼洏鏉＄爜涓虹┖", true);
- // document.getElementById("code").focus();
- return;
- }
- // if (zpallet.length !== 7) {
- // tips("鏉＄爜蹇呴』涓�7浣�", true);
- // return;
- // }
- if (matData.length === 0) {
- tips("璇锋彁鍙栫墿鏂�", true);
- return;
- }
- $.ajax({
- url: baseUrl+"/mobile/comb/auth",
- headers: {'token': localStorage.getItem('token')},
- data: JSON.stringify({
- zpallet: zpallet,
- combMats: matData
- }),
- contentType:'application/json;charset=UTF-8',
- method: 'POST',
- async: false,
- success: function (res) {
- if (res.code === 200) {
- reset();
- tips("缁勬墭鎴愬姛")
- } else if (res.code === 403) {
- top.location.href = baseUrl + "/pda";
- } else {
- tips(res.msg, true)
- }
+ layer.confirm('缁勬墭褰撳墠鐗╂枡鏄庣粏锛�', {shadeClose: true}, function(){
+ var zpallet = $('#code').val();
+ if (isEmpty(zpallet)) {
+ tips("鎵樼洏鏉＄爜涓虹┖", true);
+ // document.getElementById("code").focus();
+ return;
}
- })
+ // if (zpallet.length !== 7) {
+ // tips("鏉＄爜蹇呴』涓�7浣�", true);
+ // return;
+ // }
+ if (matData.length === 0) {
+ tips("璇锋彁鍙栫墿鏂�", true);
+ return;
+ }
+ $.ajax({
+ url: baseUrl+"/mobile/comb/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: JSON.stringify({
+ zpallet: zpallet,
+ combMats: matData
+ }),
+ contentType:'application/json;charset=UTF-8',
+ method: 'POST',
+ async: false,
+ success: function (res) {
+ if (res.code === 200) {
+ reset();
+ tips("缁勬墭鎴愬姛")
+ } else if (res.code === 403) {
+ top.location.href = baseUrl + "/pda";
+ } else {
+ tips(res.msg, true)
+ }
+ }
+ })
+ });
}
/************************************* 鏁伴噺 ****************************************/
diff --git a/src/main/webapp/views/pda/stockIn.html b/src/main/webapp/views/pda/stockIn.html
index af79e22..e68c3fe 100644
--- a/src/main/webapp/views/pda/stockIn.html
+++ b/src/main/webapp/views/pda/stockIn.html
@@ -245,40 +245,42 @@
// 涓婃灦
function pakIn() {
- var zpallet = $('#code').val();
- if (isEmpty(zpallet)) {
- tips("鎵樼洏鏉＄爜涓虹┖", true);
- return;
- }
- var node = $('#node').val();
- if (isEmpty(node)) {
- tips("璐т綅涓虹┖", true);
- return;
- }
- if (matData.length === 0) {
- tips("璇锋彁鍙栫墿鏂�", true);
- return;
- }
- $.ajax({
- url: baseUrl+"/work/stock/in",
- headers: {'token': localStorage.getItem('token')},
- data: JSON.stringify({
- nodeId: node,
- zpallet: zpallet
- }),
- contentType:'application/json;charset=UTF-8',
- method: 'POST',
- async: false,
- success: function (res) {
- if (res.code === 200) {
- reset();
- tips("涓婃灦鎴愬姛")
- } else if (res.code === 403) {
- top.location.href = baseUrl + "/pda";
- } else {
- tips(res.msg, true)
- }
+ layer.confirm('涓婃灦褰撳墠鎵樼洏锛�', {shadeClose: true}, function(){
+ var zpallet = $('#code').val();
+ if (isEmpty(zpallet)) {
+ tips("鎵樼洏鏉＄爜涓虹┖", true);
+ return;
}
+ var node = $('#node').val();
+ if (isEmpty(node)) {
+ tips("璐т綅涓虹┖", true);
+ return;
+ }
+ if (matData.length === 0) {
+ tips("璇锋彁鍙栫墿鏂�", true);
+ return;
+ }
+ $.ajax({
+ url: baseUrl+"/work/stock/in",
+ headers: {'token': localStorage.getItem('token')},
+ data: JSON.stringify({
+ nodeId: node,
+ zpallet: zpallet
+ }),
+ contentType:'application/json;charset=UTF-8',
+ method: 'POST',
+ async: false,
+ success: function (res) {
+ if (res.code === 200) {
+ reset();
+ tips("涓婃灦鎴愬姛")
+ } else if (res.code === 403) {
+ top.location.href = baseUrl + "/pda";
+ } else {
+ tips(res.msg, true)
+ }
+ }
+ })
})
}
diff --git a/src/main/webapp/views/pda/stockOut.html b/src/main/webapp/views/pda/stockOut.html
index b478b42..6de3aab 100644
--- a/src/main/webapp/views/pda/stockOut.html
+++ b/src/main/webapp/views/pda/stockOut.html
@@ -151,34 +151,36 @@
// 鎷ｈ揣纭
function pakoutConfirm() {
- if (pakoutData == null || pakoutData.length === 0) {
- tips("璇风‘璁ゅ崟鎹紪鍙凤紒", true);
- return;
- }
- var docNum = pakoutData[0].docNum;
- if (isEmpty(docNum)) {
- tips("璇风‘璁ゅ崟鎹紪鍙凤紒", true);
- return;
- }
- $.ajax({
- url: baseUrl+"/work/stock/out/confirm",
- headers: {'token': localStorage.getItem('token')},
- data: JSON.stringify({
- number: docNum
- }),
- contentType:'application/json;charset=UTF-8',
- method: 'POST',
- success: function (res) {
- if (res.code === 200) {
- reset();
- tips("鎷ｈ揣鎴愬姛")
- } else if (res.code === 403) {
- top.location.href = baseUrl + "/pda";
- } else {
- tips(res.msg, true)
- }
+ layer.confirm('纭鎷ｈ揣瀹屾垚锛�', {shadeClose: true}, function(){
+ if (pakoutData == null || pakoutData.length === 0) {
+ tips("璇风‘璁ゅ崟鎹紪鍙凤紒", true);
+ return;
}
- })
+ var docNum = pakoutData[0].docNum;
+ if (isEmpty(docNum)) {
+ tips("璇风‘璁ゅ崟鎹紪鍙凤紒", true);
+ return;
+ }
+ $.ajax({
+ url: baseUrl+"/work/stock/out/confirm",
+ headers: {'token': localStorage.getItem('token')},
+ data: JSON.stringify({
+ number: docNum
+ }),
+ contentType:'application/json;charset=UTF-8',
+ method: 'POST',
+ success: function (res) {
+ if (res.code === 200) {
+ reset();
+ tips("鎷ｈ揣鎴愬姛")
+ } else if (res.code === 403) {
+ top.location.href = baseUrl + "/pda";
+ } else {
+ tips(res.msg, true)
+ }
+ }
+ })
+ });
}
// 閲嶇疆
--
Gitblit v1.9.1