feat: 添加 设备工艺参数订单点检表 上下页 新增时禁用样式 添加选择工序和生产资源时向后端请求数据更新数据总数和当前数据偏移的函数
3个文件已修改
81 ■■■■ 已修改文件
WebTM/layuiadmin/common.js 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/模治具管理/模治具管理/Sc_Add_MouldConkBookBillList.html 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/设备管理/设备工艺参数订单点检表/SB_EquipICMOTechParamBillEdit.html 62 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/layuiadmin/common.js
@@ -27,10 +27,15 @@
}
// åˆ¤ç©ºå‡½æ•°
function isEmpty(val, zeroIsEmpty = false, falseIsEmpty = false){
function isEmpty(value, zeroIsEmpty = false, falseIsEmpty = false){
    let val = value
    // æ£€æŸ¥æ˜¯å¦ä¸ºnull  æˆ–者 undefind
    if(val === null || val === undefined){
        return true;
    }
    //如果字符串全部是由数字构成的,则转化为数字型
    if(isAllDigits(val) === true){
        val = Number(val)
    }
    // æ˜¯å¦æ˜¯å­—符串类型
@@ -69,4 +74,9 @@
        }
        return false;
    }
}
// åˆ¤æ–­æ˜¯å¦å…¨æ˜¯æ•°å­—
function isAllDigits(str) {
  return /^\d+$/.test(str);
}
WebTM/views/Ä£Öξ߹ÜÀí/Ä£Öξ߹ÜÀí/Sc_Add_MouldConkBookBillList.html
@@ -29,6 +29,8 @@
                            <div class="layui-btn-group">
                                <button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius"
                                    lay-submit="" lay-filter="Saver">保存</button>
                                <button type="button" id="check-btn" class="layui-btn layui-btn-normal layui-btn-radius"
                                    lay-submit="" lay-filter="Checker">审核</button>
                                <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit=""
                                    lay-filter="Exit">退出</button>
                            </div>
@@ -509,6 +511,11 @@
                });
            });
            //审核
            form.on('submit(Checker)', function(){
            })
            //表头信息负责人弹窗
            form.on('submit(HManagerList)', function () {
                //页面层-自定义
WebTM/views/É豸¹ÜÀí/É豸¹¤ÒÕ²ÎÊý¶©µ¥µã¼ì±í/SB_EquipICMOTechParamBillEdit.html
@@ -18,6 +18,7 @@
    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
    <script src="../../../layuiadmin/PubCustom.js"></script>
    <script src="../../../layuiadmin/PageTitle.js"></script>
    <script src="../../../layuiadmin/common.js"></script>
    <style type="text/css">
        .layui-form-item .layui-inline {
            margin-right: 0;
@@ -554,11 +555,11 @@
                $("#HDeptName").val(sessionStorage["HDept"]); //根据登录用户带出车间
                $("#HGroupID").val(sessionStorage["HGroupID"]); //根据登录用户带出班组ID
                $("#HGroupName").val(sessionStorage["HGroup"]); //根据登录用户带出班组
                $('#btn_PrevPage').addClass('layui-btn-disabled').attr('disabled', true)
                $('#btn_NextPage').addClass('layui-btn-disabled').attr('disabled', true)
                $("#btn_PrevPage").addClass("layui-btn-disabled").attr('disabled', true)
                $("#btn_NextPage").addClass("layui-btn-disabled").attr('disabled', true)
            }
            else if (OperationType == 2) {  //复制
                $("#HInterID").val(HInterID);
                //编辑状态时,根据内码,获取信息并写入界面
                RoadBillMain(HInterID);
                //文件选择初始化
@@ -575,13 +576,14 @@
                $("#HDeptName").val(sessionStorage["HDept"]); //根据登录用户带出车间
                $("#HGroupID").val(sessionStorage["HGroupID"]); //根据登录用户带出班组ID
                $("#HGroupName").val(sessionStorage["HGroup"]); //根据登录用户带出班组
                get_billWithProcAndSource()
                OperationType = 1;
            }
            else if (OperationType == 3) {  //编辑
                $("#HInterID").val(HInterID);//修改时主表ID
                //编辑状态时,根据内码,获取信息并写入界面
                RoadBillMain(HInterID);
                get_billWithProcAndSource()
                //文件选择初始化
                PicUpload();
                getFile();
@@ -730,8 +732,7 @@
                            //行数据 ä¸‹æ‹‰å¤é€‰æ¡† æ˜¾ç¤º
                            checkRefresh();
                            layer.close(ajaxLoad);
                            sWhere = " and HProcID = " + data.HProcID + " and HSourceID = " + data.HSourceID
                            GetBillLocation(HInterID, sWhere);
                        } else {
                            layer.close(ajaxLoad);
                            layer.alert(result.msg, { icon: 5, btn: ['退出'], time: 100000, offset: 't' });
@@ -759,7 +760,12 @@
                    data: { "HInterID": HInterID, "HMaker": HMaker, "sWhere": sWhere },
                    success: function (data1) {
                        total = data1.count;
                        current = data1.data[0].current;
                        if (data1.data.length > 0) {
                            current = data1.data[0].current;
                        }
                        else {
                            current = 0
                        }
                        pageJudgement();
                        layer.close(ajaxLoad);
                    },
@@ -892,7 +898,8 @@
                    , shift: 2                  //弹出动画
                    , area: ["90%", "90%"]      //窗体大小
                    , maxmin: true              //设置最大最小按钮是否显示
                    , content: ['../../基础资料/生产基础资料/Gy_Process.html?openType=2', 'yes']
                    // , content: ['../../基础资料/生产基础资料/Gy_Process.html?openType=2', 'yes']
                    , content: ['../../基础资料/生产基础资料/Gy_Process.html', 'yes']
                    , btn: ["确定", "取消"]
                    , btn1: function (index, laero) {
                        //按钮一  çš„回调
@@ -905,11 +912,26 @@
                        $("#HProcName").val(checkStatus.data[0].工序名称);
                        $("#HProcID").val(checkStatus.data[0].HItemID);
                        layer.close(index); //关闭弹窗  å®ƒèŽ·å–çš„å§‹ç»ˆæ˜¯æœ€æ–°å¼¹å‡ºçš„æŸä¸ªå±‚ï¼Œå€¼æ˜¯ç”±layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) { }
                    , end: function () {
                        get_billWithProcAndSource()
                    }
                })
            }
            //#endregion
            function get_billWithProcAndSource() {
                let interID = isEmpty($('#HInterID').val()) == true ? 0 : $('#HInterID').val()
                let HProcID = $('#HProcID').val()
                let HSourceID = $('#HSourceID').val()
                if (isEmpty(HProcID, true, true) == false) {
                    // å·¥åºæ˜¯å¿…填项
                    sWhere = " and HProcID = " + HProcID + " and HSourceID = " + HSourceID
                    GetBillLocation(interID, sWhere);
                }
            }
            //#region é€‰æ‹©ç‚¹æ£€äºº
            function get_checkEmp() {
@@ -965,6 +987,9 @@
                        layer.close(index); //关闭弹窗  å®ƒèŽ·å–çš„å§‹ç»ˆæ˜¯æœ€æ–°å¼¹å‡ºçš„æŸä¸ªå±‚ï¼Œå€¼æ˜¯ç”±layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) { }
                    , end: function () {
                        get_billWithProcAndSource()
                    }
                })
            }
            //#endregion
