工艺路线相关页面跳转，pda班组页面bug修复

wtt

2024-10-30 3a6caf8b267195622748f0aa7b591597c5c78dc8

工艺路线相关页面跳转，pda班组页面bug修复

 WebTM/views/Baseset/»ù´¡×ÊÁÏ/Gy_GetProductionTeamList.html

@@ -81,7 +81,6 @@
                }
                parent.layer.close(index);
            });
            RoadQuery($('#Value').val());
            table.render({
                elem: '#mainTable'
                // , url: '/demo/table/user/'
@@ -97,6 +96,8 @@
                , limits: [50, 500, 5000, 50000],
                limit: 50
            });
            RoadQuery($('#Value').val());
            
            ///加载显示数据
            function RoadQuery(Where) {
                var Value = " and HUSEORGID = " + sessionStorage["OrganizationID"] + "";

 WebTM/views/Ä£Öξ߹ÜÀí/Ä£Öξ߹ÜÀí/Gy_BarCodeBillList.html

@@ -321,7 +321,7 @@
                        $("#HSourceBillNo").val("");
                        $("#HMaterNumber").val("");
                        sWhere = "";
                        get_Display(sWhere);
                        get_DisplayPage(sWhere);

                        break;
                    //作废按钮
@@ -607,7 +607,8 @@
                            //do something
                            page = obj.curr;
                            size = obj.limit;
                            get_DisplayPage("");
                            // å‡è®¾æŒ‰é’®æœ‰ä¸€ä¸ªID为"myButton"
                            $("#btnSearch").trigger("click");
                        }
                    }
                }

 WebTM/views/¼Æ»®¹ÜÀí/¹¤ÒÕ·Ïß/Gy_RoutingBill.html

@@ -98,7 +98,7 @@
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">工艺路线名称<label style="color:red"> * </label></label>
                                            <label class="layui-form-label" style="width: 90px;">工艺路线名称*</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" lay-verify="HName" name="HName" id="HName">
                                            </div>
@@ -108,7 +108,7 @@
                                    <div class="layui-row">
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">产品代码*</label>
                                            <div class="layui-input-block" style="margin-left: 77px;">
                                            <div class="layui-input-block" style="margin-left: 83px;">
                                                <input type="text" class="layui-input" lay-verify="HMaterNumber" name="HMaterNumber" id="HMaterNumber" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchMater" id="btnSearchMater" style="padding: 0 10px;float: right;margin-right: 3px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
@@ -133,7 +133,7 @@
                                    <div class="layui-row">
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">计量单位*</label>
                                            <div class="layui-input-block" style="margin-left: 77px;">
                                            <div class="layui-input-block" style="margin-left: 83px;">
                                                <input type="text" class="layui-input" name="HUnitName" lay-verify="HUnitName" id="HUnitName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                <input type="hidden" name="HUnitID" id="HUnitID" lay-verify="HUnitID" value="0">
                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnUnit" id="btnUnit" style="padding: 0 10px;float: right;margin-right: 3px;">
@@ -151,11 +151,19 @@
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <div class="layui-input-block" style="margin-left: 96px;">
                                            <div class="layui-input-block" style="margin-left: 0px;">
                                                <input type="checkbox" name="checkboxHStandard" id="checkboxHStandard" lay-skin="primary" lay-filter="checkboxHStandard" checked title="是否默认工艺">
                                                <input type="hidden" value="true" name="HStandard" id="HStandard" lay-verify="HStandard">
                                                <!--<input type="checkbox" name="checkboxHUseFlag" id="checkboxHUseFlag" title="是否启用" lay-skin="primary" lay-filter="checkboxHUseFlag">
                                                <input type="hidden" value="false" name="HUseFlag" id="HUseFlag">-->
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">组织*</label>
                                            <div class="layui-input-block" style="margin-left: 120px; width: 501px;">
                                                <select name="HOrgID" id="HOrgID" lay-verify="HOrgID">
                                                    <!--动态渲染组织-->
                                                </select>
                                            </div>
                                        </div>
                                    </div>
@@ -173,13 +181,20 @@
                                        <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: 80px;">
                                                <input type="date" class="layui-input" lay-verify="HBeginDate" name="HBeginDate" id="HBeginDate" style="padding-left: 20px;">
                                            </div>
                                        </div>
                                        <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="HEndDate" name="HEndDate" id="HEndDate" style="padding-left: 80px;">
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">备注</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="hidden" class="layui-input" name="HMaker" id="HMaker" lay-verify="HMaker" value="">
                                                <input type="text" class="layui-input" name="HRemark" id="HRemark" lay-verify="HRemark" placeholder="请输入内容" onmouseover="this.title=this.value" style=" width: 500px;">
                                            </div>
                                        </div>
                                        <!--<div class="layui-inline">
@@ -248,26 +263,26 @@
                                        </div>-->
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-inline">
                                        <!--<div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">备注</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="hidden" class="layui-input" name="HMaker" id="HMaker" lay-verify="HMaker" value="">
                                                <input type="text" class="layui-input" name="HRemark" id="HRemark" lay-verify="HRemark" placeholder="请输入内容" onmouseover="this.title=this.value" style=" width: 500px;">
                                            </div>
                                        </div>
                                        </div>-->



                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-inline">
                                        <!--<div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">组织*</label>
                                            <div class="layui-input-block" style="margin-left: 120px; width: 501px;">
                                                <select name="HOrgID" id="HOrgID" lay-verify="HOrgID">
                                                <select name="HOrgID" id="HOrgID" lay-verify="HOrgID">-->
                                                    <!--动态渲染组织-->
                                                </select>
                                                <!--</select>
                                            </div>
                                        </div>
                                        </div>-->
                                    </div>
                                </div>
                            </div>
@@ -573,7 +588,7 @@
                , limit: 500 //每页默认显示的数量
                , totalRow: true
                //, cellMinWidth: 120
                , height: 400
                , height: 450
                , cols: [[ //表头
                    { type: 'checkbox', totalRowText: '合计行' }
                    , { type: 'numbers', field: '序号', title: '序号', totalRow: true }

 WebTM/views/¼Æ»®¹ÜÀí/¹¤ÒÕ·Ïß/Gy_RoutingBillCheckQuery.html

@@ -493,7 +493,7 @@
                var url = "";
                var user = sessionStorage["HUserName"];
                if (type == 1) {
                    var sWhere = "and åˆ¶å•äºº = '" + user + "'"
                    var sWhere = "and åˆ¶å•äºº = '" + user + "'" + " and å·¥åºä»£ç  != '9999' and HBillSubType<>'SUB'"
                    url = '/LEMS/MES_Gy_RoutingBillList_Json';
                    userData = { "sWhere": sWhere, "user": sessionStorage["HUserName"], "HBillSubType": "3301" };