From 18e13ddba707623dc9078d7bffc498f91dba409c Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 13 四月 2021 14:48:26 +0800
Subject: [PATCH] #
---
src/main/webapp/views/pda/comb.html | 76 ++++++++++++++++++++------------------
1 files changed, 40 insertions(+), 36 deletions(-)
diff --git a/src/main/webapp/views/pda/comb.html b/src/main/webapp/views/pda/comb.html
index 64fb14f..95f8800 100644
--- a/src/main/webapp/views/pda/comb.html
+++ b/src/main/webapp/views/pda/comb.html
@@ -156,17 +156,19 @@
function getMat() {
matCodeLayerIdx = layer.open({
type: 2,
- title: '鎻愬彇鐗╂枡',
+ title: '鎻愬彇鍟嗗搧',
shade: [0.3,'#000'],
area: ['90%', '80%'],
content: 'matQuery.html',
success: function(layero, index){
$('.layui-layer-title').css('font-size', '16px');
+ $('.layui-layer.layui-layer-iframe').css('border-radius', '8px');
},
end: function () {
$('#mat-btn').focus();
}
});
+ // layer.full(matCodeLayerIdx)
}
// 娣诲姞琛ㄦ牸鏁版嵁
@@ -176,7 +178,7 @@
tips("鎻愬彇澶辫触", true);
return;
}
- let toPush = true;
+ var toPush = true;
for (var j=0;j<matData.length;j++){
if (data.matnr === matData[j].matnr) {
matData[j].count = Number(matData[j].count) + Number(data.count);
@@ -199,41 +201,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)
+ }
+ }
+ })
+ });
}
/************************************* 鏁伴噺 ****************************************/
--
Gitblit v1.9.1