用户权限乱码转义；供应商查询列表屏蔽查询成功弹框；工序编辑模块新增计件工资类型字段；工艺路线列表查询添加审核过滤；pda出站汇报单操作员添加查询按钮，...

yusijie

2024-10-03 d9107db5e238339f483953311e9a0855e8826081

用户权限乱码转义；供应商查询列表屏蔽查询成功弹框；工序编辑模块新增计件工资类型字段；工艺路线列表查询添加审核过滤；pda出站汇报单操作员添加查询按钮，扫流转卡自动带出工序，合格数量；批量打印添加生产订单数量查询

 WebTM/views/PublicPage/PowerInformation.html

@@ -75,6 +75,8 @@
            var OperationType = params[params[0]];//操作类型
            var linterid = params[params[1]];//源单id
            var HSouceBillType = params[params[2]];//源单类型
            //将url参数中的中文乱码重新转换成中文。 æ³¨ï¼šlinterid æ˜¯å‚数命名，不是值
            linterid = getParams("linterid");
        }

        var treeCkData = { id: 0 };
@@ -348,7 +350,19 @@
                }
            })                      
            return treeData;
        }      
        }

        //将url参数中的中文乱码重新转换成中文
        function getParams(key) {
            var reg = new RegExp("(^|&)" + key + "=([^&]*)(&|$)");
            //如果地址栏中出现中文则进行编码    
            var r = encodeURI(window.location.search).substr(1).match(reg);
            if (r != null) {
                //将中文编码的字符重新变成中文
                return decodeURI(unescape(r[2]));
            }
            return null;
        };
    </script>

</body>

 WebTM/views/PublicPage/SupplierInformation.html

@@ -203,7 +203,7 @@
                        if (data1.count == 1) {
                            option.data = data1.data;
                            table.render(option);
                            layer.alert("查询成功", { icon: 1 });
                            //layer.alert("查询成功", { icon: 1 });
                        } else {
                            layer.alert(data1.code + data1.Message, { icon: 5 });
                        }

 WebTM/views/»ù´¡×ÊÁÏ/Éú²ú»ù´¡×ÊÁÏ/Add_Edit_Gy_Process.html

@@ -134,7 +134,23 @@
                                                <input class="layui-input" name="HRemark" id="HRemark" autocomplete="off" style=" width: 75%;">
                                            </div>
                                        </div>
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">计件工资类型</label>
                                            <div class="layui-input-inline" style="margin-bottom: -15px;">
                                                <div class="layui-form">
                                                    <div class="layui-form-item">
                                                        <select name="HPayMentType" id="HPayMentType">
                                                            <option value="">请选择类型</option>
                                                            <option value="个人计件" selected>个人计件</option>
                                                            <option value="集体计件">集体计件</option>
                                                            <option value="其他">其他</option>
                                                        </select>
                                                    </div>
                                                </div>
                                            </div>
                                        </div>
                                    </div>

                                    <div class="layui-col-xs8 layui-inline">
                                        <label class="layui-form-label" style="width: 12.5%;">组织*</label>
                                        <div class="layui-input-inline" style="margin-bottom: -15px;">
