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

wtt

2024-10-16 00ea07f0fcdb261bf088e8aed9443161064cce1e

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

 WebTM/WebTM.csproj.user

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <NameOfLastUsedPublishProfile>C:\Users\86130\Desktop\智云迈思\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
    <NameOfLastUsedPublishProfile>D:\智云迈思\MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
    <ProjectView>ProjectFiles</ProjectView>
    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
    <UseIISExpress>true</UseIISExpress>

 WebTM/layuiadmin/Scripts/webConfig.js

@@ -3,12 +3,12 @@
    //var WEBURL = "http://192.168.16.80:8011/";          //办公室服务器
    //var WEBURL = "http://localhost:8081/SWEAPI/";       //ch本地*/
    //var WEBURL = "http://61.164.86.218:8099/ABAPI/";
    var WEBURL = "http://localhost/API/";             //颜晓军本地配置
    //var WEBURL = "http://localhost/API/";             //颜晓军本地配置
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //杨乐本地配置
    //var WEBURL = "http://localhost:8082/API/";    //杜贺本地配置
    /*var WEBURL = "http://localhost/API/";*/    //潘浙游本地配置  
    //var WEBURL = "http://localhost:8082/API/";    //张瑞广本地配置
    var WEBURL = "http://localhost:81/API/";    //翁涛涛本地配置
    var WEBURL = "http://localhost:8082/API/";    //张瑞广本地配置
    //var WEBURL = "http://localhost:81/API/"    //翁涛涛本地配置
    //var WEBURL = "http://47.96.97.237/API/";          //智云服务器
    /*var WEBURL = "http://localhost:8082/LuBaoAPI/"; */  //余思杰本地配置
    //var WEBURL = "http://localhost:8088/ARAPI/";      //余思杰本地配置(安瑞)

 WebTM/views/Ä£Öξ߹ÜÀí/Æ÷¾ß±¨±í/Sc_MouldResumeCheckQuery.html

@@ -10,6 +10,7 @@
    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
    <script src="../../../layuiadmin/layui/layui.js"></script>
    <script src="../../../layuiadmin/layui/layui1.js"></script>
    <script src="../../../layuiadmin/PubCustom.js"></script>
    <script src="../../../layuiadmin/Scripts/json2.js"></script>
    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
