From 356cf8699c83d25c86d950c2b0836496d76120af Mon Sep 17 00:00:00 2001
From: llj <132905093+newwwwwwtree@users.noreply.github.com>
Date: 星期二, 29 七月 2025 12:55:31 +0800
Subject: [PATCH] 1.页面过滤条件:开始时间和结束时间(根据检验信息中的创建时间进行过滤)、站台(检验信息中的检验工序)、料号(PNL布局信息名称)、批次(lot号) 2.柱状图 3.饼状图 4.根据仓库、物料,维护物料的价格 2.根据表结构增加维护页面、列表页面

---
 WebTM/views/基础资料/基础资料/Gy_MatePrice.html                |  683 ++++++++++++++++
 WebTM/views/基础资料/公用基础资料/Gy_BarCodeReport.html          |  874 ++++++++++++++++++++
 WebTM/views/质量管理/库存检验单/QC_Add_Edit_StockCheckBill.html |  245 +++++
 WebTM/layuiadmin/Scripts/webConfig.js                  |    5 
 WebTM/views/基础资料/基础资料/Gy_MatePriceEdit.html            |  681 ++++++++++++++++
 WebTM/WebTM.csproj                                     |    3 
 WebTM/views/车间管理/报表分析/Sc_BadReasonReport.html          |    2 
 7 files changed, 2,476 insertions(+), 17 deletions(-)

diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index fd55ac4..07ed229 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -461,6 +461,7 @@
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\excel\Gy_QualityStd_Excel.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_AreaSet_ExtendDoubleClickReturn.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_BadPhenomena_Excel.html" />
+    <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_BarCodeReport.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_PNLInfoEdit.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_BarCodeBill_PNL_TempEdit.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_PNLInfoList.html" />
@@ -517,6 +518,8 @@
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_HPOOrderChangeBillList.aspx" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Xs_SeOrderBill_StockInCodeNote.aspx" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlSRM_Web_BarCodeBillList.aspx" />
+    <Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_MatePrice.html" />
+    <Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_MatePriceEdit.html" />
     <Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_PatrolCheckItemMethod_Excel.html" />
     <Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_PatrolCheckItemClass_Excel.html" />
     <Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_PatrolCheck_Excel.html" />
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index d15d9b4..d7d971b 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -6,11 +6,12 @@
     /*var WEBURL = "http://localhost/API/";             //棰滄檽鍐涙湰鍦伴厤缃�*/
     //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //鏉ㄤ箰鏈湴閰嶇疆
     //var WEBURL = "http://localhost:8082/API/";    //鏉滆春鏈湴閰嶇疆
-    var WEBURL = "http://localhost:8082/API/";    //寮犵憺骞挎湰鍦伴厤缃�
+   // var WEBURL = "http://localhost:8082/API/";    //寮犵憺骞挎湰鍦伴厤缃�
     //var WEBURL = "http://localhost:81/API/"    //缈佹稕娑涙湰鍦伴厤缃�
     //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //鏉ㄤ箰鏈湴閰嶇疆
     //var WEBURL = "http://47.96.97.237/API/";          //鏅轰簯鏈嶅姟鍣�
