From df3e719955cc93b4e762ac75fbb61737fbf3b7a8 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期一, 16 六月 2025 08:38:12 +0800
Subject: [PATCH] 1

---
 WebTM/views/质量管理/质量报表/QC_PPMReport.html | 1299 +++++++++++++++++++++++++++-------------------------------
 1 files changed, 615 insertions(+), 684 deletions(-)

diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_PPMReport.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_PPMReport.html"
index 6887eaf..e565ad3 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_PPMReport.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_PPMReport.html"
@@ -1,97 +1,149 @@
 锘�<!DOCTYPE html>
-<html>
+<html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-    <meta charset="utf-8" />
-    <title>PPM缁╂晥瓒嬪娍鍥�</title>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>PPM鑰冩牳瓒嬪娍鍥�</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">
-    <!--寮曠敤layui鏍峰紡鏂囦欢-->
     <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
     <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
-    <!--寮曠敤layui js鏂囦欢-->
     <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/PubCustom.js"></script>
-    <script src="../../../layuiadmin/HideButton.js"></script>
-    <script src="../../../layuiadmin/soulTable.slim.js"></script>
-    <script src="../../../layuiadmin/PageTitle.js"></script>
-    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
     <script src='../../../layuiadmin/lib/extend/echarts.min.js'></script>
 
-    <style type="text/css">
-        input.layui-input.layui-unselect {
-            padding-right: 0;
-        }
-    </style>
 </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" style="margin-top: 10px; margin-bottom: 10px;">
-                                <div class="layui-inline">
-                                    <label class="layui-form-label">鏃ユ湡</label>
-                                    <div class="layui-input-block">
-                                        <input name="HDate" id="HDate" autocomplete="off" class="layui-input ForFilteringSchemes">
+                            <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">閮ㄩ棬</label>
-                                    <div class="layui-input-block">
-                                        <input type="text" class="layui-input" name="HDeptName" id="HDeptName" lay-verify="HDeptName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
-                                        <input type="hidden" class="layui-input" name="HDeptID" lay-verify="HDeptID" id="HDeptID" value="0">
-                                        <button type="button" lay-submit="" class="layui-btn" lay-filter="btnHDept" style="width:20px;">
-                                            <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
-                                        </button>
-                                    </div>
-                                </div>
-                                <!--<div class="layui-inline">
-                                    <label class="layui-form-label" style="width: 85px;">缁勭粐</label>
-                                    <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
-                                        <select name="HStockOrgID" id="HStockOrgID" class="ForFilteringSchemes" lay-verify="HStockOrgID">
-                                            鍔ㄦ�佹覆鏌撶粍缁�
+                                    <label class="layui-form-label" style="width: 85px;">骞�</label>
+                                    <div class="layui-input-block" style="margin-left: 120px; width: 85px;">
+                                        <select name="HYear" id="HYear" lay-verify="HYear">
+                                            <!--鍔ㄦ�佹覆鏌撳勾浠�-->
                                         </select>
                                     </div>
-                                </div>-->
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label" style="width: 85px;">鏈�</label>
+                                    <div class="layui-input-block" style="margin-left: 120px; width: 85px;">
+                                        <select name="HMonth" id="HMonth" lay-verify="HMonth">
+                                            <option value="">璇烽�夋嫨</option>
+                                            <option value="1">1</option>
+                                            <option value="2">2</option>
+                                            <option value="3">3</option>
+                                            <option value="4">4</option>
+                                            <option value="5">5</option>
+                                            <option value="6">6</option>
+                                            <option value="7">7</option>
+                                            <option value="8">8</option>
+                                            <option value="9">9</option>
+                                            <option value="10">10</option>
+                                            <option value="11">11</option>
+                                            <option value="12">12</option>
+                                        </select>
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label" style="width: 85px;">椤圭洰鍙�</label>
+                                    <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
+                                        <select name="HProject" id="HProject" class=" ForFilteringSchemes" lay-verify="HProject">
+                                            <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+                                        </select>
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label" style="width: 85px;">浜嬩笟閮�</label>
+                                    <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
+                                        <select name="HDivisionName" id="HDivisionName" class=" ForFilteringSchemes" lay-verify="HDivisionName">
+                                            <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+                                        </select>
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label" style="width: 85px;">鏄惁閲忎骇</label>
+                                    <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
+                                        <select name="HBatchWork" id="HBatchWork" lay-verify="HBatchWork">
+                                            <option value="">璇烽�夋嫨</option>
+                                            <option value="1">閲忎骇</option>
+                                            <option value="0">闈為噺浜�</option>
+                                        </select>
+                                    </div>
+                                </div>
                                 <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
                                     <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 class="layui-row" style="margin-top:5px;margin-left:82px;margin-bottom:5px;">
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label">閮ㄩ棬</label>
+                                        <div class="layui-input-block">
+                                            <input type="text" class="layui-input" name="HDeptName" id="HDeptName" lay-verify="HDeptName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+                                            <input type="hidden" class="layui-input" name="HDeptID" lay-verify="HDeptID" id="HDeptID" value="">
+                                            <button type="button" lay-submit="" class="layui-btn" lay-filter="btnHDept" style="width:20px;">
+                                                <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                            </button>
+                                        </div>
+                                    </div>
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label" style="width: 85px;">渚涘簲鍟嗗悕绉�</label>
+                                        <div class="layui-input-block">
+                                            <input type="text" class="layui-input" lay-verify="HSupName" name="HSupName" id="HSupName" value="" style="background-color: #efefef4d; width: 65%; display: inline-block;" readonly>
+                                            <input type="hidden" class="layui-input" name="HSupID" lay-verify="HSupID" id="HSupID" value="">
+                                            <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHSup" id="btnHSup" style="padding: 0 10px;float: right;margin-right: 3px;">
+                                                <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                            </button>
+                                        </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;; margin-bottom: 100px;">
+                            <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="btn_Export" id="btn_Export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Refresh" id="btn_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Exit" id="btn_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_HideColumn" id="btn_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_HideButton" id="btn_HideButton"><i class="layui-icon layui-icon-form"></i>鎸夐挳璁剧疆</button>
+                                <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="set_HideButton" 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', //涓诲叆鍙fā鍧�
-        }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate', 'soulTable'], function () {
+        }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
             //#region 鍏叡鍙橀噺
             var $ = layui.$
                 , admin = layui.admin