@@ -19,6 +20,7 @@
        .layui-tree-set-active > .layui-tree-entry .layui-tree-main {
            background: #aef0f7;
        }

        .my-btn-container {
            min-width: 380px; /* è®¾ç½®æœ€å°å®½åº¦ */
            /* å…¶ä»–需要的样式 */
@@ -95,10 +97,20 @@
                , soulTable = layui.soulTable
                , tree = layui.tree
            var sWhere = "";
            var HNumber = "";
            var HName = "";
            var option = [];
            var optionResume = [];
            var titleData = ["HInterID", "HBillType"];
            var treeId;
            //获取参数
            var params = getUrlVars();
            var OperationType = params[params[0]]; //从参数中获取 æ•°æ®ç±»åž‹  1添加 ä¿å­˜  2复制  3 ç¼–辑
            var linterid  = params[params[1]]; //从参数中获取 å•æ®å†…码
                HNumber = params[params[2]]; //从参数中获取 
                HName = params[params[3]]; //从参数中获取
            HNumber = decodeURI(HNumber);
            HName = decodeURI(HName);
            //#endregion

            //#region è¿›å…¥é¡µé¢å³åŠ è½½
@@ -113,7 +125,7 @@
                    case 'get_Refresh': get_Refresh();
                        break;
                    //退出按钮
                    case 'get_Exit': Pub_Close(2);
                    case 'get_Exit': get_Exit();
                        break;
                    //退出按钮
                    case 'get_Search': get_DisplayResume();
@@ -161,9 +173,15 @@
            function set_ClearBill() {
                //初始化表格
                set_InitGrid();

                //查询
                get_Display(sWhere);
                if (OperationType == 3) {
                    $("#HNumber").val(HNumber);
                    $("#HName").val(HName);
                    get_FastQuery();
                    get_DisplayResume(linterid)
                } else {
                    //查询
                    get_Display(sWhere);
                }               
                //查询设备分类
                get_Display_Tree();
            }
@@ -310,61 +328,64 @@
            function get_DisplayResume(HInterID) {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var HInterID = data[0].hmainid.toString();
                    var ajaxLoad = layer.load();
                    $.ajax({
                        url: GetWEBURL() + '/Gy_MouldFileMain/GetMouldResumeList',
                        type: "GET",
                        data: { "HInterID": HInterID, "user": sessionStorage["HUserName"] },
                        success: function (data1) {
                            if (data1.count == 1) {
                                var data = [];
                                var col = [];
                                var totalArray = ["数量", "关联数量", "未关联数量", "打印条码数量", "未打印条码数量", "实收数量", "金额", "计划金额"];
                                //给空的数组赋值
                                for (var key in data1.list) {
                                    data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
                                }
                                //在列表左边添加勾选框
                                col.push({ type: 'checkbox', fixed: 'left', totalRowText: '合计' });
                                for (var i = 0; i < data.length; i++) {
                                    // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
                                    if ($.inArray(data[i].name, titleData) > -1) {
                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //隐藏id列
                                    }
                                    else if ($.inArray(data[i].name, totalArray) > -1) {  //添加计算列
                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
                                    } else {
                                        switch (data[i].Type) {
                                            //int
                                            case 'DateTime':
                                                col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " == null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 200 });
                                                break;
                                            default:
                                                col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
                                        }
                                    }
                                }
                                optionResume.cols = [col];
                                optionResume.data = data1.data;
                if (OperationType != 3) {
                    if (checkStatus.data.length === 1) {
                        var HInterID = data[0].hmainid.toString();

                                table.render(optionResume);
                                layer.close(ajaxLoad);
                                //layer.alert("查询成功", { icon: 1 });
                            } else {
                                layer.close(ajaxLoad);
                                layer.alert(data1.code + data1.Message, { icon: 5 });
                    } else {
                        layer.msg('请选择一行数据查询！');
                        return;
                    }
                }                
                var ajaxLoad = layer.load();
                $.ajax({
                    url: GetWEBURL() + '/Gy_MouldFileMain/GetMouldResumeList',
                    type: "GET",
                    data: { "HInterID": HInterID, "user": sessionStorage["HUserName"] },
                    success: function (data1) {
                        if (data1.count == 1) {
                            var data = [];
                            var col = [];
                            var totalArray = ["数量", "关联数量", "未关联数量", "打印条码数量", "未打印条码数量", "实收数量", "金额", "计划金额"];
                            //给空的数组赋值
                            for (var key in data1.list) {
                                data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
                            }
                        }, error: function () {
                            //在列表左边添加勾选框
                            col.push({ type: 'checkbox', fixed: 'left', totalRowText: '合计' });
                            for (var i = 0; i < data.length; i++) {
                                // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
                                if ($.inArray(data[i].name, titleData) > -1) {
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //隐藏id列
                                }
                                else if ($.inArray(data[i].name, totalArray) > -1) {  //添加计算列
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
                                } else {
                                    switch (data[i].Type) {
                                        //int
                                        case 'DateTime':
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " == null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 200 });
                                            break;
                                        default:
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
                                    }
                                }
                            }
                            optionResume.cols = [col];
                            optionResume.data = data1.data;

                            table.render(optionResume);
                            layer.close(ajaxLoad);
                            layer.alert("接口请求失败!", { icon: 5 });
                            //layer.alert("查询成功", { icon: 1 });
                        } else {
                            layer.close(ajaxLoad);
                            layer.alert(data1.code + data1.Message, { icon: 5 });
                        }
                    });
                } else {
                    layer.msg('请选择一行数据查询！');
                }
                
                    }, error: function () {
                        layer.close(ajaxLoad);
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                });
            }

            //快速过滤
@@ -482,6 +503,28 @@
                $("#btnSearch").click();
            }

            //退出
            function get_Exit() {
                if (OperationType != 3) {
                    Pub_Close(2);
                } else {
                    Pub_Close(1);
                }
            }

            //#region èŽ·å–参数
            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;
            }
            //#endregion

            //以上是layui模块
        });


 WebTM/views/Éú²ú¹ÜÀí/±¨¹¤Ì¨¹¤Ðò/²»Á¼²É¼¯/Sc_QualityReportStepBillList.html

@@ -187,7 +187,7 @@
                , soulTable = layui.soulTable
            var option = [];
            var sWhere = "";

            var HModName = "Sc_QualityReportStepBillList";
            //#region ã€è¿‡æ»¤æ–¹æ¡ˆã€‘

            //过滤条件的classç±» 

 WebTM/views/Éú²ú¹ÜÀí/±¨¹¤Ì¨¹¤Ðò/²»Á¼²É¼¯/Sc_QualityReportStepBill_New.html

@@ -258,7 +258,8 @@
            <option value="放行">放行</option>
            <option value="工废">工废</option>
            <option value="料废">料废</option>
             <option value="样件保留">样件保留</option>
            <option value="样件保留">样件保留</option>
            <option value="">请选择</option>
        </select>
    </script>
    <script>
@@ -332,6 +333,11 @@
                //子表初始化
                set_InitGrid();
                set_ProcessBill(linterid, HEntryID);
            }
            else if (OperationType == 6) {                                                  //出站汇报单下推
                //子表初始化
                set_InitGrid();
                set_StationOutBill(linterid);
            }
            //#endregion

