From a11b05b0b934f4ee62c74ac1202f5957bf610477 Mon Sep 17 00:00:00 2001
From: yxj <yxj@hz-kingdee.com>
Date: 星期四, 18 一月 2024 10:16:58 +0800
Subject: [PATCH] 新增核算方式模块;乔一销售出库扫码模块新增用户权限控制,明细清单列表显示列修改;其他入库扫码模块新增用户权限控制

---
 WebTM/views/验收入库/委外入库/Kf_EntrustInBill_Fast.html            |    1 
 WebTM/views/WMS扫码模块/销售出库/Kf_SellOutBill_QiaoYi_PDA.html     |   40 +
 WebTM/views/WMS扫码模块/销售出库/Kf_SellOutBillList_QiaoYi_PDA.html |   33 +
 WebTM/views/基础资料/工资基础资料/Gy_ClassTimePrjEdit.html            |  515 ++++++++++++++++++++
 WebTM/views/WMS扫码模块/其他入库/Kf_OtherInBill_PDA.html            |   33 +
 WebTM/views/基础资料/工资基础资料/Gy_ClassTimePrjList.html            |  847 +++++++++++++++++++++++++++++++++
 WebTM/layuiadmin/Scripts/webConfig.js                       |    4 
 WebTM/views/index.html                                      |    1 
 WebTM/WebTM.csproj                                          |    2 
 9 files changed, 1,462 insertions(+), 14 deletions(-)

diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index fef4805..f9e14dd 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -309,8 +309,10 @@
     <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_ClassTimePrjEdit.html" />
     <Content Include="views\鍩虹璧勬枡\宸ヨ祫鍩虹璧勬枡\Gy_ProcCommPrice.html" />
     <Content Include="views\鍩虹璧勬枡\宸ヨ祫鍩虹璧勬枡\Gy_ProcCommPriceList.html" />
+    <Content Include="views\鍩虹璧勬枡\宸ヨ祫鍩虹璧勬枡\Gy_ClassTimePrjList.html" />
     <Content Include="views\鍩虹璧勬枡\鐢熶骇鍩虹璧勬枡\Add_Edit_Gy_Post.html" />
     <Content Include="views\鍩虹璧勬枡\鐢熶骇鍩虹璧勬枡\Add_Edit_Gy_PostSkillList.html" />
     <Content Include="views\鍩虹璧勬枡\鐢熶骇鍩虹璧勬枡\Add_Edit_Gy_BadResult.html" />
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index 6b2abbb..922b73b 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -3,9 +3,9 @@
     //var WEBURL = "http://192.168.16.80:8011/";          //鍔炲叕瀹ゆ湇鍔″櫒
     //var WEBURL = "http://localhost:8081/SWEAPI/";       //ch鏈湴*/
     //var WEBURL = "http://61.164.86.218:8099/ABAPI/";
-    //var WEBURL = "http://localhost/API/";             //棰滄檽鍐涙湰鍦伴厤缃�
+    var WEBURL = "http://localhost/API/";             //棰滄檽鍐涙湰鍦伴厤缃�
     //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //鏉ㄤ箰鏈湴閰嶇疆
-    var WEBURL = "http://localhost:8082/API/";    //鏉滆春鏈湴閰嶇疆
+    //var WEBURL = "http://localhost:8082/API/";    //鏉滆春鏈湴閰嶇疆
     //var WEBURL = "http://localhost:8082/API/";    //寮犵憺骞挎湰鍦伴厤缃�
     //var WEBURL = "http://localhost:81/API/";  //闄堥洴闈欐湰鍦伴厤缃�
     //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //浣欐�濇澃鏈湴閰嶇疆
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBill_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBill_PDA.html"
index 63c113b..caa2243 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBill_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBill_PDA.html"
@@ -396,7 +396,8 @@
             var listOption = [];
             var columns = "";
             var HModName = "Kf_OtherInBill_PDA";
-            var titleData = [];     //涓嶉渶瑕佹樉绀虹殑瀛楁
+            var ModRightName = "CE_OtherIn";    //妯″潡鏉冮檺鍙傛暟
+            var titleData = [];                 //涓嶉渶瑕佹樉绀虹殑瀛楁
 
             //#endregion
 
@@ -404,9 +405,37 @@
             if (sessionStorage.login != "login") {
                 layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
                     icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
-                }, function () { window.location.href = "../../user/login.html"; });
+                }, function () { window.location.href = "../../user/login_pda.html"; });
             }
 