-   /* var WEBURL = "http://localhost:8082/LuBaoAPI/";  //浣欐�濇澃鏈湴閰嶇疆*/
+    /* var WEBURL = "http://localhost:8082/LuBaoAPI/";  //浣欐�濇澃鏈湴閰嶇疆*/
+     var WEBURL = "http://localhost:8082/LuBaoAPI/";  //鏉庢灄淇婃湰鍦伴厤缃�*/
     //var WEBURL = "http://localhost:8088/ARAPI/";      //浣欐�濇澃鏈湴閰嶇疆(瀹夌憺)
     //var WEBURL = "http://61.164.86.218:8099/ABAPI/";  //濂ラ偊
     //var WEBURL = "http://10.1.4.155/API/";            //姹熶赴瀹㈡埛NEW
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_BarCodeReport.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_BarCodeReport.html"
new file mode 100644
index 0000000..1da7e06
--- /dev/null
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_BarCodeReport.html"
@@ -0,0 +1,874 @@
+锘�<!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">鏃ユ湡闂撮殧</label>
+                                    <div class="layui-input-block">
+                                        <select name="HInitTimeCycle" id="HInitTimeCycle" class="ForFilteringSchemes"
+                                                lay-filter="HInitTimeCycle" style="width:190px;">
+                                        </select>
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label" style="width: 85px;">寮�濮嬫棩鏈�</label>
+                                    <div class="layui-input-inline">
+                                        <input type="date" class="layui-input ForFilteringSchemes" name="HBeginDate"
+                                               id="HBeginDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd"
+                                               placeholder="yyyy-MM-dd">
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label" style="width: 85px;">缁撴潫鏃ユ湡</label>
+                                    <div class="layui-input-inline">
+                                        <input type="date" class="layui-input ForFilteringSchemes" name="HEndDate"
+                                               id="HEndDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd"
+                                               placeholder="yyyy-MM-dd">
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">绔欏彴</label>
+                                    <div class="layui-input-block" style="width:180px;">
+                                        <select id="Station" name="Station"></select>
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">鏂欏彿</label>
+                                    <div class="layui-input-block" style="width:180px;">
+                                        <select id="MaterialNo" name="MaterialNo"></select>
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">鎵规</label>
+                                    <div class="layui-input-block" style="width:180px;">
+                                        <input type="text" class="layui-input" id="LotNo" name="LotNo" autocomplete="off">
+                                    </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-row" style=" margin-top: 10px; margin-left: 70px;">
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">杩囨护</label>
+                                                <div class="layui-input-block">
+                                                    <select name="ColName" id="ColName" class="ForFilteringSchemes" lay-filter="ColName" style="width:190px;">
+                                                    </select>
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <select name="Comparator" id="Comparator" class="ForFilteringSchemes" lay-filter="Comparator" style="width:190px;">
+                                                    <option value="0" selected="selected"></option>
+                                                    <option value="=">=</option>
+                                                    <option value=">=">>=</option>
+                                                    <option value=">">></option>
+                                                    <option value="<="><=</option>
+                                                    <option value="<"><</option>
+                                                    <option value="<>"><></option>
+                                                    <option value="7">鍖呭惈</option>
+                                                    <option value="8">宸﹀寘鍚�</option>
+                                                    <option value="9">鍙冲寘鍚�</option>
+                                                    <option value="10">涓嶅寘鍚�</option>
+                                                </select>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent">
+                                            </div>
+                                        </div>
+
+                                        <div class="layui-row" style=" margin-top: 10px; margin-left: 70px;">
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">杩囨护</label>
+                                                <div class="layui-input-block">
+                                                    <select name="ColName1" id="ColName1" class="ForFilteringSchemes" lay-filter="ColName1" style="width:190px;">
+                                                    </select>
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <select name="Comparator1" id="Comparator1" class="ForFilteringSchemes" lay-filter="Comparator1" style="width:190px;">
+                                                    <option value="0" selected="selected"></option>
+                                                    <option value="=">=</option>
+                                                    <option value=">=">>=</option>
+                                                    <option value=">">></option>
+                                                    <option value="<="><=</option>
+                                                    <option value="<"><</option>
+                                                    <option value="<>"><></option>
+                                                    <option value="7">鍖呭惈</option>
+                                                    <option value="8">宸﹀寘鍚�</option>
+                                                    <option value="9">鍙冲寘鍚�</option>
+                                                    <option value="10">涓嶅寘鍚�</option>
+                                                </select>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent1" id="ColContent1">
+                                            </div>
+                                        </div>
+
+                                        <div class="layui-row" style=" margin-top: 10px; margin-left: 70px;">
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">杩囨护</label>
+                                                <div class="layui-input-block">
+                                                    <select name="ColName2" id="ColName2" class="ForFilteringSchemes" lay-filter="ColName2" style="width:190px;">
+                                                    </select>
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <select name="Comparator2" id="Comparator2" class="ForFilteringSchemes" lay-filter="Comparator2" style="width:190px;">
+                                                    <option value="0" selected="selected"></option>
+                                                    <option value="=">=</option>
+                                                    <option value=">=">>=</option>
+                                                    <option value=">">></option>
+                                                    <option value="<="><=</option>
+                                                    <option value="<"><</option>
+                                                    <option value="<>"><></option>
+                                                    <option value="7">鍖呭惈</option>
+                                                    <option value="8">宸﹀寘鍚�</option>
+                                                    <option value="9">鍙冲寘鍚�</option>
+                                                    <option value="10">涓嶅寘鍚�</option>
+                                                </select>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
+                                            </div>
+                                        </div>
+                                    </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="get_export" id="get_export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="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>
+        //#region 鏂囨湰妗嗚緭鍏ユ悳绱㈢浉鍏虫暟鎹�-鍙橀噺
+        var childPage = null;                       //鑾峰彇瀛愮獥鍙e璞★紝鐢ㄤ簬鎿嶄綔瀛愮獥鍙g殑鍙橀噺鍜屾柟娉�
+        var currRowIndex = 0;                       //鐢ㄤ簬瀹氫綅瀛愮獥鍙e綋鍓嶉�変腑鐨勮
+        var childData = null;                       //鐢ㄤ簬鑾峰彇瀛愮獥鍙h繑鍥炵殑鏁版嵁
+        //#endregion
+
+        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 = "Sc_BarCodeReport";
+            var ins;                        //鐢ㄤ簬瀵煎嚭excel
+            //#endregion
+            //#region 杩涘叆椤甸潰鏃㈠姞杞�
+            //鍒濆鍖栫晫闈�
+            set_ClearBill();
+            
+
+
+            //#region 鐐瑰嚮浜嬩欢鍖呮嫭on form浜嬩欢绛�
+            //澶村伐鍏锋爮浜嬩欢
+            table.on('toolbar(mainTable)', function (obj) {
+                switch (obj.event) {
+                    //瀵煎嚭excel
+                    case 'get_export':
+                        get_Export();
+                        break;
+                    //閫�鍑�
+                    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();
+                    
+                
+            });
+
+            //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
+            //鍒濆鍖栫晫闈�
+            function set_ClearBill() {
+                //鍒濆鍖栨棩鏈�
+                setSelect_HInitTimeCycle();
+                //鍒濆鍖栨椂闂�
+                var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
+                if (HInitTimeCycle != -1) {
+                    $('#HBeginDate').prop('disabled', true);
+                    $('#HEndDate').prop('disabled', true);
+                } else {
+                    $('#HBeginDate').prop('disabled', false);
+                    $('#HEndDate').prop('disabled', false);
+                }
+                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
+                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+                //鍒濆鍖栦笅鎷夋
+                initSelects();
+                set_InitGrid();
+                //鍔犺浇鏁版嵁鍒扮綉鏍�
+                get_FastQuery();
+                set_Graphics();
+
+            }
+            //鍒濆鍖栬〃鏍�
+            function set_InitGrid() {
+                option = {
+                    elem: '#mainTable'
+                    , toolbar: '#toolbarDemo'
+                    , height: 'full-320'
+                    , page: true
+                    , totalRow: true
+                    , cellMinWidth: 90
+                    , limit: 50
+                    , limits: [50, 500, 5000, 20000]
+
+                }
+            }
+            //鏃ユ湡闂撮殧涓嬫媺鍒楄〃鐩戝惉
+            form.on('select(HInitTimeCycle)', function (data) {
+                var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
+                //鑻ユ棩鏈熼棿闅斾笉涓� 浠绘剰闂撮殧锛屽垯绂佺敤寮�濮嬫棩鏈熶笌缁撴潫鏃ユ湡鐨勯�夋嫨
+                if (HInitTimeCycle != -1) {
+                    $('#HBeginDate').prop('disabled', true);
+                    $('#HEndDate').prop('disabled', true);
+
+                    $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
+                    $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+
+                    //鎵ц鏌ヨ鏂规硶
+                    get_FastQuery();
+                } else {
+                    $('#HBeginDate').prop('disabled', false);
+                    $('#HEndDate').prop('disabled', false);
+                }
+            });
+
+            //#region 鍒濆鏃ユ湡闂撮殧 涓嬫媺鍒楄〃
+            function setSelect_HInitTimeCycle() {
+                var valueList = [0, 1, 2, 3, 4, 5, 6, 29, 180, 365]; //valuelist鏁扮粍鍖呭惈涓庢椂闂寸浉鍏崇殑鏁存暟鍊�
+                var titleList = ["浠婂ぉ", "杩戜袱澶�", "杩戜笁澶�", "杩戝洓澶�", "杩戜簲澶�", "杩戝叚澶�", "杩戜竷澶�", "杩�30澶�", "杩戝崐骞�", "杩戜竴骞�"];  //itilelist涓巚aluelist鍊肩浉瀵逛簬鐨勮〃锛屼笖浣滀负涓嬫媺妗嗘枃鏈樉绀�
+
+                var HInitTimeCycle_ArrayList = '<option  value="-1" selected="selected" >浠绘剰闂撮殧</option>';//瀹氫箟瀛楃涓睭InitTimeCycle_ArrayList 浣滅敤浜庝笅鎷夊垪鐨刪tml鍐呭 鍖呭惈option鍏冪礌锛屽�间负鈥�1锛屼笖鍦ㄤ笅鎷夋鏄剧ず浠绘剰闂撮殧
+                for (var i = 0; i < valueList.length; i++) {                                   // 閬嶅巻valueList  鏁扮粍  浣挎瘡涓�涓�肩敓鎴愪竴涓搴攐ption鍏冪礌
+                    HInitTimeCycle_ArrayList += '<option  style="color:blue;" value="' + valueList[i] + '">' + titleList[i] + '</option>';// 鎶婄敓鎴愮殑option鍏冪礌娣诲姞鍏InitTimeCycle_ArrayList瀛楃涓蹭腑
+                }
+
+                $("#HInitTimeCycle").empty();           //浣跨敤jquery鐨別mpty鏂规硶娓呯┖HInitTimeCycle_ArrayList <select>鍏冪礌鐨勫��
+                $("#HInitTimeCycle").append(HInitTimeCycle_ArrayList);  //浣跨敤append鏂规硶鏋勫缓涔嬪墠HInitTimeCycle_ArrayList瀛楃涓� 鐨勫唴瀹逛紶鍏InitTimeCycle  
+                form.render('select');       //璋冪敤 閲嶆柊娓叉煋select鍏冪礌
+
+                $("#HInitTimeCycle").val("29");   //浣跨敤jQuery鐨剉al()鏂规硶灏嗕笅鎷夊垪琛ㄧ殑閫変腑鍊艰缃负"29   锛屼笖鏄剧ず銆婅繎涓夋檪澶┿��
+            }
+         //#endregion
+           //#region
+               // 鍒濆鍖栦笅鎷�
+            function initSelects() {
+                // 绔欏彴銆佹枡鍙蜂笅鎷夊彲閫氳繃AJAX鑾峰彇
+                var StationList = '<option value="0" style="color:red;" selected></option>';
+                $.ajax({
+                    type: "get",
+                    url: GetWEBURL() + "/Gy_BarCodeReportController/Get_Stations",
+                    async: false,
+                    data: { "HOrgID": sessionStorage["OrganizationID"] },
+                    success: function (result) {
+                        if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            var data = result.data;
+                            for (var i = 0; i < data.length; i++) {
+                                StationList += '<option  style="color:blue;"  value="' + data[i].妫�楠屽伐搴� + '" >' + data[i].妫�楠屽伐搴� + '</option>';
+                            }
+                            $("#Station").append(StationList);
+                            form.render('select');
+
+                        }
+                        layer.closeAll("loading");
+                    }
+                })
+                var MaterialNoList = '<option value="0" style="color:red;" selected></option>';
+                $.ajax({
+                    type: "get",
+                    url: GetWEBURL() + "/Gy_BarCodeReportController/GetMaterialNos",
+                    async: false,
+                    data: { "HOrgID": sessionStorage["OrganizationID"] },
+                    success: function (result) {
+                        if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            var data = result.data;
+                            for (var i = 0; i < data.length; i++) {
+                                MaterialNoList += '<option  style="color:blue;"  value="' + data[i].HLayOutName + '" >' + data[i].HLayOutName + '</option>';
+                            }
+                            $("#MaterialNo").append(MaterialNoList);
+                            form.render('select');
+
+                        }
+                        layer.closeAll("loading");
+                    }
+                })
+            }
+           //#endregion
+            //鍔犺浇缃戞牸
+            function get_Display(sWhere) {
+                if ($("#Station").val() != null && $("#Station").val() != 0) {
+                    sWhere = sWhere;
+                }
+                else
+                sWhere = "";
+                var wait = layer.load();//閬僵
+                $.ajax({
+                    url: GetWEBURL() + '/Gy_BarCodeReportController/list',
+                    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;
+
+                            ins = 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 });
+                    }
+                });
+            }
+            //#region 閲嶇疆杩囨护鏉′欢鏂规硶
+            function set_ClearQuery() {
+                $("#Station").val("");
+                $("#MaterialNo").val("");
+                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+                
+                $("#ColContent").val("");
+                $("#ColName").val("0");
+                $("#Comparator").val("0");
+                $("#ColContent1").val("");
+                $("#ColName1").val("0");
+                $("#Comparator1").val("0");
+                $("#ColContent2").val("");
+                $("#ColName2").val("0");
+                $("#Comparator2").val("0");
+                form.render('select');
+                
+                sWhere = "";
+                get_FastQuery();
+            }
+            //#endregion
+            //蹇�熻繃婊�
+            function get_FastQuery() {
+                var HBeginDate = $("#HBeginDate").val();//璧峰鏃ユ湡
+                var HEndDate = $("#HEndDate").val();//鎴鏃ユ湡
+                var Station = $("#Station").val();//绔欏彴鍙�
+                var MaterialNo = $("#MaterialNo").val();//鏂欏彿
+                //var LotNo = $("#LotNo").val();//鎵规鍙�
+                var ColName = $("#ColName").val();//澶嶉�夋
+                var Comparator = $("#Comparator").val()
+                var ColContent = $("#ColContent").val();
+
+                var ColName1 = $("#ColName1").val();//澶嶉�夋
+                var Comparator1 = $("#Comparator1").val()
+                var ColContent1 = $("#ColContent1").val();
+                var ColName2 = $("#ColName2").val();//澶嶉�夋
+                var Comparator2 = $("#Comparator2").val()
+                var ColContent2 = $("#ColContent2").val();
+                if (ColName != 0 && Comparator != 0) {
+                    var com = "";
+                    switch (Comparator) {
+                        case "7":
+                            com = "like'%" + ColContent + "%'";
+                            break;
+                        case "8":
+                            com = "like'%" + ColContent + "'";
+                            break;
+                        case "9":
+                            com = "like'" + ColContent + "%'";
+                            break;
+                        case "10":
+                            com = "not like'%" + ColContent + "%'";
+                            break;
+                        default:
+                            com = "" + Comparator + "'" + ColContent + "'";
+                            break;
+                    }
+                    sWhere += " and " + ColName + " " + com;
+                }
+                if (ColName1 != 0 && Comparator1 != 0) {
+                    var com1 = "";
+                    switch (Comparator1) {
+                        case "7":
+                            com1 = "like'%" + ColContent1 + "%'";
+                            break;
+                        case "8":
+                            com1 = "like'%" + ColContent1 + "'";
+                            break;
+                        case "9":
+                            com1 = "like'" + ColContent1 + "%'";
+                            break;
+                        case "10":
+                            com1 = "not like'%" + ColContent1 + "%'";
+                            break;
+                        default:
+                            com1 = "" + Comparator1 + "'" + ColContent1 + "'";
+                            break;
+                    }
+                    sWhere += " and " + ColName1 + " " + com1;
+                }
+                if (ColName2 != 0 && Comparator2 != 0) {
+                    var com2 = "";
+                    switch (Comparator2) {
+                        case "7":
+                            com2 = "like'%" + ColContent2 + "%'";
+                            break;
+                        case "8":
+                            com2 = "like'%" + ColContent2 + "'";
+                            break;
+                        case "9":
+                            com2 = "like'" + ColContent2 + "%'";
+                            break;
+                        case "10":
+                            com2 = "not like'%" + ColContent2 + "%'";
+                            break;
+                        default:
+                            com2 = "" + Comparator + "'" + ColContent + "'";
+                            break;
+                    }
+                    sWhere += " and " + ColName2 + " " + com2;
+                }
+                if (Station) {
+                    sWhere += " and a.HCheckProc like '%" + Station + "%'";
+                }
+                if (MaterialNo) {
+                    sWhere += " and b.HLayOutName like '%" + MaterialNo + "%'";
+                }
+                //if (LotNo) {
+                //    sWhere += " and 鎵规鍙� like '%" + LotNo + "%'";
+                //}
+                //if (HBeginDate != "" && HEndDate != "") {
+                //    sWhere += "and 鍒涘缓鏃堕棿 between '" + HBeginDate + " 00:00:00' and '" + HEndDate + " 23:59:59'";
+                //}
+
+                get_Display(sWhere);
+                //璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+                sWhere = "";
+            }
+            //闅愯棌鍒楄缃�
+            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 });
+                    }
+                })
+            }
+            //#region 銆愬浘褰€��
+            function set_Graphics() {
+                //#region 銆愰ゼ鍥俱��
+                var chartDom = document.getElementById('PieChart');
+                var myChart = echarts.init(chartDom);
+                var option_BT;
+                var HQty2 = option.data.length > 5 ? 5 : option.data.length;//楗肩姸鍥炬牴鎹悎璁¢檷搴忔帓搴忔樉绀哄墠n鏉℃暟鎹�
+                var BadReasonCount = 0;
+                for (let i = 0; i < HQty2; i++) {
+                    if (option.data[i][3] != null)
+                        BadReasonCount++;
+                }
+                var option_BT_XData = [];
+                for (let i = 0; i < HQty2; i++) {
+                    option_BT_XData.push({ value: BadReasonCount, name: option.data[i].妫�楠屽伐搴� });
+                }
+                //$("#MaterialNo").val()
+                option_BT = {
+                    title: {
+                        text:   '鏂欏彿'+ '涓嬬殑' + '涓嶈壇鍘熷洜鍒嗗竷鍥�',
+                        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 銆愭煴鐘跺浘銆�
+                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 stations = [];//妯酱lotNO
+                var qualifiedRate = [];//绾佃酱鍚堟牸鐜�
+                var PNLCount = [];
+                var PNLPara = [];
+                var HQty1 = option.data.length > 5 ? 5 : option.data.length;//鏌辩姸鍥炬牴鎹悎璁¢檷搴忔帓搴忔樉绀哄墠n鏉℃暟鎹�
+                for (let i = 0; i < HQty1; i++) {
+                    PNLPara[i] = option.data[i].PNL鏉$爜缂栧彿;
+                    for (let j = 0; j < HQty1; j++) {
+                        
+                        if (PNLPara[i] == option.data[j].PNL鏉$爜缂栧彿) {
+                            PNLCount[i]++;
+                        }
+                        
+                    }
+                    
+                }
+                for (let i = 0; i < HQty1; i++) {
+
+                    stations.push(option.data[i].妫�楠屽伐搴�);
+                    //姝ゅ3鏆傛椂浠h〃psc鏁伴噺锛�1鏆傛椂浠h〃涓嶈壇psc鏁伴噺
+                    qualifiedRate.push((PNLCount[i] * 3 - 1) / (PNLCount[i] * 3));
+                }
+                option_ZZT = {
+                    tooltip: {
+                        trigger: 'axis',
+                        axisPointer: {
+                            type: 'shadow'
+                        }
+                    },
+                    legend: {
+                        
+                        data: PNLPara
+                        
+                    },
+                    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: stations
+                        }
+                    ],
+                    yAxis: [
+                        {
+                            type: 'value'
+                        }
+                    ],
+                    series: [
+                        {
+                            name: '涓嶈壇鐜�',
+                            type: 'bar',
+                            barGap: 0,
+                            label: labelOption,
+                            emphasis: {
+                                focus: 'series'
+                            },
+                            data: qualifiedRate
+                        },
+
+                    ]
+                };
+                option_ZZT && myChart.setOption(option_ZZT);
+                //#endregion
+            }
+        
+        });
+        
+    </script>
+    </body>
+    </html>
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MatePrice.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MatePrice.html"
new file mode 100644
index 0000000..e7bf0f5
--- /dev/null
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MatePrice.html"
@@ -0,0 +1,683 @@
+锘�<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>鏍峰搧绠$悊鍒楄〃</title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+</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="text" class="layui-input ForFilteringSchemes" name="HNumber" id="HNumber">
+                                    </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-inline" style="margin-left:5px;">
+                                    <div style="text-align:center;font-size:15px;font-weight:bold;color:#fc9393" id="HFilterScheme_Now"></div>
+                                </div>
+                                <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
+                                    <div class="layui-row" style="margin-top:10px;">
+                                        <div class="layui-row" style="margin-top:5px">
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">杩囨护</label>
+                                                <div class="layui-input-block">
+                                                    <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;" class="ForFilteringSchemes">
+                                                    </select>
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;" class="ForFilteringSchemes">
+                                                    <option value="0" selected="selected"></option>
+                                                    <option value="=">=</option>
+                                                    <option value=">=">>=</option>
+                                                    <option value=">">></option>
+                                                    <option value="<="><=</option>
+                                                    <option value="<"><</option>
+                                                    <option value="<>"><></option>
+                                                    <option value="7">鍖呭惈</option>
+                                                    <option value="8">宸﹀寘鍚�</option>
+                                                    <option value="9">鍙冲寘鍚�</option>
+                                                    <option value="10">涓嶅寘鍚�</option>
+                                                </select>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent">
+                                            </div>
+                                            <div class="layui-row" style="margin-top:5px">
+                                                <div class="layui-inline">
+                                                    <label class="layui-form-label">杩囨护</label>
+                                                    <div class="layui-input-block">
+                                                        <select name="ColName1" id="ColName1" class="ForFilteringSchemes" lay-filter="ColName1" style="width:190px;">
+                                                        </select>
+                                                    </div>
+                                                </div>
+                                                <div class="layui-inline">
+                                                    <select name="Comparator1" id="Comparator1" class="ForFilteringSchemes" lay-filter="Comparator1" style="width:190px;">
+                                                        <option value="0" selected="selected"></option>
+                                                        <option value="=">=</option>
+                                                        <option value=">=">>=</option>
+                                                        <option value=">">></option>
+                                                        <option value="<="><=</option>
+                                                        <option value="<"><</option>
+                                                        <option value="<>"><></option>
+                                                        <option value="7">鍖呭惈</option>
+                                                        <option value="8">宸﹀寘鍚�</option>
+                                                        <option value="9">鍙冲寘鍚�</option>
+                                                        <option value="10">涓嶅寘鍚�</option>
+                                                    </select>
+                                                </div>
+                                                <div class="layui-inline">
+                                                    <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent1" id="ColContent1">
+                                                </div>
+                                            </div>
+                                            <div class="layui-row" style="margin-top:5px">
+                                                <div class="layui-inline">
+                                                    <label class="layui-form-label">杩囨护</label>
+                                                    <div class="layui-input-block">
+                                                        <select name="ColName2" id="ColName2" class="ForFilteringSchemes" lay-filter="ColName2" style="width:190px;">
+                                                        </select>
+                                                    </div>
+                                                </div>
+                                                <div class="layui-inline">
+                                                    <select name="Comparator2" id="Comparator2" class="ForFilteringSchemes" lay-filter="Comparator2" style="width:190px;">
+                                                        <option value="0" selected="selected"></option>
+                                                        <option value="=">=</option>
+                                                        <option value=">=">>=</option>
+                                                        <option value=">">></option>
+                                                        <option value="<="><=</option>
+                                                        <option value="<"><</option>
+                                                        <option value="<>"><></option>
+                                                        <option value="7">鍖呭惈</option>
+                                                        <option value="8">宸﹀寘鍚�</option>
+                                                        <option value="9">鍙冲寘鍚�</option>
+                                                        <option value="10">涓嶅寘鍚�</option>
+                                                    </select>
+                                                </div>
+                                                <div class="layui-inline">
+                                                    <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
+                                                </div>
+                                            </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-Add" id="btn-Add"><i class="layui-iconlayuiiconfileb"></i>鏂板</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit" id="btn-Edit"><i class="layuiiconlayuiiconform"></i>缂栬緫</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete" id="btn-Delete"><i class="layuiiconlayuiicon-delete"></i>鍒犻櫎</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-audit" id="audit"><i class="layui-icon layui-icon-repeat"></i>瀹℃牳</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Faudit" id="Faudit"><i class="layui-icon layui-icon-refresh"></i>鍙嶅鏍�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Stop" id="Stop"><i class="layui-icon layui-icon-radio"></i>绂佺敤</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeStop" id="DeStop"><i class="layui-icon layui-icon-radio"></i>鍙嶇鐢�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-iconlayuiiconrefresh-3"></i>鍒锋柊</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layuiiconform"></i>鍒楄缃�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_SaveScheme" id="set_SaveScheme"><i class="layui-icon layui-icon-template"></i>淇濆瓨鏂规</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ReadScheme" id="set_ReadScheme"><i class="layui-icon layui-icon-set"></i>璇诲彇鏂规</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Close"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
+                            </div>
+                        </script>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+    <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/SetColumn.js"></script>
+    <script src="../../../layuiadmin/QueryScheme.js"></script>
+    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+    <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
+            var sWhere = "";
+            var option = [];
+            var Organization = sessionStorage["Organization"];
+            var HModName = "Gy_MatePrice";
+            //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+            var titleData = ["HItemID", "HUSEORGID", "HCREATEORGID", "鐖剁骇ID", "HMaterID", "HUnitID", "HRelationID"];
+
+            //#region 銆愯繃婊ゆ柟妗堛��
+
+            //杩囨护鏉′欢鐨刢lass绫�
+            window.HClassTag = "ForFilteringSchemes";
+            //妯″潡鍚嶇О锛堜腑鏂囩増锛� 姣忎釜妯″潡椤甸潰閮介渶瑕佷慨鏀�
+            window.HModuleName = "鏍峰搧绠$悊鍒楄〃";
+            //鏄惁宸茬粡閫夋嫨浜嗚繃婊ゆ柟妗堬紙鍏ㄥ眬鍙橀噺锛�
+            window.HDefaultFilter = "";
+            //閫夋嫨鐨勮繃婊ゆ柟妗堝唴鐮侊紙鍏ㄥ眬鍙橀噺锛�
+            window.HInterID_Choose = 0;
+            //#endregion
+
+            //#endregion
+
+            //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+            //鍒濆鍖栫晫闈�
+            set_ClearBill();
+
+            //#endregion
+
+            //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+            //#region 澶村伐鍏锋爮浜嬩欢
+            table.on('toolbar(mainTable)', function (obj) {
+                switch (obj.event) {
+                    //鏂板鎸夐挳
+                    case 'btn-Add':
+                        set_AddNew();
+                        break;
+                    case 'btn-Edit':
+                        set_ShowBill();
+                        break;
+                    case 'btn-Delete':
+                        set_DeleteBill();
+                        break;
+                    //瀹℃牳
+                    case 'btn-audit': set_CheckBill(0);
+                        break;
+                    //鍙嶅鏍�
+                    case 'btn-Faudit': set_CheckBill(1);
+                        break;
+                    //绂佺敤鎸夐挳
+                    case 'btn-Stop': set_De_Stop(0);
+                        break;
+                    //鍙嶇鐢ㄦ寜閽�
+                    case 'btn-DeStop': set_De_Stop(1);
+                    //鍒楄缃�
+                    case 'set_HideColumn':
+                        get_HideColumnNoPage(HModName, sessionStorage["HUserName"], option, get_FastQuery);
+                        break;
+                    //淇濆瓨鏂规
+                    case 'set_SaveScheme': set_SaveScheme(get_FastQuery);
+                        break;
+                    //璇诲彇鏂规
+                    case 'set_ReadScheme': set_ReadScheme(get_FastQuery);
+                        break;
+                    //鍒锋柊
+                    case 'get_Refresh': get_Refresh();
+                        break;
+                    //閫�鍑烘寜閽�
+                    case 'btn-Close':
+                        parent.layui.admin.events.closeThisTabs();
+                        break;
+                    //鍒楄缃�
+                    case 'set_HideColumn':
+                        get_HideColumn();
+                        break;
+                };
+            });
+            //#endregion
+
+            //#region 閲嶇疆鎸夐挳
+            form.on('submit(btnReSearch)', function (data) {
+                set_ClearQuery();
+            });
+            //#endregion
+
+            //#region 鏌ヨ鎸夐挳
+            form.on('submit(btnSearch)', function (data) {
+                get_FastQuery();
+            });
+
+            //杈撳叆妗嗗洖杞︽柟娉�
+            $('input').on('keydown', function (event) {
+                if (event.keyCode == 13) {
+                    get_FastQuery();
+                }
+            });
+            //#endregion
+
+            //#endregion
+
+            //#region 鏈〉闈㈣璋冪敤鐨勬墍鏈夋柟娉�
+
+            //#region 鍒濆鍖栫晫闈�
+            function set_ClearBill() {
+                //鍒濆鍖栬〃鏍�
+                set_InitGrid();
+                //鍒濆鍖栭〉澶у皬
+                DisPlay_HideColumn_GetPageSize(HModName, sessionStorage["HUserName"], option);
+                //鏌ヨ
+                get_FastQuery();
+                //鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
+                //get_DefaultModule(get_FastQuery);
+            }
+            //#endregion
+
+            //#region 鍒濆鍖栬〃鏍兼柟娉�
+            function set_InitGrid() {
+                option = {
+                    elem: '#mainTable'
+                    , toolbar: '#toolbarDemo'
+                    , height: 'full-100'
+                    , page: true
+                    , limits: [50, 500, 5000, 50000]
+                    , limit: 50
+                    , cellMinWidth: 90
+                };
+            }
+            //#endregion
+
+            //#region 閲嶇疆杩囨护鏉′欢鏂规硶
+            function set_ClearQuery() {
+                $("#HNumber").val("");
+                $("#HName").val("");
+                $("#ColContent").val("");
+                $("#ColName").val("0");
+                $("#Comparator").val("0");
+                form.render('select');
+                sWhere = "";
+            }
+            //#endregion
+
+            //#region 鏌ヨ
+            function get_Display(sWhere) {
+                var wait = layer.load();//閬僵
+                var ajaxLoad = layer.load();
+                $.ajax({
+                    url: GetWEBURL() + '/Gy_MatePriceController/MatePriceList',
+                    type: "GET",
+                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "Organization": Organization},
+                    success: function (data1) {
+                        if (data1.count == 1) {
+                            var data = [];
+                            var col = [];
+                            //缁欑┖鐨勬暟缁勮祴鍊�
+                            for (var key in data1.list) {
+                                data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+                            }
+                            //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+                            col.push({ type: 'checkbox', fixed: 'left' });
+                            for (var i = 0; i < data.length; i++) {
+                                if ($.inArray(data[i].name, titleData) > -1) {
+                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+                                }
+                                else {
+                                    switch (data[i].Type) {
+                                        //int
+                                        case 'DateTime':
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
+                                            break;
+                                        default:
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+                                    }
+                                }
+                            }
+
+                            option.cols = [col];
+                            option.data = data1.data;
+
+                            //鍒楄缃�
+                            DisPlay_HideColumn(HModName, sessionStorage["HUserName"], option);
+                            table.render(option)
+                            layer.close(ajaxLoad);
+                            if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+                                ColFilter();
+                            }
+                            //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+                        } else {
+                            layer.close(ajaxLoad);
+                            layer.alert(data1.code + data1.Message, { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.close(ajaxLoad);
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+            }
+            //#endregion
+
+            //#region 蹇�熻繃婊�
+            function get_FastQuery() {
+                var HNumber = $("#HNumber").val();
+                var HName = $("#HName").val();
+                var ColName = $("#ColName").val();//澶嶉�夋
+                var Comparator = $("#Comparator").val()
+                var ColContent = $("#ColContent").val();
+                var ColName1 = $("#ColName1").val();//澶嶉�夋
+                var Comparator1 = $("#Comparator1").val()
+                var ColContent1 = $("#ColContent1").val();
+                var ColName2 = $("#ColName2").val();//澶嶉�夋
+                var Comparator2 = $("#Comparator2").val()
+                var ColContent2 = $("#ColContent2").val();
+                if (ColName != 0 && Comparator != 0) {
+                    var com = "";
+                    switch (Comparator) {
+                        case "7":
+                            com = "like'%" + ColContent + "%'";
+                            break;
+                        case "8":
+                            com = "like'%" + ColContent + "'";
+                            break;
+                        case "9":
+                            com = "like'" + ColContent + "%'";
+                            break;
+                        case "10":
+                            com = "not like'%" + ColContent + "%'";
+                            break;
+                        default:
+                            com = "" + Comparator + "'" + ColContent + "'";
+                            break;
+                    }
+                    sWhere += " and " + ColName + " " + com;
+                }
+                if (ColName1 != 0 && Comparator1 != 0) {
+                    var com1 = "";
+                    switch (Comparator1) {
+                        case "7":
+                            com1 = "like'%" + ColContent1 + "%'";
+                            break;
+                        case "8":
+                            com1 = "like'%" + ColContent1 + "'";
+                            break;
+                        case "9":
+                            com1 = "like'" + ColContent1 + "%'";
+                            break;
+                        case "10":
+                            com1 = "not like'%" + ColContent1 + "%'";
+                            break;
+                        default:
+                            com1 = "" + Comparator1 + "'" + ColContent1 + "'";
+                            break;
+                    }
+                    sWhere += " and " + ColName1 + " " + com1;
+                }
+                if (ColName2 != 0 && Comparator2 != 0) {
+                    var com2 = "";
+                    switch (Comparator2) {
+                        case "7":
+                            com2 = "like'%" + ColContent2 + "%'";
+                            break;
+                        case "8":
+                            com2 = "like'%" + ColContent2 + "'";
+                            break;
+                        case "9":
+                            com2 = "like'" + ColContent2 + "%'";
+                            break;
+                        case "10":
+                            com2 = "not like'%" + ColContent2 + "%'";
+                            break;
+                        default:
+                            com2 = "" + Comparator2 + "'" + ColContent2 + "'";
+                            break;
+                    }
+                    sWhere += " and " + ColName2 + " " + com2;
+                }
+                if (HNumber) {
+                    sWhere += " and 鐗╂枡缂栫爜 like '%" + HNumber + "%'";
+                }
+                //if (HName) {
+                //    sWhere += " and 鍚嶇О like '%" + HName + "%'";
+                //}
+                get_Display(sWhere);
+                sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+            }
+            //#endregion
+
+            //#region 鍒犻櫎
+            function set_DeleteBill() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var ItemID = data[0].HItemID.toString();
+                    layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+                        var wait = layer.load();
+                        //#region 閫昏緫鍒犻櫎鏂规硶
+                        $.ajax({
+                            url: GetWEBURL() + '/Gy_MatePriceController/Delete',
+                            type: "GET",
+                            data: { "HItemID": ItemID, "user": sessionStorage["HUserName"]},
+                            success: function (result) {
+                                //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                get_FastQuery();
+                                if (result.count == 1) {
+                                    layer.msg(result.Message, { icon: 1 }, function () {
+                                        //鍏抽棴褰撳墠frame
+                                        layer.close(wait);
+                                    });
+                                } else {
+                                    layer.alert(result.code + result.Message, { icon: 5 });
+                                    layer.close(wait);
+                                }
+                            }, error: function () {
+                                layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                                layer.close(wait);
+                            }
+                        });
+                    })
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+                }
+            }
+            //#endregion
+            //#endregion
+
+            //#region 鏂板
+            function set_AddNew() {
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '鏂板閲囪喘浠锋牸',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['100%', '100%'],
+                    maxmin: true,
+                    content: '../鍩虹璧勬枡/Gy_MatePriceEdit.html?OperationType=1',
+                    end: function () {
+                        //鍒锋柊椤甸潰,
+                        get_FastQuery(table, option);
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+            }
+            //#endregion
+
+            //#region 缂栬緫鍗曟嵁
+            function set_ShowBill() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var hID = data[0].HItemID;
+                    //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+                    layer.open({
+                        type: 2
+                        , area: ['100%', '100%']
+                        , title: '缂栬緫閲囪喘浠锋牸'
+                        , shade: 0.6 //閬僵閫忔槑搴�
+                        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                        , content: '../鍩虹璧勬枡/Gy_MatePriceEdit.html?OperationType=3&hID=' + hID
+                        , resize: false
+                        , cancel: function () {
+                            //$(".layui-btn").removeClass("layui-btn-disabled");
+                        }
+                        , end: function () {
+                            //鍒锋柊椤甸潰,
+                            get_FastQuery(table, option);
+                        }
+                    })
+
+                } else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+                }
+            }
+            //#endregion
+
+            //#region 鍙嶅鏍�/瀹℃牳鏁版嵁
+            function set_CheckBill(num) {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var InterID = data[0].HItemID.toString();
+                    //閫昏緫瀹℃牳鏂规硶
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "/Gy_MatePriceController/MatePriceCheck", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        data: { "HInterID": InterID, "IsAudit": num, "CurUserName": sessionStorage["HUserName"] },
+                        success: function (result) {
+                            if (result.count == 1) {
+                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                    // 寰楀埌frame绱㈠紩
+                                    var index = layer.getFrameIndex(window.name);
+                                    //鍏抽棴褰撳墠frame
+                                    layer.close(index);
+                                    //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                    $("#btnSearch").trigger('click');
+                                });
+
+                            } else {
+                                layer.alert(result.code + result.Message, { icon: 5 });
+                            }
+                        }, error: function () {
+                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                        }
+                    });
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+                }
+            }
+            //#endregion
+
+            //#region 鍒锋柊
+            function get_Refresh() {
+                set_ClearQuery();
+                get_Display(sWhere);
+            }
+            //#endregion
+
+            //#region 鐐瑰嚮琛岄�変腑楂樹寒
+            table.on('row(mainTable)', function (obj) {
+                //閫変腑琛屾敼鍙橀鑹�
+                var flag = !obj.tr.find(':checkbox:first').prop('checked');
+                obj.tr.find(':checkbox').prop('checked', flag);
+                if (flag) {
+                    obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked');  //璁剧疆澶嶉�夋閫変腑鏍峰紡
+                    $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+                } else {
+                    obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//鍙栨秷澶嶉�夋閫変腑鏍峰紡
+                    $(obj.tr.selector).attr({ "style": "background:" });//鍙栨秷褰撳墠tr棰滆壊
+                }
+                //mainTable 涓鸿〃鏍糏D   娉ㄦ剰姝ゅ濡傛灉ID涓嶆纭皢瀵艰嚧浣犲湪鐩戝惉澶嶉�夋鏃惰幏鍙栦笉鍒颁綘閫夋嫨鐨勬暟鎹紝鍓嶉潰鐨勫彧鏄坊鍔犳垨鍒犻櫎閫変腑鏈�変腑鏍峰紡浠ュ強璁剧疆鑳屾櫙鑹诧紝瀛椾綋棰滆壊
+                layui.each(table.cache.mainTable, function (i, l) {
+                    if (obj.tr.index() == l.LAY_TABLE_INDEX) {
+                        l.LAY_CHECKED = flag;
+                    }
+                });
+            })
+            //#endregion
+            //#region 鍙嶇鐢�/绂佺敤鏁版嵁
+            function set_De_Stop(num) {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var InterID = data[0].HItemID.toString();
+                    //閫昏緫瀹℃牳鏂规硶
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "/Gy_MatePriceController/StopGy_MaterPrice", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        data: { "HInterID": InterID, "IsStop": num, "CurUserName": sessionStorage["HUserName"] },
+                        success: function (result) {
+                            if (result.count == 1) {
+                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                    // 寰楀埌frame绱㈠紩
+                                    var index = layer.getFrameIndex(window.name);
+                                    //鍏抽棴褰撳墠frame
+                                    layer.close(index);
+                                    //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                    $("#btnSearch").trigger('click');
+                                });
+
+                            } else {
+                                layer.alert(result.code + result.Message, { icon: 5 });
+                            }
+                        }, error: function () {
+                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                        }
+                    });
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+                }
+            }
+            //#endregion
+            //#region 鎺掑簭鍚庨�夋嫨
+            table.on('sort(mainTable)', function (obj) { //娉細sort 鏄伐鍏锋潯浜嬩欢鍚嶏紝test 鏄� table 鍘熷瀹瑰櫒鐨勫睘鎬� lay-filter="瀵瑰簲鐨勫��"
+                table.reload('mainTable', {
+                    initSort: obj //璁板綍鍒濆鎺掑簭锛屽鏋滀笉璁剧殑璇濓紝灏嗘棤娉曟爣璁拌〃澶寸殑鎺掑簭鐘舵�併�� layui 2.1.1 鏂板鍙傛暟
+                    , where: { //璇锋眰鍙傛暟锛堟敞鎰忥細杩欓噷闈㈢殑鍙傛暟鍙换鎰忓畾涔夛紝骞堕潪涓嬮潰鍥哄畾鐨勬牸寮忥級
+                        field: obj.field //鎺掑簭瀛楁   鍦ㄦ帴鍙d綔涓哄弬鏁板瓧娈�  field order
+                        , order: obj.type //鎺掑簭鏂瑰紡   鍦ㄦ帴鍙d綔涓哄弬鏁板瓧娈�  field order
+                    }
+                });
+                option.data = layui.table.cache["mainTable"];
+                table.render(option);
+                ////鍒锋柊鎸夐挳鏄剧ず
+                //Display_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
+            });
+            //#endregion
+
+            //#region 鍒楁槑鏄剧ず涓嬫媺妗�
+            function ColFilter() {
+                var Organization = '<option  value="0" selected="selected" ></option>';
+                for (var i = 1; i < option.cols[0].length; i++) {
+                    if (option.cols[0][i].hide != true) {
+                        Organization += '<option  style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</option>';
+                    }
+                }
+                $("#ColName").empty();
+                $("#ColName").append(Organization);
+                $("#ColName1").empty();
+                $("#ColName1").append(Organization);
+                $("#ColName2").empty();
+                $("#ColName2").append(Organization);
+                form.render('select');
+            }
+            //#endregion
+        });
+            //#endregion
+    </script>
+
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MatePriceEdit.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MatePriceEdit.html"
new file mode 100644
index 0000000..8be2e0f
--- /dev/null
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MatePriceEdit.html"
@@ -0,0 +1,681 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+    <meta 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.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+    <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>
+    <style type="text/css">
+        .layui-form-label {
+            width: 85px;
+        }
+
+        .layui-form-item .layui-input-inline {
+            width: 50%;
+        }
+
+        .layui-inline {
+            width: 290px;
+        }
+
+        .layui-form-item .layui-inline {
+            margin-right: 0px;
+        }
+    </style>
+</head>
+<body>
+    <div id="layout1" class="layui-fluid">
+        <div class="layui-row layui-col-space15">
+            <div class="layui-col-md12">
+                <div class="layui-card">
+                    <form id="form0" class="layui-form" lay-filter="component-form-group" action="">
+                        <div class="layui-card-header">
+                            <div class="layui-btn-group">
+                                <button type="button" id="Saver" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
+                                <button type="button" id="set_CheckBill" class="layui-btn layui-btn-normal layui-btn-radius"
+                                        lay-submit="" lay-filter="set_CheckBill">
+                                    瀹℃牳
+                                </button>
+                                <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
+                            </div>
+                        </div>
+                        <div class="layui-card-body">
+                            <div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
+                                <ul class="layui-tab-title">
+                                    <li class="layui-this">鍩烘湰淇℃伅</li>
+                                    <li>鍒跺崟淇℃伅</li>
+                                </ul>
+                                <div class="layui-tab-content">
+                                    <div class="layui-tab-item layui-show">
+                                        <div class="layui-form-item" style="padding-top: 10px;">
+                                            <div class="layui-inline">
+                                                <div class="layui-input-block" style="margin-left: 120px;">
+                                                    <input id="HItemID" name="HItemID" value="0" type="hidden" />
+                                                </div>
+                                            </div>
+                                            <div class="layui-row">
+                                                <div class="layui-inline">
+                                                    <label class="layui-form-label">鐗╂枡浠g爜</label>
+                                                    <div class="layui-input-block">
+                                                        <input type="text" readonly name="HMaterNumber" id="HMaterNumber" class="layui-input" value="" style="float: left; width: 135px;">
+                                                        <input type="hidden" name="HMaterID" id="HMaterID" class="layui-input" value="0" style="float:left;width:150px;">
+                                                        <button type="button" lay-submit="" class="layui-btn" lay-filter="HMaterList" id="HMaterList" style="width:40px;">
+                                                            <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                        </button>
+                                                    </div>
+                                                </div>
+                                                <div class="layui-inline">
+                                                    <label class="layui-form-label">鐗╂枡鍚嶇О</label>
+                                                    <div class="layui-input-block" style="margin-left: 120px;">
+                                                        <input type="text" class="layui-input" name="HMaterName" id="HMaterName" autocomplete="off">
+                                                    </div>
+                                                </div>
+                                                <div class="layui-inline">
+                                                    <label class="layui-form-label">渚涘簲鍟嗕唬鐮�</label>
+                                                    <div class="layui-input-block">
+                                                        <input type="text" readonly name="HSupNumber" id="HSupNumber" class="layui-input" value="" style="float: left; width: 135px;">
+                                                        <input type="hidden" name="HSupID" id="HSupID" class="layui-input" value="0" style="float:left;width:150px;">
+                                                        <button type="button" lay-submit="" class="layui-btn" lay-filter="HSupList" id="HSupList" style="width:40px;">
+                                                            <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                        </button>
+                                                    </div>
+                                                </div>
+                                                <div class="layui-inline">
+                                                    <label class="layui-form-label">渚涘簲鍟嗗悕绉�</label>
+                                                    <div class="layui-input-block" style="margin-left: 120px;">
+                                                        <input type="text" class="layui-input" name="HSupName" id="HSupName" autocomplete="off">
+                                                    </div>
+                                                </div>
+                                                <div class="layui-inline">
+                                                    <label class="layui-form-label">瀹㈡埛浠g爜</label>
+                                                    <div class="layui-input-block">
+                                                        <input type="text" readonly name="HCusNumber" id="HCusNumber" class="layui-input" value="" style="float: left; width: 135px;">
+                                                        <input type="hidden" name="HCusID" id="HCusID" class="layui-input" value="0" style="float:left;width:150px;">
+                                                        <button type="button" lay-submit="" class="layui-btn" lay-filter="HCusList" id="HCusList" style="width:40px;">
+                                                            <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                        </button>
+                                                    </div>
+                                                </div>
+                                                <div class="layui-inline">
+                                                    <label class="layui-form-label">瀹㈡埛鍚嶇О</label>
+                                                    <div class="layui-input-block" style="margin-left: 120px;">
+                                                        <input type="text" class="layui-input" name="HCusName" id="HCusName" autocomplete="off">
+                                                    </div>
+                                                </div>
+                                                <div class="layui-inline">
+                                                    <label class="layui-form-label">浠撳簱浠g爜</label>
+                                                    <div class="layui-input-block">
+                                                        <input type="text" readonly name="HWHNumber" id="HWHNumber" class="layui-input" value="" style="float: left; width: 135px;">
+                                                        <input type="hidden" name="HWHID" id="HWHID" class="layui-input" value="0" style="float:left;width:150px;">
+                                                        <button type="button" lay-submit="" class="layui-btn" lay-filter="HWHList" id="HWHList" style="width:40px;">
+                                                            <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                        </button>
+                                                    </div>
+                                                </div>
+                                                <div class="layui-inline">
+                                                    <label class="layui-form-label">浠撳簱鍚嶇О</label>
+                                                    <div class="layui-input-block" style="margin-left: 120px;">
+                                                        <input type="text" class="layui-input" name="HWHName" id="HWHName" autocomplete="off">
+                                                    </div>
+                                                </div>
+                                            </div>
+                                            <div class="layui-row">
+                                                <div class="layui-col-xs4 layui-inline">
+                                                    <label class="layui-form-label">绂佺敤鏍囧織</label>
+                                                    <div class="layui-input-inline">
+                                                        <input type="checkbox" name="HStopflag" id="HStopflag" disabled
+                                                               lay-skin="primary" lay-filter="HStopflag" value="0" title="鏄惁绂佺敤">
+                                                        <!--<input type="hidden" value="false" name="HStopflag" id="HStopflag">-->
+                                                    </div>
+                                                </div>
+                                                <div class="layui-col-xs4 layui-inline">
+                                                    <label class="layui-form-label">浣跨敤鐘舵��</label>
+                                                    <div class="layui-input-inline">
+                                                        <input type="text" name="HUseFlag" id="HUseFlag" lay-verify="HUseFlag" value="1"
+                                                               style="background-color:#efefef4d;" autocomplete="off" placeholder="" class="layui-input" readonly>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                            <div class="layui-row">
+                                                <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="HPrice" id="HPrice" value="0">
+                                                    </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="HRemark" id="HRemark">
+                                                    </div>
+                                                </div>
+                                            </div>
+                                            </div>
+                                            <div class="layui-row">
+                                                <div class="layui-inline">
+                                                    <label class="layui-form-label">浣跨敤缁勭粐</label>
+                                                    <div class="layui-input-block" style="margin-left: 120px;">
+                                                        <select name="HUSEORGID" id="HUSEORGID" class=" ForFilteringSchemes" lay-verify="HUSEORGID">
+                                                            <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+                                                        </select>
+                                                    </div>
+                                                </div>
+                                                <div class="layui-inline">
+                                                    <label class="layui-form-label">鍒涘缓缁勭粐</label>
+                                                    <div class="layui-input-block" style="margin-left: 120px;">
+                                                        <select name="HCREATEORGID" id="HCREATEORGID" class=" ForFilteringSchemes" lay-verify="HCREATEORGID">
+                                                            <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+                                                        </select>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                        
+                                    <!--鍏朵粬淇℃伅-->
+                                    <div class="layui-tab-item">
+                                        <div class="layui-form-item">
+                                            <div class="layui-row">
+                                                <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="HMakeEmp" id="HMakeEmp" style="background-color:#efefef4d;" readonly>
+                                                    </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="HStopEmp" id="HStopEmp" style="background-color:#efefef4d;" readonly>
+                                                    </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="HCheckEmp" id="HCheckEmp" style="background-color:#efefef4d;" readonly>
+                                                    </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="HModifyEmp" id="HModifyEmp" style="background-color:#efefef4d;" readonly>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                            <div class="layui-row">
+                                                <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="HMakeTime" id="HMakeTime" style="background-color:#efefef4d;" readonly>
+                                                    </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="HStopTime" id="HStopTime" style="background-color:#efefef4d;" readonly>
+                                                    </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="HCheckTime" id="HCheckTime" style="background-color:#efefef4d;" readonly>
+                                                    </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="HModifyTime" id="HModifyTime" style="background-color:#efefef4d;" readonly>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                        </div>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+</body>
+</html>
+
+<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;
+
+        //#endregion
+
+        //#region 杩涘叆椤甸潰鍗冲姞杞�
+        var HOrgIDBar = 0;
+        var params = get_UrlVars();
+        set_ClearBill();
+        if (typeof (params[params[0]]) == "undefined") {
+            var OperationType = 1;//鎿嶄綔绫诲瀷
+        } else {
+            var OperationType = params[params[0]];//鎿嶄綔绫诲瀷//浠庡弬鏁颁腑鑾峰彇 鏁版嵁绫诲瀷  1娣诲姞 淇濆瓨  2澶嶅埗  3 缂栬緫
+            var linterid = params[params[1]];//婧愬崟id
+            var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
+        }
+        $('#set_CheckBill').addClass('layui-btn-disabled').attr('disabled', true);
+        //鍒ゆ柇鎿嶄綔绫诲瀷
+        if (OperationType == 1) {//鏃犳簮鍗曟柊澧�
+            $("#HItemID").val(0);
+            $("#HMakeTime").val(util.toDateString(new Date(), 'yyyy-MM-dd'))
+        }
+        else if (OperationType == 2) {//澶嶅埗
+            $("#HItemID").val(linterid);//淇敼鏃朵富琛↖D
+            //缂栬緫鐘舵�佹椂锛屾牴鎹唴鐮侊紝鑾峰彇淇℃伅骞跺啓鍏ョ晫闈�
+            RoadBillMain(linterid);
+        }
+        else if (OperationType == 3) {//缂栬緫
+            $("#HItemID").val(linterid);//淇敼鏃朵富琛↖D
+            //缂栬緫鐘舵�佹椂锛屾牴鎹唴鐮侊紝鑾峰彇淇℃伅骞跺啓鍏ョ晫闈�
+            RoadBillMain(linterid);
+        }
+        else if (OperationType == 4) {//娴忚
+            $("#HItemID").val(linterid);//
+            //缂栬緫鐘舵�佹椂锛屾牴鎹唴鐮侊紝鑾峰彇淇℃伅骞跺啓鍏ョ晫闈�
+            RoadBillMain(linterid);
+            $('#saver').addClass("layui-btn-disabled").attr("disabled", true);//淇濆瓨鍚庡姞杞芥暟鎹椂淇濆瓨鎸夐挳绂佺敤
+        }
+        else {
+            layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
+        }
+
+        //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+        //淇濆瓨鎻愪氦
+        form.on('submit(Saver)', function (data) {//鎻愪氦
+            set_AddNew(data);
+        });
+
+        //閫�鍑�
+        form.on('submit(Exit)', function (data) {
+            Pub_Close(1);
+        });
+
+        //閫夋嫨鐗╂枡
+        form.on('submit(HMaterList)', function () {
+            layer.open({
+                type: 2
+                , area: ['90%', '90%']//澶у皬
+                , title: '鐗╂枡鍒楄〃'
+                , shade: 0.6 //閬僵閫忔槑搴�
+                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html', 'yes']
+                , resize: false
+                , cancel: function () {
+                    //$(".layui-btn").removeClass("layui-btn-disabled");
+                }
+                , 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('璇烽�夋嫨鏁版嵁');
+                    }
+                    $("#HMaterName").val(checkStatus.data[0].鐗╂枡鍚嶇О);
+                    $("#HMaterNumber").val(checkStatus.data[0].鐗╂枡浠g爜);
+                    $("#HMaterID").val(checkStatus.data[0].HItemID);
+                    layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                }
+                , btn2: function (index, layero) { }
+            })
+        });
+        //閫夋嫨浠撳簱
+        form.on('submit(HWHList)', function () {
+            layer.open({
+                type: 2
+                , area: ['90%', '90%']//澶у皬
+                , title: '鐗╂枡鍒楄〃'
+                , shade: 0.6 //閬僵閫忔槑搴�
+                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Warehouse.html', 'yes']
+                , resize: false
+                , cancel: function () {
+                    //$(".layui-btn").removeClass("layui-btn-disabled");
+                }
+                , 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('璇烽�夋嫨鏁版嵁');
+                    }
+                    $("#HWHName").val(checkStatus.data[0].浠撳簱鍚嶇О);
+                    $("#HWHNumber").val(checkStatus.data[0].浠撳簱浠g爜);
+                    $("#HWHID").val(checkStatus.data[0].HItemID);
+                    layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                }
+                , btn2: function (index, layero) { }
+            })
+        });
+        //閫夋嫨渚涘簲鍟咲:\GitHub\MES-WEB-LayUI\WebTM\views\鍩虹璧勬枡\閲囪喘鍩虹璧勬枡\Gy_Supplier.html
+        form.on('submit(HSupList)', function () {
+            layer.open({
+                type: 2
+                , area: ['90%', '90%']//澶у皬
+                , title: '渚涘簲鍟嗗垪琛�'
+                , shade: 0.6 //閬僵閫忔槑搴�
+                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                , content: ['../../../views/鍩虹璧勬枡/閲囪喘鍩虹璧勬枡/Gy_Supplier.html', 'yes']
+                , resize: false
+                , cancel: function () {
+                    //$(".layui-btn").removeClass("layui-btn-disabled");
+                }
+                , btn: ['纭畾', '鍙栨秷']
+                , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                    var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                    var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                    if (checkStatus.data.length === 0) {
+                        return layer.msg('璇烽�夋嫨鏁版嵁');
+                    }
+                    $("#HSupName").val(checkStatus.data[0].渚涘簲鍟嗗悕绉�);
+                    $("#HSupNumber").val(checkStatus.data[0].渚涘簲鍟嗕唬鐮�);
+                    $("#HSupID").val(checkStatus.data[0].HItemID);
+                    layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                }
+                , btn2: function (index, layero) { }
+            })
+        });
+        //閫夋嫨瀹㈡埛
+        form.on('submit(HCusList)', function () {
+            layer.open({
+                type: 2
+                , area: ['90%', '90%']//澶у皬
+                , title: '渚涘簲鍟嗗垪琛�'
+                , shade: 0.6 //閬僵閫忔槑搴�
+                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                , content: ['../../鍩虹璧勬枡/閿�鍞熀纭�璧勬枡/Gy_Customer.html', 'yes']
+                , resize: false
+                , cancel: function () {
+                    //$(".layui-btn").removeClass("layui-btn-disabled");
+                }
+                , 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('璇烽�夋嫨鏁版嵁');
+                    }
+                    $("#HCusName").val(checkStatus.data[0].瀹㈡埛鍚嶇О);
+                    $("#HCusNumber").val(checkStatus.data[0].瀹㈡埛浠g爜);
+                    $("#HCusID").val(checkStatus.data[0].HItemID);
+                    layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                }
+                , btn2: function (index, layero) { }
+            })
+        });
+        
+        //淇濆瓨鎻愪氦
+        form.on('submit(Saver)', function (data) {//鎻愪氦
+            set_AddNew(data);
+        });
+        //#endregion
+
+        //#region 鏈〉闈㈣璋冪敤鐨勬墍鏈夋柟娉�
+
+        // 鍒濆鍖栫晫闈�
+        function set_ClearBill() {
+            $("#HMakeEmp").val(sessionStorage["HUserName"]);
+            $("#HMakeTime").val(Format(new Date(), "yyyy-MM-dd"));
+            $("#HStopEmp").val(sessionStorage["HUserName"]);
+            $("#HCheckEmp").val(sessionStorage["HUserName"]);
+            $("#HModifyEmp").val(sessionStorage["HUserName"]);
+            Organ();
+            Organ1();
+        }
+        //鏄惁绂佺敤鎸夐挳
+        form.on('checkbox(HStopflag)', function (data) {
+            $("#HStopflag").val(data.elem.checked);
+        });
+        //淇濆瓨HMaker
+        function set_AddNew(data) {
+
+            var HPrice = $('#HPrice').val();
+            if (HPrice.substring(HPrice.length - 1, HPrice.length) == ".") {
+                layer.msg("鍗曚环鐨勭粨灏句笉鑳芥槸.锛�");
+                return;
+            } else {
+                var ref = /^[0-9]+\.?[0-9]*$/;
+                if (!ref.test(HPrice)) {
+                    layer.msg("鍗曚环璇疯緭姝g‘鍏ユ暟瀛楋紒");
+                    return;
+                }
+            }
+            var HisBan = $('#HStopflag').val();
+            var UseType = $('#HUseFlag').val();
+            var HStopEmp = $('#HStopEmp').val();
+            var sMainStr = JSON.stringify(data.field);
+            var sMainSub = sMainStr  + ";" + sessionStorage["HUserName"];
+            var itID = $('#HitemID').val();
+            var index = layer.load();
+            $.ajax({
+                type: "POST",
+                url: GetWEBURL() + "/Gy_MatePriceController/MatePriceEdit",
+                async: true,
+                data: { "msg": sMainSub },
+                dataType: "json",
+                success: function (data) {
+                    if (data.count == 1) {
+                        $('#Saver').addClass("layui-btn-disabled").attr("disabled", true);
+                        layer.close(index);
+                        layer.msg("鎻愪氦鎴愬姛");
+                    }
+                    else {
+                        layer.close(index);
+                        layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    }
+                },
+                error: function (err) {
+                    layer.close(index);
+                    layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                }
+            });
+        }
+
+        //缂栬緫 椤甸潰璧嬪��
+        function RoadBillMain(linterid)//鍔犺浇琛ㄥご
+        {
+            var ajaxLoad = layer.load();
+            $.ajax({
+                url: GetWEBURL() + "/Gy_MatePrice/cx",
+                type: "GET",
+                async: false,
+                data: { "HItemID": linterid, "user": sessionStorage["HUserName"]},
+                success: function (d) {
+                    var IsHStopflag = d.data[0].鏄惁绂佺敤;
+                    //绂佺敤鏍囪
+                    if (IsHStopflag=== 1) {
+                        $("#HStopflag").attr("checked", true);
+                    }
+                    //涓昏〃
+                    form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+                        "HItemID": d.data[0].HItemID
+                        , "HSupID": d.data[0].HSupID
+                        , "HSupName": d.data[0].渚涘簲鍟嗗悕绉�
+                        , "HSupNumber": d.data[0].渚涘簲鍟嗙紪鐮�
+                        , "HCusID": d.data[0].HCusID
+                        , "HCusNumber": d.data[0].瀹㈡埛缂栧彿
+                        , "HCusName": d.data[0].瀹㈡埛鍚嶇О
+                        , "HPrice": d.data[0].鍗曚环
+                        , "HMaterID": d.data[0].HMaterID
+                        , "HMaterNumber": d.data[0].鐗╂枡缂栫爜
+                        , "HMaterName": d.data[0].鐗╂枡鍚嶇О
+                        , "HWHID": d.data[0].HWHID
+                        , "HWHNumber": d.data[0].浠撳簱缂栫爜
+                        , "HWHName": d.data[0].浠撳簱鍚嶇О
+                        , "HUseFlag": d.data[0].鍒ゅ畾缁撹
+                        , "HMakeEmp": d.data[0].鍒涘缓浜� == "" ? sessionStorage["HMakeEmp"] : d.data[0].鍒涘缓浜�
+                        , "HMakeTime": d.data[0].鍒涘缓鏃堕棿 == null ? "" : util.toDateString(new Date(d.data[0].鍒涘缓鏃堕棿), "yyyy-MM-dd")
+                        , "HStopEmp": d.data[0].绂佺敤浜�
+                        , "HStopTime": d.data[0].绂佺敤鏃堕棿 == null ? "" : util.toDateString(new Date(d.data[0].绂佺敤鏃堕棿), "yyyy-MM-dd")
+                        , "HCheckEmp": d.data[0].瀹℃牳浜�
+                        , "HCheckTime": d.data[0].瀹℃牳鏃堕棿 == null ? "" : util.toDateString(new Date(d.data[0].瀹℃牳鏃堕棿), "yyyy-MM-dd")
+                        , "HModifyEmp": d.data[0].淇敼浜�
+                        , "HModifyTime": d.data[0].淇敼鏃堕棿 == null ? "" : util.toDateString(new Date(d.data[0].淇敼鏃堕棿), "yyyy-MM-dd")
+                        , "HRemark": d.data[0].澶囨敞
+                        , "HUSEORGID": d.data[0].HUSEORGID
+                        , "HCREATEORGID": d.data[0].HCREATEORGID
+                    });
+                     if (OperationType != 2) {
+                         if (d.data[0]['瀹℃牳浜�']!="") {
+                                    $('#saver').addClass('layui-btn-disabled').attr('disabled', true)
+                         }
+                         else
+                         {
+                             $('#set_CheckBill').removeClass('layui-btn-disabled').attr('disabled', false)
+                                }
+                     }
+                     else {
+                                debugger
+                         $("#HMakeEmp").val(sessionStorage["HMakeEmp"])
+                                $("#HMakeTime").val(util.toDateString(new Date(), 'yyyy-MM-dd'))
+                                $("#HStopEmp").val('')
+                                $("#HStopTime").val('')
+                                $("#HCheckEmp").val('')
+                                $("#HCheckTime").val('')
+                                $("#HItemID").val(0)
+                            }
+                            layer.close(ajaxLoad);
+                            //layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+                        
+                    form.render('checkbox');
+                    form.render('select');
+                }
+            })
+        }
+        form.on('submit(set_CheckBill)', function () {
+            var InterID = linterid
+            //閫昏緫瀹℃牳鏂规硶
+            $.ajax({
+                type: "GET",
+                url: GetWEBURL() + "/Gy_MatePriceController/MatePriceCheck", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                data: { "HInterID": InterID, "IsAudit": 0, "CurUserName": sessionStorage["HUserName"] },
+                success: function (result) {
+                    if (result.count == 1) {
+                        layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                            // 寰楀埌frame绱㈠紩
+                            var index = layer.getFrameIndex(window.name);
+                            //鍏抽棴褰撳墠frame
+                            layer.close(index);
+                            $('#set_CheckBill').addClass('layui-btn-disabled').attr('disabled', true);
+                            $('#saver').addClass('layui-btn-disabled').attr('disabled', true);
+                            //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                            //$("#btnSearch").trigger('click');
+                        });
+
+                    } else {
+                        layer.alert(result.code + result.Message, { icon: 5 });
+                    }
+                }, error: function () {
+                    layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                }
+            });
+        })
+        //#region 鑾峰彇缁勭粐
+        function Organ() {
+            //鑾峰彇鐧诲綍椤电粍缁囧垪
+            $.ajax({
+                type: "get",
+                async: false,
+                url: GetWEBURL() + "/Web/GetOrganizations",
+                success: function (result) {
+                    var Organization = "";
+                    if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                        var data = result.data;
+                        for (var i = 0; i < data.length; i++) {
+                            Organization += '<option  style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
+                        }
+                        $("#HUSEORGID").append(Organization);
+                        $("#HUSEORGID").val(sessionStorage["OrganizationID"])
+                        form.render('select');
+                    }
+                    layer.closeAll("loading");
+                }
+            })
+        }
+        function Organ1() {
+            //鑾峰彇鐧诲綍椤电粍缁囧垪
+            $.ajax({
+                type: "get",
+                async: false,
+                url: GetWEBURL() + "/Web/GetOrganizations",
+                success: function (result) {
+                    var Organization = "";
+                    if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                        var data = result.data;
+                        for (var i = 0; i < data.length; i++) {
+                            Organization += '<option  style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
+                        }
+                        $("#HCREATEORGID").append(Organization);
+                        $("#HCREATEORGID").val(sessionStorage["OrganizationID"])
+                        form.render('select');
+                    }
+                    layer.closeAll("loading");
+                }
+            })
+        }
+            //#endregion
+
+        //鑾峰彇鍙傛暟
+        function getUrlVars() {
+            var vars = [], hash;
+            var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
+            for (var i = 0; i < hashes.length; i++) {
+                hash = hashes[i].split('=');
+                vars.push(hash[0]);
+                vars[hash[0]] = hash[1];
+            }
+            return vars;
+        }
+
+        //#endregion
+
+    });
+    function GetHCusNameValue(obj)  //杩斿洖瀹㈡埛
+    {
+        $("#HRelationName").val(obj[0].瀹㈡埛鍚嶇О);
+        $("#HRelationID").val(obj[0].HItemID);
+    }
+    function GetHSupNameValue(obj)  //杩斿洖渚涘簲鍟�
+    {
+        $("#HRelationName").val(obj[0].渚涘簲鍟嗗悕绉�);
+        $("#HRelationID").val(obj[0].HItemID);
+    }
+
+    function GetGyMaterial(data) {
+        $("#HMaterName").val(data.鐗╂枡鍚嶇О);
+        $("#HMaterNumber").val(data.鐗╂枡浠g爜);
+        $("#HModel").val(data.瑙勬牸鍨嬪彿);
+        $("#HMaterID").val(data.HItemID);
+        $("#HUnitID").val(data.HUnitID);
+        $("#HUnitName").val(data.璁¢噺鍗曚綅鍚嶇О);
+    }
+
+</script>
\ No newline at end of file
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\272\223\345\255\230\346\243\200\351\252\214\345\215\225/QC_Add_Edit_StockCheckBill.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\272\223\345\255\230\346\243\200\351\252\214\345\215\225/QC_Add_Edit_StockCheckBill.html"
index 8b03023..a13028d 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\272\223\345\255\230\346\243\200\351\252\214\345\215\225/QC_Add_Edit_StockCheckBill.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\272\223\345\255\230\346\243\200\351\252\214\345\215\225/QC_Add_Edit_StockCheckBill.html"
@@ -50,6 +50,7 @@
                     <div style="padding: 10px;">
                         <button type="button" class="layui-btn layui-btn-normal" style="margin-left: 0px" lay-submit="" lay-filter="btn-AddNew" id="btn-AddNew">鏂板</button>
                         <button type="button" class="layui-btn layui-btn-normal" style="margin-left: 0px" lay-submit="" lay-filter="btnSave" id="btnSave">淇濆瓨</button>
