Merge remote-tracking branch 'origin/htwms' into htwms

王佳豪

2021-05-31 4726368fb058d0f396b345eaccde0164a4aecb0b

Merge remote-tracking branch 'origin/htwms' into htwms

 src/main/webapp/views/pda/index.html

@@ -78,8 +78,8 @@
<!--    <li><a id="pakout" onclick="nav(this.id)" class="nav-unselect" href="#">出库</a></li>-->
    <li><a id="stockOut" onclick="nav(this.id)" class="nav-unselect" href="#">拣货</a></li>
    <li><a id="stockCheck" onclick="nav(this.id)" class="nav-unselect" href="#">盘点</a></li>
    <li><a id="comb" onclick="nav(this.id)" class="nav-unselect" href="#">组托</a></li>
    <li><a id="stockIn" onclick="nav(this.id)" class="nav-unselect" href="#">上架</a></li>
<!--    <li><a id="comb" onclick="nav(this.id)" class="nav-unselect" href="#">组托</a></li>-->
<!--    <li><a id="stockIn" onclick="nav(this.id)" class="nav-unselect" href="#">上架</a></li>-->
    <li><a id="stockSearch" onclick="nav(this.id)" class="nav-unselect" href="#">库存</a></li>
</ul>


 src/main/webapp/views/pda/stockSearch.html

@@ -81,7 +81,6 @@
<footer>
    <div class="layui-btn-container">
        <button type="button" id="reset-btn" class="layui-btn layui-btn-primary" onclick="reset()">重置</button>
        <button type="button" id="comb-btn" class="layui-btn layui-btn-normal " onclick="check()" style="margin-left: 20px">确认</button>
        <span id="tips"></span>
    </div>
</footer>
@@ -103,7 +102,7 @@
            limit: 500,
            cellMinWidth: 50,
            cols: [[
                {align: 'center', field: 'anfme', title: '数量', style:'color: blue;', width:80},
                {align: 'center', field: 'anfme', title: '数量', style:'font-weight: bold;', width:80},
                // {field: 'matnr', align: 'center', title: '商品编号', event: 'modify'},
                {field: 'maktx', align: 'center', title: '商品名称'}
            ]],