From e23d623909d899205e5853e4e8be8764f95beb54 Mon Sep 17 00:00:00 2001
From: yxj <yxj@hz-kingdee.com>
Date: 星期二, 09 四月 2024 09:50:01 +0800
Subject: [PATCH] 新增基础资料班次新增模块、列表模块;考勤汇报单新增模块选班次,选班组带出职员功能修改

---
 WebTM/views/基础资料/生产基础资料/Gy_ShiftsEdit.html        |  468 +++++++++++++++
 WebTM/views/工资管理/考勤汇报单/Pay_WorkTimesBillEdit.html |  139 +++-
 WebTM/layuiadmin/Scripts/webConfig.js             |    4 
 WebTM/WebTM.csproj                                |    2 
 WebTM/views/基础资料/生产基础资料/Gy_ShiftsList.html        | 1210 +++++++++++++++++++++++++++++++++++++++
 5 files changed, 1,776 insertions(+), 47 deletions(-)

diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index be5ac9d..c80da82 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -380,6 +380,8 @@
     <Content Include="views\鍩虹璧勬枡\鐢熶骇鍩虹璧勬枡\Gy_DisposeWayList.html" />
     <Content Include="views\鍩虹璧勬枡\鐢熶骇鍩虹璧勬枡\Gy_ScrapReasonList.html" />
     <Content Include="views\鍩虹璧勬枡\鐢熶骇鍩虹璧勬枡\Gy_Souce_Excel.html" />
+    <Content Include="views\鍩虹璧勬枡\鐢熶骇鍩虹璧勬枡\Gy_ShiftsList.html" />
+    <Content Include="views\鍩虹璧勬枡\鐢熶骇鍩虹璧勬枡\Gy_ShiftsEdit.html" />
     <Content Include="views\鍩虹璧勬枡\璁惧鍩虹璧勬枡\Gy_CardAddress.html" />
     <Content Include="views\鍩虹璧勬枡\璁惧鍩虹璧勬枡\Gy_CardChangeType.html" />
     <Content Include="views\鍩虹璧勬枡\璁惧鍩虹璧勬枡\Gy_CardStatus.html" />
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index fd98315..f07a5e2 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -3,11 +3,11 @@
     //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:8083/API/";  //闄堥洴闈欐湰鍦伴厤缃�
-    var WEBURL = "http://localhost:8082/API/";    //寮犵憺骞挎湰鍦伴厤缃�
+    //var WEBURL = "http://localhost:8082/API/";    //寮犵憺骞挎湰鍦伴厤缃�
     //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //浣欐�濇澃鏈湴閰嶇疆
     //var WEBURL = "http://localhost:8088/ARAPI/";    //浣欐�濇澃鏈湴閰嶇疆(瀹夌憺)
     //var WEBURL = "http://10.1.4.155/API/";   //姹熶赴瀹㈡埛NEW
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ShiftsEdit.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ShiftsEdit.html"
new file mode 100644
index 0000000..144bba0
--- /dev/null
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ShiftsEdit.html"
@@ -0,0 +1,468 @@
+锘�<!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_ShiftsEdit">
+                        <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 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>
+                                    <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" lay-verify="HBeginTimes" name="HBeginTimes" id="HBeginTimes" 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" class="layui-input" lay-verify="HEndTimes" name="HEndTimes" id="HEndTimes" 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="HWorkTimes" id="HWorkTimes" lay-verify="HWorkTimes" 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: 30px;">灏忔椂</label>
+                                        </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_ShiftsController/GetGy_Shifts_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.鐝鍚嶇О
+                                , "HDeptID": data.HDeptID
+                                , "HDeptName": data.閮ㄩ棬鍚嶇О
+                                , "HBeginTimes": data.寮�濮嬫椂闂�
+                                , "HEndTimes": data.缁撴潫鏃堕棿
+                                , "HWorkTimes": 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(btnHDept)', function () {
+                get_checkDept();
+            });
+            //#endregion
+
+            //#region 寮圭獥閫夋嫨鏂规硶
+            //#region 閫夋嫨閮ㄩ棬
+            function get_checkDept() {
+                layer.open({
+                    type: 2
+                    , skin: "layui-layer-rim"   //鍔犱笂杈规
+                    , title: "閮ㄩ棬鍒楄〃"         //鏍囬
+                    , closeBtn: 1               //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                    , shift: 2                  //寮瑰嚭鍔ㄧ敾
+                    , area: ["90%", "90%"]      //绐椾綋澶у皬
+                    , maxmin: true              //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                    , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
+                    , btn: ["纭畾", "鍙栨秷"]
+                    , btn1: function (index, laero) {
+                        //鎸夐挳涓�  鐨勫洖璋�
+                        var iframeWindow = window["layui-layer-iframe" + index];                //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");    //鑾峰彇閫変腑鐨勬暟鎹�
+
+                        if (checkStatus.data.length != 1) {
+                            return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+                        }
+                        $("#HDeptName").val(checkStatus.data[0].閮ㄩ棬鍚嶇О);
+                        $("#HDeptID").val(checkStatus.data[0].HItemID);
+                        layer.close(index); //鍏抽棴寮圭獥  瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                })
+            }
+            //#endregion
+
+            //#endregion
+
+            //#endregion
+
+            //#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.HWorkTimes == '') {
+                    data.field.HWorkTimes = 0;
+                }
+
+                var sMainStr = JSON.stringify(data.field) + ';' + HMaker + ';' + OperationType;
+
+                var index = layer.load();
+                $.ajax({
+                    type: "POST",
+                    url: GetWEBURL() + "Gy_ShiftsController/GetGy_Shifts_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
+
+
+
+        });
+
+        //浠ヤ笂涓簂ayui妯″潡
+        //姝ゅ鏂规硶娑夊強鍒拌澶栭儴椤甸潰parent.鏂规硶鍚嶈皟鐢ㄧ殑蹇呴』鏀惧湪Layui鏂规硶澶栭儴
+
+        //鍙屽嚮杩斿洖鍩虹璧勬枡鏁版嵁    琛ㄥご
+        function GetHDeptNameValue(obj)  //杩斿洖閮ㄩ棬
+        {
+            $("#HDeptName").val(obj[0].閮ㄩ棬鍚嶇О);
+            $("#HDeptID").val(obj[0].HItemID);
+        }
+    </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/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ShiftsList.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ShiftsList.html"
new file mode 100644
index 0000000..06853ee
--- /dev/null
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ShiftsList.html"
@@ -0,0 +1,1210 @@
+锘�<!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 ForFilteringSchemes" 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 ForFilteringSchemes" 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" class="ForFilteringSchemes" 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-inline" style="margin-left:5px;">
+                                    <div style="text-align:center;font-size:15px;font-weight:bold;color:#fc9393" id="HFilterScheme_Now"></div>
+                                </div>
+
+                                <div class="layui-colla-content">
+                                    <div class="layui-row" style="margin-top:5px">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">杩囨护</label>
+                                            <div class="layui-input-block">
+                                                <select name="ColName" id="ColName" class="ForFilteringSchemes" lay-filter="ColName" style="width:190px;">
+                                                </select>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <select name="Comparator" id="Comparator" class="ForFilteringSchemes" lay-filter="Comparator" style="width:190px;">
+                                                <option value="0" selected="selected"></option>
+                                                <option value="=">=</option>
+                                                <option value=">=">>=</option>
+                                                <option value=">">></option>
+                                                <option value="<="><=</option>
+                                                <option value="<"><</option>
+                                                <option value="<>"><></option>
+                                                <option value="7">鍖呭惈</option>
+                                                <option value="8">宸﹀寘鍚�</option>
+                                                <option value="9">鍙冲寘鍚�</option>
+                                                <option value="10">涓嶅寘鍚�</option>
+                                            </select>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent">
+                                        </div>
+                                    </div>
+                                </div>
+                            </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-refresh-3"></i>鍒锋柊</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Check" id="btn_Check"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_AbandonCheck" id="btn_AbandonCheck"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Stop" id="btn_Stop"><i class="layui-icon layui-icon-radio"></i>绂佺敤</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_AbandonStop" id="btn_AbandonStop"><i class="layui-icon layui-icon-circle"></i>鍙嶇鐢�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Exit" id="btn_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
+                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Cell" id="btn_Cell"style="float:right"><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"style="float:right"><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_SaveScheme" id="btn_SaveScheme"><i class="layui-icon layui-icon-template"></i>淇濆瓨鏂规</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_ReadScheme" id="btn_ReadScheme"><i class="layui-icon layui-icon-set"></i>璇诲彇鏂规</button>
+                            </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_ShiftsList";
+            var titleData = [];     //涓嶉渶瑕佹樉绀虹殑瀛楁
+            var params = get_UrlVars();
+            var Type = params[params[0]];
+            var OperationType = params[params[1]];  //1涓虹洿鎺ュ垪琛ㄦā鍧楁墦寮�  2涓轰粠鍏朵粬妯″潡鎵撳紑鍩虹璧勬枡鍒楄〃
+            //#endregion
+
+        //#region 銆愯繃婊ゆ柟妗堛��
+
+            //杩囨护鏉′欢鐨刢lass绫� 
+            var HClassTag = "ForFilteringSchemes";
+            //妯″潡鍚嶇О锛堜腑鏂囩増锛� 姣忎釜妯″潡椤甸潰閮介渶瑕佷慨鏀�
+            window.HModuleName = "鐝鍒楄〃";
+            //鏄惁宸茬粡閫夋嫨浜嗚繃婊ゆ柟妗堬紙鍏ㄥ眬鍙橀噺锛�
+            window.HDefaultFilter = "";
+            //閫夋嫨鐨勮繃婊ゆ柟妗堝唴鐮侊紙鍏ㄥ眬鍙橀噺锛�
+            window.HInterID_Choose = 0;
+
+            //#endregion
+
+        //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+            //鍒濆鍖栫晫闈�
+            set_ClearBill();
+
+            //#region 鍒濆鍖栫晫闈�
+            function set_ClearBill() {
+                //鑾峰彇缁勭粐
+                set_StockOrg();
+                //鍒濆鍖栬〃鏍�
+                set_InitGrid();
+                //鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
+                get_DefaultModule();
+                //浠庡叾浠栨ā鍧楁墦寮�鍩虹璧勬枡鍒楄〃 缁勭粐涓哄綋鍓嶇粍缁囦笖涓嶅彲缂栬緫
+                if (OperationType == 2) {
+                    $("#HStockOrgID").val(sessionStorage["Organization"])   //缁勭粐
+                    $("#HStockOrgID").attr("disabled", true);
+                    form.render('select');
+                }
+            }
+            //#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");
+                    },
+                    complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
+                })
+            }
+            //#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 });
+                        }
+                    },
+                    complete: function (XHR, TS) { XHR = null },//鍥炴敹璧勬簮
+                    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);
+                        }
+
+                        //鍒锋柊鎸夐挳鏄剧ず
+                        var btns = document.getElementsByTagName("button");     //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+                        Display_HideButton(btns, HModName, HModName, HMaker);
+
+                    },
+                    complete: function (XHR, TS) { XHR = null },//鍥炴敹璧勬簮
+                    error: function () {
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                })
+            }
+            //#endregion
+
+            //#region 鐐瑰嚮琛岄�変腑楂樹寒
+            table.on('row(mainTable)', function (obj) {
+                //閫変腑琛屾敼鍙橀鑹�
+                var flag = !obj.tr.find(':checkbox:first').prop('checked');
+                obj.tr.find(':checkbox').prop('checked', flag);
+                if (flag) {
+                    obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked');  //璁剧疆澶嶉�夋閫変腑鏍峰紡
+                    $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+                } else {
+                    obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//鍙栨秷澶嶉�夋閫変腑鏍峰紡
+                    $(obj.tr.selector).attr({ "style": "background:" });//鍙栨秷褰撳墠tr棰滆壊
+                }
+                //mainTable 涓鸿〃鏍糏D   娉ㄦ剰姝ゅ濡傛灉ID涓嶆纭皢瀵艰嚧浣犲湪鐩戝惉澶嶉�夋鏃惰幏鍙栦笉鍒颁綘閫夋嫨鐨勬暟鎹紝鍓嶉潰鐨勫彧鏄坊鍔犳垨鍒犻櫎閫変腑鏈�変腑鏍峰紡浠ュ強璁剧疆鑳屾櫙鑹诧紝瀛椾綋棰滆壊
+                layui.each(table.cache.mainTable, function (i, l) {
+                    if (obj.tr.index() == l.LAY_TABLE_INDEX) {
+                        l.LAY_CHECKED = flag;
+                    }
+                });
+            })
+            //#endregion
+
+            //#region 鍙屽嚮杩斿洖鏁版嵁
+            table.on('rowDouble(mainTable)', function (obj) {
+                var data = [];
+                data.push(obj.data);
+                switch (Type) {
+                    case "HShifts":      //琛ㄥご鍙屽嚮杩斿洖
+                        parent.GetHShiftsValue(data);
+                        break;
+                    case "HShiftsList":  //鍒楄〃鍙屽嚮杩斿洖
+                        var dataList = obj.data;
+                        //杩斿洖鏂规硶
+                        parent.GetHShiftsListValue(dataList);
+                        break;
+                }
+                var index = parent.layer.getFrameIndex(window.name);
+                parent.layer.close(index);
+            });
+            //#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;
+                    //淇濆瓨鏂规
+                    case 'btn_SaveScheme': set_SaveScheme();
+                        break;
+                    //璇诲彇鏂规
+                    case 'btn_ReadScheme': set_ReadScheme();
+                        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_ShiftsEdit.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_ShiftsEdit.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_ShiftsController/GetGy_Shifts_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);
+                                }
+                            },
+                            complete: function (XHR, TS) { XHR = null },//鍥炴敹璧勬簮
+                            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_ShiftsController/GetGy_Shifts_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 });
+                            }
+                        },
+                        complete: function (XHR, TS) { XHR = null },//鍥炴敹璧勬簮
+                        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_ShiftsController/GetGy_Shifts_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 });
+                            }
+                        },
+                        complete: function (XHR, TS) { XHR = null },//鍥炴敹璧勬簮
+                        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 });
+                        }
+                    },
+                    complete: function (XHR, TS) { XHR = null },//鍥炴敹璧勬簮
+                    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 });
+                        }
+                    },
+                    complete: function (XHR, TS) { XHR = null },//鍥炴敹璧勬簮
+                    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 (OperationType == undefined || OperationType == 1) {
+                    if (HStockOrgName == "鍏ㄩ儴") {
+                        sWhere = "1=1";
+                    }
+                    else {
+                        sWhere = "缁勭粐='" + HStockOrgName + "'";
+                    }
+                }
+                //浠庡叾浠栨ā鍧楁墦寮�鍩虹璧勬枡鍒楄〃
+                else {
+                    sWhere = "HUSEORGID=" + sessionStorage["OrganizationID"];
+                }
+
+                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) {
+                //鐩存帴鍒楄〃鎵撳紑
+                if (OperationType == undefined || OperationType == 1) { 
+                    OperationType = 1;
+                }
+                //浠庡叾浠栨ā鍧楁墦寮�鍩虹璧勬枡鍒楄〃
+                else {      
+                    sWhere += " and 绂佺敤鏍囪='' and 瀹℃牳浜�<>''";
+                }
+                var ajaxLoad = layer.load();
+                $.ajax({
+                    type: "GET",
+                    url: GetWEBURL() + '/Gy_ShiftsController/GetGy_ShiftsList_Json',
+                    async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                    data: { "sWhere": sWhere, "HMaker": HMaker, "OperationType": OperationType },
+                    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, width: 140 });
+                                    }
+                                }
+                            }
+
+                            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();
+
+                            //鍒锋柊鎸夐挳鏄剧ず
+                            var btns = document.getElementsByTagName("button");     //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+                            Display_HideButton(btns, HModName, HModName, HMaker);
+
+                            layer.close(ajaxLoad);
+                            //鑷畾涔夎繃婊や笅鎷夋鍔犺浇
+                            if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+                                ColFilter();
+                            }
+                        } else {
+                            layer.close(ajaxLoad);
+                            layer.alert(data1.Message, { icon: 5 });
+                        }
+                    },
+                    complete: function (XHR, TS) { XHR = null },//鍥炴敹璧勬簮
+                    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
+
+            //#region 銆愯繃婊ゆ柟妗堛��
+
+            //鑾峰彇褰撳墠鐢ㄦ埛鐨勯粯璁よ繃婊ゆ柟妗�
+            function get_DefaultModule() {
+                $.ajax({
+                    type: "GET",
+                    url: GetWEBURL() + '/Xt_FastICScheme/Chooselist',
+                    async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                    data: { "user": sessionStorage["Czybm"], "HModuleName": HModuleName, "HInterID": 0, "Type": "Default" },
+                    success: function (data1) {
+                        if (data1.count == 1) {
+                            //褰撳墠鐢ㄦ埛璁剧疆鏈夐粯璁ょ殑杩囨护鏂规
+                            var data = data1.data;
+                            //褰撳墠閫夋嫨鐨勮繃婊ゆ柟妗�
+                            HInterID_Choose = data[0].hmainid;
+                            //杩囨护鏂规鍐呯爜
+                            HInterID = data[0].hmainid
+                            //杩囨护鏂规鍚嶇О
+                            HDefaultFilter = data[0].鏂规鍚嶇О
+                            //杩囨护鏂规鐨勫娉紙鏂规淇℃伅鎻忚堪锛�
+                            var HRemark = data[0].澶囨敞
+                            //鏄剧ず鍑哄綋鍓嶇殑榛樿杩囨护鏂规
+                            document.getElementById("HFilterScheme_Now").style.display = "block";
+                            document.getElementById('HFilterScheme_Now').innerHTML = "褰撳墠杩囨护鏂规锛�" + HDefaultFilter + '<span style="font-size: 15px; font-weight: bold; color:#7b90fb">  ' + "(" + HRemark + ")" + '</span>';
+                            //鎶婅繃婊ゆ潯浠跺�煎洖鍐欏埌椤甸潰涓�
+                            for (let i = 0; i < data.length; i++) {
+                                $("#" + data[i].杩囨护瀛楁ID).val(data[i].杩囨护鍊�);
+                                if (data[i].杩囨护鏍囩绫诲瀷 == 'SELECT') {
+                                    $("#" + data[i].杩囨护瀛楁ID).find("option[value='" + data[i].杩囨护鍊� + "']").attr("selected", true);
+                                }
+                            }
+                            //鎵ц鏌ヨ鏂规硶
+                            get_FastQuery();
+                            form.render("select");
+                        } else {
+                            //褰撳墠鐢ㄦ埛娌℃湁璁剧疆榛樿鐨勮繃婊ゆ柟妗�
+                            //闅愯棌鏄剧ず杩囨护鏂规鐨勬爣绛句俊鎭�
+                            document.getElementById("HFilterScheme_Now").style.display = "none";
+                            //鎵ц鏌ヨ鏂规硶
+                            get_FastQuery();
+                            form.render("select");
+                        }
+                    },
+                    complete: function (XHR, TS) { XHR = null },//鍥炴敹璧勬簮
+                    error: function () {
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+            }
+
+            //淇濆瓨鏂规
+            function set_SaveScheme() {
+                var index = layer.open()
+                //鍒ゆ柇鐢ㄦ埛鏄惁鐐瑰嚮浜嗗彸涓婅鐨勨�滃弶鍙封�濆叧闂脊绐楅〉闈�
+                var HIsClose_Manual = false;
+                //鑾峰彇鏈〉鎵�鏈夎繃婊ゆ潯浠跺璞�(class涓寘鍚�"ForFilteringSchemes"鐨勫厓绱�)
+                var Filter = document.getElementsByClassName(HClassTag);
+
+                var HFilterIdList = "";//杩囨护鏉′欢
+                var HFilterIdLists = "";//鎷兼帴澶氫釜杩囨护鏉′欢
+                var HValue = "";//杩囨护鍊�
+                var HElement_type = "";//杩囨护鏍囩绫诲瀷
+
+                for (var i = 0; i < Filter.length; i++) {
+                    HFilterIdList = Filter[i].id; //杩囨护鏉′欢ID
+                    HFilterIdLists += Filter[i].id + ","; //杩囨护鏉′欢ID(鎷兼帴)
+                    HValue += $("#" + HFilterIdList).val() + ","; //杩囨护鏉′欢涓緭鍏ョ殑鍊�                    
+                    HElement_type += document.getElementById(HFilterIdList).tagName + ",";//閫氳繃鏍囩id鑾峰彇鏍囩绫诲瀷
+                }
+
+                //鍘婚櫎鏈熬閫楀彿
+                HFilterIdLists = HFilterIdLists.substring(0, HFilterIdLists.length - 1);
+                HValue = HValue.substring(0, HValue.length - 1);
+                HElement_type = HElement_type.substring(0, HElement_type.length - 1);
+
+                //褰撳墠椤甸潰涓婃病鏈夐�夋嫨杩囨护鏂规锛岃繘鍏ユ柊澧炴柟娉�
+                if (HDefaultFilter == "") {
+                    layer.open({
+                        type: 2
+                        , area: ['40%', '80%']
+                        , title: '杩囨护鏂规'
+                        , shift: 0//寮瑰嚭鍔ㄧ敾
+                        , content: '../../绯荤粺绠$悊/杩囨护鏂规璁剧疆/Xt_FastICScheme.html?OperationType=1&HModuleName=' + HModuleName + '&HFilterIdLists=' + HFilterIdLists + '&HValue=' + HValue + '&HElement_type=' + HElement_type
+                        , cancel: function () {
+                            // 鍙充笂瑙掑叧闂簨浠剁殑閫昏緫
+                            HIsClose_Manual = true;
+                        }
+                        , end: function () {
+                            if (HIsClose_Manual != true) {
+                                get_FastQuery();
+                                //鏄剧ず褰撳墠鐨勮繃婊ゆ柟妗�
+                                document.getElementById("HFilterScheme_Now").style.display = "block";
+                                document.getElementById('HFilterScheme_Now').innerHTML = "褰撳墠杩囨护鏂规锛�" + sessionStorage["HFilterSchemeName_" + sessionStorage["Czybm"]] + '<span style="font-size: 15px; font-weight: bold; color:#7b90fb">  ' + "(" + sessionStorage["HFilterSchemeRemark_" + sessionStorage["Czybm"]] + ")" + '</span>';
+                            }
+                        }
+                    })
+                    layer.close(index)
+                } else {
+                    //褰撳墠椤甸潰宸叉湁杩囨护鏂规锛岀敤鎴烽�夋嫨 鏂板鎴栬�呯紪杈�
+                    layer.confirm('褰撳墠宸查�夋嫨杩囨护鏂规锛屾槸鍚︿慨鏀癸紵璇烽�夋嫨瀵瑰簲鎿嶄綔', {
+                        title: "鎿嶄綔鎻愮ず",
+                        icon: 0,
+                        btn: ['鏂板鏂规', '淇濆瓨淇敼褰撳墠鏂规', '鍙栨秷']
+                    }, function (index, layero) {
+                        //鏂板
+                        layer.open({
+                            type: 2
+                            , area: ['40%', '80%']
+                            , title: '杩囨护鏂规'
+                            , shift: 0//寮瑰嚭鍔ㄧ敾
+                            , content: '../../绯荤粺绠$悊/杩囨护鏂规璁剧疆/Xt_FastICScheme.html?OperationType=1&HModuleName=' + HModuleName + '&HFilterIdLists=' + HFilterIdLists + '&HValue=' + HValue + '&HElement_type=' + HElement_type
+                            , end: function () {
+                                get_FastQuery();
+                                //鏄剧ず褰撳墠鐨勮繃婊ゆ柟妗�
+                                document.getElementById("HFilterScheme_Now").style.display = "block";
+                                document.getElementById('HFilterScheme_Now').innerHTML = "褰撳墠杩囨护鏂规锛�" + sessionStorage["HFilterSchemeName_" + sessionStorage["Czybm"]] + '<span style="font-size: 15px; font-weight: bold; color:#7b90fb">  ' + "(" + sessionStorage["HFilterSchemeRemark_" + sessionStorage["Czybm"]] + ")" + '</span>';
+                            }
+                        })
+                        layer.close(index)
+                    }, function (index) {
+                        //缂栬緫
+                        var Filter_Edit = document.getElementsByClassName(HClassTag); //鑾峰彇鏈〉鎵�鏈夎繃婊ゆ潯浠跺璞�(class涓寘鍚�"ForFilteringSchemes"鐨勫厓绱�)
+                        HFilterIdList = "";
+                        HFilterIdLists = "";
+                        HValue = "";
+                        HElement_type = "";
+                        for (var i = 0; i < Filter_Edit.length; i++) {
+                            HFilterIdList = Filter_Edit[i].id; //杩囨护鏉′欢ID
+                            HFilterIdLists += Filter_Edit[i].id + ","; //杩囨护鏉′欢ID(鎷兼帴)
+                            HValue += $("#" + HFilterIdList).val() + ","; //杩囨护鏉′欢涓緭鍏ョ殑鍊�
+                            HElement_type += document.getElementById(HFilterIdList).tagName + ",";//閫氳繃鏍囩id鑾峰彇鏍囩绫诲瀷
+                        }
+                        //鍘婚櫎鏈熬閫楀彿
+                        HFilterIdLists = HFilterIdLists.substring(0, HFilterIdLists.length - 1);
+                        HValue = HValue.substring(0, HValue.length - 1);
+                        HElement_type = HElement_type.substring(0, HElement_type.length - 1);
+
+                        var sMainSub = HInterID_Choose + ';' + HFilterIdLists + ';' + HValue + ';' + HElement_type + ';' + sessionStorage["Czybm"] + ';' + 3;
+
+                        //淇敼
+                        $.ajax({
+                            type: "POST",
+                            url: GetWEBURL() + "/Xt_FastICScheme/save", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                            async: true,
+                            data: { "oMain": sMainSub },
+                            dataType: "json",
+                            success: function (data) {
+                                if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                    layer.msg(data.Message, { time: 1 * 1000, icon: 1 });
+                                }
+                                else {
+
+                                }
+                                layer.closeAll("loading");
+                            },
+                            complete: function (XHR, TS) { XHR = null },//鍥炴敹璧勬簮
+                            error: function (err) {
+
+
+                            }
+                        });
+                        layer.close(index)
+                    }, function (index) {
+                        //鍙栨秷
+                        layer.alert('鍙栨秷')
+                        layer.close(index)
+                    });
+                }
+
+            }
+
+            //璇诲彇鏂规
+            function set_ReadScheme() {
+                var HIsClose_Manual = false;
+                var Filter = document.getElementsByClassName(HClassTag); //鑾峰彇鏈〉鎵�鏈夎繃婊ゆ潯浠跺璞�(class涓寘鍚�"ForFilteringSchemes"鐨勫厓绱�)
+
+                var HFilterIdList = "";
+                var HFilterIdLists = "";
+                var HValue = "";
+                var HElement_type = "";
+                for (var i = 0; i < Filter.length; i++) {
+                    HFilterIdList = Filter[i].id; //杩囨护鏉′欢ID
+                    HFilterIdLists += Filter[i].id + ","; //杩囨护鏉′欢ID(鎷兼帴)
+                    HValue += $("#" + HFilterIdList).val() + ","; //杩囨护鏉′欢涓緭鍏ョ殑鍊�
+                    HElement_type += document.getElementById(HFilterIdList).tagName + ",";//閫氳繃鏍囩id鑾峰彇鏍囩绫诲瀷
+                }
+                //鍘婚櫎鏈熬閫楀彿
+                HFilterIdLists = HFilterIdLists.substring(0, HFilterIdLists.length - 1);
+                HValue = HValue.substring(0, HValue.length - 1);
+                HElement_type = HElement_type.substring(0, HElement_type.length - 1);
+
+                layer.open({
+                    type: 2
+                    , area: ['80%', '80%']
+                    , title: '杩囨护鏂规鍒楄〃'
+                    , shift: 0//寮瑰嚭鍔ㄧ敾
+                    , content: '../../绯荤粺绠$悊/杩囨护鏂规璁剧疆/Xt_FastICSchemeList.html?HType=Select&HFilterIdLists=' + HFilterIdLists + '&HValue=' + HValue + '&HElement_type=' + HElement_type + '&HModuleName=' + HModuleName
+                    , cancel: function () {
+                        // 鍙充笂瑙掑叧闂簨浠剁殑閫昏緫
+                        HIsClose_Manual = true;
+                    }
+                    , end: function () {
+                        if (HIsClose_Manual != true) {
+                            get_FastQuery();
+                            form.render("select");
+                        }
+                    }
+                })
+            }
+
+            //#endregion
+
+        //#endregion
+
+        //浠ヤ笂鏄痩ayui妯″潡
+        });
+        //#region 銆愯繃婊ゆ柟妗堣繑鍥炴暟鎹��
+        function HFilterScheme(obj)  //杩斿洖杩囨护鏂规
+        {
+            var HInterID = obj[0].hmainid;
+            HInterID_Choose = obj[0].hmainid;
+            $.ajax({
+                url: GetWEBURL() + '/Xt_FastICScheme/Chooselist',
+                type: "GET",
+                data: { "user": sessionStorage["Czybm"], "HModuleName": HModuleName, "HInterID": HInterID, "Type": "Select" },
+                success: function (data1) {
+                    if (data1.count == 1) {
+                        var data = data1.data;
+                        //璧嬪�艰繃婊ゆ柟妗堝悕绉�
+                        HDefaultFilter = data[0].鏂规鍚嶇О
+                        var HRemark = data[0].澶囨敞
+                        //鏄剧ず褰撳墠鐨勮繃婊ゆ柟妗�
+                        document.getElementById("HFilterScheme_Now").style.display = "block";
+                        document.getElementById('HFilterScheme_Now').innerHTML = "褰撳墠杩囨护鏂规锛�" + HDefaultFilter + '<span style="font-size: 15px; font-weight: bold; color:#7b90fb">  ' + "(" + HRemark + ")" + '</span>';
+                        HInterID = data[0].hmainid
+                        //鏍规嵁閫夋嫨鐨勮繃婊ゆ柟妗堝洖濉暟鎹埌鍒楄〃杩囨护鏉′欢
+                        for (let i = 0; i < data.length; i++) {
+                            $("#" + data[i].杩囨护瀛楁ID).val(data[i].杩囨护鍊�);
+                            if (data[i].杩囨护鏍囩绫诲瀷 == 'SELECT') {
+                                $("#" + data[i].杩囨护瀛楁ID).find("option[value='" + data[i].杩囨护鍊� + "']").attr("selected", true);
+                            }
+                        }
+
+                    } else {
+                        layer.close(ajaxLoad);
+                        layer.alert(data1.code + data1.Message, { icon: 5 });
+                    }
+                },
+                complete: function (XHR, TS) { XHR = null },//鍥炴敹璧勬簮
+                error: function () {
+                    layer.close(ajaxLoad);
+                    layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                }
+            });
+        }
+        //#endregion
+    </script>
+
+</body>
+</html>
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\350\200\203\345\213\244\346\261\207\346\212\245\345\215\225/Pay_WorkTimesBillEdit.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\350\200\203\345\213\244\346\261\207\346\212\245\345\215\225/Pay_WorkTimesBillEdit.html"
index d31ee9f..225e34f 100644
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\350\200\203\345\213\244\346\261\207\346\212\245\345\215\225/Pay_WorkTimesBillEdit.html"
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\350\200\203\345\213\244\346\261\207\346\212\245\345\215\225/Pay_WorkTimesBillEdit.html"
@@ -590,59 +590,99 @@
                         }
                         $("#HGroupName").val(checkStatus.data[0].鐝粍鍚嶇О);
                         $("#HGroupID").val(checkStatus.data[0].HItemID);
