From d7fd6f0f55bbdcb2c4322e3aea4b6ffaae6b146c Mon Sep 17 00:00:00 2001
From: yxj <yxj@hz-kingdee.com>
Date: 星期四, 25 一月 2024 08:39:13 +0800
Subject: [PATCH] 新增工资类型、工种模块

---
 WebTM/views/基础资料/工资基础资料/Gy_WorkTypeList.html          |  848 +++++++++++++++++
 /dev/null                                             |  329 ------
 WebTM/views/基础资料/工资基础资料/Gy_WorkPayTypeEdit.html       |  376 +++++++
 WebTM/views/基础资料/工资基础资料/Gy_WorkPayTypeList.html       |  848 +++++++++++++++++
 WebTM/views/基础资料/工资基础资料/Gy_ClassTimePrjList.html      |   32 
 WebTM/views/index.html                                |   19 
 WebTM/views/基础资料/工资基础资料/Gy_ClassTimePrjGroupList.html |   32 
 WebTM/WebTM.csproj                                    |   12 
 WebTM/views/基础资料/工资基础资料/Gy_WorkTypeEdit.html          |  408 ++++++++
 9 files changed, 2,524 insertions(+), 380 deletions(-)

diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 694df97..3006758 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -121,7 +121,6 @@
     <Content Include="views\Baseset\鍩虹璧勬枡\Gy_BadCountDevelopWHList.html" />
     <Content Include="views\Baseset\鍩虹璧勬枡\Gy_BadWHList.html" />
     <Content Include="views\Baseset\鍩虹璧勬枡\Gy_BankList.html" />
-    <Content Include="views\Baseset\鍩虹璧勬枡\Gy_ClassTimePrjGroupEdit.html" />
     <Content Include="views\Baseset\鍩虹璧勬枡\Gy_ClassTimePrjList.html" />
     <Content Include="views\Baseset\鍩虹璧勬枡\Gy_ConveyCompList.html" />
     <Content Include="views\Baseset\鍩虹璧勬枡\Gy_ConveyTypeList.html" />
@@ -324,8 +323,12 @@
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Xs_SeOrderBill.aspx" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Xs_SeOrderChangeBillList.aspx" />
     <Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_RepairCheckList_PDA.html" />
+    <Content Include="views\鍩虹璧勬枡\宸ヨ祫鍩虹璧勬枡\Gy_WorkTypeEdit.html" />
+    <Content Include="views\鍩虹璧勬枡\宸ヨ祫鍩虹璧勬枡\Gy_WorkPayTypeEdit.html" />
     <Content Include="views\鍩虹璧勬枡\宸ヨ祫鍩虹璧勬枡\Gy_ClassTimePrjGroupEdit.html" />
     <Content Include="views\鍩虹璧勬枡\宸ヨ祫鍩虹璧勬枡\Gy_ClassTimePrjEdit.html" />
+    <Content Include="views\鍩虹璧勬枡\宸ヨ祫鍩虹璧勬枡\Gy_WorkTypeList.html" />
+    <Content Include="views\鍩虹璧勬枡\宸ヨ祫鍩虹璧勬枡\Gy_WorkPayTypeList.html" />
     <Content Include="views\鍩虹璧勬枡\宸ヨ祫鍩虹璧勬枡\Gy_ClassTimePrjGroupList.html" />
     <Content Include="views\鍩虹璧勬枡\宸ヨ祫鍩虹璧勬枡\Gy_ProcCommPrice.html" />
     <Content Include="views\鍩虹璧勬枡\宸ヨ祫鍩虹璧勬枡\Gy_ProcCommPriceList.html" />
@@ -1171,10 +1174,6 @@
     <Content Include="views\鍩虹璧勬枡\闅愯棌鍒楄缃甛Gy_GridView_Hide.html" />
     <Content Include="views\宸ヨ祫绠$悊\Gy_DuSubsidyItemBillEdit.html" />
     <Content Include="views\宸ヨ祫绠$悊\Gy_DuSubsidyItemBillList.html" />
-    <Content Include="views\宸ヨ祫绠$悊\Gy_WorkPayTypeBillEdit.html" />
-    <Content Include="views\宸ヨ祫绠$悊\Gy_WorkPayTypeBillList.html" />
-    <Content Include="views\宸ヨ祫绠$悊\Gy_WorkTypeBillEdit.html" />
-    <Content Include="views\宸ヨ祫绠$悊\Gy_WorkTypeBillList.html" />
     <Content Include="views\宸ヨ祫绠$悊\澶栬喘澧欏竷宸ヨ祫\Pay_PurchaseWallclothBillEdit.html" />
     <Content Include="views\宸ヨ祫绠$悊\澶栬喘澧欏竷宸ヨ祫\Pay_PurchaseWallclothBillList.html" />
     <Content Include="views\宸ヨ祫绠$悊\宸ヨ祫鎶ヨ〃\Pay_EmpPayMentSumReport.html" />
@@ -1193,10 +1192,7 @@
     <Content Include="views\宸ヨ祫绠$悊\宸ヨ祫缁撶畻鍗�%28鍏朵粬%29\Pay_OtherBalBillEdit.html" />
     <Content Include="views\宸ヨ祫绠$悊\宸ヨ祫缁撶畻鍗�%28鍏朵粬%29\Pay_OtherBalBillList.html" />
     <Content Include="views\宸ヨ祫绠$悊\宸ヨ祫杩愮畻\Pay_SingleBalBillOperation.html" />
-    <Content Include="views\宸ヨ祫绠$悊\鏍哥畻鏂瑰紡\Gy_ClassTimePrjGroupBillList.html" />
     <Content Include="views\宸ヨ祫绠$悊\鏍哥畻鏂瑰紡\Gy_ClassTimePrjSubBillEdit.html" />
-    <Content Include="views\宸ヨ祫绠$悊\鏍哥畻鏂瑰紡\Gy_ClassTimePrjBillEdit.html" />
-    <Content Include="views\宸ヨ祫绠$悊\鏍哥畻鏂瑰紡\Gy_ClassTimePrjBillList.html" />
     <Content Include="views\宸ヨ祫绠$悊\鏍哥畻鏂瑰紡\Gy_ClassTimePrjSubBillList.html" />
     <Content Include="views\宸ヨ祫绠$悊\鐝粍鑱屽憳娓呭崟\Gy_GroupEmpBillEdit.html" />
     <Content Include="views\宸ヨ祫绠$悊\鐝粍鑱屽憳娓呭崟\Gy_GroupEmpBillList.html" />
diff --git "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ClassTimePrjGroupEdit.html" "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ClassTimePrjGroupEdit.html"
deleted file mode 100644
index b0879c7..0000000
--- "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ClassTimePrjGroupEdit.html"
+++ /dev/null
@@ -1,247 +0,0 @@
-锘�<!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/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>
-</head>
-<body>
-    <div id="layout1" class="layui-fluid">
-        <div class="layui-row layui-col-space15">
-            <div class="layui-col-md12">
-                <div class="layui-card">
-                    <form id="form0" class="layui-form" lay-filter="component-form-group" action="">
-                        <div class="layui-card-header">
-                            <div class="layui-btn-group">
-                                <button type="button" id="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>
-                                <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">鏍哥畻鏂瑰紡缁勪唬鐮�</label>
-                                                <div class="layui-input-inline">
-                                                    <input type="text" name="HNumber" id="HNumber" class="layui-input">
-                                                </div>
-                                            </div>
-                                            <div class="layui-inline">
-                                                <label class="layui-form-label">鏍哥畻鏂瑰紡缁勫悕绉�</label>
-                                                <div class="layui-input-inline">
-                                                    <input type="text" name="HName" id="HName" class="layui-input">
-                                                </div>
-                                            </div>
-                                            <div class="layui-inline">
-                                                <label class="layui-form-label">閮ㄩ棬<label style="color:red"> * </label></label>
-                                                <div class="layui-input-inline">
-                                                    <input type="text" name="HDeptName" id="HDeptName" readonly class="layui-input" value="" style="float:left;width:150px;">
-                                                    <input type="hidden" name="HDeptID" id="HDeptID" class="layui-input" value="" style="float:left;width:150px;">
-                                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="Department" style="width:40px;">
-                                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
-                                                    </button>
-                                                </div>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </form>
-                </div>
-            </div>
-        </div>
-    </div>
-    <script type="text/html" id="barDemo">
-        <!--<a class="layui-btn layui-btn-xs" lay-event="edit">缂栬緫</a>-->
-        <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
-    </script>
-    <script>
-        //鑾峰彇鍙傛暟
-        var params = get_UrlVars();
-        if (typeof (params[params[0]]) == "undefined") {
-            var OperationType = 1;//鎿嶄綔绫诲瀷
-            var closeType = 2;  //鍏抽棴绫诲瀷
-        } else {
-            var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
-            var linterid = params[params[1]];//婧愬崟id
-            var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
-            var closeType = params[params[3]];  //鍏抽棴绫诲瀷
-        }
-        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 杩涘叆椤甸潰鏃㈠姞杞�
-            //鍒ゆ柇鎿嶄綔绫诲瀷
-            if (OperationType == 3) {//缂栬緫
-                set_EditFromGrid(linterid);
-            }
-            //#endregion
-
-            //#region 鐐瑰嚮浜嬩欢锛屽寘鎷琽n鍜宖orm浜嬩欢
-            //琛ㄥご淇℃伅閮ㄩ棬寮圭獥
-            form.on('submit(Department)', function () {
-                //椤甸潰灞�-鑷畾涔�
-                layer.open({
-                    type: 2,
-                    skin: 'layui-layer-rim', //鍔犱笂杈规
-                    title: '閮ㄩ棬鍒楄〃',
-                    closeBtn: 1,
-                    shift: 2,
-                    area: ['80%', '80%'],
-                    maxmin: true,
-                    content: ['../../PublicPage/DeptInformation.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('璇烽�夋嫨鏁版嵁');
-                        }
-                        $("#HDeptName").val(checkStatus.data[0].HName);
-                        $("#HDeptID").val(checkStatus.data[0].HItemID);
-                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
-                    }
-                    , btn2: function (index, layero) {
-                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
-                        //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
-                    },
-                    end: function () {
-
-                    },
-                    success: function (layero, index) {
-
-                    }
-                });
-            });
-
-            //淇濆瓨
-            form.on('submit(Saver)', function (data) {
-                var refSav = "";
-                var HItem = 0;
-                if (linterid == "" || linterid == null) {
-                    refSav = "Add";
-                }
-                if (linterid != "" && linterid != null) {
-                    refSav = "Update";
-                    HItem = linterid;
-                }
-                var HNumber = $("#HNumber").val();
-                var HName = $("#HName").val();
-                var HDeptID = $("#HDeptID").val();
-                if (HNumber == '' || HNumber == null || HName == '' || HName == null || HDeptID == '' || HDeptID == null) {
-                    layer.msg("璇峰皢鏁版嵁濉啓瀹屾暣", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                    return Result = false;
-                }
-                $.ajax(
-                    {
-                        type: "GET",
-                        url: GetWEBURL() + "/Web/SaveGetClassTimePrjGroupList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
-                        async: true,
-                        data: { "HNumber": HNumber, "HName": HName, "HDeptID": HDeptID, "refSav": refSav, "user": sessionStorage["HUserName"], "HItem": HItem},
-                        dataType: "json",
-                        success: function (data) {
-                            if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
-                                layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
-                                    var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
-                                    parent.layer.close(index); //鍐嶆墽琛屽叧闂�
-                                });
-                            }
-                            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);
-                        }
-                    });
-            });
-            //閫�鍑�
-            form.on('submit(Exit)', function (data) {
-                if (linterid == undefined) {
-                    //鍏抽棴椤电
-                    Pub_Close(2);
-                }
-                else {
-                    //鍏抽棴椤电
-                    Pub_Close(1);
-                }
-            });
-           
-            //#region 姝ら〉闈㈡墍鏈夋柟娉�
-            //缂栬緫
-            function set_EditFromGrid(linterid) {
-                set_EditForm(linterid);  //缂栬緫鑾峰彇琛ㄥご
-            }
-            //缂栬緫鑾峰彇琛ㄥご
-            function set_EditForm(linterid) {
-                $.ajax({
-                    url: GetWEBURL() + "Web/GetClassTimePrjGroupBillEdit_Json",
-                    type: "GET",
-                    data: {
-                        "sWhere": linterid
-                    },
-                    success: function (result) {
-                        if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
-                            var data = result.data[0];
-                            form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
-                                "HNumber": data.HNumber
-                                , "HName": data.HName
-                                , "HDeptID": data.HDeptID
-                                , "HDeptName": data.浠撳簱鍚嶇О
-                            });
-                        } else {
-                            layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
-                        }
-                    }, error: function () {
-                        layer.alert("鍙戠敓閿欒!", { icon: 5 });
-                    }
-                });
-            }
-            
-            function f_alert(sMsg) {
-                layer.alert(sMsg, { icon: 5 });
-
-            }
-            
-
-            //#endregion
-
-
-        });
-    </script>
-</body>
-</html>
\ No newline at end of file
diff --git a/WebTM/views/index.html b/WebTM/views/index.html
index 19dfc8f..e1cb62d 100644
--- a/WebTM/views/index.html
+++ b/WebTM/views/index.html
@@ -893,11 +893,9 @@
                                     </dl>
                                 </dd>
                                 <dd>
-                                    <a>鏍哥畻鏂瑰紡</a>
+                                    <a>鏍哥畻璁板綍</a>
                                     <dl class="layui-nav-child">
-                                        <dd><a lay-href="宸ヨ祫绠$悊/鏍哥畻鏂瑰紡/Gy_ClassTimePrjBillList.html">鏍哥畻鏂瑰紡</a></dd>
                                         <dd><a lay-href="宸ヨ祫绠$悊/鏍哥畻鏂瑰紡/Gy_ClassTimePrjSubBillList.html">鏍哥畻璁板綍</a></dd>
-                                        <dd><a lay-href="宸ヨ祫绠$悊/鏍哥畻鏂瑰紡/Gy_ClassTimePrjGroupBillList.html">鏍哥畻鏂瑰紡缁�</a></dd>
                                     </dl>
                                 </dd>
                                 <dd>
@@ -930,15 +928,12 @@
                                     </dl>
                                 </dd>
                                 <dd>
-                                    <a>宸ヨ祫绫诲瀷</a>
+                                    <a>宸ヨ祫鍩虹璧勬枡</a>
                                     <dl class="layui-nav-child">
-                                        <dd><a lay-href="宸ヨ祫绠$悊/Gy_WorkPayTypeBillList.html">宸ヨ祫绫诲瀷鍒楄〃缁存姢</a></dd>
-                                    </dl>
-                                </dd>
-                                <dd>
-                                    <a>宸ョ鍒嗙被</a>
-                                    <dl class="layui-nav-child">
-                                        <dd><a lay-href="宸ヨ祫绠$悊/Gy_WorkTypeBillList.html">宸ョ鍒楄〃缁存姢</a></dd>
+                                        <dd><a lay-href="鍩虹璧勬枡/宸ヨ祫鍩虹璧勬枡/Gy_WorkPayTypeList.html">宸ヨ祫绫诲瀷</a></dd>
+                                        <dd><a lay-href="鍩虹璧勬枡/宸ヨ祫鍩虹璧勬枡/Gy_ClassTimePrjList.html">鏍哥畻鏂瑰紡</a></dd>
+                                        <dd><a lay-href="鍩虹璧勬枡/宸ヨ祫鍩虹璧勬枡/Gy_ClassTimePrjGroupList.html">鏍哥畻鏂瑰紡缁�</a></dd>
+                                        <dd><a lay-href="鍩虹璧勬枡/宸ヨ祫鍩虹璧勬枡/Gy_WorkTypeList.html">宸ョ</a></dd>
                                     </dl>
                                 </dd>
                                 <dd>
@@ -1137,8 +1132,10 @@
                                 <dd>
                                     <a>宸ヨ祫鍩虹璧勬枡</a>
                                     <dl class="layui-nav-child">
+                                        <dd><a lay-href="鍩虹璧勬枡/宸ヨ祫鍩虹璧勬枡/Gy_WorkPayTypeList.html">宸ヨ祫绫诲瀷</a></dd>
                                         <dd><a lay-href="鍩虹璧勬枡/宸ヨ祫鍩虹璧勬枡/Gy_ClassTimePrjList.html">鏍哥畻鏂瑰紡</a></dd>
                                         <dd><a lay-href="鍩虹璧勬枡/宸ヨ祫鍩虹璧勬枡/Gy_ClassTimePrjGroupList.html">鏍哥畻鏂瑰紡缁�</a></dd>
+                                        <dd><a lay-href="鍩虹璧勬枡/宸ヨ祫鍩虹璧勬枡/Gy_WorkTypeList.html">宸ョ</a></dd>
                                         <dd><a lay-href="鍩虹璧勬枡/宸ヨ祫鍩虹璧勬枡/Gy_ProcPrice.html">宸ュ簭宸ヤ环璧勬枡</a></dd>
                                         <dd><a lay-href="鍩虹璧勬枡/宸ヨ祫鍩虹璧勬枡/Gy_ProcPriceList.html">宸ュ簭宸ヤ环璧勬枡缁存姢</a></dd>
                                         <dd><a lay-href="鍩虹璧勬枡/宸ヨ祫鍩虹璧勬枡/Gy_WorkDay.html">宸ヤ綔鏃ュ垪琛�</a></dd>
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ClassTimePrjGroupList.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ClassTimePrjGroupList.html"
index 1ec4189..e80fe75 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ClassTimePrjGroupList.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ClassTimePrjGroupList.html"
@@ -105,8 +105,8 @@
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_AbandonCheck" id="btn_AbandonCheck"><i class="layui-icon layui-icon-search"></i>鍙嶅鏍�</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Stop" id="btn_Stop"><i class="layui-icon layui-icon-search"></i>绂佺敤</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_AbandonStop" id="btn_AbandonStop"><i class="layui-icon layui-icon-search"></i>鍙嶇鐢�</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Cell" id="btn_Cell"><i class="layui-icon layui-icon-slider"></i>淇濆瓨鍒楀</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_RefreshCell" id="btn_RefreshCell"><i class="layui-icon layui-icon-cols"></i>榛樿鍒楀</button>
+                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Cell" id="btn_Cell"><i class="layui-icon layui-icon-slider"></i>淇濆瓨鍒楀</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_RefreshCell" id="btn_RefreshCell"><i class="layui-icon layui-icon-cols"></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="btn_Exit" id="btn_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
@@ -260,10 +260,10 @@
                                 if (dataCols[1] == 1) {
                                     option.cols[0][i + 1]["hide"] = true;
                                 }
-                                ////璁剧疆鍒楀
-                                //if (dataCols[3] > 0) {
-                                //    option.cols[0][i + 1]["width"] = dataCols[3];
-                                //}
+                                //璁剧疆鍒楀
+                                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;";
@@ -784,16 +784,16 @@
 
                             columns = col;
 
-                            //璁剧疆璧嬪�煎垪瀹�
-                            var colWidth = getColumnsWidth();
-                            if (colWidth == "" || colWidth == []) {
+                            ////璁剧疆璧嬪�煎垪瀹�
+                            //var colWidth = getColumnsWidth();
+                            //if (colWidth == "" || colWidth == []) {
 
-                            }
-                            else {
-                                $.each(columns, function (x, m) {
-                                    m["width"] = colWidth[x];
-                                });
-                            }
+                            //}
+                            //else {
+                            //    $.each(columns, function (x, m) {
+                            //        m["width"] = colWidth[x];
+                            //    });
+                            //}
                             option.cols = [columns];
                             option.data = data1.data;
                             option.totalRow = true;