@@ -1049,6 +1055,95 @@
                })
            }
            //#endregion
            
            //#region (出站汇报单)下推页面初始化
            function set_StationOutBill(linterid) {
                //生成并设置主表的内码和单据号
                createBillNo();

                //相关文本框信息初始化
                $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
                $("#HMaker").val(sessionStorage["HUserName"]);
                $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd"));

                var ajaxLoad = layer.load();

                $.ajax({
                    url: GetWEBURL() + "/Cj_StationOutBill/PushDownBackInfo",
                    type: "GET",
                    async: false,
                    data: { "linterid": linterid,"user": sessionStorage["HUserName"] },
                    success: function (result) {
                        if (result.code == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                            var data = result.data[0];
                            //主表赋值
                            $("#HEmpID").val(sessionStorage["HEmpID"] == undefined ? 0 : sessionStorage["HEmpID"]);
                            $("#HEmpName").val(sessionStorage["HEmpName"]);
                            $("#HDeptID").val(data.HDeptID);
                            $("#HDeptName").val(data.车间);
                            $("#HGroupID").val(data.HGroupID);
                            $("#HGroupName").val(data.生产班组);

                            //组织的值HOrgID变化，重新渲染
                            HOrgIDBar = data.组织;

                            //子表  èµ‹å€¼
                            var rowdata = [];
                            for (var i = 0; i < result.data.length; i++) {
                                rowdata.push(
                                    {
                                        "HMaterID": result.data[i]["HMaterID"],
                                        "物料代码": result.data[i]["产品代码"],
                                        "物料名称": result.data[i]["产品名称"],
                                        "规格型号": result.data[i]["规格型号"],
                                        "HProcID": result.data[i]["HProcID"],
                                        "工序": result.data[i]["工序"],
                                        "HUnitID": result.data[i]["HUnitID"],
                                        "计量单位": result.data[i]["计量单位"],
                                        "HQty": result.data[i]["出站数量"],
                                        "HSourceID": result.data[i]["HSourceID"],
                                        "生产资源": result.data[i]["生产资源"],
                                        "HBadProcID": "0",
                                        "责任工序": "",
                                        "HRemark": "",
                                        "HProcExchInterID": result.data[i]["HProcExchInterID"],
                                        "HProcExchEntryID": result.data[i]["HProcExchEntryID"],
                                        "HProcExchBillNo": result.data[i]["工序流转卡号"],
                                        "HICMOInterID": result.data[i]["HICMOInterID"],
                                        "HICMOEntryID": result.data[i]["HICMOEntryID"],
                                        "HICMOBillNo": result.data[i]["生产订单号"],                                     
                                        "HSourceInterID": result.data[i]["hmainid"],
                                        "HSourceEntryID": "0",
                                        "HSourceBillNo": result.data[i]["单据号"],
                                        "HSourceBillType": result.data[i]["单据类型"],
                                        "HResult": "",
                                        "HEmpID": "0",
                                        "检验员": "",
                                        "HBadReasonID": "0",
                                        "不良原因": "",
                                        "HBarCode": "",
                                        "HReportType": "3",
                                        "HAddr": "",
                                        "HMaker": "",
                                        "HMakeDate": Format(new Date(), 'yyyy-MM-dd')
                                    }
                                );
                            }
                            option.data = rowdata;

                            table.render(option);
                            layer.close(ajaxLoad);
                        } else {
                            layer.close(ajaxLoad);
                            layer.alert(result.msg, { icon: 5, btn: ['退出'], time: 100000, offset: 't' });
                        }
                    }, error: function () {
                        layer.close(ajaxLoad);
                        layer.alert("发生错误!", { icon: 5 });
                    }
                })
            }
            //#endregion

            //#region å¼¹çª—选择方法
            //#region ç”Ÿäº§è½¦é—´é€‰æ‹©é¡µé¢