@@ -101,118 +153,79 @@
                 , element = layui.element
                 , laypage = layui.laypage
                 , laydate = layui.laydate
-                , soulTable = layui.soulTable
-            var HModName = "QC_PPMReport";
-            var HBillType = "QC_PPMReport";
-            var HMaker = sessionStorage["HUserName"]
-            var HStockOrgID = sessionStorage["OrganizationID"]  //缁勭粐ID
-            var sDate = Format(new Date(), "yyyy-MM-dd")
+            //鏌ヨ鏉′欢
             var sWhere = "";
-            var ins;                //鐢ㄤ簬瀵煎嚭excel
             var option = [];
-            var columns = "";
-            var titleData = [];     //涓嶉渶瑕佹樉绀虹殑瀛楁
+            var HModName = "QC_PPMReport";
+            //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+            var titleData = [];
+
+
+            var ins;                        //鐢ㄤ簬瀵煎嚭excel
             //#endregion
 
-            //#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
-            //閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
-            var HPageTitle = get_PageTitle(HBillType) == "" ? document.title : get_PageTitle(HBillType);
-            //#endregion
-            var totalArray = [];
-
-            //#region 杩涘叆椤甸潰鍗冲姞杞�
-
-            //#region 鍒濆鍖栫晫闈�
-
+            //#region 杩涘叆椤甸潰鏃㈠姞杞�
+            //鍒濆鍖栫晫闈�
             set_ClearBill();
-
-            function set_ClearBill() {
-                //鑾峰彇缁勭粐
-                //set_StockOrg();
-                //鍒濆鍖栬〃鍗曟椂闂�
-                set_InitDate();
-                //鍒濆鍖栬〃鏍�
-                set_InitGrid();
-
-                //鎵ц鏌ヨ鏂规硶
-                get_FastQuery()
-            }
             //#endregion
 
-            //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
-            if (sessionStorage.login != "login") {
-                layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
-                    icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
-                }, function () { window.location.href = "../../user/login.html"; });
-            }
-
-            //#region   鑾峰彇缁勭粐
-            //function set_StockOrg() {
-            //    //鑾峰彇鐧诲綍椤电粍缁囧垪
-            //    $.ajax({
-            //        type: "GET",
-            //        url: GetWEBURL() + "/Web/GetOrganizations",
-            //        async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
-            //        success: function (result) {
-            //            var Organization = "";
-            //            Organization += '<option  style="color:blue;" value="-1">鍏ㄩ儴</option>';
-            //            if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
-            //                var data = result.data;
-            //                for (var i = 0; i < data.length; i++) {
-            //                    Organization += '<option  style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
-            //                }
-            //                $("#HStockOrgID").append(Organization);
-            //                $("#HStockOrgID").val(HStockOrgID)
-            //                form.render('select');
-            //            }
-            //            layer.closeAll("loading");
-            //        },
-            //        complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
-            //    })
-            //}
-            //#endregion
-
-            //#region 鍒濆鍖栬〃鍗曟椂闂存彃浠�
-            function set_InitDate() {
-                //甯歌鐢ㄦ硶
-                laydate.render({
-                    elem: '#HDate'
-                    , type: 'year'
-                    , value: new Date()
-                    , btns: ['now']
-                    , showBottom: false     //鏄惁鏄剧ず搴曢儴鏍�
-                    , ready: function (date) {
-                        $("#layui-laydate").off('click', '.laydate-month-list li', function () {
-                            $("#layui-laydate").remove;
-                        });
-                    }
-                    //閫夋嫨骞翠唤鎴栨湀浠介兘浼氬叧闂�
-                    , change: function (value, date, endDate) { //鐩戝惉鏃ユ湡琚垏鎹�
-                        lay('#HDate').val(value);
-                        if ($(".layui-laydate").length) {
-                            $(".layui-laydate").remove();
-                        }
-                    }
-                });
-            }
-            //#endregion
-
-            //#region 鍒濆鍖栬〃鏍兼柟娉�
-            function set_InitGrid() {
-                option = {
-                    elem: '#mainTable'
-                    , toolbar: '#toolbarDemo'
-                    , page: true
-                    //, totalRow: true
-                    , height: 'full-50'
-                    , cellMinWidth: 90
-                    , limit: 50
-                    , limits: [50, 500, 5000, 20000]
-                    , done: function (res, curr, count) {
-                        soulTable.render(this);
-                    }
+            //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.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;
                 };
-            }
+            });
+            //鏌ヨ鎸夐挳
+            form.on('submit(btnSearch)', function (data) {
+                get_FastQuery();
+            });
+            // 閲嶇疆鎸夐挳
+            form.on('submit(btnReSearch)', function (data) {
+                set_ClearQuery();
+            });
+            //#region 閫夋嫨閮ㄩ棬鎸夐挳
+            form.on('submit(btnHDept)', function () {
+                layer.open({
+                    type: 2
+                    , skin: "layui-layer-rim"   //鍔犱笂杈规
+                    , title: "閮ㄩ棬鍒楄〃"         //鏍囬
+                    , closeBtn: 1               //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                    , shift: 2                  //寮瑰嚭鍔ㄧ敾
+                    , area: ["90%", "90%"]      //绐椾綋澶у皬
+                    , maxmin: true              //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                    , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
+                    , btn: ["纭畾", "鍙栨秷"]
+                    , btn1: function (index, laero) {
+                        //鎸夐挳涓�  鐨勫洖璋�
+                        var iframeWindow = window["layui-layer-iframe" + index];                //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");    //鑾峰彇閫変腑鐨勬暟鎹�
+
+                        if (checkStatus.data.length != 1) {
+                            return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+                        }
+                        $("#HDeptName").val(checkStatus.data[0].閮ㄩ棬鍚嶇О);
+                        $("#HDeptID").val(checkStatus.data[0].HItemID);
+                        layer.close(index); //鍏抽棴寮圭獥  瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                    , end: function () {
+                        //鍒锋柊鍒楄〃
+                        get_FastQuery();
+                    }
+                })
+            });
+            //#endregion
             //#endregion
 
             //#region 鐐瑰嚮琛岄�変腑楂樹寒
