From d5e7fc8d38fa867526c80d29c4e89792634ef690 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@DESKTOP-5BIMHQ3>
Date: 星期四, 01 二月 2024 14:22:55 +0800
Subject: [PATCH] Merge branch 'master' into wxw
---
Pda/View/AsnSetting/productEnter.html | 63 ++++++++++++++++++++++++++++---
1 files changed, 56 insertions(+), 7 deletions(-)
diff --git a/Pda/View/AsnSetting/productEnter.html b/Pda/View/AsnSetting/productEnter.html
index dc003fb..f4c2b73 100644
--- a/Pda/View/AsnSetting/productEnter.html
+++ b/Pda/View/AsnSetting/productEnter.html
@@ -46,7 +46,7 @@
</ul>
</div>
- <div id="zongDiv" class="layout-bill-info" style="height: 255px;">
+ <div id="zongDiv" class="layout-bill-info" style="height: 335px;">
<form class="layui-form" action="">
<div id="" class="layui-form-item layout-dropdownlist">
<label class="layui-form-label" lang>鍏ュ簱鍗曪細</label>
@@ -92,6 +92,28 @@
<label class="layui-form-label" lang>灏剧鏉＄爜锛�</label>
<div class="layui-input-block">
<input id="BOXCODE2" type="text" lang langholder placeholder="璇锋壂鎻忓绠辨潯鐮�" autocomplete="off"
+ class="layui-input">
+ </div>
+ </div>
+
+ <div id="" class="layui-form-item layout-input BOX01">
+ <label class="layui-form-label" lang>浜岀骇鏉＄爜锛�</label>
+ <div class="layui-input-block">
+ <input id="BOXCODE01" type="text" lang langholder placeholder="璇锋壂鎻忎簩绾ф潯鐮�" autocomplete="off"
+ class="layui-input">
+ </div>
+ </div>
+ <div id="" class="layui-form-item layout-input BOX01">
+ <label class="layui-form-label" lang>浜岀骇杩炵粍锛�</label>
+ <div class="layui-input-block">
+ <input type="checkbox" name="IsLianXu2" id="IsLianXu2" lay-skin="switch" lay-text="鏄瘄鍚�"
+ lay-filter="IsLianXu2">
+ </div>
+ </div>
+ <div id="" class="layui-form-item layout-input BOX02" style="display: none;">
+ <label class="layui-form-label" lang>浜岀骇灏剧爜锛�</label>
+ <div class="layui-input-block">
+ <input id="BOXCODE02" type="text" lang langholder placeholder="璇锋壂鎻忎簩绾ф潯鐮佸熬鐮�" autocomplete="off"
class="layui-input">
</div>
</div>
@@ -214,8 +236,10 @@
//褰撳墠鍒嗛〉
var curPageIndex = 1;
- //鏄惁杩炵画缁勬墭
+ //鏄惁杩炵画澶栫缁勬墭
isContinue = "0";
+ //鏄惁杩炵画浜岀骇鐮佺粍鎵�
+ isContinue2 = "0";
//娓呮鏂囨湰妗嗕腑鏁版嵁
function clear() {
$("#ImportQuantity").val("");
@@ -562,9 +586,10 @@
function checkBoxInfo() {
var param = {
+ "ASNNo":$("#bar").val(),
"BoxNo": $("#BOXCODE").val(),
}
- sendData(IP + "/PdaAsn/GetBoxInfos", param, 'post', function (res) {
+ sendData(IP + "/PdaAsn/GetBindBoxInfos", param, 'post', function (res) {
if (res.code == 0) { //鎴愬姛
var bl = false; console.log(res.data);
if (res.data.length == 0) {
@@ -605,14 +630,38 @@
form.on('switch(IsLianXu)', function (obj) {
if (obj.elem.checked) {
$('#BOX2').attr("style", "display:block")
- $('#zongDiv').attr("style", "height: 285px;")
- isContinue = "1";
+ $('#zongDiv').attr("style", "height: 335px;")
+ isContinue = "1";
+
+ $('.BOX01').attr("style", "display:none")
+ $('.BOX02').attr("style", "display:none")
+
} else {
$('#BOX2').attr("style", "display:none")
- $('#zongDiv').attr("style", "height: 255px;")
+ $('#zongDiv').attr("style", "height: 315px;")
isContinue = "0";
- }
+
+ $('.BOX01').attr("style", "display:block");
+ }
$('#BOXCODE2').val("");
+
+ $('#BOXCODE01').val("");
+ $('#BOXCODE02').val("");
+ $('#IsLianXu2').attr("checked", false);
+ isContinue2 = "0";
+ });
+
+ form.on('switch(IsLianXu2)', function (obj) {
+ if (obj.elem.checked) {
+ $('.BOX02').attr("style", "display:block")
+ $('#zongDiv').attr("style", "height: 345px;")
+ isContinue = "1";
+ } else {
+ $('.BOX02').attr("style", "display:none")
+ $('#zongDiv').attr("style", "height: 315px;")
+ isContinue2 = "0";
+ }
+ $('#BOXCODE02').val("");
});
$("#menuImg").click(function (e) {
--
Gitblit v1.8.0