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

Junjie

2023-11-10 bb71b47a43244e6db57cbc3cd0223bc5a64023d7

 src/main/webapp/views/priOnline2/priOnline.html

@@ -45,10 +45,15 @@
                    </div>
                </div>
                <div class="layui-form-item">

                    <div class="layui-inline">
                        <div class="layui-input-inline">
                            <input class="layui-input" type="text" name="condition" placeholder="请输入" autocomplete="off"
                                   style="border-color: #e1e1e1">
                        </div>
                        <label class="layui-form-label">ALL：</label>
                        <div class="layui-input-inline" style="text-align: left">
                            <input id="allSwitch" name="allSwitch" class="layui-input" type="checkBox" lay-skin="primary" lay-filter='detailCheckbox'>
                        </div>
                    </div>
                    <div class="layui-inline">&emsp;
@@ -66,7 +71,7 @@
<script type="text/html" id="toolbar">
    <div class="layui-btn-container">
        <button class="layui-btn layui-btn-sm" lay-event="addBlank">新增核价</button>
        <button class="layui-btn layui-btn-sm" lay-event="addBlank2">接取集成核价任务</button>
<!--        <button class="layui-btn layui-btn-sm" lay-event="addBlank2">接取集成核价任务</button>-->
        <button class="layui-btn layui-btn-sm layui-btn-danger" lay-event="deleteData">删除</button>
    </div>
</script>