@@ -236,25 +249,460 @@
             })
             //#endregion
 
+            //#region 姝ら〉闈㈡墍鏈夋柟娉�
+            // 鍒濆鍖栫晫闈�
+            function set_ClearBill() {
+                Year(); //鍒濆鍖栧勾
+                Get_HProject(); //鑾峰彇椤圭洰鍙�
+                GetGy_Division();//鑾峰彇浜嬩笟閮�
+                set_InitGrid(); //鍒濆鍖栬〃鏍�
+                get_FastQuery();
+                //鍔犺浇鏌辩姸鍥�
+                set_Graphics();
+
+            }
+            //鍒濆鍖栬〃鏍�
+            function set_InitGrid() {
+                option = {
+                    elem: '#mainTable'
+                    , toolbar: '#toolbarDemo'
+                    , height: 'full-50'
+                    , page: true
+                    , limits: [50, 500, 5000, 50000]
+                    , limit: 50
+                    , cellMinWidth: 90
+
+                };
+            }
+
+            //骞�
+            function Year() {
+                var yyyy = new Date().getFullYear();
+                var YearOption = "";
+                for (var i = 0; i <= 10; i++) {
+                    YearOption += '<option  style="color:blue;" value="' + (yyyy - 5 + i) + '">' + (yyyy - 5 + i) + '</option>';
+                }
+                $("#HYear").append(YearOption);
+                $("#HYear").val(yyyy);
+                $("#HMonth").val(new Date().getMonth() + 1);
+                form.render('select');
+            }
+
+            //#region 鑾峰彇浜嬩笟閮�
+            function GetGy_Division() {
+                //鑾峰彇浜嬩笟閮�
+                var HDivisionList = '<option value="" style="color:red;" selected></option>';
+                $.ajax({
+                    type: "get",
+                    url: GetWEBURL() + "/Gy_Material/Get_Gy_Division",
+                    async: false,
+                    data: { "HOrgID": sessionStorage["OrganizationID"] },
+                    success: function (result) {
+                        if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            var data = result.data;
+                            for (var i = 0; i < data.length; i++) {
+                                HDivisionList += '<option  style="color:blue;"  value="' + data[i].HName + '" >' + data[i].HName + '</option>';
+                            }
+                            $("#HDivisionName").append(HDivisionList);
+                            form.render('select');
+
+                        }
+                        layer.closeAll("loading");
+                    }
+                })
+            }
+            //#endregion
+
+            //#region 鑾峰彇椤圭洰鍙�
+            function Get_HProject() {
+                //鑾峰彇椤圭洰鍙�
+                var HProjectList = '<option value="" style="color:red;" selected></option>';
+                $.ajax({
+                    type: "get",
+                    url: GetWEBURL() + "/Gy_Material/Get_HProject",
+                    async: false,
+                    data: { "HOrgID": sessionStorage["OrganizationID"] },
+                    success: function (result) {
+                        if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            var data = result.data;
+                            for (var i = 0; i < data.length; i++) {
+                                HProjectList += '<option  style="color:blue;"  value="' + data[i].HName + '" >' + data[i].HName + '</option>';
+                            }
+                            $("#HProject").append(HProjectList);
+                            form.render('select');
+
+                        }
+                        layer.closeAll("loading");
+                    }
+                })
+            }
+            //#endregion
+
+            //鏌ヨ
+            function get_Display(sWhere) {
+                var index = layer.load(0, { shade: false });
+                var ajaxLoad = layer.load();
+                //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+                $.ajax({
+
+                    url: GetWEBURL() + '/QC_CustomerAppealReport/GetQC_PPMReport_Json',
+                    type: "GET",
+                    async:false,
+                    data: { "sWhere": sWhere},
+                    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 (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 {
+                                    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();
+
+                            layer.close(ajaxLoad);
+
+                        } 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 HYear = $("#HYear").val();
+                var HMonth = $("#HMonth").val();
+                var HProject = $("#HProject").val();//椤圭洰鍙�
+                var HBatchWork = $("#HBatchWork").val();//鏄惁閲忎骇
+                var HDivisionName = $("#HDivisionName").val();//浜嬩笟閮�
+                var HSupID = $("#HSupID").val();
+                var HDeptID = $("#HDeptID").val();
+
+
+                sWhere = {
+                    HYear: HYear
+                    , HMonth: HMonth
+                    , HSupID: HSupID
+                    , HDivisionName: HDivisionName
+                    , HProject: HProject
+                    , HBatchWork: HBatchWork
+                    , HDeptID: HDeptID
+                }
+                get_Display(JSON.stringify(sWhere));
+                //鍔犺浇鏌辩姸鍥�
+                set_Graphics();
+                sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+
+            }
+
+            //閲嶇疆蹇�熸煡璇�
+            function set_ClearQuery() {
+                $("#HYear").val(new Date().getFullYear());
+                $("#HMonth").val(new Date().getMonth() + 1);
+                $("#HSupID").val("");
+                $("#HSupName").val("");
+                $("#HDeptID").val(0);
+                $("#HDeptName").val("");
+                $("#HDivisionName").val("");
+                $("#HProject").val("");
+                $("#HBatchWork").val("");
+                form.render('select');
+
+                sWhere = "";
+            }
+            //鍒锋柊
+            function get_Refresh() {
+                $("#btnSearch").trigger('click');
+            }
+
+            //渚涘簲鍟�
+            form.on('submit(btnHSup)', function () {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '渚涘簲鍟嗗垪琛�',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['90%', '90%'],
+                    maxmin: true,
+                    content: ['../../鍩虹璧勬枡/閲囪喘鍩虹璧勬枡/Gy_Supplier.html?Type=HSup', 'yes'],
+                    btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {
+
+                        //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HSupName").val(checkStatus.data[0].渚涘簲鍟嗗悕绉�);
+                        $("#HSupID").val(checkStatus.data[0].HItemID);
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                    end: function () {
+
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+            });
+
+            //#region 銆愭煴鐘跺浘銆�
+            function set_Graphics() {
+                var chartDom = document.getElementById('histogram');
+                var myChart = echarts.init(chartDom);
+                var option_ZZT;
+
+                //鏌辩姸鍥剧粦瀹氭暟鎹�
+                var H_X = [];//X杞存爣棰�
+                var HBadCount = [];//涓嶈壇鏁伴噺
+                var PPM = [];//涓�娆″悎鏍�
+                var HProcPPMTarGetVal = [];//PPM鐩爣鍊�
+                var HTitle = "PPM鑰冩牳缁╂晥瓒嬪娍鍥�";//鍥惧舰鏍囬
+
+                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++) {
+
+                        HBadCount.push(option.data[i].涓嶈壇鎬绘暟);
+                        PPM.push((option.data[i].PPM == null ? '0.00%' : option.data[i].PPM ).replace('%', ''));
+                        HProcPPMTarGetVal.push(option.data[i].PPM鐩爣鍊�);
+                    }
+                }
+                option_ZZT = {
+                    title: {
+                        text: HTitle,
+                        left: 'center'
+                    },
+                    tooltip: {
+                        trigger: 'axis',
+                        axisPointer: {
+                            type: 'shadow'
+                        },
+                        formatter: function (params) {
+                            let tooltipHtml = params[0].axisValue + '<br>'; // X杞存暟鍊�
+
+                            params.forEach(function (item) {
+                                if (item.seriesType === 'line') {
+                                    let valueToShow = parseFloat(item.value); // 灏嗗瓧绗︿覆杞崲涓烘暟鍊�
+                                    tooltipHtml += item.seriesName + ': ' + valueToShow.toFixed(3) + '%' + '<br>'; // 鎶樼嚎鍥炬暟鎹牸寮忓寲涓虹櫨鍒嗘瘮
+                                } else {
+                                    tooltipHtml += item.seriesName + ': ' + item.value + '<br>'; // 鏌辩姸鍥炬暟鎹洿鎺ユ樉绀�
+                                }
+                            });
+
+                            return tooltipHtml;
+                        }
+
+                    },
+                    legend: {
+                        data: [ '涓嶈壇鎬绘暟', 'PPM','PPM鐩爣鍊�'],
+                        top: 'bottom',  // 灏嗗浘渚嬫斁缃湪鍥捐〃鐨勪笅鏂�
+                        left: 'center'  // 鎴栬�� 'right'锛屾牴鎹渶瑕佽皟鏁存按骞充綅缃�
+                    },
+                    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',
+                            name: '鏁伴噺',
+                            axisLabel: {
+                                formatter: '{value}'
+                            }
+                        },
+                        {
+                            type: 'value',
+                            name: '鐧惧垎姣�',
+                            min: 0,
+                            max: 100,
+                            axisLabel: {
+                                formatter: '{value}%'
+                            }
+                        }
+                    ],
+                    series: [
+                        {
+                            name: '涓嶈壇鎬绘暟',
+                            type: 'bar',
+                            emphasis: {
+                                focus: 'series'
+                            },
+                            tooltip: {
+                                valueFormatter: function (value) {
+                                    return value;
+                                }
+                            },
+                            itemStyle: {
+                                normal: {
+                                    label: {
+                                        show: true,		//寮�鍚樉绀�
+                                        textStyle: {	    //鏁板�兼牱寮�
+                                            color: 'black',
+                                            fontSize: 16
+                                        }
+                                    }
+                                },
+                                color: '#FF0000' // 璁剧疆鏌辩姸鍥炬鑹�
+                            },
+                            data: HBadCount
+                        },
+                        {
+                            name: 'PPM',
+                            type: 'line',
+                            yAxisIndex: 1, // 浣跨敤绗簩涓� yAxis 鏄剧ず鐧惧垎姣�
+                            data: PPM,
+                            label: {
+                                show: true,
+                                formatter: '{c}%'
+                            },
+                            lineStyle: {
+                                color: '#1E90FF' // 璁剧疆鎶樼嚎鍥鹃鑹茶摑鑹�
+                            }
+                        },
+                        {
+                            name: 'PPM鐩爣鍊�',
+                            type: 'line',
+                            yAxisIndex: 1, // 浣跨敤绗簩涓� yAxis 鏄剧ず鐧惧垎姣�
+                            data: HProcPPMTarGetVal,
+                            label: {
+                                show: true,
+                                formatter: '{c}%'
+                            },
+                            lineStyle: {
+                                color: '#FF0000' // 璁剧疆鎶樼嚎鍥捐摑鑹�
+                            }
+                        }
+                    ]
+                };
+
+                option_ZZT && myChart.setOption(option_ZZT);
+            }
+            //#endregion
+
+            //#region 瀵煎嚭Execel
+            function get_Export() {
+                table.exportFile(ins.config.id, option.data, "xls");
+            }
+            //#endregion
+
+            //#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({
-                    type: "GET",
                     url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+                    type: "GET",
                     async: false,
