From ec3e4e46da50f911b9d3eaef98b399962f3e4c70 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@DESKTOP-5BIMHQ3>
Date: 星期五, 02 二月 2024 14:56:16 +0800
Subject: [PATCH] Merge branch 'wxw'
---
Pda/View/AsnSetting/productEnter.html | 56 ++++----------------------------------------------------
1 files changed, 4 insertions(+), 52 deletions(-)
diff --git a/Pda/View/AsnSetting/productEnter.html b/Pda/View/AsnSetting/productEnter.html
index 65c4bb9..47ee0eb 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: 335px;">
+ <div id="zongDiv" class="layout-bill-info" style="height: 285px;">
<form class="layui-form" action="">
<div id="" class="layui-form-item layout-dropdownlist">
<label class="layui-form-label" lang>鍏ュ簱鍗曪細</label>
@@ -92,28 +92,6 @@
<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>
@@ -201,7 +179,7 @@
</div>
<table id="tableBoxList" class="tbl-box-list" border="" cellspacing="" cellpadding="">
<tr>
- <th lang style="width: 15%;">缂栫爜</th>
+ <th lang style="width: 15%;">绠辩爜</th>
<th lang style="width: 35%;">鍚嶇О</th>
<th lang style="width: 25%;">鎵规</th>
<th lang style="width: 15%;">鏁伴噺</th>
@@ -238,14 +216,10 @@
var curPageIndex = 1;
//鏄惁杩炵画澶栫缁勬墭
isContinue = "0";
- //鏄惁杩炵画浜岀骇鐮佺粍鎵�
- isContinue2 = "0";
//娓呮鏂囨湰妗嗕腑鏁版嵁
function clear() {
$("#BOXCODE").val("");
$("#BOXCODE2").val("");
- $("#BOXCODE01").val("");
- $("#BOXCODE02").val("");
$("#ImportQuantity").val("");
$("#Standard").val("");
@@ -358,9 +332,6 @@
BoxNo: $("#BOXCODE").val(),
IsContinue: isContinue,
TailBoxNo: $("#BOXCODE2").val(),
- BoxNo01:$("#BOXCODE01").val(),
- IsContinue2:isContinue2,
- TailBoxNo01:$("#BOXCODE02").val(),
Origin:"PDA"
}
//缁勭洏
@@ -450,7 +421,6 @@
// 缁戝畾鍏ュ簱鍗曠墿鏂欏強鎵规
function updateGoodList(skuNo) {
- console.log("aaaa");
var input = $('select[id="goodSelect"]').next().find('.layui-select-title input')
var val = input.val()
@@ -660,7 +630,7 @@
form.on('switch(IsLianXu)', function (obj) {
if (obj.elem.checked) {
$('#BOX2').attr("style", "display:block")
- $('#zongDiv').attr("style", "height: 335px;")
+ $('#zongDiv').attr("style", "height: 305px;")
isContinue = "1";
$('.BOX01').attr("style", "display:none")
@@ -668,30 +638,12 @@
} else {
$('#BOX2').attr("style", "display:none")
- $('#zongDiv').attr("style", "height: 315px;")
+ $('#zongDiv').attr("style", "height: 285px;")
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