@@ -632,6 +648,7 @@
                                , "HQCSchemeName_Proc": data.转序检验方案
                                , "HQCSchemeID_Patrol": data.HQCSchemeID_Patrol
                                , "HQCSchemeName_Patrol": data.巡检检验方案
                                , "HPayMentType": data.计件工资类型
                            });
                            layer.close(ajaxLoad);
                        } else {

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

@@ -623,6 +623,7 @@
                //sWhere += " and HPRDORGID=" + sessionStorage["OrganizationID"] + " ";
                if (HMaterID != "" && HMaterID != "undefined" && HMaterID != null) {
                    sWhere += " and HMaterID = " + HMaterID;
                    sWhere += " and å®¡æ ¸äºº != ''";
                }
                if (HProID != 0 && HProID != "undefined" && HProID != null) {
                    sWhere += " and HMainProcID = " + HProID;

 WebTM/views/³µ¼ä¹ÜÀí/¹¤ÐòÁ÷ת/MES_StationOutBill_PDA.html

@@ -207,6 +207,7 @@
                                                <th>操作员</th>
                                                <td class="bz_td">
                                                    <input type="text" name="HEmpNumber" id="HEmpNumber" value="" placeholder="操作员代码" autocomplete="off" class="layui-input" style="border-radius: 50px;">
                                                    <button type="button" lay-submit="" class="layui-btn layui-col-xs2 bz_btu layui-btn-radius" lay-filter="QueDin_CZY" style="line-height: 30px;">确定</button>
                                                </td>
                                                <td class="bz_td">
                                                    <input type="text" name="HEmpName" class="layui-input" id="HEmpName" placeholder="选择操作员" style="background-color:#efefef4d;border-radius: 50px;" readonly>
@@ -861,7 +862,8 @@
                                                    "HProcNo": data.流水号,
                                                    "HCenterName": data.工作中心,
                                                    "HCenterID": data.HCenterID,
                                                    "NoOutboundHqty": (data.流转卡数量 - data.出站报废关联数量 - data.出站关联数量)
                                                    "NoOutboundHqty": (data.流转卡数量 - data.出站报废关联数量 - data.出站关联数量),
                                                    "HQty": data.合格数量
                                                });

                                                if (data.首道工序 == "是") {
@@ -1164,6 +1166,38 @@
                    }
                });
            }

            //操作员回车方法
            function Operator_KeyDown(sBillNo) {
                var index = layer.load();
                $.ajax({
                    url: GetWEBURL() + "/Cj_StationBill/txtHBarCode_KeyDown_Operator",
                    type: "GET",
                    data: { "HBarCode": sBillNo, "HInterID": $('#HProcExchHinteID').val(), "UserID": sessionStorage["Czybm"], "HBillType": "Out" },
                    success: function (result) {
                        if (result.count == 1) {
                            var data = result.data[0];

                            form.val("formData", { //formTest å³ class="layui-form" æ‰€åœ¨å…ƒç´ å±žæ€§ lay-filter="" å¯¹åº”的值
                                "HEmpID": data.HItemID,
                                "HEmpNumber": data.职员代码,
                                "HEmpName": data.职员名称
                            });

                            layer.close(index);
                        }
                        else {
                            layer.close(index);
                            layer.msg(result.Message, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                        }
                    },
                    error: function (err) {
                        layer.close(index);
                        layer.msg("接口请求失败！" + err, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    }
                });
            }

            //#endregion

            //#region æŸ¥è¯¢ å·¥è‰ºå‚æ•°
@@ -1528,6 +1562,17 @@
            });
            //#endregion

            //#region æ“ä½œå‘˜ç¡®å®šæŒ‰é’®
            form.on('submit(QueDin_CZY)', function (data) {//
                var sBillNo = $('#HEmpNumber').val();
                if (!HProcExchBillNoFlag) {
                    layer.msg("流转卡没有扫描，或者没有按回车键，请扫描流转卡或者在流转卡文本框中按回车键！");
                    return;
                }
                Operator_KeyDown(sBillNo);
            });
            //#endregion

            form.on('submit(Detail)', function (data) {
                var HBillNo = $("#HBillNo").val();
                var HProcExchBillNo = $("#HProcExchBillNo").val();

 WebTM/views/³µ¼ä¹ÜÀí/¹¤ÐòÁ÷ת¿¨/Sc_ProcessExchangeBill_BatchSplit.html

@@ -564,7 +564,7 @@

            function dy_PL(rest) {
                var HInterID = rest[num].HInterID.toString();
                var sWhere = "select cast( b.流水号 as float) æµæ°´å·,生产订单号,a.生产数量,a.流转卡数量,a.产品代码,a.单据号,case when ISNULL(a.生产规格,'')='' then a.产品规格 else a.生产规格 end äº§å“è§„æ ¼,a.产品名称,a.日期,a.单据号,b.工序代码,b.工序名称,a.批号,b.工艺工作中心,b.工艺工艺参数,a.生产车间,b.工段名称 from h_v_Sc_ProcessExchangeBillQuery a left join h_v_Sc_ProcessExchangeBillQuerySub b on a.hmainid=b.hmainid   where b.hmainid in(" + HInterID + ") and b.工序代码 != '9999' order by cast(b.流水号 as int)"
                var sWhere = "select cast( b.流水号 as float) æµæ°´å·,生产订单号,a.生产数量,a.流转卡数量,a.产品代码,a.单据号,case when ISNULL(a.生产规格,'')='' then a.产品规格 else a.生产规格 end äº§å“è§„æ ¼,a.产品名称,a.日期,a.单据号,b.工序代码,b.工序名称,a.批号,b.工艺工作中心,b.工艺工艺参数,a.生产车间,b.工段名称,b.生产订单数量 from h_v_Sc_ProcessExchangeBillQuery a left join h_v_Sc_ProcessExchangeBillQuerySub b on a.hmainid=b.hmainid   where b.hmainid in(" + HInterID + ") and b.工序代码 != '9999' order by cast(b.流水号 as int)"

                $.ajax({
                    type: "GET",