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

pzy

2024-08-20 4de5181b14590899bc09c5135411db2533d11b62

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

 WebTM/WebTM.csproj

@@ -448,6 +448,7 @@
    <Content Include="views\设备管理\设备报表\Sb_EquipRepairTaskReport.html" />
    <Content Include="views\设备管理\设备报表\Sb_EquipResumeCheckQuery.html" />
    <Content Include="views\设备管理\设备报表\Sb_EquipRepairReport.html" />
    <Content Include="views\质量管理\质量报表\QC_EquipMentCollectionTechParam.html" />
    <Content Include="views\设备管理\设备规程单\Sb_EquipDotCheckRule_Excel.html" />
    <Content Include="views\质量管理\巡检记录单\MES_QC_PatrolProcCheckOtherBillList_PDA.html" />
    <Content Include="views\质量管理\工作联系单\OA_WorkLinkSelfQuery.html" />

 WebTM/WebTM.csproj.user

@@ -16,8 +16,9 @@
    <VisualStudio>
      <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
        <WebProjectProperties>
          <StartPageUrl>views/user/login.html</StartPageUrl>
          <StartAction>SpecificPage</StartAction>
          <StartPageUrl>
          </StartPageUrl>
          <StartAction>CurrentPage</StartAction>
          <AspNetDebugging>True</AspNetDebugging>
          <SilverlightDebugging>False</SilverlightDebugging>
          <NativeDebugging>False</NativeDebugging>

 WebTM/layuiadmin/Scripts/webConfig.js

@@ -12,8 +12,8 @@
    /*var WEBURL = "http://localhost:8082/API/";    //杜贺本地配置*/
    //var WEBURL = "http://localhost:81/API/";    //王彬本地配置
    /*var WEBURL = "http://localhost:8083/API/";  //陈雯静本地配置*/
    //var WEBURL = "http://localhost:81/API/"    //翁涛涛本地配置
    /*var WEBURL = "http://localhost:8082/API/";    *//*//张瑞广本地配置*/
    var WEBURL = "http://localhost:8082/API/";    //张瑞广本地配置
   /* var WEBURL = "http://localhost:81/API/"    //翁涛涛本地配置*/
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";   //余思杰本地配置
    //var WEBURL = "http://localhost:8088/ARAPI/";    //余思杰本地配置(安瑞)
    //var WEBURL = "http://10.1.4.155/API/";   //江丰客户NEW

 WebTM/views/Éú²ú¹¤Ðò¹ÜÀí/Ôö¼Ó²»Á¼ÆÀÉóµ¥/QC_NoPassProdDisposeBillMain.html

@@ -301,9 +301,10 @@
                                                    <div class="layui-inline">
                                                        <label class="layui-form-label">源单类型:</label>
                                                        <div class="layui-input-inline">
                                                            <select name="HMainSourceBillType" lay-filter="HMainSourceBillType" id="HMainSourceBillType" >
                                                            <select name="HMainSourceBillType" lay-filter="HMainSourceBillType" id="HMainSourceBillType">
                                                                <option value="" selected="selected"></option>
                                                                <option value="7512">不良品评审申请单</option>
                                                                <option value="3791">工序出站汇报单</option>
                                                            </select>
                                                        </div>
                                                    </div>
