Merge branch 'Liudl'

liudl

2025-01-16 f42e607f9309c06394c6c46bfdc354ddd5195d51

 Pda/View/SoSetting/SampleOut.html

@@ -169,12 +169,13 @@
            </ul>
         </div>

         <ul>
         <!-- <ul>
                <li id="option1">标签</li>
                <li id="option2">数量</li>
            </ul>

            <br />
            </ul> -->
         <button id="option1" class="layout-btn" type="button">标签</button>
            <button id="option2" class="layout-btn" type="button">数量</button>
            <br /><br />

         <!-- 有码 -->
         <div id="content1">
@@ -287,8 +288,8 @@
                              <div class="layui-form-item layout-input" style="margin-top: 6px;">
                                 <label class="layui-form-label lableWidth">拣货数量：</label>
                                 <div class="layui-input-block">
                                    <input id="pickQty1" type="number" placeholder="请输入拣货数量"autocomplete="off" 
                                       class="layui-input" oninput="value=value.replace(/^(0+)|[^\d]+/g,'')">
                                    <input id="pickQty1" type="text" placeholder="请输入拣货数量"autocomplete="off" 
                                       class="layui-input" >
                                 </div>
                              </div>
                           </td>
@@ -481,9 +482,9 @@
                                 <label class="layui-form-label lableWidth" >拣货数量：</label>
                                 <div id="" class="local-input">
                                    <div class="layui-input-block">
                                       <input id="pickQty2" type="number" placeholder="请输入拣货数量"
                                       <input id="pickQty2" type="text" placeholder="请输入拣货数量"
                                          autocomplete="off" class="layui-input" style="padding-left:0.1rem;"
                                          oninput="value=value.replace(/^(0+)|[^\d]+/g,'')">
                                          >
                                    </div>
                                 </div>
                                 <div id="" class="local-ok">
@@ -560,18 +561,18 @@
            
            $('#kuneiQty').hide();

         $('#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();
               // qingkong();aqua
               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;"); //默认颜色
               $("#palletNo").focus();//光标默认选中
            });

@@ -579,10 +580,10 @@
               // 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;"); //选中后颜色
               $("#palletNo2").focus();//光标默认选中
            });
         });
@@ -1043,6 +1044,16 @@
         //确认拣货 
         function reqPickScatter() {
                canPickBox = false//回调
            if($('#pickQty1').val()!= "" && $('#pickQty1').val()!= undefined){
               var reg = /(^[1-9]([0-9]+)?(\.[0-9]{1,4})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/;
               if (!reg.test($("#pickQty1").val())) {
                  layer.msg("数量必须大于0(可保留4位小数)", {
                     icon: 2,
                     time: 2000 //2秒关闭（如果不配置，默认是3秒）
                  });
                  return -1;
               }
            }
            var param = {
               "SoNo": $("#bar").val(),
               "SoDetailId": $("#skuLotNo").val(),
@@ -1315,7 +1326,7 @@
                                    $('#kuneilabel2').show();
                                    $('#kuqianlabel2').hide();
                           updateBillList2();
                           // console.log($('#bar2').val())
                           console.log($('#bar2').val())
                           if ($('#bar2').val() == "") {
                              console.log(1)
                              clear21();
@@ -1333,7 +1344,7 @@
                                    $('#kuqianlabel2').show();
                                    $('#kuneilabel2').hide();
                                    updateAsnBillList2();
                           GetBoxInfo();
                           GetDataInfo();
                                    sampleType = "1";
                                }
                                
@@ -1608,6 +1619,16 @@
         //确认拣货 
         function reqPickScatter2() {
            canPickBox = false//回调
            if($('#pickQty2').val()!= "" && $('#pickQty2').val()!= undefined){
               var reg = /(^[1-9]([0-9]+)?(\.[0-9]{1,4})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/;
               if (!reg.test($("#pickQty2").val())) {
                  layer.msg("数量必须大于0(可保留4位小数)", {
                     icon: 2,
                     time: 2000 //2秒关闭（如果不配置，默认是3秒）
                  });
                  return -1;
               }
            }
            var param = {
               "SoNo": $("#bar2").val(),
               "SoDetailId": $("#skuLotNo2").val(),