From 6002ec958f4a9af47a3fd6720abb777bccfee3e3 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期一, 10 三月 2025 19:15:49 +0800
Subject: [PATCH] 物料列表,仓库列表 ,职员列表 功能优化 班次,点检项目,维修项目,维修验收项目,设备档案,器具主档维护,检验项目分类,检验项目,检验值,检验仪器,异常反馈类型,工艺路线大类,维修验收项目分类,维修项目分类,保养项目分类 审核 反审核 禁用 反禁用 按钮设置 增加页签 增加字段 增加点检项目分类字段 保养项目 维修项目 维修验收项目 增加树形图

---
 WebTM/views/基础资料/公用基础资料/Gy_InspectInstruMent.html          |  270 
 WebTM/views/计划管理/工艺路线大类/Gy_RoutingGroupEdit.html           |  391 +
 WebTM/views/基础资料/公用基础资料/Gy_QCCheckClass.html               |  554 +
 WebTM/views/基础资料/基础资料/Gy_DotCheckEdit.html                 |  228 
 WebTM/views/基础资料/公用基础资料/Gy_EmployeeList.html               |  288 
 WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_QCCheckClass.html      |  188 
 WebTM/views/基础资料/基础资料/Gy_MaintainList.html                 |  505 +
 WebTM/views/基础资料/公用基础资料/Gy_Material.html                   |  350 
 WebTM/views/基础资料/基础资料/Gy_MaintainEdit.html                 |  271 +
 WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_CheckItem.html         |  167 
 WebTM/views/基础资料/基础资料/Gy_MaintainClassEdit.html            |  391 +
 WebTM/views/模治具管理/模治具管理/Gy_MouldFile.html                  |  256 
 WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_InspectInstruMent.html |   91 
 WebTM/views/基础资料/生产基础资料/Gy_WorkShiftList.html              |  434 +
 WebTM/views/质量管理/基础建模/Add_Edit_Gy_ErrMsgBackType.html      |   98 
 WebTM/views/模治具管理/模治具管理/Gy_MouldFileList.html              |  336 +
 WebTM/views/基础资料/公用基础资料/Gy_Warehouse.html                  |  185 
 WebTM/views/基础资料/基础资料/Gy_RepairClassEdit.html              |  391 +
 WebTM/views/基础资料/基础资料/Gy_RepairList.html                   |  503 +
 WebTM/views/质量管理/基础建模/Gy_ErrMsgBackType.html               |  258 
 WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_InspectValue.html      |   99 
 WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_Warehouse.html         |   11 
 WebTM/views/基础资料/基础资料/Gy_MaintainClass.html                | 1056 ++++
 WebTM/views/基础资料/基础资料/Gy_RepairCheckClass.html             | 1056 ++++
 WebTM/views/基础资料/公用基础资料/Gy_InspectValue.html               |  270 
 WebTM/views/基础资料/基础资料/Gy_RepairClass.html                  | 1056 ++++
 WebTM/layuiadmin/SetColumn.js                              |  107 
 WebTM/views/设备管理/设备档案/Gy_EquipFileMainList.html            |  363 +
 WebTM/views/基础资料/基础资料/Gy_RepairCheckEdit.html              |  266 +
 WebTM/views/基础资料/生产基础资料/Gy_WorkShiftEdit.html              |  192 
 WebTM/views/基础资料/公用基础资料/Gy_CheckItem.html                  |  542 +
 WebTM/views/基础资料/基础资料/Gy_DotCheckList.html                 |  415 +
 WebTM/views/基础资料/基础资料/Gy_RepairEdit.html                   |  286 +
 WebTM/views/计划管理/工艺路线大类/Gy_RoutingGroupList.html           |  613 ++
 WebTM/views/基础资料/基础资料/Gy_RepairCheckList.html              |  577 +
 WebTM/views/基础资料/基础资料/Gy_RepairCheckClassEdit.html         |  391 +
 WebTM/WebTM.csproj                                         |    7 
 WebTM/views/设备管理/设备档案/Gy_EquipFileMainEdit.html            |   90 
 38 files changed, 11,049 insertions(+), 2,503 deletions(-)

diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 9a1f0d2..729f30c 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -462,7 +462,13 @@
     <Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_DotCheckItemClassList.html" />
     <Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_ConkReasonList_Excel.html" />
     <Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_DotCheckItemClass_Excel.html" />
+    <Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_RepairCheckClass.html" />
+    <Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_MaintainClass.html" />
+    <Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_MaintainClassEdit.html" />
+    <Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_RepairClassEdit.html" />
+    <Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_RepairCheckClassEdit.html" />
     <Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_RepairCheck_Excel.html" />
+    <Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_RepairClass.html" />
     <Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_Repair_Excel.html" />
     <Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_Maintain_Excel.html" />
     <Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_DotCheck_Excel.html" />
@@ -593,6 +599,7 @@
     <Content Include="views\璁″垝绠$悊\宸ヨ壓璺嚎\Gy_RoutingBillWorkQty.html" />
     <Content Include="views\璁″垝绠$悊\宸ヨ壓璺嚎\Pay_ProcPriceTypeChangeReport.html" />
     <Content Include="views\璁″垝绠$悊\宸ヨ壓璺嚎\Gy_MaterialTechParamBill_Excel.html" />
+    <Content Include="views\璁″垝绠$悊\宸ヨ壓璺嚎澶х被\Gy_RoutingGroupEdit.html" />
     <Content Include="views\璁惧绠$悊\Sb_Add_EquipRepairSignBillList.html" />
     <Content Include="views\璁惧绠$悊\Sb_EquipRepairSignBillList_PDA.html" />
     <Content Include="views\璁惧绠$悊\Sb_EquipRepairSignBill_PDA.html" />
diff --git a/WebTM/layuiadmin/SetColumn.js b/WebTM/layuiadmin/SetColumn.js
index 1fd3b28..e92ab7a 100644
--- a/WebTM/layuiadmin/SetColumn.js
+++ b/WebTM/layuiadmin/SetColumn.js
@@ -185,6 +185,113 @@
 }
 //#endregion
 
+//#region 鏄剧ず鍒楁暟鎹�
+function DisPlay_HideColumn(HModName, user, option, titleData) {
+    $.ajax({
+        url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+        type: "GET",
+        async: false,
+        data: { "HModName": HModName, "user": user },
+        success: function (data1) {
+            if (data1.data.length != 0) {
+                var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+            /*    var titleData = [];*/
+                var newCols = [[]];//瀵瑰簲鏁版嵁搴撳垪椤哄簭col
+                newCols[0].push(option.cols[0][0]);//鏀惧叆绗竴涓猚heckbox
+                dataCol = data1.data[0].HGridString.split(',');
+                //鍒楄缃垪鏁颁笌椤甸潰鍒楁暟鏄惁涓�鑷�
+                if (dataCol.length == option.cols[0].length - 1) {
+                    //閬嶅巻瀵绘壘鍒楄缃搴斿垪鎸夐『搴忔彃鍏�
+                    for (var j = 0; j < option.cols[0].length - 1; j++) {
+                        for (var i = 0; i < option.cols[0].length - 1; i++) {
+                            var dataCols = dataCol[j].split('|');
+                            //閫夋嫨涓巇atacols鐩稿簲鍒楄繘琛屼慨鏀�
+                            if (option.cols[0][i + 1]["field"] == dataCols[5]) {
+                                //闅愯棌鍒�
+                                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;
+                                }
+                                //缁熻鍒�
+                                if (dataCols[6] == 1) {
+                                    option.cols[0][i + 1]["totalRow"] = true;
+                                }
+                                //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+                                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];
+                                }
+                                newCols[0].push(option.cols[0][i + 1]);
+                                break;
+                            }
+                        }
+                    }
+                    //閬嶅巻寰幆鍚庡垽鏂搴斿垪鏁版槸鍚︿竴鑷�
+                    if (dataCol.length == newCols[0].length - 1) {
+                        option.cols = newCols;
+                        //鍙栨秷鍐荤粨鍒�
+                        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";
+                            }
+                        }
+                        //璁剧疆鍒楁帓搴�
+                        for (var i = 1; i < option.cols[0].length; i++) {
+                            if (data1.data[0].HSortFlag == "鏄�") {
+                                option.cols[0][i]["sort"] = true;
+                            }
+                            else {
+                                option.cols[0][i]["sort"] = false;
+                            }
+                        }
+                    }
+                }
+            } else {
+            }
+        }, error: function () {
+            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+        }
+    })
+}
+//#endregion
+
+
 //#region 闅愯棌鍒楄缃紪杈戦〉闈�
 function get_HideColumnEdit(HModName,user,option,table) {
     var colName = "";
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/Add_Edit_Gy_CheckItem.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/Add_Edit_Gy_CheckItem.html"
index ba5aff3..dd6d07a 100644
--- "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/Add_Edit_Gy_CheckItem.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/Add_Edit_Gy_CheckItem.html"
@@ -8,6 +8,12 @@
     <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/layui/layui.js"></script>
+    <script src="../../../layuiadmin/Scripts/json2.js"></script>
+    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
+    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
     <style type="text/css">
         .layui-form-label {
             width: 85px;
@@ -29,7 +35,12 @@
                         </div>
                         <div class="layui-card-body">
                             <div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
+                                <ul class="layui-tab-title" lay-filter="tab-all">
+                                    <li lay-id="1" style="padding:1px;" class="layui-this">鍩烘湰淇℃伅</li>
+                                    <li>鍏朵粬淇℃伅</li>
+                                </ul>
                                 <div class="layui-tab-content">
+                                    <!--鍩烘湰淇℃伅-->
                                     <div class="layui-tab-item layui-show">
                                         <div class="layui-form-item">
                                             <div class="layui-inline">
@@ -150,6 +161,27 @@
                                         </div>
                                         <div class="layui-form-item">
                                             <div class="layui-inline">
+                                                <label class="layui-form-label" style="width: 85px;">浣跨敤缁勭粐</label>
+                                                <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
+                                                    <input type="hidden" class="layui-input" lay-verify="HCREATEORGID" name="HCREATEORGID" id="HCREATEORGID">
+                                                    <select name="HUSEORGID" id="HUSEORGID" lay-verify="HUSEORGID">
+                                                        <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+                                                    </select>
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label" style="width: 85px;">浣跨敤鏍囧織</label>
+                                                <div class="layui-input-block" style="margin-left: 130px; width: 190px;">
+                                                    <select name="HUseFlag" id="HUseFlag" lay-verify="HUseFlag">
+                                                        <option value="鏈娇鐢�" selected="selected">鏈娇鐢�</option>
+                                                        <option value="宸蹭娇鐢�">宸蹭娇鐢�</option>
+                                                        <option value="鏈娴�">鏈娴�</option>
+                                                    </select>
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="layui-form-item">
+                                            <div class="layui-inline">
                                                 <label class="layui-form-label">鏄惁绯荤粺棰勮</label>
                                                 <div class="layui-input-inline">
                                                     <input type="checkbox" name="HISsystemSet" id="HISsystemSet" lay-skin="primary" title="">
@@ -189,6 +221,64 @@
                                             </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="HModifyEmp" id="HModifyEmp" 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>
+                                            <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="HModifyTime" id="HModifyTime" 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>
+                                        </div>
+                                    </div>
                                 </div>
                             </div>
                         </div>
@@ -198,11 +288,7 @@
             </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/PubCustom.js"></script>
+
     <script>
         //鑾峰彇鍙傛暟
         function getUrlVars() {
@@ -218,7 +304,7 @@
 
         var params = getUrlVars();
         var hID = params[params[0]];//缂栬緫鏌ョ湅
-        var HType = params[params[1]];    //鍗曟嵁鐘舵�併�佸眰绾�
+        var OperationType = params[params[1]];    //鍗曟嵁鐘舵�併�佸眰绾�
         var TagParentId = params[params[2]];  //鐖剁骇ID
 
 
@@ -236,6 +322,32 @@
                 , element = layui.element;
 
             //甯歌鐢ㄦ硶
+            Organ();
+            $("#HStopflag").attr("disabled", true);
+            $("#HUseFlag").attr("disabled", true);
+            layui.form.render('checkbox');
+            layui.form.render('select');
+
+            if (OperationType == 1) {   //鏂板
+                hID = 0;
+                $("#HMakeEmp").val(sessionStorage["HUserName"]);
+
+            } else if (OperationType == 2) {
+                RoadBillMain(hID);
+                $("#HMakeEmp").val(sessionStorage["HUserName"]);
+                $("#HModifyEmp").val("");
+                $("#HStopEmp").val("");
+                $("#HCheckEmp").val("");
+                $("#HMakeTime").val("");
+                $("#HModifyTime").val("");
+                $("#HStopTime").val("");
+                $("#HCheckTime").val("");
+                $("#HNumber").val("");
+                $("#HItemID").val(0);
+                hID = 0;
+            } else if (OperationType == 3) {
+                RoadBillMain(hID);
+            }
 
             //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
             //if (sessionStorage.login != "login") {
@@ -281,7 +393,7 @@
                 var oMain = JSON.stringify(data.field)
 
                 var sMainSub = oMain + ';' + hID + ';' + user + ';' + ModRightNameAdd;
-                if (HType == "Modify") {
+                if (OperationType == "3") {
 
                     $.ajax(
                         {
@@ -343,18 +455,19 @@
                         });
                 }
             });
+
             function f_alert(sMsg) {
                 layer.alert(sMsg, { icon: 5 });
 
             }
 
-            if (HType == "Modify") {
+            function RoadBillMain(linterid) {
                 $.ajax({
                     url: GetWEBURL() + "/Gy_CheckItem/xg_View",
-                    //url: "http://localhost:12761/Gy_Department/xg",
                     type: "GET",
+                    async: false,
                     data: {
-                        "HInterID": hID
+                        "HInterID": linterid
                     },
                     success: function (d) {
                         ajaxReturnData = JSON.parse(JSON.stringify(d)).data;
@@ -379,6 +492,17 @@
                         $("#HInspectInstruMentID").val(d.data[0].HInspectInstruMentID);
                         $("#HInspectBasisName").val(d.data[0].妫�楠屼緷鎹悕绉�);
                         $("#HInspectBasisID").val(d.data[0].HInspectBasisID);
+
+                        $("#HUSEORGID").val(d.data[0].HUSEORGID);
+                        $("#HMakeEmp").val(d.data[0].鍒跺崟浜�);
+                        $("#HMakeTime").val(d.data[0].鍒涘缓鏃ユ湡 == null ? "" : Format(new Date(d.data[0].鍒涘缓鏃ユ湡), "yyyy-MM-dd"));
+                        $("#HCheckEmp").val(d.data[0].瀹℃牳浜�);
+                        $("#HCheckTime").val(d.data[0].瀹℃牳鏃ユ湡 == null ? "" : Format(new Date(d.data[0].瀹℃牳鏃ユ湡), "yyyy-MM-dd"));
+                        $("#HModifyEmp").val(d.data[0].淇敼浜�);
+                        $("#HModifyTime").val(d.data[0].淇敼鏃ユ湡 == null ? "" : Format(new Date(d.data[0].淇敼鏃ユ湡), "yyyy-MM-dd"));
+                        $("#HStopEmp").val(d.data[0].绂佺敤浜�);
+                        $("#HStopTime").val(d.data[0].绂佺敤鏃ユ湡 == null ? "" : Format(new Date(d.data[0].绂佺敤鏃ユ湡), "yyyy-MM-dd"));
+                        $("#HUseFlag").val(d.data[0].浣跨敤鏍囧織);
 
                         switch (d.data[0].鍒嗘瀽鏂规硶) {
                             case "瀹氭�у垎鏋�":
@@ -418,6 +542,29 @@
                 });
             }
 
+            //鑾峰彇缁勭粐
+            function Organ() {
+                //鑾峰彇鐧诲綍椤电粍缁囧垪
+                var Organization = '';
+                $.ajax({
+                    type: "get",
+                    url: GetWEBURL() + "/Web/GetOrganizations",
+                    async: false,
+                    success: function (result) {
+                        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"])
+                            $("#HCREATEORGID").val(sessionStorage["OrganizationID"])
+                            form.render('select');
+                        }
+                        layer.closeAll("loading");
+                    }
+                })
+            }
 
 
             //鐩戝惉鎻愪氦
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/Add_Edit_Gy_InspectInstruMent.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/Add_Edit_Gy_InspectInstruMent.html"
index c764bb7..155359a 100644
--- "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/Add_Edit_Gy_InspectInstruMent.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/Add_Edit_Gy_InspectInstruMent.html"
@@ -31,6 +31,7 @@
                                 <h1 style="text-align:center;"><b>妫�楠屼华鍣�</b></h1>
                                 <ul class="layui-tab-title" lay-filter="tab-all">
                                     <li lay-id="1" style="padding:1px;" class="layui-this">鍩烘湰淇℃伅</li>
+                                    <li>鍏朵粬淇℃伅</li>
                                     <li lay-id="2" style="padding:1px;">闄勪欢淇℃伅</li>
                                 </ul>
                                 <div class="layui-tab-content">
@@ -121,6 +122,65 @@
                                         </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="HModifyEmp" id="HModifyEmp" 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>
+                                            <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" value="" 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 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>
+                                        </div>
+                                    </div>
+
                                     <!--闄勪欢淇℃伅-->
                                     <div class="layui-tab-item">
                                         <div class="layui-form-item" style="padding-top: 10px;">
@@ -193,6 +253,20 @@
             //鍒ゆ柇鎿嶄綔绫诲瀷
             if (OperationType == 1) {//鏃犳簮鍗�
                 set_AddFNew();
+                $("#HMakeEmp").val(sessionStorage["HUserName"]);
+            }
+            else if (OperationType == 2) {
+                set_EditFromGrid();
+                $("#HMakeEmp").val(sessionStorage["HUserName"]);
+                $("#HModifyEmp").val("");
+                $("#HStopEmp").val("");
+                $("#HCheckEmp").val("");
+                $("#HMakeTime").val("");
+                $("#HModifyTime").val("");
+                $("#HStopTime").val("");
+                $("#HCheckTime").val("");
+                $("#HNumber").val("");
+                $("#HItemID").val(0);
             }
             else if (OperationType == 3) {//缂栬緫
                 set_EditFromGrid();
@@ -269,6 +343,10 @@
             //鍒濆鍖栫晫闈�
             function set_ClearBill() {
                 Organ();
+                $("#HStopflag").attr("disabled", true);
+                $("#HUseFlag").attr("disabled", true);
+                layui.form.render('checkbox');
+                layui.form.render('select');
             }
             //鏃犳簮鍗曟柊澧�
             function set_AddFNew() {
@@ -328,13 +406,23 @@
                             $("#HNumber").val(data.妫�楠屼华鍣ㄤ唬鐮�);//浠g爜
                             $("#HName").val(data.妫�楠屼华鍣ㄥ悕绉�);//鍚嶇О
                             $("#HHelpCode").val(data.鍔╄鐮�);//鍔╄鐮�
-                            $("#HUSEORGID").val(data.鍒涘缓缁勭粐);//浣跨敤缁勭粐                         
+                            $("#HUSEORGID").val(data.HUSEORGID);//浣跨敤缁勭粐
                             $("#HUseFlag ").val(data.浣跨敤鐘舵��);//浣跨敤鐘舵��
                             $("#HCalibrationDate").val(Format(new Date(data.鏍″噯鏃ユ湡), "yyyy-MM-dd"));//鏍″噯鏃ユ湡
                             $("#HValidDate").val(Format(new Date(data.鏈夋晥鏃ユ湡), "yyyy-MM-dd"));//鏈夋晥鏃ユ湡
                             $("#HCalibrationStatus").val(data.鏍″噯鐘舵��);//鏍″噯鐘舵��
                             $("#HExpiryDay").val(data.鍒版湡澶╂暟);//鍒版湡澶╂暟  
                             $("#HRemark").val(data.澶囨敞);//澶囨敞
+
+                            $("#HMakeEmp").val(data.鍒跺崟浜�);
+                            $("#HMakeTime").val(data.鍒涘缓鏃ユ湡 == null ? "" : Format(new Date(data.鍒涘缓鏃ユ湡), "yyyy-MM-dd"));
+                            $("#HCheckEmp").val(data.瀹℃牳浜�);
+                            $("#HCheckTime").val(data.瀹℃牳鏃ユ湡 == null ? "" : Format(new Date(data.瀹℃牳鏃ユ湡), "yyyy-MM-dd"));
+                            $("#HModifyEmp").val(data.淇敼浜�);
+                            $("#HModifyTime").val(data.淇敼鏃ユ湡 == null ? "" : Format(new Date(data.淇敼鏃ユ湡), "yyyy-MM-dd"));
+                            $("#HStopEmp").val(data.绂佺敤浜�);
+                            $("#HStopTime").val(data.绂佺敤鏃ユ湡 == null ? "" : Format(new Date(data.绂佺敤鏃ユ湡), "yyyy-MM-dd"));
+
                             $("input[name='HStopflag']").attr("checked", data.绂佺敤鏍囧織 == "鏄�" ? true : false);//true:閫変腑 false:涓嶉�変腑
                             layui.form.render();//瀹炴椂娓叉煋閫変腑鍜屼笉閫変腑鐨勬牱寮�,鏈�濂芥坊鍔犺繖鍙ヨ瘽
 
@@ -357,6 +445,7 @@
                 var Organization = '';
                 $.ajax({
                     type: "get",
+                    async: false,
                     url: GetWEBURL() + "/Web/GetOrganizations",
                     success: function (result) {
                         if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
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/Add_Edit_Gy_InspectValue.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/Add_Edit_Gy_InspectValue.html"
index 389629e..0b613dc 100644
--- "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/Add_Edit_Gy_InspectValue.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/Add_Edit_Gy_InspectValue.html"
@@ -8,6 +8,7 @@
     <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>
 </head>
 <body>
 
@@ -27,9 +28,13 @@
                         </div>
                         <div class="layui-card-body">
                             <div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
-                             
+                                <ul class="layui-tab-title" lay-filter="tab-all">
+                                    <li lay-id="1" style="padding:1px;" class="layui-this">鍩烘湰淇℃伅</li>
+                                    <li>鍏朵粬淇℃伅</li>
+                                </ul>
                                 <h1 style="text-align:center;"><b>妫�娴嬪��</b></h1>
                                 <div class="layui-tab-content">
+                                    <!--鍩烘湰淇℃伅-->
                                     <div class="layui-tab-item layui-show">
                                         <div class="layui-form-item">
                                             <div class="layui-inline">
@@ -86,6 +91,64 @@
                                             </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="HModifyEmp" id="HModifyEmp" 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>
+                                            <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" value="" 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 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>
+                                        </div>
+                                    </div>
                                 </div>
                             </div>
                         </div>
@@ -132,8 +195,20 @@
             //鍒ゆ柇鎿嶄綔绫诲瀷
             if (OperationType == 1) {//鏃犳簮鍗�
                 set_AddFNew();
-            }
-            else if (OperationType == 3) {//缂栬緫
+                $("#HMakeEmp").val(sessionStorage["HUserName"]);
+            } else if (OperationType == 2) {
+                set_EditFromGrid();
+                $("#HMakeEmp").val(sessionStorage["HUserName"]);
+                $("#HModifyEmp").val("");
+                $("#HStopEmp").val("");
+                $("#HCheckEmp").val("");
+                $("#HMakeTime").val("");
+                $("#HModifyTime").val("");
+                $("#HStopTime").val("");
+                $("#HCheckTime").val("");
+                $("#HNumber").val("");
+                $("#HItemID").val(0);
+            }else if (OperationType == 3) {//缂栬緫
                 set_EditFromGrid();
             }
             else {
@@ -204,6 +279,10 @@
             //鍒濆鍖栫晫闈�
             function set_ClearBill() {
                 Organ();
+                $("#HStopflag").attr("disabled", true);
+                $("#HUseFlag").attr("disabled", true);
+                layui.form.render('checkbox');
+                layui.form.render('select');
             }
             //鏃犳簮鍗曟柊澧�
             function set_AddFNew() {
@@ -221,6 +300,7 @@
                 $.ajax({
                     url: GetWEBURL() + "GetGy_InspectValueDetail",
                     type: "GET",
+                    async: false,
                     data: {
                         "HID": linterid
                     },
@@ -231,9 +311,19 @@
                             $("#HNumber").val(data.妫�娴嬪�间唬鐮�);//浠g爜
                             $("#HName").val(data.妫�娴嬪�煎悕绉�);//鍚嶇О
                             $("#HHelpCode").val(data.鍔╄鐮�);//鍔╄鐮�
-                            $("#HUSEORGID").val(data.鍒涘缓缁勭粐);//浣跨敤缁勭粐
+                            $("#HUSEORGID").val(data.HUSEORGID);//浣跨敤缁勭粐
                             $("#HUseFlag ").val(data.浣跨敤鐘舵��);//浣跨敤鐘舵��
                             $("#HRemark").val(data.澶囨敞);//澶囨敞
+
+                            $("#HMakeEmp").val(data.鍒跺崟浜�);
+                            $("#HMakeTime").val(data.鍒涘缓鏃ユ湡 == null ? "" : Format(new Date(data.鍒涘缓鏃ユ湡), "yyyy-MM-dd"));
+                            $("#HCheckEmp").val(data.瀹℃牳浜�);
+                            $("#HCheckTime").val(data.瀹℃牳鏃ユ湡 == null ? "" : Format(new Date(data.瀹℃牳鏃ユ湡), "yyyy-MM-dd"));
+                            $("#HModifyEmp").val(data.淇敼浜�);
+                            $("#HModifyTime").val(data.淇敼鏃ユ湡 == null ? "" : Format(new Date(data.淇敼鏃ユ湡), "yyyy-MM-dd"));
+                            $("#HStopEmp").val(data.绂佺敤浜�);
+                            $("#HStopTime").val(data.绂佺敤鏃ユ湡 == null ? "" : Format(new Date(data.绂佺敤鏃ユ湡), "yyyy-MM-dd"));
+
                             $("input[name='HStopflag']").attr("checked", data.绂佺敤鏍囧織 == "鏄�" ? true : false);//true:閫変腑 false:涓嶉�変腑
                             layui.form.render();//瀹炴椂娓叉煋閫変腑鍜屼笉閫変腑鐨勬牱寮�,鏈�濂芥坊鍔犺繖鍙ヨ瘽
 
@@ -257,6 +347,7 @@
                 var Organization = '';
                 $.ajax({
                     type: "get",
+                    async: false,
                     url: GetWEBURL() + "/Web/GetOrganizations",
                     success: function (result) {
                         if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
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/Add_Edit_Gy_QCCheckClass.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/Add_Edit_Gy_QCCheckClass.html"
index 1ff5021..b1aa636 100644
--- "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/Add_Edit_Gy_QCCheckClass.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/Add_Edit_Gy_QCCheckClass.html"
@@ -8,6 +8,7 @@
     <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>
     <style type="text/css">
         .layui-form-label {
             width: 85px;
@@ -23,17 +24,18 @@
                     <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="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</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" lay-filter="tab-all">
+                                    <li lay-id="1" style="padding:1px;" class="layui-this">鍩烘湰淇℃伅</li>
+                                    <li>鍏朵粬淇℃伅</li>
+                                </ul>
                                 <div class="layui-tab-content">
+                                    <!--鍩烘湰淇℃伅-->
                                     <div class="layui-tab-item layui-show">
                                         <div class="layui-form-item">
                                             <div class="layui-inline">
@@ -57,26 +59,108 @@
                                                 </div>
                                             </div>
                                             <!--<div class="layui-inline">
-                                                <label class="layui-form-label">妫�楠岄」鐩被鍒被鍒�</label>
-                                                <div class="layui-input-inline">
-                                                    <input type="text" name="HQCCheckClassName" id="HQCCheckClassName" class="layui-input" value="0" style="float:left;width:150px;">
-                                                    <input type="hidden" name="HQCCheckClassID" id="HQCCheckClassID" class="layui-input" value="0" style="float:left;width:150px;">
-                                                    <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="HQCCheckClassList" style="width:40px;">
-                                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
-                                                    </button>
+            <label class="layui-form-label">妫�楠岄」鐩被鍒被鍒�</label>
+            <div class="layui-input-inline">
+                <input type="text" name="HQCCheckClassName" id="HQCCheckClassName" class="layui-input" value="0" style="float:left;width:150px;">
+                <input type="hidden" name="HQCCheckClassID" id="HQCCheckClassID" class="layui-input" value="0" style="float:left;width:150px;">
+                <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="HQCCheckClassList" style="width:40px;">
+                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                </button>
+            </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; width: 185px;">
+                                                    <input type="hidden" class="layui-input" lay-verify="HCREATEORGID" name="HCREATEORGID" id="HCREATEORGID">
+                                                    <select name="HUSEORGID" id="HUSEORGID" lay-verify="HUSEORGID">
+                                                        <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+                                                    </select>
                                                 </div>
-                                            </div>-->
+                                            </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label" style="width: 85px;">浣跨敤鏍囧織</label>
+                                                <div class="layui-input-block" style="margin-left: 130px; width: 190px;">
+                                                    <select name="HUseFlag" id="HUseFlag" lay-verify="HUseFlag">
+                                                        <option value="鏈娇鐢�" selected="selected">鏈娇鐢�</option>
+                                                        <option value="宸蹭娇鐢�">宸蹭娇鐢�</option>
+                                                        <option value="鏈娴�">鏈娴�</option>
+                                                    </select>
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="layui-row">
                                             <div class="layui-inline">
                                                 <label class="layui-form-label">澶囨敞</label>
                                                 <div class="layui-input-inline">
                                                     <textarea placeholder="璇疯緭鍏ョ淮澶囨敞" class="layui-textarea" name="HRemark" id="HRemark"></textarea>
                                                 </div>
                                             </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">绂佺敤鏍囧織</label>
+                                                <div class="layui-input-block">
+                                                    <input type="checkbox" name="HStopflag" id="HStopflag" lay-skin="primary" title="">
+                                                </div>
+                                            </div>
                                         </div>
+                                    </div>
+                                    <!--鍏朵粬淇℃伅-->
+                                    <div class="layui-tab-item">
                                         <div class="layui-form-item">
-                                            <label class="layui-form-label">绂佺敤鏍囧織</label>
-                                            <div class="layui-input-block">
-                                                <input type="checkbox" name="HStopflag" id="HStopflag" lay-skin="primary" title="" checked="">
+                                            <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="HModifyEmp" id="HModifyEmp" 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>
+                                            <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="HModifyTime" id="HModifyTime" 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>
                                         </div>
                                     </div>
@@ -109,7 +193,7 @@
 
         var params = getUrlVars();
         var hID = params[params[0]];//缂栬緫鏌ョ湅
-        var HType = params[params[1]];    //鍗曟嵁鐘舵��
+        var OperationType = params[params[1]];    //鍗曟嵁鐘舵��
         var TagParentId = params[params[2]];  //鐖剁骇ID
 
         layui.config({
@@ -126,6 +210,34 @@
                 , element = layui.element;
 
             //甯歌鐢ㄦ硶
+            Organ();
+            $("#HStopflag").attr("disabled", true);
+            $("#HUseFlag").attr("disabled", true);
+            layui.form.render('checkbox');
+
+
+            if (OperationType == 1) {   //鏂板
+                hID = 0;
+                $("#HMakeEmp").val(sessionStorage["HUserName"]);
+
+            } else if (OperationType == 2) {
+                RoadBillMain(hID);
+                $("#HMakeEmp").val(sessionStorage["HUserName"]);
+                $("#HModifyEmp").val("");
+                $("#HStopEmp").val("");
+                $("#HCheckEmp").val("");
+                $("#HMakeTime").val("");
+                $("#HModifyTime").val("");
+                $("#HStopTime").val("");
+                $("#HCheckTime").val("");
+                $("#HNumber").val("");
+                $("#HItemID").val(0);
+                hID = 0;
+            } else if (OperationType == 3) {
+                RoadBillMain(hID);
+
+            }
+
 
             //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
             //if (sessionStorage.login != "login") {
@@ -158,7 +270,7 @@
 
                 var oMain = JSON.stringify(data.field)
                 var sMainSub = oMain + ';' + hID + ';' + user + ';' + ModRightNameAdd;
-                if (HType == "Modify") {
+                if (OperationType == "3") {
 
                     $.ajax(
                         {
@@ -231,13 +343,37 @@
 
             }
 
-            if (HType == "Modify") {
+            //鑾峰彇缁勭粐
+            function Organ() {
+                //鑾峰彇鐧诲綍椤电粍缁囧垪
+                var Organization = '';
+                $.ajax({
+                    type: "get",
+                    url: GetWEBURL() + "/Web/GetOrganizations",
+                    async: false,
+                    success: function (result) {
+                        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"])
+                            $("#HCREATEORGID").val(sessionStorage["OrganizationID"])
+                            form.render('select');
+                        }
+                        layer.closeAll("loading");
+                    }
+                })
+            }
+
+            function RoadBillMain(linterid) {
                 $.ajax({
                     url: GetWEBURL() + "/Gy_QCCheckClass/xg",
-                    //url: "http://localhost:12761/Gy_Department/xg",
                     type: "GET",
+                    async: false,
                     data: {
-                        "HInterID": hID
+                        "HInterID": linterid
                     },
                     success: function (d) {
                         console.log(d);
@@ -248,6 +384,18 @@
                         $("#HQCCheckClassID").val(d.data[0].HQCCheckClassID);
                         $("#HQCCheckClassName").val(d.data[0].HQCCheckClassName);
                         $("#HRemark").val(d.data[0].HRemark);
+
+                        $("#HUSEORGID").val(d.data[0].HUSEORGID);
+                        $("#HMakeEmp").val(d.data[0].HMakeEmp);
+                        $("#HMakeTime").val(d.data[0].HMakeTime == null ? "" : Format(new Date(d.data[0].HMakeTime), "yyyy-MM-dd"));
+                        $("#HCheckEmp").val(d.data[0].HCheckEmp);
+                        $("#HCheckTime").val(d.data[0].HCheckTime == null ? "" : Format(new Date(d.data[0].HCheckTime), "yyyy-MM-dd"));
+                        $("#HModifyEmp").val(d.data[0].HModifyEmp);
+                        $("#HModifyTime").val(d.data[0].HModifyTime == null ? "" : Format(new Date(d.data[0].HModifyTime), "yyyy-MM-dd"));
+                        $("#HStopEmp").val(d.data[0].HStopEmp);
+                        $("#HStopTime").val(d.data[0].HStopTime == null ? "" : Format(new Date(d.data[0].HStopTime), "yyyy-MM-dd"));
+                        $("#HUseFlag").val(d.data[0].HUseFlag);
+
                         $("input[name='HStopflag']").prop("checked", d.data[0].HStopflag);//true:閫変腑 false:涓嶉�変腑
                         layui.form.render();//瀹炴椂娓叉煋閫変腑鍜屼笉閫変腑鐨勬牱寮�,鏈�濂芥坊鍔犺繖鍙ヨ瘽
                         $("#HUpDater").val(sessionStorage["HUserName"]);//淇敼浜�
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/Add_Edit_Gy_Warehouse.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/Add_Edit_Gy_Warehouse.html"
index f36ce38..75b9a13 100644
--- "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/Add_Edit_Gy_Warehouse.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/Add_Edit_Gy_Warehouse.html"
@@ -80,6 +80,15 @@
                                                 <input type="text" name="HPhone" id="HPhone" lay-verify="HPhone" autocomplete="off" placeholder="" class="layui-input">
                                             </div>
                                         </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">浠撳簱绫诲瀷</label>
+                                            <div class="layui-input-inline">
+                                                <select name="HWarehouseType" id="HWarehouseType" lay-verify="required" >
+                                                    <option value="鐢熶骇浠撳簱" selected="selected">鐢熶骇浠撳簱</option>
+                                                    <option value="妯″叿浠撳簱">妯″叿浠撳簱</option>
+                                                </select>
+                                            </div>
+                                        </div>
                                     </div>
                                     <div class="layui-row">
 
@@ -366,7 +375,7 @@
                                 , "HStockCtrlFlag": data.璐熷簱瀛樻帶鍒舵爣璁�
                                 , "HSPFlag": data.鍚敤浠撲綅 == "Y" ? 1 : 0
                                 , "HRemark": data.HRemark
-                                , "HRemark": data.HRemark
+                                , "HWarehouseType": data.浠撳簱绫诲瀷
                                 //, "HItemID": data.鏉$爜缂栧彿
                                 , "HBarCode": data.HBarCode
                                 , "HUSEORGID": data.HUSEORGID
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_CheckItem.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_CheckItem.html"
index 81510a5..b28e0a5 100644
--- "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_CheckItem.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_CheckItem.html"
@@ -15,6 +15,11 @@
     <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
     <script src="../../../layuiadmin/layui/lay/modules/util.js"></script>
     <script src="../../../layuiadmin/soulTable.slim.js"></script>
+    <script src="../../../layuiadmin/HideButton_New.js"></script>
+    <script src="../../../layuiadmin/SetColumn.js"></script>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
+    <script src="../../../layuiadmin/layui/zgqlayui.js"></script>
+    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
     <style media="screen">
         .custom-tree-item-clicked {
             color: #FC9003
@@ -55,6 +60,14 @@
                                         <input type="text" class="layui-input ForFilteringSchemes" name="HName" id="HName">
                                     </div>
                                 </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label" style="width: 85px;">缁勭粐</label>
+                                    <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
+                                        <select name="HUSEORGID" id="HUSEORGID" class="ForFilteringSchemes" lay-verify="HUSEORGID">
+                                            <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+                                        </select>
+                                    </div>
+                                </div>
                                 <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
                                     <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                 </button>
@@ -91,24 +104,82 @@
                                             <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent">
                                         </div>
                                     </div>
-                                    <div class="layui-row layui-form-item">
-
+                                    <div class="layui-row" style="margin-top:5px">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">杩囨护</label>
+                                            <div class="layui-input-block">
+                                                <select name="ColName1" id="ColName1" lay-filter="ColName1" style="width:190px;" class="ForFilteringSchemes">
+                                                </select>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <select name="Comparator1" id="Comparator1" lay-filter="Comparator1" 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="ColContent1" id="ColContent1">
+                                        </div>
+                                    </div>
+                                    <div class="layui-row" style="margin-top:5px">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">杩囨护</label>
+                                            <div class="layui-input-block">
+                                                <select name="ColName2" id="ColName2" lay-filter="ColName2" style="width:190px;" class="ForFilteringSchemes">
+                                                </select>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <select name="Comparator2" id="Comparator2" lay-filter="Comparator2" 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="ColContent2" id="ColContent2">
+                                        </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" lay-submit="" class="layui-btn layui-btn-sm" lay-filter="btnAdd"><i class="layui-icon layui-icon-add-1"></i>鏂板</button>
-                                <button type="button" lay-submit="" class="layui-btn layui-btn-sm" lay-filter="btnModify"><i class="layui-icon layui-icon-edit"></i>淇敼</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_SouceExcel"><i class="layui-icon layui-icon-delete"></i>瀵煎叆</button>
-                                <button type="button" lay-submit="" class="layui-btn layui-btn-sm" lay-filter="btndelete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit" id="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>瀹℃牳</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit" id="btn-Audit"><i class="layui-icon layui-icon-radio"></i>鍙嶅鏍�</button>
+                            <div class="layui-btn-container" id="toolbarDemo_ButtonSet">
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_SouceExcel" id="set_SouceExcel"><i class="layui-icon layui-icon-delete"></i>瀵煎叆</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Export" id="btn_Export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btnAdd" id="btnAdd"><i class="layui-icon layui-icon-add-1"></i>鏂板</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Copy" id="btn_Copy"><i class="layui-icon layui-icon-add-1"></i>澶嶅埗</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btnModify" id="btnModify"><i class="layui-icon layui-icon-edit"></i>淇敼</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btndelete" id="btndelete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_CheckBill" id="set_CheckBill"><i class="layui-icon layui-icon-circle"></i>瀹℃牳</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AbandonCheck" id="set_AbandonCheck"><i class="layui-icon layui-icon-radio"></i>鍙嶅鏍�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Stop" id="btn-Stop"><i class="layui-icon layui-icon-radio"></i>绂佺敤</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeStop" id="btn-DeStop"><i class="layui-icon layui-icon-radio"></i>鍙嶇鐢�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn" id="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideButton" id="set_HideButton"><i class="layui-icon layui-icon-form"></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="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh" id="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit" id="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
                             </div>
                         </script>
                     </form>
@@ -117,8 +188,7 @@
         </div>
     </div>
 
-    <script src="../../../layuiadmin/layui/zgqlayui.js"></script>
-    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+
 
     <script>
         var treeCkData = { id: 0 };
@@ -146,6 +216,9 @@
             var option = [];
             let that = this;
             var HModName = "Gy_CheckItem";
+            var HBillType = "Gy_CheckItem";
+            var ins;                //鐢ㄤ簬瀵煎嚭excel
+            var set_HideButton_ID = "toolbarDemo_ButtonSet";                    //闇�瑕佽缃殑鎸夐挳鐨勭埗绾ц妭鐐圭殑id
             var HQCCheckNum = [];
             //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
             var titleData = ["HItemID","ParentID"];
@@ -221,23 +294,49 @@
             //#endregion
 
             //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
-            //澶村伐鍏锋爮浜嬩欢
+
             table.on('toolbar(mainTable)', function (obj) {
-                var checkStatus = table.checkStatus(obj.config.id);
                 switch (obj.event) {
-                    //鍒楄缃�
-                    case 'set_HideColumn': get_HideColumn();
+                    //鏂板
+                    case 'btnAdd': set_AddNew();
                         break;
-                    //瀹℃牳鎸夐挳
-                    case 'btn-Audit':
-                        set_CheckBill(0);
+                    //缂栬緫
+                    case 'btnModify': set_ShowBill();
+                        break;
+                    //鍒犻櫎
+                    case 'btndelete': set_DeleteBill();
                         break;
                     //瀵煎叆
-                    case 'set_SouceExcel': set_SouceExcel();
+                    case 'btnExcel': set_SouceExcel();
+                        break;
+                    //瀵煎嚭鎸夐挳
+                    case 'btn_Export': btn_Export();
+                        break;
+                    //鍒锋柊
+                    case 'get_Refresh': get_Refresh();
+                        break;
+                    //澶嶅埗
+                    case 'btn_Copy':
+                        set_copy();
+                        break;
+                    //瀹℃牳鎸夐挳
+                    case 'set_CheckBill':
+                        set_CheckBill(1);
                         break;
                     //鍙嶅鏍告寜閽�
-                    case 'btn-DeAudit':
-                        set_CheckBill(1);
+                    case 'set_AbandonCheck':
+                        set_CheckBill(2);
+                        break;
+                    //绂佺敤鎸夐挳
+                    case 'btn-Stop':
+                        set_De_Stop(0);
+                        break;
+                    //鍙嶇鐢ㄦ寜閽�
+                    case 'btn-DeStop':
+                        set_De_Stop(1);
+                        break;
+                    //閫�鍑烘寜閽�
+                    case 'get_Exit': Pub_Close(2);
                         break;
                     //淇濆瓨鏂规
                     case 'set_SaveScheme': set_SaveScheme();
@@ -245,29 +344,15 @@
                     //璇诲彇鏂规
                     case 'set_ReadScheme': set_ReadScheme();
                         break;
+                    //鍒楄缃�
+                    case 'set_HideColumn': get_HideColumnNoPage(HModName, sessionStorage["HUserName"], option, get_FastQuery);
+                        break;
+                    //鎸夐挳璁剧疆
+                    case 'set_HideButton':
+                        get_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
+                        break;
                 };
             });
-
-            //#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
 
             //浠g爜鍥炶溅鏂规硶
             $('#HNumber').on('keydown', function (event) {
@@ -286,6 +371,7 @@
 
             // 鍒濆鍖栫晫闈�
             function set_ClearBill() {
+                set_StockOrg();
                 //鍒濆鍖栬〃鏍�
                 set_InitGrid();
                 //鏌ヨ
@@ -381,15 +467,18 @@
                                     soulTable.render(this);
                                 }
                             }
+                            ins = table.render(option);
+                            //鍒锋柊琛ㄦ牸鏁版嵁
+                            DisPlay_HideColumn(HModName, sessionStorage["HUserName"], option, titleData);
                             table.render(option);
 
-                            //鍒锋柊琛ㄦ牸鏁版嵁
-                            DisPlay_HideColumn();
-
                             layer.close(ajaxLoad);
-                            if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+
+                            if ($("#ColName option").length < 1) {
                                 ColFilter();
                             }
+
+                            Display_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
                             //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
                         } else {
                             layer.close(ajaxLoad);
@@ -407,9 +496,17 @@
             function get_FastQuery() {
                 var HNumber = $("#HNumber").val();
                 var HName = $("#HName").val();
+                var HUSEORGID = $("#HUSEORGID").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 = "";
@@ -432,6 +529,48 @@
                     }
                     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 (HQCCheckNum.length > 0) {
                     sWhere += " and HItemID in (" + HQCCheckNum.toString() + ")";
@@ -442,12 +581,19 @@
                 if (HName) {
                     sWhere += " and 鍚嶇О like '%" + HName + "%'";
                 }
+                if (HUSEORGID) {
+                    sWhere += " and 浣跨敤缁勭粐鍚嶇О = '" + HUSEORGID + "'";
+                }
                 get_Display(sWhere);
                 sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
             }
 
-            //鏂板
-            form.on('submit(btnAdd)', function (obj) {
+            ////鏂板
+            //form.on('submit(btnAdd)', function (obj) {
+            //    set_AddNew();
+            //})
+
+            function set_AddNew() {
                 //椤甸潰灞�-鑷畾涔�
                 layer.open({
                     type: 2,
@@ -457,7 +603,7 @@
                     shift: 2,
                     area: ['100%', '100%'],
                     maxmin: true,
-                    content: ['../鍏敤鍩虹璧勬枡/Add_Edit_Gy_CheckItem.html?hID=' + TagId + '&Level=' + Level+''],
+                    content: ['../鍏敤鍩虹璧勬枡/Add_Edit_Gy_CheckItem.html?hID=' + TagId + '&HType=1&TagParentId=' + Level + ''],
                     end: function () {
                         //鍒锋柊椤甸潰,
                         location.reload();
@@ -467,10 +613,9 @@
                     }
                 });
                 return false;//杩欓噷鍔犱釜return false;灏变笉浼氫袱娆℃彁浜�
-            })
+            }
 
-            //鍒犻櫎
-            form.on('submit(btndelete)', function (obj) {
+            function set_DeleteBill() {
                 var ModRightNameDelete = 'Gy_QCCheckItem_Delete'
                 if (TagId != "") {
                     layer.confirm('鎮ㄧ‘瀹氳鍒犻櫎鍚楋紵', {
@@ -544,35 +689,20 @@
                         layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
                     }
                 }
-            });
-
-
-
-
-            //鏌ヨ鎸夐挳
-            form.on('submit(btnSearch)', function (data) {
-                get_FastQuery();
-            });
-            // 閲嶇疆鎸夐挳
-            form.on('submit(btnReSearch)', function (data) {
-                set_ClearQuery();
-            });
-
-            //閲嶇疆蹇�熸煡璇�
-            function set_ClearQuery() {
-                $("#HNumber").val("");
-                $("#HName").val("");
-                $("#btnSearch").click();
-                $("#ColContent").val("");
-                $("#ColName").val("0");
-                $("#Comparator").val("0");
-                form.render('select');
-
-                sWhere = "";
             }
 
-            //淇敼鎸夐挳
-            form.on('submit(btnModify)', function (data) {
+            ////鍒犻櫎
+            //form.on('submit(btndelete)', function (obj) {
+             
+            //});
+
+            //#region 瀵煎嚭Execel
+            function btn_Export() {
+                table.exportFile(ins.config.id, option.data, "xls");
+            }
+            //#endregion
+
+            function set_ShowBill() {
                 if (TagId != "") {
                     layer.open({
                         type: 2
@@ -582,7 +712,7 @@
                         , shade: 0.6 //閬僵閫忔槑搴�
                         , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
                         , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                        , content: ['../鍏敤鍩虹璧勬枡/Add_Edit_Gy_CheckItem.html?hID=' + TagId + '&HType=Modify&TagParentId=' + TagParentId + '', 'yes']
+                        , content: ['../鍏敤鍩虹璧勬枡/Add_Edit_Gy_CheckItem.html?hID=' + TagId + '&HType=3&TagParentId=' + TagParentId + '', 'yes']
                         , resize: false,
                         end: function () {
                             //鍒锋柊椤甸潰,
@@ -608,7 +738,7 @@
                             , shade: 0.6 //閬僵閫忔槑搴�
                             , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
                             , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                            , content: ['../鍏敤鍩虹璧勬枡/Add_Edit_Gy_CheckItem.html?hID=' + hID + '&HType=Modify&TagParentId=' + TagParentId + '', 'yes']
+                            , content: ['../鍏敤鍩虹璧勬枡/Add_Edit_Gy_CheckItem.html?hID=' + hID + '&HType=3&TagParentId=' + TagParentId + '', 'yes']
 
                             , resize: false,
                             end: function () {
@@ -624,7 +754,45 @@
                         layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
                     }
                 }
+            }
+
+            //鍒锋柊
+            function get_Refresh() {
+                $("#btnSearch").click();
+            }
+            //鏌ヨ鎸夐挳
+            form.on('submit(btnSearch)', function (data) {
+                get_FastQuery();
             });
+            // 閲嶇疆鎸夐挳
+            form.on('submit(btnReSearch)', function (data) {
+                set_ClearQuery();
+            });
+
+            //閲嶇疆蹇�熸煡璇�
+            function set_ClearQuery() {
+                $("#HNumber").val("");
+                $("#HName").val("");
+                $("#btnSearch").click();
+                $("#ColContent").val("");
+                $("#ColName").val("0");
+                $("#Comparator").val("0");
+                $("#ColContent2").val("");
+                $("#ColName2").val("0");
+                $("#Comparator2").val("0");
+                $("#ColContent1").val("");
+                $("#ColName1").val("0");
+                $("#Comparator1").val("0");
+                $("#HUSEORGID").val(sessionStorage["Organization"]);
+                form.render('select');
+
+                sWhere = "";
+            }
+
+            ////淇敼鎸夐挳
+            //form.on('submit(btnModify)', function (data) {
+              
+            //});
 
             //#region 鐐瑰嚮琛岄�変腑楂樹寒
             table.on('row(mainTable)', function (obj) {
@@ -645,6 +813,67 @@
                     }
                 });
             })
+            //#endregion
+
+            //澶嶅埗
+            function set_copy() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var HInterID = data[0].HItemID.toString();
+                    layer.open({
+                        type: 2
+                        , area: ['100%', '100%']
+                        , title: '缂栬緫妫�楠岄」鐩�'
+                        , shade: 0.6 //閬僵閫忔槑搴�
+                        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                        , content: '../鍏敤鍩虹璧勬枡/Add_Edit_Gy_CheckItem.html?hID=' + HInterID + '&HType=2&TagParentId=' + TagParentId + ''
+                        , resize: false
+                        , cancel: function () {
+
+                        }
+                    })
+
+                } else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+                }
+            }
+
+            //#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_QCCheckItem/StopGy_QCCheckItem", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        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 鍙嶅鏍�/瀹℃牳鏁版嵁
@@ -694,124 +923,6 @@
                 })
             }
 
-            //#region 闅愯棌鍒楄缃�
-            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 鏄剧ず鍒楁暟鎹�
-            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 = ["鍗曟嵁ID", "HMouldID", "hsubid", "HManagerID", "婧愬崟涓诲唴鐮�", "婧愬崟瀛愬唴鐮�"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
-
-                            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 (dataCols[3] > 0) {
-                                    option.cols[0][i + 1]["width"] = dataCols[3];
-                                }
-                                //璁剧疆鍐呭瀛椾綋澶у皬
-                                if (data1.data[0].HFontSize != 0) {
-                                    option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
-                                } else {
-                                    option.cols[0][i + 1]["style"] = "font-size:100%";
-                                }
-                                //璁剧疆鍒楀
-                                //if (data1.data[0].HColumnWidth != 0) {
-                                //    option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
-                                //} else {
-                                //    option.cols[0][i + 1]["width"] = "";
-                                //}
-                                //鏄剧ず鍒�
-                                if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
-                                    option.cols[0][i + 1]["hide"] = false;
-                                }
-                                //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
-                                switch (dataCols[2]) {
-                                    case "L":
-                                        option.cols[0][i + 1]["align"] = "left";
-                                        break;
-                                    case "M":
-                                        option.cols[0][i + 1]["align"] = "center";
-                                        break;
-                                    case "R":
-                                        option.cols[0][i + 1]["align"] = "right";
-                                        break;
-                                }
-                            }
-
-                            //鍙栨秷鍐荤粨鍒�
-                            for (var i = 1; i < option.cols[0].length - 1; i++) {
-                                if (option.cols[0][i]["fixed"] != null) {
-                                    option.cols[0][i]["fixed"] = null;
-                                }
-                                else {
-                                    break;
-                                }
-                            }
-                            //鍐荤粨鍒�
-                            if (data1.data[0].HFixCols != 0) {
-                                for (var i = 0; i < data1.data[0].HFixCols; i++) {
-                                    if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
-                                        data1.data[0].HFixCols += 1;
-                                    }
-                                    option.cols[0][i + 1]["fixed"] = "left";
-                                }
-                            }
-                            table.render(option);
-                        } else {
-                            table.render(option);
-                        }
-                    }, error: function () {
-                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
-                    }
-                })
-            }
-            //#endregion
-
             //#region 鍒楁槑鏄剧ず涓嬫媺妗�
             function ColFilter() {
                 var Organization = '<option  value="0" selected="selected" ></option>';
@@ -822,10 +933,41 @@
                 }
                 $("#ColName").empty();
                 $("#ColName").append(Organization);
+                $("#ColName1").empty();
+                $("#ColName1").append(Organization);
+                $("#ColName2").empty();
+                $("#ColName2").append(Organization);
                 form.render('select');
             }
             //#endregion
 
+
+            //#region   鑾峰彇缁勭粐
+            function set_StockOrg() {
+                //鑾峰彇鐧诲綍椤电粍缁囧垪
+                $.ajax({
+                    type: "GET",
+                    url: GetWEBURL() + "/Web/GetOrganizations",
+                    async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                    success: function (result) {
+                        var Organization = "";
+                        Organization += '<option  style="color:blue;" value="">鍏ㄩ儴</option>';
+                        if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            var data = result.data;
+                            for (var i = 0; i < data.length; i++) {
+                                Organization += '<option  style="color:blue;" value="' + data[i].Name + '">' + data[i].Name + '</option>';
+                            }
+                            $("#HUSEORGID").append(Organization);
+                            $("#HUSEORGID").val(sessionStorage["Organization"])
+                            form.render('select');
+                        }
+                        layer.closeAll("loading");
+                    },
+                    complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
+                })
+            }
+            //#endregion
+
             //laydate.render({
             //    elem: '#HDate'
             //    , type: 'datetime'
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_EmployeeList.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_EmployeeList.html"
index 66af211..b50f1a6 100644
--- "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_EmployeeList.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_EmployeeList.html"
@@ -11,6 +11,8 @@
     <script src="../../../layuiadmin/layui/layui.js"></script>
     <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
     <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../../layuiadmin/HideButton_New.js"></script>
+    <script src="../../../layuiadmin/SetColumn.js"></script>
     <!--<script src="../../../layuiadmin/layui/zgqlayui.js"></script>-->
 
 </head>
@@ -83,27 +85,82 @@
                                             <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent">
                                         </div>
                                     </div>
+                                    <div class="layui-row" style="margin-top:5px">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">杩囨护</label>
+                                            <div class="layui-input-block">
+                                                <select name="ColName1" id="ColName1" lay-filter="ColName1" style="width:190px;" class="ForFilteringSchemes">
+                                                </select>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <select name="Comparator1" id="Comparator1" lay-filter="Comparator1" 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="ColContent1" id="ColContent1">
+                                        </div>
+                                    </div>
+                                    <div class="layui-row" style="margin-top:5px">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">杩囨护</label>
+                                            <div class="layui-input-block">
+                                                <select name="ColName2" id="ColName2" lay-filter="ColName2" style="width:190px;" class="ForFilteringSchemes">
+                                                </select>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <select name="Comparator2" id="Comparator2" lay-filter="Comparator2" 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="ColContent2" id="ColContent2">
+                                        </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"><i class="layui-icon layui-icon-add-1"></i>鏂板</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Refresh" id="Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-form"></i>鍒犻櫎</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Stop"><i class="layui-icon layui-icon-radio"></i>绂佺敤</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeStop"><i class="layui-icon layui-icon-radio"></i>鍙嶇鐢�</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Print"><i class="layui-icon layui-icon-circle"></i>棰勮</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_Print"><i class="layui-icon layui-icon-print"></i>鎵撳嵃</button>
+                            <div class="layui-btn-container" id="toolbarDemo_ButtonSet">
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="get_export" id="get_export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add" id="btn-Add"><i class="layui-icon layui-icon-add-1"></i>鏂板</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit" id="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete" id="btn-Delete"><i class="layui-icon layui-icon-form"></i>鍒犻櫎</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit" id="btn-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit" id="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Stop" id="btn-Stop"><i class="layui-icon layui-icon-radio"></i>绂佺敤</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeStop" id="btn-DeStop"><i class="layui-icon layui-icon-radio"></i>鍙嶇鐢�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn" id="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideButton" id="set_HideButton"><i class="layui-icon layui-icon-form"></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-circle"></i>閫�鍑�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Refresh" id="btn_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Close" id="btn-Close"><i class="layui-icon layui-icon-circle"></i>閫�鍑�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Print" id="btn-Print"><i class="layui-icon layui-icon-circle"></i>棰勮</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_Print" id="set_Print"><i class="layui-icon layui-icon-print"></i>鎵撳嵃</button>
                             </div>
                         </script>
                     </form>
@@ -132,6 +189,8 @@
             var option = [];
             var Organization = sessionStorage["Organization"]
             var HModName = "Gy_EmployeeList";
+            var HBillType = "Gy_EmployeeList";
+            var set_HideButton_ID = "toolbarDemo_ButtonSet";
             //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
             var titleData = ["HItemID", "HDeptID", "HGroupID"];
 
@@ -223,7 +282,11 @@
                         parent.layui.admin.events.closeThisTabs();
                         break;
                     //鍒楄缃�
-                    case 'set_HideColumn': get_HideColumn();
+                    case 'set_HideColumn': get_HideColumnNoPage(HModName, sessionStorage["HUserName"], option, get_FastQuery);
+                        break;
+                    //鎸夐挳璁剧疆
+                    case 'set_HideButton':
+                        get_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
                         break;
                 };
             });
@@ -331,6 +394,12 @@
                 $("#ColContent").val("");
                 $("#ColName").val("0");
                 $("#Comparator").val("0");
+                $("#ColContent2").val("");
+                $("#ColName2").val("0");
+                $("#Comparator2").val("0");
+                $("#ColContent1").val("");
+                $("#ColName1").val("0");
+                $("#Comparator1").val("0");
                 form.render('select');
 
                 sWhere = "";
@@ -358,6 +427,13 @@
                 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) {
@@ -379,13 +455,55 @@
                     }
                     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 鑱屽憳浠g爜 like '%" + HNumber + "%'";
                 }
                 if (HName) {
                     sWhere += " and 鑱屽憳鍚嶇О like '%" + HName + "%'";
                 }
-                var index = layer.load(0);
 
                 //鏍规嵁椤甸潰鐨勬墦寮�鏂瑰紡锛屽垽鏂繃婊ゆ潯浠舵槸鍚﹂渶瑕佽繘琛岄澶栫殑娣诲姞
                 addSWhereByOpenType();
@@ -476,16 +594,16 @@
                                 , limit: 50
                                 , cellMinWidth: 90
                             }
-                            ins = table.render(option);
-
                             //鍒锋柊琛ㄦ牸鏁版嵁
-                            DisPlay_HideColumn();
-
+                            DisPlay_HideColumn(HModName, sessionStorage["HUserName"], option, titleData);
+                            ins = table.render(option);
+                         
                             layer.close(ajaxLoad);
                             if ($("#ColName option").length < 1) {
                                 ColFilter();
                                 get_DefaultModule();//鍔犺浇鏂规
                             }
+                            Display_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
                             //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
                         } else {
                             layer.close(ajaxLoad);
@@ -792,134 +910,6 @@
                 }
             }
 
-            //#region 闅愯棌鍒楄缃�
-            function get_HideColumn() {
-                var colName = "";
-                var contentUrl = "";
-                for (var i = 1; i < option.cols[0].length - 1; i++) {
-                    colName += option.cols[0][i]["field"] + ",";
-                }
-                var urlStr = window.document.location.pathname;//鑾峰彇鏂囦欢璺緞
-                var urlLen = urlStr.split('/');
-                for (var i = 0; i < urlLen.length - 4; i++) {
-                    contentUrl += "../";
-                }
-                colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
-
-                contentUrl += '鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName;
-
-                layer.open({
-                    type: 2
-                    , skin: "layui-layer-rim" //鍔犱笂杈规
-                    , title: "闅愯棌鍒楄缃�"  //鏍囬
-                    , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
-                    , shift: 2 //寮瑰嚭鍔ㄧ敾
-                    , area: ["50%", "90%"] //绐椾綋澶у皬
-                    , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
-                    , content: [contentUrl, "yes"]
-                    , btn: ["纭畾", "鍙栨秷"]
-                    , btn1: function (index, laero) {
-                        //鍒锋柊琛ㄦ牸鏁版嵁
-                        DisPlay_HideColumn();
-                        //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
-                        layer.close(index);//鍏抽棴寮圭獥
-                    }
-                })
-            }
-            //#endregion
-            //#region 鏄剧ず鍒楁暟鎹�
-            function DisPlay_HideColumn() {
-                $.ajax({
-                    url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
-                    type: "GET",
-                    async: false,
-                    data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
-                    success: function (data1) {
-                        if (data1.data.length != 0) {
-
-                            var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
-                            //var titleData = ["鍗曟嵁ID", "HMouldID", "hsubid", "HManagerID", "婧愬崟涓诲唴鐮�", "婧愬崟瀛愬唴鐮�"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
-
-                            dataCol = data1.data[0].HGridString.split(',');
-
-                            for (var i = 0; i < option.cols[0].length - 2; i++) {
-                                var dataCols = dataCol[i].split('|');
-                                //闅愯棌鍒�
-                                if (dataCols[1] == 1) {
-                                    option.cols[0][i + 1]["hide"] = true;
-                                }
-                                //璁剧疆鍒楀
-                                if (dataCols[3] > 0) {
-                                    option.cols[0][i + 1]["width"] = dataCols[3];
-                                }
-                                //璁剧疆鍐呭瀛椾綋澶у皬
-                                if (data1.data[0].HFontSize != 0) {
-                                    option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
-                                } else {
-                                    option.cols[0][i + 1]["style"] = "font-size:100%";
-                                }
-                                //璁剧疆鍒楀
-                                //if (data1.data[0].HColumnWidth != 0) {
-                                //    option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
-                                //} else {
-                                //    option.cols[0][i + 1]["width"] = "";
-                                //}
-                                //鏄剧ず鍒�
-                                if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
-                                    option.cols[0][i + 1]["hide"] = false;
-                                }
-                                //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
-                                switch (dataCols[2]) {
-                                    case "L":
-                                        option.cols[0][i + 1]["align"] = "left";
-                                        break;
-                                    case "M":
-                                        option.cols[0][i + 1]["align"] = "center";
-                                        break;
-                                    case "R":
-                                        option.cols[0][i + 1]["align"] = "right";
-                                        break;
-                                }
-                                //璁剧疆琛ㄦ牸title灞炴�ф樉绀哄埆鍚�
-                                if (dataCols[4] != null && dataCols[4] != "") {
-                                    option.cols[0][i + 1]["title"] = dataCols[4];
-                                }
-
-                                //缁熻鍒�
-                                if (dataCols[6] == 1) {
-                                    option.cols[0][i + 1]["totalRow"] = true;
-                                }
-                            }
-
-                            //鍙栨秷鍐荤粨鍒�
-                            for (var i = 1; i < option.cols[0].length - 1; i++) {
-                                if (option.cols[0][i]["fixed"] != null) {
-                                    option.cols[0][i]["fixed"] = null;
-                                }
-                                else {
-                                    break;
-                                }
-                            }
-                            //鍐荤粨鍒�
-                            if (data1.data[0].HFixCols != 0) {
-                                for (var i = 0; i < data1.data[0].HFixCols; i++) {
-                                    if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
-                                        data1.data[0].HFixCols += 1;
-                                    }
-                                    option.cols[0][i + 1]["fixed"] = "left";
-                                }
-                            }
-                            table.render(option);
-                        } else {
-                            table.render(option);
-                        }
-                    }, error: function () {
-                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
-                    }
-                })
-            }
-            //#endregion
-
             //#region 鍒楁槑鏄剧ず涓嬫媺妗�
             function ColFilter() {
                 var Organization = '<option  value="0" selected="selected" ></option>';
@@ -930,6 +920,10 @@
                 }
                 $("#ColName").empty();
                 $("#ColName").append(Organization);
+                $("#ColName1").empty();
+                $("#ColName1").append(Organization);
+                $("#ColName2").empty();
+                $("#ColName2").append(Organization);
                 form.render('select');
             }
             //#endregion
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_InspectInstruMent.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_InspectInstruMent.html"
index 0c083b1..5ced830 100644
--- "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_InspectInstruMent.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_InspectInstruMent.html"
@@ -9,8 +9,18 @@
     <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
     <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
     <script src="../../../layuiadmin/layui/layui.js"></script>
-    <script src="../../../layuiadmin/HideButton.js"></script>
     <script src="../../../layuiadmin/PubCustom.js"></script>
+    <script src="../../../layuiadmin/HideButton_New.js"></script>
+    <script src="../../../layuiadmin/SetColumn.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/treeTable.js"></script>
+    <script src="../../../layuiadmin/layui/lay/modules/util.js"></script>
+    <script src="../../../layuiadmin/soulTable.slim.js"></script>
+    <script src="../../../layuiadmin/layui/zgqlayui.js"></script>
+    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
 
 </head>
 <body>
@@ -38,6 +48,14 @@
                                     <label class="layui-form-label" style="width: 85px;">妫�楠屼华鍣ㄥ悕绉�</label>
                                     <div class="layui-input-block" style="margin-left: 120px;">
                                         <input type="text" class="layui-input ForFilteringSchemes" name="HName" id="HName">
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label" style="width: 85px;">缁勭粐</label>
+                                    <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
+                                        <select name="HUSEORGID" id="HUSEORGID" class="ForFilteringSchemes" lay-verify="HUSEORGID">
+                                            <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+                                        </select>
                                     </div>
                                 </div>
                                 <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
@@ -107,7 +125,7 @@
                                         <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 name="ColName2" id="ColName2" class="ForFilteringSchemes" lay-filter="ColName2" style="width:190px;">
                                                 </select>
                                             </div>
                                         </div>
@@ -135,21 +153,23 @@
                         </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="AddButton"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit" id="EditButton"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete" id="DeleteButton"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_SouceExcel"><i class="layui-icon layui-icon-delete"></i>瀵煎叆</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh" id="RefreshButton"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit" id="AuditButton"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit" id="DeAuditButton"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Stop" id="StopButton"> <i class="layui-icon layui-icon-radio"></i>绂佺敤</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeStop" id="DeStopButton"><i class="layui-icon layui-icon-radio"></i>鍙嶇鐢�</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn" id="HideButton"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideButton" id="HideButton"><i class="layui-icon layui-icon-form"></i>鎸夐挳璁剧疆</button>
+                            <div class="layui-btn-container"  id="toolbarDemo_ButtonSet">
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_SouceExcel" id="set_SouceExcel"><i class="layui-icon layui-icon-delete"></i>瀵煎叆</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Export" id="btn_Export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add" id="btn-Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Copy" id="btn_Copy"><i class="layui-icon layui-icon-add-1"></i>澶嶅埗</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit" id="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete" id="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit" id="btn-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit" id="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Stop" id="btn-Stop"> <i class="layui-icon layui-icon-radio"></i>绂佺敤</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeStop" id="btn-DeStop"><i class="layui-icon layui-icon-radio"></i>鍙嶇鐢�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn" id="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideButton" id="set_HideButton"><i class="layui-icon layui-icon-form"></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="get_Exit" id="ExitButton"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh" id="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit" id="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
                             </div>
                         </script>
 
@@ -158,10 +178,7 @@
             </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>
         layui.config({
             base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
@@ -181,6 +198,9 @@
             var sWhere = "";
             var option = [];
             var HModName = "Gy_InspectInstruMent";
+            var HBillType = "Gy_InspectInstruMent";
+            var ins;                //鐢ㄤ簬瀵煎嚭excel
+            var set_HideButton_ID = "toolbarDemo_ButtonSet";                    //闇�瑕佽缃殑鎸夐挳鐨勭埗绾ц妭鐐圭殑id
             //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
             var titleData = ["HItemID", "鐭唬鐮伮�","鐖剁骇ID", "绛夌骇", "鏈骇鏍囧織", "鍔╄鐮�", "鍒涘缓缁勭粐"];
 
@@ -215,6 +235,13 @@
                     //缂栬緫
                     case 'btn-Edit': set_ShowBill();
                         break;
+                    //澶嶅埗
+                    case 'btn_Copy':
+                        set_copy();
+                        break;
+                    //瀵煎嚭鎸夐挳
+                    case 'btn_Export': btn_Export();
+                        break;
                     //鍒犻櫎
                     case 'btn-Delete': set_DeleteBill();
                         break;
@@ -244,7 +271,7 @@
                         set_De_Stop(1);
                         break;
                     //鍒楄缃�
-                    case 'set_HideColumn': get_HideColumn();
+                    case 'set_HideColumn': get_HideColumnNoPage(HModName, sessionStorage["HUserName"], option, get_FastQuery);
                         break;
                     //淇濆瓨鏂规
                     case 'set_SaveScheme': set_SaveScheme();
@@ -253,9 +280,7 @@
                     case 'set_ReadScheme': set_ReadScheme();
                         break;
                     case 'set_HideButton':
-                        var btns = document.getElementsByTagName("button");     //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
-                        var HBillType = "Gy_InspectInstruMent";
-                        get_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
+                        get_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
                         break;
                 };
             });
@@ -291,6 +316,7 @@
             //#region 姝ら〉闈㈡墍鏈夋柟娉�
             // 鍒濆鍖栫晫闈�
             function set_ClearBill() {
+                set_StockOrg();
                 //鍒濆鍖栬〃鏍�
                 set_InitGrid();
                 //鏌ヨ
@@ -420,17 +446,18 @@
                                 , limit: 50
                                 , cellMinWidth: 90
                             }
-                            table.render(option);
+                          
                             //鍒锋柊鎸夐挳鏄剧ず
-                            var btns = document.getElementsByTagName("button");     //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
-                            var HBillType = "Gy_InspectInstruMent";
-                            Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
+                            Display_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
 
                             //鍒锋柊琛ㄦ牸鏁版嵁
-                            DisPlay_HideColumn();
+                            DisPlay_HideColumn(HModName, sessionStorage["HUserName"], option, titleData);
+                            ins = table.render(option);
+                            table.render(option);
+
 
                             layer.close(ajaxLoad);
-                            if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+                            if ($("#ColName option").length < 1) {
                                 ColFilter();
                             }
 
@@ -462,6 +489,7 @@
             function get_FastQuery() {
                 var HNumber = $("#HNumber").val();
                 var HName = $("#HName").val();
+                var HUSEORGID = $("#HUSEORGID").val();    //缁勭粐
                 var ColName = $("#ColName").val();//澶嶉�夋
                 var Comparator = $("#Comparator").val()
                 var ColContent = $("#ColContent").val();
@@ -530,7 +558,7 @@
                             com2 = "not like'%" + ColContent2 + "%'";
                             break;
                         default:
-                            com2 = "" + Comparator + "'" + ColContent + "'";
+                            com2 = "" + Comparator2 + "'" + ColContent2 + "'";
                             break;
                     }
                     sWhere += " and " + ColName2 + " " + com2;
@@ -540,6 +568,9 @@
                 }
                 if (HName) {
                     sWhere += " and 妫�楠屼华鍣ㄥ悕绉� like '%" + HName + "%'";
+                }
+                if (HUSEORGID) {
+                    sWhere += " and 浣跨敤缁勭粐鍚嶇О = '" + HUSEORGID + "'";
                 }
                 get_Display(sWhere);
                 sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
@@ -558,6 +589,7 @@
                 $("#ColContent1").val("");
                 $("#ColName1").val("0");
                 $("#Comparator1").val("0");
+                $("#HUSEORGID").val(sessionStorage["Organization"]);
                 form.render('select');
 
                 sWhere = "";
@@ -614,6 +646,33 @@
                     layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
                 }
             }
+
+
+            //澶嶅埗
+            function set_copy() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var HInterID = data[0].HItemID.toString();
+                    layer.open({
+                        type: 2
+                        , area: ['100%', '100%']
+                        , title: '缂栬緫妫�楠屼华鍣�'
+                        , shade: 0.6 //閬僵閫忔槑搴�
+                        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                        , content: '../鍏敤鍩虹璧勬枡/Add_Edit_Gy_InspectInstruMent.html?OperationType=2&linterid=' + HInterID + '&HSouceBillType='
+                        , resize: false
+                        , cancel: function () {
+
+                        }
+                    })
+
+                } else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+                }
+            }
+
             //鍒犻櫎
             function set_DeleteBill() {
                 var checkStatus = table.checkStatus('mainTable')
@@ -724,127 +783,9 @@
             }
             //#endregion
 
-
-
-            //#region 闅愯棌鍒楄缃�
-            function get_HideColumn() {
-                var colName = "";
-                var contentUrl = "";
-                for (var i = 1; i < option.cols[0].length; i++) {
-                    colName += option.cols[0][i]["title"] + ",";
-                }
-                var urlStr = window.document.location.pathname;//鑾峰彇鏂囦欢璺緞
-                var urlLen = urlStr.split('/');
-                for (var i = 0; i < urlLen.length - 4; i++) {
-                    contentUrl += "../";
-                }
-                colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
-
-                contentUrl += '鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName;
-
-                layer.open({
-                    type: 2
-                    , skin: "layui-layer-rim" //鍔犱笂杈规
-                    , title: "闅愯棌鍒楄缃�"  //鏍囬
-                    , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
-                    , shift: 2 //寮瑰嚭鍔ㄧ敾
-                    , area: ["50%", "90%"] //绐椾綋澶у皬
-                    , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
-                    , content: [contentUrl, "yes"]
-                    , btn: ["纭畾", "鍙栨秷"]
-                    , btn1: function (index, laero) {
-                        //鍒锋柊琛ㄦ牸鏁版嵁
-                        DisPlay_HideColumn();
-                        //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
-                        layer.close(index);//鍏抽棴寮圭獥
-                    }
-                })
-            }
-            //#endregion
-            //#region 鏄剧ず鍒楁暟鎹�
-            function DisPlay_HideColumn() {
-                $.ajax({
-                    url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
-                    type: "GET",
-                    async: false,
-                    data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
-                    success: function (data1) {
-                        if (data1.data.length != 0) {
-
-                            var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
-                            //var titleData = ["鍗曟嵁ID", "HMouldID", "hsubid", "HManagerID", "婧愬崟涓诲唴鐮�", "婧愬崟瀛愬唴鐮�"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
-                            //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
-                            var titleData = ["HItemID", "鐭唬鐮伮�", "鐖剁骇ID", "绛夌骇", "鏈骇鏍囧織", "鍔╄鐮�", "鍒涘缓缁勭粐"];
-                            dataCol = data1.data[0].HGridString.split(',');
-
-                            for (var i = 0; i < option.cols[0].length - 1; i++) {
-                                if (dataCol[i]) {
-                                    var dataCols = dataCol[i].split('|');
-                                }
-                                //闅愯棌鍒�
-                                if (dataCols[1] == 1) {
-                                    option.cols[0][i + 1]["hide"] = true;
-                                }
-                                //璁剧疆鍒楀
-                                if (dataCols[3] > 0) {
-                                    option.cols[0][i + 1]["width"] = dataCols[3];
-                                }
-                                //璁剧疆鍐呭瀛椾綋澶у皬
-                                if (data1.data[0].HFontSize != 0) {
-                                    option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
-                                } else {
-                                    option.cols[0][i + 1]["style"] = "font-size:100%";
-                                }
-                                //璁剧疆鍒楀
-                                //if (data1.data[0].HColumnWidth != 0) {
-                                //    option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
-                                //} else {
-                                //    option.cols[0][i + 1]["width"] = "";
-                                //}
-                                //鏄剧ず鍒�
-                                if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
-                                    option.cols[0][i + 1]["hide"] = false;
-                                }
-                                //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
-                                switch (dataCols[2]) {
-                                    case "L":
-                                        option.cols[0][i + 1]["align"] = "left";
-                                        break;
-                                    case "M":
-                                        option.cols[0][i + 1]["align"] = "center";
-                                        break;
-                                    case "R":
-                                        option.cols[0][i + 1]["align"] = "right";
-                                        break;
-                                }
-                            }
-
-                            //鍙栨秷鍐荤粨鍒�
-                            for (var i = 1; i < option.cols[0].length - 1; i++) {
-                                if (option.cols[0][i]["fixed"] != null) {
-                                    option.cols[0][i]["fixed"] = null;
-                                }
-                                else {
-                                    break;
-                                }
-                            }
-                            //鍐荤粨鍒�
-                            if (data1.data[0].HFixCols != 0) {
-                                for (var i = 0; i < data1.data[0].HFixCols; i++) {
-                                    if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
-                                        data1.data[0].HFixCols += 1;
-                                    }
-                                    option.cols[0][i + 1]["fixed"] = "left";
-                                }
-                            }
-                            table.render(option);
-                        } else {
-                            table.render(option);
-                        }
-                    }, error: function () {
-                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
-                    }
-                })
+            //#region 瀵煎嚭Execel
+            function btn_Export() {
+                table.exportFile(ins.config.id, option.data, "xls");
             }
             //#endregion
 
@@ -867,6 +808,33 @@
 
             //#region 銆愯繃婊ゆ柟妗堛��
 
+            //#region   鑾峰彇缁勭粐
+            function set_StockOrg() {
+                //鑾峰彇鐧诲綍椤电粍缁囧垪
+                $.ajax({
+                    type: "GET",
+                    url: GetWEBURL() + "/Web/GetOrganizations",
+                    async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                    success: function (result) {
+                        var Organization = "";
+                        Organization += '<option  style="color:blue;" value="">鍏ㄩ儴</option>';
+                        if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            var data = result.data;
+                            for (var i = 0; i < data.length; i++) {
+                                Organization += '<option  style="color:blue;" value="' + data[i].Name + '">' + data[i].Name + '</option>';
+                            }
+                            $("#HUSEORGID").append(Organization);
+                            $("#HUSEORGID").val(sessionStorage["Organization"])
+                            form.render('select');
+                        }
+                        layer.closeAll("loading");
+                    },
+                    complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
+                })
+            }
+            //#endregion
+
+
             //鑾峰彇褰撳墠鐢ㄦ埛鐨勯粯璁よ繃婊ゆ柟妗�
             function get_DefaultModule() {
                 $.ajax({
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_InspectValue.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_InspectValue.html"
index c125284..3f7f71d 100644
--- "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_InspectValue.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_InspectValue.html"
@@ -9,8 +9,17 @@
     <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
     <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
     <script src="../../../layuiadmin/layui/layui.js"></script>
-    <script src="../../../layuiadmin/HideButton.js"></script>
+    <script src="../../../layuiadmin/treeTable.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/layui/lay/modules/util.js"></script>
+    <script src="../../../layuiadmin/soulTable.slim.js"></script>
+    <script src="../../../layuiadmin/HideButton_New.js"></script>
+    <script src="../../../layuiadmin/SetColumn.js"></script>
     <script src="../../../layuiadmin/PubCustom.js"></script>
+    <script src="../../../layuiadmin/layui/zgqlayui.js"></script>
+    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
 
 
 </head>
@@ -39,6 +48,14 @@
                                     <label class="layui-form-label" style="width: 85px;">妫�娴嬪�煎悕绉�</label>
                                     <div class="layui-input-block" style="margin-left: 120px;">
                                         <input type="text" class="layui-input ForFilteringSchemes" name="HName" id="HName">
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label" style="width: 85px;">缁勭粐</label>
+                                    <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
+                                        <select name="HUSEORGID" id="HUSEORGID" class="ForFilteringSchemes" lay-verify="HUSEORGID">
+                                            <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+                                        </select>
                                     </div>
                                 </div>
                                 <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
@@ -136,21 +153,23 @@
                             </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="AddButton"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit" id="EditButton"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_SouceExcel"><i class="layui-icon layui-icon-delete"></i>瀵煎叆</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete" id="DeleteButton"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh" id="RefreshButton"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit" id="AuditButton"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit" id="DeAuditButton"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Stop" id="StopButton"> <i class="layui-icon layui-icon-radio"></i>绂佺敤</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeStop" id="DeStopButton"><i class="layui-icon layui-icon-radio"></i>鍙嶇鐢�</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn" id="HideButton"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideButton" id="HideButton"><i class="layui-icon layui-icon-form"></i>鎸夐挳璁剧疆</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit" id="ExitButton"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
+                            <div class="layui-btn-container" id="toolbarDemo_ButtonSet">
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_SouceExcel" id="set_SouceExcel"><i class="layui-icon layui-icon-delete"></i>瀵煎叆</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Export" id="btn_Export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add" id="btn-Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Copy" id="btn_Copy"><i class="layui-icon layui-icon-add-1"></i>澶嶅埗</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit" id="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete" id="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit" id="btn-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit" id="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Stop" id="btn-Stop"> <i class="layui-icon layui-icon-radio"></i>绂佺敤</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeStop" id="btn-DeStop"><i class="layui-icon layui-icon-radio"></i>鍙嶇鐢�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn" id="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideButton" id="set_HideButton"><i class="layui-icon layui-icon-form"></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="get_Refresh" id="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit" id="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
                             </div>
                         </script>
 
@@ -182,6 +201,9 @@
             var sWhere = "";
             var option = [];
             var HModName = "Gy_InspectValue";
+            var HBillType = "Gy_InspectValue";
+            var ins;                //鐢ㄤ簬瀵煎嚭excel
+            var set_HideButton_ID = "toolbarDemo_ButtonSet";                    //闇�瑕佽缃殑鎸夐挳鐨勭埗绾ц妭鐐圭殑id
             //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
             var titleData = ["HItemID", "鐭唬鐮伮�","鐖剁骇ID", "绛夌骇", "鏈骇鏍囧織", "鍔╄鐮�", "鍒涘缓缁勭粐"];
 
@@ -239,6 +261,9 @@
                     //瀵煎叆
                     case 'set_SouceExcel': set_SouceExcel();
                         break;
+                    //瀵煎嚭鎸夐挳
+                    case 'btn_Export': btn_Export();
+                        break;
                     //鍒犻櫎
                     case 'btn-Delete': set_DeleteBill();
                         break;
@@ -264,8 +289,12 @@
                     case 'btn-DeStop':
                         set_De_Stop(1);
                         break;
+                    //澶嶅埗
+                    case 'btn_Copy':
+                        set_copy();
+                        break;
                     //鍒楄缃�
-                    case 'set_HideColumn': get_HideColumn();
+                    case 'set_HideColumn': get_HideColumnNoPage(HModName, sessionStorage["HUserName"], option, get_FastQuery);
                         break;
                     //淇濆瓨鏂规
                     case 'set_SaveScheme': set_SaveScheme();
@@ -274,9 +303,10 @@
                     case 'set_ReadScheme': set_ReadScheme();
                         break;
                     case 'set_HideButton':
-                        var btns = document.getElementsByTagName("button");     //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
-                        var HBillType = "Gy_InspectValue";
-                        get_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
+                        get_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
+                        break;
+                    //閫�鍑烘寜閽�
+                    case 'get_Exit': Pub_Close(2);
                         break;
                 };
             });
@@ -293,7 +323,8 @@
          
             //#region 姝ら〉闈㈡墍鏈夋柟娉�
             // 鍒濆鍖栫晫闈�
-            function set_ClearBill() {            
+            function set_ClearBill() {
+                set_StockOrg();
                 //鍒濆鍖栬〃鏍�
                 set_InitGrid();
                 //鏌ヨ
@@ -373,6 +404,31 @@
                 })
             }
 
+            //澶嶅埗
+            function set_copy() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var HInterID = data[0].HItemID.toString();
+                    layer.open({
+                        type: 2
+                        , area: ['100%', '100%']
+                        , title: '缂栬緫妫�楠岄」鐩�'
+                        , shade: 0.6 //閬僵閫忔槑搴�
+                        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                        , content: '../鍏敤鍩虹璧勬枡/Add_Edit_Gy_InspectValue.html?OperationType=2&linterid=' + HInterID + '&HSouceBillType='
+                        , resize: false
+                        , cancel: function () {
+
+                        }
+                    })
+
+                } else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+                }
+            }
+
             //鏌ヨ
             function get_Display(sWhere) {
                 var index = layer.load(0, { shade: false });
@@ -436,19 +492,19 @@
                                 , limit: 50
                                 , cellMinWidth: 90
                             }
-                            table.render(option);
-                            //鍒锋柊鎸夐挳鏄剧ず
-                            var btns = document.getElementsByTagName("button");     //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
-                            var HBillType = "Gy_InspectValue";
-                            Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
-
                             //鍒锋柊琛ㄦ牸鏁版嵁
-                            DisPlay_HideColumn();
+                            DisPlay_HideColumn(HModName, sessionStorage["HUserName"], option, titleData);
+                        
+
+                            ins = table.render(option);
+                            table.render(option);
 
                             layer.close(ajaxLoad);
-                            if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+                            if ($("#ColName option").length < 1) {
                                 ColFilter();
                             }
+                            //鍒锋柊鎸夐挳鏄剧ず
+                            Display_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
 
                             //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
                         } else {
@@ -467,6 +523,7 @@
 
                 var HNumber = $("#HNumber").val();
                 var HName = $("#HName").val();
+                var HUSEORGID = $("#HUSEORGID").val();    //缁勭粐
                 var ColName = $("#ColName").val();//澶嶉�夋
                 var Comparator = $("#Comparator").val()
                 var ColContent = $("#ColContent").val();
@@ -534,7 +591,7 @@
                             com2 = "not like'%" + ColContent2 + "%'";
                             break;
                         default:
-                            com2 = "" + Comparator + "'" + ColContent + "'";
+                            com2 = "" + Comparator2 + "'" + ColContent2 + "'";
                             break;
                     }
                     sWhere += " and " + ColName2 + " " + com2;
@@ -545,6 +602,9 @@
                 }
                 if (HName) {
                     sWhere += " and 妫�娴嬪�煎悕绉� like '%" + HName + "%'";
+                }
+                if (HUSEORGID) {
+                    sWhere += " and 浣跨敤缁勭粐鍚嶇О = '" + HUSEORGID + "'";
                 }
                 get_Display(sWhere);
                 sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
@@ -564,6 +624,7 @@
                 $("#ColContent1").val("");
                 $("#ColName1").val("0");
                 $("#Comparator1").val("0");
+                $("#HUSEORGID").val(sessionStorage["Organization"]);
                 form.render('select');
 
                 sWhere = "";
@@ -572,6 +633,12 @@
             function get_Refresh() {
                 $("#btnSearch").trigger('click');
             }
+
+            //#region 瀵煎嚭Execel
+            function btn_Export() {
+                table.exportFile(ins.config.id, option.data, "xls");
+            }
+            //#endregion
             //鏂板
             function set_AddNew() {
                 layer.open({
@@ -658,6 +725,32 @@
             }
             //#endregion
 
+            //#region   鑾峰彇缁勭粐
+            function set_StockOrg() {
+                //鑾峰彇鐧诲綍椤电粍缁囧垪
+                $.ajax({
+                    type: "GET",
+                    url: GetWEBURL() + "/Web/GetOrganizations",
+                    async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                    success: function (result) {
+                        var Organization = "";
+                        Organization += '<option  style="color:blue;" value="">鍏ㄩ儴</option>';
+                        if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            var data = result.data;
+                            for (var i = 0; i < data.length; i++) {
+                                Organization += '<option  style="color:blue;" value="' + data[i].Name + '">' + data[i].Name + '</option>';
+                            }
+                            $("#HUSEORGID").append(Organization);
+                            $("#HUSEORGID").val(sessionStorage["Organization"])
+                            form.render('select');
+                        }
+                        layer.closeAll("loading");
+                    },
+                    complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
+                })
+            }
+            //#endregion
+
             //#region 鍙嶅鏍�/瀹℃牳鏁版嵁
             function set_CheckBill(num) {
                 var checkStatus = table.checkStatus('mainTable')
@@ -730,127 +823,6 @@
             }
             //#endregion
 
-
-
-            //#region 闅愯棌鍒楄缃�
-            function get_HideColumn() {
-                var colName = "";
-                var contentUrl = "";
-                for (var i = 1; i < option.cols[0].length; i++) {
-                    colName += option.cols[0][i]["title"] + ",";
-                }
-                var urlStr = window.document.location.pathname;//鑾峰彇鏂囦欢璺緞
-                var urlLen = urlStr.split('/');
-                for (var i = 0; i < urlLen.length - 4; i++) {
-                    contentUrl += "../";
-                }
-                colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
-
-                contentUrl += '鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName;
-
-                layer.open({
-                    type: 2
-                    , skin: "layui-layer-rim" //鍔犱笂杈规
-                    , title: "闅愯棌鍒楄缃�"  //鏍囬
-                    , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
-                    , shift: 2 //寮瑰嚭鍔ㄧ敾
-                    , area: ["50%", "90%"] //绐椾綋澶у皬
-                    , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
-                    , content: [contentUrl, "yes"]
-                    , btn: ["纭畾", "鍙栨秷"]
-                    , btn1: function (index, laero) {
-                        //鍒锋柊琛ㄦ牸鏁版嵁
-                        DisPlay_HideColumn();
-                        //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
-                        layer.close(index);//鍏抽棴寮圭獥
-                    }
-                })
-            }
-            //#endregion
-            //#region 鏄剧ず鍒楁暟鎹�
-            function DisPlay_HideColumn() {
-                $.ajax({
-                    url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
-                    type: "GET",
-                    async: false,
-                    data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
-                    success: function (data1) {
-                        if (data1.data.length != 0) {
-
-                            var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
-                            //var titleData = ["鍗曟嵁ID", "HMouldID", "hsubid", "HManagerID", "婧愬崟涓诲唴鐮�", "婧愬崟瀛愬唴鐮�"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
-                            //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
-                            var titleData = ["HItemID", "鐭唬鐮伮�", "鐖剁骇ID", "绛夌骇", "鏈骇鏍囧織", "鍔╄鐮�", "鍒涘缓缁勭粐"];
-                            dataCol = data1.data[0].HGridString.split(',');
-
-                            for (var i = 0; i < option.cols[0].length - 1; i++) {
-                                var dataCols = dataCol[i].split('|');
-                                //闅愯棌鍒�
-                                if (dataCols[1] == 1) {
-                                    option.cols[0][i + 1]["hide"] = true;
-                                }
-                                //璁剧疆鍒楀
-                                if (dataCols[3] > 0) {
-                                    option.cols[0][i + 1]["width"] = dataCols[3];
-                                }
-                                //璁剧疆鍐呭瀛椾綋澶у皬
-                                if (data1.data[0].HFontSize != 0) {
-                                    option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
-                                } else {
-                                    option.cols[0][i + 1]["style"] = "font-size:100%";
-                                }
-                                //璁剧疆鍒楀
-                                //if (data1.data[0].HColumnWidth != 0) {
-                                //    option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
-                                //} else {
-                                //    option.cols[0][i + 1]["width"] = "";
-                                //}
-                                //鏄剧ず鍒�
-                                if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
-                                    option.cols[0][i + 1]["hide"] = false;
-                                }
-                                //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
-                                switch (dataCols[2]) {
-                                    case "L":
-                                        option.cols[0][i + 1]["align"] = "left";
-                                        break;
-                                    case "M":
-                                        option.cols[0][i + 1]["align"] = "center";
-                                        break;
-                                    case "R":
-                                        option.cols[0][i + 1]["align"] = "right";
-                                        break;
-                                }
-                            }
-
-                            //鍙栨秷鍐荤粨鍒�
-                            for (var i = 1; i < option.cols[0].length - 1; i++) {
-                                if (option.cols[0][i]["fixed"] != null) {
-                                    option.cols[0][i]["fixed"] = null;
-                                }
-                                else {
-                                    break;
-                                }
-                            }
-                            //鍐荤粨鍒�
-                            if (data1.data[0].HFixCols != 0) {
-                                for (var i = 0; i < data1.data[0].HFixCols; i++) {
-                                    if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
-                                        data1.data[0].HFixCols += 1;
-                                    }
-                                    option.cols[0][i + 1]["fixed"] = "left";
-                                }
-                            }
-                            table.render(option);
-                        } else {
-                            table.render(option);
-                        }
-                    }, error: function () {
-                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
-                    }
-                })
-            }
-            //#endregion
 
             //#region 鍒楁槑鏄剧ず涓嬫媺妗�
             function ColFilter() {
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_Material.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_Material.html"
index a2d076e..b5fdbbb 100644
--- "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_Material.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_Material.html"
@@ -14,6 +14,11 @@
     <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
     <script src="../../../layuiadmin/layui/layui1.js"></script>
     <script src="../../../layuiadmin/layui/lay/modules/table.js"></script>
+    <script src="../../../layuiadmin/HideButton_New.js"></script>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
+    <script src="../../../layuiadmin/soulTable.slim.js"></script>
+    <script src="../../../layuiadmin/PageTitle.js"></script>
+    <script src="../../../layuiadmin/SetColumn.js"></script>
     <style>
         /*鏍戠姸鍥剧偣鍑婚珮浜彉鑹�*/
         .layui-tree-set-active > .layui-tree-entry .layui-tree-main {
@@ -54,10 +59,11 @@
                                         </select>
                                     </div>
                                 </div>
-                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+                                <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>
@@ -73,9 +79,11 @@
                                         <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnResCnz" id="btnReSearch" style="padding:0 5px">閲嶆柊鍚屾</button>
                                         <div class="layui-inline">
                                             <label class="layui-form-label">缁勭粐鍚嶇О</label>
-                                            <div class="layui-input-block">
-                                                <input type="text" class="layui-input ForFilteringSchemes" name="HOrgName" id="HOrgName">
-                                            </div>
+                                           <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
+                                        <select name="HOrgID" id="HOrgID" class=" ForFilteringSchemes" lay-verify="HOrgID">
+                                            <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+                                        </select>
+                                    </div>
                                         </div>
                                         <div class="layui-inline">
                                             <label class="layui-form-label">瑙勬牸鍨嬪彿</label>
@@ -87,12 +95,12 @@
                                             <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 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">
+                                                <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>
@@ -108,6 +116,60 @@
                                             </div>
                                             <div class="layui-inline">
                                                 <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent">
+                                            </div>
+                                        </div>
+                                        <div class="layui-row" style="margin-top:5px">
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">杩囨护</label>
+                                                <div class="layui-input-block">
+                                                    <select name="ColName1" id="ColName1" lay-filter="ColName1" style="width:190px;" class="ForFilteringSchemes">
+                                                    </select>
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <select name="Comparator1" id="Comparator1" lay-filter="Comparator1" 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="ColContent1" id="ColContent1">
+                                            </div>
+                                        </div>
+                                        <div class="layui-row" style="margin-top:5px">
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">杩囨护</label>
+                                                <div class="layui-input-block">
+                                                    <select name="ColName2" id="ColName2" lay-filter="ColName2" style="width:190px;" class="ForFilteringSchemes">
+                                                    </select>
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <select name="Comparator2" id="Comparator2" lay-filter="Comparator2" 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="ColContent2" id="ColContent2">
                                             </div>
                                         </div>
                                     </div>
@@ -135,27 +197,27 @@
                             </div>
                         </div>-->
                         <!--<table class="" id="mainTable" lay-filter="mainTable"></table>-->
-                        <script type="text/html" id="toolbarDemo">
-                            <div class="layui-btn-container">
+                        <script type="text/html" id="toolbarDemo" >
+                            <div class="layui-btn-container" id="toolbarDemo_ButtonSet">
                                 <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-getCheckData"><i class="layuiiconlayuiicontips"></i>棰勮</button>-->
-                                <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-NumAdd" id="btn-NumAdd"><i class="layu i-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-copy" id="btn-copy"><i class="layuiiconlayuiiconform"></i>澶嶅埗</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_SouceExcel"><i class="layui-icon layui-icon-delete"></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"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Stop"><i class="layui-icon layui-icon-radio"></i>绂佺敤</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeStop"><i class="layui-icon layui-icon-radio"></i>鍙嶇鐢�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_SouceExcel"  id="set_SouceExcel"><i class="layui-icon layui-icon-delete"></i>瀵煎叆</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="get_export" id="get_export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="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="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-copy" id="btn-copy"><i class="layuiiconlayuiiconform"></i>澶嶅埗</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-NumAdd" id="btn-NumAdd"><i class="layu i-iconlayuiiconfileb"></i>娴佹按鍙锋柊澧�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit" id="btn-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit" id="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Stop" id="btn-Stop"><i class="layui-icon layui-icon-radio"></i>绂佺敤</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeStop" id="btn-DeStop"><i class="layui-icon layui-icon-radio"></i>鍙嶇鐢�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn" id="set_HideColumn"><i class="layui-icon layuiiconform"></i>鍒楄缃�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideButton" id="HideButton"><i class="layui-icon layui-icon-form"></i>鎸夐挳璁剧疆</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="set_QueryCondition" id="set_QueryCondition"><i class="layui-icon layui-icon-set"></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-Print" id="btn-Print"><iclass="layuiiconlayuiicon-circle"></i>棰勮</button>-->
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Close"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh" id="get_Refresh"><i class="layui-iconlayuiiconrefresh-3"></i>鍒锋柊</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Close" id="btn-Close"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
                             </div>
                         </script>
                     </form>
@@ -206,6 +268,8 @@
             var sql = "";
             var option = [];
             var Organization = sessionStorage["Organization"];
+            var set_HideButton_ID = "toolbarDemo_ButtonSet";                    //闇�瑕佽缃殑鎸夐挳鐨勭埗绾ц妭鐐圭殑id
+            var HBillType = "Gy_Material";
             var HModName = "Gy_Material";
             //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
             var titleData = ["HItemID", "HUnitID", "HParentID", "HUSEORGID", "HMinPickQty", "HEndFlag", "HStopFlag","閫夋嫨","sorderid"];
@@ -315,11 +379,15 @@
                         break;
                     //鍒楄缃�
                     case 'set_HideColumn':
-                        get_HideColumn();
+                        get_HideColumn(HModName, sessionStorage["HUserName"], option, optionPage, get_FastQuery);
                         break;
                     //楂樼骇杩囨护
                     case 'set_QueryCondition':
                         set_QueryCondition();
+                        break;
+                    //鎸夐挳璁剧疆
+                    case 'set_HideButton':
+                        get_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
                         break;
                 };
             });
@@ -436,6 +504,7 @@
             function set_ClearBill() {
                 //鍒濆鍖栬〃鏍�
                 set_InitGrid();
+                OrganName();
 
                 //鏍戠姸鍥炬煡璇�
                 get_Display_Tree();
@@ -502,16 +571,46 @@
             //#endregion
 
 
+            //#region 鑾峰彇缁勭粐
+            function OrganName() {
+                //鑾峰彇鐧诲綍椤电粍缁囧垪
+                $.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>';
+                            }
+                            $("#HOrgID").append(Organization);
+                            $("#HOrgID").val(sessionStorage["OrganizationID"])
+                            form.render('select');
+                        }
+                        layer.closeAll("loading");
+                    }
+                })
+            }
+            //#endregion
+
             //#region 閲嶇疆杩囨护鏉′欢鏂规硶
             function set_ClearQuery() {
                 $("#HNumber").val("");
                 $("#HName").val("");
                 $("#HProject").val("");
                 $("#HModel").val("");
-                $("#HOrgName").val("");
+                $("#HOrgID").val("0");
                 $("#ColContent").val("");
                 $("#ColName").val("0");
                 $("#Comparator").val("0");
+                $("#ColContent2").val("");
+                $("#ColName2").val("0");
+                $("#Comparator2").val("0");
+                $("#ColContent1").val("");
+                $("#ColName1").val("0");
+                $("#Comparator1").val("0");
                 form.render('select');
                 sWhere = "";
             }
@@ -557,12 +656,13 @@
                             ins = table.render(option);
 
                             //鍒锋柊琛ㄦ牸鏁版嵁
-                            DisPlay_HideColumn();
+                            DisPlay_HideColumn(HModName, sessionStorage["HUserName"], option, titleData);
 
                             layer.close(ajaxLoad);
                             if ($("#ColName option").length < 1) {
                                 ColFilter();
                             }
+                            Display_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
                             //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
                         } else {
                             layer.close(ajaxLoad);
@@ -616,15 +716,18 @@
 
                             option.cols = [col];
                             option.data = data1.data;
+                            //鍒锋柊琛ㄦ牸鏁版嵁
+                            DisPlay_HideColumn(HModName, sessionStorage["HUserName"], option, titleData);
+
                             ins = table.render(option);
                             laypage.render(optionPage);
-                            //鍒锋柊琛ㄦ牸鏁版嵁
-                            DisPlay_HideColumn();
+                       
 
                             layer.close(ajaxLoad);
                             if ($("#ColName option").length < 1) {
                                 ColFilter();
                             }
+                            Display_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
                             //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
                         } else {
                             //option.data = [[]]
@@ -648,10 +751,18 @@
                 var HName = $("#HName").val();
                 var HProject = $("#HProject").val();
                 var HModel = $("#HModel").val();
-                var HOrgName = $("#HOrgName").val();
+                var HOrgID = $("#HOrgID").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) {
@@ -673,6 +784,49 @@
                     }
                     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 鐗╂枡浠g爜 like '%" + HNumber + "%'";
                 }
@@ -682,8 +836,8 @@
                 if (HModel) {
                     sWhere += " and 瑙勬牸鍨嬪彿 like '%" + HModel + "%'";
                 }
-                if (HOrgName) {
-                    sWhere += " and 缁勭粐鍚嶇О like '%" + HOrgName + "%'";
+                if (HOrgID) {
+                    sWhere += " and HUSEORGID = '" + HOrgID + "'";
                 }
                 if (HProject) {
                     sWhere += " and 椤圭洰鍙� like '%" + HProject + "%'";
@@ -1077,6 +1231,7 @@
                 tree.render({
                     elem: '#TreeTable' //榛樿鏄偣鍑昏妭鐐瑰彲杩涜鏀剁缉
                     , data: treeTable
+                    , onlyIconControl: true
                     , click: function (obj) {
                         //楂樹寒鍙樿壊
                         $(".layui-tree-set").removeClass('layui-tree-set-active');
@@ -1169,41 +1324,7 @@
             }
             //#endregion            
 
-            //#region 闅愯棌鍒楄缃�
-            function get_HideColumn() {
-                var colName = "";
-                var contentUrl = "";
-                for (var i = 1; i < option.cols[0].length - 1; i++) {
-                    colName += option.cols[0][i]["field"] + ",";
-                }
-                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
+           
 
             //楂樼骇杩囨护
             function set_QueryCondition() {
@@ -1261,100 +1382,7 @@
                 })
             }
 
-            //#region 鏄剧ず鍒楁暟鎹�
-            function DisPlay_HideColumn() {
-                $.ajax({
-                    url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
-                    type: "GET",
-                    async: false,
-                    data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
-                    success: function (data1) {
-                        if (data1.data.length != 0) {
-
-
-                            var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
-                           /* var titleData = ["鍗曟嵁ID", "HMouldID", "hsubid", "HManagerID", "婧愬崟涓诲唴鐮�", "婧愬崟瀛愬唴鐮�"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�*/
-
-                            dataCol = data1.data[0].HGridString.split(',');
-
-                            for (var i = 0; i < option.cols[0].length - 2; i++) {
-                                if (dataCol[i]) {
-                                    var dataCols = dataCol[i].split('|');
-                                }
-                                //闅愯棌鍒�
-                                if (dataCols[1] == 1) {
-                                    option.cols[0][i + 1]["hide"] = true;
-                                }
-                                //缁熻鍒�
-                                if (dataCols[6] == 1) {
-                                    option.cols[0][i + 1]["totalRow"] = true;
-                                }
-                                //璁剧疆鍒楀
-                                if (dataCols[3] > 0) {
-                                    option.cols[0][i + 1]["width"] = dataCols[3];
-                                }
-                                //璁剧疆鍐呭瀛椾綋澶у皬
-                                if (data1.data[0].HFontSize != 0) {
-                                    option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
-                                } else {
-                                    option.cols[0][i + 1]["style"] = "font-size:100%";
-                                }
-                                //璁剧疆鍒楀
-                                //if (data1.data[0].HColumnWidth != 0) {
-                                //    option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
-                                //} else {
-                                //    option.cols[0][i + 1]["width"] = "";
-                                //}
-                                //鏄剧ず鍒�
-                                if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
-                                    option.cols[0][i + 1]["hide"] = false;
-                                }
-                                //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
-                                switch (dataCols[2]) {
-                                    case "L":
-                                        option.cols[0][i + 1]["align"] = "left";
-                                        break;
-                                    case "M":
-                                        option.cols[0][i + 1]["align"] = "center";
-                                        break;
-                                    case "R":
-                                        option.cols[0][i + 1]["align"] = "right";
-                                        break;
-                                }
-                                //璁剧疆琛ㄦ牸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
+           
             //#region 鍒楁槑鏄剧ず涓嬫媺妗�
             function ColFilter() {
                 var Organization = '<option  value="0" selected="selected" ></option>';
@@ -1365,6 +1393,10 @@
                 }
                 $("#ColName").empty();
                 $("#ColName").append(Organization);
+                $("#ColName1").empty();
+                $("#ColName1").append(Organization);
+                $("#ColName2").empty();
+                $("#ColName2").append(Organization);
                 form.render('select');
             }
             //#endregion
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_QCCheckClass.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_QCCheckClass.html"
index 183a89b..e275bb0 100644
--- "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_QCCheckClass.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_QCCheckClass.html"
@@ -15,6 +15,9 @@
     <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
     <script src="../../../layuiadmin/layui/lay/modules/util.js"></script>
     <script src="../../../layuiadmin/soulTable.slim.js"></script>
+    <script src="../../../layuiadmin/HideButton_New.js"></script>
+    <script src="../../../layuiadmin/SetColumn.js"></script>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
     <style media="screen">
         .custom-tree-item-clicked {
             color: #FC9003
@@ -55,6 +58,14 @@
                                         <input type="text" class="layui-input ForFilteringSchemes" name="HName" id="HName">
                                     </div>
                                 </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label" style="width: 85px;">缁勭粐</label>
+                                    <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
+                                        <select name="HUSEORGID" id="HUSEORGID" class="ForFilteringSchemes" lay-verify="HUSEORGID">
+                                            <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+                                        </select>
+                                    </div>
+                                </div>
                                 <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
                                     <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                 </button>
@@ -68,12 +79,12 @@
                                         <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 name="ColName" id="ColName" lay-filter="ColName" style="width:190px;" class="ForFilteringSchemes">
                                                 </select>
                                             </div>
                                         </div>
                                         <div class="layui-inline">
-                                            <select name="Comparator" id="Comparator" class="ForFilteringSchemes" lay-filter="Comparator" style="width:190px;">
+                                            <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>
@@ -91,20 +102,83 @@
                                             <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent">
                                         </div>
                                     </div>
+                                    <div class="layui-row" style="margin-top:5px">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">杩囨护</label>
+                                            <div class="layui-input-block">
+                                                <select name="ColName1" id="ColName1" lay-filter="ColName1" style="width:190px;" class="ForFilteringSchemes">
+                                                </select>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <select name="Comparator1" id="Comparator1" lay-filter="Comparator1" 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="ColContent1" id="ColContent1">
+                                        </div>
+                                    </div>
+                                    <div class="layui-row" style="margin-top:5px">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">杩囨护</label>
+                                            <div class="layui-input-block">
+                                                <select name="ColName2" id="ColName2" lay-filter="ColName2" style="width:190px;" class="ForFilteringSchemes">
+                                                </select>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <select name="Comparator2" id="Comparator2" lay-filter="Comparator2" 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="ColContent2" id="ColContent2">
+                                        </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" lay-submit="" class="layui-btn layui-btn-sm" lay-filter="btnAdd"><i class="layui-icon layui-icon-add-1"></i>鏂板</button>
-                                <button type="button" lay-submit="" class="layui-btn layui-btn-sm" lay-filter="btnModify"><i class="layui-icon layui-icon-edit"></i>淇敼</button>
-                                <button type="button" lay-submit="" class="layui-btn layui-btn-sm" lay-filter="btnExcel"><i class="layui-icon layui-icon-edit"></i>瀵煎叆</button>
-                                <button type="button" lay-submit="" class="layui-btn layui-btn-sm" lay-filter="btndelete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
-                                <button type="button" lay-submit="" class="layui-btn layui-btn-sm" lay-filter="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
-                                <button type="button" lay-submit="" class="layui-btn layui-btn-sm" lay-filter="set_SaveScheme"><i class="layui-icon layui-icon-template"></i>淇濆瓨鏂规</button>
-                                <button type="button" lay-submit="" class="layui-btn layui-btn-sm" lay-filter="set_ReadScheme" ><i class="layui-icon layui-icon-set"></i>璇诲彇鏂规</button>
+                            <div class="layui-btn-container" id="toolbarDemo_ButtonSet">
+                                <button type="button"  class="layui-btn layui-btn-sm" lay-event="btnExcel" id="btnExcel"><i class="layui-icon layui-icon-edit"></i>瀵煎叆</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Export" id="btn_Export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
+                                <button type="button"  class="layui-btn layui-btn-sm" lay-event="btnAdd" id="btnAdd"><i class="layui-icon layui-icon-add-1"></i>鏂板</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Copy" id="btn_Copy"><i class="layui-icon layui-icon-add-1"></i>澶嶅埗</button>
+                                <button type="button"  class="layui-btn layui-btn-sm" lay-event="btnModify" id="btnModify"><i class="layui-icon layui-icon-edit"></i>淇敼</button>
+                                <button type="button"  class="layui-btn layui-btn-sm" lay-event="btndelete" id="btndelete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_CheckBill" id="set_CheckBill"><i class="layui-icon layui-icon-form"></i>瀹℃牳</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AbandonCheck" id="set_AbandonCheck"><i class="layui-icon layui-icon-form"></i>鍙嶅鏍�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Stop" id="btn-Stop"><i class="layui-icon layui-icon-radio"></i>绂佺敤</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeStop" id="btn-DeStop"><i class="layui-icon layui-icon-radio"></i>鍙嶇鐢�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn" id="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideButton" id="set_HideButton"><i class="layui-icon layui-icon-form"></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="get_Refresh" id="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit" id="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
                             </div>
                         </script>
                     </form>
@@ -141,6 +215,9 @@
             var sWhere = "";
             var option = [];
             var HModName = "Gy_QCCheckClass";
+            var HBillType = "Gy_QCCheckClass";
+            var ins;                //鐢ㄤ簬瀵煎嚭excel
+            var set_HideButton_ID = "toolbarDemo_ButtonSet";                    //闇�瑕佽缃殑鎸夐挳鐨勭埗绾ц妭鐐圭殑id
             //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
             var titleData = ["HItemID","ParentID"];
             //#endregion
@@ -180,45 +257,104 @@
 
             //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
 
-            //鏂板
-            form.on('submit(btnAdd)', function (obj) {
-                set_AddNew(obj);
-            })
-
-            //淇敼鎸夐挳
-            form.on('submit(btnModify)', function (data) {
-                set_ShowBill(data);
+            table.on('toolbar(mainTable)', function (obj) {
+                switch (obj.event) {
+                    //鏂板
+                    case 'btnAdd': set_AddNew();
+                        break;
+                    //缂栬緫
+                    case 'btnModify': set_ShowBill();
+                        break;
+                    //鍒犻櫎
+                    case 'btndelete': set_DeleteBill();
+                        break;
+                    //瀵煎叆
+                    case 'btnExcel': set_SouceExcel();
+                        break;
+                    //瀵煎嚭鎸夐挳
+                    case 'btn_Export': btn_Export();
+                        break;
+                    //鍒锋柊
+                    case 'get_Refresh': get_Refresh();
+                        break;
+                    //澶嶅埗
+                    case 'btn_Copy':
+                        set_copy();
+                        break;
+                    //瀹℃牳鎸夐挳
+                    case 'set_CheckBill':
+                        set_CheckBill(1);
+                        break;
+                    //鍙嶅鏍告寜閽�
+                    case 'set_AbandonCheck':
+                        set_CheckBill(2);
+                        break;
+                    //绂佺敤鎸夐挳
+                    case 'btn-Stop':
+                        set_De_Stop(0);
+                        break;
+                    //鍙嶇鐢ㄦ寜閽�
+                    case 'btn-DeStop':
+                        set_De_Stop(1);
+                        break;
+                    //閫�鍑烘寜閽�
+                    case 'get_Exit': Pub_Close(2);
+                        break;
+                    //淇濆瓨鏂规
+                    case 'set_SaveScheme': set_SaveScheme();
+                        break;
+                    //璇诲彇鏂规
+                    case 'set_ReadScheme': set_ReadScheme();
+                        break;
+                    //鍒楄缃�
+                    case 'set_HideColumn': get_HideColumnNoPage(HModName, sessionStorage["HUserName"], option, get_FastQuery);
+                        break;
+                    //鎸夐挳璁剧疆
+                    case 'set_HideButton':
+                        get_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
+                        break;
+                };
             });
 
-            //瀵煎叆
-            form.on('submit(btnExcel)', function (data) {
-                set_SouceExcel();
-            });
+            ////鏂板
+            //form.on('submit(btnAdd)', function (obj) {
+            //    set_AddNew(obj);
+            //})
 
-            //鍒犻櫎
-            form.on('submit(btndelete)', function (obj) {
-                set_DeleteBill(obj);
-            });
+            ////淇敼鎸夐挳
+            //form.on('submit(btnModify)', function (data) {
+            //    set_ShowBill(data);
+            //});
 
-            //鍒楄缃�
-            form.on('submit(set_HideColumn)', function (obj) {
-                get_HideColumn();
-            });
+            ////瀵煎叆
+            //form.on('submit(btnExcel)', function (data) {
+            //    set_SouceExcel();
+            //});
+
+            ////鍒犻櫎
+            //form.on('submit(btndelete)', function (obj) {
+            //    set_DeleteBill(obj);
+            //});
+
+            ////鍒楄缃�
+            //form.on('submit(set_HideColumn)', function (obj) {
+            //    get_HideColumn();
+            //});
 
             //鏌ヨ鎸夐挳
             form.on('submit(btnSearch)', function (data) {
                 get_FastQuery();
             });
 
-            //淇濆瓨鏂规            
-            form.on('submit(set_SaveScheme)', function (data) {
-                set_SaveScheme();
-            });
+            ////淇濆瓨鏂规            
+            //form.on('submit(set_SaveScheme)', function (data) {
+            //    set_SaveScheme();
+            //});
 
-            //璇诲彇鏂规            
-            form.on('submit(set_ReadScheme)', function (data) {
-                set_ReadScheme();
-            });
+            ////璇诲彇鏂规            
+            //form.on('submit(set_ReadScheme)', function (data) {
+            //    set_ReadScheme();
+            //});
 
             //#region 鍙屽嚮杩斿洖鏁版嵁
             table.on('rowDouble(mainTable)', function (obj) {
@@ -290,6 +426,7 @@
             //鍒濆鍖栬〃鏍�
             function set_ClearBill()
             {
+                set_StockOrg();
                 //鍒濆鍖栬〃鏍�
                 set_InitGrid();
 
@@ -432,15 +569,18 @@
                                     soulTable.render(this);
                                 }
                             }
+                            ins = table.render(option);
+                            //鍒锋柊琛ㄦ牸鏁版嵁
+                            DisPlay_HideColumn(HModName, sessionStorage["HUserName"], option, titleData);
                             table.render(option);
 
-                            //鍒锋柊琛ㄦ牸鏁版嵁
-                            DisPlay_HideColumn();
-
                             layer.close(ajaxLoad);
-                            if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+
+                            if ($("#ColName option").length < 1) {
                                 ColFilter();
                             }
+
+                            Display_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
 
                             //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
                         } else {
@@ -458,9 +598,17 @@
             function get_FastQuery() {
                 var HNumber = $("#HNumber").val();
                 var HName = $("#HName").val();
+                var HUSEORGID = $("#HUSEORGID").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 = "";
@@ -483,11 +631,57 @@
                     }
                     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 浠g爜 like '%" + HNumber + "%'";
                 }
                 if (HName) {
                     sWhere += " and 鍚嶇О like '%" + HName + "%'";
+                }
+                if (HUSEORGID) {
+                    sWhere += " and 浣跨敤缁勭粐鍚嶇О = '" + HUSEORGID + "'";
                 }
                 get_Display(sWhere);
                 sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
@@ -506,6 +700,13 @@
                 $("#ColContent").val("");
                 $("#ColName").val("0");
                 $("#Comparator").val("0");
+                $("#ColContent2").val("");
+                $("#ColName2").val("0");
+                $("#Comparator2").val("0");
+                $("#ColContent1").val("");
+                $("#ColName1").val("0");
+                $("#Comparator1").val("0");
+                $("#HUSEORGID").val(sessionStorage["Organization"]);
                 form.render('select');
 
                 sWhere = "";
@@ -521,9 +722,9 @@
                     title: '鏂板妫�楠岄」鐩被鍒�',
                     closeBtn: 1,
                     shift: 2,
-                    area: ['50%', '50%'],
+                    area: ['100%', '100%'],
                     maxmin: true,
-                    content: ['../鍏敤鍩虹璧勬枡/Add_Edit_Gy_QCCheckClass.html?hID=' + TagId + ''],
+                    content: ['../鍏敤鍩虹璧勬枡/Add_Edit_Gy_QCCheckClass.html?hID=' + TagId + '&HType=1&TagParentId='],
                     end: function () {
                         //鍒锋柊椤甸潰,
                         location.reload();
@@ -535,18 +736,50 @@
                 return false;//杩欓噷鍔犱釜return false;灏变笉浼氫袱娆℃彁浜�
             }
 
+            //#region 瀵煎嚭Execel
+            function btn_Export() {
+                table.exportFile(ins.config.id, option.data, "xls");
+            }
+            //#endregion
+
+            //澶嶅埗
+            function set_copy() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var HInterID = data[0].HItemID.toString();
+                    layer.open({
+                        type: 2
+                        , area: ['100%', '100%']
+                        , title: '缂栬緫妫�楠岄」鐩被鍒�'
+                        , shade: 0.6 //閬僵閫忔槑搴�
+                        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                        , content: '../鍏敤鍩虹璧勬枡/Add_Edit_Gy_QCCheckClass.html?hID=' + HInterID + '&HType=2&TagParentId=' + TagParentId + ''
+                        , resize: false
+                        , cancel: function () {
+
+                        }
+                    })
+
+                } else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+                }
+            }
+
+
             //淇敼
             function set_ShowBill(data) {
                 if (TagId != "") {
                     layer.open({
                         type: 2
-                        , area: ['50%', '50%']
+                        , area: ['100%', '100%']
                         , title: '缂栬緫妫�楠岄」鐩被鍒�'
                         , closeBtn: 1
                         , shade: 0.6 //閬僵閫忔槑搴�
                         , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
                         , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                        , content: ['../鍏敤鍩虹璧勬枡/Add_Edit_Gy_QCCheckClass.html?hID=' + TagId + '&HType=Modify&TagParentId=' + TagParentId + '', 'yes']
+                        , content: ['../鍏敤鍩虹璧勬枡/Add_Edit_Gy_QCCheckClass.html?hID=' + hID + '&HType=3&TagParentId=' + TagParentId + '', 'yes']
                         , resize: false,
                         end: function () {
                             //鍒锋柊椤甸潰,
@@ -566,13 +799,13 @@
                         //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
                         layer.open({
                             type: 2
-                            , area: ['55%', '55%']
+                            , area: ['100%', '100%']
                             , title: '缂栬緫妫�楠岄」鐩被鍒�'
                             , closeBtn: 1
                             , shade: 0.6 //閬僵閫忔槑搴�
                             , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
                             , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                            , content: ['../鍏敤鍩虹璧勬枡/Add_Edit_Gy_QCCheckClass.html?hID=' + hID + '&HType=Modify&TagParentId=' + TagParentId + '', 'yes']
+                            , content: ['../鍏敤鍩虹璧勬枡/Add_Edit_Gy_QCCheckClass.html?hID=' + hID + '&HType=3&TagParentId=' + TagParentId + '', 'yes']
 
                             , resize: false,
                             end: function () {
@@ -589,6 +822,109 @@
                     }
                 }
             }
+
+            //#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_QCCheckClass/AuditGy_QCCheckClass", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        data: { "HInterID": InterID, "Type": num, "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);
+                                    //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                    $("#btnSearch").trigger('click');
+                                });
+
+                            } else {
+                                layer.alert(result.code + result.Message, { icon: 5 });
+                            }
+                        }, error: function () {
+                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                        }
+                    });
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+                }
+            }
+            //#endregion
+
+            //#region   鑾峰彇缁勭粐
+            function set_StockOrg() {
+                //鑾峰彇鐧诲綍椤电粍缁囧垪
+                $.ajax({
+                    type: "GET",
+                    url: GetWEBURL() + "/Web/GetOrganizations",
+                    async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                    success: function (result) {
+                        var Organization = "";
+                        Organization += '<option  style="color:blue;" value="">鍏ㄩ儴</option>';
+                        if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            var data = result.data;
+                            for (var i = 0; i < data.length; i++) {
+                                Organization += '<option  style="color:blue;" value="' + data[i].Name + '">' + data[i].Name + '</option>';
+                            }
+                            $("#HUSEORGID").append(Organization);
+                            $("#HUSEORGID").val(sessionStorage["Organization"])
+                            form.render('select');
+                        }
+                        layer.closeAll("loading");
+                    },
+                    complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
+                })
+            }
+            //#endregion
+
+            //鍒锋柊
+            function get_Refresh() {
+                $("#btnSearch").click();
+            }
+
+            //#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_QCCheckClass/StopGy_QCCheckClass", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        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('row(mainTable)', function (obj) {
@@ -690,124 +1026,6 @@
 
             //#endregion
 
-            //#region 闅愯棌鍒楄缃�
-            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 鏄剧ず鍒楁暟鎹�
-            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 = ["鍗曟嵁ID", "HMouldID", "hsubid", "HManagerID", "婧愬崟涓诲唴鐮�", "婧愬崟瀛愬唴鐮�"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
-
-                            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 (dataCols[3] > 0) {
-                                    option.cols[0][i + 1]["width"] = dataCols[3];
-                                }
-                                //璁剧疆鍐呭瀛椾綋澶у皬
-                                if (data1.data[0].HFontSize != 0) {
-                                    option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
-                                } else {
-                                    option.cols[0][i + 1]["style"] = "font-size:100%";
-                                }
-                                //璁剧疆鍒楀
-                                //if (data1.data[0].HColumnWidth != 0) {
-                                //    option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
-                                //} else {
-                                //    option.cols[0][i + 1]["width"] = "";
-                                //}
-                                //鏄剧ず鍒�
-                                if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
-                                    option.cols[0][i + 1]["hide"] = false;
-                                }
-                                //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
-                                switch (dataCols[2]) {
-                                    case "L":
-                                        option.cols[0][i + 1]["align"] = "left";
-                                        break;
-                                    case "M":
-                                        option.cols[0][i + 1]["align"] = "center";
-                                        break;
-                                    case "R":
-                                        option.cols[0][i + 1]["align"] = "right";
-                                        break;
-                                }
-                            }
-
-                            //鍙栨秷鍐荤粨鍒�
-                            for (var i = 1; i < option.cols[0].length - 1; i++) {
-                                if (option.cols[0][i]["fixed"] != null) {
-                                    option.cols[0][i]["fixed"] = null;
-                                }
-                                else {
-                                    break;
-                                }
-                            }
-                            //鍐荤粨鍒�
-                            if (data1.data[0].HFixCols != 0) {
-                                for (var i = 0; i < data1.data[0].HFixCols; i++) {
-                                    if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
-                                        data1.data[0].HFixCols += 1;
-                                    }
-                                    option.cols[0][i + 1]["fixed"] = "left";
-                                }
-                            }
-                            table.render(option);
-                        } else {
-                            table.render(option);
-                        }
-                    }, error: function () {
-                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
-                    }
-                })
-            }
-            //#endregion
-
             //#region 鍒楁槑鏄剧ず涓嬫媺妗�
             function ColFilter() {
                 var Organization = '<option  value="0" selected="selected" ></option>';
@@ -818,6 +1036,10 @@
                 }
                 $("#ColName").empty();
                 $("#ColName").append(Organization);
+                $("#ColName1").empty();
+                $("#ColName1").append(Organization);
+                $("#ColName2").empty();
+                $("#ColName2").append(Organization);
                 form.render('select');
             }
             //#endregion
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_Warehouse.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_Warehouse.html"
index 056da0a..c48f1df 100644
--- "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_Warehouse.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_Warehouse.html"
@@ -9,7 +9,12 @@
     <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
     <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
     <script src="../../../layuiadmin/layui/layui.js"></script>
-
+    <script src="../../../layuiadmin/HideButton_New.js"></script>
+    <script src="../../../layuiadmin/SetColumn.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>
 </head>
 <body>
     <div class="layui-fluid">
@@ -139,22 +144,23 @@
                         </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="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh"></i>鍒锋柊</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_SouceExcel"><i class="layui-icon layui-icon-delete"></i>瀵煎叆</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Stop"><i class="layui-icon layui-icon-radio"></i>绂佺敤</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeStop"><i class="layui-icon layui-icon-radio"></i>鍙嶇鐢�</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_Print"><i class="layui-icon layui-icon-print"></i>鎵撳嵃</button>
+                            <div class="layui-btn-container" id="toolbarDemo_ButtonSet">
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_SouceExcel" id="set_SouceExcel"><i class="layui-icon layui-icon-delete"></i>瀵煎叆</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="get_export" id="get_export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew" id="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill" id="set_ShowBill"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill" id="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit" id="btn-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit" id="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Stop" id="btn-Stop"><i class="layui-icon layui-icon-radio"></i>绂佺敤</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeStop" id="btn-DeStop"><i class="layui-icon layui-icon-radio"></i>鍙嶇鐢�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn" id="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideButton" id="HideButton"><i class="layui-icon layui-icon-form"></i>鎸夐挳璁剧疆</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="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="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh" id="get_Refresh"><i class="layui-icon layui-icon-refresh"></i>鍒锋柊</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit" id="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_Print" id="set_Print"><i class="layui-icon layui-icon-print"></i>鎵撳嵃</button>
 
                             </div>
                         </script>
@@ -163,10 +169,7 @@
             </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>
         layui.config({
             base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
@@ -186,6 +189,8 @@
             var option = [];
             var Organization = sessionStorage["Organization"]
             var HModName = "Gy_Warehouse";
+            var set_HideButton_ID = "toolbarDemo_ButtonSet";
+            var HBillType = "Gy_Warehouse";
             //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
             var titleData = ["HItemID", "HParentID"];
 
@@ -265,7 +270,11 @@
                     case 'get_Exit': parent.layui.admin.events.closeThisTabs();
                         break;
                     //鍒楄缃�
-                    case 'set_HideColumn': get_HideColumn();
+                    case 'set_HideColumn': get_HideColumnNoPage(HModName, sessionStorage["HUserName"], option, get_FastQuery);
+                        break;
+                    //鎸夐挳璁剧疆
+                    case 'set_HideButton':
+                        get_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
                         break;
                 };
             });
@@ -465,16 +474,17 @@
                                 , limit: 50
                                 , cellMinWidth: 90
                             }
-                            ins = table.render(option);
-
+                           
                             //鍒锋柊琛ㄦ牸鏁版嵁
-                            DisPlay_HideColumn();
+                            DisPlay_HideColumn(HModName, sessionStorage["HUserName"], option, titleData);
+                            ins = table.render(option);
 
                             layer.close(ajaxLoad);
                             if ($("#ColName option").length < 1) {
                                 ColFilter();
                                 get_DefaultModule();//鍔犺浇鏂规
                             }
+                            Display_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
                             //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
                         } else {
                             layer.close(ajaxLoad);
@@ -561,7 +571,7 @@
                             com2 = "not like'%" + ColContent2 + "%'";
                             break;
                         default:
-                            com2 = "" + Comparator + "'" + ColContent + "'";
+                            com2 = "" + Comparator2 + "'" + ColContent2 + "'";
                             break;
                     }
                     sWhere += " and " + ColName2 + " " + com2;
@@ -863,133 +873,8 @@
                 }
             }
 
-            //#region 闅愯棌鍒楄缃�
-            function get_HideColumn() {
-                var colName = "";
-                var contentUrl = "";
-                for (var i = 1; i < option.cols[0].length - 1; i++) {
-                    colName += option.cols[0][i]["field"] + ",";
-                }
-                var urlStr = window.document.location.pathname;//鑾峰彇鏂囦欢璺緞
-                var urlLen = urlStr.split('/');
-                for (var i = 0; i < urlLen.length - 4; i++) {
-                    contentUrl += "../";
-                }
-                colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
-
-                contentUrl += '鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName;
-
-                layer.open({
-                    type: 2
-                    , skin: "layui-layer-rim" //鍔犱笂杈规
-                    , title: "闅愯棌鍒楄缃�"  //鏍囬
-                    , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
-                    , shift: 2 //寮瑰嚭鍔ㄧ敾
-                    , area: ["50%", "90%"] //绐椾綋澶у皬
-                    , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
-                    , content: [contentUrl, "yes"]
-                    , btn: ["纭畾", "鍙栨秷"]
-                    , btn1: function (index, laero) {
-                        //鍒锋柊琛ㄦ牸鏁版嵁
-                        DisPlay_HideColumn();
-                        //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
-                        layer.close(index);//鍏抽棴寮圭獥
-                    }
-                })
-            }
-            //#endregion
-            //#region 鏄剧ず鍒楁暟鎹�
-            function DisPlay_HideColumn() {
-                $.ajax({
-                    url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
-                    type: "GET",
-                    async: false,
-                    data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
-                    success: function (data1) {
-                        if (data1.data.length != 0) {
-
-                            var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
-                            /*var titleData = ["鍗曟嵁ID", "HMouldID", "hsubid", "HManagerID", "婧愬崟涓诲唴鐮�", "婧愬崟瀛愬唴鐮�"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�*/
-
-                            dataCol = data1.data[0].HGridString.split(',');
-
-                            for (var i = 0; i < option.cols[0].length - 2; i++) {
-                                var dataCols = dataCol[i].split('|');
-                                //闅愯棌鍒�
-                                if (dataCols[1] == 1) {
-                                    option.cols[0][i + 1]["hide"] = true;
-                                }
-                                //璁剧疆鍒楀
-                                if (dataCols[3] > 0) {
-                                    option.cols[0][i + 1]["width"] = dataCols[3];
-                                }
-                                //璁剧疆鍐呭瀛椾綋澶у皬
-                                if (data1.data[0].HFontSize != 0) {
-                                    option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
-                                } else {
-                                    option.cols[0][i + 1]["style"] = "font-size:100%";
-                                }
-                                //璁剧疆鍒楀
-                                //if (data1.data[0].HColumnWidth != 0) {
-                                //    option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
-                                //} else {
-                                //    option.cols[0][i + 1]["width"] = "";
-                                //}
-                                //鏄剧ず鍒�
-                                if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
-                                    option.cols[0][i + 1]["hide"] = false;
-                                }
-                                //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
-                                switch (dataCols[2]) {
-                                    case "L":
-                                        option.cols[0][i + 1]["align"] = "left";
-                                        break;
-                                    case "M":
-                                        option.cols[0][i + 1]["align"] = "center";
-                                        break;
-                                    case "R":
-                                        option.cols[0][i + 1]["align"] = "right";
-                                        break;
-                                }
-                                //璁剧疆琛ㄦ牸title灞炴�ф樉绀哄埆鍚�
-                                if (dataCols[4] != null && dataCols[4] != "") {
-                                    option.cols[0][i + 1]["title"] = dataCols[4];
-                                }
-
-                                //缁熻鍒�
-                                if (dataCols[6] == 1) {
-                                    option.cols[0][i + 1]["totalRow"] = true;
-                                }
-                            }
-
-                            //鍙栨秷鍐荤粨鍒�
-                            for (var i = 1; i < option.cols[0].length - 1; i++) {
-                                if (option.cols[0][i]["fixed"] != null) {
-                                    option.cols[0][i]["fixed"] = null;
-                                }
-                                else {
-                                    break;
-                                }
-                            }
-                            //鍐荤粨鍒�
-                            if (data1.data[0].HFixCols != 0) {
-                                for (var i = 0; i < data1.data[0].HFixCols; i++) {
-                                    if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
-                                        data1.data[0].HFixCols += 1;
-                                    }
-                                    option.cols[0][i + 1]["fixed"] = "left";
-                                }
-                            }
-                            table.render(option);
-                        } else {
-                            table.render(option);
-                        }
-                    }, error: function () {
-                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
-                    }
-                })
-            }
-            //#endregion
+          
+          
 
             //#region 鍒楁槑鏄剧ず涓嬫媺妗�
             function ColFilter() {
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_DotCheckEdit.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_DotCheckEdit.html"
index 809fe86..d230285 100644
--- "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_DotCheckEdit.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_DotCheckEdit.html"
@@ -35,7 +35,12 @@
                         </div>
                         <div class="layui-card-body">
                             <div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
+                                <ul class="layui-tab-title" lay-filter="tab-all">
+                                    <li lay-id="1" style="padding:1px;" class="layui-this">鍩烘湰淇℃伅</li>
+                                    <li>鍏朵粬淇℃伅</li>
+                                </ul>
                                 <div class="layui-tab-content">
+                                    <!--鍩烘湰淇℃伅-->
                                     <div class="layui-tab-item layui-show">
                                         <div class="layui-form-item">
                                             <div class="layui-inline">
@@ -57,12 +62,7 @@
                                                     <input class="layui-input" name="HHelpCode" lay-verify="HHelpCode" id="HHelpCode">
                                                 </div>
                                             </div>
-                                            <div class="layui-inline">
-                                                <label class="layui-form-label">澶囨敞</label>
-                                                <div class="layui-input-inline">
-                                                    <textarea placeholder="璇疯緭鍏ョ淮澶囨敞" class="layui-textarea" name="HRemark" id="HRemark"></textarea>
-                                                </div>
-                                            </div>                                            
+
                                         </div>
                                         <div class="layui-form-item">
                                             <div class="layui-inline">
@@ -75,18 +75,113 @@
                                                     </button>
                                                 </div>
                                             </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label" style="width: 85px;">浣跨敤缁勭粐</label>
+                                                <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
+                                                    <input type="hidden" class="layui-input" lay-verify="HCREATEORGID" name="HCREATEORGID" id="HCREATEORGID">
+                                                    <select name="HUSEORGID" id="HUSEORGID" lay-verify="HUSEORGID">
+                                                        <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+                                                    </select>
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label" style="width: 85px;">浣跨敤鏍囧織</label>
+                                                <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
+                                                    <select name="HUseFlag" id="HUseFlag" lay-verify="HUseFlag">
+                                                        <option value="鏈娇鐢�" selected="selected">鏈娇鐢�</option>
+                                                        <option value="宸蹭娇鐢�">宸蹭娇鐢�</option>
+                                                        <option value="鏈娴�">鏈娴�</option>
+                                                    </select>
+                                                </div>
+                                            </div>
                                         </div>
+                                        <div class="layui-row">
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">鐐规椤圭洰<br />绫诲瀷</label>
+                                                <div class="layui-input-block" style="width: 185px;">
+                                                    <select name="HDotCheckType" id="HDotCheckType" lay-verify="HDotCheckType">
+                                                        <option value="璁惧" selected="selected">璁惧</option>
+                                                        <option value="鍣ㄥ叿">鍣ㄥ叿</option>
+                                                    </select>
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="layui-row">
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">澶囨敞</label>
+                                                <div class="layui-input-inline">
+                                                    <textarea placeholder="璇疯緭鍏ョ淮澶囨敞" class="layui-textarea" name="HRemark" id="HRemark"></textarea>
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">绂佺敤鏍囧織</label>
+                                                <div class="layui-input-block">
+                                                    <input type="checkbox" name="HStopflag" id="HStopflag" lay-skin="primary" title="">
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <!--鍏朵粬淇℃伅-->
+                                    <div class="layui-tab-item">
                                         <div class="layui-form-item">
-                                            <label class="layui-form-label">绂佺敤鏍囧織</label>
-                                            <div class="layui-input-block">
-                                                <input type="checkbox" name="HStopflag" id="HStopflag" lay-skin="primary" title="">
+                                            <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="HModifyEmp" id="HModifyEmp" 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>
+                                            <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="HModifyTime" id="HModifyTime" 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>
                                         </div>
                                     </div>
                                 </div>
                             </div>
                         </div>
-
                     </form>
                 </div>
             </div>
@@ -122,33 +217,29 @@
             //#endregion
             //甯歌鐢ㄦ硶
 
+            Organ();
+            $("#HStopflag").attr("disabled", true);
+            $("#HUseFlag").attr("disabled", true);
+            layui.form.render('checkbox');
 
-            if (OperationType == 3) {
-                $.ajax({
-                    url: GetWEBURL() + "/Gy_DotCheck/EditDotCheck",
-                    type: "GET",
-                    data: {
-                        "HInterID": linterid
-                    },
-                    success: function (d) {
 
-                        ajaxReturnData = JSON.parse(JSON.stringify(d)).data;
-                        $("#HNumber").val(d.data[0].鐐规椤圭洰浠g爜);
-                        $("#HName").val(d.data[0].鐐规椤圭洰鍚嶇О);
-                        $("#HHelpCode").val(d.data[0].鍔╄鐮�);
-                        $("#HRemark").val(d.data[0].澶囨敞);
-                        $("#HLevel").val(d.data[0].绛夌骇);
-                        $("#HDotCheckItemClassID").val(d.data[0].HDotCheckItemClassID);
-                        $("#HDotCheckItemClassName").val(d.data[0].鐐规椤圭洰鍒嗙被鍚嶇О);
-                        $("input[name='HStopflag']").prop("checked", d.data[0].绂佺敤鏍囪 == 'Y' ? true : false);//true:閫変腑 false:涓嶉�変腑
-                        layui.form.render();//瀹炴椂娓叉煋閫変腑鍜屼笉閫変腑鐨勬牱寮�,鏈�濂芥坊鍔犺繖鍙ヨ瘽
-                        $("#HUpDater").val(sessionStorage["HUserName"]);//淇敼浜�
-                        //table.reload(layTableId, {
-                        //    data: ajaxReturnData
-                        //});
-                    }
+            if (OperationType == 1) {   //鏂板
+                $("#HMakeEmp").val(sessionStorage["HUserName"]);
 
-                });
+            } else if (OperationType == 2) {
+                RoadBillMain(linterid);
+                $("#HMakeEmp").val(sessionStorage["HUserName"]);
+                $("#HModifyEmp").val("");
+                $("#HStopEmp").val("");
+                $("#HCheckEmp").val("");
+                $("#HMakeTime").val("");
+                $("#HModifyTime").val("");
+                $("#HStopTime").val("");
+                $("#HCheckTime").val("");
+                $("#HNumber").val("");
+                $("#HItemID").val(0);
+            } else if (OperationType == 3) {
+                RoadBillMain(linterid);
             }
 
             //#region 宸ュ叿鎸夐挳
@@ -186,8 +277,8 @@
                                 if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
                                     layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
                                         $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
-                                        var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
-                                        parent.layer.close(index); //鍐嶆墽琛屽叧闂� 聽 聽 聽 聽 聽聽 聽聽聽 聽
+                                        //var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
+                                        //parent.layer.close(index); //鍐嶆墽琛屽叧闂� 聽 聽 聽 聽 聽聽 聽聽聽 聽
                                     });
                                 }
                                 else {
@@ -216,8 +307,8 @@
                                 if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
                                     layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
                                         $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
-                                        var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
-                                        parent.layer.close(index); //鍐嶆墽琛屽叧闂� 聽 聽 聽 聽 聽聽 聽聽聽 聽
+                                        //var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
+                                        //parent.layer.close(index); //鍐嶆墽琛屽叧闂� 聽 聽 聽 聽 聽聽 聽聽聽 聽
                                     });
                                 }
                                 else {
@@ -267,6 +358,67 @@
                 })
             });
 
+            //鑾峰彇缁勭粐
+            function Organ() {
+                //鑾峰彇鐧诲綍椤电粍缁囧垪
+                var Organization = '';
+                $.ajax({
+                    type: "get",
+                    url: GetWEBURL() + "/Web/GetOrganizations",
+                    success: function (result) {
+                        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"])
+                            $("#HCREATEORGID").val(sessionStorage["OrganizationID"])
+                            form.render('select');
+                        }
+                        layer.closeAll("loading");
+                    }
+                })
+            }
+
+            function RoadBillMain(linterid) {
+                $.ajax({
+                    url: GetWEBURL() + "/Gy_DotCheck/EditDotCheck",
+                    type: "GET",
+                    async: false,
+                    data: {
+                        "HInterID": linterid
+                    },
+                    success: function (d) {
+
+                        ajaxReturnData = JSON.parse(JSON.stringify(d)).data;
+                        $("#HNumber").val(d.data[0].鐐规椤圭洰浠g爜);
+                        $("#HName").val(d.data[0].鐐规椤圭洰鍚嶇О);
+                        $("#HHelpCode").val(d.data[0].鍔╄鐮�);
+                        $("#HRemark").val(d.data[0].澶囨敞);
+                        $("#HLevel").val(d.data[0].绛夌骇);
+                        $("#HUSEORGID").val(d.data[0].HUSEORGID);
+                        $("#HMakeEmp").val(d.data[0].鍒涘缓浜�);
+                        $("#HMakeTime").val(d.data[0].鍒涘缓鏃ユ湡);
+                        $("#HCheckEmp").val(d.data[0].瀹℃牳浜�);
+                        $("#HCheckTime").val(d.data[0].瀹℃牳鏃ユ湡);
+                        $("#HModifyEmp").val(d.data[0].淇敼浜�);
+                        $("#HModifyTime").val(d.data[0].淇敼鏃ユ湡);
+                        $("#HStopEmp").val(d.data[0].绂佺敤浜�);
+                        $("#HStopTime").val(d.data[0].绂佺敤鏃ユ湡);
+                        $("#HUseFlag").val(d.data[0].浣跨敤鏍囧織);
+                        $("#HDotCheckType").val(d.data[0].鐐规椤圭洰绫诲瀷);
+
+                        $("#HDotCheckItemClassID").val(d.data[0].HDotCheckItemClassID);
+                        $("#HDotCheckItemClassName").val(d.data[0].鐐规椤圭洰鍒嗙被鍚嶇О);
+                        $("input[name='HStopflag']").prop("checked", d.data[0].绂佺敤鏍囪 == 'Y' ? true : false);//true:閫変腑 false:涓嶉�変腑
+                        layui.form.render();//瀹炴椂娓叉煋閫変腑鍜屼笉閫変腑鐨勬牱寮�,鏈�濂芥坊鍔犺繖鍙ヨ瘽
+                        //$("#HUpDater").val(sessionStorage["HUserName"]);//淇敼浜�
+                    }
+
+                });
+            }
+
             function f_alert(sMsg) {
                 layer.alert(sMsg, { icon: 5 });
 
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_DotCheckList.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_DotCheckList.html"
index 719c806..66bdf95 100644
--- "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_DotCheckList.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_DotCheckList.html"
@@ -16,6 +16,8 @@
     <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
     <script src="../../../layuiadmin/layui/lay/modules/util.js"></script>
     <script src="../../../layuiadmin/PubCustom.js"></script>
+    <script src="../../../layuiadmin/HideButton_New.js"></script>
+    <script src="../../../layuiadmin/SetColumn.js"></script>
     <style>
         /*鏍戠姸鍥剧偣鍑婚珮浜彉鑹�*/
         .layui-tree-set-active > .layui-tree-entry .layui-tree-main {
@@ -51,6 +53,14 @@
                                     <label class="layui-form-label" style="width: 85px;">鍚嶇О</label>
                                     <div class="layui-input-block" style="margin-left: 120px;">
                                         <input type="text" class="layui-input ForFilteringSchemes" name="HName" id="HName">
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label" style="width: 85px;">缁勭粐</label>
+                                    <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
+                                        <select name="HUSEORGID" id="HUSEORGID" class="ForFilteringSchemes" lay-verify="HUSEORGID">
+                                            <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+                                        </select>
                                     </div>
                                 </div>
                                 <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
@@ -89,6 +99,60 @@
                                             <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent">
                                         </div>
                                     </div>
+                                    <div class="layui-row" style="margin-top:5px">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">杩囨护</label>
+                                            <div class="layui-input-block">
+                                                <select name="ColName1" id="ColName1" lay-filter="ColName1" style="width:190px;" class="ForFilteringSchemes">
+                                                </select>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <select name="Comparator1" id="Comparator1" lay-filter="Comparator1" 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="ColContent1" id="ColContent1">
+                                        </div>
+                                    </div>
+                                    <div class="layui-row" style="margin-top:5px">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">杩囨护</label>
+                                            <div class="layui-input-block">
+                                                <select name="ColName2" id="ColName2" lay-filter="ColName2" style="width:190px;" class="ForFilteringSchemes">
+                                                </select>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <select name="Comparator2" id="Comparator2" lay-filter="Comparator2" 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="ColContent2" id="ColContent2">
+                                        </div>
+                                    </div>
                                 </div>
                             </div>
                         </div>
@@ -103,17 +167,23 @@
                             </div>
                         </div>
                         <script type="text/html" id="toolbarDemo">
-                            <div class="layui-btn-container">
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_SouceExcel"><i class="layui-icon layui-icon-delete"></i>瀵煎叆</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
-                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-view"><i class="layui-icon layui-icon-tips"></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 class="layui-btn-container" id="toolbarDemo_ButtonSet">
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_SouceExcel" id="set_SouceExcel"><i class="layui-icon layui-icon-delete"></i>瀵煎叆</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Export" id="btn_Export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew" id="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Copy" id="btn_Copy"><i class="layui-icon layui-icon-add-1"></i>澶嶅埗</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill" id="set_ShowBill"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill" id="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit" id="btn-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit" id="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Stop" id="btn-Stop"><i class="layui-icon layui-icon-radio"></i>绂佺敤</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeStop" id="btn-DeStop"><i class="layui-icon layui-icon-radio"></i>鍙嶇鐢�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_HideColumn" id="btn_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideButton" id="set_HideButton"><i class="layui-icon layui-icon-form"></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="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh" id="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit" id="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
                             </div>
                         </script>
                     </form>
@@ -147,6 +217,9 @@
             var sWhere = "";
             var option = [];
             var HModName = "Gy_DotCheckList";
+            var HBillType = "Gy_DotCheckList";
+            var ins;                //鐢ㄤ簬瀵煎嚭excel
+            var set_HideButton_ID = "toolbarDemo_ButtonSet";                    //闇�瑕佽缃殑鎸夐挳鐨勭埗绾ц妭鐐圭殑id
             //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
             var titleData = ["HItemID"];
             //#endregion
@@ -179,11 +252,17 @@
                     //缂栬緫
                     case 'set_ShowBill': set_ShowBill();
                         break;
+                    case 'btn_Copy':
+                        set_copy();
+                        break;
                     //鍒犻櫎
                     case 'set_DeleteBill': set_DeleteBill();
                         break;
                     //瀵煎叆
                     case 'set_SouceExcel': set_SouceExcel();
+                        break;
+                    //瀵煎嚭鎸夐挳
+                    case 'btn_Export': btn_Export();
                         break;
                     //鍒锋柊
                     case 'get_Refresh': set_ClearQuery();
@@ -192,16 +271,25 @@
                     case 'btn-view':
                         get_ViewReport();
                         break;
-                    //瀹℃牳
-                    case 'btn-Audit': set_AuditBill();
+                    //瀹℃牳鎸夐挳
+                    case 'btn-Audit':
+                        set_CheckBill(0);
                         break;
-                    //鍙嶅鏍�
-                    case 'btn-DeAudit': set_DeAuditBill();
+                    //鍙嶅鏍告寜閽�
+                    case 'btn-DeAudit':
+                        set_CheckBill(1);
+                        break;
+                    //绂佺敤鎸夐挳
+                    case 'btn-Stop':
+                        set_De_Stop(0);
+                        break;
+                    //鍙嶇鐢ㄦ寜閽�
+                    case 'btn-DeStop':
+                        set_De_Stop(1);
                         break;
                     //閫�鍑烘寜閽�
                     case 'get_Exit': Pub_Close(2);
                         break;
-
                     //淇濆瓨鏂规
                     case 'set_SaveScheme': set_SaveScheme();
                         break;
@@ -209,7 +297,11 @@
                     case 'set_ReadScheme': set_ReadScheme();
                         break;
                     //鍒楄缃�
-                    case 'set_HideColumn': get_HideColumn();
+                    case 'btn_HideColumn': get_HideColumnNoPage(HModName, sessionStorage["HUserName"], option, get_FastQuery);
+                        break;
+                    //鎸夐挳璁剧疆
+                    case 'set_HideButton':
+                        get_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
                         break;
                 };
             });
@@ -272,6 +364,7 @@
             //鍒濆鍖栬〃鏍�
 
             function set_ClearBill() {
+                set_StockOrg();
                 //鍒濆鍖栬〃鏍�
                 set_InitGrid();
 
@@ -359,17 +452,20 @@
                                 , limit: 50
                                 , cellMinWidth: 90
                             }
-                            table.render(option);
-
+                            ins = table.render(option);
                             //鍒锋柊琛ㄦ牸鏁版嵁
-                            DisPlay_HideColumn();
+                            DisPlay_HideColumn(HModName, sessionStorage["HUserName"], option, titleData);
+                      
+                            table.render(option);
 
                             layer.close(ajaxLoad);
 
-                            if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+                            if ($("#ColName option").length < 1) {
                                 ColFilter();
                             }
 
+                            //鎸夐挳鏁版嵁鏄剧ず
+                            Display_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
                             //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
                         } else {
                             layer.close(ajaxLoad);
@@ -387,9 +483,17 @@
             function get_FastQuery() {
                 var HNumber = $("#HNumber").val();
                 var HName = $("#HName").val();
+                var HUSEORGID = $("#HUSEORGID").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 = "";
@@ -412,14 +516,65 @@
                     }
                     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 鐐规椤圭洰浠g爜 like '%" + HNumber + "%'";
                 }
                 if (HName) {
                     sWhere += " and 鐐规椤圭洰鍚嶇О like '%" + HName + "%'";
                 }
+                if (HUSEORGID) {
+                    sWhere += " and 浣跨敤缁勭粐鍚嶇О = '" + HUSEORGID + "'";
+                }
                 get_Display(sWhere);
                 sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+            }
+            //#endregion
+
+            //#region 瀵煎嚭Execel
+            function btn_Export() {
+                table.exportFile(ins.config.id, option.data, "xls");
             }
             //#endregion
 
@@ -430,6 +585,13 @@
                 $("#ColContent").val("");
                 $("#ColName").val("0");
                 $("#Comparator").val("0");
+                $("#ColContent2").val("");
+                $("#ColName2").val("0");
+                $("#Comparator2").val("0");
+                $("#ColContent1").val("");
+                $("#ColName1").val("0");
+                $("#Comparator1").val("0");
+                $("#HUSEORGID").val(sessionStorage["Organization"]);
                 form.render('select');
 
                 sWhere = "";
@@ -443,7 +605,7 @@
                 layer.open({
                     type: 2
                     , area: ['100%', '100%']
-                    , title: '鐢熶骇璧勬簮瀵煎叆'
+                    , title: '鐐规椤圭洰瀵煎叆'
                     , shift: 0//寮瑰嚭鍔ㄧ敾
                     , content: '../鍩虹璧勬枡/Gy_DotCheck_Excel.html?OperationType=dao&HSouceBillType='
                 })
@@ -483,7 +645,7 @@
                     layer.open({
                         type: 2
                         , area: ['100%', '100%']
-                        , title: '缂栬緫鍣ㄥ叿棰嗙敤鍗�'
+                        , title: '缂栬緫鐐规椤圭洰'
                         , closeBtn: 1
                         , shade: 0.6 //閬僵閫忔槑搴�
                         , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
@@ -560,22 +722,17 @@
                 }
             }
 
-            //瀹℃牳
-            function set_AuditBill() {
+            //#region 鍙嶅鏍�/瀹℃牳鏁版嵁
+            function set_CheckBill(num) {
                 var checkStatus = table.checkStatus('mainTable')
                     , data = checkStatus.data;
                 if (checkStatus.data.length === 1) {
-                    var HBillStatus = data[0].HBillStatus.toString(); //鍗曟嵁鐘舵��
-                    var HInterID = data[0].hmainid.toString();
-                    if (HBillStatus > 0) {
-                        layer.msg('鍗曟嵁涓嶄负鏈鏍哥姸鎬侊紒');
-                        return false;
-                    }
+                    var InterID = data[0].HItemID.toString();
                     //閫昏緫瀹℃牳鏂规硶
                     $.ajax({
                         type: "GET",
-                        url: GetWEBURL() + "/Gy_Mould/AuditProcessReportList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
-                        data: { "HInterID": HInterID, "IsAudit": 0, "CurUserName": sessionStorage["HUserName"] },
+                        url: GetWEBURL() + "/Gy_DotCheck/AuditGy_DotCheck", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        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 () {
@@ -599,23 +756,19 @@
                     layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
                 }
             }
+            //#endregion
 
-            //鍙嶅鏍�
-            function set_DeAuditBill() {
+            //#region 鍙嶇鐢�/绂佺敤鏁版嵁
+            function set_De_Stop(num) {
                 var checkStatus = table.checkStatus('mainTable')
                     , data = checkStatus.data;
                 if (checkStatus.data.length === 1) {
-                    var HBillStatus = data[0].HBillStatus.toString(); //鍗曟嵁鐘舵��
-                    var HInterID = data[0].hmainid.toString();
-                    if (HBillStatus = 0) {
-                        layer.msg('鍗曟嵁宸蹭负鏈鏍哥姸鎬�,鏃犻渶鍙嶅鏍革紒');
-                        return false;
-                    }
+                    var InterID = data[0].HItemID.toString();
                     //閫昏緫瀹℃牳鏂规硶
                     $.ajax({
                         type: "GET",
-                        url: GetWEBURL() + "/Gy_Mould/AuditProcessReportList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
-                        data: { "HInterID": HInterID, "IsAudit": 1, "CurUserName": sessionStorage["HUserName"] },
+                        url: GetWEBURL() + "/Gy_DotCheck/StopGy_DotCheck", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        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 () {
@@ -638,8 +791,61 @@
                 else {
                     layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
                 }
-
             }
+            //#endregion
+
+
+            //#region   鑾峰彇缁勭粐
+            function set_StockOrg() {
+                //鑾峰彇鐧诲綍椤电粍缁囧垪
+                $.ajax({
+                    type: "GET",
+                    url: GetWEBURL() + "/Web/GetOrganizations",
+                    async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                    success: function (result) {
+                        var Organization = "";
+                        Organization += '<option  style="color:blue;" value="">鍏ㄩ儴</option>';
+                        if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            var data = result.data;
+                            for (var i = 0; i < data.length; i++) {
+                                Organization += '<option  style="color:blue;" value="' + data[i].Name + '">' + data[i].Name + '</option>';
+                            }
+                            $("#HUSEORGID").append(Organization);
+                            $("#HUSEORGID").val(sessionStorage["Organization"])
+                            form.render('select');
+                        }
+                        layer.closeAll("loading");
+                    },
+                    complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
+                })
+            }
+            //#endregion
+
+            //澶嶅埗
+            function set_copy() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var HInterID = data[0].HItemID.toString();
+                    layer.open({
+                        type: 2
+                        , area: ['100%', '100%']
+                        , title: '缂栬緫鐐规椤圭洰'
+                        , shade: 0.6 //閬僵閫忔槑搴�
+                        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                        , content: '../鍩虹璧勬枡/Gy_DotCheckEdit.html?OperationType=2&hID=' + HInterID
+                        , resize: false
+                        , cancel: function () {
+
+                        }
+                    })
+
+                } else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+                }
+            }
+
 
             // 鏍戠姸鍥炬煡璇�
             function get_Display_Tree() {
@@ -688,6 +894,7 @@
                 tree.render({
                     elem: '#TreeTable' //榛樿鏄偣鍑昏妭鐐瑰彲杩涜鏀剁缉
                     , data: treeTable
+                    , onlyIconControl: true
                     , click: function (obj) {
                         //楂樹寒鍙樿壊
                         $(".layui-tree-set").removeClass('layui-tree-set-active');
@@ -724,126 +931,6 @@
                 return subStr;
             }
 
-
-            //#region 闅愯棌鍒楄缃�
-            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 鏄剧ず鍒楁暟鎹�
-            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 = ["鍗曟嵁ID", "HMouldID", "hsubid", "HManagerID", "婧愬崟涓诲唴鐮�", "婧愬崟瀛愬唴鐮�"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
-
-                            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 (dataCols[3] > 0) {
-                                    option.cols[0][i + 1]["width"] = dataCols[3];
-                                }
-                                //璁剧疆鍐呭瀛椾綋澶у皬
-                                if (data1.data[0].HFontSize != 0) {
-                                    option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
-                                } else {
-                                    option.cols[0][i + 1]["style"] = "font-size:100%";
-                                }
-                                //璁剧疆鍒楀
-                                //if (data1.data[0].HColumnWidth != 0) {
-                                //    option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
-                                //} else {
-                                //    option.cols[0][i + 1]["width"] = "";
-                                //}
-                                //鏄剧ず鍒�
-                                if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
-                                    option.cols[0][i + 1]["hide"] = false;
-                                }
-                                //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
-                                switch (dataCols[2]) {
-                                    case "L":
-                                        option.cols[0][i + 1]["align"] = "left";
-                                        break;
-                                    case "M":
-                                        option.cols[0][i + 1]["align"] = "center";
-                                        break;
-                                    case "R":
-                                        option.cols[0][i + 1]["align"] = "right";
-                                        break;
-                                }
-                            }
-
-                            //鍙栨秷鍐荤粨鍒�
-                            for (var i = 1; i < option.cols[0].length - 1; i++) {
-                                if (option.cols[0][i]["fixed"] != null) {
-                                    option.cols[0][i]["fixed"] = null;
-                                }
-                                else {
-                                    break;
-                                }
-                            }
-                            //鍐荤粨鍒�
-                            if (data1.data[0].HFixCols != 0) {
-                                for (var i = 0; i < data1.data[0].HFixCols; i++) {
-                                    if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
-                                        data1.data[0].HFixCols += 1;
-                                    }
-                                    option.cols[0][i + 1]["fixed"] = "left";
-                                }
-                            }
-                            table.render(option);
-                        } else {
-                            table.render(option);
-                        }
-                    }, error: function () {
-                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
-                    }
-                })
-            }
-            //#endregion
-
             //#region 鍒楁槑鏄剧ず涓嬫媺妗�
             function ColFilter() {
                 var Organization = '<option  value="0" selected="selected" ></option>';
@@ -854,6 +941,10 @@
                 }
                 $("#ColName").empty();
                 $("#ColName").append(Organization);
+                $("#ColName1").empty();
+                $("#ColName1").append(Organization);
+                $("#ColName2").empty();
+                $("#ColName2").append(Organization);
                 form.render('select');
             }
             //#endregion
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_MaintainClass.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_MaintainClass.html"
new file mode 100644
index 0000000..67f0ad4
--- /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_MaintainClass.html"
@@ -0,0 +1,1056 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <title>淇濆吇椤圭洰鍒嗙被鍒楄〃</title>
+    <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/soulTable.slim.js"></script>
+    <script src="../../../layuiadmin/HideButton_New.js"></script>
+    <script src="../../../layuiadmin/SetColumn.js"></script>
+    <script src="../../../layuiadmin/PubCustom.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">浠g爜</label>
+                                    <div class="layui-input-block">
+                                        <input type="text" class="layui-input ForFilteringSchemes" name="HNumber" id="HNumber">
+                                    </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="HName" id="HName">
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label" style="width: 85px;">缁勭粐</label>
+                                    <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
+                                        <select name="HUSEORGID" id="HUSEORGID" class="ForFilteringSchemes" lay-verify="HUSEORGID">
+                                            <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+                                        </select>
+                                    </div>
+                                </div>
+                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                </button>
+                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+                                <!--鏄剧ず褰撳墠杩囨护鏂规-->
+                                <div class="layui-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:5px">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">杩囨护</label>
+                                            <div class="layui-input-block">
+                                                <select name="ColName" id="ColName" class="ForFilteringSchemes" lay-filter="ColName" style="width:190px;">
+                                                </select>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <select name="Comparator" id="Comparator" class="ForFilteringSchemes" lay-filter="Comparator" style="width:190px;">
+                                                <option value="0" selected="selected"></option>
+                                                <option value="=">=</option>
+                                                <option value=">=">>=</option>
+                                                <option value=">">></option>
+                                                <option value="<="><=</option>
+                                                <option value="<"><</option>
+                                                <option value="<>"><></option>
+                                                <option value="7">鍖呭惈</option>
+                                                <option value="8">宸﹀寘鍚�</option>
+                                                <option value="9">鍙冲寘鍚�</option>
+                                                <option value="10">涓嶅寘鍚�</option>
+                                            </select>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent">
+                                        </div>
+                                    </div>
+                                    <div class="layui-row" style="margin-top:5px">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">杩囨护</label>
+                                            <div class="layui-input-block">
+                                                <select name="ColName1" id="ColName1" 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>
+                        <table class="" id="mainTable" lay-filter="mainTable"></table>
+                        <script type="text/html" id="toolbarDemo">
+                            <div class="layui-btn-container" id="toolbarDemo_ButtonSet">
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_SouceExcel" id="set_SouceExcel"><i class="layui-icon layui-icon-delete"></i>瀵煎叆</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Export" id="btn_Export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add" id="btn-Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Copy" id="btn_Copy"><i class="layui-icon layui-icon-add-1"></i>澶嶅埗</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit" id="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete" id="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit" id="btn-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit" id="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Stop" id="btn-Stop"> <i class="layui-icon layui-icon-radio"></i>绂佺敤</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeStop" id="btn-DeStop"><i class="layui-icon layui-icon-radio"></i>鍙嶇鐢�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn" id="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideButton" id="set_HideButton"><i class="layui-icon layui-icon-form"></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="get_Refresh" id="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit" id="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-view" id="btn-view"><i class="layui-icon layui-icon-tips"></i>棰勮</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-print" id="btn-print"><i class="layui-icon layui-icon-print"></i>鎵撳嵃</button>
+                            </div>
+                        </script>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <script>
+        layui.config({
+            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index', //涓诲叆鍙fā鍧�
+        }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate','soulTable'], function () {
+
+            //#region 鍏叡鍙橀噺
+            var $ = layui.$
+                , admin = layui.admin
+                , layer = layui.layer
+                , table = layui.table
+                , form = layui.form
+                , element = layui.element
+                , laypage = layui.laypage
+                , laydate = layui.laydate
+                , soulTable = layui.soulTable
+            var sWhere = "";
+            var option = [];
+            var HModName = "Gy_MaintainClass";
+            var HBillType = "Gy_MaintainClass";
+            var ins;                //鐢ㄤ簬瀵煎嚭excel
+            var set_HideButton_ID = "toolbarDemo_ButtonSet";                    //闇�瑕佽缃殑鎸夐挳鐨勭埗绾ц妭鐐圭殑id
+            //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+            var titleData = [];
+            //#endregion
+
+            //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+            //#region 銆愯繃婊ゆ柟妗堛��
+
+            //杩囨护鏉′欢鐨刢lass绫�
+            var HClassTag = "ForFilteringSchemes";
+            //妯″潡鍚嶇О锛堜腑鏂囩増锛� 姣忎釜妯″潡椤甸潰閮介渶瑕佷慨鏀�
+            window.HModuleName = "淇濆吇椤圭洰鍒嗙被";
+            //鏄惁宸茬粡閫夋嫨浜嗚繃婊ゆ柟妗堬紙鍏ㄥ眬鍙橀噺锛�
+            window.HDefaultFilter = "";
+            //閫夋嫨鐨勮繃婊ゆ柟妗堝唴鐮侊紙鍏ㄥ眬鍙橀噺锛�
+            window.HInterID_Choose = 0;
+
+            //#endregion
+
+            //鍒濆鍖栫晫闈�
+            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 'set_SouceExcel': set_SouceExcel();
+                        break;
+                    //瀵煎嚭鎸夐挳
+                    case 'btn_Export': btn_Export();
+                        break;
+                    //澶嶅埗
+                    case 'btn_Copy':
+                        set_copy();
+                        break;
+                    //鍒犻櫎
+                    case 'btn-Delete': set_DeleteBill();
+                        break;
+                    //鍒锋柊
+                    case 'get_Refresh': get_Refresh();
+                        break;
+                    //瀹℃牳鎸夐挳
+                    case 'btn-Audit':
+                        set_CheckBill(0);
+                        break;
+                    //鍙嶅鏍告寜閽�
+                    case 'btn-DeAudit':
+                        set_CheckBill(1);
+                        break;
+                    //绂佺敤鎸夐挳
+                    case 'btn-Stop':
+                        set_De_Stop(0);
+                        break;
+                    //鍙嶇鐢ㄦ寜閽�
+                    case 'btn-DeStop':
+                        set_De_Stop(1);
+                        break;
+                    //閫�鍑烘寜閽�
+                    case 'get_Exit': Pub_Close(2);
+                        break;
+                    //鍒楄缃�
+                    case 'set_HideColumn': get_HideColumnNoPage(HModName, sessionStorage["HUserName"], option, get_FastQuery);
+                        break;
+                    //淇濆瓨鏂规
+                    case 'set_SaveScheme': set_SaveScheme();
+                        break;
+                    //璇诲彇鏂规
+                    case 'set_ReadScheme': set_ReadScheme();
+                        break;
+                    case 'set_HideButton':
+                        get_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
+                        break;
+                };
+            });
+
+            //#endregion
+
+            //#region 鏌ヨ鎸夐挳
+            form.on('submit(btnSearch)', function (data) {//閫夋嫨浠撲綅
+
+                get_FastQuery();
+            });
+            //#endregion
+
+            //閲嶇疆鎸夐挳
+            form.on('submit(btnReSearch)', function (data) {
+                $("#WorkCenter").val("");//鍗曟嵁鍙�
+                $("#hnumber").val("");//鐗╂枡
+                $("#HOrderProcNO").val("");//鍗曟嵁绫诲瀷
+                $("#ColName").val("0");
+                $("#Comparator").val("0");
+                $("#ColContent").val("");
+                $("#ColContent2").val("");
+                $("#ColName2").val("0");
+                $("#Comparator2").val("0");
+                $("#ColContent1").val("");
+                $("#ColName1").val("0");
+                $("#Comparator1").val("0");
+                $("#HUSEORGID").val(sessionStorage["Organization"])
+                form.render('select');
+                $("#btnSearch").click();
+                set_ClearQuery();
+            });
+            //#endregion
+
+            //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
+            //#region 鍒濆鍖栫晫闈�
+            function set_ClearBill() {
+                set_StockOrg();
+                //鍒濆鍖栬〃鏍�
+                set_InitGrid();
+                //鏌ヨ
+                get_Display(sWhere);
+                //杩囨护鏂规鏌ヨ
+                get_DefaultModule();
+            }
+            //#endregion
+
+            function set_InitGrid() {
+                option = {
+                    elem: '#mainTable'
+                    , toolbar: '#toolbarDemo'
+                    , height: 'full-50'
+                    , page: true
+                    , cellMinWidth: 90
+                    , limit: 50
+                    , limits: [50, 500, 5000, 20000]
+                    , done: function (res, curr, count) {
+                        soulTable.render(this);
+                    }
+                    , cols: [[
+                        { type: 'checkbox', fixed: 'left' }
+                        , { field: 'HItemID', title: 'id', hide: true, sort: true}
+                        , { field: 'HNumber', title: '浠g爜', width: 195, sort: true}
+                        , { field: 'HName', title: '鍚嶇О', width: 180, sort: true}
+                        , { field: 'HHelpCode', title: '鍔╄鐮�', width: 180, sort: true}
+                        , { field: 'HShortNumber', title: '鐭唬鐮�', width: 180, sort: true}
+                        , { field: 'HParentID', title: '鐖剁骇', width: 180, hide: true, sort: true}
+                        , { field: 'HLevel', title: '绛夌骇', width: 180, hide: true, sort: true}
+                        , { field: 'HEndFlag', title: '鏈骇鏍囧織', width: 180, hide: true, sort: true}
+                        , { field: 'HRemark ', title: '澶囨敞 ', width: 180, sort: true}
+                    ]]
+                };
+            }
+
+            //#region 瀵煎嚭Execel
+            function btn_Export() {
+                table.exportFile(ins.config.id, option.data, "xls");
+            }
+            //#endregion
+
+            //#region 閲嶇疆杩囨护鏉′欢鏂规硶
+            function set_ClearQuery() {
+                $("#HNumber").val("");
+                $("#HName").val("");
+                $("#ColContent").val("");
+                $("#ColName").val("0");
+                $("#Comparator").val("0");
+                $("#ColContent2").val("");
+                $("#ColName2").val("0");
+                $("#Comparator2").val("0");
+                $("#ColContent1").val("");
+                $("#ColName1").val("0");
+                $("#Comparator1").val("0");
+                $("#HUSEORGID").val(sessionStorage["Organization"]);
+                sWhere = "";
+            }
+            //#endregion
+
+            //#region 鏌ヨ
+            function get_Display(sWhere) {
+                var ajaxLoad = layer.load();
+                $.ajax({
+                    url: GetWEBURL() + '/Gy_MaintainClass/list',
+                    type: "GET",
+                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+                    success: function (data1) {
+                        if (data1.count == 1) {
+
+                            var data = [];
+                            var col = [];
+                            var totalArray = [];
+                            //缁欑┖鐨勬暟缁勮祴鍊�
+                            for (var key in data1.list) {
+                                data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+                            }
+                            //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+                            col.push({ type: 'checkbox', fixed: 'left' });
+                            for (var i = 0; i < data.length; i++) {
+                                // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
+                                if ($.inArray(data[i].name, titleData) > -1) {
+                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+                                }
+                                else if ($.inArray(data[i].name, totalArray) > -1) {
+                                    col.push({
+                                        field: data[i].id, title: data[i].name, align: 'center', sort: true, totalrow: true, width: 200
+                                    })
+                                } else if (data[i].id == '鍗曟嵁鍙�') {
+                                    col.push({
+                                        field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '鍗曟嵁鍙�'
+                                    })
+                                }
+                                else {
+                                    switch (data[i].Type) {
+                                        //int
+                                        case 'DateTime':
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
+                                            break;
+                                        default:
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+                                    }
+                                }
+                            }
+
+
+                            //鍔ㄦ�佹樉绀哄垪鍚�
+                            option = {
+                                elem: '#mainTable'
+                                , toolbar: '#toolbarDemo'
+                                , cols: [col]
+                                , data: data1.data
+                                , height: 'full-80'
+                                , page: true
+                                , limits: [50, 500, 5000, 20000]
+                                , limit: 50
+                                , cellMinWidth: 90
+                            }
+
+                            option.data = data1.data;
+
+                            //鍒锋柊琛ㄦ牸鏁版嵁
+                            DisPlay_HideColumn(HModName, sessionStorage["HUserName"], option, titleData);
+                            ins = table.render(option);
+                            table.render(option);
+                            //鍒锋柊鎸夐挳鏄剧ず
+                            Display_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
+
+                            layer.close(ajaxLoad);
+                            if ($("#ColName option").length < 1) {
+                                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
+
+            //瀵煎叆
+            function set_SouceExcel() {
+                layer.open({
+                    type: 2
+                    , area: ['100%', '100%']
+                    , title: '鐢熶骇鐝粍瀵煎叆'
+                    , shift: 0//寮瑰嚭鍔ㄧ敾
+                    , content: '../../璁″垝绠$悊/Excel/Gy_RoutingGroup_Excel.html?OperationType=dao&HSouceBillType='
+                })
+            }
+
+            //#region 蹇�熻繃婊�
+            function get_FastQuery() {
+                var HName = $("#HName").val();//鍚嶇О
+                var HNumber = $("#HNumber").val();//浠g爜
+                var HUSEORGID = $("#HUSEORGID").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 (HName) {
+                    sWhere += " and HName like '%" + HName + "%'";
+                }
+                if (HNumber) {
+                    sWhere += " and HNumber like '%" + HNumber + "%'";
+                }
+                if (HUSEORGID) {
+                    sWhere += " and 浣跨敤缁勭粐鍚嶇О = '" + HUSEORGID + "'";
+                }
+                get_Display(sWhere);
+                sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+            }
+            //#endregion
+
+            //#region 鏂板
+            function set_AddNew() {
+                layer.open({
+                    type: 2
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['100%', '100%']
+                    , title: '淇濆吇椤圭洰鍒嗙被-鏂板'
+                    , shift: 0//寮瑰嚭鍔ㄧ敾
+                    , content: '../鍩虹璧勬枡/Gy_MaintainClassEdit.html?OperationType=1&linterid=&HSouceBillType=&linteridSub=-1'
+                })
+            }
+            //#endregion
+
+            //澶嶅埗
+            function set_copy() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var HInterID = data[0].HItemID.toString();
+                    layer.open({
+                        type: 2
+                        , area: ['100%', '100%']
+                        , title: '淇濆吇椤圭洰鍒嗙被'
+                        , shade: 0.6 //閬僵閫忔槑搴�
+                        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                        , content: '../鍩虹璧勬枡/Gy_MaintainClassEdit.html?OperationType=2&linterid=' + HInterID + '&HSouceBillType='
+                        , resize: false
+                        , cancel: function () {
+
+                        }
+                    })
+
+                } else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+                }
+            }
+
+            //#region 缂栬緫
+            function set_ShowBill() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var linterid = data[0].HItemID;
+                    var linteridSub = data[0].hsubid;
+
+                    //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+                    layer.open({
+                        type: 2
+                        , area: ['100%', '100%']
+                        , title: '淇濆吇椤圭洰鍒嗙被-缂栬緫'
+                        , shift: 0//寮瑰嚭鍔ㄧ敾
+                        , content: '../鍩虹璧勬枡/Gy_MaintainClassEdit.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=&linteridSub=' + linteridSub
+                    })
+                } else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+                }
+            }
+            //#endregion
+
+            //#region   鑾峰彇缁勭粐
+            function set_StockOrg() {
+                //鑾峰彇鐧诲綍椤电粍缁囧垪
+                $.ajax({
+                    type: "GET",
+                    url: GetWEBURL() + "/Web/GetOrganizations",
+                    async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                    success: function (result) {
+                        var Organization = "";
+                        Organization += '<option  style="color:blue;" value="">鍏ㄩ儴</option>';
+                        if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            var data = result.data;
+                            for (var i = 0; i < data.length; i++) {
+                                Organization += '<option  style="color:blue;" value="' + data[i].Name + '">' + data[i].Name + '</option>';
+                            }
+                            $("#HUSEORGID").append(Organization);
+                            $("#HUSEORGID").val(sessionStorage["Organization"])
+                            form.render('select');
+                        }
+                        layer.closeAll("loading");
+                    },
+                    complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
+                })
+            }
+            //#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_MaintainClass/AuditGy_MaintainClass", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        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 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_MaintainClass/StopGy_MaintainClass", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        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 鍒犻櫎
+            function set_DeleteBill() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var hmainid = data[0].HItemID;
+                    layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+                        var wait = layer.load();
+                        //閫昏緫鍒犻櫎鏂规硶
+                        $.ajax({
+                            url: GetWEBURL() + 'DeltetGy_MaintainClass',
+                            type: "GET",
+                            data: { "HItemID": hmainid, "user": sessionStorage["HUserName"] },
+                            success: function (result) {
+                                console.log('gouba' + result);
+                                if (result.count == 1) {
+                                    layer.msg(result.Message, { icon: 1 }, function () {
+                                        // 寰楀埌frame绱㈠紩
+                                        var index = layer.getFrameIndex(window.name);
+                                        //鍏抽棴褰撳墠frame
+                                        layer.close(wait);
+                                        //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                        get_FastQuery();
+                                    });
+                                } 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
+
+            //#region 鍒锋柊
+            function get_Refresh() {
+                set_ClearQuery();
+                get_Display(sWhere);
+            }
+            //#endregion
+
+
+
+            //#endregion
+
+            //#region 銆愯繃婊ゆ柟妗堛��
+
+            //鑾峰彇褰撳墠鐢ㄦ埛鐨勯粯璁よ繃婊ゆ柟妗�
+            function get_DefaultModule() {
+                $.ajax({
+                    url: GetWEBURL() + '/Xt_FastICScheme/Chooselist',
+                    type: "GET",
+                    data: { "user": sessionStorage["Czybm"], "HModuleName": HModuleName, "HInterID": 0, "Type": "Default" },
+                    success: function (data1) {
+                        if (data1.count == 1) {
+                            //褰撳墠鐢ㄦ埛璁剧疆鏈夐粯璁ょ殑杩囨护鏂规
+                            var data = data1.data;
+                            //褰撳墠閫夋嫨鐨勮繃婊ゆ柟妗�
+                            HInterID_Choose = data[0].hmainid;
+                            //杩囨护鏂规鍐呯爜
+                            HInterID = data[0].hmainid
+                            //杩囨护鏂规鍚嶇О
+                            HDefaultFilter = data[0].鏂规鍚嶇О
+                            //杩囨护鏂规鐨勫娉紙鏂规淇℃伅鎻忚堪锛�
+                            var HRemark = data[0].澶囨敞
+                            //鏄剧ず鍑哄綋鍓嶇殑榛樿杩囨护鏂规
+                            document.getElementById("HFilterScheme_Now").style.display = "block";
+                            document.getElementById('HFilterScheme_Now').innerHTML = "褰撳墠杩囨护鏂规锛�" + HDefaultFilter + '<span style="font-size: 15px; font-weight: bold; color:#7b90fb">  ' + "(" + HRemark + ")" + '</span>';
+                            //鎶婅繃婊ゆ潯浠跺�煎洖鍐欏埌椤甸潰涓�
+                            for (let i = 0; i < data.length; i++) {
+                                $("#" + data[i].杩囨护瀛楁ID).val(data[i].杩囨护鍊�);
+                                if (data[i].杩囨护鏍囩绫诲瀷 == 'SELECT') {
+                                    $("#" + data[i].杩囨护瀛楁ID).find("option[value='" + data[i].杩囨护鍊� + "']").attr("selected", true);
+                                }
+                            }
+                            //鏌ヨ
+                            get_FastQuery();
+                            form.render("select");
+                        } else {
+                            //褰撳墠鐢ㄦ埛娌℃湁璁剧疆榛樿鐨勮繃婊ゆ柟妗�
+                            //闅愯棌鏄剧ず杩囨护鏂规鐨勬爣绛句俊鎭�
+                            document.getElementById("HFilterScheme_Now").style.display = "none";
+                            //鎵ц鏌ヨ鏂规硶
+                            form.render("select");
+                        }
+                    }, error: function () {
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+            }
+
+            //#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();
+                $("#ColName1").empty();
+                $("#ColName1").append(Organization);
+                $("#ColName2").empty();
+                $("#ColName2").append(Organization);
+                $("#ColName").append(Organization);
+                form.render('select');
+            }
+            //#endregion
+
+            //淇濆瓨鏂规
+            function set_SaveScheme() {
+                var index = layer.open()
+                //鍒ゆ柇鐢ㄦ埛鏄惁鐐瑰嚮浜嗗彸涓婅鐨勨�滃弶鍙封�濆叧闂脊绐楅〉闈�
+                var HIsClose_Manual = false;
+                //鑾峰彇鏈〉鎵�鏈夎繃婊ゆ潯浠跺璞�(class涓寘鍚�"ForFilteringSchemes"鐨勫厓绱�)
+                var Filter = document.getElementsByClassName(HClassTag);
+
+                var HFilterIdList = "";//杩囨护鏉′欢
+                var HFilterIdLists = "";//鎷兼帴澶氫釜杩囨护鏉′欢
+                var HValue = "";//杩囨护鍊�
+                var HElement_type = "";//杩囨护鏍囩绫诲瀷
+
+                for (var i = 0; i < Filter.length; i++) {
+                    HFilterIdList = Filter[i].id; //杩囨护鏉′欢ID
+                    HFilterIdLists += Filter[i].id + ","; //杩囨护鏉′欢ID(鎷兼帴)
+                    HValue += $("#" + HFilterIdList).val() + ","; //杩囨护鏉′欢涓緭鍏ョ殑鍊�
+                    HElement_type += document.getElementById(HFilterIdList).tagName + ",";//閫氳繃鏍囩id鑾峰彇鏍囩绫诲瀷
+                }
+
+                //鍘婚櫎鏈熬閫楀彿
+                HFilterIdLists = HFilterIdLists.substring(0, HFilterIdLists.length - 1);
+                HValue = HValue.substring(0, HValue.length - 1);
+                HElement_type = HElement_type.substring(0, HElement_type.length - 1);
+
+                //褰撳墠椤甸潰涓婃病鏈夐�夋嫨杩囨护鏂规锛岃繘鍏ユ柊澧炴柟娉�
+                if (HDefaultFilter == "") {
+                    layer.open({
+                        type: 2
+                        , area: ['40%', '80%']
+                        , title: '杩囨护鏂规'
+                        , shift: 0//寮瑰嚭鍔ㄧ敾
+                        , content: '../../绯荤粺绠$悊/杩囨护鏂规璁剧疆/Xt_FastICScheme.html?OperationType=1&HModuleName=' + HModuleName + '&HFilterIdLists=' + HFilterIdLists + '&HValue=' + HValue + '&HElement_type=' + HElement_type
+                        , cancel: function () {
+                            // 鍙充笂瑙掑叧闂簨浠剁殑閫昏緫
+                            HIsClose_Manual = true;
+                        }
+                        , end: function () {
+                            if (HIsClose_Manual != true) {
+                                get_FastQuery();
+                                //鏄剧ず褰撳墠鐨勮繃婊ゆ柟妗�
+                                document.getElementById("HFilterScheme_Now").style.display = "block";
+                                document.getElementById('HFilterScheme_Now').innerHTML = "褰撳墠杩囨护鏂规锛�" + sessionStorage["HFilterSchemeName_" + sessionStorage["Czybm"]] + '<span style="font-size: 15px; font-weight: bold; color:#7b90fb">  ' + "(" + sessionStorage["HFilterSchemeRemark_" + sessionStorage["Czybm"]] + ")" + '</span>';
+                            }
+                        }
+                    })
+                    layer.close(index)
+                } else {
+                    //褰撳墠椤甸潰宸叉湁杩囨护鏂规锛岀敤鎴烽�夋嫨 鏂板鎴栬�呯紪杈�
+                    layer.confirm('褰撳墠宸查�夋嫨杩囨护鏂规锛屾槸鍚︿慨鏀癸紵璇烽�夋嫨瀵瑰簲鎿嶄綔', {
+                        title: "鎿嶄綔鎻愮ず",
+                        icon: 0,
+                        btn: ['鏂板鏂规', '淇濆瓨淇敼褰撳墠鏂规', '鍙栨秷']
+                    }, function (index, layero) {
+                        //鏂板
+                        layer.open({
+                            type: 2
+                            , area: ['40%', '80%']
+                            , title: '杩囨护鏂规'
+                            , shift: 0//寮瑰嚭鍔ㄧ敾
+                            , content: '../../绯荤粺绠$悊/杩囨护鏂规璁剧疆/Xt_FastICScheme.html?OperationType=1&HModuleName=' + HModuleName + '&HFilterIdLists=' + HFilterIdLists + '&HValue=' + HValue + '&HElement_type=' + HElement_type
+                            , end: function () {
+                                get_FastQuery()
+                                //鏄剧ず褰撳墠鐨勮繃婊ゆ柟妗�
+                                document.getElementById("HFilterScheme_Now").style.display = "block";
+                                document.getElementById('HFilterScheme_Now').innerHTML = "褰撳墠杩囨护鏂规锛�" + sessionStorage["HFilterSchemeName_" + sessionStorage["Czybm"]] + '<span style="font-size: 15px; font-weight: bold; color:#7b90fb">  ' + "(" + sessionStorage["HFilterSchemeRemark_" + sessionStorage["Czybm"]] + ")" + '</span>';
+                            }
+                        })
+                        layer.close(index)
+                    }, function (index) {
+                        //缂栬緫
+                        var Filter_Edit = document.getElementsByClassName(HClassTag); //鑾峰彇鏈〉鎵�鏈夎繃婊ゆ潯浠跺璞�(class涓寘鍚�"ForFilteringSchemes"鐨勫厓绱�)
+                        HFilterIdList = "";
+                        HFilterIdLists = "";
+                        HValue = "";
+                        HElement_type = "";
+                        for (var i = 0; i < Filter_Edit.length; i++) {
+                            HFilterIdList = Filter_Edit[i].id; //杩囨护鏉′欢ID
+                            HFilterIdLists += Filter_Edit[i].id + ","; //杩囨护鏉′欢ID(鎷兼帴)
+                            HValue += $("#" + HFilterIdList).val() + ","; //杩囨护鏉′欢涓緭鍏ョ殑鍊�
+                            HElement_type += document.getElementById(HFilterIdList).tagName + ",";//閫氳繃鏍囩id鑾峰彇鏍囩绫诲瀷
+                        }
+                        //鍘婚櫎鏈熬閫楀彿
+                        HFilterIdLists = HFilterIdLists.substring(0, HFilterIdLists.length - 1);
+                        HValue = HValue.substring(0, HValue.length - 1);
+                        HElement_type = HElement_type.substring(0, HElement_type.length - 1);
+
+                        var sMainSub = HInterID_Choose + ';' + HFilterIdLists + ';' + HValue + ';' + HElement_type + ';' + sessionStorage["Czybm"] + ';' + 3;
+
+                        //淇敼
+                        $.ajax({
+                            type: "POST",
+                            url: GetWEBURL() + "/Xt_FastICScheme/save", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                            async: true,
+                            data: { "oMain": sMainSub },
+                            dataType: "json",
+                            success: function (data) {
+                                if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                    layer.msg(data.Message, { time: 1 * 1000, icon: 1 });
+                                }
+                                else {
+
+                                }
+                                layer.closeAll("loading");
+                            },
+                            error: function (err) {
+
+
+                            }
+                        });
+                        layer.close(index)
+                    }, function (index) {
+                        //鍙栨秷
+                        layer.alert('鍙栨秷')
+                        layer.close(index)
+                    });
+                }
+
+            }
+
+            //璇诲彇鏂规
+            function set_ReadScheme() {
+                var HIsClose_Manual = false;
+                var Filter = document.getElementsByClassName(HClassTag); //鑾峰彇鏈〉鎵�鏈夎繃婊ゆ潯浠跺璞�(class涓寘鍚�"ForFilteringSchemes"鐨勫厓绱�)
+
+                var HFilterIdList = "";
+                var HFilterIdLists = "";
+                var HValue = "";
+                var HElement_type = "";
+                for (var i = 0; i < Filter.length; i++) {
+                    HFilterIdList = Filter[i].id; //杩囨护鏉′欢ID
+                    HFilterIdLists += Filter[i].id + ","; //杩囨护鏉′欢ID(鎷兼帴)
+                    HValue += $("#" + HFilterIdList).val() + ","; //杩囨护鏉′欢涓緭鍏ョ殑鍊�
+                    HElement_type += document.getElementById(HFilterIdList).tagName + ",";//閫氳繃鏍囩id鑾峰彇鏍囩绫诲瀷
+                }
+                //鍘婚櫎鏈熬閫楀彿
+                HFilterIdLists = HFilterIdLists.substring(0, HFilterIdLists.length - 1);
+                HValue = HValue.substring(0, HValue.length - 1);
+                HElement_type = HElement_type.substring(0, HElement_type.length - 1);
+
+                layer.open({
+                    type: 2
+                    , area: ['80%', '80%']
+                    , title: '杩囨护鏂规鍒楄〃'
+                    , shift: 0//寮瑰嚭鍔ㄧ敾
+                    , content: '../../绯荤粺绠$悊/杩囨护鏂规璁剧疆/Xt_FastICSchemeList.html?HType=Select&HFilterIdLists=' + HFilterIdLists + '&HValue=' + HValue + '&HElement_type=' + HElement_type + '&HModuleName=' + HModuleName
+                    , cancel: function () {
+                        // 鍙充笂瑙掑叧闂簨浠剁殑閫昏緫
+                        HIsClose_Manual = true;
+                    }
+                    , end: function () {
+                        if (HIsClose_Manual != true) {
+                            get_FastQuery()
+                            form.render("select");
+                        }
+                    }
+                })
+            }
+
+            //#endregion
+
+            //浠ヤ笂鏄痩ayui妯″潡
+        });
+
+        //#region 銆愯繃婊ゆ柟妗堣繑鍥炴暟鎹��
+        function HFilterScheme(obj)  //杩斿洖杩囨护鏂规
+        {
+            var HInterID = obj[0].hmainid;
+            HInterID_Choose = obj[0].hmainid;
+            $.ajax({
+                url: GetWEBURL() + '/Xt_FastICScheme/Chooselist',
+                type: "GET",
+                data: { "user": sessionStorage["Czybm"], "HModuleName": HModuleName, "HInterID": HInterID, "Type": "Select" },
+                success: function (data1) {
+                    if (data1.count == 1) {
+                        var data = data1.data;
+                        //璧嬪�艰繃婊ゆ柟妗堝悕绉�
+                        HDefaultFilter = data[0].鏂规鍚嶇О
+                        var HRemark = data[0].澶囨敞
+                        //鏄剧ず褰撳墠鐨勮繃婊ゆ柟妗�
+                        document.getElementById("HFilterScheme_Now").style.display = "block";
+                        document.getElementById('HFilterScheme_Now').innerHTML = "褰撳墠杩囨护鏂规锛�" + HDefaultFilter + '<span style="font-size: 15px; font-weight: bold; color:#7b90fb">  ' + "(" + HRemark + ")" + '</span>';
+                        HInterID = data[0].hmainid
+                        //鏍规嵁閫夋嫨鐨勮繃婊ゆ柟妗堝洖濉暟鎹埌鍒楄〃杩囨护鏉′欢
+                        for (let i = 0; i < data.length; i++) {
+                            $("#" + data[i].杩囨护瀛楁ID).val(data[i].杩囨护鍊�);
+                            if (data[i].杩囨护鏍囩绫诲瀷 == 'SELECT') {
+                                $("#" + data[i].杩囨护瀛楁ID).find("option[value='" + data[i].杩囨护鍊� + "']").attr("selected", true);
+                            }
+                        }
+
+                    } else {
+                        layer.close(ajaxLoad);
+                        layer.alert(data1.code + data1.Message, { icon: 5 });
+                    }
+                }, error: function () {
+                    layer.close(ajaxLoad);
+                    layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                }
+            });
+        }
+
+        //鑾峰彇鍙傛暟
+        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
+
+    </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_MaintainClassEdit.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_MaintainClassEdit.html"
new file mode 100644
index 0000000..003dc2a
--- /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_MaintainClassEdit.html"
@@ -0,0 +1,391 @@
+锘�<!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>
+</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="form" class="layui-form" lay-filter="component-form-group" action="">
+                        <div class="layui-card-header">
+                            <div class="layui-btn-group">
+                                <button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</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">
+                                <h1 style="text-align:center;"><b>淇濆吇椤圭洰鍒嗙被</b></h1>
+                                <ul class="layui-tab-title" lay-filter="tab-all">
+                                    <li lay-id="1" style="padding:1px;" class="layui-this">鍩烘湰淇℃伅</li>
+                                    <li>鍏朵粬淇℃伅</li>
+                                </ul>
+                                <div class="layui-tab-content">
+                                    <!--鍩烘湰淇℃伅-->
+                                    <div class="layui-tab-item layui-show">
+                                        <div class="layui-form-item">
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label" style="width: 120px">浠g爜<label style="color:red"> * </label></label>
+                                                <div class="layui-input-inline">
+                                                    <input class="layui-input" name="HNumber" lay-verify="HNumber" id="HNumber" autocomplete="off">
+                                                    <input name="HItemID" id="HItemID" autocomplete="off" type="hidden">
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label" style="width: 120px">鍚嶇О<label style="color:red"> * </label></label>
+                                                <div class="layui-input-inline">
+                                                    <input class="layui-input" name="HName" id="HName" autocomplete="off">
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label" style="width: 120px">鍔╄鐮侊細</label>
+                                                <div class="layui-input-inline">
+                                                    <input class="layui-input" name="HHelpCode" id="HHelpCode" autocomplete="off">
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="layui-form-item">
+                                            <label class="layui-form-label" style="width: 120px">浣跨敤缁勭粐锛�</label>
+                                            <div class="layui-input-inline">
+                                                <select name="HUSEORGID" id="HUSEORGID" lay-verify="HUSEORGID">
+                                                </select>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label" style="width: 120px">浣跨敤鐘舵�侊細</label>
+                                                <div class="layui-input-inline">
+                                                    <select name="HUseFlag" id="HUseFlag" lay-verify="HUseFlag">
+                                                        <option value="鏈娴�" selected>鏈娴�</option>
+                                                        <option value="鏈娇鐢�">鏈娇鐢�</option>
+                                                        <option value="宸蹭娇鐢�">宸蹭娇鐢�</option>
+                                                    </select>
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="layui-form-item">
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label" style="width: 120px"> 绂佺敤鏍囧織:</label>
+                                                <div class="layui-input-inline">
+                                                    <input type="checkbox" name="HStopflag" id="HStopflag" lay-skin="primary" title="" value="">
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="layui-form-item">
+                                            <div class="layui-col-xs11">
+                                                <label class="layui-form-label"> 澶囨敞锛�</label>
+                                                <div class="layui-input-block">
+                                                    <input class="layui-input" name="HRemark" id="HRemark" autocomplete="off">
+                                                </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="HModifyEmp" id="HModifyEmp" 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>
+                                            <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" value="" 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 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>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </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/PubCustom.js"></script>
+    <script>
+        //鑾峰彇鍙傛暟
+        var params = get_UrlVars();
+        if (typeof (params[params[0]]) == "undefined") {
+            var OperationType = 1;//鎿嶄綔绫诲瀷
+        } else {
+            var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
+            var linterid = params[params[1]];//婧愬崟id
+            var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
+        }
+
+        layui.config({
+            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index' //涓诲叆鍙fā鍧�
+        }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+            //#region 鍏叡鍙橀噺
+            var $ = layui.$
+                , admin = layui.admin
+                , layer = layui.layer
+                , table = layui.table
+                , form = layui.form
+                , laydate = layui.laydate
+                , element = layui.element;
+            //#endregion
+            //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+            //鍒濆鍖栫晫闈�
+            set_ClearBill();
+            //鍒ゆ柇鎿嶄綔绫诲瀷
+            if (OperationType == 1) {//鏃犳簮鍗�
+                set_AddFNew();
+                $("#HMakeEmp").val(sessionStorage["HUserName"]);
+            }
+            else if (OperationType == 2) {
+                set_EditFromGrid();
+                $("#HMakeEmp").val(sessionStorage["HUserName"]);
+                $("#HModifyEmp").val("");
+                $("#HStopEmp").val("");
+                $("#HCheckEmp").val("");
+                $("#HMakeTime").val("");
+                $("#HModifyTime").val("");
+                $("#HStopTime").val("");
+                $("#HCheckTime").val("");
+                $("#HNumber").val("");
+                $("#HItemID").val(0);
+            }
+            else if (OperationType == 3) {//缂栬緫
+                set_EditFromGrid();
+            }
+            else {
+                layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
+            }
+            //#endregion
+
+            //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+            //淇濆瓨
+            form.on('submit(Saver)', function (data) {//淇濆瓨
+                if (AllowLoadData()) {
+                    var isEndCheck = document.getElementById("HStopflag").checked;
+                    isEndCheck == true ? data.field.HStopflag = 'true' : data.field.HStopflag = 'false';//灏嗘暟缁勫悎骞舵垚瀛楃涓�
+
+                    var sMainStr = JSON.stringify(data.field) + ";" + sessionStorage["HUserName"];
+                    $.ajax(
+                        {
+                            type: "POST",
+                            url: GetWEBURL() + "SaveGy_MaintainClass", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                            async: true,
+                            data: { "msg": sMainStr },
+                            dataType: "json",
+                            success: function (data) {
+                                if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                    layer.msg(data.Message, { icon: 1 });
+                                    $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
+                                }
+                                else {
+                                    f_alert(data.Message);
+                                    console.log("Reason" + sMainStr + "sub:" + JSON.stringify(layui.table.cache.mainTable));
+                                }
+                                layer.closeAll("loading");
+                            },
+                            error: function (err) {
+
+                                f_alert("閿欒:" + err);
+                                console.log("Reason" + sMainStr);
+                            }
+                        });
+                }
+            });
+            //閫�鍑�
+            form.on('submit(Exit)', function (data) {//
+                if (linterid == undefined) {
+                    //鍏抽棴椤电
+                    Pub_Close(2);
+                }
+                else {
+                    //鍏抽棴椤电
+                    Pub_Close(1);
+                }
+            });
+
+            //鐩戝惉鎻愪氦
+            form.verify({
+                numberOrEmpty: function (value, item) {
+                    // if (value != '') {
+                    if (!/^\d+$/.test(value)) {
+                        return '涓嶈兘涓虹┖鎴栨暟瀛楁垨鑰�0';
+                    }
+                    //}
+                }
+            });
+            //#endregion
+
+
+            //#region 褰撳墠椤甸潰闈㈡墍鏈夌殑鏂规硶
+
+            //鍒濆鍖栫晫闈�
+            function set_ClearBill() {
+                Organ();
+                $("#HStopflag").attr("disabled", true);
+                $("#HUseFlag").attr("disabled", true);
+                layui.form.render('checkbox');
+                layui.form.render('select');
+            }
+            //鏃犳簮鍗曟柊澧�
+            function set_AddFNew() {
+                $("#HItemID").val("0");
+                $("#HNumber").val("");
+            }
+            //缂栬緫
+            function set_EditFromGrid() {
+                $("#HItemID").val(linterid);
+                set_EditForm(linterid);  //缂栬緫鑾峰彇琛ㄥご
+            }
+            //缂栬緫鍔犺浇琛ㄥご
+            function set_EditForm(linterid) {
+                //鏌ヨ妫�楠屾柟妗堝崟鏄惁瀛樺湪
+                $.ajax({
+                    url: GetWEBURL() + "Gy_MaintainClass/EditGy_MaintainClass",
+                    type: "GET",
+                    async: false,
+                    data: {
+                        "HInterID": linterid
+                    },
+                    success: function (result) {
+                        if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            var data = result.data[0];
+                            $("#HItemID").val(data.HItemID);//浠g爜ID
+                            $("#HNumber").val(data.淇濆吇椤圭洰鍒嗙被浠g爜);//浠g爜
+                            $("#HName").val(data.淇濆吇椤圭洰鍒嗙被鍚嶇О);//鍚嶇О
+                            $("#HHelpCode").val(data.鍔╄鐮�);//鍔╄鐮�
+                            $("#HUSEORGID").val(data.HUSEORGID);//浣跨敤缁勭粐
+                            $("#HUseFlag ").val(data.浣跨敤鐘舵��);//浣跨敤鐘舵��
+                            $("#HRemark").val(data.澶囨敞);//澶囨敞
+
+                            $("#HMakeEmp").val(data.鍒跺崟浜�);
+                            $("#HMakeTime").val(data.鍒涘缓鏃ユ湡 == "" ? "" : Format(new Date(data.鍒涘缓鏃ユ湡), "yyyy-MM-dd"));
+                            $("#HCheckEmp").val(data.瀹℃牳浜�);
+                            $("#HCheckTime").val(data.瀹℃牳鏃ユ湡 == "" ? "" : Format(new Date(data.瀹℃牳鏃ユ湡), "yyyy-MM-dd"));
+                            $("#HModifyEmp").val(data.淇敼浜�);
+                            $("#HModifyTime").val(data.淇敼鏃ユ湡 == "" ? "" : Format(new Date(data.淇敼鏃ユ湡), "yyyy-MM-dd"));
+                            $("#HStopEmp").val(data.绂佺敤浜�);
+                            $("#HStopTime").val(data.绂佺敤鏃ユ湡 == "" ? "" : Format(new Date(data.绂佺敤鏃ユ湡), "yyyy-MM-dd"));
+
+                            $("input[name='HStopflag']").attr("checked", data.绂佺敤鏍囧織 == "鏄�" ? true : false);//true:閫変腑 false:涓嶉�変腑
+                            layui.form.render();//瀹炴椂娓叉煋閫変腑鍜屼笉閫変腑鐨勬牱寮�,鏈�濂芥坊鍔犺繖鍙ヨ瘽
+                            form.render("select");
+                        } else {
+                            layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+                        }
+                    }, error: function () {
+                        layer.alert("鍙戠敓閿欒!", { icon: 5 });
+                    }
+                });
+            }
+
+            //鏁版嵁楠岃瘉
+            function AllowLoadData() {
+                var HNumber = $("#HNumber").val() //浠g爜
+                var HName = $("#HName").val() //鍚嶇О
+
+                if (HNumber == null || HNumber == undefined || HNumber == "") {
+                    layer.msg("璇疯緭鍏ヤ唬鐮侊紒", { icon: 5 });
+                    return false;
+                }
+                if (HName == null || HName == undefined || HName == "") {
+                    layer.msg("璇疯緭鍏ュ悕绉帮紒", { icon: 5 });
+                    return false;
+                }
+                return true;
+            }
+
+            //
+            function f_alert(sMsg) {
+                layer.alert(sMsg, { icon: 5 });
+
+            }
+            //鑾峰彇鐧诲綍椤电粍缁囧垪
+            function Organ() {
+                var Organization = '';
+                $.ajax({
+                    type: "get",
+                    url: GetWEBURL() + "/Web/GetOrganizations",
+                    async: false,
+                    success: function (result) {
+                        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");
+                    }
+                })
+            }
+            //#endregion
+        });
+
+    </script>
+</body>
+</html>
+</head>
+<body>
+
+</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_MaintainEdit.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_MaintainEdit.html"
index 6bef0f8..b96c8a7 100644
--- "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_MaintainEdit.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_MaintainEdit.html"
@@ -15,6 +15,7 @@
     <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
     <script src="../../../layuiadmin/layui/lay/modules/util.js"></script>
     <script src="../../../layuiadmin/PubCustom.js"></script>
+    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
     <style media="screen">
         .custom-tree-item-clicked {
             color: #FC9003
@@ -29,16 +30,18 @@
                     <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="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</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" lay-filter="tab-all">
+                                    <li lay-id="1" style="padding:1px;" class="layui-this">鍩烘湰淇℃伅</li>
+                                    <li>鍏朵粬淇℃伅</li>
+                                </ul>
                                 <div class="layui-tab-content">
+                                    <!--鍩烘湰淇℃伅-->
                                     <div class="layui-tab-item layui-show">
                                         <div class="layui-form-item">
                                             <div class="layui-inline">
@@ -60,17 +63,119 @@
                                                     <input class="layui-input" name="HHelpCode" lay-verify="HHelpCode" id="HHelpCode">
                                                 </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; width: 185px;">
+                                                    <input type="hidden" class="layui-input" lay-verify="HCREATEORGID" name="HCREATEORGID" id="HCREATEORGID">
+                                                    <select name="HUSEORGID" id="HUSEORGID" lay-verify="HUSEORGID">
+                                                        <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+                                                    </select>
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label"> 淇濆吇椤圭洰<br />绫诲瀷</label>
+                                                <div class="layui-input-block" style="margin-left: 125px; width: 190px;">
+                                                    <select name="HMaintainType" id="HMaintainType" lay-verify="HMaintainType">
+                                                        <option value="璁惧" selected="selected">璁惧</option>
+                                                        <option value="鍣ㄥ叿">鍣ㄥ叿</option>
+                                                    </select>
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label" style="width: 85px;">浣跨敤鏍囧織</label>
+                                                <div class="layui-input-block" style="margin-left: 130px; width: 190px;">
+                                                    <select name="HUseFlag" id="HUseFlag" lay-verify="HUseFlag">
+                                                        <option value="鏈娇鐢�" selected="selected">鏈娇鐢�</option>
+                                                        <option value="宸蹭娇鐢�">宸蹭娇鐢�</option>
+                                                        <option value="鏈娴�">鏈娴�</option>
+                                                    </select>
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="layui-row">
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">淇濆吇椤圭洰鍒嗙被</label>
+                                                <div class="layui-input-inline">
+                                                    <input type="text" name="HMaintainClassName" id="HMaintainClassName" readonly class="layui-input" value="" style="float:left;width:150px;">
+                                                    <input type="hidden" name="HMaintainClassID" id="HMaintainClassID" class="layui-input" value="0" style="float:left;width:150px;">
+                                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="BtnHMaintainClass" style="width:40px;">
+                                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                    </button>
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="layui-row">
                                             <div class="layui-inline">
                                                 <label class="layui-form-label">澶囨敞</label>
                                                 <div class="layui-input-inline">
                                                     <textarea placeholder="璇疯緭鍏ョ淮澶囨敞" class="layui-textarea" name="HRemark" id="HRemark"></textarea>
                                                 </div>
                                             </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">绂佺敤鏍囧織</label>
+                                                <div class="layui-input-block">
+                                                    <input type="checkbox" name="HStopflag" id="HStopflag" lay-skin="primary" title="">
+                                                </div>
+                                            </div>
                                         </div>
+                                    </div>
+                                    <!--鍏朵粬淇℃伅-->
+                                    <div class="layui-tab-item">
                                         <div class="layui-form-item">
-                                            <label class="layui-form-label">绂佺敤鏍囧織</label>
-                                            <div class="layui-input-block">
-                                                <input type="checkbox" name="HStopflag" id="HStopflag" lay-skin="primary" title="">
+                                            <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="HModifyEmp" id="HModifyEmp" 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>
+                                            <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="HModifyTime" id="HModifyTime" 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>
                                         </div>
                                     </div>
@@ -112,32 +217,30 @@
                 , element = layui.element;
             //#endregion
             //甯歌鐢ㄦ硶
+            Organ();
+            $("#HStopflag").attr("disabled", true);
+            $("#HUseFlag").attr("disabled", true);
+            layui.form.render('checkbox');
 
+            if (OperationType == 1) {   //鏂板
+                linterid = 0;
+                $("#HMakeEmp").val(sessionStorage["HUserName"]);
 
-            if (OperationType == 3) {
-                $.ajax({
-                    url: GetWEBURL() + "/Gy_Maintain/EditMaintain",
-                    type: "GET",
-                    data: {
-                        "HInterID": linterid
-                    },
-                    success: function (d) {
-
-                        ajaxReturnData = JSON.parse(JSON.stringify(d)).data;
-                        $("#HNumber").val(d.data[0].HNumber);
-                        $("#HName").val(d.data[0].HName);
-                        $("#HHelpCode").val(d.data[0].HHelpCode);
-                        $("#HRemark").val(d.data[0].HRemark);
-                        $("#HLevel").val(d.data[0].HLevel);
-                        $("input[name='HStopflag']").prop("checked", d.data[0].HStopflag);//true:閫変腑 false:涓嶉�変腑
-                        layui.form.render();//瀹炴椂娓叉煋閫変腑鍜屼笉閫変腑鐨勬牱寮�,鏈�濂芥坊鍔犺繖鍙ヨ瘽
-                        $("#HUpDater").val(sessionStorage["HUserName"]);//淇敼浜�
-                        //table.reload(layTableId, {
-                        //    data: ajaxReturnData
-                        //});
-                    }
-
-                });
+            } else if (OperationType == 2) {
+                RoadBillMain(linterid);
+                $("#HMakeEmp").val(sessionStorage["HUserName"]);
+                $("#HModifyEmp").val("");
+                $("#HStopEmp").val("");
+                $("#HCheckEmp").val("");
+                $("#HMakeTime").val("");
+                $("#HModifyTime").val("");
+                $("#HStopTime").val("");
+                $("#HCheckTime").val("");
+                $("#HNumber").val("");
+                $("#HItemID").val(0);
+            } else if (OperationType == 3) {
+                RoadBillMain(linterid);
+              
             }
             
             //#region 宸ュ叿鎸夐挳
@@ -146,6 +249,12 @@
             form.on('submit(Exit)', function () {
                 Pub_Close(1);
             })
+
+
+            //琛ㄥご淇℃伅  淇濆吇椤圭洰鍒嗙被
+            form.on('submit(BtnHMaintainClass)', function () {
+                BtnHMaintainClass();
+            });
 
             //淇濆瓨
             form.on('submit(Saver)', function (data) {//淇濆瓨
@@ -173,7 +282,7 @@
                         {
                             type: "POST",
                             url: GetWEBURL() + "/Gy_Maintain/EditBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
-                            async: true,
+                            async: false,
                             data: { "oMain": sMainSub },
                             dataType: "json",
                             success: function (data) {
@@ -204,7 +313,7 @@
                         {
                             type: "POST",
                             url: GetWEBURL() + "/Gy_Maintain/AddBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
-                            async: true,
+                            async: false,
                             data: { "oMain": sMainSub },
                             dataType: "json",
                             success: function (data) {
@@ -233,6 +342,104 @@
 
             //#endregion
 
+            function RoadBillMain(linterid) {
+                $.ajax({
+                    url: GetWEBURL() + "/Gy_Maintain/EditMaintain",
+                    type: "GET",
+                    async: false,
+                    data: {
+                        "HInterID": linterid
+                    },
+                    success: function (d) {
+
+                        ajaxReturnData = JSON.parse(JSON.stringify(d)).data;
+                        $("#HNumber").val(d.data[0].淇濆吇椤圭洰浠g爜);
+                        $("#HName").val(d.data[0].淇濆吇椤圭洰鍚嶇О);
+                        $("#HHelpCode").val(d.data[0].鍔╄鐮�);
+                        $("#HRemark").val(d.data[0].澶囨敞);
+                        $("#HLevel").val(d.data[0].绛夌骇);
+
+                        $("#HUSEORGID").val(d.data[0].HUSEORGID);
+                        $("#HMakeEmp").val(d.data[0].鍒跺崟浜�);
+                        $("#HMakeTime").val(d.data[0].鍒涘缓鏃ユ湡 == null ? "" : Format(new Date(d.data[0].鍒涘缓鏃ユ湡), "yyyy-MM-dd"));
+                        $("#HCheckEmp").val(d.data[0].瀹℃牳浜�);
+                        $("#HCheckTime").val(d.data[0].瀹℃牳鏃ユ湡 == null ? "" : Format(new Date(d.data[0].瀹℃牳鏃ユ湡), "yyyy-MM-dd"));
+                        $("#HModifyEmp").val(d.data[0].淇敼浜�);
+                        $("#HModifyTime").val(d.data[0].淇敼鏃ユ湡 == null ? "" : Format(new Date(d.data[0].淇敼鏃ユ湡), "yyyy-MM-dd"));
+                        $("#HStopEmp").val(d.data[0].绂佺敤浜�);
+                        $("#HStopTime").val(d.data[0].绂佺敤鏃ユ湡 == null ? "" : Format(new Date(d.data[0].绂佺敤鏃ユ湡), "yyyy-MM-dd"));
+                        $("#HUseFlag").val(d.data[0].浣跨敤鐘舵��);
+                        $("#HMaintainType").val(d.data[0].淇濆吇椤圭洰绫诲瀷);
+                        $("#HMaintainClassID").val(d.data[0].HMaintainClassID);
+                        $("#HMaintainClassName").val(d.data[0].淇濆吇椤圭洰鍒嗙被鍚嶇О);
+
+                        $("input[name='HStopflag']").prop("checked", d.data[0].HStopflag);//true:閫変腑 false:涓嶉�変腑
+                        layui.form.render();//瀹炴椂娓叉煋閫変腑鍜屼笉閫変腑鐨勬牱寮�,鏈�濂芥坊鍔犺繖鍙ヨ瘽
+                        $("#HUpDater").val(sessionStorage["HUserName"]);//淇敼浜�
+                        //table.reload(layTableId, {
+                        //    data: ajaxReturnData
+                        //});
+                    }
+
+                });
+            }
+
+            //淇濆吇椤圭洰鍒嗙被鍒楄〃
+            function BtnHMaintainClass() {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '淇濆吇椤圭洰鍒嗙被鍒楄〃',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['80%', '80%'],
+                    maxmin: true,
+                    content: ['../../鍩虹璧勬枡/鍩虹璧勬枡/Gy_MaintainClass.html', 'yes'],
+                    btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {
+
+                        //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HMaintainClassName").val(checkStatus.data[0].淇濆吇椤圭洰鍒嗙被鍚嶇О);
+                        $("#HMaintainClassID").val(checkStatus.data[0].HItemID);
+
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                });
+            }
+
+
+            //鑾峰彇缁勭粐
+            function Organ() {
+                //鑾峰彇鐧诲綍椤电粍缁囧垪
+                var Organization = '';
+                $.ajax({
+                    type: "get",
+                    url: GetWEBURL() + "/Web/GetOrganizations",
+                    success: function (result) {
+                        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"])
+                            $("#HCREATEORGID").val(sessionStorage["OrganizationID"])
+                            form.render('select');
+                        }
+                        layer.closeAll("loading");
+                    }
+                })
+            }
             function f_alert(sMsg) {
                 layer.alert(sMsg, { icon: 5 });
 
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_MaintainList.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_MaintainList.html"
index 8b1412d..35e1dfa 100644
--- "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_MaintainList.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_MaintainList.html"
@@ -9,15 +9,23 @@
     <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/treeTable.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/layui/lay/modules/util.js"></script>
+    <script src="../../../layuiadmin/layui/layui1.js"></script>
+    <script src="../../../layuiadmin/layui/lay/modules/table.js"></script>
+    <script src="../../../layuiadmin/HideButton_New.js"></script>
     <script src="../../../layuiadmin/PubCustom.js"></script>
+    <script src="../../../layuiadmin/soulTable.slim.js"></script>
+    <script src="../../../layuiadmin/PageTitle.js"></script>
+    <script src="../../../layuiadmin/SetColumn.js"></script>
     <style media="screen">
         .custom-tree-item-clicked {
             color: #FC9003
+        }
+        /*鏍戠姸鍥剧偣鍑婚珮浜彉鑹�*/
+        .layui-tree-set-active > .layui-tree-entry .layui-tree-main {
+            background: #aef0f7;
         }
     </style>
 </head>
@@ -44,6 +52,14 @@
                                     <label class="layui-form-label" style="width: 85px;">鍚嶇О</label>
                                     <div class="layui-input-block" style="margin-left: 120px;">
                                         <input type="text" class="layui-input ForFilteringSchemes" name="HName" id="HName">
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label" style="width: 85px;">缁勭粐</label>
+                                    <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
+                                        <select name="HUSEORGID" id="HUSEORGID" class="ForFilteringSchemes" lay-verify="HUSEORGID">
+                                            <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+                                        </select>
                                     </div>
                                 </div>
                                 <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
@@ -79,27 +95,96 @@
                                             </select>
                                         </div>
                                         <div class="layui-inline">
-                                            <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent" >
+                                            <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent">
+                                        </div>
+                                    </div>
+                                    <div class="layui-row" style="margin-top:5px">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">杩囨护</label>
+                                            <div class="layui-input-block">
+                                                <select name="ColName1" id="ColName1" lay-filter="ColName1" style="width:190px;" class="ForFilteringSchemes">
+                                                </select>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <select name="Comparator1" id="Comparator1" lay-filter="Comparator1" 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="ColContent1" id="ColContent1">
+                                        </div>
+                                    </div>
+                                    <div class="layui-row" style="margin-top:5px">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">杩囨护</label>
+                                            <div class="layui-input-block">
+                                                <select name="ColName2" id="ColName2" lay-filter="ColName2" style="width:190px;" class="ForFilteringSchemes">
+                                                </select>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <select name="Comparator2" id="Comparator2" lay-filter="Comparator2" 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="ColContent2" id="ColContent2">
                                         </div>
                                     </div>
                                 </div>
                             </div>
                         </div>
-                        <table class="" id="mainTable" lay-filter="mainTable"></table>
+                        <div class="layui-row" style="padding:10px 0">
+                            <div class="layui-col-xs3 layui-inline" style="border: solid 1.5px #e0d6d64d;">
+                                <div id="TreeTable" class="demo-tree demo-tree-box" style="width:99.5%;height:calc(45vh);overflow-y:auto"></div>
+
+                            </div>
+                            <div class="layui-col-xs8 layui-inline" style="padding-left: 10px; width: 75%">
+                                <div>
+                                    <table class="" id="mainTable" lay-filter="mainTable"></table>
+                                </div>
+                            </div>
+                        </div>
                         <script type="text/html" id="toolbarDemo">
-                            <div class="layui-btn-container">
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_SouceExcel"><i class="layui-icon layui-icon-delete"></i>瀵煎叆</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+                            <div class="layui-btn-container" id="toolbarDemo_ButtonSet">
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_SouceExcel" id="set_SouceExcel"><i class="layui-icon layui-icon-delete"></i>瀵煎叆</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Export" id="btn_Export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew" id="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Copy" id="btn_Copy"><i class="layui-icon layui-icon-add-1"></i>澶嶅埗</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill" id="set_ShowBill"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill" id="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit" id="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>瀹℃牳</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit" id="btn-Audit"><i class="layui-icon layui-icon-radio"></i>鍙嶅鏍�</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-view"><i class="layui-icon layui-icon-tips"></i>棰勮</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Stop" id="btn-Stop"><i class="layui-icon layui-icon-radio"></i>绂佺敤</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeStop" id="btn-DeStop"><i class="layui-icon layui-icon-radio"></i>鍙嶇鐢�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn" id="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideButton" id="set_HideButton"><i class="layui-icon layui-icon-form"></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="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh" id="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit" id="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-view" id="btn_view"><i class="layui-icon layui-icon-tips"></i>棰勮</button>
                             </div>
                         </script>
                     </form>
@@ -133,6 +218,11 @@
             var sWhere = "";
             var option = [];
             var HModName = "Gy_MaintainList";
+            var HBillType = "Gy_MaintainList";
+            var HMaterTypeID = 0;              //鐗╂枡鍒嗙被鑺傜偣id
+            var sql = "";
+            var ins;                //鐢ㄤ簬瀵煎嚭excel
+            var set_HideButton_ID = "toolbarDemo_ButtonSet";                    //闇�瑕佽缃殑鎸夐挳鐨勭埗绾ц妭鐐圭殑id
             //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
             var titleData = ["HItemID"];
             //#endregion
@@ -171,12 +261,19 @@
                     //瀵煎叆
                     case 'set_SouceExcel': set_SouceExcel();
                         break;
+                    //瀵煎嚭鎸夐挳
+                    case 'btn_Export': btn_Export();
+                        break;
                     //鍒锋柊
                     case 'get_Refresh': get_Refresh();
                         break;
                     //娴忚
                     case 'btn-view':
                         get_ViewReport();
+                        break;
+                    //澶嶅埗
+                    case 'btn_Copy':
+                        set_copy();
                         break;
                     //瀹℃牳鎸夐挳
                     case 'btn-Audit':
@@ -185,6 +282,14 @@
                     //鍙嶅鏍告寜閽�
                     case 'btn-DeAudit':
                         set_CheckBill(1);
+                        break;
+                    //绂佺敤鎸夐挳
+                    case 'btn-Stop':
+                        set_De_Stop(0);
+                        break;
+                    //鍙嶇鐢ㄦ寜閽�
+                    case 'btn-DeStop':
+                        set_De_Stop(1);
                         break;
                     //閫�鍑烘寜閽�
                     case 'get_Exit': Pub_Close(2);
@@ -196,7 +301,11 @@
                     case 'set_ReadScheme': set_ReadScheme();
                         break;
                     //鍒楄缃�
-                    case 'set_HideColumn': get_HideColumn();
+                    case 'set_HideColumn': get_HideColumnNoPage(HModName, sessionStorage["HUserName"], option, get_FastQuery);
+                        break;
+                    //鎸夐挳璁剧疆
+                    case 'set_HideButton':
+                        get_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
                         break;
                 };
             });
@@ -240,14 +349,22 @@
             //鍒濆鍖栬〃鏍�
 
             function set_ClearBill() {
+                set_StockOrg();
                 //鍒濆鍖栬〃鏍�
                 set_InitGrid();
-
+                //鏍戠姸鍥炬煡璇�
+                get_Display_Tree();
                 //鏌ヨ
                 get_Display(sWhere);
 
                 get_DefaultModule();
             }
+
+            //#region 瀵煎嚭Execel
+            function btn_Export() {
+                table.exportFile(ins.config.id, option.data, "xls");
+            }
+            //#endregion
 
             //#region鍒濆鍖栬〃鏍�
             function set_InitGrid() {
@@ -320,16 +437,19 @@
                                 , limit: 50
                                 , cellMinWidth: 90
                             }
-                            table.render(option);
+                            ins = table.render(option);
 
                             //鍒锋柊琛ㄦ牸鏁版嵁
-                            DisPlay_HideColumn();
+                            DisPlay_HideColumn(HModName, sessionStorage["HUserName"], option, titleData);
+                            table.render(option);
 
                             layer.close(ajaxLoad);
 
-                            if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+                            if ($("#ColName option").length < 1) {
                                 ColFilter();
                             }
+
+                            Display_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
                             //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
                         } else {
                             layer.close(ajaxLoad);
@@ -347,9 +467,17 @@
             function get_FastQuery() {
                 var HNumber = $("#HNumber").val();
                 var HName = $("#HName").val();
+                var HUSEORGID = $("#HUSEORGID").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 = "";
@@ -372,11 +500,59 @@
                     }
                     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 淇濆吇椤圭洰浠g爜 like '%" + HNumber + "%'";
                 }
                 if (HName) {
                     sWhere += " and 淇濆吇椤圭洰鍚嶇О like '%" + HName + "%'";
+                }
+                if (HUSEORGID) {
+                    sWhere += " and 浣跨敤缁勭粐鍚嶇О = '" + HUSEORGID + "'";
+                }
+                if (sql != "") {
+                    sWhere += sql;
                 }
                 get_Display(sWhere);
                 sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
@@ -390,6 +566,13 @@
                 $("#ColContent").val("");
                 $("#ColName").val("0");
                 $("#Comparator").val("0");
+                $("#ColContent2").val("");
+                $("#ColName2").val("0");
+                $("#Comparator2").val("0");
+                $("#ColContent1").val("");
+                $("#ColName1").val("0");
+                $("#Comparator1").val("0");
+                $("#HUSEORGID").val(sessionStorage["Organization"]);
                 form.render('select');
                 sWhere = "";
                 get_Display(sWhere);
@@ -397,6 +580,32 @@
             //#endregion
 
             //#region 宸ュ叿鏍忎簨浠�
+
+            //#region   鑾峰彇缁勭粐
+            function set_StockOrg() {
+                //鑾峰彇鐧诲綍椤电粍缁囧垪
+                $.ajax({
+                    type: "GET",
+                    url: GetWEBURL() + "/Web/GetOrganizations",
+                    async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                    success: function (result) {
+                        var Organization = "";
+                        Organization += '<option  style="color:blue;" value="">鍏ㄩ儴</option>';
+                        if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            var data = result.data;
+                            for (var i = 0; i < data.length; i++) {
+                                Organization += '<option  style="color:blue;" value="' + data[i].Name + '">' + data[i].Name + '</option>';
+                            }
+                            $("#HUSEORGID").append(Organization);
+                            $("#HUSEORGID").val(sessionStorage["Organization"])
+                            form.render('select');
+                        }
+                        layer.closeAll("loading");
+                    },
+                    complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
+                })
+            }
+            //#endregion
 
             //瀵煎叆
             function set_SouceExcel() {
@@ -432,6 +641,32 @@
 
             }
 
+            //澶嶅埗
+            function set_copy() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var HInterID = data[0].HItemID.toString();
+                    layer.open({
+                        type: 2
+                        , area: ['100%', '100%']
+                        , title: '缂栬緫淇濆吇椤圭洰'
+                        , shade: 0.6 //閬僵閫忔槑搴�
+                        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                        , content: '../鍩虹璧勬枡/Gy_MaintainEdit.html?OperationType=2&hID=' + HInterID
+                        , resize: false
+                        , cancel: function () {
+
+                        }
+                    })
+
+                } else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+                }
+            }
+
+
             //淇敼鎸夐挳
             function set_ShowBill() {
                 var checkStatus = table.checkStatus('mainTable')
@@ -461,6 +696,94 @@
                         layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
                  }
             };
+
+            // 鏍戠姸鍥炬煡璇�
+            function get_Display_Tree() {
+                var ajaxLoad = layer.load();
+                $.ajax({
+                    url: GetWEBURL() + '/Gy_Maintain/Gy_MaintainTreeList',
+                    type: "GET",
+                    data: { "HOrgID": sessionStorage["OrganizationID"] },
+                    success: function (data1) {
+                        if (data1.count == 1) {
+                            layer.close(ajaxLoad);
+                            var data = JSON.parse(data1.data);
+                            MenuMain(data);
+                        } else {
+                            layer.close(ajaxLoad);
+                            layer.alert(data1.code + data1.Message, { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.close(ajaxLoad);
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+            }
+
+            //閬嶅巻鐢熸垚涓昏彍鍗�
+            function MenuMain(data) {
+                var liStr = '[';
+                //閬嶅巻鐢熸垚涓昏彍鍗�
+                for (var i = 0; i < data.length; i++) {
+                    // 鍒ゆ柇鏄惁瀛樺湪瀛愯彍鍗�
+                    if (data[i].children != null && data[i].children.length > 0) {
+                        liStr += '{"title": "' + data[i].id + "-" + data[i].title + '", "id": "' + data[i].id + '","spread":true, "children":[ ';
+                        // 閬嶅巻鑾峰彇瀛愯彍鍗�
+                        for (var k = 0; k < data[i].children.length; k++) {
+                            liStr += getChildMenu(data[i].children[k], 0);
+                        }
+                        liStr = liStr.substring(0, liStr.length - 1);
+                        liStr += ']},';
+                    } else {
+                        liStr += '{"title": "' + data[i].id + "-" + data[i].title + '", "id": "' + data[i].id + '"},';
+                    }
+                };
+                liStr = liStr.substring(0, liStr.length - 1);
+                liStr += "]";
+                var treeTable = JSON.parse(liStr);
+                tree.render({
+                    elem: '#TreeTable' //榛樿鏄偣鍑昏妭鐐瑰彲杩涜鏀剁缉
+                    , data: treeTable
+                    , onlyIconControl: true
+                    , click: function (obj) {
+                        //楂樹寒鍙樿壊
+                        $(".layui-tree-set").removeClass('layui-tree-set-active');
+                        obj.elem.addClass('layui-tree-set-active');
+
+                        var data = obj.data;  //鑾峰彇褰撳墠鐐瑰嚮鐨勮妭鐐规暟鎹�
+                        if (data.id == "100") {
+                            sql = " and HMaintainClassID=0 ";
+                            HMaterTypeID = 0;
+                        } else if (data.id == "0") {
+                            sql = "";
+                            HMaterTypeID = 0;
+                        } else {
+                            sql = " and HMaintainClassID='" + data.id + "' ";
+                            HMaterTypeID = data.id;
+                        }
+                        get_FastQuery()
+                    }
+                });
+            }
+
+            // 閫掑綊鐢熸垚瀛愯彍鍗�
+            function getChildMenu(subMenu, num) {
+                num++;
+                var subStr = '';
+                if (subMenu.children != null && subMenu.children.length > 0) {
+                    subStr += '{"title": "' + subMenu.id + "-" + subMenu.title + '", "id": "' + subMenu.id + '", "children":[';
+                    for (var j = 0; j < subMenu.children.length; j++) {
+                        subStr += getChildMenu(subMenu.children[j], num);
+                        if (j + 1 == subMenu.children.length) {
+                            subStr = subStr.substring(0, subStr.length - 1);
+                        }
+                    }
+                    subStr += ']},';
+                } else {
+                    subStr += '{"title": "' + subMenu.id + "-" + subMenu.title + '", "id": "' + subMenu.id + '"},';
+                }
+                return subStr;
+            }
 
             //鍒犻櫎
             function set_DeleteBill() {
@@ -575,121 +898,39 @@
             }
             //#endregion
 
-            //#region 闅愯棌鍒楄缃�
-            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 杩涜缂栫爜
+            //#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_Maintain/StopGy_Maintain", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        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');
+                                });
 
-                contentUrl += '鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName;
-
-                layer.open({
-                    type: 2
-                    , skin: "layui-layer-rim" //鍔犱笂杈规
-                    , title: "闅愯棌鍒楄缃�"  //鏍囬
-                    , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
-                    , shift: 2 //寮瑰嚭鍔ㄧ敾
-                    , area: ["50%", "90%"] //绐椾綋澶у皬
-                    , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
-                    , content: [contentUrl, "yes"]
-                    , btn: ["纭畾", "鍙栨秷"]
-                    , btn1: function (index, laero) {
-                        //鍒锋柊琛ㄦ牸鏁版嵁
-                        DisPlay_HideColumn();
-                        //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
-                        layer.close(index);//鍏抽棴寮圭獥
-                    }
-                })
-            }
-            //#endregion
-            //#region 鏄剧ず鍒楁暟鎹�
-            function DisPlay_HideColumn() {
-                $.ajax({
-                    url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
-                    type: "GET",
-                    data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
-                    success: function (data1) {
-                        if (data1.data.length != 0) {
-
-                            var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
-                            //var titleData = ["鍗曟嵁ID", "HMouldID", "hsubid", "HManagerID", "婧愬崟涓诲唴鐮�", "婧愬崟瀛愬唴鐮�"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
-
-                            dataCol = data1.data[0].HGridString.split(',');
-
-                            for (var i = 0; i < option.cols[0].length - 2; i++) {
-                                var dataCols = dataCol[i].split('|');
-                                //闅愯棌鍒�
-                                if (dataCols[1] == 1) {
-                                    option.cols[0][i + 1]["hide"] = true;
-                                }
-                                //璁剧疆鍒楀
-                                if (dataCols[3] > 0) {
-                                    option.cols[0][i + 1]["width"] = dataCols[3];
-                                }
-                                //璁剧疆鍐呭瀛椾綋澶у皬
-                                if (data1.data[0].HFontSize != 0) {
-                                    option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
-                                } else {
-                                    option.cols[0][i + 1]["style"] = "font-size:100%";
-                                }
-                                //璁剧疆鍒楀
-                                //if (data1.data[0].HColumnWidth != 0) {
-                                //    option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
-                                //} else {
-                                //    option.cols[0][i + 1]["width"] = "";
-                                //}
-                                //鏄剧ず鍒�
-                                if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
-                                    option.cols[0][i + 1]["hide"] = false;
-                                }
-                                //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
-                                switch (dataCols[2]) {
-                                    case "L":
-                                        option.cols[0][i + 1]["align"] = "left";
-                                        break;
-                                    case "M":
-                                        option.cols[0][i + 1]["align"] = "center";
-                                        break;
-                                    case "R":
-                                        option.cols[0][i + 1]["align"] = "right";
-                                        break;
-                                }
+                            } else {
+                                layer.alert(result.code + result.Message, { icon: 5 });
                             }
-
-                            //鍙栨秷鍐荤粨鍒�
-                            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 });
                         }
-                    }, error: function () {
-                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
-                    }
-                })
+                    });
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+                }
             }
             //#endregion
 
@@ -703,6 +944,10 @@
                 }
                 $("#ColName").empty();
                 $("#ColName").append(Organization);
+                $("#ColName1").empty();
+                $("#ColName1").append(Organization);
+                $("#ColName2").empty();
+                $("#ColName2").append(Organization);
                 form.render('select');
             }
             //#endregion
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_RepairCheckClass.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_RepairCheckClass.html"
new file mode 100644
index 0000000..a5c18b7
--- /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_RepairCheckClass.html"
@@ -0,0 +1,1056 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <title>缁翠慨楠屾敹椤圭洰鍒嗙被鍒楄〃</title>
+    <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/soulTable.slim.js"></script>
+    <script src="../../../layuiadmin/HideButton_New.js"></script>
+    <script src="../../../layuiadmin/SetColumn.js"></script>
+    <script src="../../../layuiadmin/PubCustom.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">浠g爜</label>
+                                    <div class="layui-input-block">
+                                        <input type="text" class="layui-input ForFilteringSchemes" name="HNumber" id="HNumber">
+                                    </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="HName" id="HName">
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label" style="width: 85px;">缁勭粐</label>
+                                    <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
+                                        <select name="HUSEORGID" id="HUSEORGID" class="ForFilteringSchemes" lay-verify="HUSEORGID">
+                                            <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+                                        </select>
+                                    </div>
+                                </div>
+                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                </button>
+                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+                                <!--鏄剧ず褰撳墠杩囨护鏂规-->
+                                <div class="layui-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:5px">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">杩囨护</label>
+                                            <div class="layui-input-block">
+                                                <select name="ColName" id="ColName" class="ForFilteringSchemes" lay-filter="ColName" style="width:190px;">
+                                                </select>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <select name="Comparator" id="Comparator" class="ForFilteringSchemes" lay-filter="Comparator" style="width:190px;">
+                                                <option value="0" selected="selected"></option>
+                                                <option value="=">=</option>
+                                                <option value=">=">>=</option>
+                                                <option value=">">></option>
+                                                <option value="<="><=</option>
+                                                <option value="<"><</option>
+                                                <option value="<>"><></option>
+                                                <option value="7">鍖呭惈</option>
+                                                <option value="8">宸﹀寘鍚�</option>
+                                                <option value="9">鍙冲寘鍚�</option>
+                                                <option value="10">涓嶅寘鍚�</option>
+                                            </select>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent">
+                                        </div>
+                                    </div>
+                                    <div class="layui-row" style="margin-top:5px">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">杩囨护</label>
+                                            <div class="layui-input-block">
+                                                <select name="ColName1" id="ColName1" 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>
+                        <table class="" id="mainTable" lay-filter="mainTable"></table>
+                        <script type="text/html" id="toolbarDemo">
+                            <div class="layui-btn-container" id="toolbarDemo_ButtonSet">
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_SouceExcel" id="set_SouceExcel"><i class="layui-icon layui-icon-delete"></i>瀵煎叆</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Export" id="btn_Export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add" id="btn-Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Copy" id="btn_Copy"><i class="layui-icon layui-icon-add-1"></i>澶嶅埗</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit" id="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete" id="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit" id="btn-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit" id="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Stop" id="btn-Stop"> <i class="layui-icon layui-icon-radio"></i>绂佺敤</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeStop" id="btn-DeStop"><i class="layui-icon layui-icon-radio"></i>鍙嶇鐢�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn" id="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideButton" id="set_HideButton"><i class="layui-icon layui-icon-form"></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="get_Refresh" id="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit" id="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-view" id="btn-view"><i class="layui-icon layui-icon-tips"></i>棰勮</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-print" id="btn-print"><i class="layui-icon layui-icon-print"></i>鎵撳嵃</button>
+                            </div>
+                        </script>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <script>
+        layui.config({
+            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index', //涓诲叆鍙fā鍧�
+        }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate','soulTable'], function () {
+
+            //#region 鍏叡鍙橀噺
+            var $ = layui.$
+                , admin = layui.admin
+                , layer = layui.layer
+                , table = layui.table
+                , form = layui.form
+                , element = layui.element
+                , laypage = layui.laypage
+                , laydate = layui.laydate
+                , soulTable = layui.soulTable
+            var sWhere = "";
+            var option = [];
+            var HModName = "Gy_RepairCheckClass";
+            var HBillType = "Gy_RepairCheckClass";
+            var ins;                //鐢ㄤ簬瀵煎嚭excel
+            var set_HideButton_ID = "toolbarDemo_ButtonSet";                    //闇�瑕佽缃殑鎸夐挳鐨勭埗绾ц妭鐐圭殑id
+            //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+            var titleData = [];
+            //#endregion
+
+            //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+            //#region 銆愯繃婊ゆ柟妗堛��
+
+            //杩囨护鏉′欢鐨刢lass绫�
+            var HClassTag = "ForFilteringSchemes";
+            //妯″潡鍚嶇О锛堜腑鏂囩増锛� 姣忎釜妯″潡椤甸潰閮介渶瑕佷慨鏀�
+            window.HModuleName = "缁翠慨楠屾敹椤圭洰鍒嗙被";
+            //鏄惁宸茬粡閫夋嫨浜嗚繃婊ゆ柟妗堬紙鍏ㄥ眬鍙橀噺锛�
+            window.HDefaultFilter = "";
+            //閫夋嫨鐨勮繃婊ゆ柟妗堝唴鐮侊紙鍏ㄥ眬鍙橀噺锛�
+            window.HInterID_Choose = 0;
+
+            //#endregion
+
+            //鍒濆鍖栫晫闈�
+            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 'set_SouceExcel': set_SouceExcel();
+                        break;
+                    //瀵煎嚭鎸夐挳
+                    case 'btn_Export': btn_Export();
+                        break;
+                    //澶嶅埗
+                    case 'btn_Copy':
+                        set_copy();
+                        break;
+                    //鍒犻櫎
+                    case 'btn-Delete': set_DeleteBill();
+                        break;
+                    //鍒锋柊
+                    case 'get_Refresh': get_Refresh();
+                        break;
+                    //瀹℃牳鎸夐挳
+                    case 'btn-Audit':
+                        set_CheckBill(0);
+                        break;
+                    //鍙嶅鏍告寜閽�
+                    case 'btn-DeAudit':
+                        set_CheckBill(1);
+                        break;
+                    //绂佺敤鎸夐挳
+                    case 'btn-Stop':
+                        set_De_Stop(0);
+                        break;
+                    //鍙嶇鐢ㄦ寜閽�
+                    case 'btn-DeStop':
+                        set_De_Stop(1);
+                        break;
+                    //閫�鍑烘寜閽�
+                    case 'get_Exit': Pub_Close(2);
+                        break;
+                    //鍒楄缃�
+                    case 'set_HideColumn': get_HideColumnNoPage(HModName, sessionStorage["HUserName"], option, get_FastQuery);
+                        break;
+                    //淇濆瓨鏂规
+                    case 'set_SaveScheme': set_SaveScheme();
+                        break;
+                    //璇诲彇鏂规
+                    case 'set_ReadScheme': set_ReadScheme();
+                        break;
+                    case 'set_HideButton':
+                        get_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
+                        break;
+                };
+            });
+
+            //#endregion
+
+            //#region 鏌ヨ鎸夐挳
+            form.on('submit(btnSearch)', function (data) {//閫夋嫨浠撲綅
+
+                get_FastQuery();
+            });
+            //#endregion
+
+            //閲嶇疆鎸夐挳
+            form.on('submit(btnReSearch)', function (data) {
+                $("#WorkCenter").val("");//鍗曟嵁鍙�
+                $("#hnumber").val("");//鐗╂枡
+                $("#HOrderProcNO").val("");//鍗曟嵁绫诲瀷
+                $("#ColName").val("0");
+                $("#Comparator").val("0");
+                $("#ColContent").val("");
+                $("#ColContent2").val("");
+                $("#ColName2").val("0");
+                $("#Comparator2").val("0");
+                $("#ColContent1").val("");
+                $("#ColName1").val("0");
+                $("#Comparator1").val("0");
+                $("#HUSEORGID").val(sessionStorage["Organization"])
+                form.render('select');
+                $("#btnSearch").click();
+                set_ClearQuery();
+            });
+            //#endregion
+
+            //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
+            //#region 鍒濆鍖栫晫闈�
+            function set_ClearBill() {
+                set_StockOrg();
+                //鍒濆鍖栬〃鏍�
+                set_InitGrid();
+                //鏌ヨ
+                get_Display(sWhere);
+                //杩囨护鏂规鏌ヨ
+                get_DefaultModule();
+            }
+            //#endregion
+
+            function set_InitGrid() {
+                option = {
+                    elem: '#mainTable'
+                    , toolbar: '#toolbarDemo'
+                    , height: 'full-50'
+                    , page: true
+                    , cellMinWidth: 90
+                    , limit: 50
+                    , limits: [50, 500, 5000, 20000]
+                    , done: function (res, curr, count) {
+                        soulTable.render(this);
+                    }
+                    , cols: [[
+                        { type: 'checkbox', fixed: 'left' }
+                        , { field: 'HItemID', title: 'id', hide: true, sort: true}
+                        , { field: 'HNumber', title: '浠g爜', width: 195, sort: true}
+                        , { field: 'HName', title: '鍚嶇О', width: 180, sort: true}
+                        , { field: 'HHelpCode', title: '鍔╄鐮�', width: 180, sort: true}
+                        , { field: 'HShortNumber', title: '鐭唬鐮�', width: 180, sort: true}
+                        , { field: 'HParentID', title: '鐖剁骇', width: 180, hide: true, sort: true}
+                        , { field: 'HLevel', title: '绛夌骇', width: 180, hide: true, sort: true}
+                        , { field: 'HEndFlag', title: '鏈骇鏍囧織', width: 180, hide: true, sort: true}
+                        , { field: 'HRemark ', title: '澶囨敞 ', width: 180, sort: true}
+                    ]]
+                };
+            }
+
+            //#region 瀵煎嚭Execel
+            function btn_Export() {
+                table.exportFile(ins.config.id, option.data, "xls");
+            }
+            //#endregion
+
+            //#region 閲嶇疆杩囨护鏉′欢鏂规硶
+            function set_ClearQuery() {
+                $("#HNumber").val("");
+                $("#HName").val("");
+                $("#ColContent").val("");
+                $("#ColName").val("0");
+                $("#Comparator").val("0");
+                $("#ColContent2").val("");
+                $("#ColName2").val("0");
+                $("#Comparator2").val("0");
+                $("#ColContent1").val("");
+                $("#ColName1").val("0");
+                $("#Comparator1").val("0");
+                $("#HUSEORGID").val(sessionStorage["Organization"]);
+                sWhere = "";
+            }
+            //#endregion
+
+            //#region 鏌ヨ
+            function get_Display(sWhere) {
+                var ajaxLoad = layer.load();
+                $.ajax({
+                    url: GetWEBURL() + '/Gy_RepairCheckClass/list',
+                    type: "GET",
+                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+                    success: function (data1) {
+                        if (data1.count == 1) {
+
+                            var data = [];
+                            var col = [];
+                            var totalArray = [];
+                            //缁欑┖鐨勬暟缁勮祴鍊�
+                            for (var key in data1.list) {
+                                data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+                            }
+                            //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+                            col.push({ type: 'checkbox', fixed: 'left' });
+                            for (var i = 0; i < data.length; i++) {
+                                // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
+                                if ($.inArray(data[i].name, titleData) > -1) {
+                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+                                }
+                                else if ($.inArray(data[i].name, totalArray) > -1) {
+                                    col.push({
+                                        field: data[i].id, title: data[i].name, align: 'center', sort: true, totalrow: true, width: 200
+                                    })
+                                } else if (data[i].id == '鍗曟嵁鍙�') {
+                                    col.push({
+                                        field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '鍗曟嵁鍙�'
+                                    })
+                                }
+                                else {
+                                    switch (data[i].Type) {
+                                        //int
+                                        case 'DateTime':
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
+                                            break;
+                                        default:
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+                                    }
+                                }
+                            }
+
+
+                            //鍔ㄦ�佹樉绀哄垪鍚�
+                            option = {
+                                elem: '#mainTable'
+                                , toolbar: '#toolbarDemo'
+                                , cols: [col]
+                                , data: data1.data
+                                , height: 'full-80'
+                                , page: true
+                                , limits: [50, 500, 5000, 20000]
+                                , limit: 50
+                                , cellMinWidth: 90
+                            }
+
+                            option.data = data1.data;
+
+                            //鍒锋柊琛ㄦ牸鏁版嵁
+                            DisPlay_HideColumn(HModName, sessionStorage["HUserName"], option, titleData);
+                            ins = table.render(option);
+                            table.render(option);
+                            //鍒锋柊鎸夐挳鏄剧ず
+                            Display_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
+
+                            layer.close(ajaxLoad);
+                            if ($("#ColName option").length < 1) {
+                                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
+
+            //瀵煎叆
+            function set_SouceExcel() {
+                layer.open({
+                    type: 2
+                    , area: ['100%', '100%']
+                    , title: '鐢熶骇鐝粍瀵煎叆'
+                    , shift: 0//寮瑰嚭鍔ㄧ敾
+                    , content: '../../璁″垝绠$悊/Excel/Gy_RoutingGroup_Excel.html?OperationType=dao&HSouceBillType='
+                })
+            }
+
+            //#region 蹇�熻繃婊�
+            function get_FastQuery() {
+                var HName = $("#HName").val();//鍚嶇О
+                var HNumber = $("#HNumber").val();//浠g爜
+                var HUSEORGID = $("#HUSEORGID").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 (HName) {
+                    sWhere += " and HName like '%" + HName + "%'";
+                }
+                if (HNumber) {
+                    sWhere += " and HNumber like '%" + HNumber + "%'";
+                }
+                if (HUSEORGID) {
+                    sWhere += " and 浣跨敤缁勭粐鍚嶇О = '" + HUSEORGID + "'";
+                }
+                get_Display(sWhere);
+                sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+            }
+            //#endregion
+
+            //#region 鏂板
+            function set_AddNew() {
+                layer.open({
+                    type: 2
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['100%', '100%']
+                    , title: '缁翠慨楠屾敹椤圭洰鍒嗙被-鏂板'
+                    , shift: 0//寮瑰嚭鍔ㄧ敾
+                    , content: '../鍩虹璧勬枡/Gy_RepairCheckClassEdit.html?OperationType=1&linterid=&HSouceBillType=&linteridSub=-1'
+                })
+            }
+            //#endregion
+
+            //澶嶅埗
+            function set_copy() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var HInterID = data[0].HItemID.toString();
+                    layer.open({
+                        type: 2
+                        , area: ['100%', '100%']
+                        , title: '缁翠慨楠屾敹椤圭洰鍒嗙被'
+                        , shade: 0.6 //閬僵閫忔槑搴�
+                        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                        , content: '../鍩虹璧勬枡/Gy_RepairCheckClassEdit.html?OperationType=2&linterid=' + HInterID + '&HSouceBillType='
+                        , resize: false
+                        , cancel: function () {
+
+                        }
+                    })
+
+                } else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+                }
+            }
+
+            //#region 缂栬緫
+            function set_ShowBill() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var linterid = data[0].HItemID;
+                    var linteridSub = data[0].hsubid;
+
+                    //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+                    layer.open({
+                        type: 2
+                        , area: ['100%', '100%']
+                        , title: '缁翠慨楠屾敹椤圭洰鍒嗙被-缂栬緫'
+                        , shift: 0//寮瑰嚭鍔ㄧ敾
+                        , content: '../鍩虹璧勬枡/Gy_RepairCheckClassEdit.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=&linteridSub=' + linteridSub
+                    })
+                } else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+                }
+            }
+            //#endregion
+
+            //#region   鑾峰彇缁勭粐
+            function set_StockOrg() {
+                //鑾峰彇鐧诲綍椤电粍缁囧垪
+                $.ajax({
+                    type: "GET",
+                    url: GetWEBURL() + "/Web/GetOrganizations",
+                    async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                    success: function (result) {
+                        var Organization = "";
+                        Organization += '<option  style="color:blue;" value="">鍏ㄩ儴</option>';
+                        if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            var data = result.data;
+                            for (var i = 0; i < data.length; i++) {
+                                Organization += '<option  style="color:blue;" value="' + data[i].Name + '">' + data[i].Name + '</option>';
+                            }
+                            $("#HUSEORGID").append(Organization);
+                            $("#HUSEORGID").val(sessionStorage["Organization"])
+                            form.render('select');
+                        }
+                        layer.closeAll("loading");
+                    },
+                    complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
+                })
+            }
+            //#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_RepairCheckClass/AuditGy_RepairCheckClass", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        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 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_RepairCheckClass/StopGy_RepairCheckClass", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        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 鍒犻櫎
+            function set_DeleteBill() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var hmainid = data[0].HItemID;
+                    layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+                        var wait = layer.load();
+                        //閫昏緫鍒犻櫎鏂规硶
+                        $.ajax({
+                            url: GetWEBURL() + 'DeltetGy_RepairCheckClass',
+                            type: "GET",
+                            data: { "HItemID": hmainid, "user": sessionStorage["HUserName"] },
+                            success: function (result) {
+                                console.log('gouba' + result);
+                                if (result.count == 1) {
+                                    layer.msg(result.Message, { icon: 1 }, function () {
+                                        // 寰楀埌frame绱㈠紩
+                                        var index = layer.getFrameIndex(window.name);
+                                        //鍏抽棴褰撳墠frame
+                                        layer.close(wait);
+                                        //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                        get_FastQuery();
+                                    });
+                                } 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
+
+            //#region 鍒锋柊
+            function get_Refresh() {
+                set_ClearQuery();
+                get_Display(sWhere);
+            }
+            //#endregion
+
+
+
+            //#endregion
+
+            //#region 銆愯繃婊ゆ柟妗堛��
+
+            //鑾峰彇褰撳墠鐢ㄦ埛鐨勯粯璁よ繃婊ゆ柟妗�
+            function get_DefaultModule() {
+                $.ajax({
+                    url: GetWEBURL() + '/Xt_FastICScheme/Chooselist',
+                    type: "GET",
+                    data: { "user": sessionStorage["Czybm"], "HModuleName": HModuleName, "HInterID": 0, "Type": "Default" },
+                    success: function (data1) {
+                        if (data1.count == 1) {
+                            //褰撳墠鐢ㄦ埛璁剧疆鏈夐粯璁ょ殑杩囨护鏂规
+                            var data = data1.data;
+                            //褰撳墠閫夋嫨鐨勮繃婊ゆ柟妗�
+                            HInterID_Choose = data[0].hmainid;
+                            //杩囨护鏂规鍐呯爜
+                            HInterID = data[0].hmainid
+                            //杩囨护鏂规鍚嶇О
+                            HDefaultFilter = data[0].鏂规鍚嶇О
+                            //杩囨护鏂规鐨勫娉紙鏂规淇℃伅鎻忚堪锛�
+                            var HRemark = data[0].澶囨敞
+                            //鏄剧ず鍑哄綋鍓嶇殑榛樿杩囨护鏂规
+                            document.getElementById("HFilterScheme_Now").style.display = "block";
+                            document.getElementById('HFilterScheme_Now').innerHTML = "褰撳墠杩囨护鏂规锛�" + HDefaultFilter + '<span style="font-size: 15px; font-weight: bold; color:#7b90fb">  ' + "(" + HRemark + ")" + '</span>';
+                            //鎶婅繃婊ゆ潯浠跺�煎洖鍐欏埌椤甸潰涓�
+                            for (let i = 0; i < data.length; i++) {
+                                $("#" + data[i].杩囨护瀛楁ID).val(data[i].杩囨护鍊�);
+                                if (data[i].杩囨护鏍囩绫诲瀷 == 'SELECT') {
+                                    $("#" + data[i].杩囨护瀛楁ID).find("option[value='" + data[i].杩囨护鍊� + "']").attr("selected", true);
+                                }
+                            }
+                            //鏌ヨ
+                            get_FastQuery();
+                            form.render("select");
+                        } else {
+                            //褰撳墠鐢ㄦ埛娌℃湁璁剧疆榛樿鐨勮繃婊ゆ柟妗�
+                            //闅愯棌鏄剧ず杩囨护鏂规鐨勬爣绛句俊鎭�
+                            document.getElementById("HFilterScheme_Now").style.display = "none";
+                            //鎵ц鏌ヨ鏂规硶
+                            form.render("select");
+                        }
+                    }, error: function () {
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+            }
+
+            //#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();
+                $("#ColName1").empty();
+                $("#ColName1").append(Organization);
+                $("#ColName2").empty();
+                $("#ColName2").append(Organization);
+                $("#ColName").append(Organization);
+                form.render('select');
+            }
+            //#endregion
+
+            //淇濆瓨鏂规
+            function set_SaveScheme() {
+                var index = layer.open()
+                //鍒ゆ柇鐢ㄦ埛鏄惁鐐瑰嚮浜嗗彸涓婅鐨勨�滃弶鍙封�濆叧闂脊绐楅〉闈�
+                var HIsClose_Manual = false;
+                //鑾峰彇鏈〉鎵�鏈夎繃婊ゆ潯浠跺璞�(class涓寘鍚�"ForFilteringSchemes"鐨勫厓绱�)
+                var Filter = document.getElementsByClassName(HClassTag);
+
+                var HFilterIdList = "";//杩囨护鏉′欢
+                var HFilterIdLists = "";//鎷兼帴澶氫釜杩囨护鏉′欢
+                var HValue = "";//杩囨护鍊�
+                var HElement_type = "";//杩囨护鏍囩绫诲瀷
+
+                for (var i = 0; i < Filter.length; i++) {
+                    HFilterIdList = Filter[i].id; //杩囨护鏉′欢ID
+                    HFilterIdLists += Filter[i].id + ","; //杩囨护鏉′欢ID(鎷兼帴)
+                    HValue += $("#" + HFilterIdList).val() + ","; //杩囨护鏉′欢涓緭鍏ョ殑鍊�
+                    HElement_type += document.getElementById(HFilterIdList).tagName + ",";//閫氳繃鏍囩id鑾峰彇鏍囩绫诲瀷
+                }
+
+                //鍘婚櫎鏈熬閫楀彿
+                HFilterIdLists = HFilterIdLists.substring(0, HFilterIdLists.length - 1);
+                HValue = HValue.substring(0, HValue.length - 1);
+                HElement_type = HElement_type.substring(0, HElement_type.length - 1);
+
+                //褰撳墠椤甸潰涓婃病鏈夐�夋嫨杩囨护鏂规锛岃繘鍏ユ柊澧炴柟娉�
+                if (HDefaultFilter == "") {
+                    layer.open({
+                        type: 2
+                        , area: ['40%', '80%']
+                        , title: '杩囨护鏂规'
+                        , shift: 0//寮瑰嚭鍔ㄧ敾
+                        , content: '../../绯荤粺绠$悊/杩囨护鏂规璁剧疆/Xt_FastICScheme.html?OperationType=1&HModuleName=' + HModuleName + '&HFilterIdLists=' + HFilterIdLists + '&HValue=' + HValue + '&HElement_type=' + HElement_type
+                        , cancel: function () {
+                            // 鍙充笂瑙掑叧闂簨浠剁殑閫昏緫
+                            HIsClose_Manual = true;
+                        }
+                        , end: function () {
+                            if (HIsClose_Manual != true) {
+                                get_FastQuery();
+                                //鏄剧ず褰撳墠鐨勮繃婊ゆ柟妗�
+                                document.getElementById("HFilterScheme_Now").style.display = "block";
+                                document.getElementById('HFilterScheme_Now').innerHTML = "褰撳墠杩囨护鏂规锛�" + sessionStorage["HFilterSchemeName_" + sessionStorage["Czybm"]] + '<span style="font-size: 15px; font-weight: bold; color:#7b90fb">  ' + "(" + sessionStorage["HFilterSchemeRemark_" + sessionStorage["Czybm"]] + ")" + '</span>';
+                            }
+                        }
+                    })
+                    layer.close(index)
+                } else {
+                    //褰撳墠椤甸潰宸叉湁杩囨护鏂规锛岀敤鎴烽�夋嫨 鏂板鎴栬�呯紪杈�
+                    layer.confirm('褰撳墠宸查�夋嫨杩囨护鏂规锛屾槸鍚︿慨鏀癸紵璇烽�夋嫨瀵瑰簲鎿嶄綔', {
+                        title: "鎿嶄綔鎻愮ず",
+                        icon: 0,
+                        btn: ['鏂板鏂规', '淇濆瓨淇敼褰撳墠鏂规', '鍙栨秷']
+                    }, function (index, layero) {
+                        //鏂板
+                        layer.open({
+                            type: 2
+                            , area: ['40%', '80%']
+                            , title: '杩囨护鏂规'
+                            , shift: 0//寮瑰嚭鍔ㄧ敾
+                            , content: '../../绯荤粺绠$悊/杩囨护鏂规璁剧疆/Xt_FastICScheme.html?OperationType=1&HModuleName=' + HModuleName + '&HFilterIdLists=' + HFilterIdLists + '&HValue=' + HValue + '&HElement_type=' + HElement_type
+                            , end: function () {
+                                get_FastQuery()
+                                //鏄剧ず褰撳墠鐨勮繃婊ゆ柟妗�
+                                document.getElementById("HFilterScheme_Now").style.display = "block";
+                                document.getElementById('HFilterScheme_Now').innerHTML = "褰撳墠杩囨护鏂规锛�" + sessionStorage["HFilterSchemeName_" + sessionStorage["Czybm"]] + '<span style="font-size: 15px; font-weight: bold; color:#7b90fb">  ' + "(" + sessionStorage["HFilterSchemeRemark_" + sessionStorage["Czybm"]] + ")" + '</span>';
+                            }
+                        })
+                        layer.close(index)
+                    }, function (index) {
+                        //缂栬緫
+                        var Filter_Edit = document.getElementsByClassName(HClassTag); //鑾峰彇鏈〉鎵�鏈夎繃婊ゆ潯浠跺璞�(class涓寘鍚�"ForFilteringSchemes"鐨勫厓绱�)
+                        HFilterIdList = "";
+                        HFilterIdLists = "";
+                        HValue = "";
+                        HElement_type = "";
+                        for (var i = 0; i < Filter_Edit.length; i++) {
+                            HFilterIdList = Filter_Edit[i].id; //杩囨护鏉′欢ID
+                            HFilterIdLists += Filter_Edit[i].id + ","; //杩囨护鏉′欢ID(鎷兼帴)
+                            HValue += $("#" + HFilterIdList).val() + ","; //杩囨护鏉′欢涓緭鍏ョ殑鍊�
+                            HElement_type += document.getElementById(HFilterIdList).tagName + ",";//閫氳繃鏍囩id鑾峰彇鏍囩绫诲瀷
+                        }
+                        //鍘婚櫎鏈熬閫楀彿
+                        HFilterIdLists = HFilterIdLists.substring(0, HFilterIdLists.length - 1);
+                        HValue = HValue.substring(0, HValue.length - 1);
+                        HElement_type = HElement_type.substring(0, HElement_type.length - 1);
+
+                        var sMainSub = HInterID_Choose + ';' + HFilterIdLists + ';' + HValue + ';' + HElement_type + ';' + sessionStorage["Czybm"] + ';' + 3;
+
+                        //淇敼
+                        $.ajax({
+                            type: "POST",
+                            url: GetWEBURL() + "/Xt_FastICScheme/save", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                            async: true,
+                            data: { "oMain": sMainSub },
+                            dataType: "json",
+                            success: function (data) {
+                                if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                    layer.msg(data.Message, { time: 1 * 1000, icon: 1 });
+                                }
+                                else {
+
+                                }
+                                layer.closeAll("loading");
+                            },
+                            error: function (err) {
+
+
+                            }
+                        });
+                        layer.close(index)
+                    }, function (index) {
+                        //鍙栨秷
+                        layer.alert('鍙栨秷')
+                        layer.close(index)
+                    });
+                }
+
+            }
+
+            //璇诲彇鏂规
+            function set_ReadScheme() {
+                var HIsClose_Manual = false;
+                var Filter = document.getElementsByClassName(HClassTag); //鑾峰彇鏈〉鎵�鏈夎繃婊ゆ潯浠跺璞�(class涓寘鍚�"ForFilteringSchemes"鐨勫厓绱�)
+
+                var HFilterIdList = "";
+                var HFilterIdLists = "";
+                var HValue = "";
+                var HElement_type = "";
+                for (var i = 0; i < Filter.length; i++) {
+                    HFilterIdList = Filter[i].id; //杩囨护鏉′欢ID
+                    HFilterIdLists += Filter[i].id + ","; //杩囨护鏉′欢ID(鎷兼帴)
+                    HValue += $("#" + HFilterIdList).val() + ","; //杩囨护鏉′欢涓緭鍏ョ殑鍊�
+                    HElement_type += document.getElementById(HFilterIdList).tagName + ",";//閫氳繃鏍囩id鑾峰彇鏍囩绫诲瀷
+                }
+                //鍘婚櫎鏈熬閫楀彿
+                HFilterIdLists = HFilterIdLists.substring(0, HFilterIdLists.length - 1);
+                HValue = HValue.substring(0, HValue.length - 1);
+                HElement_type = HElement_type.substring(0, HElement_type.length - 1);
+
+                layer.open({
+                    type: 2
+                    , area: ['80%', '80%']
+                    , title: '杩囨护鏂规鍒楄〃'
+                    , shift: 0//寮瑰嚭鍔ㄧ敾
+                    , content: '../../绯荤粺绠$悊/杩囨护鏂规璁剧疆/Xt_FastICSchemeList.html?HType=Select&HFilterIdLists=' + HFilterIdLists + '&HValue=' + HValue + '&HElement_type=' + HElement_type + '&HModuleName=' + HModuleName
+                    , cancel: function () {
+                        // 鍙充笂瑙掑叧闂簨浠剁殑閫昏緫
+                        HIsClose_Manual = true;
+                    }
+                    , end: function () {
+                        if (HIsClose_Manual != true) {
+                            get_FastQuery()
+                            form.render("select");
+                        }
+                    }
+                })
+            }
+
+            //#endregion
+
+            //浠ヤ笂鏄痩ayui妯″潡
+        });
+
+        //#region 銆愯繃婊ゆ柟妗堣繑鍥炴暟鎹��
+        function HFilterScheme(obj)  //杩斿洖杩囨护鏂规
+        {
+            var HInterID = obj[0].hmainid;
+            HInterID_Choose = obj[0].hmainid;
+            $.ajax({
+                url: GetWEBURL() + '/Xt_FastICScheme/Chooselist',
+                type: "GET",
+                data: { "user": sessionStorage["Czybm"], "HModuleName": HModuleName, "HInterID": HInterID, "Type": "Select" },
+                success: function (data1) {
+                    if (data1.count == 1) {
+                        var data = data1.data;
+                        //璧嬪�艰繃婊ゆ柟妗堝悕绉�
+                        HDefaultFilter = data[0].鏂规鍚嶇О
+                        var HRemark = data[0].澶囨敞
+                        //鏄剧ず褰撳墠鐨勮繃婊ゆ柟妗�
+                        document.getElementById("HFilterScheme_Now").style.display = "block";
+                        document.getElementById('HFilterScheme_Now').innerHTML = "褰撳墠杩囨护鏂规锛�" + HDefaultFilter + '<span style="font-size: 15px; font-weight: bold; color:#7b90fb">  ' + "(" + HRemark + ")" + '</span>';
+                        HInterID = data[0].hmainid
+                        //鏍规嵁閫夋嫨鐨勮繃婊ゆ柟妗堝洖濉暟鎹埌鍒楄〃杩囨护鏉′欢
+                        for (let i = 0; i < data.length; i++) {
+                            $("#" + data[i].杩囨护瀛楁ID).val(data[i].杩囨护鍊�);
+                            if (data[i].杩囨护鏍囩绫诲瀷 == 'SELECT') {
+                                $("#" + data[i].杩囨护瀛楁ID).find("option[value='" + data[i].杩囨护鍊� + "']").attr("selected", true);
+                            }
+                        }
+
+                    } else {
+                        layer.close(ajaxLoad);
+                        layer.alert(data1.code + data1.Message, { icon: 5 });
+                    }
+                }, error: function () {
+                    layer.close(ajaxLoad);
+                    layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                }
+            });
+        }
+
+        //鑾峰彇鍙傛暟
+        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
+
+    </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_RepairCheckClassEdit.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_RepairCheckClassEdit.html"
new file mode 100644
index 0000000..cf2938a
--- /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_RepairCheckClassEdit.html"
@@ -0,0 +1,391 @@
+锘�<!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>
+</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="form" class="layui-form" lay-filter="component-form-group" action="">
+                        <div class="layui-card-header">
+                            <div class="layui-btn-group">
+                                <button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</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">
+                                <h1 style="text-align:center;"><b>缁翠慨楠屾敹椤圭洰鍒嗙被</b></h1>
+                                <ul class="layui-tab-title" lay-filter="tab-all">
+                                    <li lay-id="1" style="padding:1px;" class="layui-this">鍩烘湰淇℃伅</li>
+                                    <li>鍏朵粬淇℃伅</li>
+                                </ul>
+                                <div class="layui-tab-content">
+                                    <!--鍩烘湰淇℃伅-->
+                                    <div class="layui-tab-item layui-show">
+                                        <div class="layui-form-item">
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label" style="width: 120px">浠g爜<label style="color:red"> * </label></label>
+                                                <div class="layui-input-inline">
+                                                    <input class="layui-input" name="HNumber" lay-verify="HNumber" id="HNumber" autocomplete="off">
+                                                    <input name="HItemID" id="HItemID" autocomplete="off" type="hidden">
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label" style="width: 120px">鍚嶇О<label style="color:red"> * </label></label>
+                                                <div class="layui-input-inline">
+                                                    <input class="layui-input" name="HName" id="HName" autocomplete="off">
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label" style="width: 120px">鍔╄鐮侊細</label>
+                                                <div class="layui-input-inline">
+                                                    <input class="layui-input" name="HHelpCode" id="HHelpCode" autocomplete="off">
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="layui-form-item">
+                                            <label class="layui-form-label" style="width: 120px">浣跨敤缁勭粐锛�</label>
+                                            <div class="layui-input-inline">
+                                                <select name="HUSEORGID" id="HUSEORGID" lay-verify="HUSEORGID">
+                                                </select>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label" style="width: 120px">浣跨敤鐘舵�侊細</label>
+                                                <div class="layui-input-inline">
+                                                    <select name="HUseFlag" id="HUseFlag" lay-verify="HUseFlag">
+                                                        <option value="鏈娴�" selected>鏈娴�</option>
+                                                        <option value="鏈娇鐢�">鏈娇鐢�</option>
+                                                        <option value="宸蹭娇鐢�">宸蹭娇鐢�</option>
+                                                    </select>
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="layui-form-item">
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label" style="width: 120px"> 绂佺敤鏍囧織:</label>
+                                                <div class="layui-input-inline">
+                                                    <input type="checkbox" name="HStopflag" id="HStopflag" lay-skin="primary" title="" value="">
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="layui-form-item">
+                                            <div class="layui-col-xs11">
+                                                <label class="layui-form-label"> 澶囨敞锛�</label>
+                                                <div class="layui-input-block">
+                                                    <input class="layui-input" name="HRemark" id="HRemark" autocomplete="off">
+                                                </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="HModifyEmp" id="HModifyEmp" 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>
+                                            <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" value="" 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 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>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </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/PubCustom.js"></script>
+    <script>
+        //鑾峰彇鍙傛暟
+        var params = get_UrlVars();
+        if (typeof (params[params[0]]) == "undefined") {
+            var OperationType = 1;//鎿嶄綔绫诲瀷
+        } else {
+            var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
+            var linterid = params[params[1]];//婧愬崟id
+            var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
+        }
+
+        layui.config({
+            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index' //涓诲叆鍙fā鍧�
+        }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+            //#region 鍏叡鍙橀噺
+            var $ = layui.$
+                , admin = layui.admin
+                , layer = layui.layer
+                , table = layui.table
+                , form = layui.form
+                , laydate = layui.laydate
+                , element = layui.element;
+            //#endregion
+            //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+            //鍒濆鍖栫晫闈�
+            set_ClearBill();
+            //鍒ゆ柇鎿嶄綔绫诲瀷
+            if (OperationType == 1) {//鏃犳簮鍗�
+                set_AddFNew();
+                $("#HMakeEmp").val(sessionStorage["HUserName"]);
+            }
+            else if (OperationType == 2) {
+                set_EditFromGrid();
+                $("#HMakeEmp").val(sessionStorage["HUserName"]);
+                $("#HModifyEmp").val("");
+                $("#HStopEmp").val("");
+                $("#HCheckEmp").val("");
+                $("#HMakeTime").val("");
+                $("#HModifyTime").val("");
+                $("#HStopTime").val("");
+                $("#HCheckTime").val("");
+                $("#HNumber").val("");
+                $("#HItemID").val(0);
+            }
+            else if (OperationType == 3) {//缂栬緫
+                set_EditFromGrid();
+            }
+            else {
+                layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
+            }
+            //#endregion
+
+            //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+            //淇濆瓨
+            form.on('submit(Saver)', function (data) {//淇濆瓨
+                if (AllowLoadData()) {
+                    var isEndCheck = document.getElementById("HStopflag").checked;
+                    isEndCheck == true ? data.field.HStopflag = 'true' : data.field.HStopflag = 'false';//灏嗘暟缁勫悎骞舵垚瀛楃涓�
+
+                    var sMainStr = JSON.stringify(data.field) + ";" + sessionStorage["HUserName"];
+                    $.ajax(
+                        {
+                            type: "POST",
+                            url: GetWEBURL() + "SaveGy_RepairCheckClass", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                            async: true,
+                            data: { "msg": sMainStr },
+                            dataType: "json",
+                            success: function (data) {
+                                if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                    layer.msg(data.Message, { icon: 1 });
+                                    $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
+                                }
+                                else {
+                                    f_alert(data.Message);
+                                    console.log("Reason" + sMainStr + "sub:" + JSON.stringify(layui.table.cache.mainTable));
+                                }
+                                layer.closeAll("loading");
+                            },
+                            error: function (err) {
+
+                                f_alert("閿欒:" + err);
+                                console.log("Reason" + sMainStr);
+                            }
+                        });
+                }
+            });
+            //閫�鍑�
+            form.on('submit(Exit)', function (data) {//
+                if (linterid == undefined) {
+                    //鍏抽棴椤电
+                    Pub_Close(2);
+                }
+                else {
+                    //鍏抽棴椤电
+                    Pub_Close(1);
+                }
+            });
+
+            //鐩戝惉鎻愪氦
+            form.verify({
+                numberOrEmpty: function (value, item) {
+                    // if (value != '') {
+                    if (!/^\d+$/.test(value)) {
+                        return '涓嶈兘涓虹┖鎴栨暟瀛楁垨鑰�0';
+                    }
+                    //}
+                }
+            });
+            //#endregion
+
+
+            //#region 褰撳墠椤甸潰闈㈡墍鏈夌殑鏂规硶
+
+            //鍒濆鍖栫晫闈�
+            function set_ClearBill() {
+                Organ();
+                $("#HStopflag").attr("disabled", true);
+                $("#HUseFlag").attr("disabled", true);
+                layui.form.render('checkbox');
+                layui.form.render('select');
+            }
+            //鏃犳簮鍗曟柊澧�
+            function set_AddFNew() {
+                $("#HItemID").val("0");
+                $("#HNumber").val("");
+            }
+            //缂栬緫
+            function set_EditFromGrid() {
+                $("#HItemID").val(linterid);
+                set_EditForm(linterid);  //缂栬緫鑾峰彇琛ㄥご
+            }
+            //缂栬緫鍔犺浇琛ㄥご
+            function set_EditForm(linterid) {
+                //鏌ヨ妫�楠屾柟妗堝崟鏄惁瀛樺湪
+                $.ajax({
+                    url: GetWEBURL() + "Gy_RepairCheckClass/EditGy_RepairCheckClass",
+                    type: "GET",
+                    async: false,
+                    data: {
+                        "HInterID": linterid
+                    },
+                    success: function (result) {
+                        if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            var data = result.data[0];
+                            $("#HItemID").val(data.HItemID);//浠g爜ID
+                            $("#HNumber").val(data.缁翠慨楠屾敹椤圭洰鍒嗙被浠g爜);//浠g爜
+                            $("#HName").val(data.缁翠慨楠屾敹椤圭洰鍒嗙被鍚嶇О);//鍚嶇О
+                            $("#HHelpCode").val(data.鍔╄鐮�);//鍔╄鐮�
+                            $("#HUSEORGID").val(data.HUSEORGID);//浣跨敤缁勭粐
+                            $("#HUseFlag ").val(data.浣跨敤鐘舵��);//浣跨敤鐘舵��
+                            $("#HRemark").val(data.澶囨敞);//澶囨敞
+
+                            $("#HMakeEmp").val(data.鍒跺崟浜�);
+                            $("#HMakeTime").val(data.鍒涘缓鏃ユ湡 == "" ? "" : Format(new Date(data.鍒涘缓鏃ユ湡), "yyyy-MM-dd"));
+                            $("#HCheckEmp").val(data.瀹℃牳浜�);
+                            $("#HCheckTime").val(data.瀹℃牳鏃ユ湡 == "" ? "" : Format(new Date(data.瀹℃牳鏃ユ湡), "yyyy-MM-dd"));
+                            $("#HModifyEmp").val(data.淇敼浜�);
+                            $("#HModifyTime").val(data.淇敼鏃ユ湡 == "" ? "" : Format(new Date(data.淇敼鏃ユ湡), "yyyy-MM-dd"));
+                            $("#HStopEmp").val(data.绂佺敤浜�);
+                            $("#HStopTime").val(data.绂佺敤鏃ユ湡 == "" ? "" : Format(new Date(data.绂佺敤鏃ユ湡), "yyyy-MM-dd"));
+
+                            $("input[name='HStopflag']").attr("checked", data.绂佺敤鏍囧織 == "鏄�" ? true : false);//true:閫変腑 false:涓嶉�変腑
+                            layui.form.render();//瀹炴椂娓叉煋閫変腑鍜屼笉閫変腑鐨勬牱寮�,鏈�濂芥坊鍔犺繖鍙ヨ瘽
+                            form.render("select");
+                        } else {
+                            layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+                        }
+                    }, error: function () {
+                        layer.alert("鍙戠敓閿欒!", { icon: 5 });
+                    }
+                });
+            }
+
+            //鏁版嵁楠岃瘉
+            function AllowLoadData() {
+                var HNumber = $("#HNumber").val() //浠g爜
+                var HName = $("#HName").val() //鍚嶇О
+
+                if (HNumber == null || HNumber == undefined || HNumber == "") {
+                    layer.msg("璇疯緭鍏ヤ唬鐮侊紒", { icon: 5 });
+                    return false;
+                }
+                if (HName == null || HName == undefined || HName == "") {
+                    layer.msg("璇疯緭鍏ュ悕绉帮紒", { icon: 5 });
+                    return false;
+                }
+                return true;
+            }
+
+            //
+            function f_alert(sMsg) {
+                layer.alert(sMsg, { icon: 5 });
+
+            }
+            //鑾峰彇鐧诲綍椤电粍缁囧垪
+            function Organ() {
+                var Organization = '';
+                $.ajax({
+                    type: "get",
+                    url: GetWEBURL() + "/Web/GetOrganizations",
+                    async: false,
+                    success: function (result) {
+                        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");
+                    }
+                })
+            }
+            //#endregion
+        });
+
+    </script>
+</body>
+</html>
+</head>
+<body>
+
+</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_RepairCheckEdit.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_RepairCheckEdit.html"
index 576f820..3974483 100644
--- "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_RepairCheckEdit.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_RepairCheckEdit.html"
@@ -15,6 +15,7 @@
     <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
     <script src="../../../layuiadmin/layui/lay/modules/util.js"></script>
     <script src="../../../layuiadmin/PubCustom.js"></script>
+    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
     <style media="screen">
         .custom-tree-item-clicked {
             color: #FC9003
@@ -29,16 +30,18 @@
                     <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="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</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" lay-filter="tab-all">
+                                    <li lay-id="1" style="padding:1px;" class="layui-this">鍩烘湰淇℃伅</li>
+                                    <li>鍏朵粬淇℃伅</li>
+                                </ul>
                                 <div class="layui-tab-content">
+                                    <!--鍩烘湰淇℃伅-->
                                     <div class="layui-tab-item layui-show">
                                         <div class="layui-form-item">
                                             <div class="layui-inline">
@@ -60,17 +63,120 @@
                                                     <input class="layui-input" name="HHelpCode" lay-verify="HHelpCode" id="HHelpCode">
                                                 </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; width: 185px;">
+                                                    <input type="hidden" class="layui-input" lay-verify="HCREATEORGID" name="HCREATEORGID" id="HCREATEORGID">
+                                                    <select name="HUSEORGID" id="HUSEORGID" lay-verify="HUSEORGID">
+                                                        <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+                                                    </select>
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">缁翠慨楠屾敹<br />椤圭洰绫诲瀷</label>
+                                                <div class="layui-input-block" style="margin-left: 125px; width: 190px;">
+                                                    <select name="HRepairCheckType" id="HRepairCheckType" lay-verify="HRepairCheckType">
+                                                        <option value="璁惧" selected="selected">璁惧</option>
+                                                        <option value="鍣ㄥ叿">鍣ㄥ叿</option>
+                                                    </select>
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label" style="width: 85px;">浣跨敤鏍囧織</label>
+                                                <div class="layui-input-block" style="margin-left: 130px; width: 190px;">
+                                                    <select name="HUseFlag" id="HUseFlag" lay-verify="HUseFlag">
+                                                        <option value="鏈娇鐢�" selected="selected">鏈娇鐢�</option>
+                                                        <option value="宸蹭娇鐢�">宸蹭娇鐢�</option>
+                                                        <option value="鏈娴�">鏈娴�</option>
+                                                    </select>
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="layui-row">
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">缁翠慨楠屾敹椤圭洰鍒嗙被</label>
+                                                <div class="layui-input-inline">
+                                                    <input type="text" name="HRepairCheckClassName" id="HRepairCheckClassName" readonly class="layui-input" value="" style="float:left;width:150px;">
+                                                    <input type="hidden" name="HRepairCheckClassID" id="HRepairCheckClassID" class="layui-input" value="0" style="float:left;width:150px;">
+                                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="BtnHRepairCheckClass" style="width:40px;">
+                                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                    </button>
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="layui-row">
                                             <div class="layui-inline">
                                                 <label class="layui-form-label">澶囨敞</label>
                                                 <div class="layui-input-inline">
                                                     <textarea placeholder="璇疯緭鍏ョ淮澶囨敞" class="layui-textarea" name="HRemark" id="HRemark"></textarea>
                                                 </div>
                                             </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">绂佺敤鏍囧織</label>
+                                                <div class="layui-input-block">
+                                                    <input type="checkbox" name="HStopflag" id="HStopflag" lay-skin="primary" title="">
+                                                </div>
+                                            </div>
                                         </div>
+                                    </div>
+                                    <!--鍏朵粬淇℃伅-->
+                                    <div class="layui-tab-item">
                                         <div class="layui-form-item">
-                                            <label class="layui-form-label">绂佺敤鏍囧織</label>
-                                            <div class="layui-input-block">
-                                                <input type="checkbox" name="HStopflag" id="HStopflag" lay-skin="primary" title="">
+                                            <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="HModifyEmp" id="HModifyEmp" 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>
+                                            <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="HModifyTime" id="HModifyTime" 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>
                                         </div>
                                     </div>
@@ -112,32 +218,29 @@
                 , element = layui.element;
             //#endregion
             //甯歌鐢ㄦ硶
+            Organ();
+            $("#HStopflag").attr("disabled", true);
+            $("#HUseFlag").attr("disabled", true);
+            layui.form.render('checkbox');
 
+            if (OperationType == 1) {   //鏂板
+                linterid = 0;
+                $("#HMakeEmp").val(sessionStorage["HUserName"]);
 
-            if (OperationType == 3) {
-                $.ajax({
-                    url: GetWEBURL() + "/Gy_RepairCheck/EditRepairCheck",
-                    type: "GET",
-                    data: {
-                        "HInterID": linterid
-                    },
-                    success: function (d) {
-
-                        ajaxReturnData = JSON.parse(JSON.stringify(d)).data;
-                        $("#HNumber").val(d.data[0].HNumber);
-                        $("#HName").val(d.data[0].HName);
-                        $("#HHelpCode").val(d.data[0].HHelpCode);
-                        $("#HRemark").val(d.data[0].HRemark);
-                        $("#HLevel").val(d.data[0].HLevel);
-                        $("input[name='HStopflag']").prop("checked", d.data[0].HStopflag);//true:閫変腑 false:涓嶉�変腑
-                        layui.form.render();//瀹炴椂娓叉煋閫変腑鍜屼笉閫変腑鐨勬牱寮�,鏈�濂芥坊鍔犺繖鍙ヨ瘽
-                        $("#HUpDater").val(sessionStorage["HUserName"]);//淇敼浜�
-                        //table.reload(layTableId, {
-                        //    data: ajaxReturnData
-                        //});
-                    }
-
-                });
+            } else if (OperationType == 2) {
+                RoadBillMain(linterid);
+                $("#HMakeEmp").val(sessionStorage["HUserName"]);
+                $("#HModifyEmp").val("");
+                $("#HStopEmp").val("");
+                $("#HCheckEmp").val("");
+                $("#HMakeTime").val("");
+                $("#HModifyTime").val("");
+                $("#HStopTime").val("");
+                $("#HCheckTime").val("");
+                $("#HNumber").val("");
+                $("#HItemID").val(0);
+            } else  if (OperationType == 3) {
+                RoadBillMain(linterid);
             }
 
             //#region 宸ュ叿鎸夐挳
@@ -146,6 +249,12 @@
             form.on('submit(Exit)', function () {
                 Pub_Close(1);
             })
+
+            //琛ㄥご淇℃伅  缁翠慨楠屾敹椤圭洰鍒嗙被
+            form.on('submit(BtnHRepairCheckClass)', function () {
+                BtnHRepairCheckClass();
+            });
+
 
             //淇濆瓨
             form.on('submit(Saver)', function (data) {//淇濆瓨
@@ -229,6 +338,103 @@
 
             //#endregion
 
+            //缁翠慨楠屾敹椤圭洰鍒嗙被鍒楄〃
+            function BtnHRepairCheckClass() {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '缁翠慨楠屾敹椤圭洰鍒嗙被鍒楄〃',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['80%', '80%'],
+                    maxmin: true,
+                    content: ['../../鍩虹璧勬枡/鍩虹璧勬枡/Gy_RepairCheckClass.html', 'yes'],
+                    btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {
+
+                        //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HRepairCheckClassName").val(checkStatus.data[0].缁翠慨楠屾敹椤圭洰鍒嗙被鍚嶇О);
+                        $("#HRepairCheckClassID").val(checkStatus.data[0].HItemID);
+
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                });
+            }
+
+
+            function RoadBillMain(linterid) {
+                $.ajax({
+                    url: GetWEBURL() + "/Gy_RepairCheck/EditRepairCheck",
+                    type: "GET",
+                    async: false,
+                    data: {
+                        "HInterID": linterid
+                    },
+                    success: function (d) {
+
+                        ajaxReturnData = JSON.parse(JSON.stringify(d)).data;
+                        $("#HNumber").val(d.data[0].缁翠慨楠屾敹椤圭洰浠g爜);
+                        $("#HName").val(d.data[0].缁翠慨楠屾敹椤圭洰鍚嶇О);
+                        $("#HHelpCode").val(d.data[0].鍔╄鐮�);
+                        $("#HRemark").val(d.data[0].澶囨敞);
+                        $("#HLevel").val(d.data[0].绛夌骇);
+
+                        $("#HUSEORGID").val(d.data[0].HUSEORGID);
+                        $("#HMakeEmp").val(d.data[0].鍒跺崟浜�);
+                        $("#HMakeTime").val(d.data[0].鍒涘缓鏃ユ湡 == null ? "" : Format(new Date(d.data[0].鍒涘缓鏃ユ湡), "yyyy-MM-dd"));
+                        $("#HCheckEmp").val(d.data[0].瀹℃牳浜�);
+                        $("#HCheckTime").val(d.data[0].瀹℃牳鏃ユ湡 == null ? "" : Format(new Date(d.data[0].瀹℃牳鏃ユ湡), "yyyy-MM-dd"));
+                        $("#HModifyEmp").val(d.data[0].淇敼浜�);
+                        $("#HModifyTime").val(d.data[0].淇敼鏃ユ湡 == null ? "" : Format(new Date(d.data[0].淇敼鏃ユ湡), "yyyy-MM-dd"));
+                        $("#HStopEmp").val(d.data[0].绂佺敤浜�);
+                        $("#HStopTime").val(d.data[0].绂佺敤鏃ユ湡 == null ? "" : Format(new Date(d.data[0].绂佺敤鏃ユ湡), "yyyy-MM-dd"));
+                        $("#HUseFlag").val(d.data[0].浣跨敤鐘舵��);
+                        $("#HRepairCheckType").val(d.data[0].缁翠慨楠屾敹椤圭洰绫诲瀷);
+                        $("#HRepairCheckClassID").val(d.data[0].HRepairCheckClassID);
+                        $("#HRepairCheckClassName").val(d.data[0].缁翠慨椤归獙鏀剁洰鍒嗙被鍚嶇О);
+                        $("input[name='HStopflag']").prop("checked", d.data[0].HStopflag);//true:閫変腑 false:涓嶉�変腑
+                        layui.form.render();//瀹炴椂娓叉煋閫変腑鍜屼笉閫変腑鐨勬牱寮�,鏈�濂芥坊鍔犺繖鍙ヨ瘽
+                        $("#HUpDater").val(sessionStorage["HUserName"]);//淇敼浜�
+                        //table.reload(layTableId, {
+                        //    data: ajaxReturnData
+                        //});
+                    }
+
+                });
+            }
+
+            //鑾峰彇缁勭粐
+            function Organ() {
+                //鑾峰彇鐧诲綍椤电粍缁囧垪
+                var Organization = '';
+                $.ajax({
+                    type: "get",
+                    url: GetWEBURL() + "/Web/GetOrganizations",
+                    success: function (result) {
+                        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"])
+                            $("#HCREATEORGID").val(sessionStorage["OrganizationID"])
+                            form.render('select');
+                        }
+                        layer.closeAll("loading");
+                    }
+                })
+            }
 
             function f_alert(sMsg) {
                 layer.alert(sMsg, { icon: 5 });
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_RepairCheckList.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_RepairCheckList.html"
index 48e862e..103aa86 100644
--- "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_RepairCheckList.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_RepairCheckList.html"
@@ -9,15 +9,23 @@
     <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/treeTable.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/layui/lay/modules/util.js"></script>
+    <script src="../../../layuiadmin/layui/layui1.js"></script>
+    <script src="../../../layuiadmin/layui/lay/modules/table.js"></script>
+    <script src="../../../layuiadmin/HideButton_New.js"></script>
     <script src="../../../layuiadmin/PubCustom.js"></script>
+    <script src="../../../layuiadmin/soulTable.slim.js"></script>
+    <script src="../../../layuiadmin/PageTitle.js"></script>
+    <script src="../../../layuiadmin/SetColumn.js"></script>
     <style media="screen">
         .custom-tree-item-clicked {
             color: #FC9003
+        }
+        /*鏍戠姸鍥剧偣鍑婚珮浜彉鑹�*/
+        .layui-tree-set-active > .layui-tree-entry .layui-tree-main {
+            background: #aef0f7;
         }
     </style>
 </head>
@@ -44,6 +52,14 @@
                                     <label class="layui-form-label" style="width: 85px;">鍚嶇О</label>
                                     <div class="layui-input-block" style="margin-left: 120px;">
                                         <input type="text" class="layui-input ForFilteringSchemes" name="HName" id="HName">
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label" style="width: 85px;">缁勭粐</label>
+                                    <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
+                                        <select name="HUSEORGID" id="HUSEORGID" class="ForFilteringSchemes" lay-verify="HUSEORGID">
+                                            <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+                                        </select>
                                     </div>
                                 </div>
                                 <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
@@ -82,22 +98,93 @@
                                             <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent">
                                         </div>
                                     </div>
+                                    <div class="layui-row" style="margin-top:5px">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">杩囨护</label>
+                                            <div class="layui-input-block">
+                                                <select name="ColName1" id="ColName1" lay-filter="ColName1" style="width:190px;" class="ForFilteringSchemes">
+                                                </select>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <select name="Comparator1" id="Comparator1" lay-filter="Comparator1" 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="ColContent1" id="ColContent1">
+                                        </div>
+                                    </div>
+                                    <div class="layui-row" style="margin-top:5px">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">杩囨护</label>
+                                            <div class="layui-input-block">
+                                                <select name="ColName2" id="ColName2" lay-filter="ColName2" style="width:190px;" class="ForFilteringSchemes">
+                                                </select>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <select name="Comparator2" id="Comparator2" lay-filter="Comparator2" 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="ColContent2" id="ColContent2">
+                                        </div>
+                                    </div>
                                 </div>
                             </div>
                         </div>
-                        <table class="" id="mainTable" lay-filter="mainTable"></table>
+                        <div class="layui-row" style="padding:10px 0">
+                            <div class="layui-col-xs3 layui-inline" style="border: solid 1.5px #e0d6d64d;">
+                                <div id="TreeTable" class="demo-tree demo-tree-box" style="width:99.5%;height:calc(45vh);overflow-y:auto"></div>
+
+                            </div>
+                            <div class="layui-col-xs8 layui-inline" style="padding-left: 10px; width: 75%">
+                                <div>
+                                    <table class="" id="mainTable" lay-filter="mainTable"></table>
+                                </div>
+                            </div>
+                        </div>
                         <script type="text/html" id="toolbarDemo">
-                            <div class="layui-btn-container">
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_SouceExcel"><i class="layui-icon layui-icon-delete"></i>瀵煎叆</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-view"><i class="layui-icon layui-icon-tips"></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 class="layui-btn-container" id="toolbarDemo_ButtonSet">
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_SouceExcel" id="set_SouceExcel"><i class="layui-icon layui-icon-delete"></i>瀵煎叆</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Export" id="btn_Export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew" id="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Copy" id="btn_Copy"><i class="layui-icon layui-icon-add-1"></i>澶嶅埗</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill" id="set_ShowBill"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill" id="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit" id="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>瀹℃牳</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit" id="btn-Audit"><i class="layui-icon layui-icon-radio"></i>鍙嶅鏍�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Stop" id="btn-Stop"><i class="layui-icon layui-icon-radio"></i>绂佺敤</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeStop" id="btn-DeStop"><i class="layui-icon layui-icon-radio"></i>鍙嶇鐢�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn" id="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideButton" id="set_HideButton"><i class="layui-icon layui-icon-form"></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="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh" id="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit" id="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-view" id="btn-view"><i class="layui-icon layui-icon-tips"></i>棰勮</button>
                             </div>
                         </script>
                     </form>
@@ -131,6 +218,11 @@
             var sWhere = "";
             var option = [];
             var HModName = "Gy_RepairCheckList";
+            var HBillType = "Gy_RepairCheckList";
+            var ins;                //鐢ㄤ簬瀵煎嚭excel
+            var HMaterTypeID = 0;              //鐗╂枡鍒嗙被鑺傜偣id
+            var sql = "";
+            var set_HideButton_ID = "toolbarDemo_ButtonSet";                    //闇�瑕佽缃殑鎸夐挳鐨勭埗绾ц妭鐐圭殑id
             //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
             var titleData = ["hitemid","hparentid"];
             //#endregion
@@ -169,18 +261,35 @@
                     //瀵煎叆
                     case 'set_SouceExcel': set_SouceExcel();
                         break;
+                    //瀵煎嚭鎸夐挳
+                    case 'btn_Export': btn_Export();
+                        break;
                     //鍒锋柊
                     case 'get_Refresh': get_Refresh();
+                        break;
+                    //澶嶅埗
+                    case 'btn_Copy':
+                        set_copy();
                         break;
                     //娴忚
                     case 'btn-view':
                         get_ViewReport();
                         break;
-                    //瀹℃牳
-                    case 'btn-Audit': set_AuditBill();
+                    //瀹℃牳鎸夐挳
+                    case 'btn-Audit':
+                        set_CheckBill(0);
                         break;
-                    //鍙嶅鏍�
-                    case 'btn-DeAudit': set_DeAuditBill();
+                    //鍙嶅鏍告寜閽�
+                    case 'btn-DeAudit':
+                        set_CheckBill(1);
+                        break;
+                    //绂佺敤鎸夐挳
+                    case 'btn-Stop':
+                        set_De_Stop(0);
+                        break;
+                    //鍙嶇鐢ㄦ寜閽�
+                    case 'btn-DeStop':
+                        set_De_Stop(1);
                         break;
                     //閫�鍑烘寜閽�
                     case 'get_Exit': Pub_Close(2);
@@ -192,7 +301,11 @@
                     case 'set_ReadScheme': set_ReadScheme();
                         break;
                     //鍒楄缃�
-                    case 'set_HideColumn': get_HideColumn();
+                    case 'set_HideColumn': get_HideColumnNoPage(HModName, sessionStorage["HUserName"], option, get_FastQuery);
+                        break;
+                    //鎸夐挳璁剧疆
+                    case 'set_HideButton':
+                        get_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
                         break;
                 };
             });
@@ -222,14 +335,22 @@
             //鍒濆鍖栬〃鏍�
 
             function set_ClearBill() {
+                set_StockOrg();
                 //鍒濆鍖栬〃鏍�
                 set_InitGrid();
-
+                //鏍戠姸鍥炬煡璇�
+                get_Display_Tree();
                 //鏌ヨ
                 get_Display(sWhere);
 
                 get_DefaultModule();
             }
+
+            //#region 瀵煎嚭Execel
+            function btn_Export() {
+                table.exportFile(ins.config.id, option.data, "xls");
+            }
+            //#endregion
 
             //#region鍒濆鍖栬〃鏍�
             function set_InitGrid() {
@@ -314,15 +435,19 @@
                                 , limit: 50
                                 , cellMinWidth: 90
                             }
-                            table.render(option);
+
+                            ins = table.render(option);
 
                             //鍒锋柊琛ㄦ牸鏁版嵁
-                            DisPlay_HideColumn();
+                            DisPlay_HideColumn(HModName, sessionStorage["HUserName"], option, titleData);
+                            table.render(option);
 
                             layer.close(ajaxLoad);
-                            if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+                            if ($("#ColName option").length < 1) {
                                 ColFilter();
                             }
+
+                            Display_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
                             //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
                         } else {
                             layer.close(ajaxLoad);
@@ -340,9 +465,17 @@
             function get_FastQuery() {
                 var HNumber = $("#HNumber").val();
                 var HName = $("#HName").val();
+                var HUSEORGID = $("#HUSEORGID").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 = "";
@@ -365,11 +498,59 @@
                     }
                     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 缁翠慨楠屾敹椤圭洰浠g爜 like '%" + HNumber + "%'";
                 }
                 if (HName) {
                     sWhere += " and 缁翠慨楠屾敹椤圭洰 like '%" + HName + "%'";
+                }
+                if (HUSEORGID) {
+                    sWhere += " and 浣跨敤缁勭粐鍚嶇О = '" + HUSEORGID + "'";
+                }
+                if (sql != "") {
+                    sWhere += sql;
                 }
                 get_Display(sWhere);
                 sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
@@ -383,6 +564,13 @@
                 $("#ColContent").val("");
                 $("#ColName").val("0");
                 $("#Comparator").val("0");
+                $("#ColContent2").val("");
+                $("#ColName2").val("0");
+                $("#Comparator2").val("0");
+                $("#ColContent1").val("");
+                $("#ColName1").val("0");
+                $("#Comparator1").val("0");
+                $("#HUSEORGID").val(sessionStorage["Organization"]);
                 form.render('select');
                 sWhere = "";
                 get_Display(sWhere);
@@ -390,6 +578,34 @@
             //#endregion
 
             //#region 宸ュ叿鏍忎簨浠�
+
+
+            //#region   鑾峰彇缁勭粐
+            function set_StockOrg() {
+                //鑾峰彇鐧诲綍椤电粍缁囧垪
+                $.ajax({
+                    type: "GET",
+                    url: GetWEBURL() + "/Web/GetOrganizations",
+                    async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                    success: function (result) {
+                        var Organization = "";
+                        Organization += '<option  style="color:blue;" value="">鍏ㄩ儴</option>';
+                        if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            var data = result.data;
+                            for (var i = 0; i < data.length; i++) {
+                                Organization += '<option  style="color:blue;" value="' + data[i].Name + '">' + data[i].Name + '</option>';
+                            }
+                            $("#HUSEORGID").append(Organization);
+                            $("#HUSEORGID").val(sessionStorage["Organization"])
+                            form.render('select');
+                        }
+                        layer.closeAll("loading");
+                    },
+                    complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
+                })
+            }
+            //#endregion
+
             //鏂板
             function set_AddNew() {
                 //椤甸潰灞�-鑷畾涔�
@@ -399,7 +615,7 @@
                     title: '鏂板缁翠慨妫�楠岄」鐩�',
                     closeBtn: 1,
                     shift: 2,
-                    area: ['80%', '80%'],
+                    area: ['100%', '100%'],
                     maxmin: true,
                     content: ['../鍩虹璧勬枡/Gy_RepairCheckEdit.html?OperationType=1&linterid=&HSouceBillType='],
                     end: function () {
@@ -413,17 +629,42 @@
 
             }
 
+            //澶嶅埗
+            function set_copy() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var HInterID = data[0].hitemid.toString();
+                    layer.open({
+                        type: 2
+                        , area: ['100%', '100%']
+                        , title: '缂栬緫缁翠慨妫�楠岄」鐩�'
+                        , shade: 0.6 //閬僵閫忔槑搴�
+                        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                        , content: '../鍩虹璧勬枡/Gy_RepairCheckEdit.html?OperationType=2&hID=' + HInterID
+                        , resize: false
+                        , cancel: function () {
+
+                        }
+                    })
+
+                } else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+                }
+            }
+
             //淇敼鎸夐挳
             function set_ShowBill() {
                 var checkStatus = table.checkStatus('mainTable')
                     , data = checkStatus.data;
                 if (checkStatus.data.length === 1) {
-                    var hID = data[0].HItemID.toString();
+                    var hID = data[0].hitemid.toString();
                     //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
                     layer.open({
                         type: 2
                         , area: ['100%', '100%']
-                        , title: '缂栬緫鍣ㄥ叿棰嗙敤鍗�'
+                        , title: '缂栬緫缁翠慨妫�楠岄」鐩�'
                         , closeBtn: 1
                         , shade: 0.6 //閬僵閫忔槑搴�
                         , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
@@ -482,6 +723,94 @@
                 }
             };
 
+            // 鏍戠姸鍥炬煡璇�
+            function get_Display_Tree() {
+                var ajaxLoad = layer.load();
+                $.ajax({
+                    url: GetWEBURL() + '/Gy_RepairCheckClass/Gy_RepairCheckClassTreeList',
+                    type: "GET",
+                    data: { "HOrgID": sessionStorage["OrganizationID"] },
+                    success: function (data1) {
+                        if (data1.count == 1) {
+                            layer.close(ajaxLoad);
+                            var data = JSON.parse(data1.data);
+                            MenuMain(data);
+                        } else {
+                            layer.close(ajaxLoad);
+                            layer.alert(data1.code + data1.Message, { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.close(ajaxLoad);
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+            }
+
+            //閬嶅巻鐢熸垚涓昏彍鍗�
+            function MenuMain(data) {
+                var liStr = '[';
+                //閬嶅巻鐢熸垚涓昏彍鍗�
+                for (var i = 0; i < data.length; i++) {
+                    // 鍒ゆ柇鏄惁瀛樺湪瀛愯彍鍗�
+                    if (data[i].children != null && data[i].children.length > 0) {
+                        liStr += '{"title": "' + data[i].id + "-" + data[i].title + '", "id": "' + data[i].id + '","spread":true, "children":[ ';
+                        // 閬嶅巻鑾峰彇瀛愯彍鍗�
+                        for (var k = 0; k < data[i].children.length; k++) {
+                            liStr += getChildMenu(data[i].children[k], 0);
+                        }
+                        liStr = liStr.substring(0, liStr.length - 1);
+                        liStr += ']},';
+                    } else {
+                        liStr += '{"title": "' + data[i].id + "-" + data[i].title + '", "id": "' + data[i].id + '"},';
+                    }
+                };
+                liStr = liStr.substring(0, liStr.length - 1);
+                liStr += "]";
+                var treeTable = JSON.parse(liStr);
+                tree.render({
+                    elem: '#TreeTable' //榛樿鏄偣鍑昏妭鐐瑰彲杩涜鏀剁缉
+                    , data: treeTable
+                    , onlyIconControl: true
+                    , click: function (obj) {
+                        //楂樹寒鍙樿壊
+                        $(".layui-tree-set").removeClass('layui-tree-set-active');
+                        obj.elem.addClass('layui-tree-set-active');
+
+                        var data = obj.data;  //鑾峰彇褰撳墠鐐瑰嚮鐨勮妭鐐规暟鎹�
+                        if (data.id == "100") {
+                            sql = " and HRepairCheckClassID=0 ";
+                            HMaterTypeID = 0;
+                        } else if (data.id == "0") {
+                            sql = "";
+                            HMaterTypeID = 0;
+                        } else {
+                            sql = " and HRepairCheckClassID='" + data.id + "' ";
+                            HMaterTypeID = data.id;
+                        }
+                        get_FastQuery()
+                    }
+                });
+            }
+
+            // 閫掑綊鐢熸垚瀛愯彍鍗�
+            function getChildMenu(subMenu, num) {
+                num++;
+                var subStr = '';
+                if (subMenu.children != null && subMenu.children.length > 0) {
+                    subStr += '{"title": "' + subMenu.id + "-" + subMenu.title + '", "id": "' + subMenu.id + '", "children":[';
+                    for (var j = 0; j < subMenu.children.length; j++) {
+                        subStr += getChildMenu(subMenu.children[j], num);
+                        if (j + 1 == subMenu.children.length) {
+                            subStr = subStr.substring(0, subStr.length - 1);
+                        }
+                    }
+                    subStr += ']},';
+                } else {
+                    subStr += '{"title": "' + subMenu.id + "-" + subMenu.title + '", "id": "' + subMenu.id + '"},';
+                }
+                return subStr;
+            }
+
             //鍒锋柊
             function get_Refresh() {
                 $("#btnSearch").click();
@@ -521,22 +850,17 @@
                 }
             }
 
-            //瀹℃牳
-            function set_AuditBill() {
+            //#region 鍙嶅鏍�/瀹℃牳鏁版嵁
+            function set_CheckBill(num) {
                 var checkStatus = table.checkStatus('mainTable')
                     , data = checkStatus.data;
                 if (checkStatus.data.length === 1) {
-                    var HBillStatus = data[0].HBillStatus.toString(); //鍗曟嵁鐘舵��
-                    var HInterID = data[0].hmainid.toString();
-                    if (HBillStatus > 0) {
-                        layer.msg('鍗曟嵁涓嶄负鏈鏍哥姸鎬侊紒');
-                        return false;
-                    }
+                    var InterID = data[0].hitemid.toString();
                     //閫昏緫瀹℃牳鏂规硶
                     $.ajax({
                         type: "GET",
-                        url: GetWEBURL() + "/Gy_Mould/AuditProcessReportList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
-                        data: { "HInterID": HInterID, "IsAudit": 0, "CurUserName": sessionStorage["HUserName"] },
+                        url: GetWEBURL() + "/Gy_RepairCheck/AuditGy_RepairCheck", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        data: { "HInterID": InterID, "Type": num, "user": sessionStorage["HUserName"] },
                         success: function (result) {
                             if (result.count == 1) {
                                 layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
@@ -559,164 +883,43 @@
                 else {
                     layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
                 }
-            }
-
-            //鍙嶅鏍�
-            function set_DeAuditBill() {
-                var checkStatus = table.checkStatus('mainTable')
-                    , data = checkStatus.data;
-                if (checkStatus.data.length === 1) {
-                    var HBillStatus = data[0].HBillStatus.toString(); //鍗曟嵁鐘舵��
-                    var HInterID = data[0].hmainid.toString();
-                    if (HBillStatus = 0) {
-                        layer.msg('鍗曟嵁宸蹭负鏈鏍哥姸鎬�,鏃犻渶鍙嶅鏍革紒');
-                        return false;
-                    }
-                    //閫昏緫瀹℃牳鏂规硶
-                    $.ajax({
-                        type: "GET",
-                        url: GetWEBURL() + "/Gy_Mould/AuditProcessReportList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
-                        data: { "HInterID": HInterID, "IsAudit": 1, "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('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
-                }
-
-            }
-
-            //#region 闅愯棌鍒楄缃�
-            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 鏄剧ず鍒楁暟鎹�
-            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 = ["鍗曟嵁ID", "HMouldID", "hsubid", "HManagerID", "婧愬崟涓诲唴鐮�", "婧愬崟瀛愬唴鐮�"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
 
-                            dataCol = data1.data[0].HGridString.split(',');
+            //#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_RepairCheck/StopGy_RepairCheck", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        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');
+                                });
 
-                            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 (dataCols[3] > 0) {
-                                    option.cols[0][i + 1]["width"] = dataCols[3];
-                                }
-                                //璁剧疆鍐呭瀛椾綋澶у皬
-                                if (data1.data[0].HFontSize != 0) {
-                                    option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
-                                } else {
-                                    option.cols[0][i + 1]["style"] = "font-size:100%";
-                                }
-                                //璁剧疆鍒楀
-                                //if (data1.data[0].HColumnWidth != 0) {
-                                //    option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
-                                //} else {
-                                //    option.cols[0][i + 1]["width"] = "";
-                                //}
-                                //鏄剧ず鍒�
-                                if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
-                                    option.cols[0][i + 1]["hide"] = false;
-                                }
-                                //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
-                                switch (dataCols[2]) {
-                                    case "L":
-                                        option.cols[0][i + 1]["align"] = "left";
-                                        break;
-                                    case "M":
-                                        option.cols[0][i + 1]["align"] = "center";
-                                        break;
-                                    case "R":
-                                        option.cols[0][i + 1]["align"] = "right";
-                                        break;
-                                }
+                            } else {
+                                layer.alert(result.code + result.Message, { icon: 5 });
                             }
-
-                            //鍙栨秷鍐荤粨鍒�
-                            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 });
                         }
-                    }, error: function () {
-                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
-                    }
-                })
+                    });
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+                }
             }
             //#endregion
 
@@ -730,6 +933,10 @@
                 }
                 $("#ColName").empty();
                 $("#ColName").append(Organization);
+                $("#ColName1").empty();
+                $("#ColName1").append(Organization);
+                $("#ColName2").empty();
+                $("#ColName2").append(Organization);
                 form.render('select');
             }
             //#endregion
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_RepairClass.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_RepairClass.html"
new file mode 100644
index 0000000..2e1b2a4
--- /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_RepairClass.html"
@@ -0,0 +1,1056 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <title>缁翠慨椤圭洰鍒嗙被鍒楄〃</title>
+    <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/soulTable.slim.js"></script>
+    <script src="../../../layuiadmin/HideButton_New.js"></script>
+    <script src="../../../layuiadmin/SetColumn.js"></script>
+    <script src="../../../layuiadmin/PubCustom.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">浠g爜</label>
+                                    <div class="layui-input-block">
+                                        <input type="text" class="layui-input ForFilteringSchemes" name="HNumber" id="HNumber">
+                                    </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="HName" id="HName">
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label" style="width: 85px;">缁勭粐</label>
+                                    <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
+                                        <select name="HUSEORGID" id="HUSEORGID" class="ForFilteringSchemes" lay-verify="HUSEORGID">
+                                            <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+                                        </select>
+                                    </div>
+                                </div>
+                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                </button>
+                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+                                <!--鏄剧ず褰撳墠杩囨护鏂规-->
+                                <div class="layui-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:5px">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">杩囨护</label>
+                                            <div class="layui-input-block">
+                                                <select name="ColName" id="ColName" class="ForFilteringSchemes" lay-filter="ColName" style="width:190px;">
+                                                </select>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <select name="Comparator" id="Comparator" class="ForFilteringSchemes" lay-filter="Comparator" style="width:190px;">
+                                                <option value="0" selected="selected"></option>
+                                                <option value="=">=</option>
+                                                <option value=">=">>=</option>
+                                                <option value=">">></option>
+                                                <option value="<="><=</option>
+                                                <option value="<"><</option>
+                                                <option value="<>"><></option>
+                                                <option value="7">鍖呭惈</option>
+                                                <option value="8">宸﹀寘鍚�</option>
+                                                <option value="9">鍙冲寘鍚�</option>
+                                                <option value="10">涓嶅寘鍚�</option>
+                                            </select>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent">
+                                        </div>
+                                    </div>
+                                    <div class="layui-row" style="margin-top:5px">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">杩囨护</label>
+                                            <div class="layui-input-block">
+                                                <select name="ColName1" id="ColName1" 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>
+                        <table class="" id="mainTable" lay-filter="mainTable"></table>
+                        <script type="text/html" id="toolbarDemo">
+                            <div class="layui-btn-container" id="toolbarDemo_ButtonSet">
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_SouceExcel" id="set_SouceExcel"><i class="layui-icon layui-icon-delete"></i>瀵煎叆</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Export" id="btn_Export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add" id="btn-Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Copy" id="btn_Copy"><i class="layui-icon layui-icon-add-1"></i>澶嶅埗</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit" id="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete" id="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit" id="btn-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit" id="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Stop" id="btn-Stop"> <i class="layui-icon layui-icon-radio"></i>绂佺敤</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeStop" id="btn-DeStop"><i class="layui-icon layui-icon-radio"></i>鍙嶇鐢�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn" id="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideButton" id="set_HideButton"><i class="layui-icon layui-icon-form"></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="get_Refresh" id="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit" id="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-view" id="btn-view"><i class="layui-icon layui-icon-tips"></i>棰勮</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-print" id="btn-print"><i class="layui-icon layui-icon-print"></i>鎵撳嵃</button>
+                            </div>
+                        </script>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <script>
+        layui.config({
+            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index', //涓诲叆鍙fā鍧�
+        }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate','soulTable'], function () {
+
+            //#region 鍏叡鍙橀噺
+            var $ = layui.$
+                , admin = layui.admin
+                , layer = layui.layer
+                , table = layui.table
+                , form = layui.form
+                , element = layui.element
+                , laypage = layui.laypage
+                , laydate = layui.laydate
+                , soulTable = layui.soulTable
+            var sWhere = "";
+            var option = [];
+            var HModName = "Gy_RepairClass";
+            var HBillType = "Gy_RepairClass";
+            var ins;                //鐢ㄤ簬瀵煎嚭excel
+            var set_HideButton_ID = "toolbarDemo_ButtonSet";                    //闇�瑕佽缃殑鎸夐挳鐨勭埗绾ц妭鐐圭殑id
+            //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+            var titleData = [];
+            //#endregion
+
+            //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+            //#region 銆愯繃婊ゆ柟妗堛��
+
+            //杩囨护鏉′欢鐨刢lass绫�
+            var HClassTag = "ForFilteringSchemes";
+            //妯″潡鍚嶇О锛堜腑鏂囩増锛� 姣忎釜妯″潡椤甸潰閮介渶瑕佷慨鏀�
+            window.HModuleName = "缁翠慨椤圭洰鍒嗙被";
+            //鏄惁宸茬粡閫夋嫨浜嗚繃婊ゆ柟妗堬紙鍏ㄥ眬鍙橀噺锛�
+            window.HDefaultFilter = "";
+            //閫夋嫨鐨勮繃婊ゆ柟妗堝唴鐮侊紙鍏ㄥ眬鍙橀噺锛�
+            window.HInterID_Choose = 0;
+
+            //#endregion
+
+            //鍒濆鍖栫晫闈�
+            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 'set_SouceExcel': set_SouceExcel();
+                        break;
+                    //瀵煎嚭鎸夐挳
+                    case 'btn_Export': btn_Export();
+                        break;
+                    //澶嶅埗
+                    case 'btn_Copy':
+                        set_copy();
+                        break;
+                    //鍒犻櫎
+                    case 'btn-Delete': set_DeleteBill();
+                        break;
+                    //鍒锋柊
+                    case 'get_Refresh': get_Refresh();
+                        break;
+                    //瀹℃牳鎸夐挳
+                    case 'btn-Audit':
+                        set_CheckBill(0);
+                        break;
+                    //鍙嶅鏍告寜閽�
+                    case 'btn-DeAudit':
+                        set_CheckBill(1);
+                        break;
+                    //绂佺敤鎸夐挳
+                    case 'btn-Stop':
+                        set_De_Stop(0);
+                        break;
+                    //鍙嶇鐢ㄦ寜閽�
+                    case 'btn-DeStop':
+                        set_De_Stop(1);
+                        break;
+                    //閫�鍑烘寜閽�
+                    case 'get_Exit': Pub_Close(2);
+                        break;
+                    //鍒楄缃�
+                    case 'set_HideColumn': get_HideColumnNoPage(HModName, sessionStorage["HUserName"], option, get_FastQuery);
+                        break;
+                    //淇濆瓨鏂规
+                    case 'set_SaveScheme': set_SaveScheme();
+                        break;
+                    //璇诲彇鏂规
+                    case 'set_ReadScheme': set_ReadScheme();
+                        break;
+                    case 'set_HideButton':
+                        get_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
+                        break;
+                };
+            });
+
+            //#endregion
+
+            //#region 鏌ヨ鎸夐挳
+            form.on('submit(btnSearch)', function (data) {//閫夋嫨浠撲綅
+
+                get_FastQuery();
+            });
+            //#endregion
+
+            //閲嶇疆鎸夐挳
+            form.on('submit(btnReSearch)', function (data) {
+                $("#WorkCenter").val("");//鍗曟嵁鍙�
+                $("#hnumber").val("");//鐗╂枡
+                $("#HOrderProcNO").val("");//鍗曟嵁绫诲瀷
+                $("#ColName").val("0");
+                $("#Comparator").val("0");
+                $("#ColContent").val("");
+                $("#ColContent2").val("");
+                $("#ColName2").val("0");
+                $("#Comparator2").val("0");
+                $("#ColContent1").val("");
+                $("#ColName1").val("0");
+                $("#Comparator1").val("0");
+                $("#HUSEORGID").val(sessionStorage["Organization"])
+                form.render('select');
+                $("#btnSearch").click();
+                set_ClearQuery();
+            });
+            //#endregion
+
+            //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
+            //#region 鍒濆鍖栫晫闈�
+            function set_ClearBill() {
+                set_StockOrg();
+                //鍒濆鍖栬〃鏍�
+                set_InitGrid();
+                //鏌ヨ
+                get_Display(sWhere);
+                //杩囨护鏂规鏌ヨ
+                get_DefaultModule();
+            }
+            //#endregion
+
+            function set_InitGrid() {
+                option = {
+                    elem: '#mainTable'
+                    , toolbar: '#toolbarDemo'
+                    , height: 'full-50'
+                    , page: true
+                    , cellMinWidth: 90
+                    , limit: 50
+                    , limits: [50, 500, 5000, 20000]
+                    , done: function (res, curr, count) {
+                        soulTable.render(this);
+                    }
+                    , cols: [[
+                        { type: 'checkbox', fixed: 'left' }
+                        , { field: 'HItemID', title: 'id', hide: true, sort: true}
+                        , { field: 'HNumber', title: '浠g爜', width: 195, sort: true}
+                        , { field: 'HName', title: '鍚嶇О', width: 180, sort: true}
+                        , { field: 'HHelpCode', title: '鍔╄鐮�', width: 180, sort: true}
+                        , { field: 'HShortNumber', title: '鐭唬鐮�', width: 180, sort: true}
+                        , { field: 'HParentID', title: '鐖剁骇', width: 180, hide: true, sort: true}
+                        , { field: 'HLevel', title: '绛夌骇', width: 180, hide: true, sort: true}
+                        , { field: 'HEndFlag', title: '鏈骇鏍囧織', width: 180, hide: true, sort: true}
+                        , { field: 'HRemark ', title: '澶囨敞 ', width: 180, sort: true}
+                    ]]
+                };
+            }
+
+            //#region 瀵煎嚭Execel
+            function btn_Export() {
+                table.exportFile(ins.config.id, option.data, "xls");
+            }
+            //#endregion
+
+            //#region 閲嶇疆杩囨护鏉′欢鏂规硶
+            function set_ClearQuery() {
+                $("#HNumber").val("");
+                $("#HName").val("");
+                $("#ColContent").val("");
+                $("#ColName").val("0");
+                $("#Comparator").val("0");
+                $("#ColContent2").val("");
+                $("#ColName2").val("0");
+                $("#Comparator2").val("0");
+                $("#ColContent1").val("");
+                $("#ColName1").val("0");
+                $("#Comparator1").val("0");
+                $("#HUSEORGID").val(sessionStorage["Organization"]);
+                sWhere = "";
+            }
+            //#endregion
+
+            //#region 鏌ヨ
+            function get_Display(sWhere) {
+                var ajaxLoad = layer.load();
+                $.ajax({
+                    url: GetWEBURL() + '/Gy_RepairClass/list',
+                    type: "GET",
+                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+                    success: function (data1) {
+                        if (data1.count == 1) {
+
+                            var data = [];
+                            var col = [];
+                            var totalArray = [];
+                            //缁欑┖鐨勬暟缁勮祴鍊�
+                            for (var key in data1.list) {
+                                data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+                            }
+                            //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+                            col.push({ type: 'checkbox', fixed: 'left' });
+                            for (var i = 0; i < data.length; i++) {
+                                // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
+                                if ($.inArray(data[i].name, titleData) > -1) {
+                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+                                }
+                                else if ($.inArray(data[i].name, totalArray) > -1) {
+                                    col.push({
+                                        field: data[i].id, title: data[i].name, align: 'center', sort: true, totalrow: true, width: 200
+                                    })
+                                } else if (data[i].id == '鍗曟嵁鍙�') {
+                                    col.push({
+                                        field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '鍗曟嵁鍙�'
+                                    })
+                                }
+                                else {
+                                    switch (data[i].Type) {
+                                        //int
+                                        case 'DateTime':
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
+                                            break;
+                                        default:
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+                                    }
+                                }
+                            }
+
+
+                            //鍔ㄦ�佹樉绀哄垪鍚�
+                            option = {
+                                elem: '#mainTable'
+                                , toolbar: '#toolbarDemo'
+                                , cols: [col]
+                                , data: data1.data
+                                , height: 'full-80'
+                                , page: true
+                                , limits: [50, 500, 5000, 20000]
+                                , limit: 50
+                                , cellMinWidth: 90
+                            }
+
+                            option.data = data1.data;
+
+                            //鍒锋柊琛ㄦ牸鏁版嵁
+                            DisPlay_HideColumn(HModName, sessionStorage["HUserName"], option, titleData);
+                            ins = table.render(option);
+                            table.render(option);
+                            //鍒锋柊鎸夐挳鏄剧ず
+                            Display_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
+
+                            layer.close(ajaxLoad);
+                            if ($("#ColName option").length < 1) {
+                                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
+
+            //瀵煎叆
+            function set_SouceExcel() {
+                layer.open({
+                    type: 2
+                    , area: ['100%', '100%']
+                    , title: '鐢熶骇鐝粍瀵煎叆'
+                    , shift: 0//寮瑰嚭鍔ㄧ敾
+                    , content: '../../璁″垝绠$悊/Excel/Gy_RoutingGroup_Excel.html?OperationType=dao&HSouceBillType='
+                })
+            }
+
+            //#region 蹇�熻繃婊�
+            function get_FastQuery() {
+                var HName = $("#HName").val();//鍚嶇О
+                var HNumber = $("#HNumber").val();//浠g爜
+                var HUSEORGID = $("#HUSEORGID").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 (HName) {
+                    sWhere += " and HName like '%" + HName + "%'";
+                }
+                if (HNumber) {
+                    sWhere += " and HNumber like '%" + HNumber + "%'";
+                }
+                if (HUSEORGID) {
+                    sWhere += " and 浣跨敤缁勭粐鍚嶇О = '" + HUSEORGID + "'";
+                }
+                get_Display(sWhere);
+                sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+            }
+            //#endregion
+
+            //#region 鏂板
+            function set_AddNew() {
+                layer.open({
+                    type: 2
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['100%', '100%']
+                    , title: '缁翠慨椤圭洰鍒嗙被-鏂板'
+                    , shift: 0//寮瑰嚭鍔ㄧ敾
+                    , content: '../鍩虹璧勬枡/Gy_RepairClassEdit.html?OperationType=1&linterid=&HSouceBillType=&linteridSub=-1'
+                })
+            }
+            //#endregion
+
+            //澶嶅埗
+            function set_copy() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var HInterID = data[0].HItemID.toString();
+                    layer.open({
+                        type: 2
+                        , area: ['100%', '100%']
+                        , title: '缁翠慨椤圭洰鍒嗙被'
+                        , shade: 0.6 //閬僵閫忔槑搴�
+                        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                        , content: '../鍩虹璧勬枡/Gy_RepairClassEdit.html?OperationType=2&linterid=' + HInterID + '&HSouceBillType='
+                        , resize: false
+                        , cancel: function () {
+
+                        }
+                    })
+
+                } else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+                }
+            }
+
+            //#region 缂栬緫
+            function set_ShowBill() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var linterid = data[0].HItemID;
+                    var linteridSub = data[0].hsubid;
+
+                    //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+                    layer.open({
+                        type: 2
+                        , area: ['100%', '100%']
+                        , title: '缁翠慨椤圭洰鍒嗙被-缂栬緫'
+                        , shift: 0//寮瑰嚭鍔ㄧ敾
+                        , content: '../鍩虹璧勬枡/Gy_RepairClassEdit.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=&linteridSub=' + linteridSub
+                    })
+                } else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+                }
+            }
+            //#endregion
+
+            //#region   鑾峰彇缁勭粐
+            function set_StockOrg() {
+                //鑾峰彇鐧诲綍椤电粍缁囧垪
+                $.ajax({
+                    type: "GET",
+                    url: GetWEBURL() + "/Web/GetOrganizations",
+                    async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                    success: function (result) {
+                        var Organization = "";
+                        Organization += '<option  style="color:blue;" value="">鍏ㄩ儴</option>';
+                        if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            var data = result.data;
+                            for (var i = 0; i < data.length; i++) {
+                                Organization += '<option  style="color:blue;" value="' + data[i].Name + '">' + data[i].Name + '</option>';
+                            }
+                            $("#HUSEORGID").append(Organization);
+                            $("#HUSEORGID").val(sessionStorage["Organization"])
+                            form.render('select');
+                        }
+                        layer.closeAll("loading");
+                    },
+                    complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
+                })
+            }
+            //#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_RepairClass/AuditGy_RepairClass", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        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 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_RepairClass/StopGy_RepairClass", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        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 鍒犻櫎
+            function set_DeleteBill() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var hmainid = data[0].HItemID;
+                    layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+                        var wait = layer.load();
+                        //閫昏緫鍒犻櫎鏂规硶
+                        $.ajax({
+                            url: GetWEBURL() + 'DeltetGy_RepairClass',
+                            type: "GET",
+                            data: { "HItemID": hmainid, "user": sessionStorage["HUserName"] },
+                            success: function (result) {
+                                console.log('gouba' + result);
+                                if (result.count == 1) {
+                                    layer.msg(result.Message, { icon: 1 }, function () {
+                                        // 寰楀埌frame绱㈠紩
+                                        var index = layer.getFrameIndex(window.name);
+                                        //鍏抽棴褰撳墠frame
+                                        layer.close(wait);
+                                        //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                        get_FastQuery();
+                                    });
+                                } 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
+
+            //#region 鍒锋柊
+            function get_Refresh() {
+                set_ClearQuery();
+                get_Display(sWhere);
+            }
+            //#endregion
+
+
+
+            //#endregion
+
+            //#region 銆愯繃婊ゆ柟妗堛��
+
+            //鑾峰彇褰撳墠鐢ㄦ埛鐨勯粯璁よ繃婊ゆ柟妗�
+            function get_DefaultModule() {
+                $.ajax({
+                    url: GetWEBURL() + '/Xt_FastICScheme/Chooselist',
+                    type: "GET",
+                    data: { "user": sessionStorage["Czybm"], "HModuleName": HModuleName, "HInterID": 0, "Type": "Default" },
+                    success: function (data1) {
+                        if (data1.count == 1) {
+                            //褰撳墠鐢ㄦ埛璁剧疆鏈夐粯璁ょ殑杩囨护鏂规
+                            var data = data1.data;
+                            //褰撳墠閫夋嫨鐨勮繃婊ゆ柟妗�
+                            HInterID_Choose = data[0].hmainid;
+                            //杩囨护鏂规鍐呯爜
+                            HInterID = data[0].hmainid
+                            //杩囨护鏂规鍚嶇О
+                            HDefaultFilter = data[0].鏂规鍚嶇О
+                            //杩囨护鏂规鐨勫娉紙鏂规淇℃伅鎻忚堪锛�
+                            var HRemark = data[0].澶囨敞
+                            //鏄剧ず鍑哄綋鍓嶇殑榛樿杩囨护鏂规
+                            document.getElementById("HFilterScheme_Now").style.display = "block";
+                            document.getElementById('HFilterScheme_Now').innerHTML = "褰撳墠杩囨护鏂规锛�" + HDefaultFilter + '<span style="font-size: 15px; font-weight: bold; color:#7b90fb">  ' + "(" + HRemark + ")" + '</span>';
+                            //鎶婅繃婊ゆ潯浠跺�煎洖鍐欏埌椤甸潰涓�
+                            for (let i = 0; i < data.length; i++) {
+                                $("#" + data[i].杩囨护瀛楁ID).val(data[i].杩囨护鍊�);
+                                if (data[i].杩囨护鏍囩绫诲瀷 == 'SELECT') {
+                                    $("#" + data[i].杩囨护瀛楁ID).find("option[value='" + data[i].杩囨护鍊� + "']").attr("selected", true);
+                                }
+                            }
+                            //鏌ヨ
+                            get_FastQuery();
+                            form.render("select");
+                        } else {
+                            //褰撳墠鐢ㄦ埛娌℃湁璁剧疆榛樿鐨勮繃婊ゆ柟妗�
+                            //闅愯棌鏄剧ず杩囨护鏂规鐨勬爣绛句俊鎭�
+                            document.getElementById("HFilterScheme_Now").style.display = "none";
+                            //鎵ц鏌ヨ鏂规硶
+                            form.render("select");
+                        }
+                    }, error: function () {
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+            }
+
+            //#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();
+                $("#ColName1").empty();
+                $("#ColName1").append(Organization);
+                $("#ColName2").empty();
+                $("#ColName2").append(Organization);
+                $("#ColName").append(Organization);
+                form.render('select');
+            }
+            //#endregion
+
+            //淇濆瓨鏂规
+            function set_SaveScheme() {
+                var index = layer.open()
+                //鍒ゆ柇鐢ㄦ埛鏄惁鐐瑰嚮浜嗗彸涓婅鐨勨�滃弶鍙封�濆叧闂脊绐楅〉闈�
+                var HIsClose_Manual = false;
+                //鑾峰彇鏈〉鎵�鏈夎繃婊ゆ潯浠跺璞�(class涓寘鍚�"ForFilteringSchemes"鐨勫厓绱�)
+                var Filter = document.getElementsByClassName(HClassTag);
+
+                var HFilterIdList = "";//杩囨护鏉′欢
+                var HFilterIdLists = "";//鎷兼帴澶氫釜杩囨护鏉′欢
+                var HValue = "";//杩囨护鍊�
+                var HElement_type = "";//杩囨护鏍囩绫诲瀷
+
+                for (var i = 0; i < Filter.length; i++) {
+                    HFilterIdList = Filter[i].id; //杩囨护鏉′欢ID
+                    HFilterIdLists += Filter[i].id + ","; //杩囨护鏉′欢ID(鎷兼帴)
+                    HValue += $("#" + HFilterIdList).val() + ","; //杩囨护鏉′欢涓緭鍏ョ殑鍊�
+                    HElement_type += document.getElementById(HFilterIdList).tagName + ",";//閫氳繃鏍囩id鑾峰彇鏍囩绫诲瀷
+                }
+
+                //鍘婚櫎鏈熬閫楀彿
+                HFilterIdLists = HFilterIdLists.substring(0, HFilterIdLists.length - 1);
+                HValue = HValue.substring(0, HValue.length - 1);
+                HElement_type = HElement_type.substring(0, HElement_type.length - 1);
+
+                //褰撳墠椤甸潰涓婃病鏈夐�夋嫨杩囨护鏂规锛岃繘鍏ユ柊澧炴柟娉�
+                if (HDefaultFilter == "") {
+                    layer.open({
+                        type: 2
+                        , area: ['40%', '80%']
+                        , title: '杩囨护鏂规'
+                        , shift: 0//寮瑰嚭鍔ㄧ敾
+                        , content: '../../绯荤粺绠$悊/杩囨护鏂规璁剧疆/Xt_FastICScheme.html?OperationType=1&HModuleName=' + HModuleName + '&HFilterIdLists=' + HFilterIdLists + '&HValue=' + HValue + '&HElement_type=' + HElement_type
+                        , cancel: function () {
+                            // 鍙充笂瑙掑叧闂簨浠剁殑閫昏緫
+                            HIsClose_Manual = true;
+                        }
+                        , end: function () {
+                            if (HIsClose_Manual != true) {
+                                get_FastQuery();
+                                //鏄剧ず褰撳墠鐨勮繃婊ゆ柟妗�
+                                document.getElementById("HFilterScheme_Now").style.display = "block";
+                                document.getElementById('HFilterScheme_Now').innerHTML = "褰撳墠杩囨护鏂规锛�" + sessionStorage["HFilterSchemeName_" + sessionStorage["Czybm"]] + '<span style="font-size: 15px; font-weight: bold; color:#7b90fb">  ' + "(" + sessionStorage["HFilterSchemeRemark_" + sessionStorage["Czybm"]] + ")" + '</span>';
+                            }
+                        }
+                    })
+                    layer.close(index)
+                } else {
+                    //褰撳墠椤甸潰宸叉湁杩囨护鏂规锛岀敤鎴烽�夋嫨 鏂板鎴栬�呯紪杈�
+                    layer.confirm('褰撳墠宸查�夋嫨杩囨护鏂规锛屾槸鍚︿慨鏀癸紵璇烽�夋嫨瀵瑰簲鎿嶄綔', {
+                        title: "鎿嶄綔鎻愮ず",
+                        icon: 0,
+                        btn: ['鏂板鏂规', '淇濆瓨淇敼褰撳墠鏂规', '鍙栨秷']
+                    }, function (index, layero) {
+                        //鏂板
+                        layer.open({
+                            type: 2
+                            , area: ['40%', '80%']
+                            , title: '杩囨护鏂规'
+                            , shift: 0//寮瑰嚭鍔ㄧ敾
+                            , content: '../../绯荤粺绠$悊/杩囨护鏂规璁剧疆/Xt_FastICScheme.html?OperationType=1&HModuleName=' + HModuleName + '&HFilterIdLists=' + HFilterIdLists + '&HValue=' + HValue + '&HElement_type=' + HElement_type
+                            , end: function () {
+                                get_FastQuery()
+                                //鏄剧ず褰撳墠鐨勮繃婊ゆ柟妗�
+                                document.getElementById("HFilterScheme_Now").style.display = "block";
+                                document.getElementById('HFilterScheme_Now').innerHTML = "褰撳墠杩囨护鏂规锛�" + sessionStorage["HFilterSchemeName_" + sessionStorage["Czybm"]] + '<span style="font-size: 15px; font-weight: bold; color:#7b90fb">  ' + "(" + sessionStorage["HFilterSchemeRemark_" + sessionStorage["Czybm"]] + ")" + '</span>';
+                            }
+                        })
+                        layer.close(index)
+                    }, function (index) {
+                        //缂栬緫
+                        var Filter_Edit = document.getElementsByClassName(HClassTag); //鑾峰彇鏈〉鎵�鏈夎繃婊ゆ潯浠跺璞�(class涓寘鍚�"ForFilteringSchemes"鐨勫厓绱�)
+                        HFilterIdList = "";
+                        HFilterIdLists = "";
+                        HValue = "";
+                        HElement_type = "";
+                        for (var i = 0; i < Filter_Edit.length; i++) {
+                            HFilterIdList = Filter_Edit[i].id; //杩囨护鏉′欢ID
+                            HFilterIdLists += Filter_Edit[i].id + ","; //杩囨护鏉′欢ID(鎷兼帴)
+                            HValue += $("#" + HFilterIdList).val() + ","; //杩囨护鏉′欢涓緭鍏ョ殑鍊�
+                            HElement_type += document.getElementById(HFilterIdList).tagName + ",";//閫氳繃鏍囩id鑾峰彇鏍囩绫诲瀷
+                        }
+                        //鍘婚櫎鏈熬閫楀彿
+                        HFilterIdLists = HFilterIdLists.substring(0, HFilterIdLists.length - 1);
+                        HValue = HValue.substring(0, HValue.length - 1);
+                        HElement_type = HElement_type.substring(0, HElement_type.length - 1);
+
+                        var sMainSub = HInterID_Choose + ';' + HFilterIdLists + ';' + HValue + ';' + HElement_type + ';' + sessionStorage["Czybm"] + ';' + 3;
+
+                        //淇敼
+                        $.ajax({
+                            type: "POST",
+                            url: GetWEBURL() + "/Xt_FastICScheme/save", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                            async: true,
+                            data: { "oMain": sMainSub },
+                            dataType: "json",
+                            success: function (data) {
+                                if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                    layer.msg(data.Message, { time: 1 * 1000, icon: 1 });
+                                }
+                                else {
+
+                                }
+                                layer.closeAll("loading");
+                            },
+                            error: function (err) {
+
+
+                            }
+                        });
+                        layer.close(index)
+                    }, function (index) {
+                        //鍙栨秷
+                        layer.alert('鍙栨秷')
+                        layer.close(index)
+                    });
+                }
+
+            }
+
+            //璇诲彇鏂规
+            function set_ReadScheme() {
+                var HIsClose_Manual = false;
+                var Filter = document.getElementsByClassName(HClassTag); //鑾峰彇鏈〉鎵�鏈夎繃婊ゆ潯浠跺璞�(class涓寘鍚�"ForFilteringSchemes"鐨勫厓绱�)
+
+                var HFilterIdList = "";
+                var HFilterIdLists = "";
+                var HValue = "";
+                var HElement_type = "";
+                for (var i = 0; i < Filter.length; i++) {
+                    HFilterIdList = Filter[i].id; //杩囨护鏉′欢ID
+                    HFilterIdLists += Filter[i].id + ","; //杩囨护鏉′欢ID(鎷兼帴)
+                    HValue += $("#" + HFilterIdList).val() + ","; //杩囨护鏉′欢涓緭鍏ョ殑鍊�
+                    HElement_type += document.getElementById(HFilterIdList).tagName + ",";//閫氳繃鏍囩id鑾峰彇鏍囩绫诲瀷
+                }
+                //鍘婚櫎鏈熬閫楀彿
+                HFilterIdLists = HFilterIdLists.substring(0, HFilterIdLists.length - 1);
+                HValue = HValue.substring(0, HValue.length - 1);
+                HElement_type = HElement_type.substring(0, HElement_type.length - 1);
+
+                layer.open({
+                    type: 2
+                    , area: ['80%', '80%']
+                    , title: '杩囨护鏂规鍒楄〃'
+                    , shift: 0//寮瑰嚭鍔ㄧ敾
+                    , content: '../../绯荤粺绠$悊/杩囨护鏂规璁剧疆/Xt_FastICSchemeList.html?HType=Select&HFilterIdLists=' + HFilterIdLists + '&HValue=' + HValue + '&HElement_type=' + HElement_type + '&HModuleName=' + HModuleName
+                    , cancel: function () {
+                        // 鍙充笂瑙掑叧闂簨浠剁殑閫昏緫
+                        HIsClose_Manual = true;
+                    }
+                    , end: function () {
+                        if (HIsClose_Manual != true) {
+                            get_FastQuery()
+                            form.render("select");
+                        }
+                    }
+                })
+            }
+
+            //#endregion
+
+            //浠ヤ笂鏄痩ayui妯″潡
+        });
+
+        //#region 銆愯繃婊ゆ柟妗堣繑鍥炴暟鎹��
+        function HFilterScheme(obj)  //杩斿洖杩囨护鏂规
+        {
+            var HInterID = obj[0].hmainid;
+            HInterID_Choose = obj[0].hmainid;
+            $.ajax({
+                url: GetWEBURL() + '/Xt_FastICScheme/Chooselist',
+                type: "GET",
+                data: { "user": sessionStorage["Czybm"], "HModuleName": HModuleName, "HInterID": HInterID, "Type": "Select" },
+                success: function (data1) {
+                    if (data1.count == 1) {
+                        var data = data1.data;
+                        //璧嬪�艰繃婊ゆ柟妗堝悕绉�
+                        HDefaultFilter = data[0].鏂规鍚嶇О
+                        var HRemark = data[0].澶囨敞
+                        //鏄剧ず褰撳墠鐨勮繃婊ゆ柟妗�
+                        document.getElementById("HFilterScheme_Now").style.display = "block";
+                        document.getElementById('HFilterScheme_Now').innerHTML = "褰撳墠杩囨护鏂规锛�" + HDefaultFilter + '<span style="font-size: 15px; font-weight: bold; color:#7b90fb">  ' + "(" + HRemark + ")" + '</span>';
+                        HInterID = data[0].hmainid
+                        //鏍规嵁閫夋嫨鐨勮繃婊ゆ柟妗堝洖濉暟鎹埌鍒楄〃杩囨护鏉′欢
+                        for (let i = 0; i < data.length; i++) {
+                            $("#" + data[i].杩囨护瀛楁ID).val(data[i].杩囨护鍊�);
+                            if (data[i].杩囨护鏍囩绫诲瀷 == 'SELECT') {
+                                $("#" + data[i].杩囨护瀛楁ID).find("option[value='" + data[i].杩囨护鍊� + "']").attr("selected", true);
+                            }
+                        }
+
+                    } else {
+                        layer.close(ajaxLoad);
+                        layer.alert(data1.code + data1.Message, { icon: 5 });
+                    }
+                }, error: function () {
+                    layer.close(ajaxLoad);
+                    layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                }
+            });
+        }
+
+        //鑾峰彇鍙傛暟
+        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
+
+    </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_RepairClassEdit.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_RepairClassEdit.html"
new file mode 100644
index 0000000..6389690
--- /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_RepairClassEdit.html"
@@ -0,0 +1,391 @@
+锘�<!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>
+</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="form" class="layui-form" lay-filter="component-form-group" action="">
+                        <div class="layui-card-header">
+                            <div class="layui-btn-group">
+                                <button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</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">
+                                <h1 style="text-align:center;"><b>缁翠慨椤圭洰鍒嗙被</b></h1>
+                                <ul class="layui-tab-title" lay-filter="tab-all">
+                                    <li lay-id="1" style="padding:1px;" class="layui-this">鍩烘湰淇℃伅</li>
+                                    <li>鍏朵粬淇℃伅</li>
+                                </ul>
+                                <div class="layui-tab-content">
+                                    <!--鍩烘湰淇℃伅-->
+                                    <div class="layui-tab-item layui-show">
+                                        <div class="layui-form-item">
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label" style="width: 120px">浠g爜<label style="color:red"> * </label></label>
+                                                <div class="layui-input-inline">
+                                                    <input class="layui-input" name="HNumber" lay-verify="HNumber" id="HNumber" autocomplete="off">
+                                                    <input name="HItemID" id="HItemID" autocomplete="off" type="hidden">
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label" style="width: 120px">鍚嶇О<label style="color:red"> * </label></label>
+                                                <div class="layui-input-inline">
+                                                    <input class="layui-input" name="HName" id="HName" autocomplete="off">
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label" style="width: 120px">鍔╄鐮侊細</label>
+                                                <div class="layui-input-inline">
+                                                    <input class="layui-input" name="HHelpCode" id="HHelpCode" autocomplete="off">
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="layui-form-item">
+                                            <label class="layui-form-label" style="width: 120px">浣跨敤缁勭粐锛�</label>
+                                            <div class="layui-input-inline">
+                                                <select name="HUSEORGID" id="HUSEORGID" lay-verify="HUSEORGID">
+                                                </select>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label" style="width: 120px">浣跨敤鐘舵�侊細</label>
+                                                <div class="layui-input-inline">
+                                                    <select name="HUseFlag" id="HUseFlag" lay-verify="HUseFlag">
+                                                        <option value="鏈娴�" selected>鏈娴�</option>
+                                                        <option value="鏈娇鐢�">鏈娇鐢�</option>
+                                                        <option value="宸蹭娇鐢�">宸蹭娇鐢�</option>
+                                                    </select>
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="layui-form-item">
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label" style="width: 120px"> 绂佺敤鏍囧織:</label>
+                                                <div class="layui-input-inline">
+                                                    <input type="checkbox" name="HStopflag" id="HStopflag" lay-skin="primary" title="" value="">
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="layui-form-item">
+                                            <div class="layui-col-xs11">
+                                                <label class="layui-form-label"> 澶囨敞锛�</label>
+                                                <div class="layui-input-block">
+                                                    <input class="layui-input" name="HRemark" id="HRemark" autocomplete="off">
+                                                </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="HModifyEmp" id="HModifyEmp" 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>
+                                            <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" value="" 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 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>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </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/PubCustom.js"></script>
+    <script>
+        //鑾峰彇鍙傛暟
+        var params = get_UrlVars();
+        if (typeof (params[params[0]]) == "undefined") {
+            var OperationType = 1;//鎿嶄綔绫诲瀷
+        } else {
+            var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
+            var linterid = params[params[1]];//婧愬崟id
+            var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
+        }
+
+        layui.config({
+            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index' //涓诲叆鍙fā鍧�
+        }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+            //#region 鍏叡鍙橀噺
+            var $ = layui.$
+                , admin = layui.admin
+                , layer = layui.layer
+                , table = layui.table
+                , form = layui.form
+                , laydate = layui.laydate
+                , element = layui.element;
+            //#endregion
+            //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+            //鍒濆鍖栫晫闈�
+            set_ClearBill();
+            //鍒ゆ柇鎿嶄綔绫诲瀷
+            if (OperationType == 1) {//鏃犳簮鍗�
+                set_AddFNew();
+                $("#HMakeEmp").val(sessionStorage["HUserName"]);
+            }
+            else if (OperationType == 2) {
+                set_EditFromGrid();
+                $("#HMakeEmp").val(sessionStorage["HUserName"]);
+                $("#HModifyEmp").val("");
+                $("#HStopEmp").val("");
+                $("#HCheckEmp").val("");
+                $("#HMakeTime").val("");
+                $("#HModifyTime").val("");
+                $("#HStopTime").val("");
+                $("#HCheckTime").val("");
+                $("#HNumber").val("");
+                $("#HItemID").val(0);
+            }
+            else if (OperationType == 3) {//缂栬緫
+                set_EditFromGrid();
+            }
+            else {
+                layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
+            }
+            //#endregion
+
+            //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+            //淇濆瓨
+            form.on('submit(Saver)', function (data) {//淇濆瓨
+                if (AllowLoadData()) {
+                    var isEndCheck = document.getElementById("HStopflag").checked;
+                    isEndCheck == true ? data.field.HStopflag = 'true' : data.field.HStopflag = 'false';//灏嗘暟缁勫悎骞舵垚瀛楃涓�
+
+                    var sMainStr = JSON.stringify(data.field) + ";" + sessionStorage["HUserName"];
+                    $.ajax(
+                        {
+                            type: "POST",
+                            url: GetWEBURL() + "SaveGy_RepairClass", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                            async: true,
+                            data: { "msg": sMainStr },
+                            dataType: "json",
+                            success: function (data) {
+                                if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                    layer.msg(data.Message, { icon: 1 });
+                                    $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
+                                }
+                                else {
+                                    f_alert(data.Message);
+                                    console.log("Reason" + sMainStr + "sub:" + JSON.stringify(layui.table.cache.mainTable));
+                                }
+                                layer.closeAll("loading");
+                            },
+                            error: function (err) {
+
+                                f_alert("閿欒:" + err);
+                                console.log("Reason" + sMainStr);
+                            }
+                        });
+                }
+            });
+            //閫�鍑�
+            form.on('submit(Exit)', function (data) {//
+                if (linterid == undefined) {
+                    //鍏抽棴椤电
+                    Pub_Close(2);
+                }
+                else {
+                    //鍏抽棴椤电
+                    Pub_Close(1);
+                }
+            });
+
+            //鐩戝惉鎻愪氦
+            form.verify({
+                numberOrEmpty: function (value, item) {
+                    // if (value != '') {
+                    if (!/^\d+$/.test(value)) {
+                        return '涓嶈兘涓虹┖鎴栨暟瀛楁垨鑰�0';
+                    }
+                    //}
+                }
+            });
+            //#endregion
+
+
+            //#region 褰撳墠椤甸潰闈㈡墍鏈夌殑鏂规硶
+
+            //鍒濆鍖栫晫闈�
+            function set_ClearBill() {
+                Organ();
+                $("#HStopflag").attr("disabled", true);
+                $("#HUseFlag").attr("disabled", true);
+                layui.form.render('checkbox');
+                layui.form.render('select');
+            }
+            //鏃犳簮鍗曟柊澧�
+            function set_AddFNew() {
+                $("#HItemID").val("0");
+                $("#HNumber").val("");
+            }
+            //缂栬緫
+            function set_EditFromGrid() {
+                $("#HItemID").val(linterid);
+                set_EditForm(linterid);  //缂栬緫鑾峰彇琛ㄥご
+            }
+            //缂栬緫鍔犺浇琛ㄥご
+            function set_EditForm(linterid) {
+                //鏌ヨ妫�楠屾柟妗堝崟鏄惁瀛樺湪
+                $.ajax({
+                    url: GetWEBURL() + "Gy_RepairClass/EditGy_RepairClass",
+                    type: "GET",
+                    async: false,
+                    data: {
+                        "HInterID": linterid
+                    },
+                    success: function (result) {
+                        if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            var data = result.data[0];
+                            $("#HItemID").val(data.HItemID);//浠g爜ID
+                            $("#HNumber").val(data.缁翠慨椤圭洰鍒嗙被浠g爜);//浠g爜
+                            $("#HName").val(data.缁翠慨椤圭洰鍒嗙被鍚嶇О);//鍚嶇О
+                            $("#HHelpCode").val(data.鍔╄鐮�);//鍔╄鐮�
+                            $("#HUSEORGID").val(data.HUSEORGID);//浣跨敤缁勭粐
+                            $("#HUseFlag ").val(data.浣跨敤鐘舵��);//浣跨敤鐘舵��
+                            $("#HRemark").val(data.澶囨敞);//澶囨敞
+
+                            $("#HMakeEmp").val(data.鍒跺崟浜�);
+                            $("#HMakeTime").val(data.鍒涘缓鏃ユ湡 == "" ? "" : Format(new Date(data.鍒涘缓鏃ユ湡), "yyyy-MM-dd"));
+                            $("#HCheckEmp").val(data.瀹℃牳浜�);
+                            $("#HCheckTime").val(data.瀹℃牳鏃ユ湡 == "" ? "" : Format(new Date(data.瀹℃牳鏃ユ湡), "yyyy-MM-dd"));
+                            $("#HModifyEmp").val(data.淇敼浜�);
+                            $("#HModifyTime").val(data.淇敼鏃ユ湡 == "" ? "" : Format(new Date(data.淇敼鏃ユ湡), "yyyy-MM-dd"));
+                            $("#HStopEmp").val(data.绂佺敤浜�);
+                            $("#HStopTime").val(data.绂佺敤鏃ユ湡 == "" ? "" : Format(new Date(data.绂佺敤鏃ユ湡), "yyyy-MM-dd"));
+
+                            $("input[name='HStopflag']").attr("checked", data.绂佺敤鏍囧織 == "鏄�" ? true : false);//true:閫変腑 false:涓嶉�変腑
+                            layui.form.render();//瀹炴椂娓叉煋閫変腑鍜屼笉閫変腑鐨勬牱寮�,鏈�濂芥坊鍔犺繖鍙ヨ瘽
+                            form.render("select");
+                        } else {
+                            layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+                        }
+                    }, error: function () {
+                        layer.alert("鍙戠敓閿欒!", { icon: 5 });
+                    }
+                });
+            }
+
+            //鏁版嵁楠岃瘉
+            function AllowLoadData() {
+                var HNumber = $("#HNumber").val() //浠g爜
+                var HName = $("#HName").val() //鍚嶇О
+
+                if (HNumber == null || HNumber == undefined || HNumber == "") {
+                    layer.msg("璇疯緭鍏ヤ唬鐮侊紒", { icon: 5 });
+                    return false;
+                }
+                if (HName == null || HName == undefined || HName == "") {
+                    layer.msg("璇疯緭鍏ュ悕绉帮紒", { icon: 5 });
+                    return false;
+                }
+                return true;
+            }
+
+            //
+            function f_alert(sMsg) {
+                layer.alert(sMsg, { icon: 5 });
+
+            }
+            //鑾峰彇鐧诲綍椤电粍缁囧垪
+            function Organ() {
+                var Organization = '';
+                $.ajax({
+                    type: "get",
+                    url: GetWEBURL() + "/Web/GetOrganizations",
+                    async: false,
+                    success: function (result) {
+                        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");
+                    }
+                })
+            }
+            //#endregion
+        });
+
+    </script>
+</body>
+</html>
+</head>
+<body>
+
+</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_RepairEdit.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_RepairEdit.html"
index 55985c5..0b71b41 100644
--- "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_RepairEdit.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_RepairEdit.html"
@@ -15,6 +15,7 @@
     <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
     <script src="../../../layuiadmin/layui/lay/modules/util.js"></script>
     <script src="../../../layuiadmin/PubCustom.js"></script>
+    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
     <style media="screen">
         .custom-tree-item-clicked {
             color: #FC9003
@@ -29,16 +30,18 @@
                     <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="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</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" lay-filter="tab-all">
+                                    <li lay-id="1" style="padding:1px;" class="layui-this">鍩烘湰淇℃伅</li>
+                                    <li>鍏朵粬淇℃伅</li>
+                                </ul>
                                 <div class="layui-tab-content">
+                                    <!--鍩烘湰淇℃伅-->
                                     <div class="layui-tab-item layui-show">
                                         <div class="layui-form-item">
                                             <div class="layui-inline">
@@ -60,17 +63,120 @@
                                                     <input class="layui-input" name="HHelpCode" lay-verify="HHelpCode" id="HHelpCode">
                                                 </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; width: 185px;">
+                                                    <input type="hidden" class="layui-input" lay-verify="HCREATEORGID" name="HCREATEORGID" id="HCREATEORGID">
+                                                    <select name="HUSEORGID" id="HUSEORGID" lay-verify="HUSEORGID">
+                                                        <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+                                                    </select>
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">缁翠慨椤圭洰<br />绫诲瀷</label>
+                                                <div class="layui-input-block" style="margin-left: 125px; width: 190px;">
+                                                    <select name="HRepairType" id="HRepairType" lay-verify="HRepairType">
+                                                        <option value="璁惧" selected="selected">璁惧</option>
+                                                        <option value="鍣ㄥ叿">鍣ㄥ叿</option>
+                                                    </select>
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label" style="width: 85px;">浣跨敤鏍囧織</label>
+                                                <div class="layui-input-block" style="margin-left: 130px; width: 190px;">
+                                                    <select name="HUseFlag" id="HUseFlag" lay-verify="HUseFlag">
+                                                        <option value="鏈娇鐢�" selected="selected">鏈娇鐢�</option>
+                                                        <option value="宸蹭娇鐢�">宸蹭娇鐢�</option>
+                                                        <option value="鏈娴�">鏈娴�</option>
+                                                    </select>
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="layui-row">
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">缁翠慨椤圭洰鍒嗙被</label>
+                                                <div class="layui-input-inline">
+                                                    <input type="text" name="HRepairClassName" id="HRepairClassName" readonly class="layui-input" value="" style="float:left;width:150px;">
+                                                    <input type="hidden" name="HRepairClassID" id="HRepairClassID" class="layui-input" value="0" style="float:left;width:150px;">
+                                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="BtnHRepairClass" style="width:40px;">
+                                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                    </button>
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="layui-row">
                                             <div class="layui-inline">
                                                 <label class="layui-form-label">澶囨敞</label>
                                                 <div class="layui-input-inline">
                                                     <textarea placeholder="璇疯緭鍏ョ淮澶囨敞" class="layui-textarea" name="HRemark" id="HRemark"></textarea>
                                                 </div>
                                             </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">绂佺敤鏍囧織</label>
+                                                <div class="layui-input-block">
+                                                    <input type="checkbox" name="HStopflag" id="HStopflag" lay-skin="primary" title="" value="">
+                                                </div>
+                                            </div>
                                         </div>
+                                    </div>
+                                    <!--鍏朵粬淇℃伅-->
+                                    <div class="layui-tab-item">
                                         <div class="layui-form-item">
-                                            <label class="layui-form-label">绂佺敤鏍囧織</label>
-                                            <div class="layui-input-block">
-                                                <input type="checkbox" name="HStopflag" id="HStopflag" lay-skin="primary" title="">
+                                            <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="HModifyEmp" id="HModifyEmp" 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>
+                                            <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="HModifyTime" id="HModifyTime" 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>
                                         </div>
                                     </div>
@@ -83,11 +189,7 @@
             </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/PubCustom.js"></script>
+
     <script>
         //鑾峰彇鍙傛暟
         var params = get_UrlVars();
@@ -118,32 +220,30 @@
                 , element = layui.element;
             //#endregion
             //甯歌鐢ㄦ硶
+         
+            Organ();
+            $("#HStopflag").attr("disabled", true);
+            $("#HUseFlag").attr("disabled", true);
+            layui.form.render('checkbox');
 
+            if (OperationType == 1) {   //鏂板
+                linterid = 0;
+                $("#HMakeEmp").val(sessionStorage["HUserName"]);
 
-            if (OperationType == 3) {
-                $.ajax({
-                    url: GetWEBURL() + "/Gy_Repair/EditRepair",
-                    type: "GET",
-                    data: {
-                        "HInterID": linterid
-                    },
-                    success: function (d) {
-
-                        ajaxReturnData = JSON.parse(JSON.stringify(d)).data;
-                        $("#HNumber").val(d.data[0].HNumber);
-                        $("#HName").val(d.data[0].HName);
-                        $("#HHelpCode").val(d.data[0].HHelpCode);
-                        $("#HRemark").val(d.data[0].HRemark);
-                        $("#HLevel").val(d.data[0].HLevel);
-                        $("input[name='HStopflag']").prop("checked", d.data[0].HStopflag);//true:閫変腑 false:涓嶉�変腑
-                        layui.form.render();//瀹炴椂娓叉煋閫変腑鍜屼笉閫変腑鐨勬牱寮�,鏈�濂芥坊鍔犺繖鍙ヨ瘽
-                        $("#HUpDater").val(sessionStorage["HUserName"]);//淇敼浜�
-                        //table.reload(layTableId, {
-                        //    data: ajaxReturnData
-                        //});
-                    }
-
-                });
+            } else if (OperationType == 2) {
+                RoadBillMain(linterid);
+                $("#HMakeEmp").val(sessionStorage["HUserName"]);
+                $("#HModifyEmp").val("");
+                $("#HStopEmp").val("");
+                $("#HCheckEmp").val("");
+                $("#HMakeTime").val("");
+                $("#HModifyTime").val("");
+                $("#HStopTime").val("");
+                $("#HCheckTime").val("");
+                $("#HNumber").val("");
+                $("#HItemID").val(0);
+            } else if (OperationType == 3) {
+                RoadBillMain(linterid);
             }
 
             //#region 宸ュ叿鎸夐挳
@@ -160,10 +260,13 @@
                 }
             })
 
+            //琛ㄥご淇℃伅  缁翠慨椤圭洰鍒嗙被
+            form.on('submit(BtnHRepairClass)', function () {
+                BtnHRepairClass();
+            });
+
             //淇濆瓨
             form.on('submit(Saver)', function (data) {//淇濆瓨
-                //debugger;
-
                 if (!AllowLoadData()) {
                     return;
                 }
@@ -186,15 +289,15 @@
                         {
                             type: "POST",
                             url: GetWEBURL() + "/Gy_Repair/EditBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
-                            async: true,
+                            async: false,
                             data: { "oMain": sMainSub },
                             dataType: "json",
                             success: function (data) {
                                 if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
                                     layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
                                         $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
-                                        var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
-                                        parent.layer.close(index); //鍐嶆墽琛屽叧闂� 聽 聽 聽 聽 聽聽 聽聽聽 聽
+                                        //var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
+                                        //parent.layer.close(index); //鍐嶆墽琛屽叧闂� 聽 聽 聽 聽 聽聽 聽聽聽 聽
                                     });
                                 }
                                 else {
@@ -217,15 +320,15 @@
                         {
                             type: "POST",
                             url: GetWEBURL() + "/Gy_Repair/AddBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
-                            async: true,
+                            async: false,
                             data: { "oMain": sMainSub },
                             dataType: "json",
                             success: function (data) {
                                 if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
                                     layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
                                         $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
-                                        var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
-                                        parent.layer.close(index); //鍐嶆墽琛屽叧闂� 聽 聽 聽 聽 聽聽 聽聽聽 聽
+                                        //var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
+                                        //parent.layer.close(index); //鍐嶆墽琛屽叧闂� 聽 聽 聽 聽 聽聽 聽聽聽 聽
                                     });
                                 }
                                 else {
@@ -252,6 +355,103 @@
 
             }
 
+            //鑾峰彇缁勭粐
+            function Organ() {
+                //鑾峰彇鐧诲綍椤电粍缁囧垪
+                var Organization = '';
+                $.ajax({
+                    type: "get",
+                    url: GetWEBURL() + "/Web/GetOrganizations",
+                    success: function (result) {
+                        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"])
+                            $("#HCREATEORGID").val(sessionStorage["OrganizationID"])
+                            form.render('select');
+                        }
+                        layer.closeAll("loading");
+                    }
+                })
+            }
+
+            function RoadBillMain(linterid) {
+                $.ajax({
+                    url: GetWEBURL() + "/Gy_Repair/EditRepair",
+                    type: "GET",
+                    async: false,
+                    data: {
+                        "HInterID": linterid
+                    },
+                    success: function (d) {
+
+                        ajaxReturnData = JSON.parse(JSON.stringify(d)).data;
+                        $("#HNumber").val(d.data[0].缁翠慨椤圭洰浠g爜);
+                        $("#HName").val(d.data[0].缁翠慨椤圭洰鍚嶇О);
+                        $("#HHelpCode").val(d.data[0].鍔╄鐮�);
+                        $("#HRemark").val(d.data[0].澶囨敞);
+                        $("#HLevel").val(d.data[0].绛夌骇);
+
+                        $("#HUSEORGID").val(d.data[0].HUSEORGID);
+                        $("#HMakeEmp").val(d.data[0].鍒跺崟浜�);
+                        $("#HMakeTime").val(d.data[0].鍒涘缓鏃ユ湡 == null ? "" : Format(new Date(d.data[0].鍒涘缓鏃ユ湡), "yyyy-MM-dd"));
+                        $("#HCheckEmp").val(d.data[0].瀹℃牳浜�);
+                        $("#HCheckTime").val(d.data[0].瀹℃牳鏃ユ湡 == null ? "" : Format(new Date(d.data[0].瀹℃牳鏃ユ湡), "yyyy-MM-dd"));
+                        $("#HModifyEmp").val(d.data[0].淇敼浜�);
+                        $("#HModifyTime").val(d.data[0].淇敼鏃ユ湡 == null ? "" : Format(new Date(d.data[0].淇敼鏃ユ湡), "yyyy-MM-dd"));
+                        $("#HStopEmp").val(d.data[0].绂佺敤浜�);
+                        $("#HStopTime").val(d.data[0].绂佺敤鏃ユ湡 == null ? "" : Format(new Date(d.data[0].绂佺敤鏃ユ湡), "yyyy-MM-dd"));
+                        $("#HUseFlag").val(d.data[0].浣跨敤鐘舵��);
+                        $("#HRepairType").val(d.data[0].缁翠慨椤圭洰绫诲瀷);
+                        $("#HRepairClassID").val(d.data[0].HRepairClassID);
+                        $("#HRepairClassName").val(d.data[0].缁翠慨椤圭洰鍒嗙被鍚嶇О);
+                        $("input[name='HStopflag']").prop("checked", d.data[0].绂佺敤鏍囧織 == "鏄�" ? true : false);//true:閫変腑 false:涓嶉�変腑
+                        layui.form.render();//瀹炴椂娓叉煋閫変腑鍜屼笉閫変腑鐨勬牱寮�,鏈�濂芥坊鍔犺繖鍙ヨ瘽
+                        //$("#HUpDater").val(sessionStorage["HUserName"]);//淇敼浜�
+                        //table.reload(layTableId, {
+                        //    data: ajaxReturnData
+                        //});
+                    }
+
+                });
+            }
+
+            //缁翠慨椤圭洰鍒嗙被鍒楄〃
+            function BtnHRepairClass() {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '缁翠慨椤圭洰鍒嗙被鍒楄〃',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['80%', '80%'],
+                    maxmin: true,
+                    content: ['../../鍩虹璧勬枡/鍩虹璧勬枡/Gy_RepairClass.html', 'yes'],
+                    btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {
+
+                        //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HRepairClassName").val(checkStatus.data[0].缁翠慨椤圭洰鍒嗙被鍚嶇О);
+                        $("#HRepairClassID").val(checkStatus.data[0].HItemID);
+
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                });
+            }
+
             //鏁版嵁楠岃瘉
             function AllowLoadData() {
                 var HNumber = $("#HNumber").val();
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_RepairList.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_RepairList.html"
index 627ca85..166a03b 100644
--- "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_RepairList.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_RepairList.html"
@@ -9,15 +9,23 @@
     <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/treeTable.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/layui/lay/modules/util.js"></script>
+    <script src="../../../layuiadmin/layui/layui1.js"></script>
+    <script src="../../../layuiadmin/layui/lay/modules/table.js"></script>
+    <script src="../../../layuiadmin/HideButton_New.js"></script>
     <script src="../../../layuiadmin/PubCustom.js"></script>
+    <script src="../../../layuiadmin/soulTable.slim.js"></script>
+    <script src="../../../layuiadmin/PageTitle.js"></script>
+    <script src="../../../layuiadmin/SetColumn.js"></script>
     <style media="screen">
         .custom-tree-item-clicked {
             color: #FC9003
+        }
+        /*鏍戠姸鍥剧偣鍑婚珮浜彉鑹�*/
+        .layui-tree-set-active > .layui-tree-entry .layui-tree-main {
+            background: #aef0f7;
         }
     </style>
 </head>
@@ -44,6 +52,14 @@
                                     <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="HName ForFilteringSchemes" id="HName">
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label" style="width: 85px;">缁勭粐</label>
+                                    <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
+                                        <select name="HUSEORGID" id="HUSEORGID" class="ForFilteringSchemes" lay-verify="HUSEORGID">
+                                            <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+                                        </select>
                                     </div>
                                 </div>
                                 <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
@@ -82,24 +98,93 @@
                                             <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent">
                                         </div>
                                     </div>
+                                    <div class="layui-row" style="margin-top:5px">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">杩囨护</label>
+                                            <div class="layui-input-block">
+                                                <select name="ColName1" id="ColName1" lay-filter="ColName1" style="width:190px;" class="ForFilteringSchemes">
+                                                </select>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <select name="Comparator1" id="Comparator1" lay-filter="Comparator1" 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="ColContent1" id="ColContent1">
+                                        </div>
+                                    </div>
+                                    <div class="layui-row" style="margin-top:5px">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">杩囨护</label>
+                                            <div class="layui-input-block">
+                                                <select name="ColName2" id="ColName2" lay-filter="ColName2" style="width:190px;" class="ForFilteringSchemes">
+                                                </select>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <select name="Comparator2" id="Comparator2" lay-filter="Comparator2" 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="ColContent2" id="ColContent2">
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="layui-row" style="padding:10px 0">
+                            <div class="layui-col-xs3 layui-inline" style="border: solid 1.5px #e0d6d64d;">
+                                <div id="TreeTable" class="demo-tree demo-tree-box" style="width:99.5%;height:calc(45vh);overflow-y:auto"></div>
+                                
+                            </div>
+                            <div class="layui-col-xs8 layui-inline" style="padding-left: 10px; width: 75%">
+                                <div>
+                                    <table class="" id="mainTable" lay-filter="mainTable"></table>
                                 </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="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_SouceExcel"><i class="layui-icon layui-icon-delete"></i>瀵煎叆</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+                            <div class="layui-btn-container" id="toolbarDemo_ButtonSet">
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_SouceExcel" id="set_SouceExcel"><i class="layui-icon layui-icon-delete"></i>瀵煎叆</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Export" id="btn_Export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew" id="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Copy" id="btn_Copy"><i class="layui-icon layui-icon-add-1"></i>澶嶅埗</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill" id="set_ShowBill"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill" id="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit" id="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>瀹℃牳</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit" id="btn-Audit"><i class="layui-icon layui-icon-radio"></i>鍙嶅鏍�</button>
-                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-view"><i class="layui-icon layui-icon-tips"></i>棰勮</button>-->
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Stop" id="btn-Stop"><i class="layui-icon layui-icon-radio"></i>绂佺敤</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeStop" id="btn-DeStop"><i class="layui-icon layui-icon-radio"></i>鍙嶇鐢�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn" id="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideButton" id="set_HideButton"><i class="layui-icon layui-icon-form"></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="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh" id="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit" id="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
                             </div>
                         </script>
                     </form>
@@ -133,6 +218,11 @@
             var sWhere = "";
             var option = [];
             var HModName = "Gy_RepairList";
+            var HBillType = "Gy_RepairList";
+            var HMaterTypeID = 0;              //鐗╂枡鍒嗙被鑺傜偣id
+            var sql = "";
+            var ins;                //鐢ㄤ簬瀵煎嚭excel
+            var set_HideButton_ID = "toolbarDemo_ButtonSet";                    //闇�瑕佽缃殑鎸夐挳鐨勭埗绾ц妭鐐圭殑id
             //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
             var titleData = ["hitemid","hparentid"];
             //#endregion
@@ -174,11 +264,17 @@
                     //缂栬緫
                     case 'set_ShowBill': set_ShowBill();
                         break;
+                    case 'btn_Copy':
+                        set_copy();
+                        break;
                     //鍒犻櫎
                     case 'set_DeleteBill': set_DeleteBill();
                         break;
                     //瀵煎叆
                     case 'set_SouceExcel': set_SouceExcel();
+                        break;
+                    //瀵煎嚭鎸夐挳
+                    case 'btn_Export': btn_Export();
                         break;
                     //鍒锋柊
                     case 'get_Refresh': get_Refresh();
@@ -195,11 +291,23 @@
                     case 'btn-DeAudit':
                         set_CheckBill(1);
                         break;
+                    //绂佺敤鎸夐挳
+                    case 'btn-Stop':
+                        set_De_Stop(0);
+                        break;
+                    //鍙嶇鐢ㄦ寜閽�
+                    case 'btn-DeStop':
+                        set_De_Stop(1);
+                        break;
                     //閫�鍑烘寜閽�
                     case 'get_Exit': Pub_Close(2);
                         break;
                     //鍒楄缃�
-                    case 'set_HideColumn': get_HideColumn();
+                    case 'set_HideColumn': get_HideColumnNoPage(HModName, sessionStorage["HUserName"], option, get_FastQuery);
+                        break;
+                    //鎸夐挳璁剧疆
+                    case 'set_HideButton':
+                        get_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
                         break;
                 };
             });
@@ -250,11 +358,14 @@
             //鍒濆鍖栬〃鏍�
 
             function set_ClearBill() {
+                set_StockOrg();
                 //鍒濆鍖栬〃鏍�
                 set_InitGrid();
-
+                //鏍戠姸鍥炬煡璇�
+                get_Display_Tree();
                 //鏌ヨ
                 get_Display(sWhere);
+              
 
                 get_DefaultModule();
             }
@@ -342,15 +453,21 @@
                                 , limit: 50
                                 , cellMinWidth: 90
                             }
-                            table.render(option);
+                            ins = table.render(option);
 
                             //鍒锋柊琛ㄦ牸鏁版嵁
-                            DisPlay_HideColumn();
+                            DisPlay_HideColumn(HModName, sessionStorage["HUserName"], option, titleData);
+
+                            table.render(option);
+
+                            //鎸夐挳鏁版嵁鏄剧ず
 
                             layer.close(ajaxLoad);
-                            if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+                            if ($("#ColName option").length < 1) {
                                 ColFilter();
                             }
+                            Display_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
+
                             //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
                         } else {
                             layer.close(ajaxLoad);
@@ -369,9 +486,17 @@
             function get_FastQuery() {
                 var HNumber = $("#HNumber").val();
                 var HName = $("#HName").val();
+                var HUSEORGID = $("#HUSEORGID").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 = "";
@@ -394,11 +519,60 @@
                     }
                     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 缁翠慨椤圭洰浠g爜 like '%" + HNumber + "%'";
                 }
                 if (HName) {
                     sWhere += " and 缁翠慨椤圭洰 like '%" + HName + "%'";
+                }
+                if (HUSEORGID) {
+                    sWhere += " and 浣跨敤缁勭粐鍚嶇О = '" + HUSEORGID + "'";
+                }
+                if (sql != "") {
+                    sWhere += sql;
                 }
                 get_Display(sWhere);
                 sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
@@ -412,6 +586,13 @@
                 $("#ColContent").val("");
                 $("#ColName").val("0");
                 $("#Comparator").val("0");
+                $("#ColContent2").val("");
+                $("#ColName2").val("0");
+                $("#Comparator2").val("0");
+                $("#ColContent1").val("");
+                $("#ColName1").val("0");
+                $("#Comparator1").val("0");
+                $("#HUSEORGID").val(sessionStorage["Organization"]);
                 form.render('select');
 
                 sWhere = "";
@@ -442,6 +623,32 @@
                 });
 
             }
+
+            //#region   鑾峰彇缁勭粐
+            function set_StockOrg() {
+                //鑾峰彇鐧诲綍椤电粍缁囧垪
+                $.ajax({
+                    type: "GET",
+                    url: GetWEBURL() + "/Web/GetOrganizations",
+                    async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                    success: function (result) {
+                        var Organization = "";
+                        Organization += '<option  style="color:blue;" value="">鍏ㄩ儴</option>';
+                        if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            var data = result.data;
+                            for (var i = 0; i < data.length; i++) {
+                                Organization += '<option  style="color:blue;" value="' + data[i].Name + '">' + data[i].Name + '</option>';
+                            }
+                            $("#HUSEORGID").append(Organization);
+                            $("#HUSEORGID").val(sessionStorage["Organization"])
+                            form.render('select');
+                        }
+                        layer.closeAll("loading");
+                    },
+                    complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
+                })
+            }
+            //#endregion
 
             //淇敼鎸夐挳
             function set_ShowBill() {
@@ -531,6 +738,37 @@
                 }
             };
 
+            //澶嶅埗
+            function set_copy() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var HInterID = data[0].hitemid.toString();
+                    layer.open({
+                        type: 2
+                        , area: ['100%', '100%']
+                        , title: '缂栬緫缁翠慨椤圭洰'
+                        , shade: 0.6 //閬僵閫忔槑搴�
+                        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                        , content: '../鍩虹璧勬枡/Gy_RepairEdit.html?OperationType=2&hID=' + HInterID
+                        , resize: false
+                        , cancel: function () {
+
+                        }
+                    })
+
+                } else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+                }
+            }
+
+            //#region 瀵煎嚭Execel
+            function btn_Export() {
+                table.exportFile(ins.config.id, option.data, "xls");
+            }
+            //#endregion
+
             //鍒锋柊
             function get_Refresh() {
                 $("#btnSearch").click();
@@ -586,121 +824,40 @@
             }
             //#endregion
 
-            //#region 闅愯棌鍒楄缃�
-            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;
+            //#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_Repair/StopGy_Repair", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        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');
+                                });
 
-                layer.open({
-                    type: 2
-                    , skin: "layui-layer-rim" //鍔犱笂杈规
-                    , title: "闅愯棌鍒楄缃�"  //鏍囬
-                    , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
-                    , shift: 2 //寮瑰嚭鍔ㄧ敾
-                    , area: ["50%", "90%"] //绐椾綋澶у皬
-                    , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
-                    , content: [contentUrl, "yes"]
-                    , btn: ["纭畾", "鍙栨秷"]
-                    , btn1: function (index, laero) {
-                        //鍒锋柊琛ㄦ牸鏁版嵁
-                        DisPlay_HideColumn();
-                        //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
-                        layer.close(index);//鍏抽棴寮圭獥
-                    }
-                })
-            }
-            //#endregion
-            //#region 鏄剧ず鍒楁暟鎹�
-            function DisPlay_HideColumn() {
-                $.ajax({
-                    url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
-                    type: "GET",
-                    data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
-                    success: function (data1) {
-                        if (data1.data.length != 0) {
-
-                            var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
-                            //var titleData = ["鍗曟嵁ID", "HMouldID", "hsubid", "HManagerID", "婧愬崟涓诲唴鐮�", "婧愬崟瀛愬唴鐮�"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
-
-                            dataCol = data1.data[0].HGridString.split(',');
-
-                            for (var i = 0; i < option.cols[0].length - 2; i++) {
-                                var dataCols = dataCol[i].split('|');
-                                //闅愯棌鍒�
-                                if (dataCols[1] == 1) {
-                                    option.cols[0][i + 1]["hide"] = true;
-                                }
-                                //璁剧疆鍒楀
-                                if (dataCols[3] > 0) {
-                                    option.cols[0][i + 1]["width"] = dataCols[3];
-                                }
-                                //璁剧疆鍐呭瀛椾綋澶у皬
-                                if (data1.data[0].HFontSize != 0) {
-                                    option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
-                                } else {
-                                    option.cols[0][i + 1]["style"] = "font-size:100%";
-                                }
-                                //璁剧疆鍒楀
-                                //if (data1.data[0].HColumnWidth != 0) {
-                                //    option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
-                                //} else {
-                                //    option.cols[0][i + 1]["width"] = "";
-                                //}
-                                //鏄剧ず鍒�
-                                if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
-                                    option.cols[0][i + 1]["hide"] = false;
-                                }
-                                //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
-                                switch (dataCols[2]) {
-                                    case "L":
-                                        option.cols[0][i + 1]["align"] = "left";
-                                        break;
-                                    case "M":
-                                        option.cols[0][i + 1]["align"] = "center";
-                                        break;
-                                    case "R":
-                                        option.cols[0][i + 1]["align"] = "right";
-                                        break;
-                                }
+                            } else {
+                                layer.alert(result.code + result.Message, { icon: 5 });
                             }
-
-                            //鍙栨秷鍐荤粨鍒�
-                            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 });
                         }
-                    }, error: function () {
-                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
-                    }
-                })
+                    });
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+                }
             }
             //#endregion
 
@@ -714,6 +871,10 @@
                 }
                 $("#ColName").empty();
                 $("#ColName").append(Organization);
+                $("#ColName1").empty();
+                $("#ColName1").append(Organization);
+                $("#ColName2").empty();
+                $("#ColName2").append(Organization);
                 form.render('select');
             }
             //#endregion
@@ -776,6 +937,94 @@
                 });
             }
 
+            // 鏍戠姸鍥炬煡璇�
+            function get_Display_Tree() {
+                var ajaxLoad = layer.load();
+                $.ajax({
+                    url: GetWEBURL() + '/Gy_RepairClass/Gy_RepairClassTreeList',
+                    type: "GET",
+                    data: { "HOrgID": sessionStorage["OrganizationID"] },
+                    success: function (data1) {
+                        if (data1.count == 1) {
+                            layer.close(ajaxLoad);
+                            var data = JSON.parse(data1.data);
+                            MenuMain(data);
+                        } else {
+                            layer.close(ajaxLoad);
+                            layer.alert(data1.code + data1.Message, { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.close(ajaxLoad);
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+            }
+
+            //閬嶅巻鐢熸垚涓昏彍鍗�
+            function MenuMain(data) {
+                var liStr = '[';
+                //閬嶅巻鐢熸垚涓昏彍鍗�
+                for (var i = 0; i < data.length; i++) {
+                    // 鍒ゆ柇鏄惁瀛樺湪瀛愯彍鍗�
+                    if (data[i].children != null && data[i].children.length > 0) {
+                        liStr += '{"title": "' + data[i].id + "-" + data[i].title + '", "id": "' + data[i].id + '","spread":true, "children":[ ';
+                        // 閬嶅巻鑾峰彇瀛愯彍鍗�
+                        for (var k = 0; k < data[i].children.length; k++) {
+                            liStr += getChildMenu(data[i].children[k], 0);
+                        }
+                        liStr = liStr.substring(0, liStr.length - 1);
+                        liStr += ']},';
+                    } else {
+                        liStr += '{"title": "' + data[i].id + "-" + data[i].title + '", "id": "' + data[i].id + '"},';
+                    }
+                };
+                liStr = liStr.substring(0, liStr.length - 1);
+                liStr += "]";
+                var treeTable = JSON.parse(liStr);
+                tree.render({
+                    elem: '#TreeTable' //榛樿鏄偣鍑昏妭鐐瑰彲杩涜鏀剁缉
+                    , data: treeTable
+                    , onlyIconControl: true
+                    , click: function (obj) {
+                        //楂樹寒鍙樿壊
+                        $(".layui-tree-set").removeClass('layui-tree-set-active');
+                        obj.elem.addClass('layui-tree-set-active');
+
+                        var data = obj.data;  //鑾峰彇褰撳墠鐐瑰嚮鐨勮妭鐐规暟鎹�
+                        if (data.id == "100") {
+                            sql = " and HRepairClassID=0 ";
+                            HMaterTypeID = 0;
+                        } else if (data.id == "0") {
+                            sql = "";
+                            HMaterTypeID = 0;
+                        } else {
+                            sql = " and HRepairClassID='" + data.id + "' ";
+                            HMaterTypeID = data.id;
+                        }
+                        get_FastQuery()
+                    }
+                });
+            }
+
+            // 閫掑綊鐢熸垚瀛愯彍鍗�
+            function getChildMenu(subMenu, num) {
+                num++;
+                var subStr = '';
+                if (subMenu.children != null && subMenu.children.length > 0) {
+                    subStr += '{"title": "' + subMenu.id + "-" + subMenu.title + '", "id": "' + subMenu.id + '", "children":[';
+                    for (var j = 0; j < subMenu.children.length; j++) {
+                        subStr += getChildMenu(subMenu.children[j], num);
+                        if (j + 1 == subMenu.children.length) {
+                            subStr = subStr.substring(0, subStr.length - 1);
+                        }
+                    }
+                    subStr += ']},';
+                } else {
+                    subStr += '{"title": "' + subMenu.id + "-" + subMenu.title + '", "id": "' + subMenu.id + '"},';
+                }
+                return subStr;
+            }
+
             //淇濆瓨鏂规
             function set_SaveScheme() {
                 var index = layer.open()
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkShiftEdit.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkShiftEdit.html"
index eda5a56..209e9e6 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkShiftEdit.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkShiftEdit.html"
@@ -42,6 +42,7 @@
                     <div class="layui-tab" lay-filter="tab-Gy_ShiftsEdit">
                         <ul class="layui-tab-title" lay-filter="tab-all">
                             <li lay-id="1" style="padding:1px;" class="layui-this">鍩烘湰淇℃伅</li>
+                            <li>鍏朵粬淇℃伅</li>
                         </ul>
                         <div class="layui-tab-content">
                             <!--鍩烘湰淇℃伅-->
@@ -105,6 +106,27 @@
                                         </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; width: 185px;">
+                                                <input type="hidden" class="layui-input" lay-verify="HCREATEORGID" name="HCREATEORGID" id="HCREATEORGID">
+                                                <select name="HUSEORGID" id="HUSEORGID" lay-verify="HUSEORGID">
+                                                    <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+                                                </select>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">浣跨敤鏍囧織</label>
+                                            <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
+                                                <select name="HUseFlag" id="HUseFlag" lay-verify="HUseFlag">
+                                                    <option value="鏈娇鐢�" selected="selected">鏈娇鐢�</option>
+                                                    <option value="宸蹭娇鐢�">宸蹭娇鐢�</option>
+                                                    <option value="鏈娴�">鏈娴�</option>
+                                                </select>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
                                         <div class="layui-inline" style="width: 965px;">
                                             <label class="layui-form-label" style="width: 85px;">鐝鎻忚堪</label>
                                             <div class="layui-input-block" style="margin-left: 120px;">
@@ -127,25 +149,82 @@
                                         </div>
                                     </div>
                                 </div>
-                            </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="HModifyEmp" id="HModifyEmp" 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-tab" lay-filter="tab-Gy_ShiftsEdit">
-                        <ul class="layui-tab-title" lay-filter="tab-all">
-                            <li lay-id="1" style="padding:1px;" class="layui-this">鐝</li>
-                        </ul>
-                        <div class="layui-tab-content">
-                            <!--瀛愯〃-->
-                            <div class="layui-tab-item layui-show">
-                                <table class="layui-hide" 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-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>
+                                    <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="HModifyTime" id="HModifyTime" 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>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="layui-tab" lay-filter="tab-Gy_ShiftsEdit">
+                            <ul class="layui-tab-title" lay-filter="tab-all">
+                                <li lay-id="1" style="padding:1px;" class="layui-this">鐝</li>
+                            </ul>
+                            <div class="layui-tab-content">
+                                <!--瀛愯〃-->
+                                <div class="layui-tab-item layui-show">
+                                    <table class="layui-hide" 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-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>
+                                </div>
                             </div>
                         </div>
                     </div>
@@ -190,27 +269,43 @@
                 }, function () { window.location.href = "../../user/login.html"; });
             }
 
-           
+
 
             //鑾峰彇椤甸潰璺宠浆鍙傛暟
             var params = get_UrlVars();
             OperationType = params[params[0]];  //鎿嶄綔绫诲瀷锛�1鏂板銆�2缂栬緫锛�
             HInterID = params[params[1]];        //鍗曟嵁鍐呯爜
-
+            Organ();
+            $("#HStopflag").attr("disabled", true);
+            $("#HUseFlag").attr("disabled", true);
             //鍒ゆ柇鎿嶄綔绫诲瀷
             if (OperationType == 1) {   //鏂板
+                $("#HMakeEmp").val(sessionStorage["HUserName"]);
                 $.ajax({
                     url: GetWEBURL() + "/Web/GetMAXNum",
                     type: "GET",
                     data: { "HBillType": '3701' },
                     success: function (d) {
                         //console.log(d.data);
-                        $("#HInterID").val(d.data[0].HInterID);                     
+                        $("#HInterID").val(d.data[0].HInterID);
                     }
                 });
-             
+
                 get_InitGrid();
-               
+
+            } else if (OperationType == 2) {
+                //淇敼鏃朵富琛↖D
+                get_InitGrid();
+                RoadBillMain(HInterID);
+                $("#HMakeEmp").val(sessionStorage["HUserName"]);
+                $("#HModifyEmp").val("");
+                $("#HStopEmp").val("");
+                $("#HCheckEmp").val("");
+                $("#HMakeTime").val("");
+                $("#HModifyTime").val("");
+                $("#HStopTime").val("");
+                $("#HCheckTime").val("");
+                $("#HItemID").val(0);
             }
             else if (OperationType == 3) {  //缂栬緫
                 $("#HInterID").val(HInterID);//淇敼鏃朵富琛↖D
@@ -233,7 +328,7 @@
                     success: function (result) {
                         if (result.code == 1) {
                             var data = result.data[0];
-                            var tableSub = result.data;                                                                      
+                            var tableSub = result.data;
                             form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
                                 "HInterID": data.HInterID
                                 , "HNumber": data.鐝浠g爜
@@ -242,10 +337,20 @@
                                 , "HDeptName": data.閮ㄩ棬鍚嶇О
                                 , "HWorkCenterID": data.HWorkCenterID
                                 , "HWorkCenterName": data.宸ヤ綔涓績
-                                , "HNote": data.鐝鎻忚堪                                
+                                , "HNote": data.鐝鎻忚堪
                                 , "HWorkTimes": data.宸ヤ綔鏃堕棿
                                 , "HRemark": data.澶囨敞
                                 , "HPlanShutdownTimes": data.璁″垝鍋滃伐鏃堕暱
+                                , "HUSEORGID": data.HUSEORGID
+                                , "HUseFlag": data.浣跨敤鏍囧織
+                                , "HMakeEmp": data.鍒跺崟浜�
+                                , "HModifyEmp": data.淇敼浜�
+                                , "HStopEmp": data.绂佺敤浜�
+                                , "HCheckEmp": data.瀹℃牳浜�
+                                , "HMakeTime": data.鍒涘缓鏃ユ湡 == "1900-01-01" ? "" : data.鍒涘缓鏃ユ湡
+                                , "HModifyTime": data.淇敼鏃ユ湡 == "1900-01-01" ? "" : data.淇敼鏃ユ湡
+                                , "HStopTime": data.绂佺敤鏃ユ湡 == "1900-01-01" ? "" : data.绂佺敤鏃ユ湡
+                                , "HCheckTime": data.瀹℃牳鏃ユ湡 == "1900-01-01" ? "" : data.瀹℃牳鏃ユ湡
                             });
                             $("input[name='HStopflag']").attr("checked", data.绂佺敤鏍囪 == "true" ? true : false);//true:閫変腑 false:涓嶉�変腑
                             var rowdata = [];
@@ -275,7 +380,7 @@
             //#endregion
 
 
-         
+
 
             //#region 鏄惁璺ㄥぉ
             form.on('checkbox(HOverDay)', function (data) {
@@ -379,7 +484,7 @@
                 //鏂板琛岃〃鏍兼暟鎹�
                 var NewRow =
                 {
-                     "HSNO": "0"
+                    "HSNO": "0"
                     , "HStartDate": ""
                     , "HEndDate": ""
                     , "HOverDay": false
@@ -393,7 +498,7 @@
 
                         for (var i = 1; i <= option.data.length; i++) {
                             //瀹屾垚鏍囪
-                            if (option.data[i - 1].HOverDay=="true") {
+                            if (option.data[i - 1].HOverDay == "true") {
                                 $('#HOverDay' + i + '').attr("checked", true);
                             }
                         }
@@ -418,7 +523,7 @@
 
                             for (var i = 1; i <= option.data.length; i++) {
                                 //瀹屾垚鏍囪
-                                if (option.data[i - 1].HOverDay=="true") {
+                                if (option.data[i - 1].HOverDay == "true") {
                                     $('#HOverDay' + i + '').attr("checked", true);
                                 }
                             }
@@ -517,6 +622,10 @@
                     layer.msg("缁勭粐涓嶅厑璁镐负绌猴紝璇烽�夋嫨缁勭粐锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                     return;
                 }
+                if (data.field.HPlanShutdownTimes == '') {
+                    layer.msg("璁″垝鍋滃伐鏃堕暱涓嶅厑璁镐负绌猴紝璇疯緭鍏ワ紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return;
+                }
                 if (data.field.HWorkTimes == '') {
                     data.field.HWorkTimes = 0;
                 }
@@ -538,7 +647,7 @@
                     refSav = "Update";
                 }
 
-                  var isEndCheck = document.getElementById("HStopflag").checked;
+                var isEndCheck = document.getElementById("HStopflag").checked;
                 isEndCheck == true ? data.field.HStopflag = 'true' : data.field.HStopflag = 'false';//灏嗘暟缁勫悎骞舵垚瀛楃涓�
                 //鑾峰彇琛ㄥご鏁版嵁骞跺簭鍒楀寲
                 var sMainStr = JSON.stringify(data.field);              //涓昏〃鏁版嵁
@@ -602,7 +711,7 @@
 
                 var rowdata = [
                     {
-                         "HSNO": "0"
+                        "HSNO": "0"
                         , "HStartDate": ""
                         , "HEndDate": ""
                         , "HOverDay": false
@@ -614,6 +723,29 @@
             }
             //#endregion
 
+            //鑾峰彇缁勭粐
+            function Organ() {
+                //鑾峰彇鐧诲綍椤电粍缁囧垪
+                var Organization = '';
+                $.ajax({
+                    type: "get",
+                    url: GetWEBURL() + "/Web/GetOrganizations",
+                    success: function (result) {
+                        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"])
+                            $("#HCREATEORGID").val(sessionStorage["OrganizationID"])
+                            form.render('select');
+                        }
+                        layer.closeAll("loading");
+                    }
+                })
+            }
+
             //#region 瀛愯〃锛氬垹闄ゆ寚瀹氳
             function set_GridDelete(obj) {
                 var data = obj.data;
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkShiftList.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkShiftList.html"
index e5cc5f5..46f3ed2 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkShiftList.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkShiftList.html"
@@ -15,8 +15,9 @@
     <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
     <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
     <script src="../../../layuiadmin/PubCustom.js"></script>
-    <script src="../../../layuiadmin/HideButton.js"></script>
+    <script src="../../../layuiadmin/HideButton_New.js"></script>
     <script src="../../../layuiadmin/soulTable.slim.js"></script>
+    <script src="../../../layuiadmin/SetColumn.js"></script>
     <style>
         .layui-form-select .layui-input {
             padding-right: 15px;
@@ -48,7 +49,15 @@
                                     <div class="layui-input-block">
                                         <input type="text" class="layui-input ForFilteringSchemes" name="HName" id="HName" style="width:190px;">
                                     </div>
-                                </div>                              
+                                </div>   
+                                <div class="layui-inline">
+                                    <label class="layui-form-label" style="width: 85px;">缁勭粐</label>
+                                    <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
+                                        <select name="HUSEORGID" id="HUSEORGID" class="ForFilteringSchemes" lay-verify="HUSEORGID">
+                                            <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+                                        </select>
+                                    </div>
+                                </div>
                                 <button type="button" class="layui-btn layuiadmin-btn-order" lay-submit="" lay-filter="btn_Search" id="btn_Search">
                                     <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                 </button>
@@ -63,12 +72,12 @@
                                         <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 name="ColName" id="ColName" lay-filter="ColName" style="width:190px;" class="ForFilteringSchemes">
                                                 </select>
                                             </div>
                                         </div>
                                         <div class="layui-inline">
-                                            <select name="Comparator" id="Comparator" class="ForFilteringSchemes" lay-filter="Comparator" style="width:190px;">
+                                            <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>
@@ -86,22 +95,82 @@
                                             <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent">
                                         </div>
                                     </div>
+                                    <div class="layui-row" style="margin-top:5px">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">杩囨护</label>
+                                            <div class="layui-input-block">
+                                                <select name="ColName1" id="ColName1" lay-filter="ColName1" style="width:190px;" class="ForFilteringSchemes">
+                                                </select>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <select name="Comparator1" id="Comparator1" lay-filter="Comparator1" 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="ColContent1" id="ColContent1">
+                                        </div>
+                                    </div>
+                                    <div class="layui-row" style="margin-top:5px">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">杩囨护</label>
+                                            <div class="layui-input-block">
+                                                <select name="ColName2" id="ColName2" lay-filter="ColName2" style="width:190px;" class="ForFilteringSchemes">
+                                                </select>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <select name="Comparator2" id="Comparator2" lay-filter="Comparator2" 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="ColContent2" id="ColContent2">
+                                        </div>
+                                    </div>
                                 </div>
                             </div>
                         </div>
                         <table class="" id="mainTable" lay-filter="mainTable"></table>
                         <script type="text/html" id="toolbarDemo">
-                            <div class="layui-btn-container">
+                            <div class="layui-btn-container"  id="toolbarDemo_ButtonSet">
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_SouceExcel" id="set_SouceExcel"><i class="layui-icon layui-icon-export"></i>瀵煎叆</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Export" id="btn_Export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_AddNew" id="btn_AddNew"><i class="layui-icon layui-icon-add-1"></i>鏂板</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Modify" id="btn_Modify"><i class="layui-icon layui-icon-edit"></i>淇敼</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Copy" id="btn_Copy"><i class="layui-icon layui-icon-add-1"></i>澶嶅埗</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Modify" id="btn_Modify"><i class="layui-icon layui-icon-edit"></i>缂栬緫</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Delete" id="btn_Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Refresh" id="btn_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>                              
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Exit" id="btn_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit" id="btn-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit" id="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Stop" id="btn-Stop"><i class="layui-icon layui-icon-radio"></i>绂佺敤</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeStop" id="btn-DeStop"><i class="layui-icon layui-icon-radio"></i>鍙嶇鐢�</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_HideColumn" id="btn_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_HideButton" id="btn_HideButton"><i class="layui-icon layui-icon-form"></i>鎸夐挳璁剧疆</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideButton" id="set_HideButton"><i class="layui-icon layui-icon-form"></i>鎸夐挳璁剧疆</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_SaveScheme" id="btn_SaveScheme"><i class="layui-icon layui-icon-template"></i>淇濆瓨鏂规</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_ReadScheme" id="btn_ReadScheme"><i class="layui-icon layui-icon-set"></i>璇诲彇鏂规</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Refresh" id="btn_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Exit" id="btn_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
                             </div>
                         </script>
                     </form>
@@ -132,7 +201,9 @@
             var option = [];
             var columns = "";
             var HModName = "Gy_WorkShiftList";
-            var titleData = ["HInterID", "HDeptID","HWorkCenterID"];     //涓嶉渶瑕佹樉绀虹殑瀛楁
+            var HBillType = "Gy_WorkShiftList";
+            var titleData = ["HInterID", "HDeptID", "HWorkCenterID"];     //涓嶉渶瑕佹樉绀虹殑瀛楁
+            var set_HideButton_ID = "toolbarDemo_ButtonSet";                    //闇�瑕佽缃殑鎸夐挳鐨勭埗绾ц妭鐐圭殑id
             var params = get_UrlVars();
             var Type = params[params[0]];
             var OperationType = params[params[1]];  //1涓虹洿鎺ュ垪琛ㄦā鍧楁墦寮�  2涓轰粠鍏朵粬妯″潡鎵撳紑鍩虹璧勬枡鍒楄〃
@@ -158,6 +229,7 @@
 
             //#region 鍒濆鍖栫晫闈�
             function set_ClearBill() {
+                set_StockOrg();
                 //鍒濆鍖栬〃鏍�
                 set_InitGrid();
                 //鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
@@ -189,90 +261,6 @@
                 };
             }
             //#endregion           
-
-            //#region 鏄剧ず鍒楁暟鎹�
-            function DisPlay_HideColumn() {
-                $.ajax({
-                    type: "GET",
-                    url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
-                    async: false,
-                    data: { "HModName": HModName, "user": HMaker },
-                    success: function (data1) {
-                        if (data1.data.length != 0) {
-                            var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
-                            dataCol = data1.data[0].HGridString.split(',');
-
-                            for (var i = 0; i < option.cols[0].length - 2; i++) {
-                                if (dataCol[i]) {
-                                    var dataCols = dataCol[i].split('|');
-                                }
-                                //闅愯棌鍒�
-                                if (dataCols[1] == 1) {
-                                    option.cols[0][i + 1]["hide"] = true;
-                                }
-                                //璁剧疆鍒楀
-                                if (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;
-                                }
-                            }
-
-                            //鍙栨秷鍐荤粨鍒�
-                            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);
-                        }
-
-                        //鍒锋柊鎸夐挳鏄剧ず
-                        var btns = document.getElementsByTagName("button");     //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
-                        Display_HideButton(btns, HModName, HModName, HMaker);
-
-                    },
-                    complete: function (XHR, TS) { XHR = null },//鍥炴敹璧勬簮
-                    error: function () {
-                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
-                    }
-                })
-            }
-            //#endregion
 
             //#region 鐐瑰嚮琛岄�変腑楂樹寒
             table.on('row(mainTable)', function (obj) {
@@ -333,16 +321,33 @@
                     //鍒犻櫎鎸夐挳
                     case 'btn_Delete': btn_Delete();
                         break;
+                    case 'btn_Copy':
+                        set_copy();
                     //鍒锋柊鎸夐挳
                     case 'btn_Refresh': btn_Refresh();
-                        break;                  
+                        break;
+                    //瀹℃牳鎸夐挳
+                    case 'btn-Audit':
+                        set_CheckBill(0);
+                        break;
+                    //鍙嶅鏍告寜閽�
+                    case 'btn-DeAudit':
+                        set_CheckBill(1);
+                        break;
+                    //绂佺敤鎸夐挳
+                    case 'btn-Stop':
+                        set_De_Stop(0);
+                        break;
+                    //鍙嶇鐢ㄦ寜閽�
+                    case 'btn-DeStop':
+                        set_De_Stop(1);
+                        break;
                     //鍒楄缃�
-                    case 'btn_HideColumn': get_HideColumn();
+                    case 'btn_HideColumn': get_HideColumnNoPage(HModName, sessionStorage["HUserName"], option, get_FastQuery);
                         break;
                     //鎸夐挳璁剧疆
-                    case 'btn_HideButton':
-                        var btns = document.getElementsByTagName("button");     //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
-                        get_HideButton(btns, HModName, HModName, HMaker);
+                    case 'set_HideButton':
+                        get_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
                         break;
                     //閫�鍑烘寜閽�
                     case 'btn_Exit': Pub_Close(2);
@@ -453,42 +458,57 @@
             }
             //#endregion
 
-            //#region 鍒楄缃�
-            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);//鍏抽棴寮圭獥
-                    }
+            //#region   鑾峰彇缁勭粐
+            function set_StockOrg() {
+                //鑾峰彇鐧诲綍椤电粍缁囧垪
+                $.ajax({
+                    type: "GET",
+                    url: GetWEBURL() + "/Web/GetOrganizations",
+                    async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                    success: function (result) {
+                        var Organization = "";
+                        Organization += '<option  style="color:blue;" value="">鍏ㄩ儴</option>';
+                        if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            var data = result.data;
+                            for (var i = 0; i < data.length; i++) {
+                                Organization += '<option  style="color:blue;" value="' + data[i].Name + '">' + data[i].Name + '</option>';
+                            }
+                            $("#HUSEORGID").append(Organization);
+                            $("#HUSEORGID").val(sessionStorage["Organization"])
+                            form.render('select');
+                        }
+                        layer.closeAll("loading");
+                    },
+                    complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
                 })
             }
             //#endregion
 
+            //澶嶅埗
+            function set_copy() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var HInterID = data[0].HInterID.toString();
+                    layer.open({
+                        type: 2
+                        , area: ['100%', '100%']
+                        , title: '缂栬緫鐝'
+                        , shade: 0.6 //閬僵閫忔槑搴�
+                        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                        , content: '../鐢熶骇鍩虹璧勬枡/Gy_WorkShiftEdit.html?OperationType=2&hID=' + HInterID
+                        , resize: false
+                        , cancel: function () {
+                          
+                        }
+                    })
+
+                } else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+                }
+            }
+          
             //#region 閲嶇疆鎸夐挳
             form.on('submit(btn_ReSearch)', function (data) {
                 //娓呯┖杩囨护鏉′欢
@@ -502,6 +522,15 @@
                 $("#ColName").val("0");
                 $("#Comparator").val("0");
                 $("#ColContent").val("");
+                $("#ColContent2").val("");
+                $("#ColName2").val("0");
+                $("#Comparator2").val("0");
+                $("#ColContent1").val("");
+                $("#ColName1").val("0");
+                $("#Comparator1").val("0");
+                $("#HUSEORGID").val(sessionStorage["Organization"])
+                form.render('select');
+                sWhere = "";
             }
 
             //#endregion
@@ -515,10 +544,17 @@
             function get_FastQuery() {
                 var HNumber = $("#HNumber").val();              //鐝浠g爜
                 var HName = $("#HName").val();                  //鐝鍚嶇О
-                var HStockOrgName = $("#HStockOrgID").val();    //缁勭粐
+                var HUSEORGID = $("#HUSEORGID").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 = "";
@@ -541,15 +577,133 @@
                     }
                     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 鐝浠g爜 like '%" + HNumber + "%'";
                 }
                 if (HName) {
                     sWhere += " and 鐝鍚嶇О like '%" + HName + "%'";
                 }
+                if (HUSEORGID) {
+                    sWhere += " and 浣跨敤缁勭粐鍚嶇О = '" + HUSEORGID + "'";
+                }
                 get_Display(sWhere);
+                sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
             }
 
+            //#endregion
+
+            //#region 鍙嶅鏍�/瀹℃牳鏁版嵁
+            function set_CheckBill(num) {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var InterID = data[0].HInterID.toString();
+                    //閫昏緫瀹℃牳鏂规硶
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "/Gy_ShiftsController/AuditGy_Shifts", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        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);
+                                    //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                    $("#btn_Search").trigger('click');
+                                });
+
+                            } else {
+                                layer.alert(result.code + result.Message, { icon: 5 });
+                            }
+                        }, error: function () {
+                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                        }
+                    });
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+                }
+            }
+            //#endregion
+
+            //#region 鍙嶇鐢�/绂佺敤鏁版嵁
+            function set_De_Stop(num) {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var InterID = data[0].HInterID.toString();
+                    //閫昏緫瀹℃牳鏂规硶
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "/Gy_ShiftsController/StopGy_Shifts", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        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);
+                                    //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                    $("#btn_Search").trigger('click');
+                                });
+
+                            } else {
+                                layer.alert(result.code + result.Message, { icon: 5 });
+                            }
+                        }, error: function () {
+                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                        }
+                    });
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+                }
+            }
             //#endregion
 
             //#region 鍒楄〃鍒锋柊
@@ -608,17 +762,16 @@
                             option.data = data1.data;
                             option.totalRow = true;
                             table.render(option);
-                            ins = table.render(option);
                             //鍒锋柊琛ㄦ牸鏁版嵁
-                            DisPlay_HideColumn();
+                            DisPlay_HideColumn(HModName, sessionStorage["HUserName"], option, titleData);
+                            ins = table.render(option);
 
-                            //鍒锋柊鎸夐挳鏄剧ず
-                            var btns = document.getElementsByTagName("button");     //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
-                            Display_HideButton(btns, HModName, HModName, HMaker);
+                            //鎸夐挳鏁版嵁鏄剧ず
+                            Display_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
 
                             layer.close(ajaxLoad);
                             //鑷畾涔夎繃婊や笅鎷夋鍔犺浇
-                            if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+                            if ($("#ColName option").length < 1) {
                                 ColFilter();
                             }
                         } else {
@@ -632,7 +785,6 @@
                         layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
                     }
                 });
-                //DisPlay_HideColumn();
             }
             //#endregion
 
@@ -646,6 +798,10 @@
                 }
                 $("#ColName").empty();
                 $("#ColName").append(Organization);
+                $("#ColName1").empty();
+                $("#ColName1").append(Organization);
+                $("#ColName2").empty();
+                $("#ColName2").append(Organization);
                 form.render('select');
             }
             //#endregion
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_MouldFile.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_MouldFile.html"
index 72cbc9f..ee3cea8 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_MouldFile.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_MouldFile.html"
@@ -40,10 +40,10 @@
                         <button type="button" class="layui-btn layui-btn-normal" lay-submit="" style="margin-left: 0px" lay-filter="Exit">閫�鍑�</button>
                     </div>
                     <div class="layui-tab" lay-filter="tab-POStockInBill">
-                        <!--<ul class="layui-tab-title" lay-filter="tab-all">
+                        <ul class="layui-tab-title" lay-filter="tab-all">
                             <li lay-id="1" style="padding:1px;" class="layui-this">鍩烘湰淇℃伅</li>
                             <li lay-id="2" style="padding:1px;">鍏朵粬淇℃伅</li>
-                        </ul>-->
+                        </ul>
                         <div class="layui-tab-content">
                             <!--鍩烘湰淇℃伅-->
                             <div class="layui-tab-item layui-show">
@@ -251,38 +251,38 @@
                                             </div>
                                         </div>
                                         <!--<div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">榛樿宸ヨ壓璺嚎</label>
-                                            <div class="layui-input-block" style="margin-left: 77px;">
-                                                <input type="text" class="layui-input" name="HRoutingName" id="HRoutingName" style="background-color:#efefef4d;width: 60%;display: inline-block;">
-                                                <input type="hidden" class="layui-input" name="HRoutingID" id="HRoutingID" style="background-color:#efefef4d;width: 60%;display: inline-block;">
-                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHRoutingList" id="btnHRoutingList" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
-                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
-                                                </button>
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">榛樿BOM</label>
-                                            <div class="layui-input-block" style="margin-left: 77px;">
-                                                <input type="text" class="layui-input" name="HBOMName" id="HBOMName" style="background-color:#efefef4d;width: 60%;display: inline-block;">
-                                                <input type="hidden" class="layui-input" name="HBOMID" id="HBOMID" style="background-color:#efefef4d;width: 60%;display: inline-block;">
-                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHBOMList" id="btnHBOMList" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
-                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
-                                                </button>
-                                            </div>
-                                        </div>-->
+            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">榛樿宸ヨ壓璺嚎</label>
+            <div class="layui-input-block" style="margin-left: 77px;">
+                <input type="text" class="layui-input" name="HRoutingName" id="HRoutingName" style="background-color:#efefef4d;width: 60%;display: inline-block;">
+                <input type="hidden" class="layui-input" name="HRoutingID" id="HRoutingID" style="background-color:#efefef4d;width: 60%;display: inline-block;">
+                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHRoutingList" id="btnHRoutingList" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
+                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
+                </button>
+            </div>
+        </div>
+        <div class="layui-inline">
+            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">榛樿BOM</label>
+            <div class="layui-input-block" style="margin-left: 77px;">
+                <input type="text" class="layui-input" name="HBOMName" id="HBOMName" style="background-color:#efefef4d;width: 60%;display: inline-block;">
+                <input type="hidden" class="layui-input" name="HBOMID" id="HBOMID" style="background-color:#efefef4d;width: 60%;display: inline-block;">
+                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHBOMList" id="btnHBOMList" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
+                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
+                </button>
+            </div>
+        </div>-->
                                     </div>
                                     <div class="layui-row">
 
                                         <!--<div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">榛樿浠撲綅缁�</label>
-                                            <div class="layui-input-block" style="margin-left: 77px;">
-                                                <input type="text" class="layui-input" name="HSPGroupName" id="HSPGroupName" style="background-color:#efefef4d;width: 60%;display: inline-block;">
-                                                <input type="hidden" class="layui-input" name="HSPGroupID" id="HSPGroupID" style="background-color:#efefef4d;width: 60%;display: inline-block;">
-                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHSPGroupList" id="btnHSPGroupList" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
-                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
-                                                </button>
-                                            </div>
-                                        </div>-->
+            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">榛樿浠撲綅缁�</label>
+            <div class="layui-input-block" style="margin-left: 77px;">
+                <input type="text" class="layui-input" name="HSPGroupName" id="HSPGroupName" style="background-color:#efefef4d;width: 60%;display: inline-block;">
+                <input type="hidden" class="layui-input" name="HSPGroupID" id="HSPGroupID" style="background-color:#efefef4d;width: 60%;display: inline-block;">
+                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHSPGroupList" id="btnHSPGroupList" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
+                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
+                </button>
+            </div>
+        </div>-->
 
                                     </div>
                                     <div class="layui-row">
@@ -353,15 +353,15 @@
                                             </div>
                                         </div>
                                         <!--<div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">铏氭嫙浠�<label style="color:red"> * </label></label>
-                                            <div class="layui-input-block" style="margin-left: 77px;">
-                                                <input type="text" class="layui-input" name="HNowSupName" id="HNowSupName" style="width: 60%;display: inline-block;" readonly>
-                                                <input type="hidden" class="layui-input" name="HNowSupID" id="HNowSupID" style="background-color:#efefef4d;width: 60%;display: inline-block;">
-                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="HNowSupList" id="HNowSupList" style="padding: 0 10px;float: right;margin-right: 3px;">
-                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
-                                                </button>
-                                            </div>
-                                        </div>-->
+            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">铏氭嫙浠�<label style="color:red"> * </label></label>
+            <div class="layui-input-block" style="margin-left: 77px;">
+                <input type="text" class="layui-input" name="HNowSupName" id="HNowSupName" style="width: 60%;display: inline-block;" readonly>
+                <input type="hidden" class="layui-input" name="HNowSupID" id="HNowSupID" style="background-color:#efefef4d;width: 60%;display: inline-block;">
+                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="HNowSupList" id="HNowSupList" style="padding: 0 10px;float: right;margin-right: 3px;">
+                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                </button>
+            </div>
+        </div>-->
                                     </div>
                                     <div class="layui-row">
                                         <div class="layui-inline">
@@ -424,77 +424,85 @@
                                             </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; width: 185px;">
+                                                <input type="hidden" class="layui-input" lay-verify="HCREATEORGID" name="HCREATEORGID" id="HCREATEORGID">
+                                                <select name="HUSEORGID" id="HUSEORGID" lay-verify="HUSEORGID">
+                                                    <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+                                                </select>
+                                            </div>
+                                        </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="HMaker" id="HMaker" 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="HChecker" id="HChecker" style="background-color:#efefef4d;" readonly>
-                                            </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="HMaker" id="HMaker" style="background-color:#efefef4d;" readonly>
                                         </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="HMakeDate" id="HMakeDate" 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="HCheckDate" id="HCheckDate" style="background-color:#efefef4d;" readonly>
-                                            </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="HChecker" id="HChecker" style="background-color:#efefef4d;" readonly>
                                         </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="HCloseMan" id="HCloseMan" 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="HUpDater" id="HUpDater" 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="HDeleteMan" id="HDeleteMan" style="background-color:#efefef4d;" readonly>
-                                            </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="HCloseMan" id="HCloseMan" style="background-color:#efefef4d;" readonly>
                                         </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="HCloseDate" id="HCloseDate" style="background-color:#efefef4d;" readonly>
-                                            </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="HUpDater" id="HUpDater" style="background-color:#efefef4d;" readonly>
                                         </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="HUpDateDate" id="HUpDateDate" style="background-color:#efefef4d;" readonly>
-                                            </div>
+                                    </div>
+
+                                </div>
+                                <div class="layui-form-item">
+                                    <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="HMakeDate" id="HMakeDate" style="background-color:#efefef4d;" readonly>
                                         </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="HDeleteDate" id="HDeleteDate" 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="HCheckDate" id="HCheckDate" 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="HCloseDate" id="HCloseDate" 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="HUpDateDate" id="HUpDateDate" style="background-color:#efefef4d;" readonly>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="layui-form-item">
+                                    <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="HDeleteMan" id="HDeleteMan" 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="HDeleteDate" id="HDeleteDate" style="background-color:#efefef4d;" readonly>
                                         </div>
                                     </div>
                                 </div>
@@ -621,7 +629,7 @@
             //#endregion
 
             //#region 杩涘叆椤甸潰鍗冲姞杞�
-
+            Organ();
             //鍒濆鍖栬〃鍗曟彃浠�
             set_InitFrom();
 
@@ -631,6 +639,21 @@
                 //鍒濆鍖栧瓙琛�
                 get_InitGrid();
                 set_AddFNew();
+            } else if (OperationType == 2) {//鏃犳簮鍗�
+                Stverf = "Add";
+                get_InitGrid();
+                set_EditFromGrid();
+                set_AddFNew();
+                $("#HMaker").val(sessionStorage["HUserName"]);
+                $("#HMakeDate").val("");
+                $("#HChecker").val("");
+                $("#HCheckDate").val("");
+                $("#HUpDater").val("");
+                $("#HUpDateDate").val("");
+                $("#HCloseMan").val("");
+                $("#HCloseDate").val("");
+                $("#HDeleteMan").val("");
+                $("#HDeleteDate").val("");
             }
             else if (OperationType == 3) {//缂栬緫
                 Stverf = "Update";
@@ -1759,6 +1782,18 @@
                         $("#HMouldStatus").val(d.data[0].妯″叿鐘舵��);
                         $("#HMouldUseStatus").val(d.data[0].妯″叿鍙敤鐘舵��);
 
+                        $("#HUSEORGID").val(d.data[0].HUSEORGID);
+                        $("#HMaker").val(d.data[0].鍒跺崟浜�);
+                        $("#HMakeDate").val(d.data[0].鍒跺崟鏃ユ湡 == null ? "" : Format(new Date(d.data[0].鍒跺崟鏃ユ湡), "yyyy-MM-dd"));
+                        $("#HChecker").val(d.data[0].瀹℃牳浜�);
+                        $("#HCheckDate").val(d.data[0].瀹℃牳鏃ユ湡 == null ? "" : Format(new Date(d.data[0].瀹℃牳鏃ユ湡), "yyyy-MM-dd"));
+                        $("#HUpDater").val(d.data[0].淇敼浜�);
+                        $("#HUpDateDate").val(d.data[0].淇敼鏃ユ湡 == null ? "" : Format(new Date(d.data[0].淇敼鏃ユ湡), "yyyy-MM-dd"));
+                        $("#HCloseMan").val(d.data[0].鍏抽棴浜�);
+                        $("#HCloseDate").val(d.data[0].鍏抽棴鏃ユ湡 == null ? "" : Format(new Date(d.data[0].鍏抽棴鏃ユ湡), "yyyy-MM-dd"));
+                        $("#HDeleteMan").val(d.data[0].浣滃簾浜�);
+                        $("#HDeleteDate").val(d.data[0].浣滃簾鏃ユ湡 == null ? "" : Format(new Date(d.data[0].浣滃簾鏃ユ湡), "yyyy-MM-dd"));
+
                         var HCycleUnit = d.data[0].鍛ㄦ湡鍗曚綅;
                         var HCheckCycle = d.data[0].淇濆吇鍛ㄦ湡;
 
@@ -1835,6 +1870,31 @@
                 });
             }
 
+            //鑾峰彇缁勭粐
+            function Organ() {
+                //鑾峰彇鐧诲綍椤电粍缁囧垪
+                var Organization = '';
+                $.ajax({
+                    type: "get",
+                    url: GetWEBURL() + "/Web/GetOrganizations",
+                    async: false,
+                    success: function (result) {
+                        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"])
+                            $("#HCREATEORGID").val(sessionStorage["OrganizationID"])
+                            form.render('select');
+                        }
+                        layer.closeAll("loading");
+                    }
+                })
+            }
+
+
             // 缂栬緫鑾峰彇琛ㄥご鏃舵椂闂存牸寮忕煫姝f柟寮�
             function formatDate(date) {
                 var d = new Date(date),
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_MouldFileList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_MouldFileList.html"
index ce8940d..4f7ad86 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_MouldFileList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_MouldFileList.html"
@@ -58,6 +58,90 @@
                                 <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: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>
+                                    <div class="layui-row" style="margin-top:5px">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">杩囨护</label>
+                                            <div class="layui-input-block">
+                                                <select name="ColName1" id="ColName1" lay-filter="ColName1" style="width:190px;" class="ForFilteringSchemes">
+                                                </select>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <select name="Comparator1" id="Comparator1" lay-filter="Comparator1" 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="ColContent1" id="ColContent1">
+                                        </div>
+                                    </div>
+                                    <div class="layui-row" style="margin-top:5px">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">杩囨护</label>
+                                            <div class="layui-input-block">
+                                                <select name="ColName2" id="ColName2" lay-filter="ColName2" style="width:190px;" class="ForFilteringSchemes">
+                                                </select>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <select name="Comparator2" id="Comparator2" lay-filter="Comparator2" 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="ColContent2" id="ColContent2">
+                                        </div>
+                                    </div>
+                                </div>
                             </div>
                         </div>
                         <div class="layui-row" style="padding:10px 0">
@@ -73,21 +157,27 @@
                         </div>
                         <script type="text/html" id="toolbarDemo">
                             <div class="layui-btn-container" id="toolbarDemo_ButtonSet">
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btnAdd" id="btnAdd"><i class="layui-icon layui-icon-add-1"></i>鏂板</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btnModify" id="btnModify"><i class="layui-icon layui-icon-edit"></i>缂栬緫</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-view" id="view"><i class="layui-icon layui-icon-tips"></i>棰勮</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-print" id="print"><i class="layui-icon layui-icon-print"></i>鎵撳嵃</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="set_SouceExcel" id="set_SouceExcel"><i class="layui-icon layui-icon-delete"></i>瀵煎叆</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Export" id="btn_Export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btnAdd" id="btnAdd"><i class="layui-icon layui-icon-add-1"></i>鏂板</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Copy" id="btn_Copy"><i class="layui-icon layui-icon-add-1"></i>澶嶅埗</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btnModify" id="btnModify"><i class="layui-icon layui-icon-edit"></i>缂栬緫</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btndelete" id="btndelete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit" id="Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit" id="DeAudit"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh" id="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit" id="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Initialize" id="get_Initialize"><i class="layui-icon layui-icon-share"></i>鍒濆鍖�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Delete" id="btn_Delete"><i class="layui-icon layui-icon-radio"></i>浣滃簾</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_UnDelete" id="btn_UnDelete"><i class="layui-icon layui-icon-radio"></i>鍙嶄綔搴�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_CloseBill" id="set_CloseBill"><i class="layui-icon layui-icon-form"></i>鍏抽棴</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_CancelCloseBill" id="set_CancelCloseBill"><i class="layui-icon layui-icon-form"></i>鍙嶅叧闂�</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn" id="HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideButton" id="HideButton"><i class="layui-icon layui-icon-form"></i>鎸夐挳璁剧疆</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="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="get_Refresh" id="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit" id="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-print" id="print"><i class="layui-icon layui-icon-print"></i>鎵撳嵃</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-view" id="view"><i class="layui-icon layui-icon-tips"></i>棰勮</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Initialize" id="get_Initialize"><i class="layui-icon layui-icon-share"></i>鍒濆鍖�</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="get_BatchGen" id="get_BatchGen"><i class="layui-icon layui-icon-add-1"></i>鎵归噺鐢熸垚</button>
                             </div>
                         </script>
@@ -120,7 +210,7 @@
             var HModName = "Gy_MouldFileList"
             var HBillType = "3899";
             var set_HideButton_ID = "toolbarDemo_ButtonSet";//闇�瑕佽缃殑鎸夐挳鐨勭埗绾ц妭鐐圭殑id
-
+            var ins;                //鐢ㄤ簬瀵煎嚭excel
             //#endregion
 
 
@@ -147,6 +237,10 @@
                     //鏂板鎸夐挳
                     case 'btnAdd': set_AddNew();
                         break;
+                    //澶嶅埗
+                    case 'btn_Copy':
+                        set_copy();
+                        break;
                     //棰勮
                     case 'btn-view': get_ViewReport();
                         break;
@@ -155,6 +249,9 @@
                         break;
                     //瀵煎叆
                     case 'set_SouceExcel': set_SouceExcel();
+                        break;
+                    //瀵煎嚭鎸夐挳
+                    case 'btn_Export': btn_Export();
                         break;
                     //缂栬緫鎸夐挳
                     case 'btnModify': set_ShowBill();
@@ -167,6 +264,18 @@
                         break;
                     //鍙嶅鏍告寜閽�
                     case 'btn-DeAudit': set_AbandonCheck();
+                        break;
+                    //鍏抽棴
+                    case 'set_CloseBill': set_CloseBill(1);
+                        break;
+                    //鍙嶅叧闂�
+                    case 'set_CancelCloseBill': set_CloseBill(2);
+                        break;
+                    //浣滃簾
+                    case 'btn_Delete': btn_Delete(1);
+                        break;
+                    //鍙嶄綔搴�
+                    case 'btn_UnDelete': btn_Delete(2);
                         break;
                     //鍒锋柊
                     case 'get_Refresh': get_Refresh();
@@ -254,6 +363,12 @@
                 get_DefaultModule();
             }
 
+            //#region 瀵煎嚭Execel
+            function btn_Export() {
+                table.exportFile(ins.config.id, option.data, "xls");
+            }
+            //#endregion
+
             //鍒濆鍖栬〃鏍�
             function set_InitGrid()
             {
@@ -326,6 +441,8 @@
                         , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡', templet: "<div>{{d.淇敼鏃ユ湡 ==null ?'':layui.util.toDateString(d.淇敼鏃ユ湡, 'yyyy-MM-dd')}}</div>", sort: true }
                         , { field: '鍏抽棴浜�', title: '鍏抽棴浜�', sort: true }
                         , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡', templet: "<div>{{d.鍏抽棴鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍏抽棴鏃ユ湡, 'yyyy-MM-dd')}}</div>", sort: true }
+                        , { field: '浣滃簾浜�', title: '浣滃簾浜�', sort: true }
+                        , { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡', templet: "<div>{{d.浣滃簾鏃ユ湡 ==null ?'':layui.util.toDateString(d.浣滃簾鏃ユ湡, 'yyyy-MM-dd')}}</div>", sort: true }
                         , { field: 'hbilltype', title: 'hbilltype', hide: true, sort: true }
                         , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', hide: true, sort: true }
                         , { field: 'HMoudType', title: 'HMoudType', hide: true, sort: true }
@@ -401,6 +518,10 @@
                             DisPlay_HideColumn(HModName, sessionStorage["HUserName"], option);
                             ////鍒锋柊琛ㄦ牸鏁版嵁
                             ins = table.render(option);
+
+                            if ($("#ColName option").length < 1) {
+                                ColFilter();
+                            }
                             //鍒锋柊鎸夐挳鏄剧ず
                             Display_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
                         } else {
@@ -424,6 +545,81 @@
             function get_FastQuery() {
                 var HNumber = $("#HNumber").val();
                 var HName = $("#HName").val();
+                var HUSEORGID = $("#HUSEORGID").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 + "%'";
                 }
@@ -441,8 +637,44 @@
             function set_ClearQuery() {
                 $("#HNumber").val("")
                 $("#HName").val("");
+                $("#ColName").val("0");
+                $("#Comparator").val("0");
+                $("#ColContent").val("");
+                $("#ColContent2").val("");
+                $("#ColName2").val("0");
+                $("#Comparator2").val("0");
+                $("#ColContent1").val("");
+                $("#ColName1").val("0");
+                $("#Comparator1").val("0");
+                $("#HUSEORGID").val(sessionStorage["Organization"])
+                form.render('select');
                 sWhere = "";
                 get_FastQuery();
+            }
+
+            //澶嶅埗
+            function set_copy() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var HInterID = data[0].hmainid.toString();
+                    layer.open({
+                        type: 2
+                        , area: ['100%', '100%']
+                        , title: '缂栬緫鍣ㄥ叿妗f鍒楄〃'
+                        , shade: 0.6 //閬僵閫忔槑搴�
+                        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                        , content: 'Gy_MouldFile.html?OperationType=2&linterid=' + HInterID
+                        , resize: false
+                        , cancel: function () {
+
+                        }
+                    })
+
+                } else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+                }
             }
 
             //鏂板
@@ -626,6 +858,74 @@
 
             }
 
+            //浣滃簾/鍙嶄綔搴�
+            function btn_Delete(num) {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+
+                if (data.length == 1) {
+                    layer.confirm("纭瑕佷綔搴熷悧?", function (index) {
+                        var wait = layer.load();
+                        var HInterID = data[0].hmainid;
+                        $.ajax({
+                            url: GetWEBURL() + '/Gy_Mould/DeleteGy_Mould',
+                            type: "GET",
+                            data: { "HInterID": HInterID, "Type": num, "user": sessionStorage["HUserName"] },
+                            success: function (result) {
+                                if (result.count == 1) {
+                                    layer.msg(result.Message, { icon: 1 });
+                                    layer.close(wait);
+                                    get_FastQuery();
+                                } else {
+                                    layer.alert(result.code + result.Message, { icon: 5 });
+                                    layer.close(wait);
+                                }
+                            }, error: function () {
+                                layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                                layer.close(wait);
+                            }
+                        });
+                    })
+                }
+                else {
+                    layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�!");
+                }
+            }
+
+            //鍏抽棴/鍙嶅叧闂�
+            function set_CloseBill(num) {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+
+                if (data.length == 1) {
+                    layer.confirm("纭瑕佸叧闂悧?", function (index) {
+                        var wait = layer.load();
+                        var HInterID = data[0].hmainid;
+                        $.ajax({
+                            url: GetWEBURL() + '/Gy_Mould/CloseGy_Mould',
+                            type: "GET",
+                            data: { "HInterID": HInterID, "Type": num, "user": sessionStorage["HUserName"] },
+                            success: function (result) {
+                                if (result.count == 1) {
+                                    layer.msg(result.Message, { icon: 1 });
+                                    layer.close(wait);
+                                    get_FastQuery();
+                                } else {
+                                    layer.alert(result.code + result.Message, { icon: 5 });
+                                    layer.close(wait);
+                                }
+                            }, error: function () {
+                                layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                                layer.close(wait);
+                            }
+                        });
+                    })
+                }
+                else {
+                    layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�!");
+                }
+            }
+
             //棰勮
             function get_ViewReport() {
                 var checkStatus = table.checkStatus('mainTable')
@@ -715,6 +1015,7 @@
                 tree.render({
                     elem: '#TreeTable' //榛樿鏄偣鍑昏妭鐐瑰彲杩涜鏀剁缉
                     , data: treeTable
+                    , onlyIconControl: true
                     , click: function (obj) {
                         //楂樹寒鍙樿壊
                         $(".layui-tree-set").removeClass('layui-tree-set-active');
@@ -987,6 +1288,25 @@
 
             }
 
+
+            //#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
+
             //璇诲彇鏂规
             function set_ReadScheme() {
                 var HIsClose_Manual = false;
diff --git "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277\345\244\247\347\261\273/Gy_RoutingGroupEdit.html" "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277\345\244\247\347\261\273/Gy_RoutingGroupEdit.html"
new file mode 100644
index 0000000..2aea6be
--- /dev/null
+++ "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277\345\244\247\347\261\273/Gy_RoutingGroupEdit.html"
@@ -0,0 +1,391 @@
+锘�<!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>
+</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="form" class="layui-form" lay-filter="component-form-group" action="">
+                        <div class="layui-card-header">
+                            <div class="layui-btn-group">
+                                <button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</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">
+                                <h1 style="text-align:center;"><b>宸ヨ壓璺嚎澶х被</b></h1>
+                                <ul class="layui-tab-title" lay-filter="tab-all">
+                                    <li lay-id="1" style="padding:1px;" class="layui-this">鍩烘湰淇℃伅</li>
+                                    <li>鍏朵粬淇℃伅</li>
+                                </ul>
+                                <div class="layui-tab-content">
+                                    <!--鍩烘湰淇℃伅-->
+                                    <div class="layui-tab-item layui-show">
+                                        <div class="layui-form-item">
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label" style="width: 120px">浠g爜<label style="color:red"> * </label></label>
+                                                <div class="layui-input-inline">
+                                                    <input class="layui-input" name="HNumber" lay-verify="HNumber" id="HNumber" autocomplete="off">
+                                                    <input name="HItemID" id="HItemID" autocomplete="off" type="hidden">
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label" style="width: 120px">鍚嶇О<label style="color:red"> * </label></label>
+                                                <div class="layui-input-inline">
+                                                    <input class="layui-input" name="HName" id="HName" autocomplete="off">
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label" style="width: 120px">鍔╄鐮侊細</label>
+                                                <div class="layui-input-inline">
+                                                    <input class="layui-input" name="HHelpCode" id="HHelpCode" autocomplete="off">
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="layui-form-item">
+                                            <label class="layui-form-label" style="width: 120px">浣跨敤缁勭粐锛�</label>
+                                            <div class="layui-input-inline">
+                                                <select name="HUSEORGID" id="HUSEORGID" lay-verify="HUSEORGID">
+                                                </select>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label" style="width: 120px">浣跨敤鐘舵�侊細</label>
+                                                <div class="layui-input-inline">
+                                                    <select name="HUseFlag" id="HUseFlag" lay-verify="HUseFlag">
+                                                        <option value="鏈娴�" selected>鏈娴�</option>
+                                                        <option value="鏈娇鐢�">鏈娇鐢�</option>
+                                                        <option value="宸蹭娇鐢�">宸蹭娇鐢�</option>
+                                                    </select>
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="layui-form-item">
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label" style="width: 120px"> 绂佺敤鏍囧織:</label>
+                                                <div class="layui-input-inline">
+                                                    <input type="checkbox" name="HStopflag" id="HStopflag" lay-skin="primary" title="" value="">
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="layui-form-item">
+                                            <div class="layui-col-xs11">
+                                                <label class="layui-form-label"> 澶囨敞锛�</label>
+                                                <div class="layui-input-block">
+                                                    <input class="layui-input" name="HRemark" id="HRemark" autocomplete="off">
+                                                </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="HModifyEmp" id="HModifyEmp" 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>
+                                            <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" value="" 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 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>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </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/PubCustom.js"></script>
+    <script>
+        //鑾峰彇鍙傛暟
+        var params = get_UrlVars();
+        if (typeof (params[params[0]]) == "undefined") {
+            var OperationType = 1;//鎿嶄綔绫诲瀷
+        } else {
+            var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
+            var linterid = params[params[1]];//婧愬崟id
+            var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
+        }
+
+        layui.config({
+            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index' //涓诲叆鍙fā鍧�
+        }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+            //#region 鍏叡鍙橀噺
+            var $ = layui.$
+                , admin = layui.admin
+                , layer = layui.layer
+                , table = layui.table
+                , form = layui.form
+                , laydate = layui.laydate
+                , element = layui.element;
+            //#endregion
+            //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+            //鍒濆鍖栫晫闈�
+            set_ClearBill();
+            //鍒ゆ柇鎿嶄綔绫诲瀷
+            if (OperationType == 1) {//鏃犳簮鍗�
+                set_AddFNew();
+                $("#HMakeEmp").val(sessionStorage["HUserName"]);
+            }
+            else if (OperationType == 2) {
+                set_EditFromGrid();
+                $("#HMakeEmp").val(sessionStorage["HUserName"]);
+                $("#HModifyEmp").val("");
+                $("#HStopEmp").val("");
+                $("#HCheckEmp").val("");
+                $("#HMakeTime").val("");
+                $("#HModifyTime").val("");
+                $("#HStopTime").val("");
+                $("#HCheckTime").val("");
+                $("#HNumber").val("");
+                $("#HItemID").val(0);
+            }
+            else if (OperationType == 3) {//缂栬緫
+                set_EditFromGrid();
+            }
+            else {
+                layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
+            }
+            //#endregion
+
+            //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+            //淇濆瓨
+            form.on('submit(Saver)', function (data) {//淇濆瓨
+                if (AllowLoadData()) {
+                    var isEndCheck = document.getElementById("HStopflag").checked;
+                    isEndCheck == true ? data.field.HStopflag = 'true' : data.field.HStopflag = 'false';//灏嗘暟缁勫悎骞舵垚瀛楃涓�
+
+                    var sMainStr = JSON.stringify(data.field) + ";" + sessionStorage["HUserName"];
+                    $.ajax(
+                        {
+                            type: "POST",
+                            url: GetWEBURL() + "SaveGy_RoutingGroup", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                            async: true,
+                            data: { "msg": sMainStr },
+                            dataType: "json",
+                            success: function (data) {
+                                if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                    layer.msg(data.Message, { icon: 1 });
+                                    $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
+                                }
+                                else {
+                                    f_alert(data.Message);
+                                    console.log("Reason" + sMainStr + "sub:" + JSON.stringify(layui.table.cache.mainTable));
+                                }
+                                layer.closeAll("loading");
+                            },
+                            error: function (err) {
+
+                                f_alert("閿欒:" + err);
+                                console.log("Reason" + sMainStr);
+                            }
+                        });
+                }
+            });
+            //閫�鍑�
+            form.on('submit(Exit)', function (data) {//
+                if (linterid == undefined) {
+                    //鍏抽棴椤电
+                    Pub_Close(2);
+                }
+                else {
+                    //鍏抽棴椤电
+                    Pub_Close(1);
+                }
+            });
+
+            //鐩戝惉鎻愪氦
+            form.verify({
+                numberOrEmpty: function (value, item) {
+                    // if (value != '') {
+                    if (!/^\d+$/.test(value)) {
+                        return '涓嶈兘涓虹┖鎴栨暟瀛楁垨鑰�0';
+                    }
+                    //}
+                }
+            });
+            //#endregion
+
+
+            //#region 褰撳墠椤甸潰闈㈡墍鏈夌殑鏂规硶
+
+            //鍒濆鍖栫晫闈�
+            function set_ClearBill() {
+                Organ();
+                $("#HStopflag").attr("disabled", true);
+                $("#HUseFlag").attr("disabled", true);
+                layui.form.render('checkbox');
+                layui.form.render('select');
+            }
+            //鏃犳簮鍗曟柊澧�
+            function set_AddFNew() {
+                $("#HItemID").val("0");
+                $("#HNumber").val("");
+            }
+            //缂栬緫
+            function set_EditFromGrid() {
+                $("#HItemID").val(linterid);
+                set_EditForm(linterid);  //缂栬緫鑾峰彇琛ㄥご
+            }
+            //缂栬緫鍔犺浇琛ㄥご
+            function set_EditForm(linterid) {
+                //鏌ヨ妫�楠屾柟妗堝崟鏄惁瀛樺湪
+                $.ajax({
+                    url: GetWEBURL() + "Gy_RoutingGroup/EditGy_RoutingGroup",
+                    type: "GET",
+                    async: false,
+                    data: {
+                        "HInterID": linterid
+                    },
+                    success: function (result) {
+                        if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            var data = result.data[0];
+                            $("#HItemID").val(data.HItemID);//浠g爜ID
+                            $("#HNumber").val(data.宸ヨ壓璺嚎澶х被浠g爜);//浠g爜
+                            $("#HName").val(data.宸ヨ壓璺嚎澶х被鍚嶇О);//鍚嶇О
+                            $("#HHelpCode").val(data.鍔╄鐮�);//鍔╄鐮�
+                            $("#HUSEORGID").val(data.HUSEORGID);//浣跨敤缁勭粐
+                            $("#HUseFlag ").val(data.浣跨敤鐘舵��);//浣跨敤鐘舵��
+                            $("#HRemark").val(data.澶囨敞);//澶囨敞
+
+                            $("#HMakeEmp").val(data.鍒跺崟浜�);
+                            $("#HMakeTime").val(data.鍒涘缓鏃ユ湡 == null ? "" : Format(new Date(data.鍒涘缓鏃ユ湡), "yyyy-MM-dd"));
+                            $("#HCheckEmp").val(data.瀹℃牳浜�);
+                            $("#HCheckTime").val(data.瀹℃牳鏃ユ湡 == null ? "" : Format(new Date(data.瀹℃牳鏃ユ湡), "yyyy-MM-dd"));
+                            $("#HModifyEmp").val(data.淇敼浜�);
+                            $("#HModifyTime").val(data.淇敼鏃ユ湡 == null ? "" : Format(new Date(data.淇敼鏃ユ湡), "yyyy-MM-dd"));
+                            $("#HStopEmp").val(data.绂佺敤浜�);
+                            $("#HStopTime").val(data.绂佺敤鏃ユ湡 == null ? "" : Format(new Date(data.绂佺敤鏃ユ湡), "yyyy-MM-dd"));
+
+                            $("input[name='HStopflag']").attr("checked", data.绂佺敤鏍囧織 == "鏄�" ? true : false);//true:閫変腑 false:涓嶉�変腑
+                            layui.form.render();//瀹炴椂娓叉煋閫変腑鍜屼笉閫変腑鐨勬牱寮�,鏈�濂芥坊鍔犺繖鍙ヨ瘽
+                            form.render("select");
+                        } else {
+                            layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+                        }
+                    }, error: function () {
+                        layer.alert("鍙戠敓閿欒!", { icon: 5 });
+                    }
+                });
+            }
+
+            //鏁版嵁楠岃瘉
+            function AllowLoadData() {
+                var HNumber = $("#HNumber").val() //浠g爜
+                var HName = $("#HName").val() //鍚嶇О
+
+                if (HNumber == null || HNumber == undefined || HNumber == "") {
+                    layer.msg("璇疯緭鍏ヤ唬鐮侊紒", { icon: 5 });
+                    return false;
+                }
+                if (HName == null || HName == undefined || HName == "") {
+                    layer.msg("璇疯緭鍏ュ悕绉帮紒", { icon: 5 });
+                    return false;
+                }
+                return true;
+            }
+
+            //
+            function f_alert(sMsg) {
+                layer.alert(sMsg, { icon: 5 });
+
+            }
+            //鑾峰彇鐧诲綍椤电粍缁囧垪
+            function Organ() {
+                var Organization = '';
+                $.ajax({
+                    type: "get",
+                    url: GetWEBURL() + "/Web/GetOrganizations",
+                    async: false,
+                    success: function (result) {
+                        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");
+                    }
+                })
+            }
+            //#endregion
+        });
+
+    </script>
+</body>
+</html>
+</head>
+<body>
+
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277\345\244\247\347\261\273/Gy_RoutingGroupList.html" "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277\345\244\247\347\261\273/Gy_RoutingGroupList.html"
index 4dac728..8d25fd0 100644
--- "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277\345\244\247\347\261\273/Gy_RoutingGroupList.html"
+++ "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277\345\244\247\347\261\273/Gy_RoutingGroupList.html"
@@ -11,6 +11,9 @@
     <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
     <script src="../../../layuiadmin/PubCustom.js"></script>
     <script src="../../../layuiadmin/soulTable.slim.js"></script>
+    <script src="../../../layuiadmin/HideButton_New.js"></script>
+    <script src="../../../layuiadmin/SetColumn.js"></script>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
 </head>
 <body>
     <div class="layui-fluid">
@@ -20,6 +23,11 @@
                     <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">浠g爜</label>
                                     <div class="layui-input-block">
@@ -32,6 +40,14 @@
                                         <input type="text" class="layui-input ForFilteringSchemes" name="HName" id="HName">
                                     </div>
                                 </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label" style="width: 85px;">缁勭粐</label>
+                                    <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
+                                        <select name="HUSEORGID" id="HUSEORGID" class="ForFilteringSchemes" lay-verify="HUSEORGID">
+                                            <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+                                        </select>
+                                    </div>
+                                </div>
                                 <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
                                     <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                 </button>
@@ -40,24 +56,112 @@
                                 <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:5px">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">杩囨护</label>
+                                            <div class="layui-input-block">
+                                                <select name="ColName" id="ColName" class="ForFilteringSchemes" lay-filter="ColName" style="width:190px;">
+                                                </select>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <select name="Comparator" id="Comparator" class="ForFilteringSchemes" lay-filter="Comparator" style="width:190px;">
+                                                <option value="0" selected="selected"></option>
+                                                <option value="=">=</option>
+                                                <option value=">=">>=</option>
+                                                <option value=">">></option>
+                                                <option value="<="><=</option>
+                                                <option value="<"><</option>
+                                                <option value="<>"><></option>
+                                                <option value="7">鍖呭惈</option>
+                                                <option value="8">宸﹀寘鍚�</option>
+                                                <option value="9">鍙冲寘鍚�</option>
+                                                <option value="10">涓嶅寘鍚�</option>
+                                            </select>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent">
+                                        </div>
+                                    </div>
+                                    <div class="layui-row" style="margin-top:5px">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">杩囨护</label>
+                                            <div class="layui-input-block">
+                                                <select name="ColName1" id="ColName1" 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>
                         <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"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_SouceExcel"><i class="layui-icon layui-icon-delete"></i>瀵煎叆</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-view"><i class="layui-icon layui-icon-tips"></i>棰勮</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-print"><i class="layui-icon layui-icon-print"></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 class="layui-btn-container" id="toolbarDemo_ButtonSet">
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_SouceExcel" id="set_SouceExcel"><i class="layui-icon layui-icon-delete"></i>瀵煎叆</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Export" id="btn_Export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add" id="btn-Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Copy" id="btn_Copy"><i class="layui-icon layui-icon-add-1"></i>澶嶅埗</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit" id="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete" id="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit" id="btn-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit" id="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Stop" id="btn-Stop"> <i class="layui-icon layui-icon-radio"></i>绂佺敤</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeStop" id="btn-DeStop"><i class="layui-icon layui-icon-radio"></i>鍙嶇鐢�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn" id="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideButton" id="set_HideButton"><i class="layui-icon layui-icon-form"></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="get_Refresh" id="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit" id="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-view" id="btn-view"><i class="layui-icon layui-icon-tips"></i>棰勮</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-print" id="btn-print"><i class="layui-icon layui-icon-print"></i>鎵撳嵃</button>
                             </div>
                         </script>
                     </form>
@@ -86,6 +190,11 @@
             var sWhere = "";
             var option = [];
             var HModName = "Gy_RoutingGroupList";
+            var HBillType = "Gy_RoutingGroupList";
+            var ins;                //鐢ㄤ簬瀵煎嚭excel
+            var set_HideButton_ID = "toolbarDemo_ButtonSet";                    //闇�瑕佽缃殑鎸夐挳鐨勭埗绾ц妭鐐圭殑id
+            //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+            var titleData = [];
             //#endregion
 
             //#region 杩涘叆椤甸潰鍗冲姞杞�
@@ -114,34 +223,57 @@
             table.on('toolbar(mainTable)', function (obj) {
                 switch (obj.event) {
                     //鏂板
-                    case 'set_AddNew': set_AddNew();
+                    case 'btn-Add': set_AddNew();
                         break;
                     //缂栬緫
-                    case 'set_ShowBill': set_ShowBill();
+                    case 'btn-Edit': set_ShowBill();
                         break;
                     //瀵煎叆
                     case 'set_SouceExcel': set_SouceExcel();
                         break;
-                    //鍒犻櫎
-                    case 'set_DeleteBill': set_DeleteBill();
+                    //瀵煎嚭鎸夐挳
+                    case 'btn_Export': btn_Export();
                         break;
-                    //娴忚
-                    case 'get_PrintReport': get_PrintReport();
+                    //澶嶅埗
+                    case 'btn_Copy':
+                        set_copy();
+                        break;
+                    //鍒犻櫎
+                    case 'btn-Delete': set_DeleteBill();
                         break;
                     //鍒锋柊
                     case 'get_Refresh': get_Refresh();
+                        break;
+                    //瀹℃牳鎸夐挳
+                    case 'btn-Audit':
+                        set_CheckBill(0);
+                        break;
+                    //鍙嶅鏍告寜閽�
+                    case 'btn-DeAudit':
+                        set_CheckBill(1);
+                        break;
+                    //绂佺敤鎸夐挳
+                    case 'btn-Stop':
+                        set_De_Stop(0);
+                        break;
+                    //鍙嶇鐢ㄦ寜閽�
+                    case 'btn-DeStop':
+                        set_De_Stop(1);
                         break;
                     //閫�鍑烘寜閽�
                     case 'get_Exit': Pub_Close(2);
                         break;
                     //鍒楄缃�
-                    case 'set_HideColumn': get_HideColumn();
+                    case 'set_HideColumn': get_HideColumnNoPage(HModName, sessionStorage["HUserName"], option, get_FastQuery);
                         break;
                     //淇濆瓨鏂规
                     case 'set_SaveScheme': set_SaveScheme();
                         break;
                     //璇诲彇鏂规
                     case 'set_ReadScheme': set_ReadScheme();
+                        break;
+                    case 'set_HideButton':
+                        get_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
                         break;
                 };
             });
@@ -160,6 +292,17 @@
                 $("#WorkCenter").val("");//鍗曟嵁鍙�
                 $("#hnumber").val("");//鐗╂枡
                 $("#HOrderProcNO").val("");//鍗曟嵁绫诲瀷
+                $("#ColName").val("0");
+                $("#Comparator").val("0");
+                $("#ColContent").val("");
+                $("#ColContent2").val("");
+                $("#ColName2").val("0");
+                $("#Comparator2").val("0");
+                $("#ColContent1").val("");
+                $("#ColName1").val("0");
+                $("#Comparator1").val("0");
+                $("#HUSEORGID").val(sessionStorage["Organization"])
+                form.render('select');
                 $("#btnSearch").click();
                 set_ClearQuery();
             });
@@ -168,6 +311,7 @@
             //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
             //#region 鍒濆鍖栫晫闈�
             function set_ClearBill() {
+                set_StockOrg();
                 //鍒濆鍖栬〃鏍�
                 set_InitGrid();
                 //鏌ヨ
@@ -204,10 +348,26 @@
                 };
             }
 
+            //#region 瀵煎嚭Execel
+            function btn_Export() {
+                table.exportFile(ins.config.id, option.data, "xls");
+            }
+            //#endregion
+
             //#region 閲嶇疆杩囨护鏉′欢鏂规硶
             function set_ClearQuery() {
                 $("#HNumber").val("");
                 $("#HName").val("");
+                $("#ColContent").val("");
+                $("#ColName").val("0");
+                $("#Comparator").val("0");
+                $("#ColContent2").val("");
+                $("#ColName2").val("0");
+                $("#Comparator2").val("0");
+                $("#ColContent1").val("");
+                $("#ColName1").val("0");
+                $("#Comparator1").val("0");
+                $("#HUSEORGID").val(sessionStorage["Organization"]);
                 sWhere = "";
             }
             //#endregion
@@ -221,10 +381,69 @@
                     data: { "sWhere": sWhere },
                     success: function (data1) {
                         if (data1.count == 1) {
+
+                            var data = [];
+                            var col = [];
+                            var totalArray = [];
+                            //缁欑┖鐨勬暟缁勮祴鍊�
+                            for (var key in data1.list) {
+                                data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+                            }
+                            //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+                            col.push({ type: 'checkbox', fixed: 'left' });
+                            for (var i = 0; i < data.length; i++) {
+                                // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
+                                if ($.inArray(data[i].name, titleData) > -1) {
+                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+                                }
+                                else if ($.inArray(data[i].name, totalArray) > -1) {
+                                    col.push({
+                                        field: data[i].id, title: data[i].name, align: 'center', sort: true, totalrow: true, width: 200
+                                    })
+                                } else if (data[i].id == '鍗曟嵁鍙�') {
+                                    col.push({
+                                        field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '鍗曟嵁鍙�'
+                                    })
+                                }
+                                else {
+                                    switch (data[i].Type) {
+                                        //int
+                                        case 'DateTime':
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
+                                            break;
+                                        default:
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+                                    }
+                                }
+                            }
+
+
+                            //鍔ㄦ�佹樉绀哄垪鍚�
+                            option = {
+                                elem: '#mainTable'
+                                , toolbar: '#toolbarDemo'
+                                , cols: [col]
+                                , data: data1.data
+                                , height: 'full-80'
+                                , page: true
+                                , limits: [50, 500, 5000, 20000]
+                                , limit: 50
+                                , cellMinWidth: 90
+                            }
+
                             option.data = data1.data;
+                          
+                            //鍒锋柊琛ㄦ牸鏁版嵁
+                            DisPlay_HideColumn(HModName, sessionStorage["HUserName"], option, titleData);
+                            ins = table.render(option);
                             table.render(option);
-                            DisPlay_HideColumn();
+                            //鍒锋柊鎸夐挳鏄剧ず
+                            Display_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
+
                             layer.close(ajaxLoad);
+                            if ($("#ColName option").length < 1) {
+                                ColFilter();
+                            }
                             //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
                         } else {
                             layer.close(ajaxLoad);
@@ -249,17 +468,119 @@
                 })
             }
 
+            //澶嶅埗
+            function set_copy() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var HInterID = data[0].HItemID.toString();
+                    layer.open({
+                        type: 2
+                        , area: ['100%', '100%']
+                        , title: '缂栬緫宸ヨ壓璺嚎澶х被'
+                        , shade: 0.6 //閬僵閫忔槑搴�
+                        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                        , content: '../宸ヨ壓璺嚎澶х被/Gy_RoutingGroupEdit.html?OperationType=2&linterid=' + HInterID + '&HSouceBillType='
+                        , resize: false
+                        , cancel: function () {
+
+                        }
+                    })
+
+                } else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+                }
+            }
+
+
             //#region 蹇�熻繃婊�
             function get_FastQuery() {
                 var HName = $("#HName").val();//鍚嶇О
                 var HNumber = $("#HNumber").val();//浠g爜
+                var HUSEORGID = $("#HUSEORGID").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 (HName) {
                     sWhere += " and HName like '%" + HName + "%'";
                 }
                 if (HNumber) {
                     sWhere += " and HNumber like '%" + HNumber + "%'";
                 }
-
+                if (HUSEORGID) {
+                    sWhere += " and 浣跨敤缁勭粐鍚嶇О = '" + HUSEORGID + "'";
+                }
                 get_Display(sWhere);
                 sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
             }
@@ -271,9 +592,9 @@
                     type: 2
                     , skin: 'layui-layer-rim' //鍔犱笂杈规
                     , area: ['100%', '100%']
-                    , title: '宸ヨ壓璺嚎-鏂板'
+                    , title: '宸ヨ壓璺嚎澶х被-鏂板'
                     , shift: 0//寮瑰嚭鍔ㄧ敾
-                    , content: '../宸ヨ壓璺嚎/Gy_RoutingBill.html?OperationType=1&linterid=&HSouceBillType=&linteridSub=-1'
+                    , content: '../宸ヨ壓璺嚎澶х被/Gy_RoutingGroupEdit.html?OperationType=1&linterid=&HSouceBillType=&linteridSub=-1'
                 })
             }
             //#endregion
@@ -290,12 +611,110 @@
                     layer.open({
                         type: 2
                         , area: ['100%', '100%']
-                        , title: '宸ヨ壓璺嚎-缂栬緫'
+                        , title: '宸ヨ壓璺嚎澶х被-缂栬緫'
                         , shift: 0//寮瑰嚭鍔ㄧ敾
-                        , content: '../宸ヨ壓璺嚎/Gy_RoutingBill.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=&linteridSub=' + linteridSub
+                        , content: '../宸ヨ壓璺嚎澶х被/Gy_RoutingGroupEdit.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=&linteridSub=' + linteridSub
                     })
                 } else {
                     layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+                }
+            }
+            //#endregion
+
+            //#region   鑾峰彇缁勭粐
+            function set_StockOrg() {
+                //鑾峰彇鐧诲綍椤电粍缁囧垪
+                $.ajax({
+                    type: "GET",
+                    url: GetWEBURL() + "/Web/GetOrganizations",
+                    async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                    success: function (result) {
+                        var Organization = "";
+                        Organization += '<option  style="color:blue;" value="">鍏ㄩ儴</option>';
+                        if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            var data = result.data;
+                            for (var i = 0; i < data.length; i++) {
+                                Organization += '<option  style="color:blue;" value="' + data[i].Name + '">' + data[i].Name + '</option>';
+                            }
+                            $("#HUSEORGID").append(Organization);
+                            $("#HUSEORGID").val(sessionStorage["Organization"])
+                            form.render('select');
+                        }
+                        layer.closeAll("loading");
+                    },
+                    complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
+                })
+            }
+            //#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_RoutingGroup/AuditGy_RoutingGroup", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        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 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_RoutingGroup/StopGy_RoutingGroup", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        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
@@ -305,14 +724,14 @@
                 var checkStatus = table.checkStatus('mainTable')
                     , data = checkStatus.data;
                 if (checkStatus.data.length === 1) {
-                    var hmainid = data[0].hmainid;
+                    var hmainid = data[0].HItemID;
                     layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
                         var wait = layer.load();
                         //閫昏緫鍒犻櫎鏂规硶
                         $.ajax({
-                            url: GetWEBURL() + '/LEMS/DeltetGy_RoutingBillSub',
+                            url: GetWEBURL() + 'DeltetGy_RoutingGroup',
                             type: "GET",
-                            data: { "lngBillKey": hmainid },
+                            data: { "HItemID": hmainid, "user": sessionStorage["HUserName"] },
                             success: function (result) {
                                 console.log('gouba' + result);
                                 if (result.count == 1) {
@@ -322,7 +741,7 @@
                                         //鍏抽棴褰撳墠frame
                                         layer.close(wait);
                                         //淇敼涓哄姛鍚庡埛鏂扮晫闈�
-                                        window.location.reload();
+                                        get_FastQuery();
                                     });
                                 } else {
                                     layer.alert(result.code + result.Message, { icon: 5 });
@@ -350,123 +769,7 @@
             }
             //#endregion
 
-            //闅愯棌鍒楄缃�
-            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);//鍏抽棴寮圭獥
-                    }
-                })
-            }
-
-            //鏄剧ず鍒楁暟鎹�
-            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 = ["鍗曟嵁ID", "HMouldID", "hsubid", "HManagerID", "婧愬崟涓诲唴鐮�", "婧愬崟瀛愬唴鐮�"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
-
-                            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 (dataCols[3] > 0) {
-                                    option.cols[0][i + 1]["width"] = dataCols[3];
-                                }
-                                //璁剧疆鍐呭瀛椾綋澶у皬
-                                if (data1.data[0].HFontSize != 0) {
-                                    option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
-                                } else {
-                                    option.cols[0][i + 1]["style"] = "font-size:100%";
-                                }
-                                //璁剧疆鍒楀
-                                //if (data1.data[0].HColumnWidth != 0) {
-                                //    option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
-                                //} else {
-                                //    option.cols[0][i + 1]["width"] = "";
-                                //}
-                                //鏄剧ず鍒�
-                                if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
-                                    option.cols[0][i + 1]["hide"] = false;
-                                }
-                                //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
-                                switch (dataCols[2]) {
-                                    case "L":
-                                        option.cols[0][i + 1]["align"] = "left";
-                                        break;
-                                    case "M":
-                                        option.cols[0][i + 1]["align"] = "center";
-                                        break;
-                                    case "R":
-                                        option.cols[0][i + 1]["align"] = "right";
-                                        break;
-                                }
-                            }
-
-                            //鍙栨秷鍐荤粨鍒�
-                            for (var i = 1; i < option.cols[0].length - 1; i++) {
-                                if (option.cols[0][i]["fixed"] != null) {
-                                    option.cols[0][i]["fixed"] = null;
-                                }
-                                else {
-                                    break;
-                                }
-                            }
-                            //鍐荤粨鍒�
-                            if (data1.data[0].HFixCols != 0) {
-                                for (var i = 0; i < data1.data[0].HFixCols; i++) {
-                                    if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
-                                        data1.data[0].HFixCols += 1;
-                                    }
-                                    option.cols[0][i + 1]["fixed"] = "left";
-                                }
-                            }
-                            table.render(option);
-                        } else {
-                            table.render(option);
-                        }
-                    }, error: function () {
-                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
-                    }
-                })
-            }
+ 
 
             //#endregion
 
@@ -516,6 +819,24 @@
                 });
             }
 
+            //#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();
+                $("#ColName1").empty();
+                $("#ColName1").append(Organization);
+                $("#ColName2").empty();
+                $("#ColName2").append(Organization);
+                $("#ColName").append(Organization);
+                form.render('select');
+            }
+            //#endregion
+
             //淇濆瓨鏂规
             function set_SaveScheme() {
                 var index = layer.open()
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\241\243\346\241\210/Gy_EquipFileMainEdit.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\241\243\346\241\210/Gy_EquipFileMainEdit.html"
index 89d4130..c8b15e9 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\241\243\346\241\210/Gy_EquipFileMainEdit.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\241\243\346\241\210/Gy_EquipFileMainEdit.html"
@@ -42,6 +42,10 @@
                         </div>
                         <div class="layui-card-body">
                             <div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
+                                <ul class="layui-tab-title" lay-filter="tab-all">
+                                    <li lay-id="1" style="padding:1px;" class="layui-this">鍩烘湰淇℃伅</li>
+                                    <li>鍏朵粬淇℃伅</li>
+                                </ul>
                                 <h1 style="text-align:center;"><b>璁惧妗f</b></h1>
                                 <!--鍩烘湰淇℃伅-->
                                 <div class="layui-tab-content">
@@ -336,12 +340,19 @@
                                                     </button>
                                                 </div>
                                             </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label" style="width: 85px;">浣跨敤缁勭粐</label>
+                                                <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
+                                                    <input type="hidden" class="layui-input" lay-verify="HCREATEORGID" name="HCREATEORGID" id="HCREATEORGID">
+                                                    <select name="HUSEORGID" id="HUSEORGID" lay-verify="HUSEORGID">
+                                                        <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+                                                    </select>
+                                                </div>
+                                            </div>
                                         </div>
                                     </div>
-                                </div>
-                                <!--鍏朵粬淇℃伅-->
-                                <!--<div class="layui-tab-content">
-                                    <div class="layui-tab-item layui-show">
+                                    <!--鍏朵粬淇℃伅-->
+                                    <div class="layui-tab-item">
                                         <div class="layui-form-item">
                                             <div class="layui-inline">
                                                 <label class="layui-form-label" style="width: 85px;">鍒跺崟浜�</label>
@@ -367,12 +378,7 @@
                                                     <input type="text" class="layui-input" name="HUpDater" id="HUpDater" 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="HDeleteMan" id="HDeleteMan" style="background-color:#efefef4d;" readonly>
-                                                </div>
-                                            </div>
+                                          
                                         </div>
                                         <div class="layui-form-item">
                                             <div class="layui-inline">
@@ -399,6 +405,14 @@
                                                     <input type="text" class="layui-input" name="HUpDateDate" id="HUpDateDate" style="background-color:#efefef4d;" readonly>
                                                 </div>
                                             </div>
+                                        </div>
+                                        <div class="layui-form-item">
+                                            <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="HDeleteMan" id="HDeleteMan" 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;">
@@ -407,7 +421,7 @@
                                             </div>
                                         </div>
                                     </div>
-                                </div>-->
+                                </div>
                             </div>
                         </div>
                         <div class="layui-tab" lay-filter="table">
@@ -499,7 +513,7 @@
             //#endregion
 
             //#region 杩涘叆椤甸潰鍗冲姞杞�
-
+            Organ();
             //鍒濆鍖栬〃鍗曟彃浠�
             set_InitFrom();
 
@@ -507,6 +521,20 @@
             if (OperationType == 1) {//鏃犳簮鍗�
                 Stverf = "Add";
                 set_AddFNew();
+            } else if (OperationType == 2) {//鏃犳簮鍗�
+                Stverf = "Add";
+                set_EditFromGrid();
+                set_AddFNew();
+                $("#HMaker").val(sessionStorage["HUserName"]);
+                $("#HMakeDate").val("");
+                $("#HChecker").val("");
+                $("#HCheckDate").val("");
+                $("#HUpDater").val("");
+                $("#HUpDateDate").val("");
+                $("#HCloseMan").val("");
+                $("#HCloseDate").val("");
+                $("#HDeleteMan").val("");
+                $("#HDeleteDate").val("");
             }
             else if (OperationType == 3) {//缂栬緫
                 Stverf = "Update";
@@ -1266,6 +1294,29 @@
 
                 })
             }
+            //鑾峰彇缁勭粐
+            function Organ() {
+                //鑾峰彇鐧诲綍椤电粍缁囧垪
+                var Organization = '';
+                $.ajax({
+                    type: "get",
+                    url: GetWEBURL() + "/Web/GetOrganizations",
+                    async: false,
+                    success: function (result) {
+                        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"])
+                            $("#HCREATEORGID").val(sessionStorage["OrganizationID"])
+                            form.render('select');
+                        }
+                        layer.closeAll("loading");
+                    }
+                })
+            }
 
             //琛屽唴鍒犻櫎
             function set_GridDelete(obj) {
@@ -1300,6 +1351,7 @@
                 $.ajax({
                     url: GetWEBURL() + "/Web/GetMAXNum",
                     type: "GET",
+                    async: false,
                     data: { "HBillType": sBillType },
                     success: function (d) {
                         $("#HInterID").val(d.data[0].HInterID);
@@ -1317,6 +1369,7 @@
                 $("#HInterID").val(linterid);//淇敼鏃朵富琛↖D
                 $.ajax({
                     url: GetWEBURL() + "/Gy_EquipFileMain/Gy_EquipFileCheckDetai",
+                    async: false,
                     type: "GET",
                     data: {
                         "HInterID": linterid
@@ -1371,6 +1424,19 @@
                         $("#HMainSourceFlag").val(d.data[0].鏄惁涓荤敓浜ц澶�);
                         $("#HMainSourceID").val(d.data[0].HMainSourceID);
                         $("#HMainSourceName").val(d.data[0].鎵�灞炰富鐢熶骇璁惧);
+
+                        $("#HUSEORGID").val(d.data[0].HUSEORGID);
+                        $("#HMaker").val(d.data[0].鍒跺崟浜�);
+                        $("#HMakeDate").val(d.data[0].鍒跺崟鏃ユ湡 == null ? "" : Format(new Date(d.data[0].鍒跺崟鏃ユ湡), "yyyy-MM-dd"));
+                        $("#HChecker").val(d.data[0].瀹℃牳浜�);
+                        $("#HCheckDate").val(d.data[0].瀹℃牳鏃ユ湡 == null ? "" : Format(new Date(d.data[0].瀹℃牳鏃ユ湡), "yyyy-MM-dd"));
+                        $("#HUpDater").val(d.data[0].淇敼浜�);
+                        $("#HUpDateDate").val(d.data[0].淇敼鏃ユ湡 == null ? "" : Format(new Date(d.data[0].淇敼鏃ユ湡), "yyyy-MM-dd"));
+                        $("#HCloseMan").val(d.data[0].鍏抽棴浜�);
+                        $("#HCloseDate").val(d.data[0].鍏抽棴鏃ユ湡 == null ? "" : Format(new Date(d.data[0].鍏抽棴鏃ユ湡), "yyyy-MM-dd"));
+                        $("#HDeleteMan").val(d.data[0].浣滃簾浜�);
+                        $("#HDeleteDate").val(d.data[0].浣滃簾鏃ユ湡 == null ? "" : Format(new Date(d.data[0].浣滃簾鏃ユ湡), "yyyy-MM-dd"));
+
                         form.render("select");
                     }
                 });
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\241\243\346\241\210/Gy_EquipFileMainList.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\241\243\346\241\210/Gy_EquipFileMainList.html"
index 17e86ce..6dfec9c 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\241\243\346\241\210/Gy_EquipFileMainList.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\241\243\346\241\210/Gy_EquipFileMainList.html"
@@ -14,6 +14,8 @@
     <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
     <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
     <script src="../../../layuiadmin/layui/lay/modules/table.js"></script>
+    <script src="../../../layuiadmin/HideButton_New.js"></script>
+    <script src="../../../layuiadmin/SetColumn.js"></script>
     <style>
         /*鏍戠姸鍥剧偣鍑婚珮浜彉鑹�*/
         .layui-tree-set-active > .layui-tree-entry .layui-tree-main {
@@ -47,6 +49,14 @@
                                         <input type="text" class="layui-input ForFilteringSchemes" name="HName" id="HName">
                                     </div>
                                 </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label" style="width: 85px;">缁勭粐</label>
+                                    <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
+                                        <select name="HUSEORGID" id="HUSEORGID" class="ForFilteringSchemes" lay-verify="HUSEORGID">
+                                            <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+                                        </select>
+                                    </div>
+                                </div>
                                 <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
                                     <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                 </button>
@@ -54,6 +64,89 @@
                                 <!--鏄剧ず褰撳墠杩囨护鏂规-->
                                 <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: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>
+                                    <div class="layui-row" style="margin-top:5px">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">杩囨护</label>
+                                            <div class="layui-input-block">
+                                                <select name="ColName1" id="ColName1" lay-filter="ColName1" style="width:190px;" class="ForFilteringSchemes">
+                                                </select>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <select name="Comparator1" id="Comparator1" lay-filter="Comparator1" 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="ColContent1" id="ColContent1">
+                                        </div>
+                                    </div>
+                                    <div class="layui-row" style="margin-top:5px">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">杩囨护</label>
+                                            <div class="layui-input-block">
+                                                <select name="ColName2" id="ColName2" lay-filter="ColName2" style="width:190px;" class="ForFilteringSchemes">
+                                                </select>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <select name="Comparator2" id="Comparator2" lay-filter="Comparator2" 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="ColContent2" id="ColContent2">
+                                        </div>
+                                    </div>
                                 </div>
                             </div>
                         </div>
@@ -68,21 +161,27 @@
                             </div>
                         </div>
                         <script type="text/html" id="toolbarDemo">
-                            <div class="layui-btn-container">
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btnAdd"><i class="layui-icon layui-icon-add-1"></i>鏂板</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btnModify"><i class="layui-icon layui-icon-edit"></i>缂栬緫</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btndelete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
-                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="set_SouceExcel"><i class="layui-icon layui-icon-delete"></i>瀵煎叆</button>-->
-                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-view"><i class="layui-icon layui-icon-tips"></i>棰勮</button>-->
-                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-print"><i class="layui-icon layui-icon-print"></i>鎵撳嵃</button>-->
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_CheckBill" id="CheckBill"><i class="layui-icon layui-icon-form"></i>瀹℃牳</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AbandonCheck" id="AbandonCheck"><i class="layui-icon layui-icon-form"></i>鍙嶅鏍�</button>
+                            <div class="layui-btn-container" id="toolbarDemo_ButtonSet">
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_SouceExcel" id="set_SouceExcel"><i class="layui-icon layui-icon-delete"></i>瀵煎叆</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Export" id="btn_Export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btnAdd" id="btnAdd"><i class="layui-icon layui-icon-add-1"></i>鏂板</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Copy" id="btn_Copy"><i class="layui-icon layui-icon-add-1"></i>澶嶅埗</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btnModify" id="btnModify"><i class="layui-icon layui-icon-edit"></i>缂栬緫</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btndelete" id="btndelete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_CheckBill" id="set_CheckBill"><i class="layui-icon layui-icon-form"></i>瀹℃牳</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AbandonCheck" id="set_AbandonCheck"><i class="layui-icon layui-icon-form"></i>鍙嶅鏍�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Delete" id="btn_Delete"><i class="layui-icon layui-icon-radio"></i>浣滃簾</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_UnDelete" id="btn_UnDelete"><i class="layui-icon layui-icon-radio"></i>鍙嶄綔搴�</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="set_CloseBill" id="set_CloseBill"><i class="layui-icon layui-icon-form"></i>鍏抽棴</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="set_CancelCloseBill" id="set_CancelCloseBill"><i class="layui-icon layui-icon-form"></i>鍙嶅叧闂�</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn" id="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideButton" id="set_HideButton"><i class="layui-icon layui-icon-form"></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="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh" id="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit" id="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-view" id="btn-view"><i class="layui-icon layui-icon-tips"></i>棰勮</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-print" id="btn-print"><i class="layui-icon layui-icon-print"></i>鎵撳嵃</button>
                             </div>
                         </script>
                     </form>
@@ -112,7 +211,10 @@
             var titleData = ["hmainid", "HMaterID", "HUnitID", "HDeptID", "HEquipDotCheckRuleInterID", "HEquipMaintainRuleInterID", "HEquipFileTypeID","HBillType", "HUseEmpID", "HRepairEmpID", "HSellSupID", "HMakeSupID", "HMainSourceID", "HSourceID", "HSourceName"];
             //#endregion
             //#region 銆愯繃婊ゆ柟妗堛��
-
+            var HModName = "Gy_EquipFileMainList";
+            var HBillType = "3308";
+            var ins;                //鐢ㄤ簬瀵煎嚭excel
+            var set_HideButton_ID = "toolbarDemo_ButtonSet";                    //闇�瑕佽缃殑鎸夐挳鐨勭埗绾ц妭鐐圭殑id
             //杩囨护鏉′欢鐨刢lass绫� 
             var HClassTag = "ForFilteringSchemes";
             //妯″潡鍚嶇О锛堜腑鏂囩増锛� 姣忎釜妯″潡椤甸潰閮介渶瑕佷慨鏀�
@@ -137,11 +239,25 @@
                     //缂栬緫鎸夐挳
                     case 'btnModify': set_ShowBill();
                         break;
+                    //鍒楄缃�
+                    case 'set_HideColumn': get_HideColumnNoPage(HModName, sessionStorage["HUserName"], option, get_FastQuery);
+                        break;
+                    //鎸夐挳璁剧疆
+                    case 'set_HideButton':
+                        get_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
+                        break;
                     //棰勮
                     case 'btn-view': get_ViewReport();
                         break;
                     //瀵煎叆
                     case 'set_SouceExcel': set_SouceExcel();
+                        break;
+                    //瀵煎嚭鎸夐挳
+                    case 'btn_Export': btn_Export();
+                        break;
+                    //澶嶅埗
+                    case 'btn_Copy':
+                        set_copy();
                         break;
                     //鎵撳嵃
                     case 'btn-print': get_PrintReport();
@@ -160,6 +276,12 @@
                         break;
                     //鍙嶅叧闂�
                     case 'set_CancelCloseBill': set_CloseBill(2);
+                        break;
+                    //浣滃簾
+                    case 'btn_Delete': btn_Delete(1);
+                        break;
+                    //鍙嶄綔搴�
+                    case 'btn_UnDelete': btn_Delete(2);
                         break;
                     //鍒锋柊
                     case 'get_Refresh': get_Refresh();
@@ -212,6 +334,7 @@
 
             //鍒濆鍖栬〃鏍�
             function set_ClearBill() {
+                set_StockOrg();
                 //鍒濆鍖栬〃鏍�
                 set_InitGrid();
 
@@ -222,6 +345,12 @@
 
                 get_DefaultModule();
             }
+
+            //#region 瀵煎嚭Execel
+            function btn_Export() {
+                table.exportFile(ins.config.id, option.data, "xls");
+            }
+            //#endregion
 
             //鍒濆鍖栬〃鏍�
             function set_InitGrid()
@@ -369,9 +498,21 @@
                                 , done: function (res, curr, count) {
                                     soulTable.render(this);
                                 }
-                            }                          
+                            }
+                            ins = table.render(option);
+
+                            //鍒锋柊琛ㄦ牸鏁版嵁
+                            DisPlay_HideColumn(HModName, sessionStorage["HUserName"], option, titleData);
+
                             table.render(option);
                             layer.close(index);
+
+                            if ($("#ColName option").length < 1) {
+                                ColFilter();
+                            }
+
+                            Display_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
+
                         } else {
                             layer.close(index);
                             layer.alert(data1.code + data1.Message, { icon: 5 });
@@ -383,16 +524,112 @@
                 });
             }
 
+            //#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
 
             //蹇�熻繃婊�
             function get_FastQuery() {
                 var HNumber = $("#HNumber").val();
                 var HName = $("#HName").val();
+                var HUSEORGID = $("#HUSEORGID").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 璁惧浠g爜 like '%" + HNumber + "%'";
                 }
                 if (HName) {
                     sWhere += " and 璁惧鍚嶇О like '%" + HName + "%'";
+                }
+                if (HUSEORGID) {
+                    sWhere += " and 浣跨敤缁勭粐鍚嶇О = '" + HUSEORGID + "'";
                 }
                 get_Display(sWhere);
                 sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
@@ -418,6 +655,31 @@
 
                     }
                 });
+            }
+
+            //澶嶅埗
+            function set_copy() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var HInterID = data[0].hmainid.toString();
+                    layer.open({
+                        type: 2
+                        , area: ['100%', '100%']
+                        , title: '缂栬緫鍣ㄥ叿妗f鍒楄〃'
+                        , shade: 0.6 //閬僵閫忔槑搴�
+                        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                        , content: '../璁惧妗f/Gy_EquipFileMainEdit.html?OperationType=2&linterid=' + HInterID
+                        , resize: false
+                        , cancel: function () {
+
+                        }
+                    })
+
+                } else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+                }
             }
 
             //淇敼
@@ -550,6 +812,7 @@
                                 if (result.count == 1) {
                                     layer.msg(result.Message, { icon: 1 });
                                     layer.close(wait);
+                                    get_FastQuery();
                                 } else {
                                     layer.alert(result.code + result.Message, { icon: 5 });
                                     layer.close(wait);
@@ -564,7 +827,68 @@
                 else {
                     layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�!");
                 }
-            }  
+            }
+
+            //#region   鑾峰彇缁勭粐
+            function set_StockOrg() {
+                //鑾峰彇鐧诲綍椤电粍缁囧垪
+                $.ajax({
+                    type: "GET",
+                    url: GetWEBURL() + "/Web/GetOrganizations",
+                    async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                    success: function (result) {
+                        var Organization = "";
+                        Organization += '<option  style="color:blue;" value="">鍏ㄩ儴</option>';
+                        if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            var data = result.data;
+                            for (var i = 0; i < data.length; i++) {
+                                Organization += '<option  style="color:blue;" value="' + data[i].Name + '">' + data[i].Name + '</option>';
+                            }
+                            $("#HUSEORGID").append(Organization);
+                            $("#HUSEORGID").val(sessionStorage["Organization"])
+                            form.render('select');
+                        }
+                        layer.closeAll("loading");
+                    },
+                    complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
+                })
+            }
+            //#endregion
+
+
+            //浣滃簾/鍙嶄綔搴�
+            function btn_Delete(num) {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+
+                if (data.length == 1) {
+                    layer.confirm("纭瑕佷綔搴熷悧?", function (index) {
+                        var wait = layer.load();
+                        var HInterID = data[0].hmainid;
+                        $.ajax({
+                            url: GetWEBURL() + '/Gy_EquipFileBill/DeleteGy_EquipFileBill',
+                            type: "GET",
+                            data: { "HInterID": HInterID, "Type": num, "user": sessionStorage["HUserName"] },
+                            success: function (result) {
+                                if (result.count == 1) {
+                                    layer.msg(result.Message, { icon: 1 });
+                                    layer.close(wait);
+                                    get_FastQuery();
+                                } else {
+                                    layer.alert(result.code + result.Message, { icon: 5 });
+                                    layer.close(wait);
+                                }
+                            }, error: function () {
+                                layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                                layer.close(wait);
+                            }
+                        });
+                    })
+                }
+                else {
+                    layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�!");
+                }
+            }
 
             //棰勮
             function get_ViewReport() {
@@ -655,6 +979,7 @@
                 tree.render({
                     elem: '#TreeTable' //榛樿鏄偣鍑昏妭鐐瑰彲杩涜鏀剁缉
                     , data: treeTable
+                    , onlyIconControl: true
                     , click: function (obj) {
                         //楂樹寒鍙樿壊
                         $(".layui-tree-set").removeClass('layui-tree-set-active');
@@ -695,6 +1020,16 @@
             function get_Refresh() {
                 $("#HNumber").val("");
                 $("#HName").val("");
+                $("#ColContent").val("");
+                $("#ColName").val("0");
+                $("#Comparator").val("0");
+                $("#ColContent2").val("");
+                $("#ColName2").val("0");
+                $("#Comparator2").val("0");
+                $("#ColContent1").val("");
+                $("#ColName1").val("0");
+                $("#Comparator1").val("0");
+                $("#HUSEORGID").val(sessionStorage["Organization"]);
                 $("#btnSearch").click();
             }
             //#region 銆愯繃婊ゆ柟妗堛��
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\237\272\347\241\200\345\273\272\346\250\241/Add_Edit_Gy_ErrMsgBackType.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\237\272\347\241\200\345\273\272\346\250\241/Add_Edit_Gy_ErrMsgBackType.html"
index bd2db11..979f299 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\237\272\347\241\200\345\273\272\346\250\241/Add_Edit_Gy_ErrMsgBackType.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\237\272\347\241\200\345\273\272\346\250\241/Add_Edit_Gy_ErrMsgBackType.html"
@@ -8,6 +8,7 @@
     <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>
 </head>
 <body>
 
@@ -18,18 +19,19 @@
                     <form id="form" class="layui-form" lay-filter="component-form-group" action="">
                         <div class="layui-card-header">
                             <div class="layui-btn-group">
-
                                 <button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</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">
-
                                 <h1 style="text-align:center;"><b>寮傚父鍙嶉绫诲瀷</b></h1>
+                                <ul class="layui-tab-title" lay-filter="tab-all">
+                                    <li lay-id="1" style="padding:1px;" class="layui-this">鍩烘湰淇℃伅</li>
+                                    <li>鍏朵粬淇℃伅</li>
+                                </ul>
                                 <div class="layui-tab-content">
+                                    <!--鍩烘湰淇℃伅-->
                                     <div class="layui-tab-item layui-show">
                                         <div class="layui-form-item">
                                             <div class="layui-inline">
@@ -86,6 +88,64 @@
                                             </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="HModifyEmp" id="HModifyEmp" 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>
+                                            <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" value="" 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 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>
+                                        </div>
+                                    </div>
                                 </div>
                             </div>
                         </div>
@@ -132,6 +192,20 @@
             //鍒ゆ柇鎿嶄綔绫诲瀷
             if (OperationType == 1) {//鏃犳簮鍗�
                 set_AddFNew();
+                $("#HMakeEmp").val(sessionStorage["HUserName"]);
+            }
+            else if (OperationType == 2) {
+                set_EditFromGrid();
+                $("#HMakeEmp").val(sessionStorage["HUserName"]);
+                $("#HModifyEmp").val("");
+                $("#HStopEmp").val("");
+                $("#HCheckEmp").val("");
+                $("#HMakeTime").val("");
+                $("#HModifyTime").val("");
+                $("#HStopTime").val("");
+                $("#HCheckTime").val("");
+                $("#HNumber").val("");
+                $("#HItemID").val(0);
             }
             else if (OperationType == 3) {//缂栬緫
                 set_EditFromGrid();
@@ -205,6 +279,10 @@
             //鍒濆鍖栫晫闈�
             function set_ClearBill() {
                 Organ();
+                $("#HStopflag").attr("disabled", true);
+                $("#HUseFlag").attr("disabled", true);
+                layui.form.render('checkbox');
+                layui.form.render('select');
             }
             //鏃犳簮鍗曟柊澧�
             function set_AddFNew() {
@@ -222,6 +300,7 @@
                 $.ajax({
                     url: GetWEBURL() + "GetGy_ErrMsgBackTypeDetail",
                     type: "GET",
+                    async: false,
                     data: {
                         "HID": linterid
                     },
@@ -235,6 +314,16 @@
                             $("#HUSEORGID").val(data.HUSEORGID);//浣跨敤缁勭粐
                             $("#HUseFlag ").val(data.浣跨敤鐘舵��);//浣跨敤鐘舵��
                             $("#HRemark").val(data.澶囨敞);//澶囨敞
+
+                            $("#HMakeEmp").val(data.鍒跺崟浜�);
+                            $("#HMakeTime").val(data.鍒涘缓鏃ユ湡 == null ? "" : Format(new Date(data.鍒涘缓鏃ユ湡), "yyyy-MM-dd"));
+                            $("#HCheckEmp").val(data.瀹℃牳浜�);
+                            $("#HCheckTime").val(data.瀹℃牳鏃ユ湡 == null ? "" : Format(new Date(data.瀹℃牳鏃ユ湡), "yyyy-MM-dd"));
+                            $("#HModifyEmp").val(data.淇敼浜�);
+                            $("#HModifyTime").val(data.淇敼鏃ユ湡 == null ? "" : Format(new Date(data.淇敼鏃ユ湡), "yyyy-MM-dd"));
+                            $("#HStopEmp").val(data.绂佺敤浜�);
+                            $("#HStopTime").val(data.绂佺敤鏃ユ湡 == null ? "" : Format(new Date(data.绂佺敤鏃ユ湡), "yyyy-MM-dd"));
+
                             $("input[name='HStopflag']").attr("checked", data.绂佺敤鏍囧織 == "鏄�" ? true : false);//true:閫変腑 false:涓嶉�変腑
                             layui.form.render();//瀹炴椂娓叉煋閫変腑鍜屼笉閫変腑鐨勬牱寮�,鏈�濂芥坊鍔犺繖鍙ヨ瘽
                             form.render("select");
@@ -274,6 +363,7 @@
                 $.ajax({
                     type: "get",
                     url: GetWEBURL() + "/Web/GetOrganizations",
+                    async: false,
                     success: function (result) {
                         if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
                             var data = result.data;
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\237\272\347\241\200\345\273\272\346\250\241/Gy_ErrMsgBackType.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\237\272\347\241\200\345\273\272\346\250\241/Gy_ErrMsgBackType.html"
index e8916af..528d20a 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\237\272\347\241\200\345\273\272\346\250\241/Gy_ErrMsgBackType.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\237\272\347\241\200\345\273\272\346\250\241/Gy_ErrMsgBackType.html"
@@ -9,7 +9,8 @@
     <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
     <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
     <script src="../../../layuiadmin/layui/layui.js"></script>
-    <script src="../../../layuiadmin/HideButton.js"></script>
+    <script src="../../../layuiadmin/HideButton_New.js"></script>
+    <script src="../../../layuiadmin/SetColumn.js"></script>
     <script src="../../../layuiadmin/PubCustom.js"></script>
 
 </head>
@@ -38,6 +39,14 @@
                                     <label class="layui-form-label" style="white-space: nowrap;width:100px">寮傚父鍙嶉绫诲瀷鍚嶇О</label>
                                     <div class="layui-input-block" style="margin-left: 120px;">
                                         <input type="text" class="layui-input ForFilteringSchemes" name="HName" id="HName" style="width:200px">
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label" style="width: 85px;">缁勭粐</label>
+                                    <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
+                                        <select name="HUSEORGID" id="HUSEORGID" class="ForFilteringSchemes" lay-verify="HUSEORGID">
+                                            <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+                                        </select>
                                     </div>
                                 </div>
                                 <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
@@ -135,21 +144,23 @@
                         </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="AddButton"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit" id="EditButton"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete" id="DeleteButton"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_SouceExcel"><i class="layui-icon layui-icon-delete"></i>瀵煎叆</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh" id="RefreshButton"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit" id="AuditButton"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit" id="DeAuditButton"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Stop" id="StopButton"> <i class="layui-icon layui-icon-radio"></i>绂佺敤</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeStop" id="DeStopButton"><i class="layui-icon layui-icon-radio"></i>鍙嶇鐢�</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn" id="HideButton"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideButton" id="HideButton"><i class="layui-icon layui-icon-form"></i>鎸夐挳璁剧疆</button>
+                            <div class="layui-btn-container" id="toolbarDemo_ButtonSet">
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_SouceExcel" id="set_SouceExcel"><i class="layui-icon layui-icon-delete"></i>瀵煎叆</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Export" id="btn_Export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add" id="btn-Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Copy" id="btn_Copy"><i class="layui-icon layui-icon-add-1"></i>澶嶅埗</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit" id="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete" id="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit" id="btn-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit" id="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Stop" id="btn-Stop"> <i class="layui-icon layui-icon-radio"></i>绂佺敤</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeStop" id="btn-DeStop"><i class="layui-icon layui-icon-radio"></i>鍙嶇鐢�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn" id="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideButton" id="set_HideButton"><i class="layui-icon layui-icon-form"></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="get_Exit" id="ExitButton"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh" id="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit" id="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
                             </div>
                         </script>
 
@@ -180,7 +191,10 @@
             //鏌ヨ鏉′欢
             var sWhere = "";
             var option = [];
-            var HModName = "Gy_ErrMsgBackType";
+            var HModName = "Gy_ErrMsgBackType"; 
+            var HBillType = "Gy_ErrMsgBackType";
+            var ins;                //鐢ㄤ簬瀵煎嚭excel
+            var set_HideButton_ID = "toolbarDemo_ButtonSet";                    //闇�瑕佽缃殑鎸夐挳鐨勭埗绾ц妭鐐圭殑id
             //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
             var titleData = ["HItemID", "鐭唬鐮伮�","鐖剁骇ID", "绛夌骇", "鏈骇鏍囧織", "鍔╄鐮�", "鍒涘缓缁勭粐"];
 
@@ -215,11 +229,18 @@
                     //缂栬緫
                     case 'btn-Edit': set_ShowBill();
                         break;
+                    //澶嶅埗
+                    case 'btn_Copy':
+                        set_copy();
+                        break;
                     //鍒犻櫎
                     case 'btn-Delete': set_DeleteBill();
                         break;
                     //瀵煎叆
                     case 'set_SouceExcel': set_SouceExcel();
+                        break;
+                    //瀵煎嚭鎸夐挳
+                    case 'btn_Export': btn_Export();
                         break;
                     //鍒锋柊
                     case 'get_Refresh': get_Refresh();
@@ -244,7 +265,7 @@
                         set_De_Stop(1);
                         break;
                     //鍒楄缃�
-                    case 'set_HideColumn': get_HideColumn();
+                    case 'set_HideColumn': get_HideColumnNoPage(HModName, sessionStorage["HUserName"], option, get_FastQuery);
                         break;
                     //淇濆瓨鏂规
                     case 'set_SaveScheme': set_SaveScheme();
@@ -253,9 +274,7 @@
                     case 'set_ReadScheme': set_ReadScheme();
                         break;
                     case 'set_HideButton':
-                        var btns = document.getElementsByTagName("button");     //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
-                        var HBillType = "Gy_ProjectMoney";
-                        get_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
+                        get_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
                         break;
                 };
             });
@@ -335,6 +354,7 @@
             //#region 姝ら〉闈㈡墍鏈夋柟娉�
             // 鍒濆鍖栫晫闈�
             function set_ClearBill() {
+                set_StockOrg();
                 //鍒濆鍖栬〃鏍�
                 set_InitGrid();
                 if (addSWhereByOpenType()) {                        //addSWhereByOpenType()鏂规硶鍒ゆ柇鏄惁鍏跺畠椤甸潰鎵撳紑鏈〉闈紝鑻ユ槸鍒欏鐞嗚繃婊ゆ潯浠讹紝骞惰繑鍥瀟rue
@@ -417,20 +437,18 @@
                                 , limit: 50
                                 , cellMinWidth: 90
                             }
+                         
+                            //鍒锋柊琛ㄦ牸鏁版嵁
+                            DisPlay_HideColumn(HModName, sessionStorage["HUserName"], option, titleData);
+                            ins = table.render(option);
                             table.render(option);
                             //鍒锋柊鎸夐挳鏄剧ず
-                            var btns = document.getElementsByTagName("button");     //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
-                            var HBillType = "Gy_ErrMsgBackType";
-                            Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
-
-                            //鍒锋柊琛ㄦ牸鏁版嵁
-                            DisPlay_HideColumn();
+                            Display_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
 
                             layer.close(ajaxLoad);
-                            if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+                            if ($("#ColName option").length < 1) {
                                 ColFilter();
                             }
-
                             //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
                         } else {
                             layer.close(ajaxLoad);
@@ -443,10 +461,18 @@
                 });
                 layer.close(index);
             }
+
+            //#region 瀵煎嚭Execel
+            function btn_Export() {
+                table.exportFile(ins.config.id, option.data, "xls");
+            }
+            //#endregion
+
             //蹇�熸煡璇�
             function get_FastQuery(number) {
                 var HNumber = $("#HNumber").val();
                 var HName = $("#HName").val();
+                var HUSEORGID = $("#HUSEORGID").val();    //缁勭粐
                 var ColName = $("#ColName").val();//澶嶉�夋
                 var Comparator = $("#Comparator").val()
                 var ColContent = $("#ColContent").val();
@@ -515,7 +541,7 @@
                             com2 = "not like'%" + ColContent2 + "%'";
                             break;
                         default:
-                            com2 = "" + Comparator + "'" + ColContent + "'";
+                            com2 = "" + Comparator2 + "'" + ColContent2 + "'";
                             break;
                     }
                     sWhere += " and " + ColName2 + " " + com2;
@@ -525,6 +551,9 @@
                 }
                 if (HName) {
                     sWhere += " and 寮傚父鍙嶉绫诲瀷鍚嶇О like '%" + HName + "%'";
+                }
+                if (HUSEORGID) {
+                    sWhere += " and 浣跨敤缁勭粐鍚嶇О = '" + HUSEORGID + "'";
                 }
                 get_Display(sWhere);
                 sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
@@ -542,10 +571,38 @@
                 $("#ColContent1").val("");
                 $("#ColName1").val("0");
                 $("#Comparator1").val("0");
+                $("#HUSEORGID").val(sessionStorage["Organization"]);
                 form.render('select');
 
                 sWhere = "";
             }
+
+            //#region   鑾峰彇缁勭粐
+            function set_StockOrg() {
+                //鑾峰彇鐧诲綍椤电粍缁囧垪
+                $.ajax({
+                    type: "GET",
+                    url: GetWEBURL() + "/Web/GetOrganizations",
+                    async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                    success: function (result) {
+                        var Organization = "";
+                        Organization += '<option  style="color:blue;" value="">鍏ㄩ儴</option>';
+                        if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            var data = result.data;
+                            for (var i = 0; i < data.length; i++) {
+                                Organization += '<option  style="color:blue;" value="' + data[i].Name + '">' + data[i].Name + '</option>';
+                            }
+                            $("#HUSEORGID").append(Organization);
+                            $("#HUSEORGID").val(sessionStorage["Organization"])
+                            form.render('select');
+                        }
+                        layer.closeAll("loading");
+                    },
+                    complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
+                })
+            }
+            //#endregion
+
             //鍒锋柊
             function get_Refresh() {
                 $("#btnSearch").trigger('click');
@@ -608,6 +665,32 @@
                     layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
                 }
             }
+
+            //澶嶅埗
+            function set_copy() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var HInterID = data[0].HItemID.toString();
+                    layer.open({
+                        type: 2
+                        , area: ['100%', '100%']
+                        , title: '缂栬緫寮傚父鍙嶉绫诲瀷'
+                        , shade: 0.6 //閬僵閫忔槑搴�
+                        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                        , content: '../鍩虹寤烘ā/Add_Edit_Gy_ErrMsgBackType.html?OperationType=2&linterid=' + HInterID + '&HSouceBillType='
+                        , resize: false
+                        , cancel: function () {
+
+                        }
+                    })
+
+                } else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+                }
+            }
+
             //鍒犻櫎
             function set_DeleteBill() {
                 var checkStatus = table.checkStatus('mainTable')
@@ -743,125 +826,6 @@
                     vars[hash[0]] = hash[1];
                 }
                 return vars;
-            }
-            //#endregion
-            //#region 闅愯棌鍒楄缃�
-            function get_HideColumn() {
-                var colName = "";
-                var contentUrl = "";
-                for (var i = 1; i < option.cols[0].length; i++) {
-                    colName += option.cols[0][i]["title"] + ",";
-                }
-                var urlStr = window.document.location.pathname;//鑾峰彇鏂囦欢璺緞
-                var urlLen = urlStr.split('/');
-                for (var i = 0; i < urlLen.length - 4; i++) {
-                    contentUrl += "../";
-                }
-                colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
-
-                contentUrl += '鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName;
-
-                layer.open({
-                    type: 2
-                    , skin: "layui-layer-rim" //鍔犱笂杈规
-                    , title: "闅愯棌鍒楄缃�"  //鏍囬
-                    , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
-                    , shift: 2 //寮瑰嚭鍔ㄧ敾
-                    , area: ["50%", "90%"] //绐椾綋澶у皬
-                    , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
-                    , content: [contentUrl, "yes"]
-                    , btn: ["纭畾", "鍙栨秷"]
-                    , btn1: function (index, laero) {
-                        //鍒锋柊琛ㄦ牸鏁版嵁
-                        DisPlay_HideColumn();
-                        //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
-                        layer.close(index);//鍏抽棴寮圭獥
-                    }
-                })
-            }
-            //#endregion
-            //#region 鏄剧ず鍒楁暟鎹�
-            function DisPlay_HideColumn() {
-                $.ajax({
-                    url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
-                    type: "GET",
-                    async: false,
-                    data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
-                    success: function (data1) {
-                        if (data1.data.length != 0) {
-
-                            var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
-                            //var titleData = ["鍗曟嵁ID", "HMouldID", "hsubid", "HManagerID", "婧愬崟涓诲唴鐮�", "婧愬崟瀛愬唴鐮�"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
-                            var titleData = ["HItemID", "鐭唬鐮伮�", "鐖剁骇ID", "绛夌骇", "鏈骇鏍囧織", "鍔╄鐮�", "鍒涘缓缁勭粐"];
-
-                            dataCol = data1.data[0].HGridString.split(',');
-
-                            for (var i = 0; i < option.cols[0].length - 1; i++) {
-                                var dataCols = dataCol[i].split('|');
-                                //闅愯棌鍒�
-                                if (dataCols[1] == 1) {
-                                    option.cols[0][i + 1]["hide"] = true;
-                                }
-                                //璁剧疆鍒楀
-                                if (dataCols[3] > 0) {
-                                    option.cols[0][i + 1]["width"] = dataCols[3];
-                                }
-                                //璁剧疆鍐呭瀛椾綋澶у皬
-                                if (data1.data[0].HFontSize != 0) {
-                                    option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
-                                } else {
-                                    option.cols[0][i + 1]["style"] = "font-size:100%";
-                                }
-                                //璁剧疆鍒楀
-                                //if (data1.data[0].HColumnWidth != 0) {
-                                //    option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
-                                //} else {
-                                //    option.cols[0][i + 1]["width"] = "";
-                                //}
-                                //鏄剧ず鍒�
-                                if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
-                                    option.cols[0][i + 1]["hide"] = false;
-                                }
-                                //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
-                                switch (dataCols[2]) {
-                                    case "L":
-                                        option.cols[0][i + 1]["align"] = "left";
-                                        break;
-                                    case "M":
-                                        option.cols[0][i + 1]["align"] = "center";
-                                        break;
-                                    case "R":
-                                        option.cols[0][i + 1]["align"] = "right";
-                                        break;
-                                }
-                            }
-
-                            //鍙栨秷鍐荤粨鍒�
-                            for (var i = 1; i < option.cols[0].length - 1; i++) {
-                                if (option.cols[0][i]["fixed"] != null) {
-                                    option.cols[0][i]["fixed"] = null;
-                                }
-                                else {
-                                    break;
-                                }
-                            }
-                            //鍐荤粨鍒�
-                            if (data1.data[0].HFixCols != 0) {
-                                for (var i = 0; i < data1.data[0].HFixCols; i++) {
-                                    if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
-                                        data1.data[0].HFixCols += 1;
-                                    }
-                                    option.cols[0][i + 1]["fixed"] = "left";
-                                }
-                            }
-                            table.render(option);
-                        } else {
-                            table.render(option);
-                        }
-                    }, error: function () {
-                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
-                    }
-                })
             }
             //#endregion
 

--
Gitblit v1.9.1