Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI

yangle

2023-08-31 a022cc252ee0c5adec17f0b66eb61ce91402a273

Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI

 WebTM/layuiadmin/PubCustom.js

@@ -33,6 +33,18 @@
    return fmt;
}

// ç¼–辑获取表头时时间格式矫正方式
function formatDate(date) {
    var d = new Date(date),
        month = '' + (d.getMonth() + 1),
        day = '' + d.getDate(),
        year = d.getFullYear();

    if (month.length < 2) month = '0' + month;
    if (day.length < 2) day = '0' + day;

    return [year, month, day].join('-');
}
/**
 *判断手机还是电脑，电脑返回true，手机返回false
 *by zgq

 WebTM/views/ÖÊÁ¿¹ÜÀí/Ѳ¼ì¼Ç¼µ¥/QC_Add_Edit_PatrolProcCheckBill.html

@@ -93,6 +93,12 @@
                                                        <input type="text" name="HMainProcName" id="HMainProcName" onkeyup="this.value=this.value.replace(/\D/g,'')" lay-verify="" autocomplete="off" class="layui-input" value="">
                                                    </div>
                                                </div>
                                                <div class="layui-colorpicker-xs" style="margin-top:15px">
                                                    <label class="layui-form-label"> å¤‡æ³¨</label>
                                                    <div class="layui-input-block">
                                                        <input class="layui-input" name="HRemark" id="HRemark" autocomplete="off">
                                                    </div>
                                                </div>
                                            </div>
                                        </div>
                                        <div class="layui-form-item">
@@ -173,12 +179,6 @@
                                                        <input type="text" name="HProcExchBillNo" id="HProcExchBillNo" lay-verify="" autocomplete="off" class="layui-input">
                                                    </div>
                                                </div>
                                                <div class="layui-colorpicker-xs">
                                                    <label class="layui-form-label"> å¤‡æ³¨</label>
                                                    <div class="layui-input-block">
                                                        <input class="layui-input" name="HRemark" id="HRemark" autocomplete="off">
                                                    </div>
                                                </div>
                                            </div>
                                        </div>
                                    </div>
@@ -209,6 +209,12 @@
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>复制一行</button>
                            </div>
                        </script>
                        <script type="text/html" id="toolbarDemo2">
                            <div class="layui-btn-container">
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine_Bad"><i class="layui-icon layui-icon-form"></i>增加一行</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine_Bad"><i class="layui-icon layui-icon-form"></i>复制一行</button>
                            </div>
                        </script>
                        <script type="text/html" id="xuhao">
                            {{d.LAY_TABLE_INDEX+1}}
                        </script>
@@ -226,7 +232,7 @@
        <select name="HQCNote1" lay-filter="HQCNote1" id="HQCNote1{{d.LAY_TABLE_INDEX+1}}">
            <option value="">请选择</option>
            <option value="合格">合格</option>
            <option value="合格">不合格</option>
            <option value="不合格">不合格</option>
        </select>
    </script>
    <!--行下拉选择(检验记录2)-->
@@ -234,7 +240,7 @@
        <select name="HQCNote2" lay-filter="HQCNote2" id="HQCNote2{{d.LAY_TABLE_INDEX+1}}">
            <option value="">请选择</option>
            <option value="合格">合格</option>
            <option value="合格">不合格</option>
            <option value="不合格">不合格</option>
        </select>
    </script>
    <!--行下拉选择(检验记录3)-->
@@ -242,7 +248,7 @@
        <select name="HQCNote3" lay-filter="HQCNote3" id="HQCNote3{{d.LAY_TABLE_INDEX+1}}">
            <option value="">请选择</option>
            <option value="合格">合格</option>
            <option value="合格">不合格</option>
            <option value="不合格">不合格</option>
        </select>
    </script>
    <!--行下拉选择(检验记录4)-->
@@ -250,7 +256,7 @@
        <select name="HQCNote4" lay-filter="HQCNote4" id="HQCNote4{{d.LAY_TABLE_INDEX+1}}">
            <option value="">请选择</option>
            <option value="合格">合格</option>
            <option value="合格">不合格</option>
            <option value="不合格">不合格</option>
        </select>
    </script>
    <script src="../../../layuiadmin/layui/layui.js"></script>
@@ -258,6 +264,7 @@
    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
    <script src="../../../layuiadmin/PubCustom.js"></script>
    <script>
        //获取参数
        function getUrlVars() {
@@ -300,6 +307,7 @@
            //        icon: 4, skin: 'layui-layer-lan', title: "温馨提示", closeBtn: 0, btn: ['重新登录']
            //    }, function () { window.location.href = "../../user/login.html"; });
            //}
            //debugger
            var tableReload = table.reload;
            var option = {
                elem: '#mainTable'
@@ -312,8 +320,8 @@
                    , { templet: '#xuhao', title: '序号', sort: true, fixed: 'left', event: "qwe", width: 75 }
                    , { field: '检验项目分类', title: '检验项目分类', event: "", width: 120 }
                    , { field: 'HQCCheckItemID', title: '检验项目ID', edit: 'text', hide: true }
                    , { field: 'HQCCheckItemName', title: '检验项目名称', edit: 'text' ,width:120}
                    , { field: 'HQCStd', title: '检验标准', edit: 'text', event: "", width: 95, hide: true  }
                    , { field: 'HQCCheckItemName', title: '检验项目名称', edit: 'text', width: 120 }
                    , { field: 'HQCStd', title: '检验标准', edit: 'text', event: "", width: 95, hide: true }
                    , { field: 'HQCNote1', title: '检验记录1(08:00--12:00)', width: 185, templet: '#HQCNote1' }
                    , { field: 'HQCNote2', title: '检验记录2(13:00--17:00)', width: 185, templet: '#HQCNote2' }
                    , { field: 'HQCNote3', title: '检验记录3(18:00--23:00)', width: 185, templet: '#HQCNote3' }
@@ -332,7 +340,7 @@

            var option_BadRe = {
                elem: '#BadReTable'
                , toolbar: '#toolbarDemo'
                , toolbar: '#toolbarDemo2'
                , height: 500
                //,url: '/demo/table/user/' //数据接口
                , page: true //开启分页
@@ -367,11 +375,11 @@
            //判断是否新增
            if (OperationType == 1) {
                //初始加载表格{ "ID": 0, "HWasterReasonName": " ","HBadReasonID":0,"HEmpName": "  ", "HSQProcName": "   ","HProcID":0, "HZRProcName": "  ", "HMRBChecker": "  ", "HRemark": "  ", "HPSProcName": "  ", "HCloseMan": "   " }
                option.data = [{ "HBadReasonID": 0, "HQCStd": " ", "HQCNote1": " ", "HQCNote2": " ", "HQCNote3": "  ", "HQCNote4": "  ", "HQCNote5": " ", "HQCNote6": " ", "HQCNote7": " ", "HQCNote8": " ", "HQCNote9": " ", "HQCNote10": " ", "HRemark": " " }];
                option.data = [{ "检验项目分类":"","HQCCheckItemID":0,"HQCCheckItemName": "", "HQCStd": " ", "HQCNote1": " ", "HQCNote2": " ", "HQCNote3": "  ", "HQCNote4": "  ", "HQCNote5": " ", "HQCNote6": " ", "HQCNote7": " ", "HQCNote8": " ", "HQCNote9": " ", "HQCNote10": " ", "HRemark": " " }];
                table.render(option);

                option_BadRe.data = [{
                    "HQCCheckItemID": 0, "HBadReasonNumber": "", "HBadReasonName": "", "HEmpID": 0, "HEmpNumber": "", "HEmpName": "", "HProcID": 0,
                    "HBadReasonID":0,"HBadReasonNumber": "", "HBadReasonName": "", "HEmpID": 0, "HEmpNumber": "", "HEmpName": "", "HProcID": 0,
                    "HProcNumber": "", "HProcName": "", "HCheckEmpID": 0, "HCheckEmpNumber": "", "HCheckEmpName": "", "HMaterID": 0, "HMaterNumber": "",
                    "HMaterName": "", "HMaterModel": "", "HCreateDate": Format(new Date(), "yyyy-MM-dd"), "HFinishDate": Format(new Date(), "yyyy-MM-dd"), "HQty": 0, "HRemark": ""
                }];
@@ -379,15 +387,55 @@
            }
            else if (OperationType == 2) {
                $("#HInterID").val(linterid);//修改时主表ID
                //编辑加载数据
                //编辑加载数据--表体
                $.ajax({
                    url: GetWEBURL() + 'MES_QC_PatrolProcCheckDetail_Json',
                    type: "GET",
                    data: { "sqlWhere": "and HInterID=" + linterid },
                    success: function (result) {
                        if (result.count == 1) {
                            option.data = result.data;
                            //检验项目
                            var rowdata = [];
                            var data = result.data;
                            for (let i = 0; i < result.data.length; i++) {
                                rowdata.push({
                                    "检验项目分类": data[i].检验项目分类, "HQCCheckItemID": data[i].HQCCheckItemID, "HQCCheckItemName": data[i].检验项目名称,
                                    "HQCStd": data[i].HQCStd, "HQCNote1": data[i].HQCNote1, "HQCNote2": data[i].HQCNote2, "HQCNote3": data[i].HQCNote3,
                                    "HQCNote4": data[i].HQCNote4, "HQCNote5": data[i].HQCNote5, "HQCNote6": data[i].HQCNote6, "HQCNote7": data[i].HQCNote7,
                                    "HQCNote8": data[i].HQCNote8, "HQCNote9": data[i].HQCNote9, "HQCNote10": data[i].HQCNote10, "HRemark": data[i].表体备注
                                });
                            }

                            option.data = rowdata;
                            table.render(option);
                            for (var i = 0; i < result.data.length; i++) {
                                $('#HQCNote1' + (i + 1)).find("option[value='" + result.data[i].HQCNote1 + "']").attr("selected", true);
                                $('#HQCNote2' + (i + 1)).find("option[value='" + result.data[i].HQCNote2 + "']").attr("selected", true);
                                $('#HQCNote3' + (i + 1)).find("option[value='" + result.data[i].HQCNote3 + "']").attr("selected", true);
                                $('#HQCNote4' + (i + 1)).find("option[value='" + result.data[i].HQCNote4 + "']").attr("selected", true);
                            }
                            form.render('select');

                            //不良原因
                            var baddata = [];
                            var HSEQArr = [];
                            for (let i = 0; i < result.data.length; i++) {
                                if (HSEQArr.indexOf(data[i].行号) == -1) {
                                    HSEQArr.push(data[i].行号);
                                    baddata.push({
                                        "HBadReasonID": data[i].HBadReasonID, "HBadReasonNumber": data[i].不良原因代码, "HBadReasonName": data[i].不良原因名称,
                                        "HEmpID": data[i].HEmpID, "HEmpNumber": data[i].责任人代码, "HEmpName": data[i].责任人名称, "HProcID": data[i].HProcID,
                                        "HProcNumber": data[i].责任工序代码, "HProcName": data[i].责任工序名称, "HCheckEmpID": data[i].HCheckEmpID,
                                        "HCheckEmpNumber": data[i].确认人代码, "HCheckEmpName": data[i].确认人名称, "HMaterID": data[i].HMaterID,
                                        "HMaterNumber": data[i].物料代码, "HMaterName": data[i].物料名称, "HMaterModel": data[i].规格型号,
                                        "HCreateDate": Format(new Date(data[i].登记日期), "yyyy-MM-dd"), "HFinishDate": Format(new Date(data[i].完成日期), "yyyy-MM-dd"),
                                        "HQty": data[i].不良数量, "HRemark": data[i].不良备注
                                    });
                                }
                            }

                            option_BadRe.data = baddata;
                            table.render(option_BadRe);                         
                        } else {
                            layer.alert(result.code + result.Message, { icon: 5 });
                        }
@@ -430,6 +478,43 @@
                            table.cache["mainTable"].push(JSON.parse(copyrow));//将复制的行强转成json追加到表格上
                            option.data = table.cache["mainTable"];//将数据绑定到data上
                            table.render(option);//将数据渲染到表格上
                            //layer.alert(copyrow);
                        }
                        break;
                }
            });
            //不良原因
            table.on('toolbar(BadReTable)', function (obj) {
                var checkStatus = table.checkStatus('BadReTable')
                    , data = checkStatus.data;;
                var AddRow = table.cache['BadReTable'];
                var NewRow = {
                    "HQCCheckItemID": 0, "HBadReasonID": 0, "HBadReasonNumber": "", "HBadReasonName": "", "HEmpID": 0, "HEmpNumber": "", "HEmpName": "", "HProcID": 0,
                    "HProcNumber": "", "HProcName": "", "HCheckEmpID": 0, "HCheckEmpNumber": "", "HCheckEmpName": "", "HMaterID": 0, "HMaterNumber": "",
                    "HMaterName": "", "HMaterModel": "", "HCreateDate": Format(new Date(), "yyyy-MM-dd"), "HFinishDate": Format(new Date(), "yyyy-MM-dd"), "HQty": 0, "HRemark": ""
                };
                switch (obj.event) {
                    case 'btn-AddLine_Bad':
                        table.cache["BadReTable"].push(NewRow);
                        option_BadRe.data = table.cache["BadReTable"];
                        table.render(option_BadRe);
                        rows++;
                        layer.msg('增加一行按钮！')
                        break;
                    case 'btn-CopyLine_Bad':
                        var copydata = JSON.stringify(data);
                        if (data.length <= 0) {
                            layer.alert("请选择需要复制的一行！");
                        }
                        else if (data.length > 1) {
                            layer.alert("只能选择复制一行！");
                        }
                        else {
                            var copydata2 = copydata.substring(1, copydata.length);//去除首行字符'['
                            var copyrow = copydata2.substring(0, copydata2.length - 1);//去除末尾字符']'
                            table.cache["BadReTable"].push(JSON.parse(copyrow));//将复制的行强转成json追加到表格上
                            option_BadRe.data = table.cache["BadReTable"];//将数据绑定到data上
                            table.render(option_BadRe);//将数据渲染到表格上
                            //layer.alert(copyrow);
                        }
                        break;
@@ -861,23 +946,28 @@
                            var data = result.data.h_v_QC_Edit_PatrolProcCheckBillList[0];
                            form.val("component-form-group", { //formTest å³ class="layui-form" æ‰€åœ¨å…ƒç´ å±žæ€§ lay-filter="" å¯¹åº”的值
                                "HBillNo": data.单据号
                                , "HDate": data.日期
                                , "HSource": data.生产资源名称
                                , "HSourceID": data.生产资源ID
                                , "HICMOBillNo": data.HICMOBillNo
                                , "HICMOQty": data.HICMOQty
                                , "HICMOInterID": data.HICMOInterID
                                , "HMaterNumber": data.产品名称
                                , "HMaterID": data.产品ID
                                , "HMaterNumber": data.产品内码
                                , "HProcExchQty": data.HProcExchQty
                                , "HProcExchBillNo": data.HProcExchBillNo
                                , "HProcExchInterID": data.HProcExchInterID
                                , "HProcExchEntryID": data.HProcExchEntryID
                                , "HDate": formatDate(data.日期)
                                //, "HSource": data.生产资源名称
                                //, "HSourceID": data.生产资源ID
                                //, "HICMOBillNo": data.HICMOBillNo
                                //, "HICMOQty": data.HICMOQty
                                //, "HICMOInterID": data.HICMOInterID
                                //, "HMaterNumber": data.产品名称
                                //, "HMaterID": data.产品ID
                                //, "HMaterNumber": data.产品内码
                                //, "HProcExchQty": data.HProcExchQty
                                //, "HProcExchBillNo": data.HProcExchBillNo
                                //, "HProcExchInterID": data.HProcExchInterID
                                //, "HProcExchEntryID": data.HProcExchEntryID
                                , "HEmpName": data.检验员名称
                                , "HFirstCheckEmp": data.检验员ID
                                , "HMainProcID": data.HMainProcID
                                , "HMainProcNumber": data.工序代码
                                , "HMainProcName": data.工序名称
                                , "HRemark": data.表头备注
                            });



                        } else {
                            layer.alert(result.msg, { icon: 5, btn: ['退出'], time: 100000, offset: 't' });
@@ -914,7 +1004,7 @@
                    }
                });
            }
            else if (OperationType == 2){//如果修改则走下面 new
            else if (OperationType == 2) {//如果修改则走下面 new
                $("#HInterID").val(linterid);//修改时主表ID
                RoadBillMain(linterid);
                /* RoadBillSub(linterid);*/