-                    data: { "HModName": HModName, "user": HMaker },
+                    data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
                     success: function (data1) {
                         if (data1.data.length != 0) {
-                            var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
 
-                            var totalArray = [];
+                            var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+                            //var titleData = ["鍗曟嵁ID", "HMouldID", "hsubid", "HManagerID", "婧愬崟涓诲唴鐮�", "婧愬崟瀛愬唴鐮�"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
 
                             dataCol = data1.data[0].HGridString.split(',');
 
-                            for (var i = 0; i < option.cols[0].length - 2; i++) {
-                                if (dataCol[i]) {
-                                    var dataCols = dataCol[i].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;
@@ -269,6 +717,12 @@
                                 } 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;
@@ -309,11 +763,6 @@
                         } else {
                             table.render(option);
                         }
-
-                        //鍒锋柊鎸夐挳鏄剧ず
-                        var btns = document.getElementsByTagName("button");     //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
-                        Display_HideButton(btns, HBillType, HModName, HMaker);
-
                     }, error: function () {
                         layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
                     }
@@ -321,530 +770,13 @@
             }
             //#endregion
 
-            //#endregion
-
-            //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
-
-            //#region 閫夋嫨閮ㄩ棬鎸夐挳
-            form.on('submit(btnHDept)', function () {
-                layer.open({
-                    type: 2
-                    , skin: "layui-layer-rim"   //鍔犱笂杈规
-                    , title: "閮ㄩ棬鍒楄〃"         //鏍囬
-                    , closeBtn: 1               //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
-                    , shift: 2                  //寮瑰嚭鍔ㄧ敾
-                    , area: ["90%", "90%"]      //绐椾綋澶у皬
-                    , maxmin: true              //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
-                    , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
-                    , btn: ["纭畾", "鍙栨秷"]
-                    , btn1: function (index, laero) {
-                        //鎸夐挳涓�  鐨勫洖璋�
-                        var iframeWindow = window["layui-layer-iframe" + index];                //鑾峰彇寮规椤甸潰
-                        var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");    //鑾峰彇閫変腑鐨勬暟鎹�
-
-                        if (checkStatus.data.length != 1) {
-                            return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
-                        }
-                        $("#HDeptName").val(checkStatus.data[0].閮ㄩ棬鍚嶇О);
-                        $("#HDeptID").val(checkStatus.data[0].HItemID);
-                        layer.close(index); //鍏抽棴寮圭獥  瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
-                    }
-                    , btn2: function (index, layero) { }
-                    , end: function () {
-                        //鍒锋柊鍒楄〃
-                        get_FastQuery();
-                    }
-                })
-            });
-            //#endregion
-
-            //#region 宸ュ叿鏍忎簨浠�
-            table.on('toolbar(mainTable)', function (obj) {
-                switch (obj.event) {
-                    //瀵煎嚭鎸夐挳
-                    case 'btn_Export': btn_Export();
-                        break;
-                    //鍒锋柊鎸夐挳
-                    case 'btn_Refresh': btn_Refresh();
-                        break;
-                    //閫�鍑烘寜閽�
-                    case 'btn_Exit': Pub_Close(2);
-                        break;
-                    //鍒楄缃�
-                    case 'btn_HideColumn': get_HideColumn();
-                        break;
-                    //鎸夐挳璁剧疆
-                    case 'btn_HideButton':
-                        var btns = document.getElementsByTagName("button");     //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
-                        get_HideButton(btns, HBillType, HModName, HMaker);
-                        break;
-                };
-            });
-            //#endregion
-
-            //#region 瀵煎嚭Execel
-            function btn_Export() {
-                table.exportFile(ins.config.id, option.data, "xls");
-            }
-            //#endregion
-
-            //#region 鍒锋柊
-            function btn_Refresh() {
-                get_FastQuery();
-            }
-            //#endregion
-
-            //#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 閲嶇疆鎸夐挳
-            form.on('submit(btnReSearch)', function (data) {
-                //娓呯┖杩囨护鏉′欢
-                set_ClearQuery();
-            });
-
-            //閲嶇疆杩囨护鏉′欢
-            function set_ClearQuery() {
-                $("#HDate").val(Format(new Date(), "yyyy"));
-                sDate = Format(new Date(), "yyyy-MM-dd")
-                $("#HDeptName").val("");
-                //$("#HStockOrgID").val(HStockOrgID)   //缁勭粐
-                form.render('select');
-                sWhere = "";
-            }
-
-            //#endregion
-
-            //#region 鏌ヨ鎸夐挳
-            form.on('submit(btnSearch)', function (data) {
-                get_FastQuery();
-            });
-
-            //蹇�熸煡璇�
-            function get_FastQuery() {
-                sDate = $("#HDate").val();                  //鏃ユ湡
-                get_Display(sWhere);
-                //鍔犺浇鏌辩姸鍥�
-                set_Graphics();
-            }
-
-            //#endregion
-
-            //#region 鍒楄〃鍒锋柊
-            function get_Display(sWhere) {
-                var HDate = sDate;          //鏃ユ湡
-                //鏂囨湰妗嗕负绌烘椂锛屾竻绌哄搴擨D
-                if ($("#HDeptName").val() == '') {
-                    $("#HDeptID").val("0");
-                }
-                var HDeptID = $("#HDeptID").val()
-
-                var ajaxLoad = layer.load();
-                $.ajax({
-                    type: "GET",
-                    url: GetWEBURL() + '/QC_QualityReportsController/GetQC_PPMReport_Json',
-                    async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
-                    data: { "HYear": HDate, "HDeptID": HDeptID },
-                    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 });
-                                //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙H寮�澶寸殑鍒椾笉鏄剧ず锛�
-                                var patrn = new RegExp(/^h/i);
-                                if (patrn.test(data1.list[key].ColmCols)) {
-                                    titleData[key] = data1.list[key].ColmCols;
-                                }
-                            }
-
-                            //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
-                            col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' });
-                            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: 'left', hide: true }); //闅愯棌id鍒�
-                                }else {
-                                    switch (data[i].Type) {
-                                        //int
-                                        case 'DateTime':
-                                            col.push({ field: data[i].id, title: data[i].name, align: 'left', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 160 });
-                                            break;
-                                        case 'Decimal':
-                                            col.push({ field: data[i].id, title: data[i].name, align: 'left', sort: true, width: 100, totalRow: true });
-                                            break;
-                                        case 'Int32':
-                                            col.push({ field: data[i].id, title: data[i].name, align: 'left', sort: true, width: 100, totalRow: true });
-                                            break;
-                                        default:
-                                            if (data[i].name == '缁熻椤�') {
-                                                col.push({ field: data[i].id, title: data[i].name, align: 'left', sort: true, width: 200 });
-                                            } else {
-                                                col.push({ field: data[i].id, title: data[i].name, align: 'left', sort: true, width: 130 });
-                                            }
-                                    }
-                                }
-                            }
-                            //鍔ㄦ�佹樉绀哄垪鍚�
-                            option = {
-                                elem: '#mainTable'
-                                , toolbar: '#toolbarDemo'
-                                , cols: [col]
-                                , data: data1.data
-                                , height: 800
-                                , page: true
-                                //, totalRow: true
-                                , cellMinWidth: 90
-                                , limit: 50
-                                , limits: [50, 500, 5000, 20000]
-                                , done: function (res, curr, count) {
-                                    soulTable.render(this);
-                                }
-                            }
-                            columns = col;
-
-                            option.cols = [columns];
-                            option.data = data1.data;
-                            //option.totalRow = true;
-                            table.render(option);
-                            ins = table.render(option);
-                            //鍒锋柊琛ㄦ牸鏁版嵁
-                            DisPlay_HideColumn();
-                            layer.close(ajaxLoad);
-                        } else {
-                            layer.close(ajaxLoad);
-                            layer.alert(data1.Message, { icon: 5 });
-                        }
-                    },
-                    error: function () {
-                        layer.close(ajaxLoad);
-                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
-                    }
-                });
-            }
-            //#endregion
-
-            //#region 鍔犺浇鍥捐〃
-            function set_Graphics() {
-                //#region 銆愭煴鐘跺浘銆�
-                var app = {};
-                var chartDom = document.getElementById('histogram');
-                var myChart = echarts.init(chartDom);
-                var option_mychart;
-
-                //#region [鏌辩姸鍥惧竷灞�鏍峰紡]
-                const posList = [
-                    'left',
-                    'right',
-                    'top',
-                    'bottom',
-                    'inside',
-                    'insideTop',
-                    'insideLeft',
-                    'insideRight',
-                    'insideBottom',
-                    'insideTopLeft',
-                    'insideTopRight',
-                    'insideBottomLeft',
-                    'insideBottomRight'
-                ];
-                app.configParameters = {
-                    rotate: {
-                        min: -90,
-                        max: 90
-                    },
-                    align: {
-                        options: {
-                            left: 'left',
-                            center: 'center',
-                            right: 'right'
-                        }
-                    },
-                    verticalAlign: {
-                        options: {
-                            top: 'top',
-                            middle: 'middle',
-                            bottom: 'bottom'
-                        }
-                    },
-                    position: {
-                        options: posList.reduce(function (map, pos) {
-                            map[pos] = pos;
-                            return map;
-                        }, {})
-                    },
-                    distance: {
-                        min: 0,
-                        max: 100
-                    }
-                };
-                app.config = {
-                    rotate: 90,
-                    align: 'left',
-                    verticalAlign: 'middle',
-                    position: 'insideBottom',
-                    distance: 15,
-                    onChange: function () {
-                        const labelOption = {
-                            rotate: app.config.rotate,
-                            align: app.config.align,
-                            verticalAlign: app.config.verticalAlign,
-                            position: app.config.position,
-                            distance: app.config.distance
-                        };
-                        myChart.setOption({
-                            series: [
-                                {
-                                    label: labelOption
-                                },
-                                {
-                                    label: labelOption
-                                },
-                                {
-                                    label: labelOption
-                                },
-                                {
-                                    label: labelOption
-                                }
-                            ]
-                        });
-                    }
-                };
-                const labelOption = {
-                    show: true,
-                    position: 'top',
-                    textStyle: {
-                        //color: '#333', // 鏍囩瀛椾綋棰滆壊
-                        fontSize: 12, // 鏍囩瀛椾綋澶у皬
-                        //fontWeight: 'bold', // 鏍囩瀛椾綋鍔犵矖
-                        //fontStyle: 'italic', // 鏍囩瀛椾綋鏂滀綋
-                        //fontFamily: 'Arial' // 鏍囩瀛椾綋
-                    }
-                };
-                const labelOption1 = {
-                    show: true,
-                    position: 'right',
-                    textStyle: {
-                        //color: '#333', // 鏍囩瀛椾綋棰滆壊
-                        fontSize: 12, // 鏍囩瀛椾綋澶у皬
-                        //fontWeight: 'bold', // 鏍囩瀛椾綋鍔犵矖
-                        //fontStyle: 'italic', // 鏍囩瀛椾綋鏂滀綋
-                        //fontFamily: 'Arial' // 鏍囩瀛椾綋
-                    }
-                }
-                //#endregion
-
-                //鏌辩姸鍥剧粦瀹氭暟鎹�
-                var H_X = ['1鏈�', '2鏈�', '3鏈�', '4鏈�', '5鏈�', '6鏈�', '7鏈�', '8鏈�', '9鏈�', '10鏈�', '11鏈�', '12鏈�'];//X杞存爣棰�
-                var HBadQty = [];       //y杞达細涓嶈壇鎬绘暟
-                var HPPM = [];          //y杞达細PPM
-                var HTarget = [];       //y杞达細鐩爣
-                for (let i = 0; i < option.data.length; i++) {
-                    //鑾峰彇涓嶈壇鎬绘暟琛屾暟鍊�
-                    if (option.data[i].缁熻椤� == '涓嶈壇鎬绘暟') {
-                        for (let j = 1; j <= 12; j++) {
-                            HBadQty.push(option.data[i][j + "鏈�"]);
-                        }
-                    }
-                    //鑾峰彇PPM琛屾暟鍊�
-                    if (option.data[i].缁熻椤� == 'PPM') {
-                        for (let j = 1; j <= 12; j++) {
-                            HPPM.push(option.data[i][j + "鏈�"]);
-                        }
-                    }
-                    //鑾峰彇鐩爣琛屾暟鍊�
-                    if (option.data[i].缁熻椤� == '鐩爣') {
-                        for (let j = 1; j <= 12; j++) {
-                            HTarget.push(option.data[i][j + "鏈�"]);
-                        }
-                    }
-                }
-
-                option_mychart = {
-                    title: {
-                        text: 'PPM缁熻鍥捐〃',
-                        left: 'center'
-                    },
-                    tooltip: {
-                        trigger: 'axis',
-                        axisPointer: {
-                            type: 'shadow'
-                        }
-                    },
-                    legend: {
-                        data: ['涓嶈壇鎬绘暟', 'PPM', '鐩爣'],
-                        top: 'bottom',  // 灏嗗浘渚嬫斁缃湪鍥捐〃鐨勪笅鏂�
-                        left: 'center'  // 鎴栬�� 'right'锛屾牴鎹渶瑕佽皟鏁存按骞充綅缃�
-                    },
-                    //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 }
-                    //    }
-                    //},
-                    grid:
-                    {
-                        left: '5%',
-                        right: '5%',
-                        bottom: '10%',
-                        //top: '10%',
-                        containLabel: true
-                    },
-                    xAxis: [                                //璁剧疆x杞村潗鏍�
-                        {
-                            type: 'category',
-                            axisTick: { show: true },
-                            data: H_X,
-                            axisLabel: {
-                                formatter: function (value) {
-                                    var temp = "";
-                                    var temp_len = 5;
-                                    for (var i = 0; i < value.length; i = i + temp_len) {
-                                        if (i + temp_len <= value.length) {
-                                            temp += '\n' + value.slice(i, i + temp_len)
-                                        } else {
-                                            temp += '\n' + value.slice(i);
-                                        }
-                                    }
-
-                                    return temp;
-
-                                    // 浣跨敤 '\n' 瀹炵幇鎹㈣
-                                    //return value.length > 5 ? value.slice(0, 5) + '\n' + value.slice(5) : value;
-                                },
-                                width: 30 // 璁剧疆鍒诲害鏍囩鐨勫搴︼紝瓒呰繃杩欎釜瀹藉害浼氳嚜鍔ㄦ崲琛�
-                            }
-                        }
-                    ],
-                    yAxis: [                                //璁剧疆y杞存暟鎹被鍨�
-                        {
-                            type: 'value',
-                            position: 'left',
-                            data: [HBadQty] // 宸︿晶Y杞寸殑鏁版嵁
-                        }, {
-                            type: 'value',
-                            position: 'right',
-                            data: [HPPM, HTarget], // 鍙充晶Y杞寸殑鏁版嵁
-                            axisLabel: {
-                                formatter: '{value}' // 鍙互娣诲姞鍗曚綅
-                            }
-                        }
-                    ],
-                    series: [                               //璁剧疆y杞存暟鎹�
-                        {
-                            name: '涓嶈壇鎬绘暟',
-                            type: 'bar',
-                            barWidth: 30,
-                            barGap: 0,
-                            label: labelOption,
-                            emphasis: {
-                                focus: 'series'
-                            },
-                            itemStyle: {
-                                normal: {
-                                    lineStyle: {
-                                        color: '#0066CC' // 璁剧疆绾挎潯棰滆壊涓鸿摑鑹�
-                                    },
-                                    color: '#0066CC' // 璁剧疆绾挎潯棰滆壊涓鸿摑鑹�
-                                }
-                            },
-                            data: HBadQty
-                        },
-                        {
-                            name: 'PPM',
-                            type: 'line',
-                            yAxisIndex: 1,
-                            barWidth: 10,
-                            barGap: 0,
-                            label: labelOption1,
-                            emphasis: {
-                                focus: 'series'
-                            },
-                            itemStyle: {
-                                normal: {
-                                    lineStyle: {
-                                        color: '#FF8000' // 璁剧疆绾挎潯棰滆壊涓洪粍鑹�
-                                    },
-                                    color: '#FF8000' // 璁剧疆绾挎潯棰滆壊涓洪粍鑹�
-                                }
-                            },
-                            data: HPPM
-                        },
-                        {
-                            name: '鐩爣',
-                            type: 'line',
-                            barWidth: 10,
-                            barGap: 0,
-                            label: labelOption1,
-                            emphasis: {
-                                focus: 'series'
-                            },
-                            itemStyle: {
-                                normal: {
-                                    lineStyle: {
-                                        color: '#FF0000' // 璁剧疆绾挎潯棰滆壊涓虹孩鑹�
-                                    },
-                                    color: '#FF0000' // 璁剧疆绾挎潯棰滆壊涓虹孩鑹�
-                                }
-                            },
-                            data: HTarget
-                        }
-                    ]
-                };
-                option_mychart && myChart.setOption(option_mychart);
-                //#endregion
-            }
-            ////#endregion
-            //#endregion
-
+            //浠ヤ笂鏄痩ayui妯″潡
         });
-
-        //#endregion
-        //浠ヤ笂鏄痩ayui妯″潡
-
+        function GetHSupNameValue(obj)  //杩斿洖渚涘簲鍟�
+        {
+            $("#HSupName").val(obj[0].渚涘簲鍟嗗悕绉�);
+            $("#HSupID").val(obj[0].HItemID);
+        }
         //鍙屽嚮杩斿洖鍩虹璧勬枡鏁版嵁    琛ㄥご
         function GetHDeptNameValue(obj)  //杩斿洖閮ㄩ棬
         {
@@ -852,6 +784,5 @@
             $("#HDeptID").val(obj[0].HItemID);
         }
     </script>
-
 </body>
-</html>
+</html>
\ No newline at end of file

--
Gitblit v1.9.1