1
yusijie
2024-06-14 9e7294ca82f83ab9291141ad32368972a3b4ab68
1
4个文件已修改
80 ■■■■■ 已修改文件
WebTM/views/生产管理/生产停工单/Sc_Add_MESStopWorkBillList.html 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/设备管理/Sb_EquipDotCheckBill_PDA.html 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/设备管理/设备规程单/Sb_EquipDotCheckRuleList_PDA.html 61 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBill.html 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/Éú²ú¹ÜÀí/Éú²úÍ£¹¤µ¥/Sc_Add_MESStopWorkBillList.html
@@ -618,13 +618,14 @@
            //保存提交
            form.on('submit(Saver)', function (data) {
                var index = layer.load();
                var sMainStr = JSON.stringify(data.field);
                var sMainSub = sMainStr + ';' + sessionStorage["HUserName"] + ';' + refSav;
                if (!AllowLoadData())//数据验证
                {
                    return false;
                }
                var index = layer.load();
                $.ajax({
                    type: "POST",
                    url: GetWEBURL() + "/Sc_MESStopWorkBill/SaveGetMESStopFrom", //方法所在页面和方法名
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/³µ¼ä¹ÜÀí/¹¤ÐòÁ÷ת¿¨/Sc_ProcessExchangeBill.html
@@ -140,6 +140,12 @@
                                                <input type="text" class="layui-input" name="HMaterModel2" id="HMaterModel2" onmouseover="this.title=this.value" style="background-color:#efefef4d;" readonly>
                                            </div>
                                        </div>
                                        <div class="layui-col-xs3 layui-inline">
                                            <label class="layui-form-label">项目编号</label>
                                            <div class="layui-input-inline">
                                                <input type="text" class="layui-input" name="HProjectNum" id="HProjectNum">
                                            </div>
                                        </div>
                                        <!--<div class="layui-col-xs3 layui-inline">
                                            <label class="layui-form-label">总装图号</label>
                                            <div class="layui-input-inline">
@@ -444,12 +450,12 @@
                                                </button>
                                            </div>
                                        </div>
                                        <div class="layui-col-xs3 layui-inline">
                                        <!--<div class="layui-col-xs3 layui-inline">
                                            <label class="layui-form-label">项目编号</label>
                                            <div class="layui-input-inline">
                                                <input type="text" class="layui-input" name="HProjectNum" id="HProjectNum" style="background-color:#efefef4d;" readonly>
                                            </div>
                                        </div>
                                        </div>-->
                                        <div class="layui-col-xs3 layui-inline">
                                            <label class="layui-form-label">委外加工单位</label>