@@ -1184,9 +1274,8 @@
                //debugger;
                var sMainStr = JSON.stringify(data.field);
                var sSubStr = JSON.stringify(table.cache['mainTable']);
                console.log(sSubStr);
                return;
                var sMainSub = sMainStr + ';' + sSubStr + ";" + sessionStorage["HUserName"];
                var sBadStr = JSON.stringify(table.cache['BadReTable']);
                var sMainSub = sMainStr + ';' + sSubStr + ";" + sessionStorage["HUserName"] + ";" + sBadStr;
                $.ajax(
                    {
                        type: "POST",
@@ -1229,6 +1318,50 @@
                }
            });

            //行选择处理（检验记录1）
            form.on('select(HQCNote1)', function (data) {
                //获取下拉框选中的值
                var elem = data.othis.parents('tr');
                var dataindex = elem.attr("data-index");
                $.each(option.data, function (index, value) {
                    if (value.LAY_TABLE_INDEX == dataindex) {
                        value.HQCNote1 = data.value;//把选中下拉框id值赋值给表格缓存
                    }
                });
            });
            //行选择处理（检验记录2）
            form.on('select(HQCNote2)', function (data) {
                //获取下拉框选中的值
                var elem = data.othis.parents('tr');
                var dataindex = elem.attr("data-index");
                $.each(option.data, function (index, value) {
                    if (value.LAY_TABLE_INDEX == dataindex) {
                        value.HQCNote2 = data.value;//把选中下拉框id值赋值给表格缓存
                    }
                });
            });
            //行选择处理（检验记录3）
            form.on('select(HQCNote3)', function (data) {
                //获取下拉框选中的值
                var elem = data.othis.parents('tr');
                var dataindex = elem.attr("data-index");
                $.each(option.data, function (index, value) {
                    if (value.LAY_TABLE_INDEX == dataindex) {
                        value.HQCNote3 = data.value;//把选中下拉框id值赋值给表格缓存
                    }
                });
            });
            //行选择处理（检验记录4）
            form.on('select(HQCNote4)', function (data) {
                //获取下拉框选中的值
                var elem = data.othis.parents('tr');
                var dataindex = elem.attr("data-index");
                $.each(option.data, function (index, value) {
                    if (value.LAY_TABLE_INDEX == dataindex) {
                        value.HQCNote4 = data.value;//把选中下拉框id值赋值给表格缓存
                    }
                });
            });         

        });
        //定义全局变量

 WebTM/views/ÖÊÁ¿¹ÜÀí/Ѳ¼ì¼Ç¼µ¥/QC_PatrolProcCheckBillList.html