@@ -614,6 +615,63 @@
               
            }

            //有源单新增-出站单下推
            function set_AddNew() {
                //加源单类型区分(可以写不同的方法)
                refSav = "Add";
                //初始基本信息赋值
                $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));      //单据日期
                $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));  //制单日期
                $("#HMaker").val(sessionStorage["HUserName"]);     //制单人
                $("#HSendMan").val(sessionStorage["HUserName"]);   //发送人
                $("#HDeptID").val(sessionStorage["HDeptID"]);  //部门ID
                $("#HDeptName").val(sessionStorage["HDept"]);  //部门
                if (HSouceBillType =="3791") {
                    $.ajax({
                        url: GetWEBURL() + "Sc_ProcessMangement/Get_Sc_StationOutBill",
                        type: "GET",
                        data: {
                            "HID": linterid
                        },
                        success: function (result) {
                            if (result.code == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                                var data = result.data;
                                form.val("component-form-group", { //formTest å³ class="layui-form" æ‰€åœ¨å…ƒç´ å±žæ€§ lay-filter="" å¯¹åº”的值
                                    "HMainSourceBillNo": data[0]["单据号"]
                                    , "HMainSourceInterID": data[0]["hmainid"]
                                    , "HBillNos": data[0]["单据号"]
                                    , "HDates": formatDate(data[0]["日期"])
                                    , "HICMOBillNos": data[0]["任务单"]
                                    , "HICMOInterIDs": data[0]["HICMOInterID"]
                                    , "HICMOEntryIDs": data[0]["HICMOEntryID"]
                                    , "HProcExchBillNos": data[0]["工序流转卡号"]
                                    , "HProcExchInterIDs": data[0]["HProcExchInterID"]
                                    , "HProcExchEntryIDs": data[0]["HProcExchEntryID"]
                                    , "HHappendDates": Pub_Format(data[0]["日期"], "yyyy-MM-dd hh:mm:ss")
                                    , "HMaterIDs": data[0]["HMaterID"]
                                    , "HMaterNumbers": data[0]["产品代码"]
                                    , "HMaterNames": data[0]["产品名称"]
                                    , "HMaterModels": data[0]["规格型号"]
                                    , "HUnitIDs": data[0]["HUnitID"]
                                    , "HUnitNames": data[0]["计量单位"]

                                    , "HUnRightQtys": data[0]["不良数量"]
                                    , "HProcIDs": data[0]["HProcID"]
                                    , "HProcNames": data[0]["当前工序"]
                                });
                                $('#HMainSourceBillType').find("option[value='" + data[0]["HSouceBillType"] + "']").attr("selected", true);
                                form.render('select');

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

        
            //编辑
            function set_EditFromGrid() {
@@ -806,7 +864,7 @@
                var HMainSourceBillType = $("#HMainSourceBillType").val();
                if (HMainSourceBillType == null || HMainSourceBillType == '') {
                    layer.msg("请选择源单")
                } else  {
                } else if (HMainSourceBillType=="7512") {
                    //页面层-自定义
                    layer.open({
                        type: 2,
@@ -871,6 +929,71 @@

                        }
                    });
                } else if (HMainSourceBillType =="3791") {
                    //页面层-自定义
                    layer.open({
                        type: 2,
                        skin: 'layui-layer-rim', //加上边框
                        title: '不良品评审申请单列表',
                        closeBtn: 1,
                        shift: 2,
                        area: ['80%', '80%'],
                        maxmin: true,
                        content: ['../../车间管理/工序出站汇报单/Cj_StationOutBillList.html', 'yes'],
                        btn: ['确定', '取消']
                        , btn1: function (index, layero) {

                            //按钮【按钮一】的回调
                            var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
                            var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//获取table的elem:"#test"
                            if (checkStatus.data.length === 0) {
                                return layer.msg('请选择数据');
                            }
                            $("#HMainSourceBillNo").val(checkStatus.data[0].单据号);
                            $("#HMainSourceInterID").val(checkStatus.data[0].hmainid);
                            $("#HBillNos").val(checkStatus.data[0].单据号);
                            $("#HDates").val(formatDate(checkStatus.data[0].日期));
                            $("#HICMOBillNos").val(checkStatus.data[0].任务单);
                            $("#HICMOInterIDs").val(checkStatus.data[0].HICMOInterID);
                            $("#HICMOEntryIDs").val(checkStatus.data[0].HICMOEntryID);
                            $("#HProcExchBillNos").val(checkStatus.data[0].工序流转卡号);
                            $("#HProcExchInterIDs").val(checkStatus.data[0].HProcExchInterID);
                            $("#HProcExchEntryIDs").val(checkStatus.data[0].HProcExchEntryID);
                            $("#HHappendDates").val(Pub_Format(checkStatus.data[0].日期, "yyyy-MM-dd hh:mm:ss"));
                            $("#HMaterIDs").val(checkStatus.data[0].HMaterID);
                            $("#HMaterNumbers").val(checkStatus.data[0].产品代码);
                            $("#HMaterNames").val(checkStatus.data[0].产品名称);
                            $("#HMaterModels").val(checkStatus.data[0].规格型号);
                            $("#HUnitIDs").val(checkStatus.data[0].HUnitID);
                            $("#HUnitNames").val(checkStatus.data[0].计量单位);
                           /* $("#HMaterTypes").val(checkStatus.data[0].产品类型);*/
                            $("#HUnRightQtys").val(checkStatus.data[0].不良数量);
                            //$("#HDeptIDs").val(checkStatus.data[0].HDeptID);
                            //$("#HDeptNames").val(checkStatus.data[0].车间名称);
                            $("#HProcIDs").val(checkStatus.data[0].HProcID);
                            $("#HProcNames").val(checkStatus.data[0].当前工序);
                            //$("#HBadPhenomenaNames").val(checkStatus.data[0].不良现象);
                            //$("#HBadPhenomenaIDs").val(checkStatus.data[0].HBadPhenomenaID);
                            //$("#HBarCodes").val(checkStatus.data[0].不良品SN码);
                            //$("#HSeOrderBillNos").val(checkStatus.data[0].销售订单);
                            //$("#HReasonNotes").val(checkStatus.data[0].问题现象简述);
                            //$('#HLevs').find("option[value='" + checkStatus.data[0].紧急程度 + "']").attr("selected", true);
                            //$('#HIsStops').find("option[value='" + checkStatus.data[0].是否停线 + "']").attr("selected", true);
                            //$('#HIsBatchUnRights').find("option[value='" + checkStatus.data[0].是否批量问题 + "']").attr("selected", true);
                            form.render('select');
                            layer.close(layer.index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                        }
                        , btn2: function (index, layero) {
                            //按钮【按钮二】的回调
                            //return false å¼€å¯è¯¥ä»£ç å¯ç¦æ­¢ç‚¹å‡»è¯¥æŒ‰é’®å…³é—­
                        },
                        end: function () {

                        },
                        success: function (layero, index) {

                        }
                    });
                }
            });


 WebTM/views/É豸¹ÜÀí/É豸¹¤ÒÕ²ÎÊý¶©µ¥µã¼ì±í/SB_EquipICMOTechParamBillEdit.html

@@ -1392,9 +1392,9 @@
                                "HProcID": data.HProcID,
                                "HProcName": data.工序名称,
                                "HProcNo": data.工序号,
                                "HGroupID": data.HGroupID,
                                "HGroupID": data.HGroupID == undefined ? 0 : data.HGroupID,
                                "HGroupName": data.班组,
                                "HDeptID": data.HDeptID,
                                "HDeptID": data.HDeptID == undefined ? 0 : data.HDeptID,
                                "HDeptName": data.加工车间,

                                "HSourceID": data.HSourceID,

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

New file
@@ -0,0 +1,862 @@
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
    <title>设备工艺参数趋势分析图</title>
    <meta name="renderer" content="webkit">
    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
    <script src="../../../layuiadmin/layui/layui.js"></script>
    <script src="../../../layuiadmin/HideButton.js"></script>
    <script src="../../../layuiadmin/PubCustom.js"></script>
    <script src="../../../layuiadmin/zgqCustom/zgqCustom.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>
    <script src='../../../layuiadmin/lib/extend/echarts.min.js'></script>

</head>
<body>
    <div class="layui-fluid">
        <div class="layui-col-md12">
            <div class="layui-card" style="padding: 1px">
                <div class="layui-card-body" style="padding: 1px;">
                    <form class="layui-form" action="" lay-filter="component-form-group">
                        <div class="layui-collapse">
                            <div class="layui-colla-item">
                                <div class="layui-colla-title layui-inline">
                                    <div class="layui-inline">
                                        <span>更多</span>
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label" style="width: 85px;">设备编码</label>
                                    <div class="layui-input-block" style="margin-left: 120px;">
                                        <input type="text" class="layui-input" name="HEquipNumber" id="HEquipNumber" value="" readonly>
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">设备名称</label>
                                    <div class="layui-input-block">
                                        <input type="text" class="layui-input" lay-verify="HEquipName" name="HEquipName" id="HEquipName" value="" style="background-color:#efefef4d;width: 75%;display: inline-block;" readonly>
                                        <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHEquip" id="btnHEquip" style="padding: 0 10px;float: right;margin-right: 3px;">
                                            <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                        </button>
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">工序</label>
                                    <div class="layui-input-block">
                                        <input type="text" class="layui-input" lay-verify="HProcName" name="HProcName" id="HProcName" value="" style="background-color: #efefef4d; width: 75%; display: inline-block;" readonly>
                                        <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHProc" id="btnHProc" style="padding: 0 10px;float: right;margin-right: 3px;">
                                            <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                        </button>
                                    </div>
                                </div>

                                <div class="layui-row" style="margin-top:5px;margin-left:82px;margin-bottom:5px;">
                                    <div class="layui-inline">
                                        <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">工艺参数</label>
                                        <div class="layui-input-block">
                                            <input type="text" class="layui-input" lay-verify="HTechParamName" name="HTechParamName" id="HTechParamName" value="" style="background-color: #efefef4d; width: 75%; display: inline-block;" readonly>
                                            <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHTechParam" id="btnHTechParam" style="padding: 0 10px;float: right;margin-right: 3px;">
                                                <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                            </button>
                                        </div>
                                    </div>
                                    <div class="layui-inline">
                                        <label class="layui-form-label">日期</label>
                                        <div class="layui-input-block">
                                            <input type="date" class="layui-input ForFilteringSchemes" id="HDate" style="width:190px;">
                                        </div>
                                    </div>
                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch" style="padding: 0 10px;margin-left: 20px;">
                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                    </button>
                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">重置</button>

                                </div>


                                <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
                                    <div class="layui-row" style="margin-top:5px">
                                        <div class="layui-inline">
                                            <label class="layui-form-label">过滤</label>
                                            <div class="layui-input-block">
                                                <select name="ColName" id="ColName" class="ForFilteringSchemes" lay-filter="ColName" style="width:190px;">
                                                </select>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <select name="Comparator" id="Comparator" class="ForFilteringSchemes" lay-filter="Comparator" style="width:190px;">
                                                <option value="0" selected="selected"></option>
                                                <option value="=">=</option>
                                                <option value=">=">>=</option>
                                                <option value=">">></option>
                                                <option value="<="><=</option>
                                                <option value="<"><</option>
                                                <option value="<>"><></option>
                                                <option value="7">包含</option>
                                                <option value="8">左包含</option>
                                                <option value="9">右包含</option>
                                                <option value="10">不包含</option>
                                            </select>
                                        </div>
                                        <div class="layui-inline">
                                            <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent">
                                        </div>
                                    </div>
                                    <div class="layui-row" style="margin-top:5px">
                                        <div class="layui-inline">
                                            <label class="layui-form-label">过滤</label>
                                            <div class="layui-input-block">
                                                <select name="ColName1" id="ColName1" lay-filter="ColName1" style="width:190px;">
                                                </select>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <select name="Comparator1" id="Comparator1" lay-filter="Comparator1" style="width:190px;">
                                                <option value="0" selected="selected"></option>
                                                <option value="=">=</option>
                                                <option value=">=">>=</option>
                                                <option value=">">></option>
                                                <option value="<="><=</option>
                                                <option value="<"><</option>
                                                <option value="<>"><></option>
                                                <option value="7">包含</option>
                                                <option value="8">左包含</option>
                                                <option value="9">右包含</option>
                                                <option value="10">不包含</option>
                                            </select>
                                        </div>
                                        <div class="layui-inline">
                                            <input type="text" class="layui-input" value="" name="ColContent1" id="ColContent1">
                                        </div>
                                    </div>
                                    <div class="layui-row" style="margin-top:5px">
                                        <div class="layui-inline">
                                            <label class="layui-form-label">过滤</label>
                                            <div class="layui-input-block">
                                                <select name="ColName2" id="ColName2" lay-filter="ColName2" style="width:190px;">
                                                </select>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <select name="Comparator2" id="Comparator2" lay-filter="Comparator2" style="width:190px;">
                                                <option value="0" selected="selected"></option>
                                                <option value="=">=</option>
                                                <option value=">=">>=</option>
                                                <option value=">">></option>
                                                <option value="<="><=</option>
                                                <option value="<"><</option>
                                                <option value="<>"><></option>
                                                <option value="7">包含</option>
                                                <option value="8">左包含</option>
                                                <option value="9">右包含</option>
                                                <option value="10">不包含</option>
                                            </select>
                                        </div>
                                        <div class="layui-inline">
                                            <input type="text" class="layui-input" value="" name="ColContent2" id="ColContent2">
                                        </div>
                                    </div>
                                </div>
                            </div>
                        </div>
                        <div>
                            <div style="width:99%;height:calc(100vh);">
                                <table class="" id="mainTable" lay-filter="mainTable"></table>
                            </div>
                            <div id="histogram" style="width:99.5%;height:calc(68vh);margin-top:10px;">
                            </div>
                        </div>
                        <script type="text/html" id="toolbarDemo">
                            <div class="layui-btn-container">
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh" id="RefreshButton"><i class="layui-icon layui-icon-refresh-3"></i>刷新</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_export" id="get_export"><i class="layui-icon layui-icon-export"></i>导出</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn" id="HideButton"><i class="layui-icon layui-icon-form"></i>列设置</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit" id="ExitButton"><i class="layui-icon layui-icon-logout"></i>退出</button>
                            </div>
                        </script>

                    </form>
                </div>
            </div>
        </div>
    </div>

    <script>
        layui.config({
            base: '../../../layuiadmin/' //静态资源所在路径
        }).extend({
            index: 'lib/index', //主入口模块
        }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
            //#region å…¬å…±å˜é‡
            var $ = layui.$
                , admin = layui.admin
                , layer = layui.layer
                , table = layui.table
                , form = layui.form
                , element = layui.element
                , laypage = layui.laypage
                , laydate = layui.laydate
            //查询条件
            var sWhere = "";
            var option = [];
            var HModName = "SB_TechnologyParameterList";
            //不需要显示的字段 å¯æ‰©å±•
            var titleData = ["å¹´", "月", "工序"];


            var ins;                        //用于导出excel
            //#endregion

            //#region è¿›å…¥é¡µé¢æ—¢åŠ è½½
            //初始化界面
            set_ClearBill();
            //#endregion

            //#region è§¦å‘事件：包括form.on(){}格式的所有点击事件、选择事件等
            //头工具栏事件
            table.on('toolbar(mainTable)', function (obj) {
                var checkStatus = table.checkStatus(obj.config.id);
                switch (obj.event) {
                    //刷新
                    case 'get_Refresh': get_Refresh();
                        break;
                    //退出按钮
                    case 'get_Exit': Pub_Close(2);
                        break;
                    //导出excel
                    case 'get_export':
                        get_Export();
                        break;
                    //列设置
                    case 'set_HideColumn': get_HideColumn();
                        break;
                };
            });
            //查询按钮
            form.on('submit(btnSearch)', function (data) {
                get_FastQuery();
            });
            // é‡ç½®æŒ‰é’®
            form.on('submit(btnReSearch)', function (data) {
                set_ClearQuery();
            });
            //#endregion

            //#region ç‚¹å‡»è¡Œé€‰ä¸­é«˜äº®
            table.on('row(mainTable)', function (obj) {
                //选中行改变颜色
                var flag = !obj.tr.find(':checkbox:first').prop('checked');
                obj.tr.find(':checkbox').prop('checked', flag);
                if (flag) {
                    obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked');  //设置复选框选中样式
                    $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//改变当前tr背景颜色和字体颜色
                } else {
                    obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//取消复选框选中样式
                    $(obj.tr.selector).attr({ "style": "background:" });//取消当前tr颜色
                }
                //mainTable ä¸ºè¡¨æ ¼ID   æ³¨æ„æ­¤å¤„如果ID不正确将导致你在监听复选框时获取不到你选择的数据，前面的只是添加或删除选中未选中样式以及设置背景色，字体颜色
                layui.each(table.cache.mainTable, function (i, l) {
                    if (obj.tr.index() == l.LAY_TABLE_INDEX) {
                        l.LAY_CHECKED = flag;
                    }
                });
            })
            //#endregion

            //#region æ­¤é¡µé¢æ‰€æœ‰æ–¹æ³•
            // åˆå§‹åŒ–界面
            function set_ClearBill() {
                $("#HDate").val(Format(new Date, "yyyy-MM-dd"));
                set_InitGrid(); //初始化表格
                get_FastQuery();
                ////加载折线图
                set_Graphics();

            }
            //初始化表格
            function set_InitGrid() {
                option = {
                    elem: '#mainTable'
                    , toolbar: '#toolbarDemo'
                    , totalRow: true
                    , height: 'full-50'
                    , page: true
                    , cellMinWidth: 90
                    , limit: 50
                    , data: []
                    , limits: [50, 500, 5000, 20000]
                    , cols: [[
                        { type: 'checkbox', totalRowText: '合计行' }
                        , { field: '日期', title: '日期', sort: true }
                        , { field: '设备编码', title: '设备编码', sort: true }
                        , { field: '工艺参数', title: '工艺参数', sort: true }
                        , { field: '单位 ', title: '单位 ',sort: true }
                        , { field: '上限值', title: '上限值', sort: true }
                        , { field: '标准值', title: '标准值', sort: true }
                        , { field: '下限值', title: '下限值', sort: true }
                        , { field: '实际值', title: '实际值', sort: true }

                    ]]
                };
                table.render(option)
            }

            //查询
            function get_Display(sWhere) {
                var index = layer.load(0, { shade: false });
                var ajaxLoad = layer.load();
                //进入页面显示的缓存列表
                $.ajax({
                    url: GetWEBURL() + '/QC_CustomerAppealReport/SB_EquipICMOTechParamList',
                    type: "GET",
                    async:false,
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
                    success: function (data1) {
                        if (data1.count == 1) {
                            var data = [];
                            var col = [];
                            //给空的数组赋值
                            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' });
                            for (var i = 0; i < data.length; i++) {
                                if ($.inArray(data[i].name, titleData) > -1) {
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //隐藏id列
                                }
                                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')}}</div>", width: 200 });
                                            break;
                                        default:
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
                                    }
                                }
                            }

                            //动态显示列名
                            option = {
                                elem: '#mainTable'
                                , toolbar: '#toolbarDemo'
                                , cols: [col]
                                , data: data1.data
                                , height: 'full-80'
                                , page: true
                                , limits: [50, 500, 5000, 50000]
                                , limit: 50
                                , cellMinWidth: 90
                            }
                            ins = table.render(option);

                            //刷新表格数据
                            DisPlay_HideColumn();
                            //加载折线图
                            set_Graphics();

                            layer.close(ajaxLoad);
                            if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
                                ColFilter();
                            }

                        } else {
                            layer.close(ajaxLoad);
                            layer.alert(data1.code + data1.Message, { icon: 5 });
                        }
                    }, error: function () {
                        layer.close(ajaxLoad);
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                });
                layer.close(index);
            }
            //快速查询
            function get_FastQuery() {
                var HEquipNumber = $("#HEquipNumber").val();
                var HEquipName = $("#HEquipName").val();
                var HProcName = $("#HProcName").val();
                var HTechParamName = $("#HTechParamName").val();
                var HDate = $("#HDate").val();

                var ColName = $("#ColName").val();//复选框
                var Comparator = $("#Comparator").val()
                var ColContent = $("#ColContent").val();

                var ColName1 = $("#ColName1").val();//复选框
                var Comparator1 = $("#Comparator1").val()
                var ColContent1 = $("#ColContent1").val();
                var ColName2 = $("#ColName2").val();//复选框
                var Comparator2 = $("#Comparator2").val()
                var ColContent2 = $("#ColContent2").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 (ColName1 != 0 && Comparator1 != 0) {
                    var com1 = "";
                    switch (Comparator1) {
                        case "7":
                            com1 = "like'%" + ColContent1 + "%'";
                            break;
                        case "8":
                            com1 = "like'%" + ColContent1 + "'";
                            break;
                        case "9":
                            com1 = "like'" + ColContent1 + "%'";
                            break;
                        case "10":
                            com1 = "not like'%" + ColContent1 + "%'";
                            break;
                        default:
                            com1 = "" + Comparator1 + "'" + ColContent1 + "'";
                            break;
                    }
                    sWhere += " and " + ColName1 + " " + com1;
                }
                if (ColName2 != 0 && Comparator2 != 0) {
                    var com2 = "";
                    switch (Comparator2) {
                        case "7":
                            com2 = "like'%" + ColContent2 + "%'";
                            break;
                        case "8":
                            com2 = "like'%" + ColContent2 + "'";
                            break;
                        case "9":
                            com2 = "like'" + ColContent2 + "%'";
                            break;
                        case "10":
                            com2 = "not like'%" + ColContent2 + "%'";
                            break;
                        default:
                            com2 = "" + Comparator + "'" + ColContent + "'";
                            break;
                    }
                    sWhere += " and " + ColName2 + " " + com2;
                }

                if (HEquipNumber != "" && HEquipName != "" && HProcName != "" && HTechParamName != "") {
                    sWhere = {
                        HEquipNumber: HEquipNumber
                        , HEquipName: HEquipName
                        , HProcName: HProcName
                        , HTechParamName: HTechParamName
                        , HDate: HDate
                    }
                    get_Display(JSON.stringify(sWhere));
                    sWhere = "";//调用接口后清空sWhere缓存
                }
            }
            //重置快速查询
            function set_ClearQuery() {
                $("#HEquipNumber").val("");
                $("#HEquipName").val("");
                $("#HTechParamName").val("");
                $("#HProcName").val("");
                $("#HDate").val(Format(new Date, "yyyy-MM-dd"));

                $("#btnSearch").click();
                $("#ColContent").val("");
                $("#ColName").val("0");
                $("#Comparator").val("0");
                $("#ColContent2").val("");
                $("#ColName2").val("0");
                $("#Comparator2").val("0");
                $("#ColContent1").val("");
                $("#ColName1").val("0");
                $("#Comparator1").val("0");
                form.render('select');

                sWhere = "";
            }
            //刷新
            function get_Refresh() {
                $("#btnSearch").trigger('click');
            }

            //#region ã€æŠ˜çº¿å›¾ã€‘
            function set_Graphics() {
                var chartDom = document.getElementById('histogram');
                var myChart = echarts.init(chartDom);
                var option_ZZT;

                //折线图绑定数据
                var H_X = [];//X轴标题
                var HVaule = [];//实际值               
                var HTitle = "设备工艺参数趋势分析图";//图形标题
                if (option.data.length > 0) {
                    for (let i = 0; i < option.data.length ; i++) {
                        H_X.push(option.data[i].采集日期);
                    }
                    // å¡«å……数据
                    for (let i = 0; i < option.data.length; i++) {

                        HVaule.push(option.data[i].数采值);
                    }
                }
                option_ZZT = {
                    title: {
                        text: HTitle,
                        left: 'center'
                    },
                    tooltip: {
                        trigger: 'axis'
                    },
                    legend: {
                        data: ['数采值'],
                        top: 'bottom',
                        left: 'center'
                    },
                    toolbox: {
                        show: true,
                        orient: 'vertical',
                        left: 'right',
                        top: 'center',
                        feature: {
                            mark: { show: true },
                            dataView: { show: true, readOnly: false },
                            magicType: { show: true, type: ['line', 'bar', 'stack'] },
                            restore: { show: true },
                            saveAsImage: { show: true }
                        }
                    },
                    xAxis: [
                        {
                            type: 'category',
                            axisTick: { show: false },
                            data: H_X
                        }
                    ],
                    yAxis: [
                        {
                            type: 'value'
                        }
                    ],
                    series: [
                        {
                            name: '数采值',
                            type: 'line',
                            label: {
                                show: true,
                                formatter: '{c}'
                            },
                            tooltip: {
                                valueFormatter: function (value) {
                                    return value;
                                }
                            },
                            data: HVaule
                        }
                    ]
                };


                option_ZZT && myChart.setOption(option_ZZT);
            }
            //#endregion

            //#region å¯¼å‡ºExecel
            function get_Export() {
                var ModRightNameCheck = "Gy_ProjectMoney_ExportExcel";

                //逻辑审核方法
                $.ajax({
                    type: "GET",
                    url: GetWEBURL() + "/LMES/getReportByModRightNameCheck", //方法所在页面和方法名
                    data: { "ModRightNameCheck": ModRightNameCheck, "user": sessionStorage["HUserName"] },
                    success: function (result) {
                        if (result.count == 1) {
                            table.exportFile(ins.config.id, option.data, "xls");
                        } else {
                            layer.alert("当前模块没有导出权限!", { icon: 5 });
                        }
                    }, error: function () {
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                });
            }
            //#endregion

            //工序流转卡弹窗
            form.on('submit(btnHEquip)', function () {
                //页面层-自定义
                layer.open({
                    type: 2,
                    skin: 'layui-layer-rim', //加上边框
                    title: '设备档案列表',
                    closeBtn: 1,
                    shift: 2,
                    area: ['90%', '90%'],
                    maxmin: true,
                    content: ['../../../views/设备管理/设备档案/Gy_EquipFileMainList.html', 'yes'],
                    btn: ['确定', '取消']
                    , btn1: function (index, layero) {

                        //按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//获取table的elem:"#test"
                        if (checkStatus.data.length === 0) {
                            return layer.msg('请选择数据');
                        }
                        $("#HEquipNumber").val(checkStatus.data[0].设备编码);
                        $("#HEquipName").val(checkStatus.data[0].设备名称);
                        layer.close(layer.index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                        get_EquipList();
                    }
                    , btn2: function (index, layero) {
                        //按钮【按钮二】的回调
                        //return false å¼€å¯è¯¥ä»£ç å¯ç¦æ­¢ç‚¹å‡»è¯¥æŒ‰é’®å…³é—­
                    },
                    end: function () {

                    },
                    success: function (layero, index) {

                    }
                });
            });

            //工序
            form.on('submit(btnHProc)', function () {
                //页面层-自定义
                layer.open({
                    type: 2,
                    skin: 'layui-layer-rim', //加上边框
                    title: '工序列表',
                    closeBtn: 1,
                    shift: 2,
                    area: ['90%', '90%'],
                    maxmin: true,
                    content: ['../../基础资料/生产基础资料/Gy_Process.html', 'yes'],
                    btn: ['确定', '取消']
                    , btn1: function (index, layero) {

                        //按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//获取table的elem:"#test"
                        if (checkStatus.data.length === 0) {
                            return layer.msg('请选择数据');
                        }
                        $("#HProcName").val(checkStatus.data[0].工序名称);
                        layer.close(layer.index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) {
                        //按钮【按钮二】的回调
                        //return false å¼€å¯è¯¥ä»£ç å¯ç¦æ­¢ç‚¹å‡»è¯¥æŒ‰é’®å…³é—­
                    },
                    end: function () {

                    },
                    success: function (layero, index) {

                    }
                });
            });

            //工艺参数
            form.on('submit(btnHTechParam)', function () {
                //页面层-自定义
                layer.open({
                    type: 2,
                    skin: 'layui-layer-rim', //加上边框
                    title: '工序列表',
                    closeBtn: 1,
                    shift: 2,
                    area: ['90%', '90%'],
                    maxmin: true,
                    content: ['../../../views/基础资料/公用基础资料/Gy_TechnologyParameterList.html', 'yes'],
                    btn: ['确定', '取消']
                    , btn1: function (index, layero) {

                        //按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//获取table的elem:"#test"
                        if (checkStatus.data.length === 0) {
                            return layer.msg('请选择数据');
                        }
                        $("#HTechParamName").val(checkStatus.data[0].工艺参数名称);
                        layer.close(layer.index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) {
                        //按钮【按钮二】的回调
                        //return false å¼€å¯è¯¥ä»£ç å¯ç¦æ­¢ç‚¹å‡»è¯¥æŒ‰é’®å…³é—­
                    },
                    end: function () {

                    },
                    success: function (layero, index) {

                    }
                });
            });

            //#region éšè—åˆ—设置
            function get_HideColumn() {
                var colName = "";
                var contentUrl = "";
                for (var i = 1; i < option.cols[0].length; i++) {
                    colName += option.cols[0][i]["title"] + ",";
                }
                var urlStr = window.document.location.pathname;//获取文件路径
                var urlLen = urlStr.split('/');
                for (var i = 0; i < urlLen.length - 4; i++) {
                    contentUrl += "../";
                }
                colName = encodeURI(colName.substring(0, colName.length - 1));//对 URI è¿›è¡Œç¼–码

                contentUrl += '基础资料/隐藏列设置/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName;

                layer.open({
                    type: 2
                    , skin: "layui-layer-rim" //加上边框
                    , title: "隐藏列设置"  //标题
                    , closeBtn: 1  //窗体右上角关闭 çš„ æ ·å¼
                    , shift: 2 //弹出动画
                    , area: ["50%", "90%"] //窗体大小
                    , maxmin: true //设置最大最小按钮是否显示
                    , content: [contentUrl, "yes"]
                    , btn: ["确定", "取消"]
                    , btn1: function (index, laero) {
                        //刷新表格数据
                        DisPlay_HideColumn();
                        //更新表格缓存的数据
                        layer.close(index);//关闭弹窗
                    }
                })
            }
            //#endregion

            //#region æ˜¾ç¤ºåˆ—数据
            function DisPlay_HideColumn() {
                $.ajax({
                    url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
                    type: "GET",
                    async: false,
                    data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
                    success: function (data1) {
                        if (data1.data.length != 0) {

                            var dataCol = [];//数据库查询出的列数据
                            //var titleData = ["单据ID", "HMouldID", "hsubid", "HManagerID", "源单主内码", "源单子内码"];//不需要显示的字段 å¯æ‰©å±•

                            dataCol = data1.data[0].HGridString.split(',');

                            for (var i = 0; i < option.cols[0].length - 1; i++) {
                                var dataCols = dataCol[i].split('|');
                                //隐藏列
                                if (dataCols[1] == 1) {
                                    option.cols[0][i + 1]["hide"] = true;
                                }
                                //设置列宽
                                if (dataCols[3] > 0) {
                                    option.cols[0][i + 1]["width"] = dataCols[3];
                                }
                                //设置内容字体大小
                                if (data1.data[0].HFontSize != 0) {
                                    option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
                                } else {
                                    option.cols[0][i + 1]["style"] = "font-size:100%";
                                }
                                //设置列宽
                                //if (data1.data[0].HColumnWidth != 0) {
                                //    option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
                                //} else {
                                //    option.cols[0][i + 1]["width"] = "";
                                //}
                                //显示列
                                if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
                                    option.cols[0][i + 1]["hide"] = false;
                                }
                                //字体所在位置(å·¦ å±…中 å³)
                                switch (dataCols[2]) {
                                    case "L":
                                        option.cols[0][i + 1]["align"] = "left";
                                        break;
                                    case "M":
                                        option.cols[0][i + 1]["align"] = "center";
                                        break;
                                    case "R":
                                        option.cols[0][i + 1]["align"] = "right";
                                        break;
                                }
                            }

                            //取消冻结列
                            for (var i = 1; i < option.cols[0].length - 1; i++) {
                                if (option.cols[0][i]["fixed"] != null) {
                                    option.cols[0][i]["fixed"] = null;
                                }
                                else {
                                    break;
                                }
                            }
                            //冻结列
                            if (data1.data[0].HFixCols != 0) {
                                for (var i = 0; i < data1.data[0].HFixCols; i++) {
                                    if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
                                        data1.data[0].HFixCols += 1;
                                    }
                                    option.cols[0][i + 1]["fixed"] = "left";
                                }
                            }
                            table.render(option);
                        } else {
                            table.render(option);
                        }
                    }, error: function () {
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                })
            }
            //#endregion

            //#region åˆ—明显示下拉框
            function ColFilter() {
                var Organization = '<option  value="0" selected="selected" ></option>';
                for (var i = 1; i < option.cols[0].length; i++) {
                    if (option.cols[0][i].hide != true) {
                        Organization += '<option  style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</option>';
                    }
                }
                $("#ColName").empty();
                $("#ColName").append(Organization);
                $("#ColName1").empty();
                $("#ColName1").append(Organization);
                $("#ColName2").empty();
                $("#ColName2").append(Organization);
                form.render('select');
            }
            //#endregion

            //以上是layui模块
        });
    </script>

</body>
</html>

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

@@ -67,9 +67,12 @@
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label" style="width: 85px;">工序名称</label>
                                    <div class="layui-input-block" style="margin-left: 120px;">
                                        <input type="text" class="layui-input" name="HProcName" id="HProcName">
                                    <label class="layui-form-label" style="width: 85px;">工序名称</label>                                   
                                    <div class="layui-input-block">
                                        <input type="text" class="layui-input" lay-verify="HProcName" name="HProcName" id="HProcName" value="" style="background-color: #efefef4d; width: 65%; display: inline-block;" readonly>
                                        <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHProc" id="btnHProc" style="padding: 0 10px;float: right;margin-right: 3px;">
                                            <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                        </button>
                                    </div>
                                </div>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
@@ -504,6 +507,43 @@
                $("#btnSearch").trigger('click');
            }

            //工序
            form.on('submit(btnHProc)', function () {
                //页面层-自定义
                layer.open({
                    type: 2,
                    skin: 'layui-layer-rim', //加上边框
                    title: '工序列表',
                    closeBtn: 1,
                    shift: 2,
                    area: ['90%', '90%'],
                    maxmin: true,
                    content: ['../../基础资料/生产基础资料/Gy_Process.html', 'yes'],
                    btn: ['确定', '取消']
                    , btn1: function (index, layero) {

                        //按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//获取table的elem:"#test"
                        if (checkStatus.data.length === 0) {
                            return layer.msg('请选择数据');
                        }
                        $("#HProcName").val(checkStatus.data[0].工序名称);
                        layer.close(layer.index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) {
                        //按钮【按钮二】的回调
                        //return false å¼€å¯è¯¥ä»£ç å¯ç¦æ­¢ç‚¹å‡»è¯¥æŒ‰é’®å…³é—­
                    },
                    end: function () {

                    },
                    success: function (layero, index) {

                    }
                });
            });

            //#region ã€æŸ±çŠ¶å›¾ã€‘
            function set_Graphics() {
                var chartDom = document.getElementById('histogram');
@@ -796,6 +836,7 @@
                })
            }
            //#endregion

            //#region æ˜¾ç¤ºåˆ—数据
            function DisPlay_HideColumn() {
                $.ajax({

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

@@ -189,6 +189,7 @@
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_CloseBill" id="set_CloseBill"><i class="layui-icon layui-icon-form"></i>关闭</button>
                                <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" 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>-->
@@ -679,6 +680,9 @@
                        break;
                    //工序检
                    case 'btn-ProcessCheck': set_ProcessCheck();
                        break;
                    //下推工序出站汇报单
                    case 'btn-NoPassProd': set_NoPassProd();
                        break;
                    //预览
                    case 'btn-Cell': layer.msg('预览！');
@@ -1472,6 +1476,34 @@
                }
            }

            //下推不良品评审处理单
            function set_NoPassProd() {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var linterid = data[0].hmainid.toString();
                    var OperationType = 2;
                    layer.open({
                        type: 2
                        , area: ['100%', '100%']
                        , title: '工序检验单-编辑'
                        , shade: 0.6
                        , maxmin: false
                        , anim: 0
                        , content: ['../../生产工序管理/增加不良评审单/QC_NoPassProdDisposeBillMain.html?OperationType=2&linterid=' + linterid + '&HEntryID=&HSouceBillType=3791', 'yes']
                        , resize: false
                        , cancel: function () {
                            btnIs();
                        }
                        , end: function () {
                            get_FastQuery(table, option);
                        }
                    })
                } else {
                    layer.msg('请选择一行数据编辑！');
                }
            }

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