#

luxiaotao1123

2022-10-18 b5130c2e6d60c7f23e37f7c620375bc4e253caa3

 src/main/webapp/views/order/out.html

@@ -71,10 +71,10 @@
                <div class="layui-card-body" style="padding: 10px;">
                    <form class="layui-form toolbar">
                        <div class="layui-form-item">
                            <div class="layui-inline" style="max-width: 300px;">
                            <div class="layui-inline" style="max-width: 300px;margin-bottom: 5px">
                                <input name="orderNo" class="layui-input" placeholder="输入单据编号" autocomplete="off"/>
                            </div>
                            <div class="layui-inline">
                            <div class="layui-inline" style="margin-bottom: 5px">
                                <button class="layui-btn icon-btn" lay-filter="originTableSearch" lay-submit>
                                    <i class="layui-icon">&#xe615;</i>搜索
                                </button>
@@ -84,6 +84,9 @@
                            </div>
                        </div>
                    </form>
                    <button style="margin-bottom: 5px;line-height: 28px;height: 28px" class="layui-btn icon-btn layui-btn-danger" lay-filter="mergeOut" lay-submit>
                        <i class="layui-icon">&#xe656;</i>&nbsp;合并出库
                    </button>
                    <table id="originTable" lay-filter="originTable"></table>
                </div>
            </div>
@@ -112,16 +115,16 @@
                                    <input name="batch" class="layui-input" placeholder="序列码"/>
                                </div>
                            </div>
<!--                            <div class="layui-inline">-->
<!--                                <label class="layui-form-label">状态:</label>-->
<!--                                <div class="layui-input-inline">-->
<!--                                    <select name="isOnline">-->
<!--                                        <option value="1">充电中</option>-->
<!--                                        <option value="1">充电中</option>-->
<!--                                        <option value="0">不在充电</option>-->
<!--                                    </select>-->
<!--                                </div>-->
<!--                            </div>-->
                            <!--                            <div class="layui-inline">-->
                            <!--                                <label class="layui-form-label">状态:</label>-->
                            <!--                                <div class="layui-input-inline">-->
                            <!--                                    <select name="isOnline">-->
                            <!--                                        <option value="1">充电中</option>-->
                            <!--                                        <option value="1">充电中</option>-->
                            <!--                                        <option value="0">不在充电</option>-->
                            <!--                                    </select>-->
                            <!--                                </div>-->
                            <!--                            </div>-->
                            <div class="layui-inline">&emsp;
                                <button class="layui-btn icon-btn" lay-filter="sensorTbSearch" lay-submit>
                                    <i class="layui-icon">&#xe615;</i>搜索
@@ -165,6 +168,33 @@
    </div>
</script>

<!-- 合并表单弹窗 -->
<script type="text/html" id="mergeDialog">
    <div style="padding: 25px; line-height: 22px; background-color: #1E9FFF; color: #fff; font-weight: 300;">
        <span style="font-size: large; font-weight: bold">合并出库</span>
    </div>
    <div class="layui-card">
        <div class="layui-card-body" style="padding: 10px">
            <table id="orderMergeTab" lay-filter="orderMergeTab"></table>
        </div>
    </div>
</script>

<!-- 出库预览 【合并】 -->
<script type="text/html" id="pakoutPreviewMergeBox" style="display: none">
    <div style="padding: 25px; line-height: 22px; background-color: #393D49; color: #fff; font-weight: 300;">
        <span style="font-size: large; font-weight: bold">出库预览</span>
    </div>
    <div class="layui-card">
        <div class="layui-card-body" style="padding: 10px">
            <table id="stoPreTabMerge" lay-filter="stoPreTabMerge"></table>
        </div>
        <button class="layui-btn layui-btn-primary layui-border-black layui-btn-sm" lay-filter="batchModifySta" lay-submit style="display: block;float: right;margin-right: 1rem">
            批量修改
        </button>
    </div>
</script>

<script type="text/html" id="tbBasicTbStaNos">
    <div class="ew-select-fixed">
        <select class="order-sta-select" lay-filter="tbBasicTbStaNos">
@@ -187,10 +217,10 @@

<script type="text/html" id="locNoTpl">
    <span name="locNo"
    {{# if( d.lack === false){ }}
    class="layui-badge layui-badge-green" >{{d.locNo}}</span>
        {{# } else { }}
        class="layui-badge layui-badge-red" >库存不足</span>
          {{# if( d.lack === false){ }}
          class="layui-badge layui-badge-green" >{{d.locNo}}</span>
    {{# } else { }}
    class="layui-badge layui-badge-red" >库存不足</span>
    {{# } }}
</script>