Merge branch 'master' into csc

chengsc

2024-10-18 1e26a7575d9969e728b0aa01466f490409cb173c

 Pda/View/HouseDataSetting/stockCheck.html

@@ -7,7 +7,7 @@
   <!-- <meta name="viewport" content="width=device-width, initial-scale=0.665, minimum-scale=0.5, maximum-scale=1, user-scalable=no" /> -->
   <!-- <meta name="viewport" content="width=device-width, initial-scale=0.665" /> -->
   <meta http-equiv="X-UA-Compatible" content="ie=edge" />
   <title>Boxline PDA</title>
   <title>库存盘点</title>

   <link rel="stylesheet" href="/layui/css/layui.css" />
   <link rel="stylesheet" href="/css/style.css" />
@@ -158,16 +158,20 @@
      .cut-line {
         margin-top: 10px;
      }

      .show{
         display: block;
      }

      .noshow{
         display: none;
      }

      td {
         word-break: break-all;
         word-wrap: break-word;
      }

      .layui-form-switch {
         margin-top: 0;
      }
@@ -226,8 +230,8 @@
                  <div id="" class="layui-form-item layout-input"  >
                     <label class="layui-form-label">是否数量盘点：</label>
                     <div class="layui-input-block" style="position: absolute;top: 100;">
                        <input type="checkbox" name="IsZhengTuo" id="IsZhengTuo" lay-skin="switch" lay-text="是|否"
                           lay-filter="IsZhengTuo" class="layui-input" >
                        <input type="checkbox" name="IsZhengTuo" id="IsZhengTuo" lay-skin="switch"
                           lay-text="是|否" lay-filter="IsZhengTuo" class="layui-input">
                     </div>
                  </div>
                  <div id="boxno1" class="layui-form-item layout-input" style="margin-top: 10px;">
@@ -289,10 +293,18 @@
         <div id="tableid" class="layout-tbl-paging"> 
            <table id="tableBoxList" class="tbl-box-list" border="" cellspacing="" cellpadding="">
               <tr>
                  <th style="width: 40%;"><p id="a">箱码</p></th>
                  <th style="width: 30%;"><p id="b">支码</p></th>
                  <th style="width: 15%;"><p id="c">箱内数量</p></th>
                  <th style="width: 15%;"><p id="d">结果</p></th>
                  <th style="width: 40%;">
                     <p id="a">箱码</p>
                  </th>
                  <th style="width: 30%;">
                     <p id="b">支码</p>
                  </th>
                  <th style="width: 15%;">
                     <p id="c">箱内数量</p>
                  </th>
                  <th style="width: 15%;">
                     <p id="d">结果</p>
                  </th>
               </tr>
               <tr id="boxCell" style="display: none;">
                  <td name="boxNo"></td>
@@ -646,8 +658,7 @@
                  idx++;
                  tr.attr('index', idx)
                  //判断是否为数量
                  if(isContinue == "1")
                  {
                  if (isContinue == "1") {
                     tr.find("td[name='boxNo']").html(list[i].SkuNo);
                     tr.find("td[name='boxNo3']").html(list[i].PalletNo);
                  }