+                        <button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="set_CheckBill" id="set_CheckBill">瀹℃牳</button>
                         <button type="button" class="layui-btn layui-btn-normal" style="margin-left: 0px" lay-submit="" lay-filter="btn-Exit" id="btn-Exit">閫�鍑�</button>
                     </div>
                     <div class="layui-tab" lay-filter="tab-POStockInBill">
@@ -638,6 +639,7 @@
                         <div class="layui-btn-container">
                             <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>
                             <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button>
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
                         </div>
                     </script>
                     <!--闅愯棌瀛楁-->
@@ -688,7 +690,7 @@
         //1.妫�楠岄」鐩〃浣撴暟鎹�煎瓨鍌紝鍊熺敤鐐瑰嚮琛屼簨浠讹紝褰撳垏鎹㈣鏃舵妸涓婃鎵�鍦ㄨ鐨勬暟鎹瓨鍒皁ption.data涓婏紱
         //杩欎釜鎬濊矾浼氭湁涓棶棰橈紝鏈�鍚庝竴娆$偣鍑荤殑閭h鏁版嵁灏嗕笉浼氬湪鍘昏Е鍙戠偣鍑昏浜嬩欢瀛樺偍鍊硷紝鐩墠鎯冲埌鐨勬槸鍦ㄦ墽琛屼繚瀛樻柟娉曟椂鍦ㄦ妸鏈�鍚庣偣鍑荤殑閭d竴琛屾暟鎹瓨鍏ption.data涓�
 
