Merge branch 'master' into Liudl

bklLiudl

2024-10-19 fe41831b0e9057a16aef1e82048105aee671bbda

 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">
@@ -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();//光标默认选中
            });
         });
@@ -1315,7 +1316,7 @@
                                    $('#kuneilabel2').show();
                                    $('#kuqianlabel2').hide();
                           updateBillList2();
                           // console.log($('#bar2').val())
                           console.log($('#bar2').val())
                           if ($('#bar2').val() == "") {
                              console.log(1)
                              clear21();
@@ -1333,7 +1334,7 @@
                                    $('#kuqianlabel2').show();
                                    $('#kuneilabel2').hide();
                                    updateAsnBillList2();
                           GetBoxInfo();
                           GetDataInfo();
                                    sampleType = "1";
                                }