Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI

ch

2022-07-29 94bd70ca069aa3bb8546b77a2e99fd5c7ffc4c6a

 WebTM/views/Éú²ú¹ÜÀí/Éú²ú½ÐÁÏƽ̨/JIT_ComplementGoodBillMain.html

@@ -34,7 +34,7 @@
                        <button class="layui-btn layui-btn-normal" type="button" lay-submit="" lay-filter="Cx" id="Cx">查询</button>
                        <button class="layui-btn layui-btn-normal" type="button" lay-submit="" lay-filter="Jl" id="Jl">叫料</button>
                        <button class="layui-btn layui-btn-normal" type="button" lay-submit="" lay-filter="Scjld" id="Scjld">生成拣料单</button>
                        <button class="layui-btn layui-btn-normal" type="button" lay-submit="" lay-filter="Blptl" id="Blptl">不良品退申请料</button>
                        <button class="layui-btn layui-btn-normal" type="button" lay-submit="" lay-filter="Blptl" id="Blptl">不良品退料申请单</button>
                        <button class="layui-btn layui-btn-normal" type="button" lay-submit="" lay-filter="Yltl" id="Yltl">余量退料申请单</button>
                        <button class="layui-btn layui-btn-normal" type="button" lay-submit="" lay-filter="Bftl" id="Bftl">报废退料申请单</button>
                        <button class="layui-btn layui-btn-normal" type="button" lay-submit="" lay-filter="Sctld" id="Sctld">生成退料单</button>
@@ -129,17 +129,15 @@
                                    <div class="layui-inline">
                                        <label class="layui-form-label" style="width: 85px;">开始日期</label>
                                        <div class="layui-input-block" style="margin-left: 120px;">
                                            <input type="date" class="layui-input" lay-verify="HBeginDate" name="HBeginDate" id="HBeginDate" style="padding-left: 48px;">
                                            <input type="date" class="layui-input" lay-verify="HBeginDate" name="HBeginDate" id="HBeginDate" style="padding-left: 80px;">
                                        </div>
                                    </div>
                                    <div class="layui-inline">
                                        <label class="layui-form-label" style="width: 85px;text-align:center;">—</label>
                                        <div class="layui-input-block" style="margin-left: 118px;">
                                            <input type="date" class="layui-input" lay-verify="HEndDate" name="HEndDate" id="HEndDate" style="padding-left: 48px;">
                                        <div class="layui-input-block" style="margin-left: 120px;">
                                            <input type="date" class="layui-input" lay-verify="HEndDate" name="HEndDate" id="HEndDate" style="padding-left: 80px;">
                                        </div>
                                    </div>
                                </div>
                                <div class="layui-row" style="margin-top:10px;">
                                    <div class="layui-inline">
                                        <div class="layui-input-block" style="margin-left: 90px;">
                                            <input type="checkbox" name="ps" id="ps" lay-skin="primary" lay-filter="ps" title="仅显示未完全配送">
@@ -154,7 +152,6 @@
                            <div class="layui-form-item" style="padding-top: 10px;">
                                <table class="" id="mainTable" lay-filter="mainTable"></table>
                            </div>

                        </div>
                    </div>
                </form>
@@ -295,8 +292,8 @@
                , cellMinWidth: 90
                , limit: 500
                , cols: [[
                    //{ type: 'checkbox', fixed: 'left' }
                     { field: '销售订单号', title: '销售订单号',width: 150 }
                    { type: 'checkbox', fixed: 'left' }
                    , { field: '销售订单号', title: '销售订单号',width: 150 }
                    , { field: '生产订单号', title: '生产订单号', width: 170}
                    , { field: '产品代码', title: '产品代码', width: 170 }
                    , { field: '产品名称', title: '产品名称', width: 260, }
@@ -761,7 +758,7 @@
                    , area: ['80%', '80%']
                    , title: '叫料拣料信息查询'
                    , shift: 0//弹出动画
                    , content: '../生产叫料平台/JIT_HlpBillList.html?HSourceInterID=' + HSouceInterID + '&HSourceEntryID=' + HSourceEntryID 
                    , content: '../生产叫料平台/JIT_HlpBillList.html?HSourceInterID=' + HSouceInterID + '&HSourceEntryID=' + HSourceEntryID + '&Type=1'
                })
            }
        }