@@ -816,7 +816,7 @@
                         layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
                     }
                 });
-                DisPlay_HideColumn();
+                //DisPlay_HideColumn();
             }
             //#endregion
 
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ClassTimePrjList.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ClassTimePrjList.html"
index cde1bdc..6bc630b 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ClassTimePrjList.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ClassTimePrjList.html"
@@ -111,8 +111,8 @@
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_AbandonCheck" id="btn_AbandonCheck"><i class="layui-icon layui-icon-search"></i>鍙嶅鏍�</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Stop" id="btn_Stop"><i class="layui-icon layui-icon-search"></i>绂佺敤</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_AbandonStop" id="btn_AbandonStop"><i class="layui-icon layui-icon-search"></i>鍙嶇鐢�</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Cell" id="btn_Cell"><i class="layui-icon layui-icon-slider"></i>淇濆瓨鍒楀</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_RefreshCell" id="btn_RefreshCell"><i class="layui-icon layui-icon-cols"></i>榛樿鍒楀</button>
+                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Cell" id="btn_Cell"><i class="layui-icon layui-icon-slider"></i>淇濆瓨鍒楀</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_RefreshCell" id="btn_RefreshCell"><i class="layui-icon layui-icon-cols"></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="btn_Exit" id="btn_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
@@ -266,10 +266,10 @@
                                 if (dataCols[1] == 1) {
                                     option.cols[0][i + 1]["hide"] = true;
                                 }
-                                ////璁剧疆鍒楀
-                                //if (dataCols[3] > 0) {
-                                //    option.cols[0][i + 1]["width"] = dataCols[3];
-                                //}
+                                //璁剧疆鍒楀
+                                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;";
@@ -795,16 +795,16 @@
 
                             columns = col;
 
-                            //璁剧疆璧嬪�煎垪瀹�
-                            var colWidth = getColumnsWidth();
-                            if (colWidth == "" || colWidth == []) {
+                            ////璁剧疆璧嬪�煎垪瀹�
+                            //var colWidth = getColumnsWidth();
+                            //if (colWidth == "" || colWidth == []) {
 
-                            }
-                            else {
-                                $.each(columns, function (x, m) {
-                                    m["width"] = colWidth[x];
-                                });
-                            }
+                            //}
+                            //else {
+                            //    $.each(columns, function (x, m) {
+                            //        m["width"] = colWidth[x];
+                            //    });
+                            //}
                             option.cols = [columns];
                             option.data = data1.data;
                             option.totalRow = true;
@@ -827,7 +827,7 @@
                         layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
                     }
                 });