-                        //GetEmployee();
+
+                        var sSubStr = table.cache['mainTable'];
+                        if (parseFloat(sSubStr[0].HEmpID) > 0) {
+                            layer.confirm('鍒楄〃涓凡缁忓瓨鍦ㄨ亴鍛�,鏄惁瑕佽鐩栵紵', { icon: 3, title: '鎻愮ず' }, function (index) {
+                                set_InitGrid();     //鍒濆鍖栧瓙琛�
+                                GetEmployee();      //鏍规嵁鐝粍杩斿洖鑱屽憳淇℃伅
+                                layer.close(index); //鍏抽棴寮圭獥  瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                            });
+                        }
+                        else {
+                            GetEmployee();
+                        }
                         layer.close(index); //鍏抽棴寮圭獥  瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
                     , btn2: function (index, layero) { }
+                    , end: function () {
+                        var sSubStr = table.cache['mainTable'];
+                        if (parseFloat(sSubStr[0].HEmpID) > 0) {
+                            layer.confirm('鍒楄〃涓凡缁忓瓨鍦ㄨ亴鍛�,鏄惁瑕佽鐩栵紵', { icon: 3, title: '鎻愮ず' }, function (index) {
+                                set_InitGrid();     //鍒濆鍖栧瓙琛�
+                                GetEmployee();      //鏍规嵁鐝粍杩斿洖鑱屽憳淇℃伅
+                                layer.close(index); //鍏抽棴寮圭獥  瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                            });
+                        }
+                        else {
+                            GetEmployee();
+                        }
+                    }
                 })
             }
 
             function GetEmployee() {
                 $.ajax({
-                    url: GetWEBURL() + "/Pay_WorkTimesBill/GetEmployeeByHGroup",
                     type: "GET",
-                    data: { "HGroupID": $("#HGroupID").val() },
+                    url: GetWEBURL() + "/Gy_EmployeeController/GetEmpInfoByGroup_Json",
+                    async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                    data: { "HGroupID": $('#HGroupID').val() },
                     success: function (result) {
-                        if (result != null) {
-                            if (result.count == 1) {
-                                var BYData = result.list[0];
-                                var rowdate1 = layui.table.cache["mainTable"];
-                                option.data = [{
-                                    "HEmpID": "", "HEmpNumber": "", "HEmpName": "", "HEmpID": "", "HEmpRate": 0
-                                    , "HPMTimes": 0, "HAMTimes": 0, "HBaseTimes": 0, "HBaseDays": 0, "HOverTimes": 0
-                                    , "HOverDays": 0, "HLeaveTimes": 0, "HLeaveDays": 0, "HLateQty": 0, "HLateTimes": 0, "HEarlyQty": 0
-                                    , "HEarlyTimes": 0, "HOutForEmpQty": 0, "HOutForEmpTimes": 0, "HOutForComQty": 0, "HOutForComTimes": 0, "HAbsentDays": 0
-                                    , "HRestFlag": "true", "HSchClassID": 0, "HCTPrjID": 0, "HCTPrjName": "", "HWorkTypeID": 0, "HWorkTypeName": "", "HPayMoney": 0, "HMoney": 0
-                                    , "HNeedTimes": 0, "HMainSourceInterID": 0, "HMainSourceEntryID": 0, "HMainSourceBillNo": 0
-                                    , "HSourceBillType": "", "HRemark": ""
-                                }];
-                                table.render(option);
-                                if (BYData.length != 0)  //琛ㄤ綋鏁版嵁涓虹┖鏃�
-                                {
-                                    buttonArr = [];//娓呯┖鏁扮粍
-                                    for (var i = 0; i < BYData.length; i++) {
-                                        var checkrow = {
-                                            "HEmpID": BYData[i].HEmpID, "HEmpNumber": BYData[i].HEmpNumber, "HEmpName": BYData[i].HEmpName, "HEmpRate": BYData[i].HEmpRate
-                                            , "HPMTimes": rowdate1[i].HPMTimes, "HAMTimes": rowdate1[i].HAMTimes, "HBaseTimes": rowdate1[i].HBaseTimes, "HBaseDays": rowdate1[i].HBaseDays, "HOverTimes": rowdate1[i].HOverTimes
-                                            , "HOverDays": rowdate1[i].HOverDays, "HLeaveTimes": rowdate1[i].HLeaveTimes, "HLeaveDays": rowdate1[i].HLeaveDays, "HLateQty": rowdate1[i].HLateQty, "HLateTimes": rowdate1[i].HLateTimes, "HEarlyQty": rowdate1[i].HEarlyQty
-                                            , "HEarlyTimes": rowdate1[i].HEarlyTimes, "HOutForEmpQty": rowdate1[i].HOutForEmpQty, "HOutForEmpTimes": rowdate1[i].HOutForEmpTimes, "HOutForComQty": rowdate1[i].HOutForComQty, "HOutForComTimes": rowdate1[i].HOutForComTimes, "HAbsentDays": rowdate1[i].HAbsentDays
-                                            , "HRestFlag": "true", "HSchClassID": rowdate1[i].HSchClassID, "HCTPrjID": BYData[i].HCTPrjID, "HCTPrjName": BYData[i].HCTPrjName, "HWorkTypeID": rowdate1[i].HWorkTypeID, "HWorkTypeName": rowdate1[i].HWorkTypeName, "HPayMoney": rowdate1[i].HPayMoney, "HMoney": rowdate1[i].HMoney
-                                            , "HNeedTimes": rowdate1[i].HNeedTimes, "HMainSourceInterID": rowdate1[i].HMainSourceInterID, "HMainSourceEntryID": rowdate1[i].HMainSourceEntryID, "HMainSourceBillNo": rowdate1[i].HMainSourceBillNo
-                                            , "HSourceBillType": rowdate1[i].HSourceBillType, "HRemark": rowdate1[i].HRemark
-                                        };
-                                        buttonArr.push(checkrow);  //灏嗕箣鍓嶇殑鏁版嵁瀛樺偍
+                        if (result.count == 1) {
+                            //瀛愯〃  璧嬪��
+                            var rowdata = [];
+                            for (let i = 0; i < result.data.length; i++) {
+                                rowdata.push(
+                                    {
+                                        "HEmpID": result.data[i].HItemID
+                                        , "HEmpNumber": result.data[i].鑱屽憳浠g爜
+                                        , "HEmpName": result.data[i].鑱屽憳鍚嶇О
+                                        , "HEmpRate": result.data[i].HEmpRate
+                                        , "HPMTimes": "0"
+                                        , "HAMTimes": "0"
+                                        , "HBaseTimes": "0"
+                                        , "HBaseDays": "0"
+                                        , "HOverTimes": "0"
+                                        , "HOverDays": "0"
+                                        , "HLeaveTimes": "0"
+                                        , "HLeaveDays": "0"
+                                        , "HLateQty": "0"
+                                        , "HLateTimes": "0"
+                                        , "HEarlyQty": "0"
+                                        , "HEarlyTimes": "0"
+                                        , "HOutForEmpQty": "0"
+                                        , "HOutForEmpTimes": "0"
+                                        , "HOutForComQty": "0"
+                                        , "HOutForComTimes": "0"
+                                        , "HAbsentDays": "0"
+                                        , "HRestFlag": false
+                                        , "HSchClassID": "0"
+                                        , "HSchClassNumber": ""
+                                        , "HSchClassName": ""
+                                        , "HNeedTimes": "0"
+                                        , 'HCTPrjID': result.data[i].HCTPrjID
+                                        , 'HCTPrjNumber': result.data[i].HCTPrjNumber
+                                        , 'HCTPrjName': result.data[i].HCTPrjName
+                                        , 'HWorkTypeID': result.data[i].HWorkTypeID
+                                        , 'HWorkTypeNumber': result.data[i].HWorkTypeNumber
+                                        , 'HWorkTypeName': result.data[i].HWorkTypeName
+                                        , 'HPayMoney': result.data[i].HPayMoney == null ? 0 : result.data[i].HPayMoney
+                                        , "HMoney": "0"
+                                        , "HRemark": ""
                                     }
-                                    table.reload("mainTable", {
-                                        data: buttonArr    //灏嗘暟鎹噸鏂拌浇鍏ヨ〃鏍�
-                                    })
-                                }
-                            } else {
-                                layer.alert(result.code + result.Message, { icon: 5 });
+                                )
                             }
+                            option.data = rowdata;
+                            table.render(option);
+                            //鍒锋柊璁剧疆澶嶉�夋鐘舵��
+                            CheckedSet_tableSub();
+                        }
+                        else {
+                            layer.msg(result.Message, { icon: 0, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                         }
                     },
                     complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
-                })
+                });
             }
             //#endregion
 
@@ -1053,7 +1093,7 @@
                                         , "HWorkTypeID": checkStatus.data[0].HWorkTypeID
                                         , "HWorkTypeNumber": checkStatus.data[0].HWorkTypeNumber
                                         , "HWorkTypeName": checkStatus.data[0].HWorkTypeName
-                                        , "HPayMoney": checkStatus.data[0].HPayMoney
+                                        , "HPayMoney": checkStatus.data[0].HPayMoney == null ? 0 : checkStatus.data[0].HPayMoney
                                     })
                                     layer.close(index);//鍏抽棴寮圭獥
                                 }
@@ -1069,7 +1109,7 @@
                                         , "HWorkTypeID": OptionData.HWorkTypeID
                                         , "HWorkTypeNumber": OptionData.HWorkTypeNumber
                                         , "HWorkTypeName": OptionData.HWorkTypeName
-                                        , "HPayMoney": OptionData.HPayMoney
+                                        , "HPayMoney": OptionData.HPayMoney == null ? 0 : OptionData.HPayMoney
                                     })
                                 }
                             })
