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

whycq

2023-03-14 b49472f96cd9b545036cdf28fb4e5111737b080e

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

 src/main/webapp/static/js/stoMan/stoQue.js

@@ -19,8 +19,8 @@
        headers: {token: localStorage.getItem('token')},
        url: baseUrl+'/locMast/list/auth',
        page: true,
        limit: 20,
        limits: [20, 30, 50, 100, 200, 500],
        limit: 16,
        limits: [16, 30, 50, 100, 200, 500],
        even: true,
        toolbar: '#toolbar',
        cellMinWidth: 50,

 src/main/webapp/views/locMast/locMast.html

@@ -41,6 +41,11 @@
    </div>
    <div class="layui-inline">
        <div class="layui-input-inline">
            <input class="layui-input" type="text" name="crn_no" placeholder="堆垛机号" autocomplete="off">
        </div>
    </div>
    <div class="layui-inline">
        <div class="layui-input-inline">
            <input class="layui-input" type="text" name="row1" placeholder="排" autocomplete="off">
        </div>
    </div>

 src/main/webapp/views/stoMan/stoQue.html

@@ -39,6 +39,11 @@
    </div>
    <div class="layui-inline">
        <div class="layui-input-inline">
            <input class="layui-input" type="text" name="crn_no" placeholder="堆垛机号" autocomplete="off">
        </div>
    </div>
    <div class="layui-inline">
        <div class="layui-input-inline">
            <input class="layui-input" type="text" name="barcode" placeholder="托盘码" autocomplete="off">
        </div>
    </div>