Merge branch 'wxw'

Administrator

2024-02-02 ec3e4e46da50f911b9d3eaef98b399962f3e4c70

 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) {