From 1b86f1120560fbfcad792606064a9bef15d42827 Mon Sep 17 00:00:00 2001
From: bklLiudl <673013083@qq.com>
Date: 星期一, 02 九月 2024 08:24:34 +0800
Subject: [PATCH] Merge branch 'master' into Liudl
---
Pda/View/SoSetting/pingKuOut.html | 106 +++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 78 insertions(+), 28 deletions(-)
diff --git a/Pda/View/SoSetting/pingKuOut.html b/Pda/View/SoSetting/pingKuOut.html
index 3f0cecb..92a28f8 100644
--- a/Pda/View/SoSetting/pingKuOut.html
+++ b/Pda/View/SoSetting/pingKuOut.html
@@ -110,19 +110,23 @@
<img src="/assets/fengexian.png">
</div>
- <div class="layout-tbl-paging" id="" style="display: none;">
+ <div class="layout-tbl-paging" id="" >
<table id="tableBoxList" class="tbl-box-list" border="" cellspacing="" cellpadding="">
<tr>
+ <th lang>鎵樼洏鐮�</th>
<th lang>鐗╂枡鍙�</th>
<th lang>鐗╂枡鍚嶇О</th>
<th lang>鎵规鍙�</th>
+ <th lang>搴撲綅鍦板潃</th>
+
</tr>
<tr id="boxCell" style="display: none">
- <!-- <td name="PalletNo">鎵樼洏鐮�</td> -->
+ <td name="PalletNo">鎵樼洏鐮�</td>
<td name="SkuNo">鐗╂枡鍙�</td>
<td name="SkuName">鐗╂枡鍚嶇О</td>
<td name="LotNo">鎵规鍙�</td>
+ <td name="LocatNo">搴撲綅鍦板潃</td>
<!-- <td name="del">
<div id="" class="tbl-btn-del" lang>
鍒犻櫎
@@ -175,37 +179,81 @@
}
GetBoxInfo();
});
+
+ $("#selectDiv").click(function () {
+ var input = $('select[id="bar"]').next().find('.layui-select-title input')
+ var val = input.val()
+ //鍏堟洿鏂颁竴涓嬪嚭搴撳崟
+ updateBillList(function (data) {
+ $('select[id="bar"]').next().addClass('layui-form-selected')
+ $('select[id="bar"]').next().find('.layui-select-title input').val(val)
+ })
+ })
//鍒濆鍖栨覆鏌� 鍑哄簱鍗�
- function updateBillList() {
+ function updateBillList(callback) {
+ var input = $('select[id="bar"]').next().find('.layui-select-title input')
+ var val = input.val()
$("#bar").empty()
$("#bar").append('<option value =>' + '</option>');
form.render('select');
-
- var param = {
- PalletNo: $("#PalletNo").val(),
- Type: "1",
- };
- synData(IP + "/PdaSo/GetRunSoNoticeList", param, 'post', function (res) {
- console.log(res);
-
- if (res.code == 0) { //鎴愬姛
- console.log(res.data);
- for (var i = 0; i < res.data.length; i++) {
- if (i == 0) {
- $("#bar").append('<option value =' + res.data[i] + ' selected>' + res.data[i] + '</option>');
- } else {
- $("#bar").append('<option value =' + res.data[i] + '>' + res.data[i] + '</option>');
+ var PalletNo = $("#PalletNo").val();
+ if(PalletNo.length != 8){ //涓嬫媺妗嗚幏鍙栧钩搴撳嚭搴撳崟
+ var param = {
+ Type: "1",
+ };
+ synData(IP + "/PdaSo/GetRunNoticeList", param,'post', function (res) {
+ console.log(res);
+ if (res.code == 0) { //鎴愬姛
+ for (var i = 0; i < res.data.length; i++) {
+ $("#bar").append('<option value =' + res.data[i] + '>' + res.data[i]
+ +
+ '</option>');
}
- }
- form.render('select');
+ form.render('select');
- } else { //涓嶆垚鍔�
- layer.msg(res.msg, {
- icon: 2,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- });
- }
- });
+ if (!val) {
+ $('#bar').siblings("div.layui-form-select").find('dl').find('.layui-select-tips').addClass('layui-this')
+ } else {
+ var sel = 'dd[lay-value=' + val + ']';
+ $('#bar').siblings("div.layui-form-select").find('dl').find(sel).addClass('layui-this')
+ }
+
+ callback(res.data)
+
+ } else { //涓嶆垚鍔�
+ layer.msg(res.msg, {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ });
+ }
+ });
+ }else{//鏍规嵁鎵樼洏鍙疯幏鍙栧嚭搴撳崟
+ var param = {
+ PalletNo: $("#PalletNo").val(),
+ Type: "1",
+ };
+ synData(IP + "/PdaSo/GetRunSoNoticeList", param, 'post', function (res) {
+ console.log(res);
+
+ if (res.code == 0) { //鎴愬姛
+ console.log(res.data);
+ for (var i = 0; i < res.data.length; i++) {
+ if (i == 0) {
+ $("#bar").append('<option value =' + res.data[i] + ' selected>' + res.data[i] + '</option>');
+ } else {
+ $("#bar").append('<option value =' + res.data[i] + '>' + res.data[i] + '</option>');
+ }
+ }
+ form.render('select');
+
+ } else { //涓嶆垚鍔�
+ layer.msg(res.msg, {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ });
+ }
+ });
+ }
}
//鑾峰彇鎵樼洏鐗╂枡鍚嶇粏
@@ -251,16 +299,18 @@
var arrTrs = new Array()
let idx = 0
for (var i in list) {
+ console.log("list[i].LocatN:"+list[i].LocatNo);
// list[i].BoxCode
var tr = $("#boxCell").eq(0).clone();
tr.appendTo("#tableBoxList");
// tr.attr('id', list[i].BoxCode)
idx++;
tr.attr('index', idx)
- // tr.find("td[name='PalletNo']").html(list[i].PalletNo);
+ tr.find("td[name='PalletNo']").html(list[i].PalletNo);
tr.find("td[name='SkuNo']").html(list[i].SkuNo);
tr.find("td[name='SkuName']").html(list[i].SkuName);
tr.find("td[name='LotNo']").html(list[i].LotNo);
+ tr.find("td[name='LocatNo']").html(list[i].LocatNo);
// var code = list[i].BoxCode
// //console.log("code is "+code)
--
Gitblit v1.8.0