@@ -1134,7 +1229,7 @@
            function set_SaveBill(data) {
                //记录操作类型
                var refSav = "";
                if (OperationType == 1 || OperationType == 2 || OperationType == 4 || OperationType == 5) {
                if (OperationType == 1 || OperationType == 2 || OperationType == 4 || OperationType == 5 || OperationType == 6) {
                    refSav = "Add";
                    data.field.HChangeDate = new Date();
                    data.field.HSTOCKORGID = data.field.HOrgID;
@@ -1206,7 +1301,7 @@
                //    return false;
                //}

                if ($("#HEmpID").val() == "0") {
                if ($("#HEmpID").val() == "0" || $("#HEmpID").val() == undefined || $("#HEmpID").val() == null) {
                    layer.msg("登记人未选择!");
                    return false;
                }
@@ -1226,6 +1321,22 @@
                        return false;
                    } else if (!ref.test(temp)) {
                        layer.msg("第" + (i+1) + "行：数量请输入大于0的数字！");
                        return false;
                    }
                    if (option.data[i]["HMaterID"] == 0 || option.data[i]["HMaterID"] == undefined || option.data[i]["HMaterID"] == null) {
                        layer.msg("第" + (i + 1) + "行：物料信息不允许为空！");
                        return false;
                    }
                    if (option.data[i]["HProcID"] == 0 || option.data[i]["HProcID"] == undefined || option.data[i]["HProcID"] == null) {
                        layer.msg("第" + (i + 1) + "行：工序信息不允许为空！");
                        return false;
                    }
                    if (option.data[i]["HResult"] == 0 || option.data[i]["HResult"] == undefined || option.data[i]["HResult"] == null) {
                        layer.msg("第" + (i + 1) + "行：判定结果不允许为空！");
                        return false;
                    }
                    if (option.data[i]["HBadReasonID"] == 0 || option.data[i]["HBadReasonID"] == undefined || option.data[i]["HBadReasonID"] == null) {
                        layer.msg("第" + (i + 1) + "行：不良原因不允许为空！");
                        return false;
                    }
                }
@@ -1430,7 +1541,7 @@
                                    layer.close(index);//关闭弹窗
                                }
                                , end: function () {
                                    if (HDataTemp != {}) {
                                     if (JSON.stringify(HDataTemp) != '{}') {
                                        //更新表格缓存的数据
                                        obj.update({
                                            "HMaterID": HDataTemp.HItemID
@@ -1473,7 +1584,7 @@
                                    layer.close(index);//关闭弹窗
                                }
                                , end: function () {
                                    if (HDataTemp != {}) {
                                     if (JSON.stringify(HDataTemp) != '{}') {
                                        //更新表格缓存的数据
                                        obj.update({
                                            "HUnitID": HDataTemp.HItemID
@@ -1512,7 +1623,7 @@
                                    layer.close(index);//关闭弹窗
                                }
                                , end: function () {
                                    if (HDataTemp != {}) {
                                     if (JSON.stringify(HDataTemp) != '{}') {
                                        //更新表格缓存的数据
                                        obj.update({
                                            "HEmpID": HDataTemp.HItemID
@@ -1551,7 +1662,7 @@
                                    layer.close(index);//关闭弹窗
                                }
                                , end: function () {
                                    if (HDataTemp != {}) {
                                     if (JSON.stringify(HDataTemp) != '{}') {
                                        //更新表格缓存的数据
                                        obj.update({
                                            "HSourceID": HDataTemp.HItemID
@@ -1590,7 +1701,7 @@
                                    layer.close(index);//关闭弹窗
                                }
                                , end: function () {
                                    if (HDataTemp != {}) {
                                    if (JSON.stringify(HDataTemp) != '{}') {
                                        //更新表格缓存的数据
                                        obj.update({
                                            "HBadReasonID": HDataTemp.HItemID

 WebTM/views/É豸¹ÜÀí/É豸±¨±í/Sb_EquipResumeCheckQuery.html

@@ -10,6 +10,7 @@
    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
    <script src="../../../layuiadmin/layui/layui.js"></script>
    <script src="../../../layuiadmin/layui/layui1.js"></script>
    <script src="../../../layuiadmin/PubCustom.js"></script>
    <script src="../../../layuiadmin/Scripts/json2.js"></script>
    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
@@ -19,6 +20,7 @@
        .layui-tree-set-active > .layui-tree-entry .layui-tree-main {
            background: #aef0f7;
        }

        .my-btn-container {
            min-width: 380px; /* è®¾ç½®æœ€å°å®½åº¦ */
            /* å…¶ä»–需要的样式 */
@@ -95,10 +97,20 @@
                , soulTable = layui.soulTable
                , tree = layui.tree
            var sWhere = "";
            var HNumber = "";
            var HName = "";
            var option = [];
            var optionResume = [];
            var titleData = ["HInterID", "HBillType"];
            var treeId;
            //获取参数
            var params = getUrlVars();
            var OperationType = params[params[0]]; //从参数中获取 æ•°æ®ç±»åž‹  1添加 ä¿å­˜  2复制  3 ç¼–辑
            var linterid = params[params[1]]; //从参数中获取 å•æ®å†…码
                HNumber = params[params[2]]; //从参数中获取 
                HName = params[params[3]]; //从参数中获取
                HNumber = decodeURI(HNumber);
                HName = decodeURI(HName);
            //#endregion

            //#region è¿›å…¥é¡µé¢å³åŠ è½½
@@ -113,7 +125,7 @@
                    case 'get_Refresh': get_Refresh();
                        break;
                    //退出按钮
                    case 'get_Exit': Pub_Close(2);
                    case 'get_Exit': get_Exit();                                            
                        break;
                    //退出按钮
                    case 'get_Search': get_DisplayResume();
@@ -161,9 +173,15 @@
            function set_ClearBill() {
                //初始化表格
                set_InitGrid();

                //查询
                get_Display(sWhere);
                if (OperationType == 3) {
                    $("#HNumber").val(HNumber);
                    $("#HName").val(HName);
                    get_FastQuery();
                    get_DisplayResume(linterid)
                } else {
                    //查询
                    get_Display(sWhere);
                }
                //查询设备分类
                get_Display_Tree();
            }
@@ -298,60 +316,63 @@
            function get_DisplayResume(HInterID) {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var HInterID = data[0].hmainid.toString();
                    var ajaxLoad = layer.load();
                    $.ajax({
                        url: GetWEBURL() + '/Gy_EquipFileMain/GetResumeList',
                        type: "GET",
                        data: { "HInterID": HInterID, "user": sessionStorage["HUserName"] },
                        success: function (data1) {
                            if (data1.count == 1) {
                                var data = [];
                                var col = [];
                                var totalArray = ["数量", "关联数量", "未关联数量", "打印条码数量", "未打印条码数量", "实收数量", "金额", "计划金额"];
                                //给空的数组赋值
                                for (var key in data1.list) {
                                    data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
                                }
                                //在列表左边添加勾选框
                                col.push({ type: 'checkbox', fixed: 'left', totalRowText: '合计' });
                                for (var i = 0; i < data.length; i++) {
                                    // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
                                    if ($.inArray(data[i].name, titleData) > -1) {
                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //隐藏id列
                                    }
                                    else if ($.inArray(data[i].name, totalArray) > -1) {  //添加计算列
                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
                                    } else {
                                        switch (data[i].Type) {
                                            //int
                                            case 'DateTime':
                                                col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " == null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 200 });
                                                break;
                                            default:
                                                col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
                                        }
                                    }
                                }
                                optionResume.cols = [col];
                                optionResume.data = data1.data;

                                table.render(optionResume);
                                layer.close(ajaxLoad);
                                //layer.alert("查询成功", { icon: 1 });
                            } else {
                                layer.close(ajaxLoad);
                                layer.alert(data1.code + data1.Message, { icon: 5 });
                if (OperationType!=3) {
                    if (checkStatus.data.length === 1) {
                        var HInterID = data[0].hmainid.toString();
                    } else {
                        layer.msg('请选择一行数据查询！');
                        return;
                    }
                }                
                var ajaxLoad = layer.load();
                $.ajax({
                    url: GetWEBURL() + '/Gy_EquipFileMain/GetResumeList',
                    type: "GET",
                    data: { "HInterID": HInterID, "user": sessionStorage["HUserName"] },
                    success: function (data1) {
                        if (data1.count == 1) {
                            var data = [];
                            var col = [];
                            var totalArray = ["数量", "关联数量", "未关联数量", "打印条码数量", "未打印条码数量", "实收数量", "金额", "计划金额"];
                            //给空的数组赋值
                            for (var key in data1.list) {
                                data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
                            }
                        }, error: function () {
                            //在列表左边添加勾选框
                            col.push({ type: 'checkbox', fixed: 'left', totalRowText: '合计' });
                            for (var i = 0; i < data.length; i++) {
                                // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
                                if ($.inArray(data[i].name, titleData) > -1) {
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //隐藏id列
                                }
                                else if ($.inArray(data[i].name, totalArray) > -1) {  //添加计算列
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
                                } else {
                                    switch (data[i].Type) {
                                        //int
                                        case 'DateTime':
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " == null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 200 });
                                            break;
                                        default:
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
                                    }
                                }
                            }
                            optionResume.cols = [col];
                            optionResume.data = data1.data;

                            table.render(optionResume);
                            layer.close(ajaxLoad);
                            layer.alert("接口请求失败!", { icon: 5 });
                            //layer.alert("查询成功", { icon: 1 });
                        } else {
                            layer.close(ajaxLoad);
                            layer.alert(data1.code + data1.Message, { icon: 5 });
                        }
                    });
                } else {
                    layer.msg('请选择一行数据查询！');
                }
                    }, error: function () {
                        layer.close(ajaxLoad);
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                });
                
            }

@@ -470,6 +491,27 @@
                $("#btnSearch").click();
            }

            //退出
            function get_Exit() {
                if (OperationType != 3) {
                    Pub_Close(2);
                } else {
                    Pub_Close(1);
                }
            }

            //#region èŽ·å–参数
            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;
            }
            //#endregion
            //以上是layui模块
        });


 WebTM/views/ÖÊÁ¿¹ÜÀí/ÖÊÁ¿±¨±í/QC_FiveMenOneRingList.html

@@ -168,7 +168,7 @@
            //
            var HModName = "QC_FiveMenOneRingList";
            //不需要显示的字段 å¯æ‰©å±• ï¼ˆäººï¼‰
            var titleData = ["流转卡id", "生产订单", "物料代码", "规格型号", "单据主id","物料id","生产资源id","职员id","模具id","设备id"];
            var titleData = ["流转卡id", "生产订单", "物料代码", "规格型号", "单据主id","物料id","生产资源id","职员id","模具id","设备id","工序id"];
            //初始化界面
            set_ClearBill();
            //#endregion
@@ -576,8 +576,15 @@
                                            }, style: 'cursor: pointer;'
                                        });
                                    }
                                    else if (data[j].name == '工序名称') {//添加超链接
                                         col.push({
                                            field: data[j].id, title: data[j].name, align: 'center', sort: true, width: 200, event: '工序名称', templet: function (d) {
                                                return '<span style="color: blue;">' + d.工序名称 + '</span>'
                                            }, style: 'cursor: pointer;'
                                         });
                                    }
                                    else {
                                        switch (data[j].Type) {
                                         switch (data[j].Type) {
                                            //int
                                            case 'DateTime':
                                                col.push({ field: data[j].id, title: data[j].name, align: 'center', sort: true, templet: "<div>{{d." + data[j].name + " ==null ?'':layui.util.toDateString(d." + data[j].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
@@ -811,33 +818,139 @@
            table.on('tool(mainTable_Machine)', function (obj) {
                var data = obj.data;
                if (obj.event == '单据号') {
                    var linterid = data.单据主id;
                    layer.open({
                        type: 2
                        , area: ['100%', '100%']
                        , title: '查看设备启动点检清单'
                        , closeBtn: 1
                        , shade: 0.6 //遮罩透明度
                        , maxmin: true //允许全屏最小化
                        , anim: 0 //0-6的动画形式，-1不开启
                        , content: '../../车间管理/启动点检单/Sc_WorkBeginDotCheckBill.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0'
                        , resize: false,
                        end: function () {
                        }
                        , cancel: function () {
                        }
                    })
                    if (data.单据类型 == "设备启动点检单") {
                        var linterid = data.单据主id;
                        layer.open({
                            type: 2
                            , area: ['100%', '100%']
                            , title: '查看设备启动点检清单'
                            , closeBtn: 1
                            , shade: 0.6 //遮罩透明度
                            , maxmin: true //允许全屏最小化
                            , anim: 0 //0-6的动画形式，-1不开启
                            , content: '../../车间管理/启动点检单/Sc_WorkBeginDotCheckBill.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0'
                            , resize: false,
                            end: function () {
                            }
                            , cancel: function () {
                            }
                        })
                    } else if (data.单据类型 == "设备点检记录单") {
                        var linterid = data.单据主id;
                        layer.open({
                            type: 2
                            , area: ['100%', '100%']
                            , title: '查看设备点检记录单'
                            , closeBtn: 1
                            , shade: 0.6 //遮罩透明度
                            , maxmin: true //允许全屏最小化
                            , anim: 0 //0-6的动画形式，-1不开启
                            , content: '../../设备管理/Sb_EquipDotCheckBillEdit.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0'
                            , resize: false,
                            end: function () {
                            }
                            , cancel: function () {
                            }
                        })
                    } else if (data.单据类型 == "设备保养记录单") {
                        var linterid = data.单据主id;
                        layer.open({
                            type: 2
                            , area: ['100%', '100%']
                            , title: '查看设备保养记录单'
                            , closeBtn: 1
                            , shade: 0.6 //遮罩透明度
                            , maxmin: true //允许全屏最小化
                            , anim: 0 //0-6的动画形式，-1不开启
                            , content: '../../设备管理/Sb_EquipMaintainBillEdit.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0'
                            , resize: false,
                            end: function () {
                            }
                            , cancel: function () {
                            }
                        })
                    } else if (data.单据类型 == "设备维修记录单") {
                        var linterid = data.单据主id;
                        layer.open({
                            type: 2
                            , area: ['100%', '100%']
                            , title: '查看设备维修记录单'
                            , closeBtn: 1
                            , shade: 0.6 //遮罩透明度
                            , maxmin: true //允许全屏最小化
                            , anim: 0 //0-6的动画形式，-1不开启
                            , content: '../../设备管理/Sb_Add_EqpMaintenanceBillList.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0'
                            , resize: false,
                            end: function () {
                            }
                            , cancel: function () {
                            }
                        })
                    } else if (data.单据类型 == "模具点检记录单") {
                        var linterid = data.单据主id;
                        layer.open({
                            type: 2
                            , area: ['100%', '100%']
                            , title: '查看模具点检记录单'
                            , closeBtn: 1
                            , shade: 0.6 //遮罩透明度
                            , maxmin: true //允许全屏最小化
                            , anim: 0 //0-6的动画形式，-1不开启
                            , content: '../../模治具管理/模治具管理/Sc_Add_MouldDotCheckBillList.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0'
                            , resize: false,
                            end: function () {
                            }
                            , cancel: function () {
                            }
                        })
                    } else if (data.单据类型 == "模具保养记录单") {
                        var linterid = data.单据主id;
                        layer.open({
                            type: 2
                            , area: ['100%', '100%']
                            , title: '查看模具保养记录单'
                            , closeBtn: 1
                            , shade: 0.6 //遮罩透明度
                            , maxmin: true //允许全屏最小化
                            , anim: 0 //0-6的动画形式，-1不开启
                            , content: '../../模治具管理/模治具管理/Sc_Add_MouldMaintainBillList.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0'
                            , resize: false,
                            end: function () {
                            }
                            , cancel: function () {
                            }
                        })
                    } else if (data.单据类型 == "模具维修记录单") {
                        var linterid = data.单据主id;
                        layer.open({
                            type: 2
                            , area: ['100%', '100%']
                            , title: '查看模具维修记录单'
                            , closeBtn: 1
                            , shade: 0.6 //遮罩透明度
                            , maxmin: true //允许全屏最小化
                            , anim: 0 //0-6的动画形式，-1不开启
                            , content: '../../模治具管理/模治具管理/Sb_Add_MouldRepairWorkBillList.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0'
                            , resize: false,
                            end: function () {
                            }
                            , cancel: function () {
                            }
                        })
                    }
                } else if (obj.event == '模具名称') {
                    var linterid = data.模具id;
                    var HNumber = data.模具编码;
                    var HName = data.模具名称;
                    layer.open({
                        type: 2
                        , area: ['100%', '100%']
                        , title: '查看模具档案'
                        , title: '查看模具履历'
                        , closeBtn: 1
                        , shade: 0.6 //遮罩透明度
                        , maxmin: true //允许全屏最小化
                        , anim: 0 //0-6的动画形式，-1不开启
                        , content: '../../模治具管理/模治具管理/Gy_MouldFile.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0'
                        , content: '../../模治具管理/器具报表/Sc_MouldResumeCheckQuery.html?OperationType=3&linterid=' + linterid + '&HNumber=' + HNumber + '&HName=' + HName+''
                        , resize: false,
                        end: function () {
                        }
@@ -846,15 +959,17 @@
                    })
                } else if (obj.event == '设备名称') {
                    var linterid = data.设备id;
                    var HNumber = data.设备编码;
                    var HName = data.设备名称;
                    layer.open({
                        type: 2
                        , area: ['100%', '100%']
                        , title: '查看设备档案'
                        , title: '查看设备履历'
                        , closeBtn: 1
                        , shade: 0.6 //遮罩透明度
                        , maxmin: true //允许全屏最小化
                        , anim: 0 //0-6的动画形式，-1不开启
                        , content: '../../设备管理/设备档案/Gy_EquipFileMainEdit.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0'
                        , content: '../../设备管理/设备报表/Sb_EquipResumeCheckQuery.html?OperationType=3&linterid=' + linterid + '&HNumber=' + HNumber + '&HName=' + HName + ''
                        , resize: false,
                        end: function () {
                        }
@@ -960,15 +1075,17 @@
                    })
                } else if (obj.event == '模具名称') {
                    var linterid = data.模具id;
                    var HNumber = data.模具编码;
                    var HName = data.模具名称;
                    layer.open({
                        type: 2
                        , area: ['100%', '100%']
                        , title: '查看模具档案'
                        , title: '查看模具履历'
                        , closeBtn: 1
                        , shade: 0.6 //遮罩透明度
                        , maxmin: true //允许全屏最小化
                        , anim: 0 //0-6的动画形式，-1不开启
                        , content: '../../模治具管理/模治具管理/Gy_MouldFile.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0'
                        , content: '../../模治具管理/器具报表/Sc_MouldResumeCheckQuery.html?OperationType=3&linterid=' + linterid + '&HNumber=' + HNumber + '&HName=' + HName + ''
                        , resize: false,
                        end: function () {
                        }
@@ -977,15 +1094,34 @@
                    })
                } else if (obj.event == '设备名称') {
                    var linterid = data.设备id;
                    var HNumber = data.设备编码;
                    var HName = data.设备名称;
                    layer.open({
                        type: 2
                        , area: ['100%', '100%']
                        , title: '查看设备档案'
                        , title: '查看设备履历'
                        , closeBtn: 1
                        , shade: 0.6 //遮罩透明度
                        , maxmin: true //允许全屏最小化
                        , anim: 0 //0-6的动画形式，-1不开启
                        , content: '../../设备管理/设备档案/Gy_EquipFileMainEdit.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0'
                        , content: '../../设备管理/设备报表/Sb_EquipResumeCheckQuery.html?OperationType=3&linterid=' + linterid + '&HNumber=' + HNumber + '&HName=' + HName + ''
                        , resize: false,
                        end: function () {
                        }
                        , cancel: function () {
                        }
                    })
                } else if (obj.event == '工序名称') {
                    var linterid = data.单据主id;
                    layer.open({
                        type: 2
                        , area: ['100%', '100%']
                        , title: '查看设备履历'
                        , closeBtn: 1
                        , shade: 0.6 //遮罩透明度
                        , maxmin: true //允许全屏最小化
                        , anim: 0 //0-6的动画形式，-1不开启
                        , content: '../../质量管理/质量报表/SB_TechnologyParameterList.html?OperationType=3&linterid=' + linterid + ''
                        , resize: false,
                        end: function () {
                        }

 WebTM/views/ÖÊÁ¿¹ÜÀí/ÖÊÁ¿±¨±í/SB_TechnologyParameterList.html

@@ -132,7 +132,9 @@
            var HModName = "SB_TechnologyParameterList";
            //不需要显示的字段 å¯æ‰©å±•
            var titleData = ["å¹´", "月", "工序"];

            var params = getUrlVars();
            var OperationType = params[params[0]]; //从参数中获取 æ•°æ®ç±»åž‹  1添加 ä¿å­˜  2复制  3 ç¼–辑
            var linterid = params[params[1]]; //从参数中获取 å•æ®å†…码

            var ins;                        //用于导出excel
            //#endregion
@@ -198,8 +200,11 @@
            function set_ClearBill() {
                set_InitGrid(); //初始化表格
                get_FastQuery();
                ////加载折线图
                //加载折线图
                set_Graphics();
                if (OperationType==3) {
                    Get_SB_EquipICMOTechParamBill(linterid);
                }

            }
            //初始化表格
@@ -656,6 +661,45 @@
                })
            }

            //根据全程追溯报表获取流转卡,工序,设备,物料
            function Get_SB_EquipICMOTechParamBill(linterid) {

                $.ajax({
                    url: GetWEBURL() + "/QC_CustomerAppealReport/Get_EquipICMOTechParamList",
                    type: "GET",
                    async: false,
                    data: { "linterid": linterid, "user": sessionStorage["HUserName"] },
                    success: function (result) {
                        if (result.count == 1) {
                            var data = result.data;
                            $("#HProcExchBillNo").val(data[0]["HProcExchBillNo"]);
                            $("#HProcName").val(data[0]["工序名称"]);
                            $("#HMaterName").val(data[0]["物料名称"]);
                            $("#HEquipName").val(data[0]["设备名称"]);

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

            //#region èŽ·å–参数
            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;
            }
            //#endregion


            //#region éšè—åˆ—设置
            function get_HideColumn() {

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

@@ -191,6 +191,7 @@
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_CancelCloseBill" id="set_CancelCloseBill"><i class="layui-icon layui-icon-form"></i>反关闭</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-ProcessCheck" id="btn-ProcessCheck">工序检验</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-NoPassProd" id="btn-NoPassProd">下推不良品评审处理单</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-QualityReport" id="btn-QualityReport">下推质量汇报单</button>
                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Print" id="btn-Print"><i class="layui-icon layui-icon-circle"></i>预览</button>-->
                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Cell" id="btn-Cell"><i class="layui-icon layui-icon-ok"></i>保存列宽</button>-->
                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-RefreshCell" id="btn-RefreshCell"><i class="layui-icon layui-icon-refresh"></i>默认列宽</button>-->
@@ -728,6 +729,9 @@
                    //下推工序出站汇报单
                    case 'btn-NoPassProd': set_NoPassProd();
                        break;
                    //下推质量汇报单
                    case 'btn-QualityReport': set_QualityReport();
                        break;                        
                    //预览
                    case 'btn-Cell': layer.msg('预览！');
                        break;
@@ -1649,6 +1653,51 @@
                }
            }

            //下推质量汇报单            
            function set_QualityReport() {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (checkStatus.data.length > 0) {

                    var linterid = [];
                    var HERR = "";
                    var HGroupID_JY = data[0].HGroupID;
                    var HDeptID_JY = data[0].HDeptID;

                    for (var i = 0; i < checkStatus.data.length; i++) {
                        if (data[i].HGroupID != HGroupID_JY || data[i].HDeptID || HDeptID_JY) {
                            HERR += "第" + (i+1) + "行，生产班组或者生产车间，与其余行不一致，不允许合并下推！"
                        }

                        linterid.push(data[i].hmainid.toString());
                    }

                    if (HERR != "") {
                        layer.msg(HERR,{ time: 3000, })
                        return;
                    }
                   
                    layer.open({
                        type: 2
                        , area: ['100%', '100%']
                        , title: '质量汇报单-编辑'
                        , shade: 0.6
                        , maxmin: false
                        , anim: 0
                        , content: ['../../生产管理/报工台工序/不良采集/Sc_QualityReportStepBill_New.html?OperationType=' + 6 + '&linterid=' + linterid.toString() + '&HEntry=0&HProcNo=' + 0 + '&HEntryID=' + 0 + '', 'yes']
                        , resize: false
                        , cancel: function () {
                            btnIs();
                        }
                        , end: function () {
                            get_FastQuery(table, option);
                        }
                    })
                } else {
                    layer.msg('请选择数据下推！');
                }
            }

            //新增单据
            function set_AddNew() {
                layer.open({