-
+        var OptionData = [];
         layui.config({
             base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
         }).extend({
@@ -718,6 +720,7 @@
             var UnRightQty_isFied = 0; //鐢ㄤ簬鍒ゆ柇鏄惁鍚堟牸//妫�楠屽�艰〃鏍间笉鍚堟牸鏁伴噺姹囨��
             var editIndex = 0;//缂栬緫涓嬫爣
             var SampleNum = [];//鏍锋湰鏁伴噺
+            var HModName = "QC_Add_Edit_StockCheckBill";
 
             //#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
             var HModuleType = "7519";
@@ -1066,6 +1069,10 @@
                             form.render('select');
                         }
                         break;
+                    //鍒楄缃�
+                    case 'set_HideColumn':
+                        get_HideColumn();
+                        break;
                 }
             });
             //#endregion
@@ -1229,16 +1236,55 @@
                                     if (checkStatus.data.length === 0) {
                                         return layer.msg('璇烽�夋嫨鏁版嵁');
                                     }
-                                    var HResult = checkStatus.data[0].榛樿缁撹 == "鍚堟牸" ? 1 : 2
-                                    //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
-                                    obj.update({
-                                        妫�楠岄」鐩�: checkStatus.data[0].鍚嶇О
-                                        , HQCCheckItemID: checkStatus.data[0].HItemID
-                                        , HResult: HResult
-                                    });
-                                    $('#HResult' + rowIndex + '').find("option[value='" + HResult + "']").attr("selected", true);
-                                    form.render('select');
-                                    layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                                    if (checkStatus.data.length === 1) {
+                                        var HResult = checkStatus.data[0].榛樿缁撹 == "鍚堟牸" ? 1 : 2
+                                        //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+                                        obj.update({
+                                            妫�楠岄」鐩�: checkStatus.data[0].鍚嶇О
+                                            , 妫�楠岄」鐩唬鐮�: checkStatus.data[0].浠g爜
+                                            , HQCCheckItemID: checkStatus.data[0].HItemID
+                                            , HResult: HResult
+                                        });
+                                        $('#HResult' + rowIndex + '').find("option[value='" + HResult + "']").attr("selected", true);
+                                        form.render('select');
+                                        layer.close(layer.index);
+                                    }
+                                    else {
+                                        //(澶氶�夎)
+                                        //灏嗗師鏈夎〃浣撴暟鎹啓鍏ユ暟缁�
+                                        var tableBak = table.cache["mainTable"]; //鑾峰彇涔嬪墠缂栬緫杩囩殑琛ㄦ牸鏁版嵁
+                                        buttonArr = [];//娓呯┖鏁扮粍
+                                        for (var i = 0; i < tableBak.length; i++) {
+                                            if (tableBak[i]["HQCCheckItemID"] != 0 && tableBak[i]["妫�楠岄」鐩�"] != "" && tableBak[i]["HResult"] != undefined && tableBak[i]["HResult"] != null) {
+                                                buttonArr.push(tableBak[i]);  //濡傛灉鍏抽敭瀛楁涓嶄负绌猴紝鍒欏皢涔嬪墠鐨勬暟鎹瓨鍌�
+                                            }
+                                        }
+                                        //灏嗘壒閲忛�夋嫨鐨勬暟鎹啓鍏ユ暟缁勶紙澶氶�夎锛�
+                                        for (var i = 0; i < checkStatus.data.length; i++) {
+                                            buttonArr.push({
+                                                "妫�楠岄」鐩�": checkStatus.data[i].鍚嶇О, "妫�楠岄」鐩唬鐮�": checkStatus.data[i].浠g爜, "HQCCheckItemID": checkStatus.data[i].HItemID, "HResult": 1,
+                                                "HInspectInstruMentID": "0", "妫�楠屼华鍣ㄤ唬鐮�": "", "妫�楠屼华鍣�": "", "HQCStd": "", "HUnit": "", "HQCNote": "", "HAnalysisMethod": "",
+                                                "HMax": "", "HMin": "", "HAvg": "", "HRemark": "", "HKeyInspect": false, "HStatus": 0, "HSampleSchemeID": 0, "HUnitID": 0,
+                                                "HInspectVal": '', "HTargetVal": '', "HUpLimit": '', "HDownLimit": '', "HUpOffSet": '', "HDownOffSet": '', "HSampleDamageQty": '0',
+                                                "HSampleSchemeName": "", "HSampleQty": "0", "HSampleDamageQty": "0", "HAcceptQty": "0", "HInspectionLevel": "", "HRejectQty": "",
+                                                "HStrictness": "", "HSampleUnRightQty": "", "HAQL": "", "HSamplingType": ""
+                                            });
+                                        }
+
+                                        table.reload("mainTable", {
+                                            data: buttonArr    //灏嗘暟鎹噸鏂拌浇鍏ヨ〃鏍�
+                                        })
+                                        for (var i = 1; i <= option.data.length; i++) {
+                                            $('#HResult' + i + '').find("option[value='" + option.data[i - 1].HResult + "']").attr("selected", true);
+                                            $('#HAnalysisMethod' + i + '').find("option[value='" + option.data[i - 1].HAnalysisMethod + "']").attr("selected", true);
+                                            //瀹屾垚鏍囪
+                                            if (option.data[i - 1].HKeyInspect) {
+                                                $('#HKeyInspect' + i + '').attr("checked", true);
+                                            }
+                                        }
+                                        form.render('select');
+                                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                                    }
                                 }
                                 , btn2: function (index, layero) {
                                     //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
@@ -1272,7 +1318,8 @@
 
                                     //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
                                     obj.update({
-                                        妫�楠屼华鍣�: checkStatus.data[0].妫�楠屼华鍣ㄥ悕绉�
+                                        妫�楠屼华鍣ㄤ唬鐮�: checkStatus.data[0].妫�楠屼华鍣ㄤ唬鐮�
+                                        , 妫�楠屼华鍣�: checkStatus.data[0].妫�楠屼华鍣ㄥ悕绉�
                                         , HInspectInstruMentID: checkStatus.data[0].HItemID
                                     });
                                     layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
@@ -1282,7 +1329,16 @@
                                     //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
                                 },
                                 end: function () {
+                                    if (OptionData.length > 0) {
+                                        //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+                                        obj.update({
+                                            妫�楠屼华鍣ㄤ唬鐮�: OptionData[0].妫�楠屼华鍣ㄤ唬鐮�,
+                                            妫�楠屼华鍣�: OptionData[0].妫�楠屼华鍣ㄥ悕绉�,
+                                            HInspectInstruMentID: OptionData[0].HItemID
+                                        });
 
