From 242d92a72ed07aaa10787e9f881fb10162fc6222 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期四, 26 十月 2023 17:09:10 +0800
Subject: [PATCH] 质量报表(总,客户,部门,责任人,编码,错误类型)

---
 WebTM/views/品质管理/客诉处理/QC_CustomerAppealReport_Dept.html     |  581 +++++++++
 WebTM/views/品质管理/客诉处理/QC_CustomerAppealReport_Customer.html |  318 +++++
 WebTM/views/生产管理/生产工位/Gy_SourceWorkStationSetList.html      |    4 
 WebTM/views/品质管理/客诉处理/QC_CustomerAppealReport_BadClass.html |  533 ++++++++
 WebTM/views/质量管理/工序检验单/QC_ProcessCheckBill.html             |   21 
 WebTM/views/质量管理/首件检验单/QC_Add_Edit_FirstPieceCheckBill.html |    6 
 WebTM/views/质量管理/首件检验单/QC_FirstPieceCheckReport_ZDQX.html   |  608 +++++++++
 WebTM/views/品质管理/客诉处理/QC_CustomerAppealReport_Material.html |  636 ++++++++++
 WebTM/WebTM.csproj                                          |    5 
 WebTM/views/品质管理/客诉处理/QC_CustomerAppealReport_Emp.html      |  677 +++++++++++
 WebTM/views/品质管理/客诉处理/QC_CustomerAppealReport_Sum.html      |  221 +++
 11 files changed, 3,554 insertions(+), 56 deletions(-)

diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 303a7a3..abe378c 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -227,6 +227,10 @@
     <Content Include="views\浜轰簨绠$悊\绂昏亴鐢宠\HR_EmpDimissionBillList.html" />
     <Content Include="views\浜轰簨绠$悊\鑱屽憳寮傚姩鍗昞HR_EmpChangeBill.html" />
     <Content Include="views\浜轰簨绠$悊\鑱屽憳寮傚姩鍗昞HR_EmpChangeBillList.html" />
+    <Content Include="views\鍝佽川绠$悊\瀹㈣瘔澶勭悊\QC_CustomerAppealReport_BadClass.html" />
+    <Content Include="views\鍝佽川绠$悊\瀹㈣瘔澶勭悊\QC_CustomerAppealReport_Material.html" />
+    <Content Include="views\鍝佽川绠$悊\瀹㈣瘔澶勭悊\QC_CustomerAppealReport_Emp.html" />
+    <Content Include="views\鍝佽川绠$悊\瀹㈣瘔澶勭悊\QC_CustomerAppealReport_Dept.html" />
     <Content Include="views\鍝佽川绠$悊\瀹㈣瘔澶勭悊\QC_CustomerAppealReport_Customer.html" />
     <Content Include="views\鍝佽川绠$悊\瀹㈣瘔澶勭悊\QC_CustomerAppealReport_Sum.html" />
     <Content Include="views\鍝佽川绠$悊\瀹㈣瘔澶勭悊\Crm_CustomerAppealBill_KaiBei.html" />
@@ -288,6 +292,7 @@
     <Content Include="views\璁″垝绠$悊\宸ヨ壓璺嚎\Gy_RoutingBillSubList.html" />
     <Content Include="views\璐ㄩ噺绠$悊\宸ュ簭妫�楠屽崟\MES_ProcessCheckBillList_PDA.html" />
     <Content Include="views\璐ㄩ噺绠$悊\宸ュ簭妫�楠屽崟\MES_ProcessCheckBill_PDA.html" />
+    <Content Include="views\璐ㄩ噺绠$悊\棣栦欢妫�楠屽崟\QC_FirstPieceCheckReport_ZDQX.html" />
     <Content Include="views\杞﹂棿绠$悊\宸ュ簭娴佽浆\MES_Sc_ProcessExchangeBillMain_Note_PDA.html" />
     <Content Include="views\杞﹂棿绠$悊\鎶ヨ〃鍒嗘瀽\Sc_ProcessErrStationReport.html" />
     <Content Include="views\杞﹂棿绠$悊\鎶ヨ〃鍒嗘瀽\Kf_MateOutSumReport_QiaoYi.html" />
