1
zrg
2024-06-17 61a7964be7409a38575a1df73f9e4f481c3c3ae0
1
5个文件已修改
101 ■■■■■ 已修改文件
WebTM/views/IpadIndex.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/设备管理/Sb_EquipDotCheckBill_PDA.html 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/设备管理/设备规程单/Sb_EquipDotCheckRuleList_PDA.html 61 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/质量管理/检验方案单/QC_Add_CheckProject.html 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBill_CurrentWork.html 29 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/IpadIndex.html
@@ -1353,7 +1353,7 @@
                            <div class="layui-col-sm12 layui-col-md4" onclick="OpenMaterToSource(event,this)">
                                <div class="cnt bottomright">
                                    <span class="layui-icon layui-icon-engine imgicon"></span>
                                    <span class="imgtitle">上料防呆</span>
                                    <span class="imgtitle">上料防错</span>
                                </div>
                            </div>
                            <div class="layui-col-sm12 layui-col-md4" onclick="BadGather(event,this)">
WebTM/views/É豸¹ÜÀí/Sb_EquipDotCheckBill_PDA.html
@@ -623,6 +623,10 @@
            //表头信息设备保养规程
            form.on('submit(HEquipDotCheckRuleInterist)', function () {
                if ($("#HEquipID").val() == 0 || $("#HEquipID").val() == null || $("#HEquipID").val() == "") {
                    layer.alert("请先扫描设备二维码带出设备信息");
                    return;
                }
                //页面层-自定义
                layer.open({
                    type: 2,
@@ -632,7 +636,7 @@
                    shift: 2,
                    area: ['80%', '80%'],
                    maxmin: true,
                    content: ['../设备管理/设备规程单/Sb_EquipDotCheckRuleList_PDA.html', 'yes'],
                    content: ['../设备管理/设备规程单/Sb_EquipDotCheckRuleList_PDA.html?HEquipID=' + $("#HEquipID").val(), 'yes'],
                    btn: ['确定', '取消']
                    , btn1: function (index, layero) {
                        //按钮【按钮一】的回调
WebTM/views/É豸¹ÜÀí/É豸¹æ³Ìµ¥/Sb_EquipDotCheckRuleList_PDA.html
@@ -92,6 +92,10 @@
            , laypage = layui.laypage
            , laydate = layui.laydate
            , soulTable = layui.soulTable
            var params = getUrlVars();
            var HEquipID = params[params[0]]; //设备ID
            var sWhere = "";
            var option = [];
            var HModName = "Sb_EquipDotCheckRuleList_PDA";
@@ -228,11 +232,12 @@
            //查询
            function get_Display(sWhere) {
                sWhere += "";
                var index = layer.load();
                var ajaxLoad = layer.load();
                //进入页面显示的缓存列表
                $.ajax({
                    url: GetWEBURL() + '/Sb_EquipDotCheckRuleBill/GetEquipDotCheckRuleList',
                    url: GetWEBURL() + '/Sb_EquipDotCheckRuleBill/GetEquipDotCheckRuleListPDA',
                    type: "GET",
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
                    success: function (data1) {
@@ -313,27 +318,27 @@
                var Comparator = $("#Comparator").val()
                var ColContent = $("#ColContent").val();
                if (ColName != 0 && Comparator != 0) {
                    var com = "";
                    switch (Comparator) {
                        case "7":
                            com = "like'%" + ColContent + "%'";
                            break;
                        case "8":
                            com = "like'%" + ColContent + "'";
                            break;
                        case "9":
                            com = "like'" + ColContent + "%'";
                            break;
                        case "10":
                            com = "not like'%" + ColContent + "%'";
                            break;
                        default:
                            com = "" + Comparator + "'" + ColContent + "'";
                            break;
                    }
                    sWhere += " and " + ColName + " " + com;
                }
                //if (ColName != 0 && Comparator != 0) {
                //    var com = "";
                //    switch (Comparator) {
                //        case "7":
                //            com = "like'%" + ColContent + "%'";
                //            break;
                //        case "8":
                //            com = "like'%" + ColContent + "'";
                //            break;
                //        case "9":
                //            com = "like'" + ColContent + "%'";
                //            break;
                //        case "10":
                //            com = "not like'%" + ColContent + "%'";
                //            break;
                //        default:
                //            com = "" + Comparator + "'" + ColContent + "'";
                //            break;
                //    }
                //    sWhere += " and " + ColName + " " + com;
                //}
                if (HBillNo) {
                    sWhere += " and å•据号 like '%" + HBillNo + "%'";
                }
@@ -643,6 +648,18 @@
                form.render('select');
            }
            //获取参数
            function getUrlVars() {
                var vars = [], hash;
                var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
                for (var i = 0; i < hashes.length; i++) {
                    hash = hashes[i].split('=');
                    vars.push(hash[0]);
                    vars[hash[0]] = hash[1];
                }
                return vars;
            }
            //以上是layui模块
        });
WebTM/views/ÖÊÁ¿¹ÜÀí/¼ìÑé·½°¸µ¥/QC_Add_CheckProject.html
@@ -649,7 +649,8 @@
                                        for (var i = 0; i < checkStatus.data.length; i++) {
                                            buttonArr.push({
                                                "HPrjNo": i + 1, "HQCCheckItemID": checkStatus.data[i].HItemID, "HQCCheckItemNumber": checkStatus.data[i].代码, "HQCCheckItemName": checkStatus.data[i].名称, "HQCStd": "", "HQCStdMax": "", "HQCUnit": "", "HRemark": ""
                                                 ,"HTargetVal": 0, "HUpLimit": 0, "HDownLimit": 0, "HUpOffSet": 0, "HDownOffSet": 0, "HTargetValB": 0,"HUpLimitB": 0, "HDownLimitB": 0, "HUpOffSetB": 0,"HDownOffSetB": 0
                                                , "HTargetVal": 0, "HUpLimit": 0, "HDownLimit": 0, "HUpOffSet": 0, "HDownOffSet": 0, "HTargetValB": 0, "HUpLimitB": 0, "HDownLimitB": 0, "HUpOffSetB": 0, "HDownOffSetB": 0, "HTargetValQ": 0, "HUpLimitQ": 0, "HDownLimitQ": 0, "HUpOffSetQ": 0
                                                , "HDownOffSetQ": 0
                                            });
                                        }
WebTM/views/³µ¼ä¹ÜÀí/¹¤Ðò³öÕ¾»ã±¨µ¥/Cj_StationOutBill_CurrentWork.html
@@ -187,6 +187,9 @@
                                                <input type="hidden" name="HUnitID" id="HUnitID">
                                                <input type="hidden" name="eventType" id="eventType" value="Add">
                                                <input type="hidden" name="HPRDOrgID" id="HPRDOrgID" value="0">
                                                <input type="hidden" name="HICMOQty" id="HICMOQty" value="0">
                                                <input type="hidden" name="HPlanQty" id="HPlanQty" value="0">
                                                <input type="hidden" name="HLastSubProc" id="HLastSubProc" value="true">
                                            </div>
                                        </div>
                                    </div>
@@ -892,16 +895,16 @@
                        $("#HDeptID").val(data1.data[0]["HDeptID"]);
                        $("#HDeptName").val(data1.data[0]["车间"]);
                        //$("#HProcName").val(data1.data[0]["工序"]);
                        //$("#HProcID").val(data1.data[0]["HProcID"]);
                        //$("#HSourceID").val(data1.data[0]["HSourceID"]);
                        //$("#HSourceName").val(data1.data[0]["生产资源"]);
                        $("#HProcName").val(data1.data[0]["工序"]);
                        $("#HProcID").val(data1.data[0]["HProcID"]);
                        $("#HSourceID").val(data1.data[0]["HSourceID"]);
                        $("#HSourceName").val(data1.data[0]["生产资源"]);
                        $("#HEmpID").val(data1.data[0]["HEmpID"]);
                        $("#HEmpName").val(data1.data[0]["质检员"]);
                        $("#HGroupID").val(data1.data[0]["HGroupID"]);
                        $("#HGroupName").val(data1.data[0]["生产班组"]);
                        //$("#HCenterID").val(data1.data[0]["HWorkCenterID"]);
                        //$("#HCenterName").val(data1.data[0]["工作中心"]);
                        $("#HCenterID").val(data1.data[0]["HWorkCenterID"]);
                        $("#HCenterName").val(data1.data[0]["工作中心"]);
                        layer.close(ajaxLoad);
                        //layer.alert("查询成功", { icon: 1 });
@@ -920,16 +923,16 @@
        //#region æ ¹æ®å¹³æ¿ç»‘定,自动带出基础资料信息
        function get_ConfigFileInfo_EquipFile() {
            var objdata = get_ConfigFileInfo();
            $("#HProcID").val(objdata.HProcID); //工序ID
            $("#HProcName").val(objdata.HProcName); //工序名称
            //$("#HProcID").val(objdata.HProcID); //工序ID
            //$("#HProcName").val(objdata.HProcName); //工序名称
            //$("#HEquipID").val(objdata.HEquipID); //设备ID
            $("#HEquipCode").text(objdata.HEquipName); //设备名称
            $("#HSourceID").val(objdata.HSourceID); //生产资源ID
            $("#HSourceName").val(objdata.HSourceName); //生产资源名称
            //$("#HSourceID").val(objdata.HSourceID); //生产资源ID
            //$("#HSourceName").val(objdata.HSourceName); //生产资源名称
            //$("#HGroupID").val(objdata.HGroupID); //班组ID
            //$("#HGroupName").val(objdata.HGroupName); //班组名称
            $("#HCenterID").val(objdata.HWorkCenterID); //工作中心ID
            $("#HCenterName").val(objdata.HWorkCenterName); //工作中心名称
            //$("#HCenterID").val(objdata.HWorkCenterID); //工作中心ID
            //$("#HCenterName").val(objdata.HWorkCenterName); //工作中心名称
          
        }
        //#endregion
@@ -987,6 +990,8 @@
                        $("#HUnitName").val(data1.data[0]["单位"]);
                        $("#HUnitID").val(data1.data[0]["HUnitID"]);
                        $("#HQty").val(data1.data[0]["最小包装数量"]);
                        $("#HICMOQty").val(data1.data[0]["生产数量"]);
                        $("#HPlanQty").val(data1.data[0]["流转卡数量"]);
                        $("#HBarCode").val(HBarCode);
                    }