+            //#region   鐢ㄦ埛妯″潡鏉冮檺鍒ゆ柇
+
+            //鐢ㄦ埛妯″潡鏉冮檺鍒ゆ柇
+            CheckModRight();
+
+            function CheckModRight() {
+                layer.load(3);
+                $.ajax({
+                    type: "GET",
+                    url: GetWEBURL() + "/WEBSController/CheckModRight_Json",
+                    async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                    data: { "ModRightName": ModRightName, "HUserName": HMaker },
+                    success: function (d) {
+                        if (d.count == 1) {
+                        }
+                        else {
+                            layer.msg(d.Message, {
+                                icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                            }, function () {
+                                parent.location.href = "../../../views/index_Mobile.html";
+                            });
+                        }
+                    }
+                });
+                layer.closeAll("loading");
+            }
+            //#endregion
+
             //澶辫触鎻愮ず闊�
             function playSound() {
                 console.log("playSound");
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBillList_QiaoYi_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBillList_QiaoYi_PDA.html"
index a4dbbf8..6157740 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBillList_QiaoYi_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBillList_QiaoYi_PDA.html"
@@ -124,8 +124,9 @@
         var columns = "";
         var Uploadedcolumns = "";
         var HModName = "Kf_SellOutBillList_QiaoYi_PDA";
-        var titleData = [];     //涓嶉渶瑕佹樉绀虹殑瀛楁
-        var UploadedtitleData = [];     //涓嶉渶瑕佹樉绀虹殑瀛楁
+        var ModRightName = "CE_SellOut";    //妯″潡鏉冮檺鍙傛暟
+        var titleData = [];                 //涓嶉渶瑕佹樉绀虹殑瀛楁
+        var UploadedtitleData = [];         //涓嶉渶瑕佹樉绀虹殑瀛楁
 
         //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
         if (sessionStorage.login != "login") {
@@ -134,6 +135,34 @@
             }, function () { window.location.href = "../../user/login.html"; });
         }
 
+        //#region   鐢ㄦ埛妯″潡鏉冮檺鍒ゆ柇
+
+        //鐢ㄦ埛妯″潡鏉冮檺鍒ゆ柇
+        CheckModRight();
+
+        function CheckModRight() {
+            layer.load(3);
+            $.ajax({
+                type: "GET",
+                url: GetWEBURL() + "/WEBSController/CheckModRight_Json",
+                async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                data: { "ModRightName": ModRightName, "HUserName": HMaker },
+                success: function (d) {
+                    if (d.count == 1) {
+                    }
+                    else {
+                        layer.msg(d.Message, {
+                            icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                        }, function () {
+                            parent.location.href = "../../../views/index_Mobile_QiaoYi.html";
+                        });
+                    }
+                }
+            });
+            layer.closeAll("loading");
+        }
+        //#endregion
+
         //澶辫触鎻愮ず闊�
         function playSound() {
             console.log("playSound");
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_QiaoYi_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_QiaoYi_PDA.html"
index 78bf790..4db3085 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_QiaoYi_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_QiaoYi_PDA.html"
@@ -293,7 +293,8 @@
             var BarCodelistOption = [];
             var columns = "";
             var HModName = "Kf_SellOutBill_QiaoYi_PDA";
-            var titleData = [];     //涓嶉渶瑕佹樉绀虹殑瀛楁
+            var ModRightName = "CE_SellOut";    //妯″潡鏉冮檺鍙傛暟
+            var titleData = [];                 //涓嶉渶瑕佹樉绀虹殑瀛楁
 
             //#endregion
 
@@ -303,6 +304,34 @@
                     icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
                 }, function () { window.location.href = "../../user/login.html"; });
             }
+
+            //#region   鐢ㄦ埛妯″潡鏉冮檺鍒ゆ柇
+
+            //鐢ㄦ埛妯″潡鏉冮檺鍒ゆ柇
+            CheckModRight();
+
+            function CheckModRight() {
+                layer.load(3);
+                $.ajax({
+                    type: "GET",
+                    url: GetWEBURL() + "/WEBSController/CheckModRight_Json",
+                    async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                    data: { "ModRightName": ModRightName, "HUserName": HMaker },
+                    success: function (d) {
+                        if (d.count == 1) {
+                        }
+                        else {
+                            layer.msg(d.Message, {
+                                icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                            }, function () {
+                                parent.location.href = "../../../views/index_Mobile_QiaoYi.html";
+                            });
+                        }
+                    }
+                });
+                layer.closeAll("loading");
+            }
+            //#endregion
 
             //澶辫触鎻愮ず闊�
             function playSound() {
@@ -378,15 +407,10 @@
                     , limit: 3000
                     , totalRow: true
                     , cols: [[
-                        { field: 'HBarCode', title: '鏉$爜缂栧彿', width: 220 }
-                        , { field: 'HQty', title: '鏁伴噺', width: 80, totalRow: true }
+                        { field: 'HQty', title: '鏁伴噺', width: 80, totalRow: true }
                         , { field: 'HMaterNumber', title: '鐗╂枡浠g爜', width: 150 }
                         , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
-                        , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 150 }
-                        , { field: 'HWHName', title: '浠撳簱', width: 150 }
-                        , { field: 'HSPName', title: '浠撲綅', width: 150 }
-                        , { field: 'HBatchNo', title: '鎵瑰彿', width: 150 }
-                        , { field: 'HAuxPropName', title: '杈呭姪灞炴��', width: 150 }
+                        , { field: 'HBarCode', title: '鏉$爜缂栧彿', width: 220 }
                         , { field: 'HItemID', title: 'HItemID', width: 150, hide: true }
                     ]]
                     , height: 500