diff --git "a/WebTM/views/\345\223\201\350\264\250\347\256\241\347\220\206/\345\256\242\350\257\211\345\244\204\347\220\206/QC_CustomerAppealReport_BadClass.html" "b/WebTM/views/\345\223\201\350\264\250\347\256\241\347\220\206/\345\256\242\350\257\211\345\244\204\347\220\206/QC_CustomerAppealReport_BadClass.html"
new file mode 100644
index 0000000..8f31cbb
--- /dev/null
+++ "b/WebTM/views/\345\223\201\350\264\250\347\256\241\347\220\206/\345\256\242\350\257\211\345\244\204\347\220\206/QC_CustomerAppealReport_BadClass.html"
@@ -0,0 +1,533 @@
+锘�<!DOCTYPE html>
+<html>
+<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/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/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">
+                                <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; width: 85px;">
+                                        <select name="HYear" id="HYear" lay-verify="HYear">
+                                            <!--鍔ㄦ�佹覆鏌撳勾浠�-->
+                                        </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-colla-content" style="padding: 0px; margin-left: 6%;">
+                                    <div class="layui-row" style="margin-top:10px;">
+                                        <!--鍏朵粬鏉′欢-->
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                        <div>
+                            <div id="histogram" style="width:99.5%;height:calc(68vh);margin-top:10px;">
+
+                            </div>
+                            <div style="width:99%;height:calc(33vh);">
+                                <table class="" id="mainTable" lay-filter="mainTable"></table>
+                            </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-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="HideColumn"><i class="layui-icon layui-icon-form"></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'], 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
+                , util = layui.util
+            //鏌ヨ鏉′欢
+            var sWhere = "";
+            var option = [];
+            var HModName = "QC_CustomerAppealReport_BadClass";
+            //#endregion
+
+            //#region 杩涘叆椤甸潰鏃㈠姞杞�
+
+            //鍒濆鍖栫晫闈�
+            set_ClearBill();
+            //#endregion
+
+            //#region 銆愭煴鐘跺浘銆�
+            function set_Graphics() {
+                var app = {};
+                var chartDom = document.getElementById('histogram');
+                var myChart = echarts.init(chartDom);
+                var option_ZZT;
+                //#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: app.config.position,
+                    distance: app.config.distance,
+                    align: app.config.align,
+                    verticalAlign: app.config.verticalAlign,
+                    rotate: app.config.rotate,
+                    formatter: '{c}  {name|{a}}',
+                    fontSize: 16,
+                    rich: {
+                        name: {}
+                    }
+                };
+                //#endregion
+
+                //鏌辩姸鍥剧粦瀹氭暟鎹�
+                var HCusName = [];//瀹㈡埛鍚嶇О            
+                var Hseries = []; //x杞存暟鎹紙鎬讳綋锛�
+                var option_X = []; //x杞存暟鎹槑缁�
+                var HProblemType = [];//闂绫诲瀷
+
+                for (let i = 2; i < option.cols[0].length - 1;i++) {
+                    HCusName.push(option.cols[0][i].title);
+                }
+                if (option.data.length > 0) {
+                    for (let i = 0; i < option.data.length; i++) {    
+                        HProblemType.push(option.data[i].閿欒绫诲瀷);
+                        option_X = [];
+
+                        for (let j = 0; j < option.data.length; j++) {
+                            option_X.push(option.data[i][HCusName[j]]);
+                        }
+                        
+                        Hseries.push({
+                            name: option.data[i].閿欒绫诲瀷,
+                            type: 'bar',
+                            barGap: 0,
+                            label: {
+                                show: true,
+                                position: 'top'
+                            },
+                            emphasis: {
+                                focus: 'series'
+                            },
+                            data: option_X
+                        });
+                    }
+                }              
+            
+                option_ZZT = {
+                    grid: {
+                        x: '1%', //鐩稿綋浜庤窛绂诲乏杈规晥鏋�:padding-left
+                        //y: '5%',  //鐩稿綋浜庤窛绂讳笂杈规晥鏋�:padding-top
+                        bottom: '5%',
+                        containLabel: true
+                    },
+                    tooltip: {
+                        trigger: 'axis',
+                        axisPointer: {
+                            type: 'shadow'
+                        }
+                    },
+                    legend: {
+                        data: HProblemType
+                    },
+                    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: true },
+                            data: HCusName                           
+                        }
+                    ],
+                    yAxis: [
+                        {
+                            type: 'value'
+                        }
+                    ],
+                    series: Hseries
+                };
+                option_ZZT && myChart.setOption(option_ZZT,true);
+            }
+            //#endregion
+
+            //#region 鐐瑰嚮浜嬩欢鍖呮嫭on form浜嬩欢绛�
+            //澶村伐鍏锋爮浜嬩欢
+            table.on('toolbar(mainTable)', function (obj) {
+                switch (obj.event) {
+                    //閫�鍑�
+                    case 'btn-exit': Pub_Close(2);
+                        break;
+                    //闅愯棌鍒楄缃�
+                    case 'HideColumn':
+                        get_HideColumn();
+                        break;
+                };
+            });
+            //閲嶇疆鎸夐挳
+            form.on('submit(btnReSearch)', function (data) {
+                set_ClearQuery();
+            });
+
+            //鏌ヨ鎸夐挳
+            form.on('submit(btnSearch)', function (data) {
+                get_FastQuery();
+            });
+            //#endregion
+
+            //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
+
+            //鍒濆鍖栫晫闈�
+            function set_ClearBill() {
+                Year();
+                //鍒濆鍖栨棩鏈�
+                //鍒濆鍖栨椂闂�
+                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+                //鍒濆鍖栬〃鏍�
+                set_InitGrid();
+                //鍔犺浇鏁版嵁鍒扮綉鏍�
+                get_FastQuery();
+                //DisPlay_HideColumn();
+                set_Graphics();
+            }
+
+            //鍒濆鍖栬〃鏍�
+            function set_InitGrid() {            
+                option = {
+                    elem: '#mainTable'
+                    , toolbar: '#toolbarDemo'
+                    , height: 'full-450'
+                    , page: true
+                    , totalRow: true
+                    , cellMinWidth: 90
+                    , limit: 50
+                    , limits: [50, 500, 5000, 20000]
+
+                }
+            }
+
+            //骞�
+            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)
+                form.render('select');
+            }
+
+            //鍔犺浇缃戞牸
+            function get_Display(sWhere) {
+                sWhere = $("#HYear").val();
+                var wait = layer.load();//閬僵
+                $.ajax({
+                    url: GetWEBURL() + '/QC_CustomerAppealReport/ProblemType',
+                    type: "GET",
+                    async: false,
+                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+                    success: function (data1) {
+                        var col = [];
+                        if (data1.count == 1) {
+                            var data = [];
+                            //缁欑┖鐨勬暟缁勮祴鍊�
+                            for (var key in data1.list) {
+                                data.push({ "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+                            }
+                            col.push({ type: 'checkbox', fixed: 'left', totalRowText: '姹囨��' });
+                            //鍒ゆ柇鏄惁鏄函鑻辨枃
+                            var patrn = new RegExp("[\u4E00-\u9FA5]+");
+                            for (var i = 0; i < data.length; i++) {
+                                if (!patrn.test(data[i].name)) {
+                                    col.push({ field: data[i].name, title: data[i].name, hide: true }); //闅愯棌鍒�
+                                }
+                                else {
+                                    switch (data[i].Type) {
+                                        case 'DateTime':
+                                            col.push({ field: data[i].name, 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: 120 });
+                                            break;
+                                        default:
+                                            col.push({ field: data[i].name, title: data[i].name, align: 'center', sort: true, totalRow: true });
+                                    }
+                                }
+                            }
+                           
+                            option.cols = [col];
+                            option.data = data1.data;
+
+                            table.render(option);
+                            layer.close(wait);
+                        } else {
+                            layer.close(wait);
+                            layer.alert(data1.Message, { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.close(wait);
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+            }
+
+            //蹇�熻繃婊�
+            function get_FastQuery() {
+                var HBeginDate = $("#HBeginDate").val();
+                var HEndDate = $("#HEndDate").val();
+
+                sWhere = "'" + HBeginDate + "','" + HEndDate + "'";
+
+                get_Display(sWhere);
+                //璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+                sWhere = "";
+                set_Graphics();
+            }
+
+            //閲嶇疆杩囨护鏉′欢
+            function set_ClearQuery() {
+                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+                sWhere = " ";
+                get_FastQuery();
+            }
+
+            //闅愯棌鍒楄缃�
+            function get_HideColumn() {
+                var colName = "";
+                for (var i = 1; i < option.cols[0].length - 1; i++) {
+                    colName += option.cols[0][i]["title"] + ",";
+                }
+
+                colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+                layer.open({
+                    type: 2
+                    , skin: "layui-layer-rim" //鍔犱笂杈规
+                    , title: "闅愯棌鍒楄缃�"  //鏍囬
+                    , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                    , shift: 2 //寮瑰嚭鍔ㄧ敾
+                    , area: ["50%", "90%"] //绐椾綋澶у皬
+                    , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                    , content: ['../../鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName, "yes"]
+                    , btn: ["纭畾", "鍙栨秷"]
+                    , btn1: function (index, laero) {
+                        //鍒锋柊琛ㄦ牸鏁版嵁
+                        DisPlay_HideColumn();
+                        //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+                        layer.close(index);//鍏抽棴寮圭獥
+                    }
+                })
+            }
+
+            //鏄剧ず鍒楁暟鎹�
+            function DisPlay_HideColumn() {
+                $.ajax({
+                    url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+                    type: "GET",
+                    data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+                    success: function (data1) {
+                        if (data1.data.length != 0) {
+
+                            var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+                            var titleData = [];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+
+                            dataCol = data1.data[0].HGridString.split(',');
+
+                            for (var i = 0; i < option.cols[0].length - 2; i++) {
+                                var dataCols = dataCol[i].split('|');
+                                //闅愯棌鍒�
+                                if (dataCols[1] == 1) {
+                                    option.cols[0][i + 1]["hide"] = true;
+                                }
+                                //璁剧疆鍐呭瀛椾綋澶у皬
+                                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 (dataCols[3] > 0) {
+                                    option.cols[0][i + 1]["width"] = dataCols[3];
+                                }
+                                //鏄剧ず鍒�
+                                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
+        });
+    </script>
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\345\223\201\350\264\250\347\256\241\347\220\206/\345\256\242\350\257\211\345\244\204\347\220\206/QC_CustomerAppealReport_Customer.html" "b/WebTM/views/\345\223\201\350\264\250\347\256\241\347\220\206/\345\256\242\350\257\211\345\244\204\347\220\206/QC_CustomerAppealReport_Customer.html"
index 0bd9e1e..0cb535f 100644
--- "a/WebTM/views/\345\223\201\350\264\250\347\256\241\347\220\206/\345\256\242\350\257\211\345\244\204\347\220\206/QC_CustomerAppealReport_Customer.html"
+++ "b/WebTM/views/\345\223\201\350\264\250\347\256\241\347\220\206/\345\256\242\350\257\211\345\244\204\347\220\206/QC_CustomerAppealReport_Customer.html"
@@ -14,6 +14,7 @@
     <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
     <script src="../../../layuiadmin/PubCustom.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;
@@ -23,7 +24,7 @@
 <body>
     <div class="layui-fluid">
         <div class="layui-col-md12">
-            <div class="layui-card" style="padding: 1px">
+            <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">
@@ -52,7 +53,14 @@
                                 </div>
                             </div>
                         </div>
-                        <table class="" id="mainTable" lay-filter="mainTable"></table>
+                        <div>
+                            <div id="histogram" style="width:99.5%;height:calc(68vh);margin-top:10px;">
+
+                            </div>
+                            <div style="width:99%;height:calc(33vh);">
+                                <table class="" id="mainTable" lay-filter="mainTable"></table>
+                            </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-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>
@@ -60,12 +68,13 @@
                             </div>
                         </script>
                     </form>
-                </div>
+                </div>                
             </div>
         </div>
     </div>
 
     <script>
+
         layui.config({
             base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
         }).extend({
@@ -85,14 +94,298 @@
             //鏌ヨ鏉′欢
             var sWhere = "";
             var option = [];
-            var HModName = "QC_CustomerAppealReport_Sum";
+            var HModName = "QC_CustomerAppealReport_Customer";
             //#endregion
 
             //#region 杩涘叆椤甸潰鏃㈠姞杞�
 
             //鍒濆鍖栫晫闈�
             set_ClearBill();
+            //#endregion
 
+            //#region 銆愭煴鐘跺浘銆�
+            function set_Graphics() {
+                var app = {};
+                var chartDom = document.getElementById('histogram');
+                var myChart = echarts.init(chartDom);
+                var option_ZZT;
+                //#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: app.config.position,
+                    distance: app.config.distance,
+                    align: app.config.align,
+                    verticalAlign: app.config.verticalAlign,
+                    rotate: app.config.rotate,
+                    formatter: '{c}  {name|{a}}',
+                    fontSize: 16,
+                    rich: {
+                        name: {}
+                    }
+                };
+                //#endregion
+
+                //鏌辩姸鍥剧粦瀹氭暟鎹�
+                var HCusName = [];//瀹㈡埛鍚嶇О
+                var HJanuary = []; //涓�鏈堜唤鏁版嵁
+                var HFebruary = []; //浜屾湀浠芥暟鎹�
+                var HMarch = []; //涓夋湀浠芥暟鎹�
+                var HApril = []; //鍥涙湀浠芥暟鎹�
+                var HMay = []; //浜旀湀浠芥暟鎹�
+                var HJune = []; //鍏湀浠芥暟鎹�
+                var HJuly = []; //涓冩湀浠芥暟鎹�
+                var HAugust = []; //鍏湀浠芥暟鎹�
+                var HSeptember = []; //涔濇湀浠芥暟鎹�
+                var HOctober = []; //鍗佹湀浠芥暟鎹�
+                var HNovember = []; //鍗佷竴鏈堜唤鏁版嵁
+                var HDecember = []; //鍗佷簩鏈堜唤鏁版嵁
+                for (let i = 0; i < option.data.length; i++) {
+                    HCusName.push(option.data[i].瀹㈡埛);
+                    HJanuary.push(option.data[i]['1鏈�']);
+                    HFebruary.push(option.data[i]['2鏈�']);
+                    HMarch.push(option.data[i]['3鏈�']);
+                    HApril.push(option.data[i]['4鏈�']);
+                    HMay.push(option.data[i]['5鏈�']);
+                    HJune.push(option.data[i]['6鏈�']);
+                    HJuly.push(option.data[i]['7鏈�']);
+                    HAugust.push(option.data[i]['8鏈�']);
+                    HSeptember.push(option.data[i]['9鏈�']);
+                    HOctober.push(option.data[i]['10鏈�']);
+                    HNovember.push(option.data[i]['11鏈�']);
+                    HDecember.push(option.data[i]['12鏈�']);
+                }
+                option_ZZT = {
+                    grid: {
+                        x: '1%', //鐩稿綋浜庤窛绂诲乏杈规晥鏋�:padding-left
+                        //y: '5%',  //鐩稿綋浜庤窛绂讳笂杈规晥鏋�:padding-top
+                        bottom: '5%',
+                        containLabel: true
+                    },
+                    tooltip: {
+                        trigger: 'axis',
+                        axisPointer: {
+                            type: 'shadow'
+                        }
+                    },
+                    legend: {
+                        data: ['1鏈�', '2鏈�', '3鏈�', '4鏈�', '5鏈�', '6鏈�', '7鏈�', '8鏈�', '9鏈�', '10鏈�', '11鏈�', '12鏈�']
+                    },
+                    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: true },
+                            data: HCusName
+                        }
+                    ],
+                    yAxis: [
+                        {
+                            type: 'value'
+                        }
+                    ],
+                    series: [
+                        {
+                            name: '1鏈�',
+                            type: 'bar',
+                            barGap: 0,
+                            label: labelOption,
+                            emphasis: {
+                                focus: 'series'
+                            },
+                            data: HJanuary
+                        },
+                        {
+                            name: '2鏈�',
+                            type: 'bar',
+                            label: labelOption,
+                            emphasis: {
+                                focus: 'series'
+                            },
+                            data: HFebruary
+                        },
+                        {
+                            name: '3鏈�',
+                            type: 'bar',
+                            label: labelOption,
+                            emphasis: {
+                                focus: 'series'
+                            },
+                            data: HMarch
+                        },
+                        {
+                            name: '4鏈�',
+                            type: 'bar',
+                            label: labelOption,
+                            emphasis: {
+                                focus: 'series'
+                            },
+                            data: HApril
+                        },
+                        {
+                            name: '5鏈�',
+                            type: 'bar',
+                            label: labelOption,
+                            emphasis: {
+                                focus: 'series'
+                            },
+                            data: HMay
+                        },
+                        {
+                            name: '6鏈�',
+                            type: 'bar',
+                            label: labelOption,
+                            emphasis: {
+                                focus: 'series'
+                            },
+                            data: HJune
+                        },
+                        {
+                            name: '7鏈�',
+                            type: 'bar',
+                            label: labelOption,
+                            emphasis: {
+                                focus: 'series'
+                            },
+                            data: HJuly
+                        },
+                        {
+                            name: '8鏈�',
+                            type: 'bar',
+                            label: labelOption,
+                            emphasis: {
+                                focus: 'series'
+                            },
+                            data: HAugust
+                        },
+                        {
+                            name: '9鏈�',
+                            type: 'bar',
+                            label: labelOption,
+                            emphasis: {
+                                focus: 'series'
+                            },
+                            data: HSeptember
+                        },
+                        {
+                            name: '10鏈�',
+                            type: 'bar',
+                            label: labelOption,
+                            emphasis: {
+                                focus: 'series'
+                            },
+                            data: HOctober
+                        },
+                        {
+                            name: '11鏈�',
+                            type: 'bar',
+                            label: labelOption,
+                            emphasis: {
+                                focus: 'series'
+                            },
+                            data: HNovember
+                        },
+                        {
+                            name: '12鏈�',
+                            type: 'bar',
+                            label: labelOption,
+                            emphasis: {
+                                focus: 'series'
+                            },
+                            data: HDecember
+                        }
+                    ]
+                };
+                option_ZZT && myChart.setOption(option_ZZT);
+            }
             //#endregion
 
             //#region 鐐瑰嚮浜嬩欢鍖呮嫭on form浜嬩欢绛�
@@ -116,7 +409,7 @@
             //鏌ヨ鎸夐挳
             form.on('submit(btnSearch)', function (data) {
                 get_FastQuery();
-            });          
+            });
             //#endregion
 
             //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
@@ -133,6 +426,7 @@
                 //鍔犺浇鏁版嵁鍒扮綉鏍�
                 get_FastQuery();
                 //DisPlay_HideColumn();
+                set_Graphics();
             }
 
             //鍒濆鍖栬〃鏍�
@@ -147,13 +441,13 @@
                 option = {
                     elem: '#mainTable'
                     , toolbar: '#toolbarDemo'
-                    , height: 'full-50'
+                    , height: 'full-450'
                     , page: true
                     , totalRow: true
                     , cellMinWidth: 90
                     , limit: 50
                     , limits: [50, 500, 5000, 20000]
-                   
+
                 }
             }
 
@@ -176,6 +470,7 @@
                 $.ajax({
                     url: GetWEBURL() + '/QC_CustomerAppealReport/Customer',
                     type: "GET",
+                    async: false,
                     data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
                     success: function (data1) {
                         var col = [];
@@ -202,8 +497,10 @@
                                     }
                                 }
                             }
+                           
                             option.cols = [col];
                             option.data = data1.data;
+
                             table.render(option);
                             layer.close(wait);
                         } else {
@@ -220,23 +517,24 @@
             //蹇�熻繃婊�
             function get_FastQuery() {
                 var HBeginDate = $("#HBeginDate").val();
-                var HEndDate = $("#HEndDate").val();             
+                var HEndDate = $("#HEndDate").val();
 
                 sWhere = "'" + HBeginDate + "','" + HEndDate + "'";
 
                 get_Display(sWhere);
                 //璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
                 sWhere = "";
+                set_Graphics();
             }
 
             //閲嶇疆杩囨护鏉′欢
             function set_ClearQuery() {
                 $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
-                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));              
+                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
                 sWhere = " ";
                 get_FastQuery();
             }
-      
+
             //闅愯棌鍒楄缃�
             function get_HideColumn() {
                 var colName = "";
diff --git "a/WebTM/views/\345\223\201\350\264\250\347\256\241\347\220\206/\345\256\242\350\257\211\345\244\204\347\220\206/QC_CustomerAppealReport_Dept.html" "b/WebTM/views/\345\223\201\350\264\250\347\256\241\347\220\206/\345\256\242\350\257\211\345\244\204\347\220\206/QC_CustomerAppealReport_Dept.html"
new file mode 100644
index 0000000..130cfac
--- /dev/null
+++ "b/WebTM/views/\345\223\201\350\264\250\347\256\241\347\220\206/\345\256\242\350\257\211\345\244\204\347\220\206/QC_CustomerAppealReport_Dept.html"
@@ -0,0 +1,581 @@
+锘�<!DOCTYPE html>
+<html>
+<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/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/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">
+                                <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; width: 85px;">
+                                        <select name="HYear" id="HYear" lay-verify="HYear">
+                                            <!--鍔ㄦ�佹覆鏌撳勾浠�-->
+                                        </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-colla-content" style="padding: 0px; margin-left: 6%;">
+                                    <div class="layui-row" style="margin-top:10px;">
+                                        <!--鍏朵粬鏉′欢-->
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                        <div>
+                            <div style="width:99.5%;height:calc(70vh);margin-top:10px;">
+                                <div id="histogram" style="width:60%;height:calc(70vh);float:left">
+
+                                </div>
+                                <div id="PieChart" style="width:39%;height:calc(70vh);float:left;margin-left:5px;">
+
+                                </div>
+                            </div>                            
+                            <div style="width:99%;height:calc(50vh);">
+                                <table class="" id="mainTable" lay-filter="mainTable"></table>
+                            </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-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="HideColumn"><i class="layui-icon layui-icon-form"></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'], 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
+                , util = layui.util
+            //鏌ヨ鏉′欢
+            var sWhere = "";
+            var option = [];
+            var HModName = "QC_CustomerAppealReport_Dept";
+            //#endregion
+
+            //#region 杩涘叆椤甸潰鏃㈠姞杞�
+
+            //鍒濆鍖栫晫闈�
+            set_ClearBill();
+            //#endregion
+
+            //#region 銆愬浘褰€��
+            function set_Graphics() {
+                //#region 銆愭煴鐘跺浘銆�
+                var app = {};
+
+                var chartDom = document.getElementById('histogram');
+                var myChart = echarts.init(chartDom);
+                var option_ZZT;
+                //#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
+                                }
+                            ]
+                        });
+                    }
+                };               
+                //#endregion
+
+                //鏌辩姸鍥剧粦瀹氭暟鎹�
+                var H_X = ['1鏈�', '2鏈�', '3鏈�', '4鏈�', '5鏈�', '6鏈�', '7鏈�', '8鏈�', '9鏈�', '10鏈�', '11鏈�', '12鏈�'];//X杞存爣棰�
+                var HDeptName = [];//閮ㄩ棬鍚嶇О
+                var HJanuary = []; //涓�鏈堜唤鏁版嵁
+                var HFebruary = []; //浜屾湀浠芥暟鎹�
+                var HMarch = []; //涓夋湀浠芥暟鎹�
+                var HApril = []; //鍥涙湀浠芥暟鎹�
+                var HMay = []; //浜旀湀浠芥暟鎹�
+                var HJune = []; //鍏湀浠芥暟鎹�
+                var HJuly = []; //涓冩湀浠芥暟鎹�
+                var HAugust = []; //鍏湀浠芥暟鎹�
+                var HSeptember = []; //涔濇湀浠芥暟鎹�
+                var HOctober = []; //鍗佹湀浠芥暟鎹�
+                var HNovember = []; //鍗佷竴鏈堜唤鏁版嵁
+                var HDecember = []; //鍗佷簩鏈堜唤鏁版嵁
+                var Hseries = [];
+                var option_X = [];
+                if (option.data.length>0) {
+                    for (let i = 0; i < option.data.length; i++) {
+                        HDeptName.push(option.data[i].璐d换閮ㄩ棬);
+                        option_X = [];
+                       
+                        for (let j = 1; j <= 12; j++) {
+                            option_X.push(option.data[i][j + "鏈�"]);
+                        }
+                        Hseries.push({
+                            name: option.data[i].璐d换閮ㄩ棬,
+                            type: 'bar',
+                            barGap: 0,
+                            label: {
+                                show: true,
+                                position: 'top'
+                            },
+                            emphasis: {
+                                focus: 'series'
+                            },
+                            data: option_X
+                        });
+                    }
+                }
+                option_ZZT = {
+                    tooltip: {
+                        trigger: 'axis',
+                        axisPointer: {
+                            type: 'shadow'
+                        }
+                    },
+                    legend: {
+                        //澶撮儴鍙�夊睆钄芥爣棰�
+                        data: HDeptName
+                    },
+                    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 }
+                        }
+                    },
+                    //X杞�
+                    xAxis: [
+                        {
+                            type: 'category',
+                            axisTick: { show: true },
+                            data: H_X
+                        }
+                    ],
+                    //Y杞�
+                    yAxis: [
+                        {
+                            type: 'value'
+                        }
+                    ],
+                    //X杞存暟鎹�
+                    series: Hseries
+                };             
+                option_ZZT && myChart.setOption(option_ZZT,true);
+                //#endregion
+
+                //#region 銆愰ゼ鍥俱��
+                var chartDom = document.getElementById('PieChart');
+                var myChart = echarts.init(chartDom);
+                var option_BT;
+
+                var option_BT_XData = [];
+                for (let i = 0; i < option.data.length; i++) {
+                    option_BT_XData.push({ value: option.data[i][(Number(new Date().getMonth()) + Number(1)) + "鏈�"], name: option.data[i].璐d换閮ㄩ棬 });
+                }
+
+                option_BT = {
+                    title: {
+                        text: $("#HYear").val() + '骞�' + (Number(new Date().getMonth()) + Number(1)) + '鏈堝璇夐棶棰樿矗浠诲崰姣斿浘',
+                        left: 'center'
+                    },
+                    tooltip: {
+                        trigger: 'item'
+                    },
+                    legend: {
+                        orient: 'vertical',
+                        left: 'left'
+                    },
+                    series: [
+                        {
+                            name: '瀹㈣瘔鏁伴噺',
+                            type: 'pie',
+                            radius: '50%',
+                            data: option_BT_XData,
+                            emphasis: {
+                                itemStyle: {
+                                    shadowBlur: 10,
+                                    shadowOffsetX: 0,
+                                    shadowColor: 'rgba(0, 0, 0, 0.5)'
+                                }
+                            }
+                        }
+                    ]
+                };
+
+                option_BT && myChart.setOption(option_BT);
+            //#endregion
+            }            
+            //#endregion           
+
+            //#region 鐐瑰嚮浜嬩欢鍖呮嫭on form浜嬩欢绛�
+            //澶村伐鍏锋爮浜嬩欢
+            table.on('toolbar(mainTable)', function (obj) {
+                switch (obj.event) {
+                    //閫�鍑�
+                    case 'btn-exit': Pub_Close(2);
+                        break;
+                    //闅愯棌鍒楄缃�
+                    case 'HideColumn':
+                        get_HideColumn();
+                        break;
+                };
+            });
+            //閲嶇疆鎸夐挳
+            form.on('submit(btnReSearch)', function (data) {
+                set_ClearQuery();
+            });
+
+            //鏌ヨ鎸夐挳
+            form.on('submit(btnSearch)', function (data) {
+                get_FastQuery();
+            });
+            //#endregion
+
+            //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
+
+            //鍒濆鍖栫晫闈�
+            function set_ClearBill() {
+                Year();
+                //鍒濆鍖栨棩鏈�
+                //鍒濆鍖栨椂闂�
+                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+                //鍒濆鍖栬〃鏍�
+                set_InitGrid();
+                //鍔犺浇鏁版嵁鍒扮綉鏍�
+                get_FastQuery();
+                //DisPlay_HideColumn();
+                set_Graphics();
+            }
+
+            //鍒濆鍖栬〃鏍�
+            function set_InitGrid() {
+                //option = {
+                //    elem: '#mainTable'
+                //    , toolbar: '#toolbarDemo'
+                //    , cellMinWidth: 120
+                //    , limit: Number.MAX_VALUE // 鏁版嵁琛ㄦ牸榛樿鍏ㄩ儴鏄剧ず
+                //    , height: 'full-70'
+                //};
+                option = {
+                    elem: '#mainTable'
+                    , toolbar: '#toolbarDemo'
+                    , height: 'full-320'
+                    , page: true
+                    , totalRow: true
+                    , cellMinWidth: 90
+                    , limit: 50
+                    , limits: [50, 500, 5000, 20000]
+
+                }
+            }
+
+            //骞�
+            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)
+                form.render('select');
+            }
+
+            //鍔犺浇缃戞牸
+            function get_Display(sWhere) {
+                sWhere = $("#HYear").val();
+                var wait = layer.load();//閬僵
+                $.ajax({
+                    url: GetWEBURL() + '/QC_CustomerAppealReport/Dept',
+                    type: "GET",
+                    async: false,
+                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+                    success: function (data1) {
+                        var col = [];
+                        if (data1.count == 1) {
+                            var data = [];
+                            //缁欑┖鐨勬暟缁勮祴鍊�
+                            for (var key in data1.list) {
+                                data.push({ "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+                            }
+                            col.push({ type: 'checkbox', fixed: 'left', totalRowText: '姹囨��' });
+                            //鍒ゆ柇鏄惁鏄函鑻辨枃
+                            var patrn = new RegExp("[\u4E00-\u9FA5]+");
+                            for (var i = 0; i < data.length; i++) {
+                                if (!patrn.test(data[i].name)) {
+                                    col.push({ field: data[i].name, title: data[i].name, hide: true }); //闅愯棌鍒�
+                                }
+                                else {
+                                    switch (data[i].Type) {
+                                        case 'DateTime':
+                                            col.push({ field: data[i].name, 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: 120 });
+                                            break;
+                                        default:
+                                            col.push({ field: data[i].name, title: data[i].name, align: 'center', sort: true, totalRow: true , width: 120 });
+                                    }
+                                }
+                            }
+                           
+                            option.cols = [col];
+                            option.data = data1.data;
+
+                            table.render(option);
+                            layer.close(wait);
+                        } else {
+                            layer.close(wait);
+                            layer.alert(data1.Message, { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.close(wait);
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+            }
+
+            //蹇�熻繃婊�
+            function get_FastQuery() {
+                var HBeginDate = $("#HBeginDate").val();
+                var HEndDate = $("#HEndDate").val();
+
+                sWhere = "'" + HBeginDate + "','" + HEndDate + "'";
+
+                get_Display(sWhere);
+                //璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+                sWhere = "";
+                set_Graphics();
+            }
+
+            //閲嶇疆杩囨护鏉′欢
+            function set_ClearQuery() {
+                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+                sWhere = " ";
+                get_FastQuery();
+            }
+
+            //闅愯棌鍒楄缃�
+            function get_HideColumn() {
+                var colName = "";
+                for (var i = 1; i < option.cols[0].length - 1; i++) {
+                    colName += option.cols[0][i]["title"] + ",";
+                }
+
+                colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+                layer.open({
+                    type: 2
+                    , skin: "layui-layer-rim" //鍔犱笂杈规
+                    , title: "闅愯棌鍒楄缃�"  //鏍囬
+                    , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                    , shift: 2 //寮瑰嚭鍔ㄧ敾
+                    , area: ["50%", "90%"] //绐椾綋澶у皬
+                    , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                    , content: ['../../鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName, "yes"]
+                    , btn: ["纭畾", "鍙栨秷"]
+                    , btn1: function (index, laero) {
+                        //鍒锋柊琛ㄦ牸鏁版嵁
+                        DisPlay_HideColumn();
+                        //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+                        layer.close(index);//鍏抽棴寮圭獥
+                    }
+                })
+            }
+
+            //鏄剧ず鍒楁暟鎹�
+            function DisPlay_HideColumn() {
+                $.ajax({
+                    url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+                    type: "GET",
+                    data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+                    success: function (data1) {
+                        if (data1.data.length != 0) {
+
+                            var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+                            var titleData = [];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+
+                            dataCol = data1.data[0].HGridString.split(',');
+
+                            for (var i = 0; i < option.cols[0].length - 2; i++) {
+                                var dataCols = dataCol[i].split('|');
+                                //闅愯棌鍒�
+                                if (dataCols[1] == 1) {
+                                    option.cols[0][i + 1]["hide"] = true;
+                                }
+                                //璁剧疆鍐呭瀛椾綋澶у皬
+                                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 (dataCols[3] > 0) {
+                                    option.cols[0][i + 1]["width"] = dataCols[3];
+                                }
+                                //鏄剧ず鍒�
+                                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
+        });
+    </script>
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\345\223\201\350\264\250\347\256\241\347\220\206/\345\256\242\350\257\211\345\244\204\347\220\206/QC_CustomerAppealReport_Emp.html" "b/WebTM/views/\345\223\201\350\264\250\347\256\241\347\220\206/\345\256\242\350\257\211\345\244\204\347\220\206/QC_CustomerAppealReport_Emp.html"
new file mode 100644
index 0000000..5d899ee
--- /dev/null
+++ "b/WebTM/views/\345\223\201\350\264\250\347\256\241\347\220\206/\345\256\242\350\257\211\345\244\204\347\220\206/QC_CustomerAppealReport_Emp.html"
@@ -0,0 +1,677 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>瀹㈣瘔璐d换浜哄垎鏋愭姤琛�</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/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/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">
+                                <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; width: 85px;">
+                                        <select name="HYear" id="HYear" lay-verify="HYear">
+                                            <!--鍔ㄦ�佹覆鏌撳勾浠�-->
+                                        </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-colla-content" style="padding: 0px; margin-left: 6%;">
+                                    <div class="layui-row" style="margin-top:10px;">
+                                        <!--鍏朵粬鏉′欢-->
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                        <div>
+                            <div style="width:99.5%;height:calc(70vh);margin-top:10px;">
+                                <div id="histogram" style="width:60%;height:calc(70vh);float:left">
+
+                                </div>
+                                <div id="PieChart" style="width:39%;height:calc(70vh);float:left;margin-left:5px;">
+
+                                </div>
+                            </div>
+                            <div style="width:99%;height:calc(50vh);">
+                                <table class="" id="mainTable" lay-filter="mainTable"></table>
+                            </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-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="HideColumn"><i class="layui-icon layui-icon-form"></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'], 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
+                , util = layui.util
+            //鏌ヨ鏉′欢
+            var sWhere = "";
+            var option = [];
+            var HModName = "QC_CustomerAppealReport_Emp";
+            //#endregion
+
+            //#region 杩涘叆椤甸潰鏃㈠姞杞�
+
+            //鍒濆鍖栫晫闈�
+            set_ClearBill();
+            //#endregion
+
+            //#region 銆愬浘褰€��
+            function set_Graphics() {
+                //#region 銆愭煴鐘跺浘銆�
+                var app = {};
+                var chartDom = document.getElementById('histogram');
+                var myChart = echarts.init(chartDom);
+                var option_ZZT;
+                //#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'
+                };
+                //#endregion
+
+                //鏌辩姸鍥剧粦瀹氭暟鎹�
+                var HCusName = [];//瀹㈡埛鍚嶇О
+                var HJanuary = []; //涓�鏈堜唤鏁版嵁
+                var HFebruary = []; //浜屾湀浠芥暟鎹�
+                var HMarch = []; //涓夋湀浠芥暟鎹�
+                var HApril = []; //鍥涙湀浠芥暟鎹�
+                var HMay = []; //浜旀湀浠芥暟鎹�
+                var HJune = []; //鍏湀浠芥暟鎹�
+                var HJuly = []; //涓冩湀浠芥暟鎹�
+                var HAugust = []; //鍏湀浠芥暟鎹�
+                var HSeptember = []; //涔濇湀浠芥暟鎹�
+                var HOctober = []; //鍗佹湀浠芥暟鎹�
+                var HNovember = []; //鍗佷竴鏈堜唤鏁版嵁
+                var HDecember = []; //鍗佷簩鏈堜唤鏁版嵁
+                for (let i = 0; i < option.data.length; i++) {
+                    HCusName.push(option.data[i].璐d换浜�);
+                    HJanuary.push(option.data[i]['1鏈�']);
+                    HFebruary.push(option.data[i]['2鏈�']);
+                    HMarch.push(option.data[i]['3鏈�']);
+                    HApril.push(option.data[i]['4鏈�']);
+                    HMay.push(option.data[i]['5鏈�']);
+                    HJune.push(option.data[i]['6鏈�']);
+                    HJuly.push(option.data[i]['7鏈�']);
+                    HAugust.push(option.data[i]['8鏈�']);
+                    HSeptember.push(option.data[i]['9鏈�']);
+                    HOctober.push(option.data[i]['10鏈�']);
+                    HNovember.push(option.data[i]['11鏈�']);
+                    HDecember.push(option.data[i]['12鏈�']);
+                }
+                option_ZZT = {
+                    tooltip: {
+                        trigger: 'axis',
+                        axisPointer: {
+                            type: 'shadow'
+                        }
+                    },
+                    legend: {
+                        data: ['1鏈�', '2鏈�', '3鏈�', '4鏈�', '5鏈�', '6鏈�', '7鏈�', '8鏈�', '9鏈�', '10鏈�', '11鏈�', '12鏈�']
+                    },
+                    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: true },
+                            data: HCusName
+                        }
+                    ],
+                    yAxis: [
+                        {
+                            type: 'value'
+                        }
+                    ],
+                    series: [
+                        {
+                            name: '1鏈�',
+                            type: 'bar',
+                            barGap: 0,
+                            label: labelOption,
+                            emphasis: {
+                                focus: 'series'
+                            },
+                            data: HJanuary
+                        },
+                        {
+                            name: '2鏈�',
+                            type: 'bar',
+                            label: labelOption,
+                            emphasis: {
+                                focus: 'series'
+                            },
+                            data: HFebruary
+                        },
+                        {
+                            name: '3鏈�',
+                            type: 'bar',
+                            label: labelOption,
+                            emphasis: {
+                                focus: 'series'
+                            },
+                            data: HMarch
+                        },
+                        {
+                            name: '4鏈�',
+                            type: 'bar',
+                            label: labelOption,
+                            emphasis: {
+                                focus: 'series'
+                            },
+                            data: HApril
+                        },
+                        {
+                            name: '5鏈�',
+                            type: 'bar',
+                            label: labelOption,
+                            emphasis: {
+                                focus: 'series'
+                            },
+                            data: HMay
+                        },
+                        {
+                            name: '6鏈�',
+                            type: 'bar',
+                            label: labelOption,
+                            emphasis: {
+                                focus: 'series'
+                            },
+                            data: HJune
+                        },
+                        {
+                            name: '7鏈�',
+                            type: 'bar',
+                            label: labelOption,
+                            emphasis: {
+                                focus: 'series'
+                            },
+                            data: HJuly
+                        },
+                        {
+                            name: '8鏈�',
+                            type: 'bar',
+                            label: labelOption,
+                            emphasis: {
+                                focus: 'series'
+                            },
+                            data: HAugust
+                        },
+                        {
+                            name: '9鏈�',
+                            type: 'bar',
+                            label: labelOption,
+                            emphasis: {
+                                focus: 'series'
+                            },
+                            data: HSeptember
+                        },
+                        {
+                            name: '10鏈�',
+                            type: 'bar',
+                            label: labelOption,
+                            emphasis: {
+                                focus: 'series'
+                            },
+                            data: HOctober
+                        },
+                        {
+                            name: '11鏈�',
+                            type: 'bar',
+                            label: labelOption,
+                            emphasis: {
+                                focus: 'series'
+                            },
+                            data: HNovember
+                        },
+                        {
+                            name: '12鏈�',
+                            type: 'bar',
+                            label: labelOption,
+                            emphasis: {
+                                focus: 'series'
+                            },
+                            data: HDecember
+                        }
+                    ]
+                };
+                option_ZZT && myChart.setOption(option_ZZT);
+                //#endregion
+
+                //#region 銆愰ゼ鍥俱��
+                var chartDom = document.getElementById('PieChart');
+                var myChart = echarts.init(chartDom);
+                var option_BT;
+
+                var option_BT_XData = [];
+                for (let i = 0; i < option.data.length; i++) {
+                    option_BT_XData.push({ value: option.data[i][(Number(new Date().getMonth()) + Number(1)) + "鏈�"], name: option.data[i].璐d换浜� });
+                }
+
+                option_BT = {
+                    title: {
+                        text: $("#HYear").val() + '骞�' + (Number(new Date().getMonth()) + Number(1)) + '鏈堜唤璐d换浜哄垎甯冨浘',
+                        left: 'center'
+                    },
+                    tooltip: {
+                        trigger: 'item'
+                    },
+                    legend: {
+                        top: 'bottom'
+                    },
+                    series: [
+                        {
+                            name: '瀹㈣瘔鏁伴噺',
+                            type: 'pie',
+                            radius: '50%',
+                            data: option_BT_XData,
+                            emphasis: {
+                                itemStyle: {
+                                    shadowBlur: 10,
+                                    shadowOffsetX: 0,
+                                    shadowColor: 'rgba(0, 0, 0, 0.5)'
+                                }
+                            }
+                        }
+                    ]
+                };
+
+                option_BT && myChart.setOption(option_BT);
+            //#endregion
+            }           
+
+            //#region 鐐瑰嚮浜嬩欢鍖呮嫭on form浜嬩欢绛�
+            //澶村伐鍏锋爮浜嬩欢
+            table.on('toolbar(mainTable)', function (obj) {
+                switch (obj.event) {
+                    //閫�鍑�
+                    case 'btn-exit': Pub_Close(2);
+                        break;
+                    //闅愯棌鍒楄缃�
+                    case 'HideColumn':
+                        get_HideColumn();
+                        break;
+                };
+            });
+            //閲嶇疆鎸夐挳
+            form.on('submit(btnReSearch)', function (data) {
+                set_ClearQuery();
+            });
+
+            //鏌ヨ鎸夐挳
+            form.on('submit(btnSearch)', function (data) {
+                get_FastQuery();
+            });
+            //#endregion
+
+            //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
+
+            //鍒濆鍖栫晫闈�
+            function set_ClearBill() {
+                Year();
+                //鍒濆鍖栨棩鏈�
+                //鍒濆鍖栨椂闂�
+                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+                //鍒濆鍖栬〃鏍�
+                set_InitGrid();
+                //鍔犺浇鏁版嵁鍒扮綉鏍�
+                get_FastQuery();
+                //DisPlay_HideColumn();
+                set_Graphics();
+            }
+
+            //鍒濆鍖栬〃鏍�
+            function set_InitGrid() {
+                //option = {
+                //    elem: '#mainTable'
+                //    , toolbar: '#toolbarDemo'
+                //    , cellMinWidth: 120
+                //    , limit: Number.MAX_VALUE // 鏁版嵁琛ㄦ牸榛樿鍏ㄩ儴鏄剧ず
+                //    , height: 'full-70'
+                //};
+                option = {
+                    elem: '#mainTable'
+                    , toolbar: '#toolbarDemo'
+                    , height: 'full-320'
+                    , page: true
+                    , totalRow: true
+                    , cellMinWidth: 90
+                    , limit: 50
+                    , limits: [50, 500, 5000, 20000]
+
+                }
+            }
+
+            //骞�
+            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)
+                form.render('select');
+            }
+
+            //鍔犺浇缃戞牸
+            function get_Display(sWhere) {
+                sWhere = $("#HYear").val();
+                var wait = layer.load();//閬僵
+                $.ajax({
+                    url: GetWEBURL() + '/QC_CustomerAppealReport/Emp',
+                    type: "GET",
+                    async: false,
+                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+                    success: function (data1) {
+                        var col = [];
+                        if (data1.count == 1) {
+                            var data = [];
+                            //缁欑┖鐨勬暟缁勮祴鍊�
+                            for (var key in data1.list) {
+                                data.push({ "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+                            }
+                            col.push({ type: 'checkbox', fixed: 'left', totalRowText: '姹囨��' });
+                            //鍒ゆ柇鏄惁鏄函鑻辨枃
+                            var patrn = new RegExp("[\u4E00-\u9FA5]+");
+                            for (var i = 0; i < data.length; i++) {
+                                if (!patrn.test(data[i].name)) {
+                                    col.push({ field: data[i].name, title: data[i].name, hide: true }); //闅愯棌鍒�
+                                }
+                                else {
+                                    switch (data[i].Type) {
+                                        case 'DateTime':
+                                            col.push({ field: data[i].name, 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: 120 });
+                                            break;
+                                        default:
+                                            col.push({ field: data[i].name, title: data[i].name, align: 'center', sort: true, totalRow: true , width: 120 });
+                                    }
+                                }
+                            }
+                           
+                            option.cols = [col];
+                            option.data = data1.data;
+
+                            table.render(option);
+                            layer.close(wait);
+                        } else {
+                            layer.close(wait);
+                            layer.alert(data1.Message, { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.close(wait);
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+            }
+
+            //蹇�熻繃婊�
+            function get_FastQuery() {
+                var HBeginDate = $("#HBeginDate").val();
+                var HEndDate = $("#HEndDate").val();
+
+                sWhere = "'" + HBeginDate + "','" + HEndDate + "'";
+
+                get_Display(sWhere);
+                //璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+                sWhere = "";
+                set_Graphics();
+            }
+
+            //閲嶇疆杩囨护鏉′欢
+            function set_ClearQuery() {
+                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+                sWhere = " ";
+                get_FastQuery();
+            }
+
+            //闅愯棌鍒楄缃�
+            function get_HideColumn() {
+                var colName = "";
+                for (var i = 1; i < option.cols[0].length - 1; i++) {
+                    colName += option.cols[0][i]["title"] + ",";
+                }
+
+                colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+                layer.open({
+                    type: 2
+                    , skin: "layui-layer-rim" //鍔犱笂杈规
+                    , title: "闅愯棌鍒楄缃�"  //鏍囬
+                    , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                    , shift: 2 //寮瑰嚭鍔ㄧ敾
+                    , area: ["50%", "90%"] //绐椾綋澶у皬
+                    , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                    , content: ['../../鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName, "yes"]
+                    , btn: ["纭畾", "鍙栨秷"]
+                    , btn1: function (index, laero) {
+                        //鍒锋柊琛ㄦ牸鏁版嵁
+                        DisPlay_HideColumn();
+                        //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+                        layer.close(index);//鍏抽棴寮圭獥
+                    }
+                })
+            }
+
+            //鏄剧ず鍒楁暟鎹�
+            function DisPlay_HideColumn() {
+                $.ajax({
+                    url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+                    type: "GET",
+                    data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+                    success: function (data1) {
+                        if (data1.data.length != 0) {
+
+                            var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+                            var titleData = [];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+
+                            dataCol = data1.data[0].HGridString.split(',');
+
+                            for (var i = 0; i < option.cols[0].length - 2; i++) {
+                                var dataCols = dataCol[i].split('|');
+                                //闅愯棌鍒�
+                                if (dataCols[1] == 1) {
+                                    option.cols[0][i + 1]["hide"] = true;
+                                }
+                                //璁剧疆鍐呭瀛椾綋澶у皬
+                                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 (dataCols[3] > 0) {
+                                    option.cols[0][i + 1]["width"] = dataCols[3];
+                                }
+                                //鏄剧ず鍒�
+                                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
+        });
+    </script>
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\345\223\201\350\264\250\347\256\241\347\220\206/\345\256\242\350\257\211\345\244\204\347\220\206/QC_CustomerAppealReport_Material.html" "b/WebTM/views/\345\223\201\350\264\250\347\256\241\347\220\206/\345\256\242\350\257\211\345\244\204\347\220\206/QC_CustomerAppealReport_Material.html"
new file mode 100644
index 0000000..5a4c5d4
--- /dev/null
+++ "b/WebTM/views/\345\223\201\350\264\250\347\256\241\347\220\206/\345\256\242\350\257\211\345\244\204\347\220\206/QC_CustomerAppealReport_Material.html"
@@ -0,0 +1,636 @@
+锘�<!DOCTYPE html>
+<html>
+<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/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/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">
+                                <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; width: 85px;">
+                                        <select name="HYear" id="HYear" lay-verify="HYear">
+                                            <!--鍔ㄦ�佹覆鏌撳勾浠�-->
+                                        </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-colla-content" style="padding: 0px; margin-left: 6%;">
+                                    <div class="layui-row" style="margin-top:10px;">
+                                        <!--鍏朵粬鏉′欢-->
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                        <div>
+                            <div id="histogram" style="width:99.5%;height:calc(68vh);margin-top:10px;">
+
+                            </div>
+                            <div style="width:99%;height:calc(50vh);">
+                                <table class="" id="mainTable" lay-filter="mainTable"></table>
+                            </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-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="HideColumn"><i class="layui-icon layui-icon-form"></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'], 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
+                , util = layui.util
+            //鏌ヨ鏉′欢
+            var sWhere = "";
+            var option = [];
+            var HModName = "QC_CustomerAppealReport_Material";
+            //#endregion
+
+            //#region 杩涘叆椤甸潰鏃㈠姞杞�
+
+            //鍒濆鍖栫晫闈�
+            set_ClearBill();
+            //#endregion
+
+            //#region 銆愭煴鐘跺浘銆�
+            function set_Graphics() {
+                var app = {};
+                var chartDom = document.getElementById('histogram');
+                var myChart = echarts.init(chartDom);
+                var option_ZZT;
+                //#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'
+                };
+                //#endregion
+
+                //鏌辩姸鍥剧粦瀹氭暟鎹�
+                var HCusName = [];//瀹㈡埛鍚嶇О
+                var HJanuary = []; //涓�鏈堜唤鏁版嵁
+                var HFebruary = []; //浜屾湀浠芥暟鎹�
+                var HMarch = []; //涓夋湀浠芥暟鎹�
+                var HApril = []; //鍥涙湀浠芥暟鎹�
+                var HMay = []; //浜旀湀浠芥暟鎹�
+                var HJune = []; //鍏湀浠芥暟鎹�
+                var HJuly = []; //涓冩湀浠芥暟鎹�
+                var HAugust = []; //鍏湀浠芥暟鎹�
+                var HSeptember = []; //涔濇湀浠芥暟鎹�
+                var HOctober = []; //鍗佹湀浠芥暟鎹�
+                var HNovember = []; //鍗佷竴鏈堜唤鏁版嵁
+                var HDecember = []; //鍗佷簩鏈堜唤鏁版嵁
+                for (let i = 0; i < option.data.length; i++) {
+                    HCusName.push(option.data[i].缂栫爜);
+                    HJanuary.push(option.data[i]['1鏈�']);
+                    HFebruary.push(option.data[i]['2鏈�']);
+                    HMarch.push(option.data[i]['3鏈�']);
+                    HApril.push(option.data[i]['4鏈�']);
+                    HMay.push(option.data[i]['5鏈�']);
+                    HJune.push(option.data[i]['6鏈�']);
+                    HJuly.push(option.data[i]['7鏈�']);
+                    HAugust.push(option.data[i]['8鏈�']);
+                    HSeptember.push(option.data[i]['9鏈�']);
+                    HOctober.push(option.data[i]['10鏈�']);
+                    HNovember.push(option.data[i]['11鏈�']);
+                    HDecember.push(option.data[i]['12鏈�']);
+                }
+                option_ZZT = {
+                    grid: {
+                        x: '1%', //鐩稿綋浜庤窛绂诲乏杈规晥鏋�:padding-left
+                        //y: '5%',  //鐩稿綋浜庤窛绂讳笂杈规晥鏋�:padding-top
+                        bottom: '5%',
+                        containLabel: true
+                    },
+                    tooltip: {
+                        trigger: 'axis',
+                        axisPointer: {
+                            type: 'shadow'
+                        }
+                    },
+                    legend: {
+                        data: ['1鏈�', '2鏈�', '3鏈�', '4鏈�', '5鏈�', '6鏈�', '7鏈�', '8鏈�', '9鏈�', '10鏈�', '11鏈�', '12鏈�']
+                    },
+                    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: true },
+                            data: HCusName
+                        }
+                    ],
+                    yAxis: [
+                        {
+                            type: 'value'
+                        }
+                    ],
+                    series: [
+                        {
+                            name: '1鏈�',
+                            type: 'bar',
+                            barGap: 0,
+                            label: labelOption,
+                            emphasis: {
+                                focus: 'series'
+                            },
+                            data: HJanuary
+                        },
+                        {
+                            name: '2鏈�',
+                            type: 'bar',
+                            label: labelOption,
+                            emphasis: {
+                                focus: 'series'
+                            },
+                            data: HFebruary
+                        },
+                        {
+                            name: '3鏈�',
+                            type: 'bar',
+                            label: labelOption,
+                            emphasis: {
+                                focus: 'series'
+                            },
+                            data: HMarch
+                        },
+                        {
+                            name: '4鏈�',
+                            type: 'bar',
+                            label: labelOption,
+                            emphasis: {
+                                focus: 'series'
+                            },
+                            data: HApril
+                        },
+                        {
+                            name: '5鏈�',
+                            type: 'bar',
+                            label: labelOption,
+                            emphasis: {
+                                focus: 'series'
+                            },
+                            data: HMay
+                        },
+                        {
+                            name: '6鏈�',
+                            type: 'bar',
+                            label: labelOption,
+                            emphasis: {
+                                focus: 'series'
+                            },
+                            data: HJune
+                        },
+                        {
+                            name: '7鏈�',
+                            type: 'bar',
+                            label: labelOption,
+                            emphasis: {
+                                focus: 'series'
+                            },
+                            data: HJuly
+                        },
+                        {
+                            name: '8鏈�',
+                            type: 'bar',
+                            label: labelOption,
+                            emphasis: {
+                                focus: 'series'
+                            },
+                            data: HAugust
+                        },
+                        {
+                            name: '9鏈�',
+                            type: 'bar',
+                            label: labelOption,
+                            emphasis: {
+                                focus: 'series'
+                            },
+                            data: HSeptember
+                        },
+                        {
+                            name: '10鏈�',
+                            type: 'bar',
+                            label: labelOption,
+                            emphasis: {
+                                focus: 'series'
+                            },
+                            data: HOctober
+                        },
+                        {
+                            name: '11鏈�',
+                            type: 'bar',
+                            label: labelOption,
+                            emphasis: {
+                                focus: 'series'
+                            },
+                            data: HNovember
+                        },
+                        {
+                            name: '12鏈�',
+                            type: 'bar',
+                            label: labelOption,
+                            emphasis: {
+                                focus: 'series'
+                            },
+                            data: HDecember
+                        }
+                    ]
+                };
+                option_ZZT && myChart.setOption(option_ZZT);
+            }
+            //#endregion            
+
+            //#region 鐐瑰嚮浜嬩欢鍖呮嫭on form浜嬩欢绛�
+            //澶村伐鍏锋爮浜嬩欢
+            table.on('toolbar(mainTable)', function (obj) {
+                switch (obj.event) {
+                    //閫�鍑�
+                    case 'btn-exit': Pub_Close(2);
+                        break;
+                    //闅愯棌鍒楄缃�
+                    case 'HideColumn':
+                        get_HideColumn();
+                        break;
+                };
+            });
+            //閲嶇疆鎸夐挳
+            form.on('submit(btnReSearch)', function (data) {
+                set_ClearQuery();
+            });
+
+            //鏌ヨ鎸夐挳
+            form.on('submit(btnSearch)', function (data) {
+                get_FastQuery();
+            });
+            //#endregion
+
+            //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
+
+            //鍒濆鍖栫晫闈�
+            function set_ClearBill() {
+                Year();
+                //鍒濆鍖栨棩鏈�
+                //鍒濆鍖栨椂闂�
+                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+                //鍒濆鍖栬〃鏍�
+                set_InitGrid();
+                //鍔犺浇鏁版嵁鍒扮綉鏍�
+                get_FastQuery();
+                //DisPlay_HideColumn();
+                set_Graphics();
+            }
+
+            //鍒濆鍖栬〃鏍�
+            function set_InitGrid() {
+                //option = {
+                //    elem: '#mainTable'
+                //    , toolbar: '#toolbarDemo'
+                //    , cellMinWidth: 120
+                //    , limit: Number.MAX_VALUE // 鏁版嵁琛ㄦ牸榛樿鍏ㄩ儴鏄剧ず
+                //    , height: 'full-70'
+                //};
+                option = {
+                    elem: '#mainTable'
+                    , toolbar: '#toolbarDemo'
+                    , height: 'full-320'
+                    , page: true
+                    , totalRow: true
+                    , cellMinWidth: 90
+                    , limit: 50
+                    , limits: [50, 500, 5000, 20000]
+
+                }
+            }
+
+            //骞�
+            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)
+                form.render('select');
+            }
+
+            //鍔犺浇缃戞牸
+            function get_Display(sWhere) {
+                sWhere = $("#HYear").val();
+                var wait = layer.load();//閬僵
+                $.ajax({
+                    url: GetWEBURL() + '/QC_CustomerAppealReport/Material',
+                    type: "GET",
+                    async: false,
+                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+                    success: function (data1) {
+                        var col = [];
+                        if (data1.count == 1) {
+                            var data = [];
+                            //缁欑┖鐨勬暟缁勮祴鍊�
+                            for (var key in data1.list) {
+                                data.push({ "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+                            }
+                            col.push({ type: 'checkbox', fixed: 'left', totalRowText: '姹囨��' });
+                            //鍒ゆ柇鏄惁鏄函鑻辨枃
+                            var patrn = new RegExp("[\u4E00-\u9FA5]+");
+                            for (var i = 0; i < data.length; i++) {
+                                if (!patrn.test(data[i].name)) {
+                                    col.push({ field: data[i].name, title: data[i].name, hide: true }); //闅愯棌鍒�
+                                }
+                                else {
+                                    switch (data[i].Type) {
+                                        case 'DateTime':
+                                            col.push({ field: data[i].name, 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: 120 });
+                                            break;
+                                        default:
+                                            col.push({ field: data[i].name, title: data[i].name, align: 'center', sort: true, totalRow: true , width: 120 });
+                                    }
+                                }
+                            }
+                           
+                            option.cols = [col];
+                            option.data = data1.data;
+
+                            table.render(option);
+                            layer.close(wait);
+                        } else {
+                            layer.close(wait);
+                            layer.alert(data1.Message, { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.close(wait);
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+            }
+
+            //蹇�熻繃婊�
+            function get_FastQuery() {
+                var HBeginDate = $("#HBeginDate").val();
+                var HEndDate = $("#HEndDate").val();
+
+                sWhere = "'" + HBeginDate + "','" + HEndDate + "'";
+
+                get_Display(sWhere);
+                //璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+                sWhere = "";
+                set_Graphics();
+            }
+
+            //閲嶇疆杩囨护鏉′欢
+            function set_ClearQuery() {
+                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+                sWhere = " ";
+                get_FastQuery();
+            }
+
+            //闅愯棌鍒楄缃�
+            function get_HideColumn() {
+                var colName = "";
+                for (var i = 1; i < option.cols[0].length - 1; i++) {
+                    colName += option.cols[0][i]["title"] + ",";
+                }
+
+                colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+                layer.open({
+                    type: 2
+                    , skin: "layui-layer-rim" //鍔犱笂杈规
+                    , title: "闅愯棌鍒楄缃�"  //鏍囬
+                    , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                    , shift: 2 //寮瑰嚭鍔ㄧ敾
+                    , area: ["50%", "90%"] //绐椾綋澶у皬
+                    , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                    , content: ['../../鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName, "yes"]
+                    , btn: ["纭畾", "鍙栨秷"]
+                    , btn1: function (index, laero) {
+                        //鍒锋柊琛ㄦ牸鏁版嵁
+                        DisPlay_HideColumn();
+                        //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+                        layer.close(index);//鍏抽棴寮圭獥
+                    }
+                })
+            }
+
+            //鏄剧ず鍒楁暟鎹�
+            function DisPlay_HideColumn() {
+                $.ajax({
+                    url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+                    type: "GET",
+                    data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+                    success: function (data1) {
+                        if (data1.data.length != 0) {
+
+                            var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+                            var titleData = [];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+
+                            dataCol = data1.data[0].HGridString.split(',');
+
+                            for (var i = 0; i < option.cols[0].length - 2; i++) {
+                                var dataCols = dataCol[i].split('|');
+                                //闅愯棌鍒�
+                                if (dataCols[1] == 1) {
+                                    option.cols[0][i + 1]["hide"] = true;
+                                }
+                                //璁剧疆鍐呭瀛椾綋澶у皬
+                                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 (dataCols[3] > 0) {
+                                    option.cols[0][i + 1]["width"] = dataCols[3];
+                                }
+                                //鏄剧ず鍒�
+                                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
+        });
+    </script>
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\345\223\201\350\264\250\347\256\241\347\220\206/\345\256\242\350\257\211\345\244\204\347\220\206/QC_CustomerAppealReport_Sum.html" "b/WebTM/views/\345\223\201\350\264\250\347\256\241\347\220\206/\345\256\242\350\257\211\345\244\204\347\220\206/QC_CustomerAppealReport_Sum.html"
index 8784860..df4b792 100644
--- "a/WebTM/views/\345\223\201\350\264\250\347\256\241\347\220\206/\345\256\242\350\257\211\345\244\204\347\220\206/QC_CustomerAppealReport_Sum.html"
+++ "b/WebTM/views/\345\223\201\350\264\250\347\256\241\347\220\206/\345\256\242\350\257\211\345\244\204\347\220\206/QC_CustomerAppealReport_Sum.html"
@@ -14,6 +14,7 @@
     <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
     <script src="../../../layuiadmin/PubCustom.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;
@@ -21,40 +22,45 @@
     </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-fluid" style="width:100%;height:100%;">
+        <div class="layui-col-md12" style="width:100%;height:100%;">
+            <div class="layui-card" style="padding: 1px;width:100%;height:100%;">
+                <div class="layui-card-body" style="padding: 1px;width:100%;height:100%;">
+                    <form class="layui-form" action="" lay-filter="component-form-group" style="width:100%;height:100%;">
                         <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="date" class="layui-input" lay-verify="HBeginDate" name="HBeginDate" id="HBeginDate" style="padding-left: 75px;">
-                                    </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="date" class="layui-input" lay-verify="HEndDate" name="HEndDate" id="HEndDate" style="padding-left: 75px;">
+                                    <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>
                                 <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-colla-content" style="padding: 0px; margin-left: 6%;">           
-                                    
+                                <!--<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btn-exit" id="btn-exit" style="padding:0 5px">閫�鍑�</button>
+                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="HideColumn" id="HideColumn" style="padding:0 5px">闅愯棌鍒楄缃�</button>-->                              
+                                <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
+
                                 </div>
                             </div>
                         </div>
-                        <table class="" id="mainTable" lay-filter="mainTable"></table>
+                        <div>
+                            <div id="histogram" style="width:99.5%;height:calc(68vh);margin-top:10px;">
+
+                            </div>
+                            <div style="width:99%;height:calc(30vh);">
+                                <table class="" id="mainTable" lay-filter="mainTable"></table>
+                            </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-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>
@@ -97,6 +103,125 @@
 
             //#endregion
 
+
+            //#region 銆愭煴鐘跺浘銆�
+            function set_Graphics() {
+                var chartDom = document.getElementById('histogram');
+                var myChart = echarts.init(chartDom);
+                var option_ZZT;
+
+                //鏌辩姸鍥剧粦瀹氭暟鎹�
+                var H_X = ['1鏈�', '2鏈�', '3鏈�', '4鏈�', '5鏈�', '6鏈�', '7鏈�', '8鏈�', '9鏈�', '10鏈�', '11鏈�', '12鏈�'];//X杞存爣棰�
+                var HSum = [];//鎬绘暟閲�
+                var HLot = [];//鎵归噺闂鏁伴噺
+                var HProp = [];//鎵归噺闂姣斾緥
+                if (option.data.length>0) {
+                    for (let i = 1; i <= 12; i++) {
+                        HSum.push(option.data[0][i + "鏈�"]);
+                        HLot.push(option.data[1][i + "鏈�"]);
+                        HProp.push(option.data[2][i + "鏈�"].replace('%', ''));
+                    }
+                }
+
+                option_ZZT = {
+                    grid: {
+                        x: '2%', //鐩稿綋浜庤窛绂诲乏杈规晥鏋�:padding-left
+                        //y: '5%',  //鐩稿綋浜庤窛绂讳笂杈规晥鏋�:padding-top
+                        bottom: '5%',
+                        containLabel: true
+                    },
+                    tooltip: {
+                        trigger: 'axis',
+                        axisPointer: {
+                            type: 'cross',
+                            crossStyle: {
+                                color: '#999'
+                            }
+                        }
+                    },
+                    toolbox: {
+                        feature: {
+                            dataView: { show: true, readOnly: false },
+                            magicType: { show: true, type: ['line', 'bar'] },
+                            restore: { show: true },
+                            saveAsImage: { show: true }
+                        },
+                        x: 'right',
+                        orient: "vertical",//宸ュ叿鏍廼con鐨勫竷灞�鏈濆悜鈥榟orizontal鈥�'vertical'                   
+                    },
+                    legend: {
+                        data: ['鎬绘暟閲�', '鎵归噺闂鏁伴噺', '鎵归噺闂姣斾緥']
+                    },
+                    xAxis: [
+                        {
+                            type: 'category',
+                            data: H_X,
+                            axisPointer: {
+                                type: 'shadow'
+                            }
+                        }
+                    ],
+                    yAxis: [
+                        {
+                            type: 'value',
+                            name: '鎵归噺闂鏁伴噺',
+                            //min: 0,
+                            //max: 150,
+                            //interval: 50,
+                            //axisLabel: {
+                            //    formatter: '{value}'
+                            //}
+                        },
+                        {
+                            type: 'value',
+                            name: '鎵归噺闂姣斾緥%',
+                            //min: 0,
+                            //max: 100,
+                            //interval: 10,
+                            axisLabel: {
+                                formatter: '{value} ' + '%'
+                            }
+                        }
+                    ],
+                    series: [
+                        {
+                            name: '鎬绘暟閲�',
+                            type: 'bar',
+                            tooltip: {
+                                valueFormatter: function (value) {
+                                    return value;
+                                }
+                            },
+                            data: HSum
+                        },
+                        {
+                            name: '鎵归噺闂鏁伴噺',
+                            type: 'bar',
+                            tooltip: {
+                                valueFormatter: function (value) {
+                                    return value;
+                                }
+                            },
+                            data: HLot
+                        },
+                        {
+                            name: '鎵归噺闂姣斾緥',
+                            type: 'line',
+                            yAxisIndex: 1,
+                            tooltip: {
+                                valueFormatter: function (value) {
+                                    return value + ' ';
+                                }
+                            },
+                            data: HProp
+                        }
+                    ]
+                };
+
+                option_ZZT && myChart.setOption(option_ZZT);
+            }            
+            //#endregion
+
             //#region 鐐瑰嚮浜嬩欢鍖呮嫭on form浜嬩欢绛�
             //澶村伐鍏锋爮浜嬩欢
             table.on('toolbar(mainTable)', function (obj) {
@@ -118,13 +243,24 @@
             //鏌ヨ鎸夐挳
             form.on('submit(btnSearch)', function (data) {
                 get_FastQuery();
-            });          
+            });
+
+            //閫�鍑烘寜閽�
+            form.on('submit(btn-exit)', function (data) {
+                Pub_Close(2);
+            });
+
+            //鍒楄缃寜閽�
+            form.on('submit(HideColumn)', function (data) {
+                get_HideColumn();
+            });
             //#endregion
 
             //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
 
             //鍒濆鍖栫晫闈�
             function set_ClearBill() {
+                Year();
                 //鍒濆鍖栨棩鏈�
                 //鍒濆鍖栨椂闂�
                 $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
@@ -134,6 +270,20 @@
                 //鍔犺浇鏁版嵁鍒扮綉鏍�
                 get_FastQuery();
                 //DisPlay_HideColumn();
+                //鍔犺浇鏌辩姸鍥�
+                set_Graphics();
+            }
+
+            //骞�
+            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)
+                form.render('select');
             }
 
             //鍒濆鍖栬〃鏍�
@@ -148,22 +298,24 @@
                 option = {
                     elem: '#mainTable'
                     , toolbar: '#toolbarDemo'
-                    , height: 'full-50'
+                    , height: 'full-490'
                     , page: true
                     , cellMinWidth: 90
                     , limit: 50
                     , limits: [50, 500, 5000, 20000]
-                   
+
                 }
             }
 
             //鍔犺浇缃戞牸
             function get_Display(sWhere) {
+                sWhere = $("#HYear").val();
                 var wait = layer.load();//閬僵
                 $.ajax({
-                    url: GetWEBURL() + '/',
+                    url: GetWEBURL() + '/QC_CustomerAppealReport/Sum',
                     type: "GET",
-                    data: { "sWhere": sWhere },
+                    async: false,
+                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
                     success: function (data1) {
                         var col = [];
                         if (data1.count == 1) {
@@ -172,6 +324,7 @@
                             for (var key in data1.list) {
                                 data.push({ "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
                             }
+                            col.push({ type: 'checkbox', fixed: 'left', totalRowText: '姹囨��' });
                             //鍒ゆ柇鏄惁鏄函鑻辨枃
                             var patrn = new RegExp("[\u4E00-\u9FA5]+");
                             for (var i = 0; i < data.length; i++) {
@@ -184,12 +337,26 @@
                                             col.push({ field: data[i].name, 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: 120 });
                                             break;
                                         default:
-                                            col.push({ field: data[i].name, title: data[i].name, align: 'center', sort: true, width: 120 });
+                                            col.push({ field: data[i].name, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
                                     }
                                 }
                             }
+                            if (data1.data.length>0) {
+                                for (let i = 1; i <= 12; i++) {
+                                    if (data1.data[0][i + "鏈�"] != 0) {
+                                        data1.data[2][i + "鏈�"] = (data1.data[1][i + "鏈�"] * 100 / data1.data[0][i + "鏈�"]).toFixed(2) + '%'
+                                    }
+                                    else {
+                                        data1.data[2][i + "鏈�"] = (0.00).toFixed(2) + '%'
+                                    }
+                                }
+                                data1.data[2].鍚堣 = (data1.data[1].鍚堣 * 100 / data1.data[0].鍚堣).toFixed(2) + '%'
+                            }
+                            
+
                             option.cols = [col];
                             option.data = data1.data;
+
                             table.render(option);
                             layer.close(wait);
                         } else {
@@ -206,23 +373,25 @@
             //蹇�熻繃婊�
             function get_FastQuery() {
                 var HBeginDate = $("#HBeginDate").val();
-                var HEndDate = $("#HEndDate").val();             
+                var HEndDate = $("#HEndDate").val();
 
                 sWhere = "'" + HBeginDate + "','" + HEndDate + "'";
 
                 get_Display(sWhere);
                 //璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
                 sWhere = "";
+                //鍔犺浇鏌辩姸鍥�
+                set_Graphics();
             }
 
             //閲嶇疆杩囨护鏉′欢
             function set_ClearQuery() {
                 $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
-                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));              
+                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
                 sWhere = " ";
                 get_FastQuery();
             }
-      
+
             //闅愯棌鍒楄缃�
             function get_HideColumn() {
                 var colName = "";
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\267\245\344\275\215/Gy_SourceWorkStationSetList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\267\245\344\275\215/Gy_SourceWorkStationSetList.html"
index d49d5f6..3dafe8d 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\267\245\344\275\215/Gy_SourceWorkStationSetList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\267\245\344\275\215/Gy_SourceWorkStationSetList.html"
@@ -338,7 +338,7 @@
                     layer.open({
                         type: 2
                         , area: ['100%', '100%']
-                        , title: '鍖呰鏂瑰紡鍒楄〃-缂栬緫'
+                        , title: '鐢熶骇宸ヤ綅鍒楄〃-缂栬緫'
                         , shift: 0//寮瑰嚭鍔ㄧ敾
                         , content: './Gy_SourceWorkStationSet.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
                     })
@@ -358,7 +358,7 @@
                         var wait = layer.load();
                         //閫昏緫鍒犻櫎鏂规硶
                         $.ajax({
-                            url: GetWEBURL() + 'DeltetGy_PackType',
+                            url: GetWEBURL() + 'DeltetGy_SourceWorkStation',
                             type: "GET",
                             data: { "HItemID": ItemID, "user": sessionStorage["HUserName"]},
                             success: function (result) {
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBill.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBill.html"
index 6729c89..1efd432 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBill.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBill.html"
@@ -662,6 +662,7 @@
                 , laydate = layui.laydate
                 , element = layui.element;
             //鍏敤鍙橀噺
+            debugger;
             var rowdata = [];
             var option = [];
 
@@ -1750,7 +1751,7 @@
                             table.render(option);
                             //妫�楠屽��
                             option_Value.data = rowdata_Value;
-                            console.log(JSON.stringify(option_Value.data));
+                            //console.log(JSON.stringify(option_Value.data));
                             table.render(option_Value);
                             //================================================
                             for (var i = 1; i <= result.data.length; i++) {
@@ -2310,21 +2311,15 @@
 
                 //鑾峰彇鍗曞厓鏍兼楠屽�兼暟鎹�
                 var table_value = table.cache['ValueTable'];
-
-                //set_SaveValue(dataindex + 1);
-                //if (isHavingCount == false) {
-                //    //鍒锋柊妫�楠屽�艰〃鏍�
-                //    option_Value.data = [{
-                //        "HSEQ": "0", "HInSpectResult": "", "HInSpectValueB": "", "HInSpectValueT": "", "HInSpectValue": ""
-                //    }];
-                //    table.render(option_Value);
-                //}
-
+           
                 if (OperationType == 3) {
                     set_SaveValue(Number(nowindex) + Number(1));
                 } else {
                     set_SaveValue(dataindex + 1);
                 }
+
+                //璧嬪�间笌鍥炴樉
+                Assignment(nowindex, dataindex);
                 if (isHavingCount == false && OperationType != 3) {
                     var row_value = [];
                     for (let i = 0; i < SampleNum[nowindex]; i++) {
@@ -2335,11 +2330,7 @@
                     //鍒锋柊妫�楠屽�艰〃鏍�
                     option_Value.data = row_value;
                     table.render(option_Value);
-                    console.log(option_Value.data);
                 }
-
-                //璧嬪�间笌鍥炴樉
-                Assignment(nowindex, dataindex);
                 if (isFristClick != true) {
                     //if ($(this).parents('.layui-table').prevObject.context.cells[5].getAttribute('data-field') == 'HAnalysisMethod') {
                     //console.log('aaa');
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill.html"
index 3f7283c..228c98e 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill.html"
@@ -1863,7 +1863,7 @@
                             table.render(option);
                             //妫�楠屽��
                             option_Value.data = rowdata_Value;
-                            console.log(JSON.stringify(option_Value.data));
+                            //console.log(JSON.stringify(option_Value.data));
                             table.render(option_Value);
                             //================================================
                             for (var i = 1; i <= result.data.length; i++) {
@@ -2445,6 +2445,8 @@
                 } else {
                     set_SaveValue(dataindex + 1);
                 }
+                //璧嬪�间笌鍥炴樉
+                Assignment(nowindex, dataindex);
                 if (isHavingCount == false && OperationType != 3) {
                     var row_value = [];
                     for (let i = 0; i < SampleNum[nowindex]; i++) {
@@ -2456,8 +2458,6 @@
                     option_Value.data = row_value;
                     table.render(option_Value);
                 }
-                //璧嬪�间笌鍥炴樉
-                Assignment(nowindex, dataindex);
                 if (isFristClick != true) {
                     //if ($(this).parents('.layui-table').prevObject.context.cells[5].getAttribute('data-field') == 'HAnalysisMethod') {
                     //console.log('aaa');
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_FirstPieceCheckReport_ZDQX.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_FirstPieceCheckReport_ZDQX.html"
new file mode 100644
index 0000000..9ae149c
--- /dev/null
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_FirstPieceCheckReport_ZDQX.html"
@@ -0,0 +1,608 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>棣栨姝f�佸垎甯冨浘鎶ヨ〃</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/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/zgqCustom/zgqCustom.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">
+                                <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="date" class="layui-input" id="HBeginDate" style="width:160px;">
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">缁撴潫鏃ユ湡</label>
+                                    <div class="layui-input-block">
+                                        <input type="date" class="layui-input" id="HEndDate" style="width:160px;">
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">閮ㄩ棬</label>
+                                    <div class="layui-input-block">
+                                        <select name="HDeptName" id="HDeptName" lay-verify="required" lay-search class="layui-input">
+                                            <!--鍔ㄦ�佹覆鏌撹溅闂�-->
+                                        </select>
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">宸ュ簭</label>
+                                    <div class="layui-input-block" style="margin-left: 120px;">
+                                        <input type="text" class="layui-input" name="HProcName" id="HProcName">
+                                    </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-colla-content" style="padding: 0px; margin-left: 6%;">
+                                    <div class="layui-row" style="margin-top:10px;">
+                                        <!--鍏朵粬鏉′欢-->
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">鐗╂枡浠g爜</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HMaterNumber" id="HMaterNumber">
+                                            </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="HMaterName" id="HMaterName">
+                                            </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="HMaterModel" id="HMaterModel">
+                                            </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="HUpLoad" id="HUpLoad">
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row" style="margin-top:5px;">
+                                        <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="HCheckItem" id="HCheckItem">
+                                            </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" id="HUnitName">
+                                            </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" id="HStandard" >
+                                            </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" id="HDownLoad">
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row" style="margin: 10px 0 10px">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">杩囨护</label>
+                                            <div class="layui-input-block">
+                                                <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
+                                                </select>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <select name="Comparator" id="Comparator" 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" value="" name="ColContent" id="ColContent">
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                        <table class="" id="mainTable" lay-filter="mainTable"></table>
+                        <script type="text/html" id="toolbarDemo">
+                            <div class="layui-btn-container">
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="HideColumn"><i class="layui-icon layui-icon-form"></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'], 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
+                , util = layui.util
+            //鏌ヨ鏉′欢
+            var sWhere = "";
+            var option = [];
+            var HModName = "QC_FirstPieceCheckReport_ZDQX";
+            //#endregion
+
+            //#region 杩涘叆椤甸潰鏃㈠姞杞�
+
+            //鍒濆鍖栫晫闈�
+            set_ClearBill();
+
+            //#endregion
+
+            //#region 鐐瑰嚮浜嬩欢鍖呮嫭on form浜嬩欢绛�
+            //澶村伐鍏锋爮浜嬩欢
+            table.on('toolbar(mainTable)', function (obj) {
+                switch (obj.event) {
+                    //閫�鍑�
+                    case 'btn-exit': Pub_Close(2);
+                        break;
+                    //闅愯棌鍒楄缃�
+                    case 'HideColumn':
+                        get_HideColumn();
+                        break;
+                };
+            });
+            //閲嶇疆鎸夐挳
+            form.on('submit(btnReSearch)', function (data) {
+                set_ClearQuery();
+            });
+            //鏌ヨ鎸夐挳
+            form.on('submit(btnSearch)', function (data) {
+                get_FastQuery();
+            });
+
+            //杞﹂棿寮圭獥
+            form.on('submit(HWorkShopList)', function () {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '杞﹂棿鍒楄〃',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['80%', '80%'],
+                    maxmin: true,
+                    content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html', '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('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HWorkShopName").val(checkStatus.data[0].閮ㄩ棬鍚嶇О);
+                        $("#HWorkShopID").val(checkStatus.data[0].HItemID);
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                    end: function () {
+
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+            });
+
+            ////鐗╂枡
+            //form.on('submit(btnHMaterID)', function (data) {
+            //    get_btnHMaterID();
+            //});
+
+            //#endregion
+
+            //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
+
+            //鍒濆鍖栫晫闈�
+            function set_ClearBill() {
+                get_Dept();
+                //鍒濆鍖栨椂闂�
+                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 10), "yyyy-MM-dd"));//寮�濮嬫棩鏈�
+                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));//缁撴潫鏃ユ湡
+                //鍒濆鍖栬〃鏍�
+                set_InitGrid();
+                //鍔犺浇鏁版嵁鍒扮綉鏍�
+                get_FastQuery();
+                DisPlay_HideColumn();
+            }
+
+            //鍒濆鍖栬〃鏍�
+            function set_InitGrid() {
+                option = {
+                    elem: '#mainTable'
+                    , toolbar: '#toolbarDemo'
+                    , height: 'full-450'
+                    , page: true
+                    , totalRow: true
+                    , cellMinWidth: 90
+                    , limit: 50
+                    , limits: [50, 500, 5000, 20000]
+
+                }
+            }
+
+            //鍔犺浇缃戞牸
+            function get_Display(sWhere) {
+                sWhere = $("#HYear").val();
+                var wait = layer.load();//閬僵
+                $.ajax({
+                    url: GetWEBURL() + '/QC_CustomerAppealReport/ProblemType',
+                    type: "GET",
+                    async: false,
+                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+                    success: function (data1) {
+                        var col = [];
+                        if (data1.count == 1) {
+                            var data = [];
+                            //缁欑┖鐨勬暟缁勮祴鍊�
+                            for (var key in data1.list) {
+                                data.push({ "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+                            }
+                            col.push({ type: 'checkbox', fixed: 'left', totalRowText: '姹囨��' });
+                            //鍒ゆ柇鏄惁鏄函鑻辨枃
+                            var patrn = new RegExp("[\u4E00-\u9FA5]+");
+                            for (var i = 0; i < data.length; i++) {
+                                if (!patrn.test(data[i].name)) {
+                                    col.push({ field: data[i].name, title: data[i].name, hide: true }); //闅愯棌鍒�
+                                }
+                                else {
+                                    switch (data[i].Type) {
+                                        case 'DateTime':
+                                            col.push({ field: data[i].name, 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: 120 });
+                                            break;
+                                        default:
+                                            col.push({ field: data[i].name, title: data[i].name, align: 'center', sort: true, totalRow: true });
+                                    }
+                                }
+                            }
+
+                            option.cols = [col];
+                            option.data = data1.data;
+
+                            table.render(option);
+                            layer.close(wait);
+                        } else {
+                            layer.close(wait);
+                            layer.alert(data1.Message, { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.close(wait);
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+            }
+
+            //鐢熶骇杞﹂棿
+            function get_Dept() {
+                //鑾峰彇杞﹂棿鍒�
+                var HDeptName = '<option value="0" style="color:red;" selected>鍏ㄩ儴杞﹂棿</option>';
+                $.ajax({
+                    type: "get",
+                    url: GetWEBURL() + "/Sc_ICMOBill/GetHDeptList",
+                    async: false,
+                    data: { "HOrgID": sessionStorage["OrganizationID"] },
+                    success: function (result) {
+                        if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            var data = result.data;
+                            if (sessionStorage["OrganizationID"] == 100014) {
+                                HDeptName += '<option  style="color:blue;"  value="2679633" >姘寸涓�鏉℃祦</option>';
+                                HDeptName += '<option  style="color:blue;"  value="1592361" >閮ㄤ欢娌瑰喎鍣ㄥ反</option>';
+                                HDeptName += '<option  style="color:blue;"  value="1592371" >灏忚溅瑁呰姱宸�</option>';
+                                HDeptName += '<option  style="color:blue;"  value="1592374" >灏忚溅鎬绘垚宸�</option>';
+                                HDeptName += '<option  style="color:blue;"  value="1743766" >鍗¤溅瑁呰姱宸�</option>';
+                                HDeptName += '<option  style="color:blue;"  value="1743767" >鍗¤溅鎬绘垚宸�</option>';
+                                HDeptName += '<option  style="color:blue;"  value="2679647" >鍗¤溅姘寸涓�鏉℃祦</option>';
+                            } else {
+                                for (var i = 0; i < data.length; i++) {
+                                    HDeptName += '<option  style="color:blue;"  value="' + data[i].HItemID + '" >' + data[i].HName + '</option>';
+                                }
+                            }
+
+                            $("#HDeptName").append(HDeptName);
+                            form.render('select');
+                        }
+                        layer.closeAll("loading");
+                    }
+                })
+            }
+
+            //蹇�熻繃婊�
+            function get_FastQuery() {
+                var HBeginDate = $("#HBeginDate").val();//涓嬭揪鏃ユ湡 寮�濮嬫棩鏈�
+                var HEndDate = $("#HEndDate").val();//缁撴潫鏃ユ湡
+                var HBillNo = $("#HBillNo").val();//娴佽浆鍗″彿
+                var HICMOBillNo = $("#HICMOBillNo").val(); //鎵瑰彿
+                var HWorkShopID = $("#HDeptName").val();//杞﹂棿
+                var F_BSV_WYID = $("#F_BSV_WYID").val();//鍞竴ID
+                var HMaterNumber = $("#HMaterNumber").val();//鐗╂枡浠g爜
+                var HState = $("#HState").val();//鐘舵��
+                var HSTATUS = $("#HSTATUS").val();//鐢熶骇璁㈠崟鐘舵��
+                var HOrgID = sessionStorage["OrganizationID"];
+                var checkWRuku = $("input[name='checkWRuku']").prop("checked");//澶嶉�夋
+                var ColName = $("#ColName").val();//澶嶉�夋
+                var Comparator = $("#Comparator").val()
+                var ColContent = $("#ColContent").val();
+                var sWhere1 = "";
+                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;
+                    }
+                    sWhere1 += " and " + ColName + " " + com;
+                }
+
+                if (checkWRuku) {
+                    checkWRuku = 1;
+                } else {
+                    checkWRuku = 0;
+                }
+
+                sWhere = {
+                    HBeginDate: HBeginDate
+                    , HEndDate: HEndDate
+                    , HICMOBillNo: HICMOBillNo
+                    , HWorkShopID: HWorkShopID
+                    , F_BSV_WYID: F_BSV_WYID
+                    , HMaterNumber: HMaterNumber
+                    , HOrgID: HOrgID
+                    , HBillNo: HBillNo
+                    , IsTrue: checkWRuku
+                    , HState: HState
+                    , HSTATUS: HSTATUS
+                    , sWhere1: sWhere1
+                }
+
+                //get_Display(JSON.stringify(sWhere));
+                //璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+                sWhere = "";
+            }
+            //閲嶇疆杩囨护鏉′欢
+            function set_ClearQuery() {
+                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 10), "yyyy-MM-dd"));//寮�濮嬫棩鏈�
+                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));//缁撴潫鏃ユ湡
+                $("#HICMOBillNo").val("");
+                $("#HProcExchBillNo").val("");
+                $("#HName").val("");
+                $("#HBillNo").val("");
+                $("#HMaterNumber").val("");
+                $("#F_BSV_WYID").val("");
+                $("#HState").val("0")
+                $("#ColContent").val("");
+                $("#ColName").val("0");
+                $("#Comparator").val("0");
+                $("input[name='checkWRuku']").prop("checked", false);
+                form.render()
+                sWhere = "";
+            }
+
+            //鐗╂枡
+            function get_btnHMaterID() {
+                layer.open({
+                    type: 2
+                    , area: ['80%', '80%']
+                    , title: '鐗╂枡'
+                    , shade: 0.6 //閬僵閫忔槑搴�
+                    //, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_MaterialList.html', '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('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HMaterID").val(checkStatus.data[0].HItemID);
+                        $("#HMaterNumber").val(checkStatus.data[0].HNumber);
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                })
+            }
+
+            //闅愯棌鍒楄缃�
+            function get_HideColumn() {
+                var colName = "";
+                for (var i = 1; i < option.cols[0].length - 1; i++) {
+                    colName += option.cols[0][i]["title"] + ",";
+                }
+
+                colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+                layer.open({
+                    type: 2
+                    , skin: "layui-layer-rim" //鍔犱笂杈规
+                    , title: "闅愯棌鍒楄缃�"  //鏍囬
+                    , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                    , shift: 2 //寮瑰嚭鍔ㄧ敾
+                    , area: ["50%", "90%"] //绐椾綋澶у皬
+                    , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                    , content: ['../../鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName, "yes"]
+                    , btn: ["纭畾", "鍙栨秷"]
+                    , btn1: function (index, laero) {
+                        //鍒锋柊琛ㄦ牸鏁版嵁
+                        DisPlay_HideColumn();
+                        //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+                        layer.close(index);//鍏抽棴寮圭獥
+                    }
+                })
+            }
+
+            //鏄剧ず鍒楁暟鎹�
+            function DisPlay_HideColumn() {
+                $.ajax({
+                    url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+                    type: "GET",
+                    data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+                    success: function (data1) {
+                        if (data1.data.length != 0) {
+
+                            var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+                            var titleData = [];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+
+                            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('|');
+                                }
+                                //闅愯棌鍒�
+                                if (dataCols[1] == 1) {
+                                    option.cols[0][i + 1]["hide"] = true;
+                                }
+                                //璁剧疆鍐呭瀛椾綋澶у皬
+                                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 (dataCols[3] > 0) {
+                                    option.cols[0][i + 1]["width"] = dataCols[3];
+                                }
+                                //鏄剧ず鍒�
+                                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 });
+                    }
+                })
+            }
+
+            //鍒楁槑鏄剧ず涓嬫媺妗�
+            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);
+                form.render('select');
+            }
+
+
+            //#endregion
+        });
+    </script>
+</body>
+</html>
\ No newline at end of file

--
Gitblit v1.9.1