@@ -224,7 +224,7 @@
                                , shade: 0.6 //遮罩透明度
                                , maxmin: true //允许全屏最小化
                                , anim: 0 //0-6的动画形式，-1不开启
                                , content: '../巡检记录单/QC_Add_Edit_PatrolProcCheckBill.html?hID=' + hID
                                , content: '../巡检记录单/QC_Add_Edit_PatrolProcCheckBill.html?OperationType=2&linterid=' + hID + '&HSouceBillType=0&closeType=1'
                                , resize: false
                                , cancel: function () {
                                    //$(".layui-btn").removeClass("layui-btn-disabled");

 WebTM/views/³µ¼ä¹ÜÀí/¹¤Ðò³öÕ¾»ã±¨µ¥/Cj_StationOutBill.html

@@ -1330,7 +1330,7 @@
                    return;
                }
                var tableData = data.field;
                var oMain = JSON.stringify(data.field) + ";" + sessionStorage["HUserName"];
                var oMain = JSON.stringify(data.field) + ";" + sessionStorage["HUserName"] + ";" + OperationType;
                var index = layer.load();
                $.ajax({
                    type: "POST",

 WebTM/views/³µ¼ä¹ÜÀí/¹¤Ðò½øÕ¾½ÓÊÕµ¥/Cj_StationInBill.html

@@ -542,7 +542,7 @@
                    return;
                }
                //console.log(data.field);
                var oMain = JSON.stringify(data.field) + ";" + sessionStorage["HUserName"];
                var oMain = JSON.stringify(data.field) + ";" + sessionStorage["HUserName"] + ";" + OperationType;
                //var oMain = data.field;
                var HUserName = sessionStorage["HUserName"];
                var index = layer.load();