From b4a8d50e3d97fc9e893b554a60134e4eceb012eb Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期一, 05 一月 2026 08:58:08 +0800
Subject: [PATCH] #
---
src/main/webapp/views/pda/combPro.html | 60 ++++++++++++++++++++++++++----------------------------------
1 files changed, 26 insertions(+), 34 deletions(-)
diff --git a/src/main/webapp/views/pda/combPro.html b/src/main/webapp/views/pda/combPro.html
index 7579b01..bbe504e 100644
--- a/src/main/webapp/views/pda/combPro.html
+++ b/src/main/webapp/views/pda/combPro.html
@@ -230,7 +230,7 @@
}
// 娣诲姞琛ㄦ牸鏁版嵁
- // var matData = [];
+ var matData = [];
function addTableData(data) {
for (var i = 0; i < data.length; i++) {
@@ -271,14 +271,15 @@
return;
}
// 璧嬪�煎墠娓呯┖琛ㄦ牸
-// matData = [];
+ matData = [];
tableIns.reload({data: matData});
$.ajax({
url: baseUrl + "/mobile/bill/query/auth",
headers: {'token': localStorage.getItem('token')},
data: {
- billNo: billNo
+ billNo: billNo,
+ mnemonic: '',
},
method: 'POST',
success: function (res) {
@@ -286,9 +287,9 @@
if (res.data != null) {
addTableData(res.data);
// 寤惰繜1绉掑悗娓呯┖閫氱煡鍗曞彿
- setTimeout(function () {
- $('#billNo').val("");
- }, 500);
+ // setTimeout(function () {
+ // $('#billNo').val("");
+ // }, 500);
}
} else if (res.code === 403) {
top.location.href = baseUrl + "/pda";
@@ -377,36 +378,27 @@
tips("璇锋彁鍙栫墿鏂�", true);
return;
}
- for (var i = 0; i < matData.length; i++) {
- for (var j = 0; j < sourceData.length ; j++) {
- if (matData[i].matNo == sourceData[j].matNo && matData[i].mnemonic == sourceData[j].mnemonic && matData[i].count == sourceData[j].count) {
- // 鏁伴噺鎻愰啋
- layer.confirm('鏁伴噺鍜屽墿浣欐暟閲忎竴鑷达紝纭畾缁х画缁勬墭鍚�?', function(){
- $.ajax({
- url: baseUrl + "/mobile/comb/auth/batch",
- headers: {'token': localStorage.getItem('token')},
- data: JSON.stringify({
- barcode: barcode,
- 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)
- }
- }
- })
- });
+ $.ajax({
+ url: baseUrl + "/mobile/comb/auth/batch",
+ headers: {'token': localStorage.getItem('token')},
+ data: JSON.stringify({
+ barcode: barcode,
+ 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