-                DisPlay_HideColumn();
+                //DisPlay_HideColumn();
             }
             //#endregion
 
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkPayTypeEdit.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkPayTypeEdit.html"
new file mode 100644
index 0000000..043a719
--- /dev/null
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkPayTypeEdit.html"
@@ -0,0 +1,376 @@
+锘�<!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">
+    <!--寮曠敤layui鏍峰紡鏂囦欢-->
+    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+    <!--寮曠敤layui js鏂囦欢-->
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/Scripts/json2.js"></script>
+    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
+    <style>
+        .layui-form-item .layui-inline {
+            margin-top: 5px;
+            margin-bottom: 5px;
+            margin-right: 0px;
+        }
+
+        .layui-form-label {
+            width: 25%;
+        }
+    </style>
+</head>
+<body>
+    <div class="layui-fluid" style="padding: 0;">
+        <div class="layui-card" style="padding: 2px;background-color: #efefef;">
+            <div class="layui-card-body" style="padding: 1px;">
+                <form class="layui-form" action="" lay-filter="component-form-group" style="background-color:white;">
+                    <div style="padding: 10px; ">
+                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btn_Save" id="btn_Save">淇濆瓨</button>
+                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btn_Cancel" id="btn_Cancel">閫�鍑�</button>
+                    </div>
+                    <div class="layui-tab" lay-filter="tab-Gy_WorkPayTypeEdit">
+                        <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>
+                        <div class="layui-tab-content">
+                            <!--鍩烘湰淇℃伅-->
+                            <div class="layui-tab-item layui-show">
+                                <div class="layui-form-item" style="padding-top: 10px;">
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">宸ヨ祫绫诲瀷浠g爜</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" lay-verify="HNumber" name="HNumber" id="HNumber" placeholder="璇疯緭鍏ュ唴瀹�">
+                                            </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" lay-verify="HName" name="HName" id="HName" placeholder="璇疯緭鍏ュ唴瀹�">
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-inline" style="width: 917px;">
+                                            <label class="layui-form-label" style="width: 85px;">澶囨敞</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" lay-verify="HRemark" name="HRemark" id="HRemark" onmouseover="this.title=this.value">
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-inline" style="width: 610px;">
+                                            <label class="layui-form-label" style="width: 85px;">缁勭粐*</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <select name="HUSEORGID" id="HUSEORGID" lay-verify="HUSEORGID">
+                                                    <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+                                                </select>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <div class="layui-input-block" style="margin-left: 200px;">
+                                                <input type="checkbox" name="checkboxHStopflag" id="checkboxHStopflag" lay-skin="primary" lay-filter="checkboxHStopflag" value="true" title="鏄惁绂佺敤"disabled="disabled">
+                                                <input type="hidden" value="false" name="HStopflag" id="HStopflag">
+                                            </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="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="HCheckTime" id="HCheckTime" 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="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>
+                                    <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="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>
+
+                                    <!--闅愯棌瀛楁-->
+                                    <div class="layui-row" style="display:none;">
+                                        <div class="layui-inline">
+                                            <div class="layui-input-block" style="margin-left: 77px;">
+                                                <input type="hidden" lay-verify="HItemID" name="HItemID" id="HItemID" value="0">
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+    <script>
+        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
+                , element = layui.element;
+            var HItemID = $('#HItemID').val()
+            var HMaker = sessionStorage["HUserName"]
+            var HUSEORGID = sessionStorage["OrganizationID"]  //缁勭粐ID
+            var OperationType = 1       //鎿嶄綔绫诲瀷锛�1鏂板銆�2缂栬緫锛�
+            //#endregion
+
+            //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
+            if (sessionStorage.login != "login") {
+                layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
+                    icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
+                }, function () { window.location.href = "../../user/login.html"; });
+            }
+
+            //鑾峰彇缁勭粐
+            Organ();
+
+            //#region   鑾峰彇缁勭粐
+            function Organ() {
+                //鑾峰彇鐧诲綍椤电粍缁囧垪
+                $.ajax({
+                    type: "GET",
+                    url: GetWEBURL() + "/Web/GetOrganizations",
+                    async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                    success: function (result) {
+                        var Organization = "";
+                        if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            var data = result.data;
+                            for (var i = 0; i < data.length; i++) {
+                                Organization += '<option  style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
+                            }
+                            $("#HUSEORGID").append(Organization);
+                            $("#HUSEORGID").val(HUSEORGID)
+                            form.render('select');
+                        }
+                        layer.closeAll("loading");
+                    }
+                })
+            }
+            //#endregion
+
+            //鑾峰彇椤甸潰璺宠浆鍙傛暟
+            var params = get_UrlVars();
+            OperationType = params[params[0]];  //鎿嶄綔绫诲瀷锛�1鏂板銆�2缂栬緫锛�
+            HItemID = params[params[1]];        //鍗曟嵁鍐呯爜
+
+            //鍒ゆ柇鎿嶄綔绫诲瀷
+            if (OperationType == 1) {   //鏂板
+                $("#HItemID").val(0);
+                $("#HMakeEmp").val(HMaker);
+                $("#HMakeTime").val(Pub_Format(new Date(), "yyyy-MM-dd"));
+                //绂佺敤缁勭粐閫夐」
+                //$("#HUSEORGID").attr("disabled", true);
+            }
+            else if (OperationType == 2) {  //缂栬緫
+                $("#HItemID").val(HItemID);//淇敼鏃朵富琛↖D
+                //缂栬緫鐘舵�佹椂锛屾牴鎹唴鐮侊紝鑾峰彇淇℃伅骞跺啓鍏ョ晫闈�
+                RoadBillMain(HItemID);
+            }
+            else {
+                layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
+            }
+
+            //#region 杩斿洖鐣岄潰淇℃伅
+            function RoadBillMain(HItemID) {
+                var ajaxLoad = layer.load();
+                $.ajax({
+                    type: "GET",
+                    url: GetWEBURL() + "Gy_WorkPayTypeController/GetGy_WorkPayType_Json",
+                    async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                    data: { "HItemID": HItemID },
+                    success: function (result) {
+                        if (result.code == 1) {
+                            var data = result.data[0];
+                            var IsHStopflag = data.绂佺敤鏍囪;
+                            //绂佺敤鏍囪
+                            if (IsHStopflag) {
+                                $("input[name='checkboxHStopflag'][value='" + IsHStopflag + "']").attr("checked", true);
+                            }
+                            if (data.瀹℃牳浜�!="") {
+                                $('#btn_Save').addClass("layui-btn-disabled").attr("disabled", true);
+                            }
+                            if (data.HUSEORGID != 0) {
+                                //绂佺敤缁勭粐閫夐」
+                                $("#HUSEORGID").attr("disabled", true);
+                            }
+                            form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+                                "HItemID": data.HItemID
+                                , "HNumber": data.宸ヨ祫绫诲瀷浠g爜
+                                , "HName": data.宸ヨ祫绫诲瀷鍚嶇О
+                                , "HStopflag": data.绂佺敤鏍囪
+                                , "HRemark": data.澶囨敞
+                                , "HUSEORGID": data.HUSEORGID
+                                , "HMakeEmp": data.鍒涘缓浜�
+                                , "HMakeTime": data.鍒涘缓鏃ユ湡 == null ? "" : Pub_Format(data.鍒涘缓鏃ユ湡, "yyyy-MM-dd hh:mm:ss")
+                                , "HCheckEmp": data.瀹℃牳浜�
+                                , "HCheckTime": data.瀹℃牳鏃ユ湡 == null ? "" : Pub_Format(data.瀹℃牳鏃ユ湡, "yyyy-MM-dd hh:mm:ss")
+                                , "HModifyEmp": data.淇敼浜�
+                                , "HModifyTime": data.淇敼鏃ユ湡 == null ? "" : Pub_Format(data.淇敼鏃ユ湡, "yyyy-MM-dd hh:mm:ss")
+                                , "HStopEmp": data.绂佺敤浜�
+                                , "HStopTime": data.绂佺敤鏃ユ湡 == null ? "" : Pub_Format(data.绂佺敤鏃ユ湡, "yyyy-MM-dd hh:mm:ss")
+                            });
+                            layer.close(ajaxLoad);
+                        } else {
+                            layer.close(ajaxLoad);
+                            layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+                        }
+                    }, error: function () {
+                        layer.close(ajaxLoad);
+                        layer.alert("鍙戠敓閿欒!", { icon: 5 });
+                    }
+                });
+            }
+            //#endregion
+
+
+
+            //涓嬫媺妗嗘椂闂� 缁勭粐
+            form.on('select(HUSEORGID)', function (data) {
+                $("#HUSEORGID").val(data.value);
+            });
+
+            //鏄惁绂佺敤鎸夐挳
+            form.on('checkbox(checkboxHStopflag)', function (data) {
+                $("#HStopflag").val(data.elem.checked);
+            });
+
+
+            //#region 鍔熻兘鎺т欢
+
+            //#region 淇濆瓨
+
+            //淇濆瓨鎸夐挳
+            form.on('submit(btn_Save)', function (data) {
+                set_SaveBill(data);
+            });
+
+            //淇濆瓨鏂规硶
+            function set_SaveBill(data) {
+                //淇濆瓨鍓嶅垽鏂�
+                if (!$("#HNumber").val()) {
+                    layer.msg("宸ヨ祫绫诲瀷浠g爜涓嶅厑璁镐负绌猴紝璇疯緭鍏ュ伐璧勭被鍨嬩唬鐮侊紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return;
+                }
+                if (!$("#HName").val()) {
+                    layer.msg("宸ヨ祫绫诲瀷鍚嶇О涓嶅厑璁镐负绌猴紝璇疯緭鍏ュ伐璧勭被鍨嬪悕绉帮紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return;
+                }
+                if (data.field.HUSEORGID == '') {
+                    layer.msg("缁勭粐涓嶅厑璁镐负绌猴紝璇烽�夋嫨缁勭粐锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return;
+                }
+
+                var sMainStr = JSON.stringify(data.field) + ';' + HMaker + ';' + OperationType;
+
+                var index = layer.load();
+                $.ajax({
+                    type: "POST",
+                    url: GetWEBURL() + "Gy_WorkPayTypeController/GetGy_WorkPayType_Save_Json",
+                    async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                    data: { "oMain": sMainStr },
+                    dataType: "json",
+                    success: function (data) {
+                        if (data.count == 1) {
+                            layer.msg(data.Message, { icon: 1 });
+                            $('#btn_Save').addClass("layui-btn-disabled").attr("disabled", true);
+                            layer.close(index);
+                        }
+                        else {
+                            layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            layer.close(index);
+                        }
+                    },
+                    error: function (err) {
+                        layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        layer.close(index);
+                    }
+                });
+            }
+
+            //#endregion
+
+            //#region 閫�鍑�
+
+            //閫�鍑烘寜閽�
+            form.on('submit(btn_Cancel)', function () {
+                Pub_Close(1);
+            });
+
+            //#endregion
+
+            //#endregion
+
+
+
+        });
+    </script>
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkPayTypeList.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkPayTypeList.html"
new file mode 100644
index 0000000..48a455b
--- /dev/null
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkPayTypeList.html"
@@ -0,0 +1,848 @@
+锘�<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>宸ヨ祫绫诲瀷鍒楄〃</title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+    <!--寮曠敤layui鏍峰紡鏂囦欢-->
+    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+    <!--寮曠敤layui js鏂囦欢-->
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/Scripts/json2.js"></script>
+    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
+    <script src="../../../layuiadmin/HideButton.js"></script>
+    <script src="../../../layuiadmin/soulTable.slim.js"></script>
+    <style>
+        .layui-form-select .layui-input {
+            padding-right: 15px;
+            cursor: pointer;
+        }
+    </style>
+</head>
+<body>
+    <div class="layui-fluid">
+        <div class="layui-col-md12">
+            <div class="layui-card" style="padding: 1px">
+                <div class="layui-card-body" style="padding: 1px;">
+                    <form class="layui-form" action="" lay-filter="component-form-group">
+                        <div class="layui-collapse">
+                            <div class="layui-colla-item">
+                                <div class="layui-colla-title layui-inline">
+                                    <div class="layui-inline">
+                                        <span>鏇村</span>
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">宸ヨ祫绫诲瀷浠g爜</label>
+                                    <div class="layui-input-block">
+                                        <input type="text" class="layui-input" name="HNumber" id="HNumber" style="width:190px;">
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">宸ヨ祫绫诲瀷鍚嶇О</label>
+                                    <div class="layui-input-block">
+                                        <input type="text" class="layui-input" name="HName" id="HName" style="width:190px;">
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label" style="width: 85px;">缁勭粐</label>
+                                    <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
+                                        <select name="HStockOrgID" id="HStockOrgID" lay-verify="HStockOrgID">
+                                            <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+                                        </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>
+                                <button type="button" class="layui-btn layuiadmin-btn-order" lay-submit="" lay-filter="btn_ReSearch" id="btn_ReSearch" style="padding:0 5px">閲嶇疆</button>
+
+                                <div class="layui-colla-content">
+                                    <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;">
+                                                </select>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
+                                                <option value="0" selected="selected"></option>
+                                                <option value="=">=</option>
+                                                <option value=">=">>=</option>
+                                                <option value=">">></option>
+                                                <option value="<="><=</option>
+                                                <option value="<"><</option>
+                                                <option value="<>"><></option>
+                                                <option value="7">鍖呭惈</option>
+                                                <option value="8">宸﹀寘鍚�</option>
+                                                <option value="9">鍙冲寘鍚�</option>
+                                                <option value="10">涓嶅寘鍚�</option>
+                                            </select>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                        <table class="" id="mainTable" lay-filter="mainTable"></table>
+                        <script type="text/html" id="toolbarDemo">
+                            <div class="layui-btn-container">
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_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_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-search"></i>鍒锋柊</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Check" id="btn_Check"><i class="layui-icon layui-icon-search"></i>瀹℃牳</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_AbandonCheck" id="btn_AbandonCheck"><i class="layui-icon layui-icon-search"></i>鍙嶅鏍�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Stop" id="btn_Stop"><i class="layui-icon layui-icon-search"></i>绂佺敤</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_AbandonStop" id="btn_AbandonStop"><i class="layui-icon layui-icon-search"></i>鍙嶇鐢�</button>
+                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Cell" id="btn_Cell"><i class="layui-icon layui-icon-slider"></i>淇濆瓨鍒楀</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_RefreshCell" id="btn_RefreshCell"><i class="layui-icon layui-icon-cols"></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="btn_Exit" id="btn_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
+                            </div>
+                        </script>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+    <script>
+        layui.config({
+            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index'  //涓诲叆鍙fā鍧�
+        }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate','soulTable'], function () {
+            
+            //#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 HMaker = sessionStorage["HUserName"]
+            var HStockOrgID = sessionStorage["OrganizationID"]  //缁勭粐ID
+            var sWhere = "";
+            var ins;                //鐢ㄤ簬瀵煎嚭excel
+            var option = [];
+            var columns = "";
+            var HModName = "Gy_WorkPayTypeList";
+            var titleData = [];     //涓嶉渶瑕佹樉绀虹殑瀛楁
+            //#endregion
+
+            //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+            //鍒濆鍖栫晫闈�
+            set_ClearBill();
+
+            //#region 鍒濆鍖栫晫闈�
+            function set_ClearBill() {
+                //鑾峰彇缁勭粐
+                set_StockOrg();
+                //鍒濆鍖栬〃鏍�
+                set_InitGrid();
+                //鍒锋柊
+                sWhere = "HUSEORGID=" + sessionStorage["OrganizationID"];
+                get_Display(sWhere);
+            }
+            //#endregion
+
+            //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
+            if (sessionStorage.login != "login") {
+                layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
+                    icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
+                }, function () { window.location.href = "../../user/login.html"; });
+            }
+
+            //#region   鑾峰彇缁勭粐
+            function set_StockOrg() {
+                //鑾峰彇鐧诲綍椤电粍缁囧垪
+                $.ajax({
+                    type: "GET",
+                    url: GetWEBURL() + "/Web/GetOrganizations",
+                    async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                    success: function (result) {
+                        var Organization = "";
+                        Organization += '<option  style="color:blue;" value="鍏ㄩ儴">鍏ㄩ儴</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>';
+                            }
+                            $("#HStockOrgID").append(Organization);
+                            $("#HStockOrgID").val(sessionStorage["Organization"])
+                            form.render('select');
+                        }
+                        layer.closeAll("loading");
+                    }
+                })
+            }
+            //#endregion
+
+            //#region 鍒濆鍖栬〃鏍�
+            function set_InitGrid() {
+                option = {
+                    elem: '#mainTable'
+                    , toolbar: '#toolbarDemo'
+                    , page: true
+                    , totalRow: true
+                    , height: 'full-50'
+                    , cellMinWidth: 90
+                    , limit: 50
+                    , limits: [50, 500, 5000, 20000]
+                    , done: function (res, curr, count) {
+                        soulTable.render(this);
+                    }
+                };
+            }
+            //#endregion
+
+            //#region 鑾峰彇鍒楀
+            function getColumnsWidth() {
+                var result = [];
+                var colNum = $(".layui-table-header").find("tr").eq(0).find("th").length;
+                //鑾峰彇鍒楀
+                $.ajax({
+                    type: "Get",
+                    url: GetWEBURL() + '/tb_CellWidth/GetMouldScrapInHouseCellWidthList',
+                    async: false,
+                    dataType: "json",
+                    data: { "colNum": colNum, "Name": HModName },
+                    success: function (data1) {
+                        if (data1.code == 1) {
+                            result = data1.data;
+                        }
+                        else if (data1.code == -1) {
+
+                        }
+                        else {
+                            layer.alert(data1.Message, { icon: 5 });
+                        }
+                    }, error: function (e) {
+                        layer.alert(e.Message, { icon: 5 });
+                    }
+                });
+                return result;
+            }
+            //#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);
+                        }
+                    }, error: function () {
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                })
+            }
+            //#endregion
+
+        //#endregion
+
+        //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
+
+            //#region 宸ュ叿鏍忎簨浠�
+            table.on('toolbar(mainTable)', function (obj) {
+                switch (obj.event) {
+                    //瀵煎嚭鎸夐挳
+                    case 'btn_Export': btn_Export();
+                        break;
+                    //鏂板鎸夐挳
+                    case 'btn_AddNew': btn_AddNew();
+                        break;
+                    //淇敼鎸夐挳
+                    case 'btn_Modify': btn_Modify();
+                        break;
+                    //鍒犻櫎鎸夐挳
+                    case 'btn_Delete': btn_Delete();
+                        break;
+                    //鍒锋柊鎸夐挳
+                    case 'btn_Refresh': btn_Refresh();
+                        break;
+                    //瀹℃牳鎸夐挳
+                    case 'btn_Check': set_CheckBill(0);
+                        break;
+                    //鍙嶅鏍告寜閽�
+                    case 'btn_AbandonCheck': set_CheckBill(1);
+                        break;
+                    //绂佺敤鎸夐挳
+                    case 'btn_Stop': set_StopBill(0);
+                        break;
+                    //鍙嶇鐢ㄦ寜閽�
+                    case 'btn_AbandonStop': set_StopBill(1);
+                        break;
+                    //淇濆瓨鍒楀鎸夐挳
+                    case 'btn_Cell': set_SaveGridColWidth();
+                        break;
+                    //榛樿鍒楀鎸夐挳
+                    case 'btn_RefreshCell': set_DefaultGridColWidth();
+                        break;
+                    //鍒楄缃�
+                    case 'btn_HideColumn': get_HideColumn();
+                        break;
+                    //鎸夐挳璁剧疆
+                    case 'btn_HideButton':
+                        var btns = document.getElementsByTagName("button");     //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+                        get_HideButton(btns, HModName, HModName, HMaker);
+                        break;
+                    //閫�鍑烘寜閽�
+                    case 'btn_Exit': Pub_Close(2);
+                        break;
+                };
+            });
+            //#endregion
+
+            //#region 瀵煎嚭Execel
+            function btn_Export() {
+                table.exportFile(ins.config.id, option.data, "xls");
+            }
+            //#endregion
+
+            //#region 鏂板
+            function btn_AddNew() {
+                layer.open({
+                    type: 2
+                    , skin: 'layui-layer-rim'   //鍔犱笂杈规
+                    , area: ['100%', '100%']
+                    , title: '宸ヨ祫绫诲瀷-鏂板'
+                    , shift: 0  //寮瑰嚭鍔ㄧ敾
+                    , content: '../宸ヨ祫鍩虹璧勬枡/Gy_WorkPayTypeEdit.html?OperationType=1&HItemID=0'
+                    , btn: ['纭畾'],
+                    // 鎸夐挳1 鐨勫洖璋�
+                    end: function (index, layero, that) {
+                        //鍒锋柊椤甸潰
+                        $("#btn_Search").trigger('click');
+                    }
+                })
+            }
+            //#endregion
+
+            //#region 淇敼
+            function btn_Modify() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var HItemID = data[0].HItemID.toString();
+                    layer.open({
+                        type: 2
+                        , area: ['100%', '100%']
+                        , title: '宸ヨ祫绫诲瀷-缂栬緫'
+                        , shift: 0  //寮瑰嚭鍔ㄧ敾
+                        , content: '../宸ヨ祫鍩虹璧勬枡/Gy_WorkPayTypeEdit.html?OperationType=2&HItemID=' + HItemID
+                        , btn: ['纭畾'],
+                        // 鎸夐挳1 鐨勫洖璋�
+                        end: function (index, layero, that) {
+                            //鍒锋柊椤甸潰
+                            $("#btn_Search").trigger('click');
+                        }
+                    })
+                } else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+                }
+            }
+            //#endregion
+
+            //#region 鍒犻櫎
+            function btn_Delete() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var HItemID = data[0].HItemID.toString();
+                    layer.confirm("纭瑕佸垹闄ら�変腑琛屾暟鎹紵鍒犻櫎鍚庡皢涓嶅彲鎭㈠锛�", { title: "鍒犻櫎纭" }, function (index) {
+                        var wait = layer.load();
+                        $.ajax({
+                            type: "GET",
+                            url: GetWEBURL() + "/Gy_WorkPayTypeController/GetGy_WorkPayType_Delete_Json",
+                            async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                            data: { "HItemID": HItemID, "HMaker": HMaker },
+                            success: function (result) {
+                                if (result.count == 1) {
+                                    layer.msg(result.Message, { icon: 1 }, function () {
+                                        //鍒锋柊鐣岄潰
+                                        $("#btn_Search").trigger('click');
+                                        layer.close(wait);
+                                    });
+                                } else {
+                                    layer.msg(result.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                                    layer.close(wait);
+                                }
+                            }, error: function (err) {
+                                layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                                layer.close(wait);
+                            }
+                        });
+                    })
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+                }
+            }
+            //#endregion
+
+            //#region 鍒锋柊
+            function btn_Refresh() {
+                set_ClearQuery();
+                get_Display(sWhere);
+            }
+            //#endregion
+
+            //#region 瀹℃牳锛坣um=0锛�/鍙嶅鏍革紙num=1锛�
+            function set_CheckBill(num) {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var HItemID = data[0].HItemID.toString();
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "/Gy_WorkPayTypeController/GetGy_WorkPayType_Check_Json",
+                        async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                        data: { "HItemID": HItemID, "IsAudit": num, "HMaker": HMaker },
+                        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.Message, { icon: 5 });
+                            }
+                        }, error: function () {
+                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                        }
+                    });
+                }
+                else {
+                    if (num == 0) {
+                        layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+                    }
+                    else {
+                        layer.msg('璇烽�夋嫨涓�琛屾暟鎹弽瀹℃牳锛�');
+                    }
+                }
+            }
+            //#endregion
+
+            //#region 绂佺敤锛坣um=0锛�/鍙嶇鐢紙num=1锛�
+            function set_StopBill(num) {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var HItemID = data[0].HItemID.toString();
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "/Gy_WorkPayTypeController/GetGy_WorkPayType_Stop_Json",
+                        async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                        data: { "HItemID": HItemID, "IsStop": num, "HMaker": HMaker },
+                        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.Message, { icon: 5 });
+                            }
+                        }, error: function () {
+                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                        }
+                    });
+                }
+                else {
+                    if (num == 0) {
+                        layer.msg('璇烽�夋嫨涓�琛屾暟鎹鐢紒');
+                    }
+                    else {
+                        layer.msg('璇烽�夋嫨涓�琛屾暟鎹弽绂佺敤锛�');
+                    }
+                }
+            }
+            //#endregion
+
+            //#region 淇濆瓨鍒楀
+            function set_SaveGridColWidth() {
+                var arr = [];
+                // 鍒楁暟
+                var colNum = $(".layui-table-header").find("tr").eq(0).find("th").length;
+                for (var i = 0; i <= colNum; i++) {
+                    var colName = $(".layui-table-header").find("tr").eq(0).find("th").eq(i).text();
+                    var colWidth = $(".layui-table-header").find("tr").eq(0).find("th").eq(i).width();
+                    if (colName != "" && colName != null) {
+                        arr.push(colWidth == -1 ? 200 : colWidth);
+                    }
+                }
+                arr.unshift(40); //棣栦綅杩藉姞
+                $.ajax({
+                    type: "POST",
+                    async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                    url: GetWEBURL() + '/tb_CellWidth/GetMouldScrapInHouseCellWidth',
+                    dataType: "json",
+                    data: { "myMap": JSON.stringify(arr), "Name": HModName },
+                    success: function (data1) {
+                        if (data1.count == 1) {
+                            //layer.alert(data1.Message, { icon: 1 });
+                        } else {
+                            layer.alert(data1.Message, { icon: 5 });
+                        }
+                    }, error: function (e) {
+                        layer.alert(e.Message, { icon: 5 });
+                    }
+                });
+                //璁剧疆璧嬪�煎垪瀹�
+                var colWidth = getColumnsWidth();
+                if (colWidth == "" || colWidth == []) {
+
+                }
+                else {
+                    $.each(columns, function (x, m) {
+                        m["width"] = colWidth[x];
+                    });
+                }
+                //location.reload();
+            }
+            //#endregion
+
+            //#region 榛樿鍒楀
+            function set_DefaultGridColWidth() {
+                var arr = [];
+                // 鍒楁暟
+                var colNum = $(".layui-table-header").find("tr").eq(0).find("th").length;
+                for (var i = 0; i <= colNum; i++) {
+                    var colName = $(".layui-table-header").find("tr").eq(0).find("th").eq(i).text();
+                    if (colName != "" && colName != null) {
+                        arr.push(200);   //榛樿瀹藉害200
+                    }
+                }
+                arr.unshift(40); //棣栦綅杩藉姞
+                $.ajax({
+                    type: "POST",
+                    async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                    url: GetWEBURL() + '/tb_CellWidth/GetMouldScrapInHouseCellWidth',
+                    dataType: "json",
+                    data: { "myMap": JSON.stringify(arr), "Name": HModName },
+                    success: function (data1) {
+                        if (data1.count == 1) {
+
+                        } else {
+                            layer.alert(data1.Message, { icon: 5 });
+                        }
+                    }, error: function (e) {
+                        layer.alert(e.Message, { icon: 5 });
+                    }
+                });
+                //璁剧疆璧嬪�煎垪瀹�
+                var colWidth = getColumnsWidth();
+                if (colWidth == "" || colWidth == []) {
+
+                }
+                else {
+                    $.each(columns, function (x, m) {
+                        m["width"] = colWidth[x];
+                    });
+                }
+                location.reload();
+            }
+            //#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 閲嶇疆鎸夐挳
+            form.on('submit(btn_ReSearch)', function (data) {
+                //娓呯┖杩囨护鏉′欢
+                set_ClearQuery();
+            });
+
+            //閲嶇疆杩囨护鏉′欢
+            function set_ClearQuery() {
+                $("#HNumber").val("");      //浠g爜
+                $("#HName").val("");        //鍚嶇О
+                $("#ColName").val("0");
+                $("#Comparator").val("0");
+                $("#ColContent").val("");
+                $("#HStockOrgID").val(sessionStorage["Organization"])   //缁勭粐
+                form.render('select');
+                sWhere = "HUSEORGID=" + sessionStorage["OrganizationID"];
+            }
+
+            //#endregion
+
+            //#region 鏌ヨ鎸夐挳
+            form.on('submit(btn_Search)', function (data) {
+                get_FastQuery();
+            });
+
+            //蹇�熸煡璇�
+            function get_FastQuery() {
+                var HNumber = $("#HNumber").val();              //宸ヨ祫绫诲瀷浠g爜
+                var HName = $("#HName").val();                  //宸ヨ祫绫诲瀷鍚嶇О
+                var HStockOrgName = $("#HStockOrgID").val();    //缁勭粐
+                var ColName = $("#ColName").val();  //澶嶉�夋
+                var Comparator = $("#Comparator").val()
+                var ColContent = $("#ColContent").val();
+
+                if (HStockOrgName =="鍏ㄩ儴") {
+                    sWhere = "1=1";
+                }
+                else {
+                    sWhere = "缁勭粐='" + HStockOrgName + "'";
+                }
+
+                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 (HNumber) {
+                    sWhere += " and 宸ヨ祫绫诲瀷浠g爜 like '%" + HNumber + "%'";
+                }
+                if (HName) {
+                    sWhere += " and 宸ヨ祫绫诲瀷鍚嶇О like '%" + HName + "%'";
+                }
+                get_Display(sWhere);
+            }
+
+            //#endregion
+
+            //#region 鍒楄〃鍒锋柊
+            function get_Display(sWhere) {
+                var ajaxLoad = layer.load();
+                $.ajax({
+                    type: "GET",
+                    url: GetWEBURL() + '/Gy_WorkPayTypeController/GetGy_WorkPayTypeList_Json',
+                    async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                    data: { "sWhere": sWhere, "HMaker": HMaker },
+                    success: function (data1) {
+                        if (data1.count == 1) {
+                            var data = [];
+                            var col = [];
+                            //缁欑┖鐨勬暟缁勮祴鍊�
+                            for (var key in data1.list) {
+                                //鍔ㄦ�佽幏鍙栧垪琛ㄦ墍鏈夊垪鍚�
+                                data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+                                //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙H寮�澶寸殑鍒椾笉鏄剧ず锛�
+                                var patrn = new RegExp(/^h/i);
+                                if (patrn.test(data1.list[key].ColmCols)) {
+                                    titleData[key] = data1.list[key].ColmCols;
+                                }
+                            }
+
+                            //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+                            col.push({ type: 'checkbox', fixed: 'left' });
+                            for (var i = 0; i < data.length; i++) {
+                                if ($.inArray(data[i].name, titleData) > -1) {
+                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+                                }
+                                else {
+                                    switch (data[i].Type) {
+                                        //int
+                                        case 'DateTime':
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 160 });
+                                            break;
+                                        default:
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true });
+                                    }
+                                }
+                            }
+
+                            columns = col;
+
+                            ////璁剧疆璧嬪�煎垪瀹�
+                            //var colWidth = getColumnsWidth();
+                            //if (colWidth == "" || colWidth == []) {
+
+                            //}
+                            //else {
+                            //    $.each(columns, function (x, m) {
+                            //        m["width"] = colWidth[x];
+                            //    });
+                            //}
+                            option.cols = [columns];
+                            option.data = data1.data;
+                            option.totalRow = true;
+                            table.render(option);
+                            ins = table.render(option);
+                            //鍒锋柊琛ㄦ牸鏁版嵁
+                            DisPlay_HideColumn();
+                            layer.close(ajaxLoad);
+                            //鑷畾涔夎繃婊や笅鎷夋鍔犺浇
+                            if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+                                ColFilter();
+                            }
+                        } else {
+                            layer.close(ajaxLoad);
+                            layer.alert(data1.Message, { icon: 5 });
+                        }
+                    },
+                    error: function () {
+                        layer.close(ajaxLoad);
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+                //DisPlay_HideColumn();
+            }
+            //#endregion
+
+            //#region 鑷畾涔夎繃婊や笅鎷夋
+            function ColFilter() {
+                var Organization = '<option  value="0" selected="selected" ></option>';
+                for (var i = 1; i < option.cols[0].length; i++) {
+                    if (option.cols[0][i].hide != true) {
+                        Organization += '<option  style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</option>';
+                    }
+                }
+                $("#ColName").empty();
+                $("#ColName").append(Organization);
+                form.render('select');
+            }
+            //#endregion
+
+        //#endregion
+
+
+        });
+
+
+
+
+    </script>
+
+</body>
+</html>
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkTypeEdit.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkTypeEdit.html"
new file mode 100644
index 0000000..364a0a1
--- /dev/null
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkTypeEdit.html"
@@ -0,0 +1,408 @@
+锘�<!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">
+    <!--寮曠敤layui鏍峰紡鏂囦欢-->
+    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+    <!--寮曠敤layui js鏂囦欢-->
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/Scripts/json2.js"></script>
+    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
+    <style>
+        .layui-form-item .layui-inline {
+            margin-top: 5px;
+            margin-bottom: 5px;
+            margin-right: 0px;
+        }
+
+        .layui-form-label {
+            width: 25%;
+        }
+    </style>
+</head>
+<body>
+    <div class="layui-fluid" style="padding: 0;">
+        <div class="layui-card" style="padding: 2px;background-color: #efefef;">
+            <div class="layui-card-body" style="padding: 1px;">
+                <form class="layui-form" action="" lay-filter="component-form-group" style="background-color:white;">
+                    <div style="padding: 10px; ">
+                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btn_Save" id="btn_Save">淇濆瓨</button>
+                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btn_Cancel" id="btn_Cancel">閫�鍑�</button>
+                    </div>
+                    <div class="layui-tab" lay-filter="tab-Gy_WorkTypeEdit">
+                        <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>
+                        <div class="layui-tab-content">
+                            <!--鍩烘湰淇℃伅-->
+                            <div class="layui-tab-item layui-show">
+                                <div class="layui-form-item" style="padding-top: 10px;">
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">宸ョ浠g爜</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" lay-verify="HNumber" name="HNumber" id="HNumber" placeholder="璇疯緭鍏ュ唴瀹�">
+                                            </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" lay-verify="HName" name="HName" id="HName" placeholder="璇疯緭鍏ュ唴瀹�">
+                                            </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" name="HPayMoney" id="HPayMoney" lay-verify="HPayMoney" onkeyup="if(!this.value.match(/^[\+\-]?\d*?\.?\d*?$/)){if(!this.t_value>0){this.value=''}else{this.value=this.t_value;}}else this.t_value=this.value;if(this.value.match(/^(?:[\+\-]?\d+(?:\.\d+)?)?$/))this.o_value=this.value" autocomplete="off" class="layui-input" onfocus="this.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;">
+                                                <input type="text" name="HDayMoney" id="HDayMoney" lay-verify="HDayMoney" onkeyup="if(!this.value.match(/^[\+\-]?\d*?\.?\d*?$/)){if(!this.t_value>0){this.value=''}else{this.value=this.t_value;}}else this.t_value=this.value;if(this.value.match(/^(?:[\+\-]?\d+(?:\.\d+)?)?$/))this.o_value=this.value" autocomplete="off" class="layui-input" onfocus="this.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;">
+                                                <select name="HForEmp" id="HForEmp" lay-verify="HForEmp">
+                                                    <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;">
+                                                <input type="text" class="layui-input" lay-verify="HRemark" name="HRemark" id="HRemark" onmouseover="this.title=this.value">
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-inline" style="width: 610px;">
+                                            <label class="layui-form-label" style="width: 85px;">缁勭粐*</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <select name="HUSEORGID" id="HUSEORGID" lay-verify="HUSEORGID">
+                                                    <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+                                                </select>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <div class="layui-input-block" style="margin-left: 200px;">
+                                                <input type="checkbox" name="checkboxHStopflag" id="checkboxHStopflag" lay-skin="primary" lay-filter="checkboxHStopflag" value="true" title="鏄惁绂佺敤" disabled="disabled">
+                                                <input type="hidden" value="false" name="HStopflag" id="HStopflag">
+                                            </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="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="HCheckTime" id="HCheckTime" 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="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>
+                                    <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="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>
+
+                                    <!--闅愯棌瀛楁-->
+                                    <div class="layui-row" style="display:none;">
+                                        <div class="layui-inline">
+                                            <div class="layui-input-block" style="margin-left: 77px;">
+                                                <input type="hidden" lay-verify="HItemID" name="HItemID" id="HItemID" value="0">
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+    <script>
+        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
+                , element = layui.element;
+            var HItemID = $('#HItemID').val()
+            var HMaker = sessionStorage["HUserName"]
+            var HUSEORGID = sessionStorage["OrganizationID"]  //缁勭粐ID
+            var OperationType = 1       //鎿嶄綔绫诲瀷锛�1鏂板銆�2缂栬緫锛�
+            //#endregion
+
+            //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
+            if (sessionStorage.login != "login") {
+                layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
+                    icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
+                }, function () { window.location.href = "../../user/login.html"; });
+            }
+
+            //鑾峰彇缁勭粐
+            Organ();
+
+            //#region   鑾峰彇缁勭粐
+            function Organ() {
+                //鑾峰彇鐧诲綍椤电粍缁囧垪
+                $.ajax({
+                    type: "GET",
+                    url: GetWEBURL() + "/Web/GetOrganizations",
+                    async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                    success: function (result) {
+                        var Organization = "";
+                        if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            var data = result.data;
+                            for (var i = 0; i < data.length; i++) {
+                                Organization += '<option  style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
+                            }
+                            $("#HUSEORGID").append(Organization);
+                            $("#HUSEORGID").val(HUSEORGID)
+                            form.render('select');
+                        }
+                        layer.closeAll("loading");
+                    }
+                })
+            }
+            //#endregion
+
+            //鑾峰彇椤甸潰璺宠浆鍙傛暟
+            var params = get_UrlVars();
+            OperationType = params[params[0]];  //鎿嶄綔绫诲瀷锛�1鏂板銆�2缂栬緫锛�
+            HItemID = params[params[1]];        //鍗曟嵁鍐呯爜
+
+            //鍒ゆ柇鎿嶄綔绫诲瀷
+            if (OperationType == 1) {   //鏂板
+                $("#HItemID").val(0);
+                $("#HMakeEmp").val(HMaker);
+                $("#HMakeTime").val(Pub_Format(new Date(), "yyyy-MM-dd"));
+                //绂佺敤缁勭粐閫夐」
+                //$("#HUSEORGID").attr("disabled", true);
+            }
+            else if (OperationType == 2) {  //缂栬緫
+                $("#HItemID").val(HItemID);//淇敼鏃朵富琛↖D
+                //缂栬緫鐘舵�佹椂锛屾牴鎹唴鐮侊紝鑾峰彇淇℃伅骞跺啓鍏ョ晫闈�
+                RoadBillMain(HItemID);
+            }
+            else {
+                layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
+            }
+
+            //#region 杩斿洖鐣岄潰淇℃伅
+            function RoadBillMain(HItemID) {
+                var ajaxLoad = layer.load();
+                $.ajax({
+                    type: "GET",
+                    url: GetWEBURL() + "Gy_WorkTypeController/GetGy_WorkType_Json",
+                    async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                    data: { "HItemID": HItemID },
+                    success: function (result) {
+                        if (result.code == 1) {
+                            var data = result.data[0];
+                            var IsHStopflag = data.绂佺敤鏍囪;
+                            //绂佺敤鏍囪
+                            if (IsHStopflag) {
+                                $("input[name='checkboxHStopflag'][value='" + IsHStopflag + "']").attr("checked", true);
+                            }
+                            if (data.瀹℃牳浜�!="") {
+                                $('#btn_Save').addClass("layui-btn-disabled").attr("disabled", true);
+                            }
+                            if (data.HUSEORGID != 0) {
+                                //绂佺敤缁勭粐閫夐」
+                                $("#HUSEORGID").attr("disabled", true);
+                            }
+                            form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+                                "HItemID": data.HItemID
+                                , "HNumber": data.宸ョ浠g爜
+                                , "HName": data.宸ョ鍚嶇О
+                                , "HPayMoney": data.灏忔椂宸ヨ祫
+                                , "HDayMoney": data.鏃ュ伐璧�
+                                , "HForEmp": data.鑰冭檻浜烘暟
+                                , "HStopflag": data.绂佺敤鏍囪
+                                , "HRemark": data.澶囨敞
+                                , "HUSEORGID": data.HUSEORGID
+                                , "HMakeEmp": data.鍒涘缓浜�
+                                , "HMakeTime": data.鍒涘缓鏃ユ湡 == null ? "" : Pub_Format(data.鍒涘缓鏃ユ湡, "yyyy-MM-dd hh:mm:ss")
+                                , "HCheckEmp": data.瀹℃牳浜�
+                                , "HCheckTime": data.瀹℃牳鏃ユ湡 == null ? "" : Pub_Format(data.瀹℃牳鏃ユ湡, "yyyy-MM-dd hh:mm:ss")
+                                , "HModifyEmp": data.淇敼浜�
+                                , "HModifyTime": data.淇敼鏃ユ湡 == null ? "" : Pub_Format(data.淇敼鏃ユ湡, "yyyy-MM-dd hh:mm:ss")
+                                , "HStopEmp": data.绂佺敤浜�
+                                , "HStopTime": data.绂佺敤鏃ユ湡 == null ? "" : Pub_Format(data.绂佺敤鏃ユ湡, "yyyy-MM-dd hh:mm:ss")
+                            });
+                            layer.close(ajaxLoad);
+                        } else {
+                            layer.close(ajaxLoad);
+                            layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+                        }
+                    }, error: function () {
+                        layer.close(ajaxLoad);
+                        layer.alert("鍙戠敓閿欒!", { icon: 5 });
+                    }
+                });
+            }
+            //#endregion
+
+
+
+            //涓嬫媺妗嗘椂闂� 缁勭粐
+            form.on('select(HUSEORGID)', function (data) {
+                $("#HUSEORGID").val(data.value);
+            });
+
+            //鏄惁绂佺敤鎸夐挳
+            form.on('checkbox(checkboxHStopflag)', function (data) {
+                $("#HStopflag").val(data.elem.checked);
+            });
+
+
+            //#region 鍔熻兘鎺т欢
+
+            //#region 淇濆瓨
+
+            //淇濆瓨鎸夐挳
+            form.on('submit(btn_Save)', function (data) {
+                set_SaveBill(data);
+            });
+
+            //淇濆瓨鏂规硶
+            function set_SaveBill(data) {
+                //淇濆瓨鍓嶅垽鏂�
+                if (!$("#HNumber").val()) {
+                    layer.msg("宸ョ浠g爜涓嶅厑璁镐负绌猴紝璇疯緭鍏ュ伐绉嶄唬鐮侊紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return;
+                }
+                if (!$("#HName").val()) {
+                    layer.msg("宸ョ鍚嶇О涓嶅厑璁镐负绌猴紝璇疯緭鍏ュ伐绉嶅悕绉帮紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return;
+                }
+                if (data.field.HUSEORGID == '') {
+                    layer.msg("缁勭粐涓嶅厑璁镐负绌猴紝璇烽�夋嫨缁勭粐锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return;
+                }
+                if (data.field.HPayMoney == '') {
+                    data.field.HPayMoney = 0;
+                }
+                if (data.field.HDayMoney == '') {
+                    data.field.HDayMoney = 0;
+                }
+
+                var sMainStr = JSON.stringify(data.field) + ';' + HMaker + ';' + OperationType;
+
+                var index = layer.load();
+                $.ajax({
+                    type: "POST",
+                    url: GetWEBURL() + "Gy_WorkTypeController/GetGy_WorkType_Save_Json",
+                    async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                    data: { "oMain": sMainStr },
+                    dataType: "json",
+                    success: function (data) {
+                        if (data.count == 1) {
+                            layer.msg(data.Message, { icon: 1 });
+                            $('#btn_Save').addClass("layui-btn-disabled").attr("disabled", true);
+                            layer.close(index);
+                        }
+                        else {
+                            layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            layer.close(index);
+                        }
+                    },
+                    error: function (err) {
+                        layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        layer.close(index);
+                    }
+                });
+            }
+
+            //#endregion
+
+            //#region 閫�鍑�
+
+            //閫�鍑烘寜閽�
+            form.on('submit(btn_Cancel)', function () {
+                Pub_Close(1);
+            });
+
+            //#endregion
+
+            //#endregion
+
+
+
+        });
+    </script>
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkTypeList.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkTypeList.html"
new file mode 100644
index 0000000..a36de1e
--- /dev/null
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkTypeList.html"
@@ -0,0 +1,848 @@
+锘�<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>宸ョ鍒楄〃</title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+    <!--寮曠敤layui鏍峰紡鏂囦欢-->
+    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+    <!--寮曠敤layui js鏂囦欢-->
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/Scripts/json2.js"></script>
+    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
+    <script src="../../../layuiadmin/HideButton.js"></script>
+    <script src="../../../layuiadmin/soulTable.slim.js"></script>
+    <style>
+        .layui-form-select .layui-input {
+            padding-right: 15px;
+            cursor: pointer;
+        }
+    </style>
+</head>
+<body>
+    <div class="layui-fluid">
+        <div class="layui-col-md12">
+            <div class="layui-card" style="padding: 1px">
+                <div class="layui-card-body" style="padding: 1px;">
+                    <form class="layui-form" action="" lay-filter="component-form-group">
+                        <div class="layui-collapse">
+                            <div class="layui-colla-item">
+                                <div class="layui-colla-title layui-inline">
+                                    <div class="layui-inline">
+                                        <span>鏇村</span>
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">宸ョ浠g爜</label>
+                                    <div class="layui-input-block">
+                                        <input type="text" class="layui-input" name="HNumber" id="HNumber" style="width:190px;">
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">宸ョ鍚嶇О</label>
+                                    <div class="layui-input-block">
+                                        <input type="text" class="layui-input" name="HName" id="HName" style="width:190px;">
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label" style="width: 85px;">缁勭粐</label>
+                                    <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
+                                        <select name="HStockOrgID" id="HStockOrgID" lay-verify="HStockOrgID">
+                                            <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+                                        </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>
+                                <button type="button" class="layui-btn layuiadmin-btn-order" lay-submit="" lay-filter="btn_ReSearch" id="btn_ReSearch" style="padding:0 5px">閲嶇疆</button>
+
+                                <div class="layui-colla-content">
+                                    <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;">
+                                                </select>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
+                                                <option value="0" selected="selected"></option>
+                                                <option value="=">=</option>
+                                                <option value=">=">>=</option>
+                                                <option value=">">></option>
+                                                <option value="<="><=</option>
+                                                <option value="<"><</option>
+                                                <option value="<>"><></option>
+                                                <option value="7">鍖呭惈</option>
+                                                <option value="8">宸﹀寘鍚�</option>
+                                                <option value="9">鍙冲寘鍚�</option>
+                                                <option value="10">涓嶅寘鍚�</option>
+                                            </select>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                        <table class="" id="mainTable" lay-filter="mainTable"></table>
+                        <script type="text/html" id="toolbarDemo">
+                            <div class="layui-btn-container">
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_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_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-search"></i>鍒锋柊</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Check" id="btn_Check"><i class="layui-icon layui-icon-search"></i>瀹℃牳</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_AbandonCheck" id="btn_AbandonCheck"><i class="layui-icon layui-icon-search"></i>鍙嶅鏍�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Stop" id="btn_Stop"><i class="layui-icon layui-icon-search"></i>绂佺敤</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_AbandonStop" id="btn_AbandonStop"><i class="layui-icon layui-icon-search"></i>鍙嶇鐢�</button>
+                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Cell" id="btn_Cell"><i class="layui-icon layui-icon-slider"></i>淇濆瓨鍒楀</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_RefreshCell" id="btn_RefreshCell"><i class="layui-icon layui-icon-cols"></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="btn_Exit" id="btn_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
+                            </div>
+                        </script>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+    <script>
+        layui.config({
+            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index'  //涓诲叆鍙fā鍧�
+        }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate','soulTable'], function () {
+            
+            //#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 HMaker = sessionStorage["HUserName"]
+            var HStockOrgID = sessionStorage["OrganizationID"]  //缁勭粐ID
+            var sWhere = "";
+            var ins;                //鐢ㄤ簬瀵煎嚭excel
+            var option = [];
+            var columns = "";
+            var HModName = "Gy_WorkTypeList";
+            var titleData = [];     //涓嶉渶瑕佹樉绀虹殑瀛楁
+            //#endregion
+
+            //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+            //鍒濆鍖栫晫闈�
+            set_ClearBill();
+
+            //#region 鍒濆鍖栫晫闈�
+            function set_ClearBill() {
+                //鑾峰彇缁勭粐
+                set_StockOrg();
+                //鍒濆鍖栬〃鏍�
+                set_InitGrid();
+                //鍒锋柊
+                sWhere = "HUSEORGID=" + sessionStorage["OrganizationID"];
+                get_Display(sWhere);
+            }
+            //#endregion
+
+            //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
+            if (sessionStorage.login != "login") {
+                layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
+                    icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
+                }, function () { window.location.href = "../../user/login.html"; });
+            }
+
+            //#region   鑾峰彇缁勭粐
+            function set_StockOrg() {
+                //鑾峰彇鐧诲綍椤电粍缁囧垪
+                $.ajax({
+                    type: "GET",
+                    url: GetWEBURL() + "/Web/GetOrganizations",
+                    async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                    success: function (result) {
+                        var Organization = "";
+                        Organization += '<option  style="color:blue;" value="鍏ㄩ儴">鍏ㄩ儴</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>';
+                            }
+                            $("#HStockOrgID").append(Organization);
+                            $("#HStockOrgID").val(sessionStorage["Organization"])
+                            form.render('select');
+                        }
+                        layer.closeAll("loading");
+                    }
+                })
+            }
+            //#endregion
+
+            //#region 鍒濆鍖栬〃鏍�
+            function set_InitGrid() {
+                option = {
+                    elem: '#mainTable'
+                    , toolbar: '#toolbarDemo'
+                    , page: true
+                    , totalRow: true
+                    , height: 'full-50'
+                    , cellMinWidth: 90
+                    , limit: 50
+                    , limits: [50, 500, 5000, 20000]
+                    , done: function (res, curr, count) {
+                        soulTable.render(this);
+                    }
+                };
+            }
+            //#endregion
+
+            //#region 鑾峰彇鍒楀
+            function getColumnsWidth() {
+                var result = [];
+                var colNum = $(".layui-table-header").find("tr").eq(0).find("th").length;
+                //鑾峰彇鍒楀
+                $.ajax({
+                    type: "Get",
+                    url: GetWEBURL() + '/tb_CellWidth/GetMouldScrapInHouseCellWidthList',
+                    async: false,
+                    dataType: "json",
+                    data: { "colNum": colNum, "Name": HModName },
+                    success: function (data1) {
+                        if (data1.code == 1) {
+                            result = data1.data;
+                        }
+                        else if (data1.code == -1) {
+
+                        }
+                        else {
+                            layer.alert(data1.Message, { icon: 5 });
+                        }
+                    }, error: function (e) {
+                        layer.alert(e.Message, { icon: 5 });
+                    }
+                });
+                return result;
+            }
+            //#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);
+                        }
+                    }, error: function () {
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                })
+            }
+            //#endregion
+
+        //#endregion
+
+        //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
+
+            //#region 宸ュ叿鏍忎簨浠�
+            table.on('toolbar(mainTable)', function (obj) {
+                switch (obj.event) {
+                    //瀵煎嚭鎸夐挳
+                    case 'btn_Export': btn_Export();
+                        break;
+                    //鏂板鎸夐挳
+                    case 'btn_AddNew': btn_AddNew();
+                        break;
+                    //淇敼鎸夐挳
+                    case 'btn_Modify': btn_Modify();
+                        break;
+                    //鍒犻櫎鎸夐挳
+                    case 'btn_Delete': btn_Delete();
+                        break;
+                    //鍒锋柊鎸夐挳
+                    case 'btn_Refresh': btn_Refresh();
+                        break;
+                    //瀹℃牳鎸夐挳
+                    case 'btn_Check': set_CheckBill(0);
+                        break;
+                    //鍙嶅鏍告寜閽�
+                    case 'btn_AbandonCheck': set_CheckBill(1);
+                        break;
+                    //绂佺敤鎸夐挳
+                    case 'btn_Stop': set_StopBill(0);
+                        break;
+                    //鍙嶇鐢ㄦ寜閽�
+                    case 'btn_AbandonStop': set_StopBill(1);
+                        break;
+                    //淇濆瓨鍒楀鎸夐挳
+                    case 'btn_Cell': set_SaveGridColWidth();
+                        break;
+                    //榛樿鍒楀鎸夐挳
+                    case 'btn_RefreshCell': set_DefaultGridColWidth();
+                        break;
+                    //鍒楄缃�
+                    case 'btn_HideColumn': get_HideColumn();
+                        break;
+                    //鎸夐挳璁剧疆
+                    case 'btn_HideButton':
+                        var btns = document.getElementsByTagName("button");     //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+                        get_HideButton(btns, HModName, HModName, HMaker);
+                        break;
+                    //閫�鍑烘寜閽�
+                    case 'btn_Exit': Pub_Close(2);
+                        break;
+                };
+            });
+            //#endregion
+
+            //#region 瀵煎嚭Execel
+            function btn_Export() {
+                table.exportFile(ins.config.id, option.data, "xls");
+            }
+            //#endregion
+
+            //#region 鏂板
+            function btn_AddNew() {
+                layer.open({
+                    type: 2
+                    , skin: 'layui-layer-rim'   //鍔犱笂杈规
+                    , area: ['100%', '100%']
+                    , title: '宸ョ-鏂板'
+                    , shift: 0  //寮瑰嚭鍔ㄧ敾
+                    , content: '../宸ヨ祫鍩虹璧勬枡/Gy_WorkTypeEdit.html?OperationType=1&HItemID=0'
+                    , btn: ['纭畾'],
+                    // 鎸夐挳1 鐨勫洖璋�
+                    end: function (index, layero, that) {
+                        //鍒锋柊椤甸潰
+                        $("#btn_Search").trigger('click');
+                    }
+                })
+            }
+            //#endregion
+
+            //#region 淇敼
+            function btn_Modify() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var HItemID = data[0].HItemID.toString();
+                    layer.open({
+                        type: 2
+                        , area: ['100%', '100%']
+                        , title: '宸ョ-缂栬緫'
+                        , shift: 0  //寮瑰嚭鍔ㄧ敾
+                        , content: '../宸ヨ祫鍩虹璧勬枡/Gy_WorkTypeEdit.html?OperationType=2&HItemID=' + HItemID
+                        , btn: ['纭畾'],
+                        // 鎸夐挳1 鐨勫洖璋�
+                        end: function (index, layero, that) {
+                            //鍒锋柊椤甸潰
+                            $("#btn_Search").trigger('click');
+                        }
+                    })
+                } else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+                }
+            }
+            //#endregion
+
+            //#region 鍒犻櫎
+            function btn_Delete() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var HItemID = data[0].HItemID.toString();
+                    layer.confirm("纭瑕佸垹闄ら�変腑琛屾暟鎹紵鍒犻櫎鍚庡皢涓嶅彲鎭㈠锛�", { title: "鍒犻櫎纭" }, function (index) {
+                        var wait = layer.load();
+                        $.ajax({
+                            type: "GET",
+                            url: GetWEBURL() + "/Gy_WorkTypeController/GetGy_WorkType_Delete_Json",
+                            async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                            data: { "HItemID": HItemID, "HMaker": HMaker },
+                            success: function (result) {
+                                if (result.count == 1) {
+                                    layer.msg(result.Message, { icon: 1 }, function () {
+                                        //鍒锋柊鐣岄潰
+                                        $("#btn_Search").trigger('click');
+                                        layer.close(wait);
+                                    });
+                                } else {
+                                    layer.msg(result.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                                    layer.close(wait);
+                                }
+                            }, error: function (err) {
+                                layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                                layer.close(wait);
+                            }
+                        });
+                    })
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+                }
+            }
+            //#endregion
+
+            //#region 鍒锋柊
+            function btn_Refresh() {
+                set_ClearQuery();
+                get_Display(sWhere);
+            }
+            //#endregion
+
+            //#region 瀹℃牳锛坣um=0锛�/鍙嶅鏍革紙num=1锛�
+            function set_CheckBill(num) {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var HItemID = data[0].HItemID.toString();
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "/Gy_WorkTypeController/GetGy_WorkType_Check_Json",
+                        async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                        data: { "HItemID": HItemID, "IsAudit": num, "HMaker": HMaker },
+                        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.Message, { icon: 5 });
+                            }
+                        }, error: function () {
+                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                        }
+                    });
+                }
+                else {
+                    if (num == 0) {
+                        layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+                    }
+                    else {
+                        layer.msg('璇烽�夋嫨涓�琛屾暟鎹弽瀹℃牳锛�');
+                    }
+                }
+            }
+            //#endregion
+
+            //#region 绂佺敤锛坣um=0锛�/鍙嶇鐢紙num=1锛�
+            function set_StopBill(num) {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var HItemID = data[0].HItemID.toString();
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "/Gy_WorkTypeController/GetGy_WorkType_Stop_Json",
+                        async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                        data: { "HItemID": HItemID, "IsStop": num, "HMaker": HMaker },
+                        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.Message, { icon: 5 });
+                            }
+                        }, error: function () {
+                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                        }
+                    });
+                }
+                else {
+                    if (num == 0) {
+                        layer.msg('璇烽�夋嫨涓�琛屾暟鎹鐢紒');
+                    }
+                    else {
+                        layer.msg('璇烽�夋嫨涓�琛屾暟鎹弽绂佺敤锛�');
+                    }
+                }
+            }
+            //#endregion
+
+            //#region 淇濆瓨鍒楀
+            function set_SaveGridColWidth() {
+                var arr = [];
+                // 鍒楁暟
+                var colNum = $(".layui-table-header").find("tr").eq(0).find("th").length;
+                for (var i = 0; i <= colNum; i++) {
+                    var colName = $(".layui-table-header").find("tr").eq(0).find("th").eq(i).text();
+                    var colWidth = $(".layui-table-header").find("tr").eq(0).find("th").eq(i).width();
+                    if (colName != "" && colName != null) {
+                        arr.push(colWidth == -1 ? 200 : colWidth);
+                    }
+                }
+                arr.unshift(40); //棣栦綅杩藉姞
+                $.ajax({
+                    type: "POST",
+                    async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                    url: GetWEBURL() + '/tb_CellWidth/GetMouldScrapInHouseCellWidth',
+                    dataType: "json",
+                    data: { "myMap": JSON.stringify(arr), "Name": HModName },
+                    success: function (data1) {
+                        if (data1.count == 1) {
+                            //layer.alert(data1.Message, { icon: 1 });
+                        } else {
+                            layer.alert(data1.Message, { icon: 5 });
+                        }
+                    }, error: function (e) {
+                        layer.alert(e.Message, { icon: 5 });
+                    }
+                });
+                //璁剧疆璧嬪�煎垪瀹�
+                var colWidth = getColumnsWidth();
+                if (colWidth == "" || colWidth == []) {
+
+                }
+                else {
+                    $.each(columns, function (x, m) {
+                        m["width"] = colWidth[x];
+                    });
+                }
+                //location.reload();
+            }
+            //#endregion
+
+            //#region 榛樿鍒楀
+            function set_DefaultGridColWidth() {
+                var arr = [];
+                // 鍒楁暟
+                var colNum = $(".layui-table-header").find("tr").eq(0).find("th").length;
+                for (var i = 0; i <= colNum; i++) {
+                    var colName = $(".layui-table-header").find("tr").eq(0).find("th").eq(i).text();
+                    if (colName != "" && colName != null) {
+                        arr.push(200);   //榛樿瀹藉害200
+                    }
+                }
+                arr.unshift(40); //棣栦綅杩藉姞
+                $.ajax({
+                    type: "POST",
+                    async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                    url: GetWEBURL() + '/tb_CellWidth/GetMouldScrapInHouseCellWidth',
+                    dataType: "json",
+                    data: { "myMap": JSON.stringify(arr), "Name": HModName },
+                    success: function (data1) {
+                        if (data1.count == 1) {
+
+                        } else {
+                            layer.alert(data1.Message, { icon: 5 });
+                        }
+                    }, error: function (e) {
+                        layer.alert(e.Message, { icon: 5 });
+                    }
+                });
+                //璁剧疆璧嬪�煎垪瀹�
+                var colWidth = getColumnsWidth();
+                if (colWidth == "" || colWidth == []) {
+
+                }
+                else {
+                    $.each(columns, function (x, m) {
+                        m["width"] = colWidth[x];
+                    });
+                }
+                location.reload();
+            }
+            //#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 閲嶇疆鎸夐挳
+            form.on('submit(btn_ReSearch)', function (data) {
+                //娓呯┖杩囨护鏉′欢
+                set_ClearQuery();
+            });
+
+            //閲嶇疆杩囨护鏉′欢
+            function set_ClearQuery() {
+                $("#HNumber").val("");      //浠g爜
+                $("#HName").val("");        //鍚嶇О
+                $("#ColName").val("0");
+                $("#Comparator").val("0");
+                $("#ColContent").val("");
+                $("#HStockOrgID").val(sessionStorage["Organization"])   //缁勭粐
+                form.render('select');
+                sWhere = "HUSEORGID=" + sessionStorage["OrganizationID"];
+            }
+
+            //#endregion
+
+            //#region 鏌ヨ鎸夐挳
+            form.on('submit(btn_Search)', function (data) {
+                get_FastQuery();
+            });
+
+            //蹇�熸煡璇�
+            function get_FastQuery() {
+                var HNumber = $("#HNumber").val();              //宸ョ浠g爜
+                var HName = $("#HName").val();                  //宸ョ鍚嶇О
+                var HStockOrgName = $("#HStockOrgID").val();    //缁勭粐
+                var ColName = $("#ColName").val();  //澶嶉�夋
+                var Comparator = $("#Comparator").val()
+                var ColContent = $("#ColContent").val();
+
+                if (HStockOrgName =="鍏ㄩ儴") {
+                    sWhere = "1=1";
+                }
+                else {
+                    sWhere = "缁勭粐='" + HStockOrgName + "'";
+                }
+
+                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 (HNumber) {
+                    sWhere += " and 宸ョ浠g爜 like '%" + HNumber + "%'";
+                }
+                if (HName) {
+                    sWhere += " and 宸ョ鍚嶇О like '%" + HName + "%'";
+                }
+                get_Display(sWhere);
+            }
+
+            //#endregion
+
+            //#region 鍒楄〃鍒锋柊
+            function get_Display(sWhere) {
+                var ajaxLoad = layer.load();
+                $.ajax({
+                    type: "GET",
+                    url: GetWEBURL() + '/Gy_WorkTypeController/GetGy_WorkTypeList_Json',
+                    async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                    data: { "sWhere": sWhere, "HMaker": HMaker },
+                    success: function (data1) {
+                        if (data1.count == 1) {
+                            var data = [];
+                            var col = [];
+                            //缁欑┖鐨勬暟缁勮祴鍊�
+                            for (var key in data1.list) {
+                                //鍔ㄦ�佽幏鍙栧垪琛ㄦ墍鏈夊垪鍚�
+                                data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+                                //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙H寮�澶寸殑鍒椾笉鏄剧ず锛�
+                                var patrn = new RegExp(/^h/i);
+                                if (patrn.test(data1.list[key].ColmCols)) {
+                                    titleData[key] = data1.list[key].ColmCols;
+                                }
+                            }
+
+                            //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+                            col.push({ type: 'checkbox', fixed: 'left' });
+                            for (var i = 0; i < data.length; i++) {
+                                if ($.inArray(data[i].name, titleData) > -1) {
+                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+                                }
+                                else {
+                                    switch (data[i].Type) {
+                                        //int
+                                        case 'DateTime':
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 160 });
+                                            break;
+                                        default:
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true });
+                                    }
+                                }
+                            }
+
+                            columns = col;
+
+                            ////璁剧疆璧嬪�煎垪瀹�
+                            //var colWidth = getColumnsWidth();
+                            //if (colWidth == "" || colWidth == []) {
+
+                            //}
+                            //else {
+                            //    $.each(columns, function (x, m) {
+                            //        m["width"] = colWidth[x];
+                            //    });
+                            //}
+                            option.cols = [columns];
+                            option.data = data1.data;
+                            option.totalRow = true;
+                            table.render(option);
+                            ins = table.render(option);
+                            //鍒锋柊琛ㄦ牸鏁版嵁
+                            DisPlay_HideColumn();
+                            layer.close(ajaxLoad);
+                            //鑷畾涔夎繃婊や笅鎷夋鍔犺浇
+                            if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+                                ColFilter();
+                            }
+                        } else {
+                            layer.close(ajaxLoad);
+                            layer.alert(data1.Message, { icon: 5 });
+                        }
+                    },
+                    error: function () {
+                        layer.close(ajaxLoad);
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+                //DisPlay_HideColumn();
+            }
+            //#endregion
+
+            //#region 鑷畾涔夎繃婊や笅鎷夋
+            function ColFilter() {
+                var Organization = '<option  value="0" selected="selected" ></option>';
+                for (var i = 1; i < option.cols[0].length; i++) {
+                    if (option.cols[0][i].hide != true) {
+                        Organization += '<option  style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</option>';
+                    }
+                }
+                $("#ColName").empty();
+                $("#ColName").append(Organization);
+                form.render('select');
+            }
+            //#endregion
+
+        //#endregion
+
+
+        });
+
+
+
+
+    </script>
+
+</body>
+</html>
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/Gy_WorkPayTypeBillEdit.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/Gy_WorkPayTypeBillEdit.html"
deleted file mode 100644
index 69451e5..0000000
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/Gy_WorkPayTypeBillEdit.html"
+++ /dev/null
@@ -1,206 +0,0 @@
-锘�<!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">
-    <style type="text/css">
-        .layui-form-label {
-            width: 85px;
-        }
-    </style>
-</head>
-<body>
-    <div id="layout1" class="layui-fluid">
-        <div class="layui-row layui-col-space15">
-            <div class="layui-col-md12">
-                <div class="layui-card">
-                    <form id="form0" class="layui-form" lay-filter="component-form-group" action="">
-                        <div class="layui-card-header">
-
-                            <div class="layui-btn-group">
-                                <button type="button" id="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>
-                                <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">宸ヨ祫绫诲瀷浠g爜</label>
-                                                <div class="layui-input-inline">
-                                                    <input class="layui-input" name="HNumber" lay-verify="HNumber" id="HNumber">
-                                                </div>
-                                            </div>
-                                            <div class="layui-inline">
-                                                <label class="layui-form-label">宸ヨ祫绫诲瀷鍚嶇О</label>
-                                                <div class="layui-input-inline">
-                                                    <input class="layui-input" name="HName" lay-verify="HName" id="HName">
-                                                </div>
-                                            </div>
-                                            <div class="layui-inline">
-                                                <label class="layui-form-label">鍔╄鐮�</label>
-                                                <div class="layui-input-inline">
-                                                    <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 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="" checked="">
-                                                </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 () {
-            var $ = layui.$
-                , admin = layui.admin
-                , layer = layui.layer
-                , table = layui.table
-                , form = layui.form
-                , laydate = layui.laydate
-                , element = layui.element;
-
-            //甯歌鐢ㄦ硶
-
-
-            //#region 杩涘叆椤甸潰鏃㈠姞杞�
-            //鍒ゆ柇鎿嶄綔绫诲瀷
-            if (OperationType == 3) {//缂栬緫
-                set_EditFromGrid(linterid);
-            }
-            //#endregion
-
-            //#region 澶撮儴宸ュ叿鏍忎簨浠�
-            //淇濆瓨
-            form.on('submit(Saver)', function (data) {//淇濆瓨
-                //debugger;
-                var arr = new Array();
-                var isEndCheck = document.getElementById("HStopflag").checked;
-                data.field.HStopflag = isEndCheck;//灏嗘暟缁勫悎骞舵垚瀛楃涓�
-
-                data.field.HItemID = linterid == "" ? 0 : linterid;
-
-                var oMain = JSON.stringify(data.field);
-                var sMainSub = oMain + ';' + data.field.HItemID + ";" + sessionStorage["HUserName"];
-
-                $.ajax(
-                    {
-                        type: "POST",
-                        url: GetWEBURL() + "/Gy_WorkPayTypeBill/SaveGetGy_WorkPayTypeBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
-                        async: true,
-                        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); //鍐嶆墽琛屽叧闂� 聽 聽 聽 聽 聽聽 聽聽聽 聽
-                                });
-                            }
-                            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 () {
-                Pub_Close(1);
-            })
-            //#endregion
-
-            function f_alert(sMsg) {
-                layer.alert(sMsg, { icon: 5 });
-
-            }
-
-            //缂栬緫鑾峰彇琛ㄥご鏁版嵁
-            function set_EditFromGrid(linterid) {
-                $.ajax({
-                    url: GetWEBURL() + "Gy_WorkPayTypeBill/xg",
-                    type: "GET",
-                    data: {
-                        "HID": linterid
-                    },
-                    success: function (result) {
-                        console.log(result);
-                        ajaxReturnData = JSON.parse(JSON.stringify(result)).data;
-                        $("#HNumber").val(result.data[0].HNumber);
-                        $("#HName").val(result.data[0].HName);
-                        $("#HHelpCode").val(result.data[0].HHelpCode);
-                        $("#HRemark").val(result.data[0].HRemark);
-                        $("input[name='HStopflag']").prop("checked", result.data[0].HStopflag);//true:閫変腑 false:涓嶉�変腑
-                        layui.form.render();//瀹炴椂娓叉煋閫変腑鍜屼笉閫変腑鐨勬牱寮�,鏈�濂芥坊鍔犺繖鍙ヨ瘽
-                    }, error: function () {
-                        layer.alert("鍙戠敓閿欒!", { icon: 5 });
-                    }
-                });
-            }
-            //鐩戝惉鎻愪氦
-            form.verify({
-                numberOrEmpty: function (value, item) {
-                    // if (value != '') {
-                    if (!/^\d+$/.test(value)) {
-                        return '涓嶈兘涓虹┖鎴栨暟瀛楁垨鑰�0';
-                    }
-                    //}
-                }
-            });
-
-        });
-    </script>
-</body>
-</html>
\ No newline at end of file
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/Gy_WorkPayTypeBillList.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/Gy_WorkPayTypeBillList.html"
deleted file mode 100644
index ac3440d..0000000
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/Gy_WorkPayTypeBillList.html"
+++ /dev/null
@@ -1,292 +0,0 @@
-锘�<!DOCTYPE html>
-<html>
-<head>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <title>宸ヨ祫绫诲瀷</title>
-    <meta name="renderer" content="webkit">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
-    <link rel="stylesheet" href="../../layuiadmin/layui/css/layui.css" media="all">
-    <link rel="stylesheet" href="../../layuiadmin/style/admin.css" media="all">
-    <script src="../../layuiadmin/layui/layui.js"></script>
-    <script src="../../layuiadmin/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>
-
-</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 style="padding: 10px;">
-                                    <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="btndelete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
-                                </div>
-
-                                <div class="layui-form-item" style="border-top: solid 1px #F6F6F6;">
-                                    <div class="layui-row" style="padding:10px 0">
-                                        <div class="layui-col-xs3 layui-inline" style="width: 23%; display:none;">
-                                            <div id="treeCheckItem" lay-filter="treeCheckItem" class="demo-tree demo-tree-box" style="height: 520px; overflow: scroll;"></div>
-                                        </div>
-                                        <div class="layui-col-xs12 layui-inline">
-                                            <div class="layui-row">
-                                                <div class="layui-inline">
-                                                    <label class="layui-form-label">浠g爜</label>
-                                                    <div class="layui-input-block">
-                                                        <input type="text" class="layui-input" 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" name="HName" id="HName">
-                                                    </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>
-                                            </div>
-                                            <div>
-                                                <table class="" id="mainTable" lay-filter="mainTable"></table>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </form>
-                </div>
-            </div>
-        </div>
-    </div>
-
-    <script src="../../layuiadmin/layui/zgqlayui.js"></script>
-    <script src="../../layuiadmin/zgqCustom/zgqCustom.js"></script>
-    <script>
-        layui.config({
-            base: '../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
-        }).extend({
-            index: 'lib/index', //涓诲叆鍙fā鍧�
-        }).use(['tree', '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
-                , util = layui.util
-                , tree = layui.tree
-                , soulTable = layui.soulTable
-
-            var sWhere = "";
-            var option = [];
-            //#endregion
-
-            //#region 杩涘叆椤甸潰鍗冲姞
-
-            //鍒濆鍖栬〃鏍�
-            set_ClearBill();
-            //#endregion
-
-            //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
-
-            //鏂板
-            form.on('submit(btnAdd)', function (obj) {
-                set_AddNew(obj);
-            })
-
-            //淇敼
-            form.on('submit(btnModify)', function (data) {
-                set_ShowBill(data);
-            });
-
-            //鍒犻櫎
-            form.on('submit(btndelete)', function (obj) {
-                set_DeleteBill(obj);
-            });
-
-            //鏌ヨ鎸夐挳
-            form.on('submit(btnSearch)', function (data) {
-                var HNumber = $("#HNumber").val();
-                var HName = $("#HName").val();
-                if (HNumber) {
-                    sWhere += " and 宸ヨ祫绫诲瀷浠g爜 like '%" + HNumber + "%'";
-                }
-                if (HName) {
-                    sWhere += " and 宸ヨ祫绫诲瀷鍚嶇О like '%" + HName + "%'";
-                }
-                get_Display(sWhere);
-                sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
-            });
-
-            //#endregion
-
-            //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
-
-            //鍒濆鍖栬〃鏍�
-            function set_ClearBill() {
-                //鍒濆鍖栬〃鏍�
-                set_InitGrid();
-
-                //鏌ヨ
-                get_Display(sWhere);
-            }
-
-            //鍒濆鍖栬〃鏍�
-            function set_InitGrid() {
-                option = {
-                    elem: '#mainTable'
-                    , height: 'full-50'
-                    , page: true
-                    , cellMinWidth: 90
-                    , limit: 50
-                    , limits: [50, 500, 5000, 20000]
-                    , done: function (res, curr, count) {
-                        soulTable.render(this);
-                    }
-                    , cols: [[
-                        { type: 'radio', fixed: 'left' }
-                        , { field: 'HItemID', title: 'HItemID', sort: true, hide: true }
-                        , { field: '宸ヨ祫绫诲瀷浠g爜', title: '宸ヨ祫绫诲瀷浠g爜', sort: true }
-                        , { field: '宸ヨ祫绫诲瀷鍚嶇О', title: '宸ヨ祫绫诲瀷鍚嶇О', sort: true}
-                        , { field: '绂佺敤鏍囪', title: '绂佺敤鏍囪', sort: true}
-                        , { field: '澶囨敞', title: '澶囨敞', sort: true}
-                        , { field: '浣跨敤鏍囪', title: '浣跨敤鏍囪', sort: true}
-                    ]]
-                };
-            }
-
-            //鏌ヨ
-            function get_Display(sWhere) {
-                var ajaxLoad = layer.load();
-                //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
-                $.ajax({
-                    url: GetWEBURL() + '/Gy_WorkPayTypeBill/GetWorkPayTypelist',
-                    type: "GET",
-                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
-                    success: function (data1) {
-                        if (data1.count == 1) {
-                            option.data = data1.data;
-                            table.render(option);
-                            layer.close(ajaxLoad);
-                        } else {
-                            layer.close(ajaxLoad);
-                            layer.alert(data1.code + data1.Message, { icon: 5 });
-                        }
-                    }, error: function () {
-                        layer.close(ajaxLoad);
-                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
-                    }
-                });
-            }
-
-            //鏂板
-            function set_AddNew(obj) {
-                //椤甸潰灞�-鑷畾涔�
-                layer.open({
-                    type: 2,
-                    skin: 'layui-layer-rim', //鍔犱笂杈规
-                    title: '鏂板宸ヨ祫绫诲瀷',
-                    closeBtn: 1,
-                    shift: 2,
-                    area: ['80%', '80%'],
-                    maxmin: true,
-                    content: ['../宸ヨ祫绠$悊/Gy_WorkPayTypeBillEdit.html?OperationType=1&linterid=&HSouceBillType='],
-                    end: function () {
-                        //鍒锋柊椤甸潰,
-                        location.reload();
-                    },
-                    success: function (layero, index) {
-
-                    }
-                });
-                return false;//杩欓噷鍔犱釜return false;灏变笉浼氫袱娆℃彁浜�
-            }
-
-            //淇敼
-            function set_ShowBill(data) {
-                var checkStatus = table.checkStatus('mainTable')
-                    , data = checkStatus.data;
-                if (checkStatus.data.length === 1) {
-                    var hID = data[0].HItemID.toString();
-                    //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
-                    layer.open({
-                        type: 2
-                        , area: ['100%', '100%']
-                        , title: '缂栬緫璧勬枡绫诲瀷'
-                        , closeBtn: 1
-                        , shade: 0.6 //閬僵閫忔槑搴�
-                        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                        , content: '../宸ヨ祫绠$悊/Gy_WorkPayTypeBillEdit.html?OperationType=3&linterid=' + hID + '&HSouceBillType='
-                        , resize: false,
-                        end: function () {
-                            //鍒锋柊椤甸潰,
-                            location.reload();
-                        }
-                        , cancel: function () {
-                            //$(".layui-btn").removeClass("layui-btn-disabled");
-                        }
-                    })
-
-                } else {
-                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
-                }
-            }
-
-            //鍒犻櫎
-            function set_DeleteBill(obj) {
-                var checkStatus = table.checkStatus('mainTable')
-                    , data = checkStatus.data;
-                if (checkStatus.data.length === 1) {
-                    var InterID = data[0].HItemID.toString();
-                    //閫昏緫鍒犻櫎鏂规硶
-                    layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
-                        $.ajax({
-                            type: "GET",
-                            url: GetWEBURL() + "Gy_WorkPayTypeBill/Delete_Json", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
-                            data: { "HInterID": InterID, "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);
-                                        //淇敼涓哄姛鍚庡埛鏂扮晫闈�
-                                        window.location.reload();
-                                    });
-
-                                } else {
-                                    layer.alert(result.code + result.Message, { icon: 5 });
-                                }
-                            }, error: function () {
-                                layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
-                            }
-                        });
-                    })
-                }
-                else {
-                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
-                }
-            }
-
-            //#endregion
-
-
-            //浠ヤ笂鏄痩ayui妯″潡
-        });
-    </script>
-</body>
-</html>
\ No newline at end of file
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/Gy_WorkTypeBillEdit.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/Gy_WorkTypeBillEdit.html"
deleted file mode 100644
index e9c16cf..0000000
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/Gy_WorkTypeBillEdit.html"
+++ /dev/null
@@ -1,236 +0,0 @@
-锘�<!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">
-    <style type="text/css">
-        .layui-form-label {
-            width: 85px;
-        }
-    </style>
-</head>
-<body>
-    <div id="layout1" class="layui-fluid">
-        <div class="layui-row layui-col-space15">
-            <div class="layui-col-md12">
-                <div class="layui-card">
-                    <form id="form0" class="layui-form" lay-filter="component-form-group" action="">
-                        <div class="layui-card-header">
-
-                            <div class="layui-btn-group">
-                                <button type="button" id="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>
-                                <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">宸ョ浠g爜</label>
-                                                <div class="layui-input-inline">
-                                                    <input class="layui-input" name="HNumber" lay-verify="HNumber" id="HNumber">
-                                                </div>
-                                            </div>
-                                            <div class="layui-inline">
-                                                <label class="layui-form-label">宸ョ鍚嶇О</label>
-                                                <div class="layui-input-inline">
-                                                    <input class="layui-input" name="HName" lay-verify="HName" id="HName">
-                                                </div>
-                                            </div>
-                                        </div>
-                                        <div class="layui-form-item">
-                                            <div class="layui-inline">
-                                                <label class="layui-form-label">灏忔椂宸ヨ祫</label>
-                                                <div class="layui-input-inline">
-                                                    <input class="layui-input" name="HPayMoney" lay-verify="HPayMoney" id="HPayMoney">
-                                                </div>
-                                            </div>
-                                            <div class="layui-inline">
-                                                <label class="layui-form-label">鏃ュ伐璧�</label>
-                                                <div class="layui-input-inline">
-                                                    <input class="layui-input" name="HDayMoney" lay-verify="HDayMoney" id="HDayMoney">
-                                                </div>
-                                            </div>
-                                        </div>
-                                        <div class="layui-form-item">
-                                            <div class="layui-inline">
-                                                <label class="layui-form-label">鍔╄鐮�</label>
-                                                <div class="layui-input-inline">
-                                                    <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">
-                                                    <input class="layui-input" name="HForEmp" lay-verify="HForEmp" id="HForEmp">
-                                                </div>
-                                            </div>
-
-                                        </div>
-                                        <div class="layui-form-item">
-                                            <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-inline">
-                                                    <input type="checkbox" name="HStopflag" id="HStopflag" lay-skin="primary" title="" checked="">
-                                                </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 () {
-            var $ = layui.$
-                , admin = layui.admin
-                , layer = layui.layer
-                , table = layui.table
-                , form = layui.form
-                , laydate = layui.laydate
-                , element = layui.element;
-
-            //甯歌鐢ㄦ硶
-
-
-            //#region 杩涘叆椤甸潰鏃㈠姞杞�
-            //鍒ゆ柇鎿嶄綔绫诲瀷
-            if (OperationType == 3) {//缂栬緫
-                set_EditFromGrid(linterid);
-            }
-            //#endregion
-
-            //#region 澶撮儴宸ュ叿鏍忎簨浠�
-            //淇濆瓨
-            form.on('submit(Saver)', function (data) {//淇濆瓨
-                //debugger;
-                var ModRightNameAdd = 'Gy_WorkType_Edit';
-                var user = sessionStorage["HUserName"];
-                var arr = new Array();
-                var isEndCheck = document.getElementById("HStopflag").checked;
-                data.field.HStopflag = isEndCheck;//灏嗘暟缁勫悎骞舵垚瀛楃涓�
-
-                data.field.HItemID = linterid == "" ? 0 : linterid;
-
-                var oMain = JSON.stringify(data.field)
-                var sMainSub = oMain + ';' + user + ';' + ModRightNameAdd;
-
-                $.ajax(
-                    {
-                        type: "POST",
-                        url: GetWEBURL() + "/Gy_WorkTypeBill/SaveGetGy_WorkTypeBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
-                        async: true,
-                        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); //鍐嶆墽琛屽叧闂� 聽 聽 聽 聽 聽聽 聽聽聽 聽
-                                });
-                            }
-                            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 () {
-                Pub_Close(1);
-            })
-            //#endregion
-
-            function f_alert(sMsg) {
-                layer.alert(sMsg, { icon: 5 });
-
-            }
-
-            //缂栬緫鑾峰彇琛ㄥご鏁版嵁
-            function set_EditFromGrid(linterid) {
-                $.ajax({
-                    url: GetWEBURL() + "Gy_WorkTypeBill/xg",
-                    type: "GET",
-                    data: {
-                        "HID": linterid
-                    },
-                    success: function (result) {
-                        console.log(result);
-                        ajaxReturnData = JSON.parse(JSON.stringify(result)).data;
-                        $("#HNumber").val(result.data[0].HNumber);
-                        $("#HName").val(result.data[0].HName);
-                        $("#HPayMoney").val(result.data[0].HPayMoney);
-                        $("#HDayMoney").val(result.data[0].HDayMoney);
-                        $("#HHelpCode").val(result.data[0].HHelpCode);
-                        $("#HForEmp").val(result.data[0].HForEmp);
-                        $("#HRemark").val(result.data[0].HRemark);
-                        $("input[name='HStopflag']").prop("checked", result.data[0].HStopflag);//true:閫変腑 false:涓嶉�変腑
-                        layui.form.render();//瀹炴椂娓叉煋閫変腑鍜屼笉閫変腑鐨勬牱寮�,鏈�濂芥坊鍔犺繖鍙ヨ瘽
-                    }, error: function () {
-                        layer.alert("鍙戠敓閿欒!", { icon: 5 });
-                    }
-                });
-            }
-            //鐩戝惉鎻愪氦
-            form.verify({
-                numberOrEmpty: function (value, item) {
-                    // if (value != '') {
-                    if (!/^\d+$/.test(value)) {
-                        return '涓嶈兘涓虹┖鎴栨暟瀛楁垨鑰�0';
-                    }
-                    //}
-                }
-            });
-
-        });
-    </script>
-</body>
-</html>
\ No newline at end of file
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/Gy_WorkTypeBillList.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/Gy_WorkTypeBillList.html"
deleted file mode 100644
index 15c887b..0000000
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/Gy_WorkTypeBillList.html"
+++ /dev/null
@@ -1,306 +0,0 @@
-锘�<!DOCTYPE html>
-<html>
-<head>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <title>宸ョ绫诲埆</title>
-    <meta name="renderer" content="webkit">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
-    <link rel="stylesheet" href="../../layuiadmin/layui/css/layui.css" media="all">
-    <link rel="stylesheet" href="../../layuiadmin/style/admin.css" media="all">
-    <script src="../../layuiadmin/layui/layui.js"></script>
-    <script src="../../layuiadmin/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>
-
-    <style media="screen">
-        .custom-tree-item-clicked {
-            color: #FC9003
-        }
-
-        .layui-form-label {
-            width: 40px;
-            padding: 9px 5px;
-        }
-
-        .layui-input-block {
-            margin-left: 50px;
-        }
-    </style>
-</head>
-<body>
-    <div class="layui-fluid">
-        <div class="layui-col-md12">
-            <div class="layui-card" style="padding: 1px">
-                <div class="layui-card-body" style="padding: 1px;">
-                    <form class="layui-form" action="" lay-filter="component-form-group">
-                        <div class="layui-collapse">
-                            <div class="layui-colla-item">
-                                <div style="padding: 10px;">
-                                    <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="btndelete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
-                                </div>
-
-                                <div class="layui-form-item" style="border-top: solid 1px #F6F6F6;">
-                                    <div class="layui-row" style="padding:10px 0">
-                                        <div class="layui-col-xs3 layui-inline" style="width: 23%; display:none;">
-                                            <div id="treeCheckItem" lay-filter="treeCheckItem" class="demo-tree demo-tree-box" style="height: 520px; overflow: scroll;"></div>
-                                        </div>
-                                        <div class="layui-col-xs12 layui-inline">
-                                            <div class="layui-row">
-                                                <div class="layui-inline">
-                                                    <label class="layui-form-label">浠g爜</label>
-                                                    <div class="layui-input-block">
-                                                        <input type="text" class="layui-input" 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" name="HName" id="HName">
-                                                    </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>
-                                            </div>
-                                            <div>
-                                                <table class="" id="mainTable" lay-filter="mainTable"></table>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </form>
-                </div>
-            </div>
-        </div>
-    </div>
-
-    <script src="../../layuiadmin/layui/zgqlayui.js"></script>
-    <script src="../../layuiadmin/zgqCustom/zgqCustom.js"></script>
-    <script>
-        layui.config({
-            base: '../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
-        }).extend({
-            index: 'lib/index', //涓诲叆鍙fā鍧�
-        }).use(['tree', '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
-                , util = layui.util
-                , tree = layui.tree
-                , soulTable = layui.soulTable
-            var sWhere = "";
-            var option = [];
-            //#endregion
-
-            //#region 杩涘叆椤甸潰鍗冲姞
-
-            //鍒濆鍖栬〃鏍�
-            set_ClearBill();
-            //#endregion
-
-            //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
-
-            //鏂板
-            form.on('submit(btnAdd)', function (obj) {
-                set_AddNew(obj);
-            })
-
-            //淇敼
-            form.on('submit(btnModify)', function (data) {
-                set_ShowBill(data);
-            });
-
-            //鍒犻櫎
-            form.on('submit(btndelete)', function (obj) {
-                set_DeleteBill(obj);
-            });
-
-            //鏌ヨ鎸夐挳
-            form.on('submit(btnSearch)', function (data) {
-                var HNumber = $("#HNumber").val();
-                var HName = $("#HName").val();
-                if (HNumber) {
-                    sWhere += " and 宸ョ浠g爜 like '%" + HNumber + "%'";
-                }
-                if (HName) {
-                    sWhere += " and 宸ョ鍚嶇О like '%" + HName + "%'";
-                }
-                get_Display(sWhere);
-                sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
-            });
-
-            //#endregion
-
-            //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
-
-            //鍒濆鍖栬〃鏍�
-            function set_ClearBill() {
-                //鍒濆鍖栬〃鏍�
-                set_InitGrid();
-
-                //鏌ヨ
-                get_Display(sWhere);
-            }
-
-            //鍒濆鍖栬〃鏍�
-            function set_InitGrid() {
-                option = {
-                    elem: '#mainTable'
-                    , height: 'full-50'
-                    , page: true
-                    , cellMinWidth: 90
-                    , limit: 50
-                    , limits: [50, 500, 5000, 20000]
-                    , done: function (res, curr, count) {
-                        soulTable.render(this);
-                    }
-                    , cols: [[
-                        { type: 'radio', fixed: 'left' }
-                        , { field: 'HItemID', title: 'HItemID', sort: true, hide: true }
-                        , { field: '宸ョ浠g爜', title: '宸ョ浠g爜', sort: true}
-                        , { field: '宸ョ鍚嶇О', title: '宸ョ鍚嶇О', sort: true}
-                        , { field: '绂佺敤鏍囪', title: '绂佺敤鏍囪', sort: true}
-                        , { field: '澶囨敞', title: '澶囨敞', sort: true}
-                        , { field: '灏忔椂宸ヨ祫', title: '灏忔椂宸ヨ祫', sort: true}
-                        , { field: '浣跨敤鏍囪', title: '浣跨敤鏍囪', sort: true}
-                    ]]
-                };
-            }
-
-            //鏌ヨ
-            function get_Display(sWhere) {
-                var ajaxLoad = layer.load();
-                //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
-                $.ajax({
-                    url: GetWEBURL() + '/Gy_WorkTypeBill/GetWorkTypelist',
-                    type: "GET",
-                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
-                    success: function (data1) {
-                        if (data1.count == 1) {
-                            option.data = data1.data;
-                            table.render(option);
-                            layer.close(ajaxLoad);
-                        } else {
-                            layer.close(ajaxLoad);
-                            layer.alert(data1.code + data1.Message, { icon: 5 });
-                        }
-                    }, error: function () {
-                        layer.close(ajaxLoad);
-                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
-                    }
-                });
-            }
-
-            //鏂板
-            function set_AddNew(obj) {
-                //椤甸潰灞�-鑷畾涔�
-                layer.open({
-                    type: 2,
-                    skin: 'layui-layer-rim', //鍔犱笂杈规
-                    title: '鏂板宸ョ绫诲埆',
-                    closeBtn: 1,
-                    shift: 2,
-                    area: ['80%', '80%'],
-                    maxmin: true,
-                    content: ['../宸ヨ祫绠$悊/Gy_WorkTypeBillEdit.html?OperationType=1&linterid=&HSouceBillType='],
-                    end: function () {
-                        //鍒锋柊椤甸潰,
-                        location.reload();
-                    },
-                    success: function (layero, index) {
-
-                    }
-                });
-                return false;//杩欓噷鍔犱釜return false;灏变笉浼氫袱娆℃彁浜�
-            }
-
-            //淇敼
-            function set_ShowBill(data) {
-                var checkStatus = table.checkStatus('mainTable')
-                    , data = checkStatus.data;
-                if (checkStatus.data.length === 1) {
-                    var hID = data[0].HItemID.toString();
-                    //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
-                    layer.open({
-                        type: 2
-                        , area: ['100%', '100%']
-                        , title: '缂栬緫宸ョ'
-                        , closeBtn: 1
-                        , shade: 0.6 //閬僵閫忔槑搴�
-                        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                        , content: '../宸ヨ祫绠$悊/Gy_WorkTypeBillEdit.html?OperationType=3&linterid=' + hID + '&HSouceBillType='
-                        , resize: false,
-                        end: function () {
-                            //鍒锋柊椤甸潰,
-                            location.reload();
-                        }
-                        , cancel: function () {
-                            //$(".layui-btn").removeClass("layui-btn-disabled");
-                        }
-                    })
-
-                } else {
-                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
-                }
-            }
-
-            //鍒犻櫎
-            function set_DeleteBill(obj) {
-                var checkStatus = table.checkStatus('mainTable')
-                    , data = checkStatus.data;
-                if (checkStatus.data.length === 1) {
-                    var InterID = data[0].HItemID.toString();
-                    //閫昏緫鍒犻櫎鏂规硶
-                    layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
-                        $.ajax({
-                            type: "GET",
-                            url: GetWEBURL() + "Gy_WorkTypeBill/Delete_Json", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
-                            data: { "HInterID": InterID, "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);
-                                        //淇敼涓哄姛鍚庡埛鏂扮晫闈�
-                                        window.location.reload();
-                                    });
-
-                                } else {
-                                    layer.alert(result.code + result.Message, { icon: 5 });
-                                }
-                            }, error: function () {
-                                layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
-                            }
-                        });
-                    })
-                }
-                else {
-                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
-                }
-            }
-
-            //#endregion
-
-
-            //浠ヤ笂鏄痩ayui妯″潡
-        });
-    </script>
-</body>
-</html>
\ No newline at end of file
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\346\240\270\347\256\227\346\226\271\345\274\217/Gy_ClassTimePrjBillEdit.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\346\240\270\347\256\227\346\226\271\345\274\217/Gy_ClassTimePrjBillEdit.html"
deleted file mode 100644
index 368f3be..0000000
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\346\240\270\347\256\227\346\226\271\345\274\217/Gy_ClassTimePrjBillEdit.html"
+++ /dev/null
@@ -1,404 +0,0 @@
-锘�<!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">
-    <style type="text/css">
-        .layui-form-label {
-            width: 85px;
-        }
-    </style>
-</head>
-<body>
-
-    <div id="layout1" class="layui-fluid">
-        <div class="layui-row layui-col-space15">
-            <div class="layui-col-md12">
-                <div class="layui-card">
-                    <form id="form0" class="layui-form" lay-filter="component-form-group" action="">
-                        <div class="layui-card-header">
-                            <div class="layui-btn-group">
-                                <button type="button" id="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">
-                                <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">鏍哥畻鏂瑰紡浠g爜</label>
-                                                <div class="layui-input-inline">
-                                                    <input class="layui-input" name="HNumber" lay-verify="HNumber" id="HNumber">
-                                                    <input id="HItemID" name="HItemID" type="hidden" />
-                                                    <input id="HLevel" name="HLevel" type="hidden" value="0" />
-                                                </div>
-                                            </div>
-                                            <div class="layui-inline">
-                                                <label class="layui-form-label">鏍哥畻鏂瑰紡鍚嶇О</label>
-                                                <div class="layui-input-inline">
-                                                    <input class="layui-input" name="HName" lay-verify="HName" id="HName">
-                                                </div>
-                                            </div>
-                                            <div class="layui-inline">
-                                                <label class="layui-form-label">鐝粍</label>
-                                                <div class="layui-input-inline">
-                                                    <input type="text" name="HGroupName" id="HGroupName" readonly class="layui-input" value="0" style="float:left;width:150px;">
-                                                    <input type="hidden" name="HGroupID" id="HGroupID" class="layui-input" value="0" style="float:left;width:150px;">
-                                                    <button type="button" lay-submit="" class="layui-btn layuiadmin-btn-order" lay-filter="HGroup-BT" style="width:40px;">
-                                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
-                                                    </button>
-                                                </div>
-                                            </div>
-                                            <div class="layui-inline">
-                                                <label class="layui-form-label">鎵�灞炴牳绠楃粍</label>
-                                                <div class="layui-input-inline">
-                                                    <input type="text" name="HParentName" id="HParentName" readonly class="layui-input" value="0" style="float:left;width:150px;">
-                                                    <input type="hidden" name="HParentID" id="HParentID" class="layui-input" value="0" style="float:left;width:150px;">
-                                                    <button type="button" lay-submit="" class="layui-btn layuiadmin-btn-order" lay-filter="hparent-BT" style="width:40px;">
-                                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
-                                                    </button>
-                                                </div>
-                                            </div>
-                                            <div class="layui-inline">
-                                                <label class="layui-form-label">閮ㄩ棬</label>
-                                                <div class="layui-input-inline">
-                                                    <input type="text" name="HDeptName" id="HDeptName" readonly class="layui-input" value="0" style="float:left;width:150px;">
-                                                    <input type="hidden" name="HDeptID" id="HDeptID" class="layui-input" value="0" style="float:left;width:150px;">
-                                                    <button type="button" lay-submit="" class="layui-btn layuiadmin-btn-order" lay-filter="HDepart-BT" style="width:40px;">
-                                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
-                                                    </button>
-                                                </div>
-                                            </div>
-                                            <div class="layui-inline">
-                                                <label class="layui-form-label">澶囨敞</label>
-                                                <div class="layui-input-inline">
-                                                    <textarea placeholder="璇疯緭鍏ョ淮澶囨敞" class="layui-textarea" name="HRemark" id="HRemark"></textarea>
-                                                </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>
-        //鑾峰彇鍙傛暟
-        function get_UrlVars() {
-            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;
-        }
-        //鑾峰彇鍙傛暟
-        var params = get_UrlVars();
-        if (typeof (params[params[0]]) == "undefined") {
-            var OperationType = 1;//鎿嶄綔绫诲瀷
-            var closeType = 2;  //鍏抽棴绫诲瀷
-        } else {
-            var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
-            var linterid = params[params[1]];//婧愬崟id
-            var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
-            var closeType = params[params[3]];  //鍏抽棴绫诲瀷
-        }
-
-        var params = get_UrlVars();
-        var hID = params[params[0]];//缂栬緫鏌ョ湅
-        var HType = params[params[1]];    //鍗曟嵁鐘舵�併�佸眰绾�
-        var TagParentId = params[params[2]];  //鐖剁骇ID
-
-
-        layui.config({
-            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
-        }).extend({
-            index: 'lib/index' //涓诲叆鍙fā鍧�
-        }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
-            var $ = layui.$
-                , admin = layui.admin
-                , layer = layui.layer
-                , table = layui.table
-                , form = layui.form
-                , laydate = layui.laydate
-                , element = layui.element;
-
-            //甯歌鐢ㄦ硶
-
-            //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
-            //if (sessionStorage.login != "login") {
-            //    layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
-            //        icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
-            //    }, function () { window.location.href = "../../user/login.html"; });
-            //}
-            //閫夋嫨閮ㄩ棬鎸夐挳
-            form.on('submit(HDepart-BT)', function () {
-                get_checkDept();
-            });
-            //閫夋嫨鐝粍鎸夐挳
-            form.on('submit(HGroup-BT)', function () {
-                get_checkGroup();
-            });
-            //閫夋嫨鎵�灞炵粍鎸夐挳
-            form.on('submit(hparent-BT)', function () {
-                get_checkparent();
-            });
-            form.on('submit(Cancel)', function () {
-                //sessionStorage["SourceFlag"] = false;
-                parent.location.href = "../../../views/index.html"
-                //window.close();//鍏抽棴褰撳墠椤�
-            })
-            form.on('submit(Saver)', function (data) {//淇濆瓨
-                //debugger;
-                var ModRightNameAdd = 'Gy_ClassTimePrj_Edit';
-                var user = sessionStorage["HUserName"];
-                var arr = new Array();
-                //var isEndCheck = document.getElementById("HStopflag").checked;
-                //data.field.HStopflag = isEndCheck;//灏嗘暟缁勫悎骞舵垚瀛楃涓�
-                data.field.HItemID = hID == "" ? 0 : hID;
-                //data.field.HLevel = HType == "" ? 1 : HType;
-                var oMain = JSON.stringify(data.field)
-                var sMainSub = oMain + ';' + hID + ';' + user + ';' + ModRightNameAdd;
-                if (HType == "Modify") {
-                    $.ajax(
-                        {
-                            type: "POST",
-                            url: GetWEBURL() + "/Gy_ClassTimePrj/EditBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
-                            async: true,
-                            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); //鍐嶆墽琛屽叧闂� 聽 聽 聽 聽 聽聽 聽聽聽 聽
-                                    });
-                                }
-                                else {
-                                    f_alert(data.Message);
-                                }
-                                layer.closeAll("loading");
-                            },
-                            error: function (err) {
-                                f_alert("閿欒:" + err);
-                            }
-                        });
-                }
-                else {
-                    if (hID == "") {
-                        hID = " ";
-                    }
-                    sMainSub = oMain + ';' + hID + ';' + user + ';' + ModRightNameAdd;
-                    $.ajax(
-                        {
-                            type: "POST",
-                            url: GetWEBURL() + "/Gy_ClassTimePrj/AddBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
-                            async: true,
-                            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); //鍐嶆墽琛屽叧闂� 聽 聽 聽 聽 聽聽 聽聽聽 聽
-                                    });
-                                }
-                                else {
-
-                                    f_alert(data.Message);
-                                }
-                                layer.closeAll("loading");
-                            },
-                            error: function (err) {
-                                f_alert("閿欒:" + err);
-                            }
-                        });
-                }
-            });
-            //閫�鍑�
-            form.on('submit(Exit)', function (data) {
-                if (linterid == undefined) {
-                    //鍏抽棴椤电
-                    Pub_Close(2);
-                }
-                else {
-                    //鍏抽棴椤电
-                    Pub_Close(1);
-                }
-            });
-            function f_alert(sMsg) {
-                layer.alert(sMsg, { icon: 5 });
-            }
-            if (HType == "Modify") {
-                $.ajax({
-                    url: GetWEBURL() + "/Gy_ClassTimePrj/xg",
-                    //url: "http://localhost:12761/Gy_Department/xg",
-                    type: "GET",
-                    data: {
-                        "HInterID": hID
-                    },
-                    success: function (d) {
-                        console.log(d);
-                        ajaxReturnData = JSON.parse(JSON.stringify(d)).data;
-                        $("#HNumber").val(d.data[0].鏍哥畻鏂瑰紡浠g爜);
-                        $("#HName").val(d.data[0].鏍哥畻鏂瑰紡鍚嶇О);
-                        $("#HGroupID").val(d.data[0].HGroupID);
-                        $("#HGroupName").val(d.data[0].鐝粍鍚嶇О);
-                        $("#HParentId").val(d.data[0].hparentid);
-                        $("#HParentName").val(d.data[0].缁勫悕绉�);
-                        $("#HDeptID").val(d.data[0].HDeptID);
-                        $("#HDeptName").val(d.data[0].閮ㄩ棬);
-                        $("#HRemark").val(d.data[0].澶囨敞);
-                        layui.form.render();//瀹炴椂娓叉煋閫変腑鍜屼笉閫変腑鐨勬牱寮�,鏈�濂芥坊鍔犺繖鍙ヨ瘽
-                    }
-
-                });
-            }
-            //鐩戝惉鎻愪氦
-            form.verify({
-                numberOrEmpty: function (value, item) {
-                    // if (value != '') {
-                    if (!/^\d+$/.test(value)) {
-                        return '涓嶈兘涓虹┖鎴栨暟瀛楁垨鑰�0';
-                    }
-                    //}
-                }
-            });
-
-            //鏍哥畻鏂瑰紡绫诲埆寮圭獥
-            form.on('submit(HQCCheckClassList)', function () {
-                //椤甸潰灞�-鑷畾涔�
-                layer.open({
-                    type: 2,
-                    skin: 'layui-layer-rim', //鍔犱笂杈规
-                    title: '鏍哥畻鏂瑰紡绫诲埆鍒楄〃',
-                    closeBtn: 1,
-                    shift: 2,
-                    area: ['100%', '100%'],
-                    maxmin: true,
-                    content: ['../../PublicPage/CheckItemType.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('璇烽�夋嫨鏁版嵁');
-                        }
-                        $("#HQCCheckClassName").val(checkStatus.data[0].HName);
-                        $("#HQCCheckClassID").val(checkStatus.data[0].HItemID);
-                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
-                    }
-                    , btn2: function (index, layero) {
-                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
-                        //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
-                    },
-                    end: function () {
-
-                    },
-                    success: function (layero, index) {
-
-                    }
-                });
-            });
-
-            //#region 閫夋嫨閮ㄩ棬鏂规硶
-            function get_checkDept() {
-                layer.open({
-                    type: 2//寮圭獥绫诲瀷
-                    , skin: 'layui-layer-rim' //鍔犱笂杈规
-                    , area: ['90%', '90%']//澶у皬
-                    , title: '閮ㄩ棬鍒楄〃'//鏍囬
-                    , shift: 2//寮瑰嚭鍔ㄧ敾
-                    , content: ['../../PublicPage/DeptInformation.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('璇烽�夋嫨鏁版嵁');
-                        }
-                        $("#HDeptName").val(checkStatus.data[0].HName);
-                        $("#HDeptID").val(checkStatus.data[0].HItemID);
-                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
-                    }
-                    , btn2: function (index, layero) { }
-                })
-            }
-            //#endregion
-
-            //#region 閫夋嫨鐝粍鏂规硶
-            function get_checkGroup() {
-                layer.open({
-                    type: 2//寮圭獥绫诲瀷
-                    , skin: 'layui-layer-rim' //鍔犱笂杈规
-                    , area: ['90%', '90%']//澶у皬
-                    , title: '鐝粍鍒楄〃'//鏍囬
-                    , shift: 2//寮瑰嚭鍔ㄧ敾
-                    , content: ['../../PublicPage/GroupInformation.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('璇烽�夋嫨鏁版嵁');
-                        }
-                        $("#HGroupName").val(checkStatus.data[0].HName);
-                        $("#HGroupID").val(checkStatus.data[0].HItemID);
-                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
-                    }
-                    , btn2: function (index, layero) { }
-                })
-            }
-            //#endregion
-
-            //#region 閫夋嫨鎵�灞炵粍鏂规硶
-            function get_checkparent() {
-                layer.open({
-                    type: 2//寮圭獥绫诲瀷
-                    , skin: 'layui-layer-rim' //鍔犱笂杈规
-                    , area: ['90%', '90%']//澶у皬
-                    , title: '鏍哥畻鏂瑰紡缁勫垪琛�'//鏍囬
-                    , shift: 2//寮瑰嚭鍔ㄧ敾
-                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_ClassTimePrjGroupList.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('璇烽�夋嫨鏁版嵁');
-                        }
-                        $("#HParentName").val(checkStatus.data[0].HName);
-                        $("#HParentID").val(checkStatus.data[0].HItemID);
-                        //$("#HDeptNumber").val(checkStatus.data[0].HNumber);
-                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
-                    }
-                    , btn2: function (index, layero) { }
-                })
-            }
-            //#endregion
-        });
-    </script>
-</body>
-</html>
\ No newline at end of file
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\346\240\270\347\256\227\346\226\271\345\274\217/Gy_ClassTimePrjBillList.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\346\240\270\347\256\227\346\226\271\345\274\217/Gy_ClassTimePrjBillList.html"
deleted file mode 100644
index 2c6c41c..0000000
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\346\240\270\347\256\227\346\226\271\345\274\217/Gy_ClassTimePrjBillList.html"
+++ /dev/null
@@ -1,418 +0,0 @@
-锘�<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <title>鏍哥畻鏂瑰紡鍒楄〃</title>
-    <meta name="renderer" content="webkit">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
-    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
-    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
-    <script src="../../../layuiadmin/layui/layui.js"></script>
-    <script src="../../../layuiadmin/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>
-    <style media="screen">
-        .custom-tree-item-clicked {
-            color: #FC9003
-        }
-        .layui-form-label {
-            width: 40px;
-            padding: 9px 5px;
-        }
-
-        .layui-input-block {
-            margin-left: 50px;
-        }
-    </style>
-</head>
-<body>
-    <div class="layui-fluid">
-        <div class="layui-col-md12">
-            <div class="layui-card" style="padding: 1px">
-                <div class="layui-card-body" style="padding: 1px;">
-                    <form class="layui-form" action="" lay-filter="component-form-group">
-                        <div class="layui-collapse">
-                            <div class="layui-colla-item">
-                                <div style="padding: 10px;">
-                                    <!--<div class="layui-col-xs2">
-                                        <div id="treeDepartment" lay-filter="treeDepartment" class="demo-tree demo-tree-box" style="width: 200px; height: 500px; overflow: scroll;"></div>
-                                    </div>-->
-
-                                    <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="btndelete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
-                                </div>
-
-                                <div class="layui-form-item" style="border-top: solid 1px #F6F6F6;">
-                                    <div class="layui-row" style="padding:10px 0">
-                                        <div class="layui-col-xs3 layui-inline" style="width: 23%;display:none;">
-                                            <div id="treeCheckItem" lay-filter="treeCheckItem" class="demo-tree demo-tree-box" style="height: 520px; overflow: scroll;"></div>
-                                        </div>
-                                        <div class="layui-col-xs12 layui-inline">
-                                            <div class="layui-row">
-                                                <div class="layui-inline">
-                                                    <label class="layui-form-label">浠g爜</label>
-                                                    <div class="layui-input-block">
-                                                        <input type="text" class="layui-input" 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" name="HName" id="HName">
-                                                    </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>
-                                            </div>
-                                            <div>
-                                                <table class="" id="mainTable" lay-filter="mainTable"></table>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
-
-                                <div class="layui-row layui-form-item">
-                                    <!--<div class="layui-inline">
-                                        <div id="treeDepartment" lay-filter="treeDepartment" class="demo-tree demo-tree-box" style="width: 200px; height: 500px; overflow: scroll;"></div>
-                                    </div>-->
-                                    <!--<div class="" style="padding-top: 10px;">
-                                        <div class="layui-row">
-                                            <div class="layui-inline">
-                                                <label class="layui-form-label">閮ㄩ棬浠g爜</label>
-                                                <div class="layui-input-block">
-                                                    <input type="text" class="layui-input" 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" name="HName" id="HName">
-                                                </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>
-                                        </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-getCheckData"><i class="layui-icon layui-icon-tips"></i>棰勮</button>-->
-                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload"><i class="layui-icon layui-icon-refresh"></i>鍒锋柊</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-confirm" id="btn_confirm"><i class="layui-icon layui-icon-ok-circle"></i>纭</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-back" id="btn_back"><i class="layui-icon layui-icon-close-fill"></i>椹冲洖</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-details"><i class="layui-icon layui-icon-form"></i>璇︽儏</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-generate"><i class="layui-icon layui-icon-file"></i>鐢熸垚閫佽揣鍗�</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>-->
-
-                            </div>
-                        </script>
-                    </form>
-                </div>
-            </div>
-        </div>
-    </div>
-
-    <script src="../../../layuiadmin/layui/zgqlayui.js"></script>
-    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
-
-    <script>
-        var treeCkData = { id: 0 };
-        var TagId = "";
-        var TagParentId = "";
-        var Level = "1";
-
-        layui.config({
-            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
-        }).extend({
-            index: 'lib/index', //涓诲叆鍙fā鍧�
-        }).use(['tree', 'index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
-            var $ = layui.$
-                , admin = layui.admin
-                , layer = layui.layer
-                , table = layui.table
-                , form = layui.form
-                , element = layui.element
-                , laypage = layui.laypage
-                , laydate = layui.laydate
-                , util = layui.util
-                , tree = layui.tree
-            var sWhere = "";
-            let that = this;
-            var option = {
-                elem: '#mainTable'
-                //, toolbar: '#toolbarDemo'
-                , height: 'full-50'
-                , page: true
-                , cellMinWidth: 90
-                , limit: 50
-                , limits: [50, 500, 5000, 20000]
-                , cols: [[
-                    { type: 'checkbox', fixed: 'left' }
-                    , { field: 'HItemID', title: 'HItemID', sort: true, hide: true }
-                    , { field: '鏍哥畻鏂瑰紡浠g爜', title: '鏍哥畻鏂瑰紡浠g爜' }
-                    , { field: '鏍哥畻鏂瑰紡鍚嶇О', title: '鏍哥畻鏂瑰紡鍚嶇О' }
-                    , { field: 'HDeptID', title: 'HDeptID', sort: true, hide: true }
-                    , { field: '閮ㄩ棬浠g爜', title: '閮ㄩ棬浠g爜' }
-                    , { field: '閮ㄩ棬', title: '閮ㄩ棬鍚嶇О' }
-                    , { field: 'HGroupID', title: 'HGroupID', sort: true, hide: true }
-                    , { field: '鐝粍浠g爜', title: '鐝粍浠g爜' }
-                    , { field: '鐝粍鍚嶇О', title: '鐝粍鍚嶇О' }
-                    , { field: '澶囨敞', title: '澶囨敞' }
-                    , { field: 'hparentid', title: 'hparentid', sort: true, hide: true }
-                    , { field: '缁勪唬鐮�', title: '鏍哥畻鏂瑰紡缁勪唬鐮�' }
-                    , { field: '缁勫悕绉�', title: '鏍哥畻鏂瑰紡缁勫悕绉�' }
-                ]]
-            };
-            var index = layer.load(0, { shade: false });
-            //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
-            $.ajax({
-                url: GetWEBURL() + '/Gy_ClassTimePrj/list',
-                type: "GET",
-                data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
-                success: function (data1) {
-                    if (data1.count == 1) {
-                        option.data = data1.data;
-                        table.render(option);
-                        layer.close(index);
-                    } else {
-                        layer.close(index);
-                        layer.alert(data1.code + data1.Message, { icon: 5 });
-                    }
-                }, error: function () {
-                    layer.close(index);
-                    layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
-                }
-            });
-            //鏂板
-            form.on('submit(btnAdd)', function (obj) {
-                //椤甸潰灞�-鑷畾涔�
-                layer.open({
-                    type: 2,
-                    skin: 'layui-layer-rim', //鍔犱笂杈规
-                    title: '鏂板鏍哥畻鏂瑰紡',
-                    closeBtn: 1,
-                    shift: 2,
-                    area: ['80%', '80%'],
-                    maxmin: true,
-                    content: ['../鏍哥畻鏂瑰紡/Gy_ClassTimePrjBillEdit.html?hID=' + TagId + '&Level=' + Level+''],
-                    end: function () {
-                        //鍒锋柊椤甸潰,
-                        location.reload();
-                    },
-                    success: function (layero, index) {
-
-                    }
-                });
-                return false;//杩欓噷鍔犱釜return false;灏变笉浼氫袱娆℃彁浜�
-            })
-            //鍒犻櫎
-            form.on('submit(btndelete)', function (obj) {
-                var ModRightNameDelete = 'Gy_ClassTimePrj_Delete'
-                if (TagId != "") {
-                    layer.confirm('鎮ㄧ‘瀹氳鍒犻櫎鍚楋紵', {
-                        btn: ['纭畾', '鍙栨秷'] //鎸夐挳
-                        , yes: function (index, layero) {
-
-                            $.ajax({
-                                url: GetWEBURL() + '/Gy_ClassTimePrj/Delete_Json',
-                                type: "GET",
-                                //async: true,
-                                data: { "HItemID": TagId, "User": sessionStorage["HUserName"], "ModRightNameDelete": ModRightNameDelete },
-                                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);
-                                            //淇敼涓哄姛鍚庡埛鏂扮晫闈�
-                                            window.location.reload();
-                                            //閲嶈浇tree
-                                            tree.reload('treeDepartment', {});
-                                        });
-
-                                    } else {
-                                        layer.alert(result.code + result.Message, { icon: 5 });
-                                    }
-                                }
-                            })
-                        }
-                    });
-                }
-                else {
-                    //var data = obj.data //鑾峰緱褰撳墠琛屾暟鎹�
-                    //    , layEvent = obj.event; //鑾峰緱 lay-event 瀵瑰簲鐨勫��
-                    var checkStatus = table.checkStatus('mainTable')
-                        , data = checkStatus.data;
-                    var layEvent = checkStatus.event;
-                    if (checkStatus.data.length === 1) {
-                        layer.confirm('鎮ㄧ‘瀹氳鍒犻櫎鍚楋紵', {
-                            btn: ['纭畾', '鍙栨秷'] //鎸夐挳
-                            , yes: function (index, layero) {
-
-                                $.ajax({
-                                    url: GetWEBURL() + '/Gy_ClassTimePrj/Delete_Json',
-                                    type: "GET",
-                                    //async: true,
-                                    data: { "HItemID": data[0].HItemID, "User": sessionStorage["HUserName"], "ModRightNameDelete": ModRightNameDelete },
-                                    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);
-                                                //淇敼涓哄姛鍚庡埛鏂扮晫闈�
-                                                window.location.reload();
-                                                //閲嶈浇tree
-                                                tree.reload('treeDepartment', {});
-                                            });
-
-                                        } else {
-                                            layer.alert(result.code + result.Message, { icon: 5 });
-                                        }
-                                    }
-                                })
-                            }
-                        });
-                    }
-                    else {
-                        layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
-                    }
-                }
-            });
-            //鏌ヨ鎸夐挳
-            form.on('submit(btnSearch)', function (data) {
-                var HNumber = $("#HNumber").val();
-                var HName = $("#HName").val();
-                if (HNumber) {
-                    sWhere += " and 浠g爜 like '%" + HNumber + "%'";
-                }
-                if (HName) {
-                    sWhere += " and 鍚嶇О like '%" + HName + "%'";
-                }
-                $.ajax({
-                    //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
-                    url: GetWEBURL() + '/Gy_ClassTimePrj/list',
-                    type: "GET",
-                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
-                    success: function (data1) {
-                        if (data1.count == 1) {
-                            option.data = data1.data;
-                            table.render(option);
-                            layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
-                        } else {
-                            layer.alert(data1.code + data1.Message, { icon: 5 });
-                        }
-                    }, error: function () {
-                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
-                    }
-                });
-                sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
-            });
-            //淇敼鎸夐挳
-            form.on('submit(btnModify)', function (data) {
-                if (TagId != "") {
-                    layer.open({
-                        type: 2
-                        , area: ['80%', '80%']
-                        , title: '缂栬緫鏍哥畻鏂瑰紡'
-                        , closeBtn: 1
-                        , shade: 0.6 //閬僵閫忔槑搴�
-                        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                        , content: ['../鏍哥畻鏂瑰紡/Gy_ClassTimePrjBillEdit.html?hID=' + TagId + '&HType=Modify&TagParentId=' + TagParentId + '', 'yes']
-                        , resize: false,
-                        end: function () {
-                            //鍒锋柊椤甸潰,
-                            location.reload();
-                        }
-                        , cancel: function () {
-                            //$(".layui-btn").removeClass("layui-btn-disabled");
-                        }
-                    })
-                }
-                else {
-                    var checkStatus = table.checkStatus('mainTable')
-                        , data = checkStatus.data;
-                    if (checkStatus.data.length === 1) {
-                        var hID = data[0].HItemID.toString();
-                        TagParentId = data[0].hparentid.toString();
-                        //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
-                        layer.open({
-                            type: 2
-                            , area: ['80%', '80%']
-                            , title: '缂栬緫鏍哥畻鏂瑰紡'
-                            , closeBtn: 1
-                            , shade: 0.6 //閬僵閫忔槑搴�
-                            , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                            , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                            , content: ['../鏍哥畻鏂瑰紡/Gy_ClassTimePrjBillEdit.html?hID=' + hID + '&HType=Modify&TagParentId=' + TagParentId + '', 'yes']
-
-                            , resize: false,
-                            end: function () {
-                                //鍒锋柊椤甸潰,
-                                location.reload();
-                            }
-                            , cancel: function () {
-                                //$(".layui-btn").removeClass("layui-btn-disabled");
-                            }
-                        })
-
-                    } else {
-                        layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
-                    }
-                }
-            });
-        });
-
-        //鏌ヨ鏍戠姸鏁版嵁
-        function getData(sWhere) {
-            var treeData;
-
-            $.ajax({
-                url: GetWEBURL() + '/Gy_ClassTimePrj/LoadTree',
-                type: "GET",
-                data: { "sWhere": sWhere },
-                async: false,
-                success: function (result) {
-                    console.log(result);
-                    var data = result.data;
-                    //鐢熸垚鏁版嵁瀵硅薄闆嗗悎
-                    treeData = LoadTree(data);
-
-                }
-            });
-            return treeData;
-        }
-        /**澶勭悊鏍戝舰灞曠ず鏁版嵁锛岃姹傛湁ID鍜孭arentID銆乼itle瀛楁**/
-        function LoadTree(data) {
-            let map = {};
-            let treeData = [];
-            data.forEach(it => {
-                map[it.id] = it;    //ID涓烘瘡涓妭鐐圭殑id
-            })
-            //鐢熸垚缁撴灉闆�
-            data.forEach(it => {
-                const parent = map[it.ParentID];   //ParentID涓虹埗鑺傜偣鐨刬d
-                if (parent) {
-                    if (!Array.isArray(parent.children)) parent.children = [];
-                    parent.children.push(it);
-                } else {
-                    treeData.push(it)
-                }
-            })
-            return treeData;
-        }
-    </script>
-</body>
-</html>
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\346\240\270\347\256\227\346\226\271\345\274\217/Gy_ClassTimePrjGroupBillList.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\346\240\270\347\256\227\346\226\271\345\274\217/Gy_ClassTimePrjGroupBillList.html"
deleted file mode 100644
index 0737ef7..0000000
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\346\240\270\347\256\227\346\226\271\345\274\217/Gy_ClassTimePrjGroupBillList.html"
+++ /dev/null
@@ -1,329 +0,0 @@
-锘�<!DOCTYPE html>
-<html>
-<head>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <title>鏍哥畻鏂瑰紡缁勫垪琛�</title>
-    <meta name="renderer" content="webkit">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
-    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
-    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
-    <script src="../../../layuiadmin/layui/layui.js"></script>
-    <script src="../../../layuiadmin/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>
-    <style media="screen">
-        .custom-tree-item-clicked {
-            color: #FC9003
-        }
-
-        .layui-form-label {
-            width: 40px;
-            padding: 9px 5px;
-        }
-
-        .layui-input-block {
-            margin-left: 50px;
-        }
-    </style>
-</head>
-<body>
-    <div class="layui-fluid">
-        <div class="layui-col-md12">
-            <div class="layui-card" style="padding: 1px">
-                <div class="layui-card-body" style="padding: 1px;">
-                    <form class="layui-form" action="" lay-filter="component-form-group">
-                        <div class="layui-collapse">
-                            <div class="layui-colla-item">
-                                <div style="padding: 10px;">
-
-                                    <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="btndelete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
-                                </div>
-
-                                <div class="layui-form-item" style="border-top: solid 1px #F6F6F6;">
-                                    <div class="layui-row" style="padding:10px 0">
-                                        <div class="layui-col-xs3 layui-inline" style="width: 23%;display:none;">
-                                            <div id="treeCheckItem" lay-filter="treeCheckItem" class="demo-tree demo-tree-box" style="height: 520px; overflow: scroll;"></div>
-                                        </div>
-                                        <div class="layui-col-xs12 layui-inline">
-                                            <div class="layui-row">
-                                                <div class="layui-inline">
-                                                    <label class="layui-form-label">浠g爜</label>
-                                                    <div class="layui-input-block">
-                                                        <input type="text" class="layui-input" 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" name="HName" id="HName">
-                                                    </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>
-                                            </div>
-                                            <div>
-                                                <table class="" id="mainTable" lay-filter="mainTable"></table>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                        <!--<table class="" id="mainTable" lay-filter="mainTable"></table>-->
-                        <script type="text/html" id="toolbarDemo">
-                            <div class="layui-btn-container">
-
-                            </div>
-                        </script>
-                    </form>
-                </div>
-            </div>
-        </div>
-    </div>
-    <script src="../../../layuiadmin/layui/zgqlayui.js"></script>
-    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
-
-    <script>
-        var treeCkData = { id: 0 };
-        var TagId = "";
-        var TagParentId = "";
-        var Level = "1";
-
-        layui.config({
-            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
-        }).extend({
-            index: 'lib/index', //涓诲叆鍙fā鍧�
-        }).use(['tree', 'index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
-            var $ = layui.$
-                , admin = layui.admin
-                , layer = layui.layer
-                , table = layui.table
-                , form = layui.form
-                , element = layui.element
-                , laypage = layui.laypage
-                , laydate = layui.laydate
-                , util = layui.util
-                , tree = layui.tree
-            var sWhere = "";
-            let that = this;
-
-            var option = {
-                elem: '#mainTable'
-                //, toolbar: '#toolbarDemo'
-                , height: 'full-50'
-                , page: true
-                , cellMinWidth: 90
-                , limit: 50
-                , limits: [50, 500, 5000, 20000]
-                , cols: [[
-                    { type: 'checkbox', fixed: 'left' }
-                    , { field: 'HItemID', title: 'HItemID', sort: true, hide: true }
-                    , { field: '鏍哥畻鏂瑰紡缁勪唬鐮�', title: '鏍哥畻鏂瑰紡缁勪唬鐮�' }
-                    , { field: '鏍哥畻鏂瑰紡缁勫悕绉�', title: '鏍哥畻鏂瑰紡缁勫悕绉�' }
-                    , { field: 'HDeptID', title: 'HDeptID', sort: true, hide: true }
-                    , { field: '閮ㄩ棬浠g爜', title: '閮ㄩ棬浠g爜' }
-                    , { field: '閮ㄩ棬', title: '閮ㄩ棬鍚嶇О' }
-                ]]
-            };
-
-            var index = layer.load(0, { shade: false });
-            //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
-            $.ajax({
-                url: GetWEBURL() + '/Web/GetClassTimePrjGroupBillList_Json',
-                type: "GET",
-                data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
-                success: function (data1) {
-                    if (data1.count == 1) {
-                        option.data = data1.data;
-                        table.render(option);
-                        layer.close(index);
-                    } else {
-                        layer.close(index);
-                        layer.alert(data1.code + data1.Message, { icon: 5 });
-                    }
-                }, error: function () {
-                    layer.close(index);
-                    layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
-                }
-            });
-
-
-
-            //鏂板
-            form.on('submit(btnAdd)', function (obj) {
-                //椤甸潰灞�-鑷畾涔�
-                layer.open({
-                    type: 2,
-                    skin: 'layui-layer-rim', //鍔犱笂杈规
-                    title: '鏂板鏍哥畻鏂瑰紡',
-                    closeBtn: 1,
-                    shift: 2,
-                    area: ['80%', '80%'],
-                    maxmin: true,
-                    content: ['../../Baseset/鍩虹璧勬枡/Gy_ClassTimePrjGroupEdit.html?OperationType=1&linterid=&HSouceBillType=0&closeType=1'],
-                    end: function () {
-                        //鍒锋柊椤甸潰,
-                        location.reload();
-                    },
-                    success: function (layero, index) {
-
-                    }
-                });
-                return false;//杩欓噷鍔犱釜return false;灏变笉浼氫袱娆℃彁浜�
-            })
-            //鍒犻櫎
-            form.on('submit(btndelete)', function (obj) {
-                var checkStatus = table.checkStatus('mainTable')
-                    , data = checkStatus.data;
-                if (checkStatus.data.length === 1) {
-                    var linterid = data[0].HItemID.toString();
-                    layer.confirm('鎮ㄧ‘瀹氳鍒犻櫎鍚楋紵', {
-                        btn: ['纭畾', '鍙栨秷'] //鎸夐挳
-                        , yes: function (index, layero) {
-                            $.ajax({
-                                url: GetWEBURL() + '/Web/DeleteClassTimePrjGroupBillList',
-                                type: "GET",
-                                //async: true,
-                                data: { "HItemID": linterid, "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);
-                                            //淇敼涓哄姛鍚庡埛鏂扮晫闈�
-                                            window.location.reload();
-                                            
-                                        });
-
-                                    } else {
-                                        layer.alert(result.code + result.Message, { icon: 5 });
-                                    }
-                                }
-                            })
-                        }
-                    });
-                }
-                else {
-                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紒');
-                }
-            });
-            //鏌ヨ鎸夐挳
-            form.on('submit(btnSearch)', function (data) {
-                var HNumber = $("#HNumber").val();
-                var HName = $("#HName").val();
-                if (HNumber) {
-                    sWhere += " and HNumber like '%" + HNumber + "%'";
-                }
-                if (HName) {
-                    sWhere += " and HName like '%" + HName + "%'";
-                }
-                $.ajax({
-                    url: GetWEBURL() + '/Web/GetClassTimePrjGroupBillList_Json',
-                    type: "GET",
-                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
-                    success: function (data1) {
-                        if (data1.count == 1) {
-                            option.data = data1.data;
-                            table.render(option);
-                            layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
-                        } else {
-                            layer.alert(data1.code + data1.Message, { icon: 5 });
-                        }
-                    }, error: function () {
-                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
-                    }
-                });
-                sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
-            });
-
-            //淇敼鎸夐挳
-            form.on('submit(btnModify)', function (data) {
-                var checkStatus = table.checkStatus('mainTable')
-                    , data = checkStatus.data;
-                if (checkStatus.data.length === 1) {
-                    var linterid = data[0].HItemID.toString();
-                    //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
-                    layer.open({
-                        type: 2
-                        , area: ['80%', '80%']
-                        , title: '缂栬緫鏍哥畻鏂瑰紡'
-                        , closeBtn: 1
-                        , shade: 0.6 //閬僵閫忔槑搴�
-                        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                        , content: ['../../Baseset/鍩虹璧勬枡/Gy_ClassTimePrjGroupEdit.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0&closeType=1']
-
-                        , resize: false,
-                        end: function () {
-                            //鍒锋柊椤甸潰,
-                            location.reload();
-                        }
-                        , cancel: function () {
-                            //$(".layui-btn").removeClass("layui-btn-disabled");
-                        }
-                    })
-
-                } else {
-                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
-                }
-            });
-
-            
-
-            //浠ヤ笂鏄痩ayui妯″潡
-        });
-
-        //鏌ヨ鏍戠姸鏁版嵁
-        function getData(sWhere) {
-            var treeData;
-
-            $.ajax({
-                url: GetWEBURL() + '/Gy_ClassTimePrj/LoadTree',
-                type: "GET",
-                data: { "sWhere": sWhere },
-                async: false,
-                success: function (result) {
-                    console.log(result);
-                    var data = result.data;
-                    //鐢熸垚鏁版嵁瀵硅薄闆嗗悎
-                    treeData = LoadTree(data);
-
-                }
-            });
-            return treeData;
-        }
-        /**澶勭悊鏍戝舰灞曠ず鏁版嵁锛岃姹傛湁ID鍜孭arentID銆乼itle瀛楁**/
-        function LoadTree(data) {
-            let map = {};
-            let treeData = [];
-            data.forEach(it => {
-                map[it.id] = it;    //ID涓烘瘡涓妭鐐圭殑id
-            })
-            //鐢熸垚缁撴灉闆�
-            data.forEach(it => {
-                const parent = map[it.ParentID];   //ParentID涓虹埗鑺傜偣鐨刬d
-                if (parent) {
-                    if (!Array.isArray(parent.children)) parent.children = [];
-                    parent.children.push(it);
-                } else {
-                    treeData.push(it)
-                }
-            })
-            return treeData;
-        }
-
-
-
-
-    </script>
-
-</body>
-</html>
\ No newline at end of file

--
Gitblit v1.9.1