@@ -1642,7 +1667,7 @@
                    maxmin: true, //开启最大化最小化按钮
                    area: ['90%', '80%'],
                    content: '../设备工艺参数订单点检表/SB_EquipICMOTechParamBillEdit_HistoryRecord.html?linterid=' + HInterID
                    + '&HProcID='+ HProcID + '&HSourceID='+ HSourceID
                        + '&HProcID=' + HProcID + '&HSourceID=' + HSourceID
                });
            })
@@ -1805,6 +1830,7 @@
                            {
                                $("#HInterID").val(data.HInterID);//获取提交成功返回的单据主ID
                                set_CheckBill(1); //审核
                                get_billWithProcAndSource() // é‡æ–°èŽ·å–ä½ç½®
                            }
                            layer.close(index);
                            layer.close(index);
@@ -2099,22 +2125,30 @@
                });
            }
            //#endregion
            function pageJudgement() {
                if (total == 1) {
            function pageJudgement() { // è¯¥ç”Ÿäº§èµ„源和工序下没有数据 æˆ–者仅有一条数据
                if (total <= 1) {
                    $('#btn_PrevPage').addClass("layui-btn-disabled").attr("disabled", true);
                    $('#btn_NextPage').addClass("layui-btn-disabled").attr("disabled", true);
                    return
                }
                if (total == current) {
                if (total == current) { // è¾¾åˆ°ä¸Šé™
                    $('#btn_PrevPage').removeClass("layui-btn-disabled").attr("disabled", false);
                    $('#btn_NextPage').addClass("layui-btn-disabled").attr("disabled", true);
                } else if (current == 1) {
                } else if (current == 1) { // è¾¾åˆ°ä¸‹é™
                    $('#btn_PrevPage').addClass("layui-btn-disabled").attr("disabled", true);
                    $('#btn_NextPage').removeClass("layui-btn-disabled").attr("disabled", false);
                } else {
                } else if (current == 0) { // å±žäºŽè¯¥ç”Ÿäº§èµ„源和工序下的新增
                    current = total + 1
                    $('#btn_PrevPage').removeClass("layui-btn-disabled").attr("disabled", false);
                    $('#btn_NextPage').addClass("layui-btn-disabled").attr("disabled", true);
                } else if (current < total) {
                    $('#btn_PrevPage').removeClass("layui-btn-disabled").attr("disabled", false);
                    $('#btn_NextPage').removeClass("layui-btn-disabled").attr("disabled", false);
                }
                else {
                    $('#btn_PrevPage').addClass("layui-btn-disabled").attr("disabled", true);
                    $('#btn_NextPage').addClass("layui-btn-disabled").attr("disabled", true);
                }
            }
        });