+                                        OptionData = [];
+                                    }
                                 }
                             });
                         }
@@ -1400,7 +1456,11 @@
             form.on('submit(btnSave)', function (data) {
                 set_SaveBill(data);
             });
-
+            //#region 瀹℃牳鎸夐挳
+            form.on('submit(set_CheckBill)', function (data) {
+                set_CheckBill(0);
+            });
+            //#endregion
             //淇濆瓨
             function set_SaveBill(data) {               
                 //淇濆瓨鏈�鍚庝竴娆$偣鍑昏鐨勬楠屽��
@@ -2223,6 +2283,7 @@
 
             //鍒濆鍖栬〃鏍�
             function set_InitGrid() {
+                $('#set_CheckBill').addClass("layui-btn-disabled").attr("disabled", true);//鍒濆鍖栫鐢ㄥ鏍告寜閽�
                 $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
                 $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd"));
                 //鍒濆琛ㄦ牸鏁版嵁
@@ -3688,10 +3749,153 @@
                 form.render('checkbox');
             }
             //#endregion
+            //#region 瀛愯〃1锛氶殣钘忓垪璁剧疆
+            function get_HideColumn() {
+                var colName = "";
+                var contentUrl = "";
+                for (var i = 1; i < option.cols[0].length - 1; i++) {
+                    colName += option.cols[0][i]["title"] + ",";
+                }
+                var urlStr = window.document.location.pathname;//鑾峰彇鏂囦欢璺緞
+                var urlLen = urlStr.split('/');
+                for (var i = 0; i < urlLen.length - 4; i++) {
+                    contentUrl += "../";
+                }
+                colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
 
+                contentUrl += '鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName;
+
+                layer.open({
+                    type: 2
+                    , skin: "layui-layer-rim" //鍔犱笂杈规
+                    , title: "闅愯棌鍒楄缃�"  //鏍囬
+                    , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                    , shift: 2 //寮瑰嚭鍔ㄧ敾
+                    , area: ["50%", "90%"] //绐椾綋澶у皬
+                    , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                    , content: [contentUrl, "yes"]
+                    , btn: ["纭畾", "鍙栨秷"]
+                    , btn1: function (index, laero) {
+                        //鍒锋柊琛ㄦ牸鏁版嵁
+                        DisPlay_HideColumn();
+                        //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+                        layer.close(index);//鍏抽棴寮圭獥
+                    }
+                })
+            }
+            //#endregion
+            //#region 瀛愯〃1锛氭樉绀哄垪鏁版嵁
+            function DisPlay_HideColumn() {
+                $.ajax({
+                    url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+                    async: false,
+                    type: "GET",
+                    data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+                    async: false,
+                    success: function (data1) {
+                        if (data1.data.length != 0) {
+                            var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+                            var titleData = ["HQCCheckItemID", "HInspectInstruMentID"];
+
+                            dataCol = data1.data[0].HGridString.split(',');
+
+                            for (var i = 0; i < option.cols[0].length - 2; i++) {
+                                if (dataCol.length <= i) {
+                                    break;
+                                }
+                                var dataCols = dataCol[i].split('|');
+                                //闅愯棌鍒�
+                                if (dataCols[1] == 1) {
+                                    option.cols[0][i + 1]["hide"] = true;
+                                }
+                                //璁剧疆鍒楀
+                                if (dataCols[3] > 0) {
+                                    option.cols[0][i + 1]["width"] = dataCols[3];
+                                }
+                                //璁剧疆鍐呭瀛椾綋澶у皬
+                                if (data1.data[0].HFontSize != 0) {
+                                    option.cols[0][i + 1]["style"] += "font-size:" + data1.data[0].HFontSize + "px;";
+                                } else {
+                                    option.cols[0][i + 1]["style"] += "font-size:100%";
+                                }
+                                //鏄剧ず鍒�
+                                if (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;
+                                }
+                                //璁剧疆琛ㄦ牸title灞炴�ф樉绀哄埆鍚�
+                                if (dataCols[4] != null && dataCols[4] != "") {
+                                    option.cols[0][i + 1]["title"] = dataCols[4];
+                                }
+                            }
+
+                            //鍙栨秷鍐荤粨鍒�
+                            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
             //浠ヤ笂涓簂ayui妯″潡
         });
-
+        //#region 瀹℃牳鏁版嵁
+        function set_CheckBill() {
+            var InterID = $("#HInterID").val();
+            //閫昏緫瀹℃牳鏂规硶
+            $.ajax({
+                type: "GET",
+                url: GetWEBURL() + "/QC_WorkSelfCheckBill/AuditQC_WorkSelfCheckBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                data: { "HInterID": InterID, "Type": 1, "user": sessionStorage["HUserName"] },
+                success: function (result) {
+                    if (result.count == 1) {
+                        layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                            // 寰楀埌frame绱㈠紩
+                            var index = layer.getFrameIndex(window.name);
+                            //鍏抽棴褰撳墠frame
+                            layer.close(index);
+                        });
+                        $('#set_CheckBill').addClass("layui-btn-disabled").attr("disabled", true);// 绂佺敤瀹℃牳鎸夐挳
+                    } else {
+                        layer.alert(result.code + result.Message, { icon: 5 });
+                    }
+                }, error: function () {
+                    layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                }
+            });
+        }
+            //#endregion
         function GetGySource(obj) {  //鐢熶骇璧勬簮
             $("#HSourceName").val(obj[0].鐢熶骇璧勬簮鍚嶇О);
             $("#HSourceID").val(obj[0].HItemID);
@@ -3730,6 +3934,19 @@
             $("#HShiftsName").val(obj[0].鐝鍚嶇О);
             $("#HShiftsID").val(obj[0].HItemID);
         }
+        //宸ュ簭
+        function GetProcessValue(obj) {
+            $("#HProcName").val(obj[0].宸ュ簭鍚嶇О);
+            $("#HProcID").val(obj[0].HItemID);
+        }
+        //妫�楠岄」鐩�
+        function GetCheckItemValue(obj) {
+            OptionData = obj;
+        }
+        //妫�楠屼华鍣�
+        function GetInspectInstruMentValue(obj) {
+            OptionData = obj;
+        }
     </script>
 </body>
 </html>
\ No newline at end of file
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Sc_BadReasonReport.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Sc_BadReasonReport.html"
index c7705d5..be208ef 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Sc_BadReasonReport.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Sc_BadReasonReport.html"
@@ -489,7 +489,7 @@
 
                 option_BT = {
                     title: {
-                        text: $("#HYear").val() + '骞�' + (Number(new Date().getMonth()) + Number(1)) + '鏈堜唤涓嶈壇鍘熷洜鍒嗗竷鍥�',
+                        text: $("#HYear").val() + '骞�' + (Number(new Date().getMonth()) + Number(1)) + '涓嶈壇鍘熷洜鍥�',
                         left: 'center'
                     },
                     tooltip: {

--
Gitblit v1.9.1