From 83b9213dc893bec8f94e04cad121abb6649886dd Mon Sep 17 00:00:00 2001
From: chengsc <Demo@DESKTOP-CPA90BF>
Date: 星期日, 13 十月 2024 17:55:04 +0800
Subject: [PATCH] 修改业务需求问题
---
Pda/View/AsnSetting/productEnterQuantity.html | 392 +++++++++++++++++++++----------------------------------
1 files changed, 153 insertions(+), 239 deletions(-)
diff --git a/Pda/View/AsnSetting/productEnterQuantity.html b/Pda/View/AsnSetting/productEnterQuantity.html
index bf23974..6550d26 100644
--- a/Pda/View/AsnSetting/productEnterQuantity.html
+++ b/Pda/View/AsnSetting/productEnterQuantity.html
@@ -101,13 +101,15 @@
</ul>
</div>
- <ul>
+ <!-- <ul>
<li id="option1">鏍囩</li>
<li id="option2">鏁伴噺</li>
+ </ul> -->
- </ul>
+ <button id="option1" class="layout-btn" type="button">鏍囩</button>
+ <button id="option2" class="layout-btn" type="button">鏁伴噺</button>
+ <br /><br />
- <br />
<!-- 鏈夌爜 -->
<div id="content1">
<div id="zongDiv" class="layout-bill-info" style="height: 285px;">
@@ -248,7 +250,7 @@
</table>
<!-- 鍒嗛〉 -->
<table id="tableBoxPages" class="tbl-box-pages" border="" cellspacing="" cellpadding="">
- <tr >
+ <tr>
<td class="page-prev">涓婁竴椤�</td>
<td class="page-num page-num-select">1</td>
<td class="page-num">2</td>
@@ -350,11 +352,12 @@
<div id="demodiv" class="layui-form-item layout-input" style="height: auto;">
<label class="layui-form-label">瀵勫瓨澶囨敞锛�</label>
<div class="layui-input-inline" style="width: 365px;height: auto;">
- <textarea placeholder="璇疯緭鍏ュ唴瀹�" id="NoticeDemo" name="NoticeDemo" class="layui-textarea" ></textarea>
+ <textarea placeholder="璇疯緭鍏ュ唴瀹�" id="NoticeDemo" name="NoticeDemo"
+ class="layui-textarea"></textarea>
</div>
<br>
</div>
-
+
<table class="layout-tbl-submit" border="" cellspacing="" cellpadding="">
<tr>
<td style="width: 23%;"></td>
@@ -375,7 +378,7 @@
<div id="demodiv1">
<br><br><br><br><br><br><br>
</div>
-
+
<div id="" class="cut-line">
<img src="/assets/fengexian.png">
@@ -434,29 +437,29 @@
$('#demodiv1').hide();
var xianshiyemian = 0;
- $('#option1').attr("style", "background-color: aqua;width: 45.77%;float: left;text-align: center;"); //閫変腑鍚庨鑹�
- $('#option2').attr("style", "background-color: #999;width: 45.77%;float: right;text-align: center;"); //榛樿棰滆壊
+ $('#option1').attr("style", "background-color: red;width: 50%;float: left;text-align: center;"); //閫変腑鍚庨鑹�
+ $('#option2').attr("style", "background-color: #999;width: 50%;float: right;text-align: center;"); //榛樿棰滆壊
$('#content2').hide();
$(document).ready(function () {
$('#option1').click(function () {
// qingkong();
xianshiyemian = 0;
$('#content1').show();
- $('#option1').attr("style", "background-color: aqua;width: 45.77%;float: left;text-align: center;"); //閫変腑鍚庨鑹�
+ $('#option1').attr("style", "background-color: red;width: 50%;float: left;text-align: center;"); //閫変腑鍚庨鑹�
$('#content2').hide();
- $('#option2').attr("style", "background-color: #999;width: 45.77%;float: right;text-align: center;"); //榛樿棰滆壊
+ $('#option2').attr("style", "background-color: #999;width: 50%;float: right;text-align: center;"); //榛樿棰滆壊
});
$('#option2').click(function () {
// qingkong();
xianshiyemian = 1;
$('#content1').hide();
- $('#option1').attr("style", "background-color: #999;width: 45.77%;float: left;text-align: center;"); //榛樿棰滆壊
-
-
+ $('#option1').attr("style", "background-color: #999;width: 50%;float: left;text-align: center;"); //榛樿棰滆壊
+
+
$('#content2').show();
- $('#option2').attr("style", "background-color: aqua;width: 45.77%;float: right;text-align: center;"); //閫変腑鍚庨鑹�
+ $('#option2').attr("style", "background-color: red;width: 50%;float: right;text-align: center;"); //閫変腑鍚庨鑹�
});
});
@@ -583,14 +586,12 @@
form.render('select');
var param = {
- Type: "0,1,3"
+ Type: "0"
};
sendData(IP + "/PdaAsn/GetArrivalNotices", param, 'post', function (res) {
if (res.code == 0) { //鎴愬姛
for (var i = 0; i < res.data.length; i++) {
- $("#bar").append('<option value =' + res.data[i].ASNNo + '>' + res.data[i]
- .ASNNo +
- '</option>');
+ $("#bar").append('<option value =' + res.data[i] + '>' + res.data[i] + '</option>');
}
form.render('select');
@@ -618,14 +619,13 @@
form.render('select');
var param = {
- Type: "2,5,6,7"
+ Type: "1"
};
sendData(IP + "/PdaAsn/GetArrivalNotices", param, 'post', function (res) {
if (res.code == 0) { //鎴愬姛
+ console.log(res.data);
for (var i = 0; i < res.data.length; i++) {
- $("#bar1").append('<option value =' + res.data[i].ASNNo + '>' + res.data[i]
- .ASNNo +
- '</option>');
+ $("#bar1").append('<option value =' + res.data[i] + '>' + res.data[i] +'</option>');
}
form.render('select');
@@ -729,8 +729,10 @@
BoxNo: $("#BOXCODE").val(),
IsContinue: isContinue,
TailBoxNo: $("#BOXCODE2").val(),
- Origin: "PDA"
+ Origin: "PDA",
+ TableType: xianshiyemian,
}
+ console.log(param)
//缁勭洏
sendData(IP + "/PdaAsn/BindPallet", param, 'post', function (res) {
if (res.code == 0) { //鎴愬姛
@@ -783,7 +785,8 @@
LotNo: $("#goodSelect1").find("option:selected").text(), //鐗╂枡鎵规
SkuQty: parseInt($("#SkuQty").val()), //鐗╂枡鏁伴噺
Demo: $("#NoticeDemo").val(), //鐗╂枡鏁伴噺
- Origin: "PDA"
+ Origin: "PDA",
+ TableType: xianshiyemian,
}
console.log(param)
@@ -822,21 +825,19 @@
synData(IP + "/PdaAsn/GetArrivalNotice", param, 'post', function (res) {
console.log(res)
if (res.code == 0 && res.data != null) { //鎴愬姛
-
+
//鍒ゆ柇榛樿閫変腑鏄惁涓哄瘎瀛樼墿鏂�
- if(res.data[0].Type == "7")
- {
+ if (res.data[0].Type == "7") {
$("textarea[name='NoticeDemo']").val(res.data[0].Demo); //澶囨敞
$('#demodiv').show();
$('#demodiv1').show();
}
- else
- {
+ else {
$('#demodiv').hide();
$('#demodiv1').hide();
}
}
- else{
+ else {
$('#demodiv').hide();
$('#demodiv1').hide();
}
@@ -879,7 +880,7 @@
$("#Standard1").val(res.data.Standard);
$("#ImportFactQuantity1").val(res.data.FactQty + "");
}
- else{}
+ else { }
});
}
@@ -904,36 +905,43 @@
console.log("鍑哄簱鍙ｏ細" + JSON.stringify(res))
if (res.code == 0) { //鎴愬姛
asnDetails = res.data;
+ if (asnDetails.length <= 0) {
+ layer.msg('褰撳墠鍗曟嵁涓嬩笉瀛樺湪璐存爣鐗╂枡', {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ });
+ return;
+ }
for (var i = 0; i < res.data.length; i++) {
if (skuNo != '' && skuNo == res.data[i].SkuNo) {
if (res.data[i].LotNo == '' || res.data[i].LotNo == null) {
- $("#goodSelect").append('<option value =' + res.data[i].Id + ' selected>' + res.data[i]
+ $("#goodSelect").append('<option value =' + res.data[i].Id + '-' + i + ' selected>' + res.data[i]
.SkuName +
'</option>');
} else {
- $("#goodSelect").append('<option value =' + res.data[i].Id + ' selected>' + res.data[i]
+ $("#goodSelect").append('<option value =' + res.data[i].Id + '-' + i + ' selected>' + res.data[i]
.SkuName + "-" + res.data[i].LotNo +
'</option>');
}
} else {
if (i == 0) {
if (res.data[i].LotNo == '' || res.data[i].LotNo == null) {
- $("#goodSelect").append('<option value =' + res.data[i].Id + ' selected>' + res.data[i]
+ $("#goodSelect").append('<option value =' + res.data[i].Id + '-' + i + ' selected>' + res.data[i]
.SkuName +
'</option>');
} else {
- $("#goodSelect").append('<option value =' + res.data[i].Id + ' selected>' + res.data[i]
+ $("#goodSelect").append('<option value =' + res.data[i].Id + '-' + i + ' selected>' + res.data[i]
.SkuName + "-" + res.data[i].LotNo +
'</option>');
}
} else {
if (res.data[i].LotNo == '' || res.data[i].LotNo == null) {
- $("#goodSelect").append('<option value =' + res.data[i].Id + '>' + res.data[i]
+ $("#goodSelect").append('<option value =' + res.data[i].Id + '-' + i + '>' + res.data[i]
.SkuName +
'</option>');
} else {
- $("#goodSelect").append('<option value =' + res.data[i].Id + '>' + res.data[i]
+ $("#goodSelect").append('<option value =' + res.data[i].Id + '-' + i + '>' + res.data[i]
.SkuName + "-" + res.data[i].LotNo +
'</option>');
}
@@ -967,9 +975,17 @@
console.log("鍑哄簱鍙ｏ細" + JSON.stringify(res))
if (res.code == 0) { //鎴愬姛
asnDetails = res.data;
+ // console.log(asnDetails.length)
+ if (asnDetails.length <= 0) {
+ layer.msg('褰撳墠鍗曟嵁涓嬩笉瀛樺湪涓嶈创鏍囩墿鏂�', {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ });
+ return;
+ }
for (var i = 0; i < res.data.length; i++) {
if (skuNo != '' && skuNo == res.data[i].SkuNo) {
-
+
if (i == 0) {
$("#goodSelect1").append('<option value =' + res.data[i].Id + ' selected>' + res.data[i]
.SkuName);
@@ -1003,7 +1019,7 @@
$('#goodSelect1').siblings("div.layui-form-select").find('dl').find(sel).addClass('layui-this')
}
} else {
-
+
}
});
}
@@ -1081,7 +1097,8 @@
tr.show();
arrTrs[i] = tr
}
-
+ //璁剧疆鍒嗛〉
+ setPages(1, res.data.length)
} else { //涓嶆垚鍔�
layer.msg("鏃犳暟鎹�", {
@@ -1089,6 +1106,7 @@
time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
}, function () { });
$("#boxNum").val(0)
+ setPages(1, 0)
}
});
}
@@ -1138,6 +1156,7 @@
yes: function () {
var param = {
+ Id: parseInt(Id),
PalletNo: res.data[0].PalletNo,
};
console.log(Id)
@@ -1166,7 +1185,7 @@
}
//璁剧疆鍒嗛〉
- setPages(1, list.length)
+ setPages(1, res.data.length)
} else { //涓嶆垚鍔�
layer.msg("鏃犳暟鎹�", {
@@ -1228,6 +1247,7 @@
function checkBoxInfo() {
var param = {
"BoxNo": $("#BOXCODE").val(),
+ "AsnNo":$("#bar").val(),
}
sendData(IP + "/PdaAsn/GetBindBoxInfos", param, 'post', function (res) {
if (res.code == 0) { //鎴愬姛
@@ -1289,217 +1309,98 @@
/* 鍒嗛〉 */
//璁剧疆鍒嗛〉
function setPages(pageIndex, boxNum) {
-
- if (xianshiyemian == 0) {
- if (boxNum <= 0) {
- //鍒楄〃涓虹┖锛岄殣钘忓垎椤甸〉鐮�
- $("#tableBoxPages").hide()
- return
- }
-
- let pageNum = Math.floor(boxNum / 10);
- if (boxNum % 10 > 0) {
- pageNum += 1;
- }
- //console.log("pageNum is " + pageNum)
-
- $("#tableBoxPages").find("tr").remove()
- let table = $("#tableBoxPages")
- $("<tr></tr>").appendTo("#tableBoxPages")
-
- // let newTr = table.append("<tr></tr>")
- // newTr.append("<td class='page-prev'>涓婁竴椤�</td>")
- $("<td id='prevPage' class='page-prev'>涓婁竴椤�</td>").appendTo("#tableBoxPages tr")
- $("#tableBoxPages tr").eq(0).find("td[id^='prevPage']").click(function () {
- onClickPrevPage()
- })
- for (i = 1; i < pageNum + 1; i++) {
- // newTr.append("<td class='page-num'>"+ i +"</td>")
- $("<td class='page-num'>" + i + "</td>").appendTo("#tableBoxPages tr")
- }
- // newTr.append("<td class='page-next'>涓嬩竴椤�</td>")
- $("<td id='nextPage' class='page-next'>涓嬩竴椤�</td>").appendTo("#tableBoxPages tr")
- $("#tableBoxPages tr").eq(0).find("td[id^='nextPage']").click(function () {
- onClickNextPage()
- })
- // pages.show()
- $("#tableBoxPages").show()
-
- setCurPage(1)
- }
- else if (xianshiyemian == 1) {
- if (boxNum <= 0) {
- //鍒楄〃涓虹┖锛岄殣钘忓垎椤甸〉鐮�
- $("#tableBoxPages1").hide()
- return
- }
-
- let pageNum = Math.floor(boxNum / 10);
- if (boxNum % 10 > 0) {
- pageNum += 1;
- }
- //console.log("pageNum is " + pageNum)
-
- $("#tableBoxPages1").find("tr").remove()
- let table = $("#tableBoxPages1")
- $("<tr></tr>").appendTo("#tableBoxPages1")
-
- // let newTr = table.append("<tr></tr>")
- // newTr.append("<td class='page-prev'>涓婁竴椤�</td>")
- $("<td id='prevPage' class='page-prev'>涓婁竴椤�</td>").appendTo("#tableBoxPages1 tr")
- $("#tableBoxPages1 tr").eq(0).find("td[id^='prevPage']").click(function () {
- onClickPrevPage()
- })
- for (i = 1; i < pageNum + 1; i++) {
- // newTr.append("<td class='page-num'>"+ i +"</td>")
- $("<td class='page-num'>" + i + "</td>").appendTo("#tableBoxPages1 tr")
- }
- // newTr.append("<td class='page-next'>涓嬩竴椤�</td>")
- $("<td id='nextPage' class='page-next'>涓嬩竴椤�</td>").appendTo("#tableBoxPages1 tr")
- $("#tableBoxPages1 tr").eq(0).find("td[id^='nextPage']").click(function () {
- onClickNextPage()
- })
- // pages.show()
- $("#tableBoxPages1").show()
-
- setCurPage(1)
+ if (boxNum <= 0) {
+ //鍒楄〃涓虹┖锛岄殣钘忓垎椤甸〉鐮�
+ $("#tableBoxPages").hide()
+ return
}
+ let pageNum = Math.floor(boxNum / 10);
+ if (boxNum % 10 > 0) {
+ pageNum += 1;
+ }
+ //console.log("pageNum is " + pageNum)
+
+ $("#tableBoxPages").find("tr").remove()
+ let table = $("#tableBoxPages")
+ $("<tr></tr>").appendTo("#tableBoxPages")
+
+ // let newTr = table.append("<tr></tr>")
+ // newTr.append("<td class='page-prev'>涓婁竴椤�</td>")
+ $("<td id='prevPage' class='page-prev'>涓婁竴椤�</td>").appendTo("#tableBoxPages tr")
+ $("#tableBoxPages tr").eq(0).find("td[id^='prevPage']").click(function () {
+ onClickPrevPage()
+ })
+ for (i = 1; i < pageNum + 1; i++) {
+ // newTr.append("<td class='page-num'>"+ i +"</td>")
+ $("<td class='page-num'>" + i + "</td>").appendTo("#tableBoxPages tr")
+ }
+ // newTr.append("<td class='page-next'>涓嬩竴椤�</td>")
+ $("<td id='nextPage' class='page-next'>涓嬩竴椤�</td>").appendTo("#tableBoxPages tr")
+ $("#tableBoxPages tr").eq(0).find("td[id^='nextPage']").click(function () {
+ onClickNextPage()
+ })
+ // pages.show()
+ $("#tableBoxPages").show()
+
+ setCurPage(1)
}
//璁剧疆褰撳墠鍒嗛〉
function setCurPage(pageIndex) {
- if (xianshiyemian == 0) {
- let totalTrNum = $("#tableBoxList tr").length
- if (totalTrNum <= 2) {
- //console.log("tableBoxList 涓虹┖ totalTrNum: " + totalTrNum)
- //curPageIndex = 1
- return
- }
+ let totalTrNum = $("#tableBoxList tr").length
+ if (totalTrNum <= 2) {
+ //console.log("tableBoxList 涓虹┖ totalTrNum: " + totalTrNum)
+ //curPageIndex = 1
+ return
+ }
- let pageNum = getBoxPageNum()
- if (pageIndex > pageNum) {
- //console.log("璁剧疆鐨勯〉鐮佽秴鍑洪〉鏁�, pageIndex : " + pageIndex)
- //curPageIndex = 1
- return
- }
+ let pageNum = getBoxPageNum()
+ if (pageIndex > pageNum) {
+ //console.log("璁剧疆鐨勯〉鐮佽秴鍑洪〉鏁�, pageIndex : " + pageIndex)
+ //curPageIndex = 1
+ return
+ }
- let startIndex = (pageIndex - 1) * 10 + 1
- let n = totalTrNum - startIndex
- let endIndex = 0
- if (n > 9) {
- endIndex = startIndex + 9
+ let startIndex = (pageIndex - 1) * 10 + 1
+ let n = totalTrNum - startIndex
+ let endIndex = 0
+ if (n > 9) {
+ endIndex = startIndex + 9
+ } else {
+ endIndex = startIndex + n
+ }
+ //console.log("startIndex is "+startIndex)
+ //console.log("endIndex is "+endIndex)
+ //startIndex =2
+ //endIndex = 2
+ let trs = $("#tableBoxList tr")
+ //console.log("琛屾暟 "+trs.length)
+ let d = 0
+ for (let i = 2; i < trs.length; i++) {
+ //console.log("琛岀储寮� " + trs.eq(i).attr('index'))
+ let t = trs.eq(i)
+ d = t.attr('index')
+ if (d >= startIndex && d <= endIndex) {
+ //console.log("闇�瑕佹樉绀�")
+ //鏄剧ず琛�
+ t.show()
} else {
- endIndex = startIndex + n
- }
-
- let trs = $("#tableBoxList tr")
- //console.log("琛屾暟 "+trs.length)
- let d = 0
- for (let i = 2; i < trs.length; i++) {
- //console.log("琛岀储寮� " + trs.eq(i).attr('index'))
- let t = trs.eq(i)
- d = t.attr('index')
- if (d >= startIndex && d <= endIndex) {
- //console.log("闇�瑕佹樉绀�")
- //鏄剧ず琛�
- t.show()
- } else {
- //闅愯棌琛�
- t.hide()
- }
- }
-
- curPageIndex = pageIndex
-
- let ptr = $("#tableBoxPages tr")
- for (let i = 1; i < pageNum + 1; i++) {
- ptr.eq(0).find("td").eq(i).removeClass("page-num-select")
- if (i == curPageIndex) {
- ptr.eq(0).find("td").eq(i).addClass("page-num-select")
- }
- }
- }
- else if (xianshiyemian == 1) {
- let totalTrNum = $("#tableBoxList1 tr").length
- if (totalTrNum <= 2) {
- return
- }
-
- let pageNum = getBoxPageNum()
- if (pageIndex > pageNum) {
- //console.log("璁剧疆鐨勯〉鐮佽秴鍑洪〉鏁�, pageIndex : " + pageIndex)
- //curPageIndex = 1
- return
- }
-
- let startIndex = (pageIndex - 1) * 10 + 1
- let n = totalTrNum - startIndex
- let endIndex = 0
- if (n > 9) {
- endIndex = startIndex + 9
- } else {
- endIndex = startIndex + n
- }
-
- let trs = $("#tableBoxList1 tr")
- //console.log("琛屾暟 "+trs.length)
- let d = 0
- for (let i = 2; i < trs.length; i++) {
- //console.log("琛岀储寮� " + trs.eq(i).attr('index'))
- let t = trs.eq(i)
- d = t.attr('index')
- if (d >= startIndex && d <= endIndex) {
- //console.log("闇�瑕佹樉绀�")
- //鏄剧ず琛�
- t.show()
- } else {
- //闅愯棌琛�
- t.hide()
- }
- }
-
- curPageIndex = pageIndex
-
- let ptr = $("#tableBoxPages1 tr")
- for (let i = 1; i < pageNum + 1; i++) {
- ptr.eq(0).find("td").eq(i).removeClass("page-num-select")
- if (i == curPageIndex) {
- ptr.eq(0).find("td").eq(i).addClass("page-num-select")
- }
+ //闅愯棌琛�
+ t.hide()
}
}
- }
+ curPageIndex = pageIndex
- function getBoxPageNum() {
- if (xianshiyemian == 0) {
- let num = $("#tableBoxList tr").length
- if (num <= 2) {
- return 0
+ let ptr = $("#tableBoxPages tr")
+ for (let i = 1; i < pageNum + 1; i++) {
+ ptr.eq(0).find("td").eq(i).removeClass("page-num-select")
+ if (i == curPageIndex) {
+ ptr.eq(0).find("td").eq(i).addClass("page-num-select")
}
-
- let pageNum = Math.floor(num / 10);
- if (num % 10 > 0) {
- pageNum += 1;
- }
-
- return pageNum
}
- else if (xianshiyemian == 1) {
- let num = $("#tableBoxList1 tr").length
- if (num <= 2) {
- return 0
- }
-
- let pageNum = Math.floor(num / 10);
- if (num % 10 > 0) {
- pageNum += 1;
- }
-
- return pageNum
- }
-
+ //console.log("totalTrNum is " + totalTrNum)
}
function onClickPrevPage() {
@@ -1513,11 +1414,24 @@
function onClickNextPage() {
//console.log("涓嬩竴椤垫寜閽鐐瑰嚮")
let n = getBoxPageNum()
- if (curPageIndex == n) {
+ if (curPageIndex == n - 1) {
return
}
setCurPage(curPageIndex + 1)
}
+ function getBoxPageNum() {
+ let num = $("#tableBoxList tr").length
+ if (num <= 2) {
+ return 0
+ }
+
+ let pageNum = Math.floor(num / 10);
+ if (num % 10 > 0) {
+ pageNum += 1;
+ }
+
+ return pageNum
+ }
/*鈥斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺��*/
--
Gitblit v1.8.0