diff --git a/WebTM/views/index.html b/WebTM/views/index.html
index 343f8bc..aaeccba 100644
--- a/WebTM/views/index.html
+++ b/WebTM/views/index.html
@@ -1136,6 +1136,7 @@
                                 <dd>
                                     <a>宸ヨ祫鍩虹璧勬枡</a>
                                     <dl class="layui-nav-child">
+                                        <dd><a lay-href="鍩虹璧勬枡/宸ヨ祫鍩虹璧勬枡/Gy_ClassTimePrjList.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_ClassTimePrjEdit.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_ClassTimePrjEdit.html"
new file mode 100644
index 0000000..d3d8967
--- /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_ClassTimePrjEdit.html"
@@ -0,0 +1,515 @@
+锘�<!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_ClassTimePrjEdit">
+                        <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;padding: 9px 18px;">鏍哥畻鏂瑰紡缁�</label>
+                                            <div class="layui-input-block" style="margin-left: 77px;">
+                                                <input type="text" class="layui-input" lay-verify="HParentName" name="HParentName" id="HParentName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+                                                <input type="hidden" lay-verify="HParentID" name="HParentID" id="HParentID" value="0">
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHParent" id="btnHParent" style="padding: 0 10px;float: right;margin-right: 3px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">閮ㄩ棬</label>
+                                            <div class="layui-input-block" style="margin-left: 77px;">
+                                                <input type="text" class="layui-input" lay-verify="HDeptName" name="HDeptName" id="HDeptName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+                                                <input type="hidden" lay-verify="HDeptID" name="HDeptID" id="HDeptID" value="0">
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHDept" id="btnHDept" style="padding: 0 10px;float: right;margin-right: 3px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鐝粍</label>
+                                            <div class="layui-input-block" style="margin-left: 77px;">
+                                                <input type="text" class="layui-input" lay-verify="HGroupName" name="HGroupName" id="HGroupName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+                                                <input type="hidden" lay-verify="HGroupID" name="HGroupID" id="HGroupID" value="0">
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHGroup" id="btnHGroup" style="padding: 0 10px;float: right;margin-right: 3px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-inline" 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="鏄惁绂佺敤">
+                                                <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) {  //缂栬緫
+                //绂佺敤缁勭粐閫夐」
+                $("#HUSEORGID").attr("disabled", true);
+                $("#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_ClassTimePrjController/GetGy_ClassTimePrj_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);
+                            }
+                            form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+                                "HItemID": data.HItemID
+                                , "HNumber": data.鏍哥畻鏂瑰紡浠g爜
+                                , "HName": data.鏍哥畻鏂瑰紡鍚嶇О
+                                , "HParentID": data.HParentID
+                                , "HParentName": data.鎵�灞炴牳绠楁柟寮忕粍
+                                , "HDeptID": data.HDeptID
+                                , "HDeptName": data.閮ㄩ棬
+                                , "HGroupID": data.HGroupID
+                                , "HGroupName": data.鐝粍
+                                , "HStopflag": data.绂佺敤鏍囪
+                                , "HRemark": data.澶囨敞
+                                , "HUSEORGID": data.HUSEORGID
+                                , "HMakeEmp": data.鍒涘缓浜�
+                                , "HMakeTime": data.鍒涘缓鏃ユ湡 == null ? "" : Format(data.鍒涘缓鏃ユ湡, "yyyy-MM-dd hh:mm:ss")
+                                , "HCheckEmp": data.瀹℃牳浜�
+                                , "HCheckTime": data.瀹℃牳鏃ユ湡 == null ? "" : Format(data.瀹℃牳鏃ユ湡, "yyyy-MM-dd hh:mm:ss")
+                                , "HModifyEmp": data.淇敼浜�
+                                , "HModifyTime": data.淇敼鏃ユ湡 == null ? "" : Format(data.淇敼鏃ユ湡, "yyyy-MM-dd hh:mm:ss")
+                                , "HStopEmp": data.绂佺敤浜�
+                                , "HStopTime": data.绂佺敤鏃ユ湡 == null ? "" : 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 鍩虹璧勬枡閫夋嫨
+
+            //閫夋嫨鎵�灞炴牳绠楁柟寮忕粍鎸夐挳
+            form.on('submit(btnHParent)', function () {
+                get_CheckParent();
+            });
+            //閫夋嫨閮ㄩ棬鎸夐挳
+            form.on('submit(btnHDept)', function () {
+                get_CheckDept();
+            });
+            //閫夋嫨鐝粍鎸夐挳
+            form.on('submit(btnHGroup)', function () {
+                get_CheckGroup();
+            });
+
+            //#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('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HParentID").val(checkStatus.data[0].HItemID);
+                        $("#HParentName").val(checkStatus.data[0].HName);
+                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                })
+            }
+            //#endregion
+
+            //#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('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HDeptID").val(checkStatus.data[0].HItemID);
+                        $("#HDeptName").val(checkStatus.data[0].HName);
+                        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('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HGroupID").val(checkStatus.data[0].HItemID);
+                        $("#HGroupName").val(checkStatus.data[0].HName);
+                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                })
+            }
+            //#endregion
+
+            //#endregion
+
+
+            //#region 鍔熻兘鎺т欢
+
+            //#region 淇濆瓨
+
+            //淇濆瓨鎸夐挳
+            form.on('submit(btn_Save)', function (data) {
+                set_SaveBill(data);
+            });
+
+            //淇濆瓨鏂规硶
+            function set_SaveBill(data) {
+                //鍩虹璧勬枡鏂囨湰妗嗕负绌烘椂锛屾竻绌哄搴擨D
+                if ($("#HParentName").val() == '') {
+                    $("#HParentID").val("0");
+                    data.field.HParentID = $('#HParentID').val()
+                }
+                if ($("#HDeptName").val() == '') {
+                    $("#HDeptID").val("0");
+                    data.field.HDeptID = $('#HDeptID').val()
+                }
+                if ($("#HGroupName").val() == '') {
+                    $("#HGroupID").val("0");
+                    data.field.HGroupID = $('#HGroupID').val()
+                }
+
+                //淇濆瓨鍓嶅垽鏂�
+                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.HParentID==0) {
+                    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_ClassTimePrjController/GetGy_ClassTimePrj_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 });
+                            $('#set_SaveBill').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_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"
new file mode 100644
index 0000000..4405643
--- /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_ClassTimePrjList.html"
@@ -0,0 +1,847 @@
+锘�<!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">鎵�灞炴牳绠楁柟寮忕粍</label>
+                                    <div class="layui-input-block">
+                                        <input type="text" class="layui-input" name="HParentName" id="HParentName" 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_ClassTimePrjList";
+            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_ClassTimePrjEdit.html?OperationType=1&HItemID=0'
+                })
+            }
+            //#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_ClassTimePrjEdit.html?OperationType=2&HItemID=' + HItemID
+                    })
+                } 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_ClassTimePrjController/GetGy_ClassTimePrj_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_ClassTimePrjController/GetGy_ClassTimePrj_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_ClassTimePrjController/GetGy_ClassTimePrj_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("");        //鍚嶇О
+                $("#HParentName").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 HParentName = $("#HParentName").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 + "%'";
+                }
+                if (HParentName) {
+                    sWhere += " and 鎵�灞炴牳绠楁柟寮忕粍 like '%" + HParentName + "%'";
+                }
+                get_Display(sWhere);
+            }
+
+            //#endregion
+
+            //#region 鍒楄〃鍒锋柊
+            function get_Display(sWhere) {
+                var ajaxLoad = layer.load();
+                $.ajax({
+                    type: "GET",
+                    url: GetWEBURL() + '/Gy_ClassTimePrjController/GetGy_ClassTimePrjList_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/\351\252\214\346\224\266\345\205\245\345\272\223/\345\247\224\345\244\226\345\205\245\345\272\223/Kf_EntrustInBill_Fast.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\247\224\345\244\226\345\205\245\345\272\223/Kf_EntrustInBill_Fast.html"
index e024ee0..1a6e8fc 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\247\224\345\244\226\345\205\245\345\272\223/Kf_EntrustInBill_Fast.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\247\224\345\244\226\345\205\245\345\272\223/Kf_EntrustInBill_Fast.html"
@@ -1016,6 +1016,7 @@
                         success: function (result) {
                             if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
                                 $("#HStockPlaceName").val(result.data[0].HName);
+                                $("#HStockPlaceID").val(result.data[0].HItemID);
                                 $("#HWHID").val(result.data[0].HWHID);
                                 $("#HWHNAME").val(result.data[0].HWhName);
                                 element.tabChange('tab-Kf_EntrustInBill', '2');

--
Gitblit v1.9.1