@@ -1084,7 +1124,7 @@
                                 , shift: 2                  //寮瑰嚭鍔ㄧ敾
                                 , area: ["90%", "90%"]      //绐椾綋澶у皬
                                 , maxmin: true              //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
-                                , content: ['../../鍩虹璧勬枡/宸ヨ祫鍩虹璧勬枡/Gy_ClassTimePrjList.html', 'yes']
+                                , content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_ShiftsList.html?Type=HShiftsList&OperationType=2', 'yes']
                                 , btn: ["纭畾", "鍙栨秷"]
                                 , btn1: function (index, laero) {
                                     //鎸夐挳涓�  鐨勫洖璋�
@@ -1094,14 +1134,21 @@
                                     if (checkStatus.data.length != 1) {
                                         return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
                                     }
-
+                                    OptionData = checkStatus.data[0];
                                     //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
                                     obj.update({
                                         "HSchClassID": checkStatus.data[0].HItemID
-                                        , "HSchClassNumber": checkStatus.data[0].HNumber
-                                        , "HSchClassName": checkStatus.data[0].HName
+                                        , "HSchClassNumber": checkStatus.data[0].鐝浠g爜
+                                        , "HSchClassName": checkStatus.data[0].鐝鍚嶇О
                                     })
                                     layer.close(index);//鍏抽棴寮圭獥
+                                }
+                                , end: function () {
+                                    obj.update({
+                                        "HSchClassID": OptionData.HItemID
+                                        , "HSchClassNumber": OptionData.鐝浠g爜
+                                        , "HSchClassName": OptionData.鐝鍚嶇О
+                                    })
                                 }
                             })
                         }
@@ -1169,6 +1216,7 @@
                                         "HWorkTypeID": checkStatus.data[0].HItemID
                                         , "HWorkTypeNumber": checkStatus.data[0].宸ョ浠g爜
                                         , "HWorkTypeName": checkStatus.data[0].宸ョ鍚嶇О
+                                        , "HPayMoney": checkStatus.data[0].灏忔椂宸ヨ祫
                                     })
                                     layer.close(index);//鍏抽棴寮圭獥
                                 }
@@ -1177,6 +1225,7 @@
                                         "HWorkTypeID": OptionData.HItemID
                                         , "HWorkTypeNumber": OptionData.宸ョ浠g爜
                                         , "HWorkTypeName": OptionData.宸ョ鍚嶇О
+                                        , "HWorkTypeName": OptionData.灏忔椂宸ヨ祫
                                     })
                                 }
                             })
@@ -1412,7 +1461,7 @@
         {
             OptionData = data
         }
-        function GetHClassTimePrjValue(data)  //杩斿洖鏍哥畻鏂规
+        function GetHShiftsListValue(data)  //杩斿洖鐝
         {
             OptionData = data
         }

--
Gitblit v1.9.1