MES-WEB-LayUI.git

parent: e70ea1c5 | 补丁 | 提交 | ignore whitespace

wtt

2024-06-28 01ef7c649cb64c63777a551e13a84600a561ef01

工资模块弹框更改

13个文件已修改

	WebTM/views/工资管理/Gy_DuSubsidyItemBillList.html	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/工资管理/加班申请/Pay_OverApplyBill.html	14 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/工资管理/定额申请/Pay_ProcPriceRequestBill.html	32 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/工资管理/工资单/Pay_PayMentBill.html	77 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/工资管理/工资结算单(其他)/Pay_OtherBalBillEdit.html	76 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/工资管理/工资结算单(集体)/Pay_GroupBalBillEdit.html	36 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/工资管理/工资运算/Pay_SingleBalBillOperation.html	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/工资管理/异常工时申请单/Pay_ErrWorkTimesRequestBill.html	24 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/工资管理/扣补项目费用单/Pay_DuSubsidyItemBill.html	14 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/工资管理/扣补项目费用单/Pay_DuSubsidyItemBill_KS.html	10 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/工资管理/核算方式/Gy_ClassTimePrjSubBillEdit.html	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/工资管理/班组职员清单/Gy_GroupEmpBillEdit.html	12 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/工资管理/请假申请/Pay_OutApplyBill.html	50 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 WebTM/views/¹¤×Ê¹ÜÀí/Gy_DuSubsidyItemBillList.html

@@ -170,7 +170,7 @@
                        soulTable.render(this);
                    }
                    , cols: [[
                        { type: 'radio', fixed: 'left' }
                        { type: 'checkbox', fixed: 'left' }
                        , { field: 'HItemID', title: 'HItemID', sort: true, hide: true }
                        , { field: 'æ£è¡¥èµæä»£ç ', title: 'æ£è¡¥èµæä»£ç ', sort: true }
                        , { field: 'æ£è¡¥èµæåç§°', title: 'æ£è¡¥èµæåç§°', sort: true}

 WebTM/views/¹¤×Ê¹ÜÀí/¼Ó°àÉêÇë/Pay_OverApplyBill.html

@@ -753,7 +753,7 @@
                    , shift: 2                                          //å¼¹åºå¨ç»
                    , area: ["90%", "90%"]                              //çªä½å¤§å°
                    , maxmin: true                                      //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
                    , content: ["../../../views/Baseset/åºç¡èµæ/Gy_DepartmentList.html?Type=HDeptID", "yes"]
                    , content: ["../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_DepartmentList.html", "yes"]
                    , btn: ["ç¡®å®", "åæ¶"]
                    , btn1: function (index, laero) {
                        //æé®ä¸  çåè°
@@ -765,7 +765,7 @@
                        }

                        $("#HDeptID").val(checkStatus.data[0].HItemID);//åç 
                        $("#HDeptName").val(checkStatus.data[0].HName);//åç§°
                        $("#HDeptName").val(checkStatus.data[0].é¨é¨åç§°);//åç§°
                        layer.close(index);//å³éå¼¹çª
                    }
                    , btn2: function (index, layero) { }
@@ -784,7 +784,7 @@
                    , shift: 2                                          //å¼¹åºå¨ç»
                    , area: ["90%", "90%"]                              //çªä½å¤§å°
                    , maxmin: true                                      //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
                    , content: ["../../../views/Baseset/åºç¡èµæ/Gy_EmployeeList.html?Type=HEmpID", "yes"]
                    , content: ["../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_EmployeeList.html?Type=HManager", "yes"]
                    , btn: ["ç¡®å®", "åæ¶"]
                    , btn1: function (index, laero) {
                        //æé®ä¸  çåè°
@@ -796,7 +796,7 @@
                        }

                        $("#HMangerID").val(checkStatus.data[0].HItemID);//åç 
                        $("#HMangerName").val(checkStatus.data[0].HName);//åç§°
                        $("#HMangerName").val(checkStatus.data[0].èååç§°);//åç§°
                        layer.close(index);//å³éå¼¹çª
                    }
                    , btn2: function (index, layero) { }
@@ -1110,7 +1110,7 @@
                                , shift: 2                                          //å¼¹åºå¨ç»
                                , area: ["90%", "90%"]                              //çªä½å¤§å°
                                , maxmin: true                                      //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
                                , content: ["../../Baseset/åºç¡èµæ/Gy_EmployeeList.html", "yes"]
                                , content: ["../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_EmployeeList.html?", "yes"]
                                , btn: ["ç¡®å®", "åæ¶"]
                                , btn1: function (index, laero) {
                                    //æé®ä¸  çåè°
@@ -1123,8 +1123,8 @@
                                    //æ´æ°è¡¨æ ¼ç¼åçæ°æ®
                                    obj.update({
                                        "HEmpID": checkStatus.data[0].HItemID
                                        , "HEmpNumber": checkStatus.data[0].HNumber
                                        , "HEmpName": checkStatus.data[0].HName
                                        , "HEmpNumber": checkStatus.data[0].èåä»£ç 
                                        , "HEmpName": checkStatus.data[0].èååç§°
                                    })
                                    layer.close(index);//å³éå¼¹çª
                                }

 WebTM/views/¹¤×Ê¹ÜÀí/¶¨¶îÉêÇë/Pay_ProcPriceRequestBill.html

@@ -667,7 +667,7 @@
                    , shift: 2                                          //å¼¹åºå¨ç»
                    , area: ["90%", "90%"]                              //çªä½å¤§å°
                    , maxmin: true                                      //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
                    , content: ["../../../views/Baseset/åºç¡èµæ/Gy_DepartmentList.html?Type=HDeptID", "yes"]
                    , content: ["../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_DepartmentList.html", "yes"]
                    , btn: ["ç¡®å®", "åæ¶"]
                    , btn1: function (index, laero) {
                        //æé®ä¸  çåè°
@@ -679,7 +679,7 @@
                        }

                        $("#HDeptID").val(checkStatus.data[0].HItemID);//åç 
                        $("#HDeptName").val(checkStatus.data[0].HName);//åç§°
                        $("#HDeptName").val(checkStatus.data[0].é¨é¨åç§°);//åç§°
                        layer.close(index);//å³éå¼¹çª
                    }
                    , btn2: function (index, layero) { }
@@ -1058,7 +1058,7 @@
                                , shift: 2                                          //å¼¹åºå¨ç»
                                , area: ["90%", "90%"]                              //çªä½å¤§å°
                                , maxmin: true                                      //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
                                , content: ["../../../views/Baseset/åºç¡èµæ/Gy_MaterialList.html", "yes"]
                                , content: ["../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_Material.html?", "yes"]
                                , btn: ["ç¡®å®", "åæ¶"]
                                , btn1: function (index, laero) {
                                    //æé®ä¸  çåè°
@@ -1068,6 +1068,7 @@
                                    if (checkStatus.data.length != 1) {
                                        return layer.msg("è¯·éæ©ä¸æ¡æ°æ®");
                                    }
                                    OptionData = checkStatus.data[0];
                                    //è·åå·¥ä»·
                                    var HMaterID = checkStatus.data[0].HItemID;
                                    var HProcID = obj.data.hasOwnProperty("HProcID") ? obj.data.HProcID + "" : "0";
@@ -1077,18 +1078,18 @@
                                    if (HOldPrice != -1) {
                                        //æ´æ°è¡¨æ ¼ç¼åçæ°æ®
                                        obj.update({
                                            "HMaterID": checkStatus.data[0].HItemID
                                            , "HMaterNumber": checkStatus.data[0].HNumber
                                            , "HMaterName": checkStatus.data[0].HName
                                            , "HMaterModel": checkStatus.data[0].HModel
                                            "HMaterID": OptionData.HItemID
                                            , "HMaterNumber": OptionData.ç©æä»£ç 
                                            , "HMaterName": OptionData.ç©æåç§°
                                            , "HMaterModel": OptionData.è§æ ¼åå·
                                            , "HOldPrice": HOldPrice
                                        })
                                    } else {
                                        obj.update({
                                            "HMaterID": checkStatus.data[0].HItemID
                                            , "HMaterNumber": checkStatus.data[0].HNumber
                                            , "HMaterName": checkStatus.data[0].HName
                                            , "HMaterModel": checkStatus.data[0].HModel
                                            "HMaterID": OptionData.HItemID
                                            , "HMaterNumber": OptionData.ç©æä»£ç 
                                            , "HMaterName": OptionData.ç©æåç§°
                                            , "HMaterModel": OptionData.è§æ ¼åå·
                                        })
                                    }
                                    layer.close(index);//å³éå¼¹çª
@@ -1106,7 +1107,7 @@
                                , shift: 2                                          //å¼¹åºå¨ç»
                                , area: ["90%", "90%"]                              //çªä½å¤§å°
                                , maxmin: true                                      //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
                                , content: ["../../../views/Baseset/åºç¡èµæ/Gy_ProcList.html", "yes"]
                                , content: ["../../åºç¡èµæ/çäº§åºç¡èµæ/Gy_Process.html", "yes"]
                                , btn: ["ç¡®å®", "åæ¶"]
                                , btn1: function (index, laero) {
                                    //æé®ä¸  çåè°
@@ -1116,6 +1117,7 @@
                                    if (checkStatus.data.length != 1) {
                                        return layer.msg("è¯·éæ©ä¸æ¡æ°æ®");
                                    }
                                    OptionData = checkStatus.data[0];
                                    //è·åå·¥ä»·
                                    var HMaterID = obj.data.hasOwnProperty("HMaterID") ? obj.data.HMaterID + "" : "0";
                                    var HProcID = checkStatus.data[0].HItemID;
@@ -1127,14 +1129,14 @@
                                        obj.update({
                                            "HProcID": checkStatus.data[0].HItemID
                                            , "HProcNumber": checkStatus.data[0].å·¥åºä»£ç 
                                            , "HProcName": checkStatus.data[0].å·¥åº
                                            , "HProcName": checkStatus.data[0].å·¥åºåç§°
                                            , "HOldPrice": HOldPrice
                                        })
                                    } else {
                                        obj.update({
                                            "HProcID": checkStatus.data[0].HItemID
                                            , "HProcNumber": checkStatus.data[0].å·¥åºä»£ç 
                                            , "HProcName": checkStatus.data[0].å·¥åº
                                            , "HProcName": checkStatus.data[0].å·¥åºåç§°
                                        })
                                    }
                                    layer.close(index);//å³éå¼¹çª
@@ -1152,7 +1154,7 @@
                                , shift: 2                                          //å¼¹åºå¨ç»
                                , area: ["90%", "90%"]                              //çªä½å¤§å°
                                , maxmin: true                                      //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
                                , content: ["../../../views/åºç¡èµæ/çäº§åºç¡èµæ/Gy_Source.html", "yes"]
                                , content: ["../../åºç¡èµæ/çäº§åºç¡èµæ/Gy_Source.html", "yes"]
                                , btn: ["ç¡®å®", "åæ¶"]
                                , btn1: function (index, laero) {
                                    //æé®ä¸  çåè°

 WebTM/views/¹¤×Ê¹ÜÀí/¹¤×Êµ¥/Pay_PayMentBill.html

@@ -553,11 +553,11 @@
                        , { type: 'numbers', title: 'åºå·' }
                        , { field: 'RowID', title: 'è¡å·', hide: true }                                                   //è¡æ è¯ï¼ç¨äºä¸ä¸è¡ãä¸ä¸è¡è¯å«æå¨è¡
                        , { field: 'HEmpID', title: 'èåID', hide: true }
                        , { field: 'HEmpNumber', title: 'èåä»£ç ', event: "HEmpNumber" }     //f7
                        , { field: 'HEmpNumber', title: 'èåä»£ç ', edit: 'text', event: "HEmpNumber" }     //f7
                        , { field: 'HEmpName', title: 'èååç§°' }
                        , { field: 'HEmpType', title: 'å·¥èµç±»å' }
                        , { field: 'HPostID', title: 'å²ä½ID', hide: true }
                        , { field: 'HPostNumber', title: 'å²ä½ä»£ç ' }
                        , { field: 'HPostID', title: 'å²ä½ID',  hide: true }
                        , { field: 'HPostNumber', title: 'å²ä½ä»£ç '}
                        , { field: 'HPostName', title: 'å²ä½åç§°' }
                        , { field: 'HPiecePay', title: 'è®¡ä»¶å·¥èµ', totalRow: true }
                        , { field: 'HTimesPay', title: 'è®¡æ¶å·¥èµ', event: "HTimesPay", totalRow: true }
@@ -665,7 +665,7 @@
                    , shift: 2                                          //å¼¹åºå¨ç»
                    , area: ["90%", "90%"]                              //çªä½å¤§å°
                    , maxmin: true                                      //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
                    , content: ["../../../views/Baseset/åºç¡èµæ/Gy_DepartmentList.html?Type=HDeptID", "yes"]
                    , content: ["../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_DepartmentList.html", "yes"]
                    , btn: ["ç¡®å®", "åæ¶"]
                    , btn1: function (index, laero) {
                        //æé®ä¸  çåè°
@@ -677,7 +677,7 @@
                        }

                        $("#HDeptID").val(checkStatus.data[0].HItemID);//åç 
                        $("#HDeptName").val(checkStatus.data[0].HName);//åç§°
                        $("#HDeptName").val(checkStatus.data[0].é¨é¨åç§°);//åç§°
                        layer.close(index);//å³éå¼¹çª
                    }
                    , btn2: function (index, layero) { }
@@ -971,7 +971,7 @@
                                , shift: 2                                          //å¼¹åºå¨ç»
                                , area: ["90%", "90%"]                              //çªä½å¤§å°
                                , maxmin: true                                      //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
                                , content: ["../../Baseset/åºç¡èµæ/Gy_EmployeeList.html", "yes"]
                                , content: ["../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_EmployeeList.html", "yes"]
                                , btn: ["ç¡®å®", "åæ¶"]
                                , btn1: function (index, laero) {
                                    //æé®ä¸  çåè°
@@ -984,8 +984,11 @@
                                    //æ´æ°è¡¨æ ¼ç¼åçæ°æ®
                                    obj.update({
                                        "HEmpID": checkStatus.data[0].HItemID
                                        , "HEmpNumber": checkStatus.data[0].HNumber
                                        , "HEmpName": checkStatus.data[0].HName
                                        , "HEmpNumber": checkStatus.data[0].èåä»£ç 
                                        , "HEmpName": checkStatus.data[0].èååç§°
                                        , "HPostID": checkStatus.data[0].HPostID
                                        , "HPostNumber": checkStatus.data[0].å²ä½ä»£ç 
                                        , "HPostName": checkStatus.data[0].å²ä½åç§°
                                    })
                                    layer.close(index);//å³éå¼¹çª
                                }
@@ -1004,36 +1007,36 @@
            function openDetailTouchedByDblclick(obj) {
                $(document).off('dblclick', ".layui-table").on('dblclick', '.layui-table', function (e) {
                    //èå
                    if (obj.event == "HTimesPay") {
                        //æå¼èåå°çªä½
                        layer.open({
                            type: 2
                            , skin: "layui-layer-rim"                           //å ä¸è¾¹æ¡
                            , title: "èååè¡¨"                             //æ é¢
                            , closeBtn: 1                                       //çªä½å³ä¸è§å³é ç æ ·å¼
                            , shift: 2                                          //å¼¹åºå¨ç»
                            , area: ["90%", "90%"]                              //çªä½å¤§å°
                            , maxmin: true                                      //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
                            , content: ["../../Baseset/åºç¡èµæ/Gy_EmployeeList.html", "yes"]
                            , btn: ["ç¡®å®", "åæ¶"]
                            , btn1: function (index, laero) {
                                //æé®ä¸  çåè°
                                var iframeWindow = window["layui-layer-iframe" + index];//è·åå¼¹æ¡é¡µé¢
                                var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//è·åéä¸çæ°æ®
                    //if (obj.event == "HTimesPay") {
                    //    //æå¼èåå°çªä½
                    //    layer.open({
                    //        type: 2
                    //        , skin: "layui-layer-rim"                           //å ä¸è¾¹æ¡
                    //        , title: "èååè¡¨"                             //æ é¢
                    //        , closeBtn: 1                                       //çªä½å³ä¸è§å³é ç æ ·å¼
                    //        , shift: 2                                          //å¼¹åºå¨ç»
                    //        , area: ["90%", "90%"]                              //çªä½å¤§å°
                    //        , maxmin: true                                      //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
                    //        , content: ["../../Baseset/åºç¡èµæ/Gy_EmployeeList.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("è¯·éæ©ä¸æ¡æ°æ®");
                                }
                                //æ´æ°è¡¨æ ¼ç¼åçæ°æ®
                                obj.update({
                                    "HEmpID": checkStatus.data[0].HItemID
                                    , "HEmpNumber": checkStatus.data[0].HNumber
                                    , "HEmpName": checkStatus.data[0].HName
                                })
                                layer.close(index);//å³éå¼¹çª
                            }
                        })
                    }
                    //            if (checkStatus.data.length != 1) {
                    //                return layer.msg("è¯·éæ©ä¸æ¡æ°æ®");
                    //            }
                    //            //æ´æ°è¡¨æ ¼ç¼åçæ°æ®
                    //            obj.update({
                    //                "HEmpID": checkStatus.data[0].HItemID
                    //                , "HEmpNumber": checkStatus.data[0].HNumber
                    //                , "HEmpName": checkStatus.data[0].HName
                    //            })
                    //            layer.close(index);//å³éå¼¹çª
                    //        }
                    //    })
                    //}
                    obj.event = "";
                    return false;
                })

 WebTM/views/¹¤×Ê¹ÜÀí/¹¤×Ê½áËãµ¥(ÆäËû)/Pay_OtherBalBillEdit.html

@@ -332,8 +332,8 @@
                    , { field: 'HEmpName', title: 'èååç§°', width: 100, style: 'background-color: #f9f9f9;' }
                    , { field: 'HMaterID', title: 'HMaterID', edit: 'text', width: 100, hide: true, style: 'background-color: #f9f9f9;' }
                    , { field: 'HMaterNumber', title: 'ç©æä»£ç ', edit: 'text', event: 'HMaterNumber', width: 100 }
                    , { field: 'HMaterName', title: 'ç©æåç§°', width: 300, style: 'background-color: #f9f9f9;' }
                    , { field: 'HMaterModel', title: 'è§æ ¼åå·', width: 200, style: 'background-color: #f9f9f9;' }
                    , { field: 'HMaterName', title: 'ç©æåç§°', width: 100, style: 'background-color: #f9f9f9;' }
                    , { field: 'HMaterModel', title: 'è§æ ¼åå·', width: 100, style: 'background-color: #f9f9f9;' }
                    , { field: 'HProcID', title: 'HProcID', edit: 'text', width: 100, hide: true, style: 'background-color: #f9f9f9;' }
                    , { field: 'HProcNumber', title: 'å·¥åºä»£ç ', edit: 'text', event: "HProcNumber", width: 100 }
                    , { field: 'HProcName', title: 'å·¥åºåç§°', width: 100, style: 'background-color: #f9f9f9;' }
@@ -357,7 +357,7 @@
                $("#HMaker").val(sessionStorage["HUserName"]);
                //åå§å è½½è¡¨æ ¼{ "ID": 0, "HWasterReasonName": " ","HBadReasonID":0,"HEmpName": "  ", "HSQProcName": "   ","HProcID":0, "HZRProcName": "  ", "HMRBChecker": "  ", "HRemark": "  ", "HPSProcName": "  ", "HCloseMan": "   " }
                option.data = [{
                    "HEmpID": "", "HEmpNumber": "", "HEmpName": "", "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HProcID": "", "HProcNumber": "", "HProcName": ""
                    "HEmpID": "", "HEmpNumber": "", "HEmpName": "", "HMaterID": 0, "HMaterNumber": "", "HMaterName": "", "HMaterModel": "", "HProcID": "", "HProcNumber": "", "HProcName": ""
                    , "HTimes": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HRemark": ""
                    , "HMainSourceInterID": 0, "HMainSourceEntryID": 0, "HMainSourceBillNo": 0, "HSourceBillType": "", "HCloseDate": 0
                }];
@@ -398,7 +398,7 @@
                    , data = checkStatus.data;;
                var AddRow = table.cache['mainTable'];
                var NewRow = {
                    "HEmpID": "", "HEmpNumber": "", "HEmpName": "","HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "","HProcID":0, "HProcNumber": "", "HProcName": ""
                    "HEmpID": "", "HEmpNumber": "", "HEmpName": "","HMaterID": 0, "HMaterNumber": "", "HMaterName": "", "HMaterModel": "","HProcID":0, "HProcNumber": "", "HProcName": ""
                    , "HTimes": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HRemark": ""
                    , "HMainSourceInterID": 0, "HMainSourceEntryID": 0, "HMainSourceBillNo": 0, "HSourceBillType": "", "HCloseDate": 0
                };
@@ -450,7 +450,6 @@
                        }
                    });
                }

                $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
                    if (event.key == "F7") {
                        if (obj.event === 'HEmpCheck') //èå
@@ -463,7 +462,7 @@
                                shift: 2,
                                area: ['90%', '90%'],
                                maxmin: true,
                                content: ['../../../views/Baseset/åºç¡èµæ/Gy_EmployeeList.html', 'yes'],
                                content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_EmployeeList.html?Type=HEmpList', 'yes'],
                                btn: ['ç¡®å®', 'åæ¶']
                                , btn1: function (index, layero) {
                                    //æé®ãæé®ä¸ãçåè°
@@ -472,23 +471,29 @@
                                    if (checkStatus.data.length === 0) {
                                        return layer.msg('è¯·éæ©æ°æ®');
                                    }
                                    OptionData = checkStatus.data[0];
                                    //æ´æ°è¡¨æ ¼ç¼åçæ°æ®
                                    obj.update({
                                        HEmpName: checkStatus.data[0].HName
                                        , HEmpID: checkStatus.data[0].HItemID
                                        , HEmpNumber: checkStatus.data[0].HNumber
                                    });
                                        "HEmpID": checkStatus.data[0].HItemID
                                        , "HEmpNumber": checkStatus.data[0].èåä»£ç 
                                        , "HEmpName": checkStatus.data[0].èååç§°
                                    })

                                    layer.close(layer.index);
                                }
                                , btn2: function (index, layero) {
                                },
                                end: function () {

                                    obj.update({
                                        "HEmpID": OptionData.HItemID
                                        , "HEmpNumber": OptionData.èåä»£ç 
                                        , "HEmpName": OptionData.èååç§°
                                    })
                                }
                            });
                        }

                        if (obj.event === 'HMaterCode')  //ç©æä»£ç 
                        if (obj.event === 'HMaterNumber')  //ç©æä»£ç 
                        {
                            //é¡µé¢å±-èªå®ä¹
                            layer.open({
@@ -499,7 +504,7 @@
                                shift: 2,
                                area: ['80%', '80%'],
                                maxmin: true,
                                content: ['../../../views/Baseset/åºç¡èµæ/Gy_MaterialList.html', 'yes'],
                                content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_Material.html?', 'yes'],
                                btn: ['ç¡®å®', 'åæ¶']
                                , btn1: function (index, layero) {

@@ -509,15 +514,15 @@
                                    if (checkStatus.data.length === 0) {
                                        return layer.msg('è¯·éæ©æ°æ®');
                                    }

                                    OptionData = checkStatus.data[0];
                                    //åæ¥æ´æ°è¡¨æ ¼åç¼åå¯¹åºçå¼
                                    obj.update({
                                        HMaterID: checkStatus.data[0].HItemID,
                                        HMaterCode: checkStatus.data[0].HNumber,
                                        HMaterName: checkStatus.data[0].HName,
                                        HMaterSpec: checkStatus.data[0].HModel,
                                        HQty: 1,         //å®æ¶æ°é
                                        HMoney: 0,       //éé¢
                                        "HMaterID": checkStatus.data[0].HItemID
                                        , "HMaterNumber": checkStatus.data[0].ç©æä»£ç 
                                        , "HMaterName": checkStatus.data[0].ç©æåç§°
                                        , "HMaterModel": checkStatus.data[0].è§æ ¼åå·
                                        , "HQty": 1     //å®æ¶æ°é
                                        , "HMoney": 0     //éé¢
                                    });
                                    $.ajax({
                                        url: GetWEBURL() + "Pay_OtherBalBill/getOtherBalBillPrice",
@@ -532,8 +537,8 @@

                                                } else {
                                                    obj.update({
                                                        HPrice: result.data[0].åä»·
                                                        ,HMoney: obj.data.HQty * result.data[0].åä»·
                                                        "HPrice": result.data[0].åä»·
                                                        ,"HMoney": obj.data.HQty * result.data[0].åä»·
                                                    });
                                                }
                                            }
@@ -548,7 +553,7 @@
                                    //return false å¼å¯è¯¥ä»£ç å¯ç¦æ¢ç¹å»è¯¥æé®å³é
                                },
                                end: function () {

                                    
                                }
                            });
                        }
@@ -563,7 +568,7 @@
                                shift: 2,
                                area: ['90%', '90%'],
                                maxmin: true,
                                content: ['../../../views/Baseset/åºç¡èµæ/Gy_ProcList.html', 'yes'],
                                content: ['../../åºç¡èµæ/çäº§åºç¡èµæ/Gy_Process.html', 'yes'],
                                btn: ['ç¡®å®', 'åæ¶']
                                , btn1: function (index, layero) {
                                    //æé®ãæé®ä¸ãçåè°
@@ -573,10 +578,11 @@
                                        return layer.msg('è¯·éæ©æ°æ®');
                                    }
                                    obj.update({
                                        HProcName: checkStatus.data[0].å·¥åº
                                        HProcName: checkStatus.data[0].å·¥åºåç§°
                                        , HProcID: checkStatus.data[0].HItemID
                                        , HProcNumber: checkStatus.data[0].å·¥åºä»£ç 
                                    });
                                    OptionData = checkStatus.data[0];
                                    $.ajax({
                                        url: GetWEBURL() + "Pay_OtherBalBill/getOtherBalBillPrice",
                                        type: "GET",
@@ -604,7 +610,11 @@
                                , btn2: function (index, layero) {
                                },
                                end: function () {

                                    obj.update({
                                        "HProcID": OptionData.HItemID
                                        , "HProcNumber": OptionData.å·¥åºä»£ç 
                                        , "HProcName": OptionData.å·¥åºåç§°
                                    })
                                }
                            });
                        }
@@ -744,7 +754,7 @@
                    shift: 2,
                    area: ['80%', '80%'],
                    maxmin: true,
                    content: ['../../../views/Baseset/åºç¡èµæ/Gy_GetProductionTeamList.html?Type=HGroupID', 'yes'],
                    content: ['../../åºç¡èµæ/å·¥èµåºç¡èµæ/Gy_Group.html?Type=HGroup', 'yes'],
                    btn: ['ç¡®å®', 'åæ¶']
                    , btn1: function (index, layero) {

@@ -754,7 +764,7 @@
                        if (checkStatus.data.length === 0) {
                            return layer.msg('è¯·éæ©æ°æ®');
                        }
                        $("#HGroupName").val(checkStatus.data[0].çç»);
                        $("#HGroupName").val(checkStatus.data[0].çç»åç§°);
                        $("#HGroupID").val(checkStatus.data[0].HItemID);
                        layer.close(layer.index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
                    }
@@ -782,7 +792,7 @@
                    shift: 2,
                    area: ['80%', '80%'],
                    maxmin: true,
                    content: ['../../../views/Baseset/åºç¡èµæ/Gy_EmployeeList.html?Type=HEmpID', 'yes'],
                    content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_EmployeeList.html?Type=HManager', 'yes'],
                    btn: ['ç¡®å®', 'åæ¶']
                    , btn1: function (index, layero) {

@@ -792,7 +802,7 @@
                        if (checkStatus.data.length === 0) {
                            return layer.msg('è¯·éæ©æ°æ®');
                        }
                        $("#HEmpName").val(checkStatus.data[0].HName);
                        $("#HEmpName").val(checkStatus.data[0].èååç§°);
                        $("#HEmpID").val(checkStatus.data[0].HItemID);
                        layer.close(layer.index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
                    }
@@ -820,7 +830,7 @@
                    shift: 2,
                    area: ['80%', '80%'],
                    maxmin: true,
                    content: ['../../../views/Baseset/åºç¡èµæ/Gy_DepartmentList.html?Type=HDeptID', 'yes'],
                    content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_DepartmentList.html', 'yes'],
                    btn: ['ç¡®å®', 'åæ¶']
                    , btn1: function (index, layero) {

@@ -830,7 +840,7 @@
                        if (checkStatus.data.length === 0) {
                            return layer.msg('è¯·éæ©æ°æ®');
                        }
                        $("#HDeptName").val(checkStatus.data[0].HName);
                        $("#HDeptName").val(checkStatus.data[0].é¨é¨åç§°);
                        $("#HDeptID").val(checkStatus.data[0].HItemID);
                        layer.close(layer.index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
                    }
@@ -858,7 +868,7 @@
                    shift: 2,
                    area: ['80%', '80%'],
                    maxmin: true,
                    content: ['../../../views/å·¥èµç®¡ç/Gy_WorkPayTypeBillList.html?Type=HPayType', 'yes'],
                    content: ['../../åºç¡èµæ/å·¥èµåºç¡èµæ/Gy_WorkPayTypeList.html?Type=HWorkPayType&OperationType=2', 'yes'],
                    btn: ['ç¡®å®', 'åæ¶']
                    , btn1: function (index, layero) {


 WebTM/views/¹¤×Ê¹ÜÀí/¹¤×Ê½áËãµ¥(¼¯Ìå)/Pay_GroupBalBillEdit.html

@@ -1034,26 +1034,25 @@
                //æå¼é¨é¨å°çªä½
                layer.open({
                    type: 2
                    , skin: "layui-layer-rim"                           //å ä¸è¾¹æ¡
                    , title: "é¨é¨åè¡¨"                             //æ é¢
                    , closeBtn: 1                                       //çªä½å³ä¸è§å³é ç æ ·å¼
                    , shift: 2                                          //å¼¹åºå¨ç»
                    , area: ["90%", "90%"]                              //çªä½å¤§å°
                    , maxmin: true                                      //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
                    , content: ["../../../views/Baseset/åºç¡èµæ/Gy_DepartmentList.html?Type=HDeptID", "yes"]
                    , 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");//è·åéä¸çæ°æ®
                        var iframeWindow = window["layui-layer-iframe" + index];                //è·åå¼¹æ¡é¡µé¢
                        var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");    //è·åéä¸çæ°æ®

                        if (checkStatus.data.length != 1) {
                            return layer.msg("è¯·éæ©ä¸æ¡æ°æ®");
                        }

                        $("#HDeptID").val(checkStatus.data[0].HItemID);//åç 
                        $("#HDeptName").val(checkStatus.data[0].HName);//åç§°
                        layer.close(index);//å³éå¼¹çª
                        $("#HDeptName").val(checkStatus.data[0].é¨é¨åç§°);
                        $("#HDeptID").val(checkStatus.data[0].HItemID);
                        layer.close(index); //å³éå¼¹çª  å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
                    }
                    , btn2: function (index, layero) { }
                })
@@ -1664,7 +1663,7 @@
                                , shift: 2                                          //å¼¹åºå¨ç»
                                , area: ["90%", "90%"]                              //çªä½å¤§å°
                                , maxmin: true                                      //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
                                , content: ["../../../views/Baseset/åºç¡èµæ/Gy_ProcList.html", "yes"]
                                , content: ["../../åºç¡èµæ/çäº§åºç¡èµæ/Gy_Process.html", "yes"]
                                , btn: ["ç¡®å®", "åæ¶"]
                                , btn1: function (index, laero) {
                                    //æé®ä¸  çåè°
@@ -1687,7 +1686,7 @@
                                        obj.update({
                                            "HProcID": checkStatus.data[0].HItemID
                                            , "HProcNumber": checkStatus.data[0].å·¥åºä»£ç 
                                            , "HProcName": checkStatus.data[0].å·¥åº
                                            , "HProcName": checkStatus.data[0].å·¥åºåç§°
                                            , "HPrice": HPrice
                                            , "HMoney": HMoney
                                        })
@@ -1695,7 +1694,7 @@
                                        obj.update({
                                            "HProcID": checkStatus.data[0].HItemID
                                            , "HProcNumber": checkStatus.data[0].å·¥åºä»£ç 
                                            , "HProcName": checkStatus.data[0].å·¥åº
                                            , "HProcName": checkStatus.data[0].å·¥åºåç§°
                                            , "HPrice": 0
                                            , "HMoney": 0
                                        })
@@ -2214,7 +2213,10 @@


        });

        function GetProcessValue(data)  //è¿åå·¥åº
        {
            OptionData = data
        }

    </script>
</body>

 WebTM/views/¹¤×Ê¹ÜÀí/¹¤×ÊÔËËã/Pay_SingleBalBillOperation.html

@@ -97,7 +97,7 @@
                    shift: 2,
                    area: ['80%', '80%'],
                    maxmin: true,
                    content: ['../../PublicPage/DeptInformation.html', 'yes'],
                    content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_DepartmentList.html', 'yes'],
                    btn: ['ç¡®å®', 'åæ¶']
                    , btn1: function (index, layero) {

@@ -107,7 +107,7 @@
                        if (checkStatus.data.length === 0) {
                            return layer.msg('è¯·éæ©æ°æ®');
                        }
                        $("#HDeptName").val(checkStatus.data[0].HName);
                        $("#HDeptName").val(checkStatus.data[0].é¨é¨åç§°);
                        $("#HDeptID").val(checkStatus.data[0].HItemID);
                        layer.close(layer.index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
                    }

 WebTM/views/¹¤×Ê¹ÜÀí/Òì³£¹¤Ê±ÉêÇëµ¥/Pay_ErrWorkTimesRequestBill.html

@@ -803,7 +803,7 @@
                    , shift: 2                                          //å¼¹åºå¨ç»
                    , area: ["90%", "90%"]                              //çªä½å¤§å°
                    , maxmin: true                                      //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
                    , content: ["../../../views/Baseset/åºç¡èµæ/Gy_DepartmentList.html?Type=HDeptID", "yes"]
                    , content: ["../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_DepartmentList.html", "yes"]
                    , btn: ["ç¡®å®", "åæ¶"]
                    , btn1: function (index, laero) {
                        //æé®ä¸  çåè°
@@ -814,8 +814,8 @@
                            return layer.msg("è¯·éæ©ä¸æ¡æ°æ®");
                        }

                        $("#HDeptID").val(checkStatus.data[0].HItemID);//åç 
                        $("#HDeptName").val(checkStatus.data[0].HName);//åç§°
                        $("#HDeptName").val(checkStatus.data[0].é¨é¨åç§°);
                        $("#HDeptID").val(checkStatus.data[0].HItemID);
                        layer.close(index);//å³éå¼¹çª
                    }
                    , btn2: function (index, layero) { }
@@ -834,7 +834,7 @@
                    , shift: 2                                          //å¼¹åºå¨ç»
                    , area: ["90%", "90%"]                              //çªä½å¤§å°
                    , maxmin: true                                      //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
                    , content: ["../../../views/Baseset/åºç¡èµæ/Gy_GetProductionTeamList.html?Type=HGroupID", "yes"]
                    , content: ["../../åºç¡èµæ/å·¥èµåºç¡èµæ/Gy_Group.html?Type=HGroup", "yes"]
                    , btn: ["ç¡®å®", "åæ¶"]
                    , btn1: function (index, laero) {
                        //æé®ä¸  çåè°
@@ -846,7 +846,7 @@
                        }

                        $("#HGroupID").val(checkStatus.data[0].HItemID);//åç 
                        $("#HGroupName").val(checkStatus.data[0].çç»);//åç§°
                        $("#HGroupName").val(checkStatus.data[0].çç»åç§°);//åç§°
                        layer.close(index);//å³éå¼¹çª
                    }
                    , btn2: function (index, layero) { }
@@ -865,7 +865,7 @@
                    , shift: 2                                          //å¼¹åºå¨ç»
                    , area: ["90%", "90%"]                              //çªä½å¤§å°
                    , maxmin: true                                      //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
                    , content: ["../../../views/Baseset/åºç¡èµæ/Gy_EmployeeList.html?Type=HEmpID", "yes"]
                    , content: ["../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_EmployeeList.html?Type=HManager", "yes"]
                    , btn: ["ç¡®å®", "åæ¶"]
                    , btn1: function (index, laero) {
                        //æé®ä¸  çåè°
@@ -877,7 +877,7 @@
                        }

                        $("#HMangerID").val(checkStatus.data[0].HItemID);//åç 
                        $("#HMangerName").val(checkStatus.data[0].HName);//åç§°
                        $("#HMangerName").val(checkStatus.data[0].èååç§°);//åç§°
                        layer.close(index);//å³éå¼¹çª
                    }
                    , btn2: function (index, layero) { }
@@ -896,7 +896,7 @@
                    , shift: 2                                          //å¼¹åºå¨ç»
                    , area: ["90%", "90%"]                              //çªä½å¤§å°
                    , maxmin: true                                      //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
                    , content: ["../../../views/Baseset/åºç¡èµæ/Gy_MaterialList.html", "yes"]
                    , content: ["../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_Material.html?", "yes"]
                    , btn: ["ç¡®å®", "åæ¶"]
                    , btn1: function (index, laero) {
                        //æé®ä¸  çåè°
@@ -908,7 +908,7 @@
                        }

                        $("#HMaterID").val(checkStatus.data[0].HItemID);//åç 
                        $("#HMaterName").val(checkStatus.data[0].HName);//åç§°
                        $("#HMaterName").val(checkStatus.data[0].ç©æåç§°);//åç§°
                        layer.close(index);//å³éå¼¹çª
                    }
                })
@@ -1382,7 +1382,7 @@
                                , shift: 2                                          //å¼¹åºå¨ç»
                                , area: ["90%", "90%"]                              //çªä½å¤§å°
                                , maxmin: true                                      //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
                                , content: ["../../Baseset/åºç¡èµæ/Gy_EmployeeList.html", "yes"]
                                , content: ["../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_EmployeeList.html?", "yes"]
                                , btn: ["ç¡®å®", "åæ¶"]
                                , btn1: function (index, laero) {
                                    //æé®ä¸  çåè°
@@ -1403,8 +1403,8 @@
                                        success: function (result) {
                                            if (result.code == 1) { // è¯´æéªè¯æåäºï¼
                                                var HEmpID = checkStatus.data[0].HItemID;
                                                var HEmpNumber = checkStatus.data[0].HNumber;
                                                var HEmpName = checkStatus.data[0].HName;
                                                var HEmpNumber = checkStatus.data[0].èåä»£ç ;
                                                var HEmpName = checkStatus.data[0].èååç§°;
                                                var HWorkTypeID = result.data[0]["HWorkTypeID"];
                                                var HWorkTypeNumber = result.data[0]["HWorkTypeNumber"];
                                                var HWorkTypeName = result.data[0]["HWorkTypeName"];

 WebTM/views/¹¤×Ê¹ÜÀí/¿Û²¹ÏîÄ¿·ÑÓÃµ¥/Pay_DuSubsidyItemBill.html

@@ -606,7 +606,7 @@
                    , shift: 2                                          //å¼¹åºå¨ç»
                    , area: ["90%", "90%"]                              //çªä½å¤§å°
                    , maxmin: true                                      //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
                    , content: ["../../../views/Baseset/åºç¡èµæ/Gy_DepartmentList.html?Type=HDeptID", "yes"]
                    , content: ["../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_DepartmentList.html", "yes"]
                    , btn: ["ç¡®å®", "åæ¶"]
                    , btn1: function (index, laero) {
                        //æé®ä¸  çåè°
@@ -618,7 +618,7 @@
                        }

                        $("#HDeptID").val(checkStatus.data[0].HItemID);//åç 
                        $("#HDeptName").val(checkStatus.data[0].HName);//åç§°
                        $("#HDeptName").val(checkStatus.data[0].é¨é¨åç§°);//åç§°
                        layer.close(index);//å³éå¼¹çª
                    }
                    , btn2: function (index, layero) { }
@@ -637,7 +637,7 @@
                    , shift: 2                                          //å¼¹åºå¨ç»
                    , area: ["90%", "90%"]                              //çªä½å¤§å°
                    , maxmin: true                                      //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
                    , content: ["../../../views/Baseset/åºç¡èµæ/Gy_GetProductionTeamList.html?Type=HGroupID", "yes"]
                    , content: ["../../åºç¡èµæ/å·¥èµåºç¡èµæ/Gy_Group.html?Type=HGroup", "yes"]
                    , btn: ["ç¡®å®", "åæ¶"]
                    , btn1: function (index, laero) {
                        //æé®ä¸  çåè°
@@ -649,7 +649,7 @@
                        }

                        $("#HGroupID").val(checkStatus.data[0].HItemID);//åç 
                        $("#HGroupName").val(checkStatus.data[0].çç»);//åç§°
                        $("#HGroupName").val(checkStatus.data[0].çç»åç§°);//åç§°
                        layer.close(index);//å³éå¼¹çª
                    }
                    , btn2: function (index, layero) { }
@@ -930,7 +930,7 @@
                                , shift: 2                                          //å¼¹åºå¨ç»
                                , area: ["90%", "90%"]                              //çªä½å¤§å°
                                , maxmin: true                                      //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
                                , content: ["../../Baseset/åºç¡èµæ/Gy_EmployeeList.html", "yes"]
                                , content: ["../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_EmployeeList.html?", "yes"]
                                , btn: ["ç¡®å®", "åæ¶"]
                                , btn1: function (index, laero) {
                                    //æé®ä¸  çåè°
@@ -943,8 +943,8 @@
                                    //æ´æ°è¡¨æ ¼ç¼åçæ°æ®
                                    obj.update({
                                        "HEmpID": checkStatus.data[0].HItemID
                                        , "HEmpNumber": checkStatus.data[0].HNumber
                                        , "HEmpName": checkStatus.data[0].HName
                                        , "HEmpNumber": checkStatus.data[0].èåä»£ç 
                                        , "HEmpName": checkStatus.data[0].èååç§°
                                    })
                                    layer.close(index);//å³éå¼¹çª
                                }

 WebTM/views/¹¤×Ê¹ÜÀí/¿Û²¹ÏîÄ¿·ÑÓÃµ¥/Pay_DuSubsidyItemBill_KS.html

@@ -621,7 +621,7 @@
                    , shift: 2                                          //å¼¹åºå¨ç»
                    , area: ["90%", "90%"]                              //çªä½å¤§å°
                    , maxmin: true                                      //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
                    , content: ["../../../views/Baseset/åºç¡èµæ/Gy_DepartmentList.html?Type=HDeptID", "yes"]
                    , content: ["../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_DepartmentList.html", "yes"]
                    , btn: ["ç¡®å®", "åæ¶"]
                    , btn1: function (index, laero) {
                        //æé®ä¸  çåè°
@@ -633,7 +633,7 @@
                        }

                        $("#HDeptID").val(checkStatus.data[0].HItemID);//åç 
                        $("#HDeptName").val(checkStatus.data[0].HName);//åç§°
                        $("#HDeptName").val(checkStatus.data[0].é¨é¨åç§°);//åç§°
                        layer.close(index);//å³éå¼¹çª
                    }
                    , btn2: function (index, layero) { }
@@ -955,7 +955,7 @@
                                , shift: 2                                          //å¼¹åºå¨ç»
                                , area: ["90%", "90%"]                              //çªä½å¤§å°
                                , maxmin: true                                      //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
                                , content: ["../../Baseset/åºç¡èµæ/Gy_EmployeeList.html", "yes"]
                                , content: ["../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_EmployeeList.html?", "yes"]
                                , btn: ["ç¡®å®", "åæ¶"]
                                , btn1: function (index, laero) {
                                    //æé®ä¸  çåè°
@@ -968,8 +968,8 @@
                                    //æ´æ°è¡¨æ ¼ç¼åçæ°æ®
                                    obj.update({
                                        "HEmpID": checkStatus.data[0].HItemID
                                        , "HEmpNumber": checkStatus.data[0].HNumber
                                        , "HEmpName": checkStatus.data[0].HName
                                        , "HEmpNumber": checkStatus.data[0].èåä»£ç 
                                        , "HEmpName": checkStatus.data[0].èååç§°
                                    })
                                    layer.close(index);//å³éå¼¹çª
                                }

 WebTM/views/¹¤×Ê¹ÜÀí/ºËËã·½Ê½/Gy_ClassTimePrjSubBillEdit.html

@@ -320,7 +320,7 @@
                    , area: ['90%', '90%']//å¤§å°
                    , title: 'æå±ç»åè¡¨'//æ é¢
                    , shift: 2//å¼¹åºå¨ç»
                    , content: ['../../Baseset/åºç¡èµæ/Gy_ClassTimePrjGroupList.html', 'yes']
                    , content: ['../../åºç¡èµæ/å·¥èµåºç¡èµæ/Gy_ClassTimePrjGroupList.html', 'yes']
                    , btn: ['ç¡®å®', 'åæ¶']
                    , btn1: function (index, layero) {//æé®ãæé®ä¸ãçåè°
                        var iframeWindow = window['layui-layer-iframe' + index]  //è·åå¼¹æ¡é¡µé¢
@@ -328,7 +328,7 @@
                        if (checkStatus.data.length === 0) {
                            return layer.msg('è¯·éæ©æ°æ®');
                        }
                        $("#HEntryName").val(checkStatus.data[0].HName);
                        $("#HEntryName").val(checkStatus.data[0].æ ¸ç®æ¹å¼ç»åç§°);
                        $("#HEntryID").val(checkStatus.data[0].HItemID);
                        //$("#HDeptNumber").val(checkStatus.data[0].HNumber);
                        layer.close(index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç

 WebTM/views/¹¤×Ê¹ÜÀí/°à×éÖ°Ô±Çåµ¥/Gy_GroupEmpBillEdit.html

@@ -338,7 +338,7 @@
                                shift: 2,
                                area: ['90%', '90%'],
                                maxmin: true,
                                content: ['../../../views/Baseset/åºç¡èµæ/Gy_EmployeeList.html', 'yes'],
                                content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_EmployeeList.html?Type=HEmpList', 'yes'],
                                btn: ['ç¡®å®', 'åæ¶']
                                , btn1: function (index, layero) {
                                    //æé®ãæé®ä¸ãçåè°
@@ -348,9 +348,9 @@
                                        return layer.msg('è¯·éæ©æ°æ®');
                                    }
                                    obj.update({
                                        HEmpName: checkStatus.data[0].HName
                                        , HEmpID: checkStatus.data[0].HItemID
                                        , HEmpNumber: checkStatus.data[0].HNumber
                                        "HEmpID": checkStatus.data[0].HItemID
                                        , "HEmpNumber": checkStatus.data[0].èåä»£ç 
                                        , "HEmpName": checkStatus.data[0].èååç§°
                                    });

                                    layer.close(layer.index);
@@ -445,7 +445,7 @@
                    shift: 2,
                    area: ['80%', '80%'],
                    maxmin: true,
                    content: ['../../../views/Baseset/åºç¡èµæ/Gy_GetProductionTeamList.html?Type=HGroupID', 'yes'],
                    content: ['../../åºç¡èµæ/å·¥èµåºç¡èµæ/Gy_Group.html?Type=HGroup', 'yes'],
                    btn: ['ç¡®å®', 'åæ¶']
                    , btn1: function (index, layero) {

@@ -455,7 +455,7 @@
                        if (checkStatus.data.length === 0) {
                            return layer.msg('è¯·éæ©æ°æ®');
                        }
                        $("#HGroupName").val(checkStatus.data[0].çç»);
                        $("#HGroupName").val(checkStatus.data[0].çç»åç§°);
                        $("#HGroupID").val(checkStatus.data[0].HItemID);
                        layer.close(layer.index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
                    }

 WebTM/views/¹¤×Ê¹ÜÀí/Çë¼ÙÉêÇë/Pay_OutApplyBill.html

@@ -779,7 +779,7 @@
                    , shift: 2                                          //å¼¹åºå¨ç»
                    , area: ["90%", "90%"]                              //çªä½å¤§å°
                    , maxmin: true                                      //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
                    , content: ["../../../views/Baseset/åºç¡èµæ/Gy_DepartmentList.html?Type=HDeptID", "yes"]
                    , content: ["../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_DepartmentList.html", "yes"]
                    , btn: ["ç¡®å®", "åæ¶"]
                    , btn1: function (index, laero) {
                        //æé®ä¸  çåè°
@@ -791,7 +791,7 @@
                        }

                        $("#HDeptID").val(checkStatus.data[0].HItemID);//åç 
                        $("#HDeptName").val(checkStatus.data[0].HName);//åç§°
                        $("#HDeptName").val(checkStatus.data[0].é¨é¨åç§°);//åç§°
                        layer.close(index);//å³éå¼¹çª
                    }
                    , btn2: function (index, layero) { }
@@ -810,7 +810,7 @@
                    , shift: 2                                          //å¼¹åºå¨ç»
                    , area: ["90%", "90%"]                              //çªä½å¤§å°
                    , maxmin: true                                      //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
                    , content: ["../../../views/Baseset/åºç¡èµæ/Gy_EmployeeList.html?Type=HEmpID", "yes"]
                    , content: ["../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_EmployeeList.html?Type=HEmpID", "yes"]
                    , btn: ["ç¡®å®", "åæ¶"]
                    , btn1: function (index, laero) {
                        //æé®ä¸  çåè°
@@ -822,7 +822,7 @@
                        }

                        $("#HMangerID").val(checkStatus.data[0].HItemID);//åç 
                        $("#HMangerName").val(checkStatus.data[0].HName);//åç§°
                        $("#HMangerName").val(checkStatus.data[0].èååç§°);//åç§°
                        layer.close(index);//å³éå¼¹çª
                    }
                    , btn2: function (index, layero) { }
@@ -1169,7 +1169,7 @@
                                , shift: 2                                          //å¼¹åºå¨ç»
                                , area: ["90%", "90%"]                              //çªä½å¤§å°
                                , maxmin: true                                      //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
                                , content: ["../../Baseset/åºç¡èµæ/Gy_EmployeeList.html", "yes"]
                                , content: ["../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_EmployeeList.html?Type=HManager", "yes"]
                                , btn: ["ç¡®å®", "åæ¶"]
                                , btn1: function (index, laero) {
                                    //æé®ä¸  çåè°
@@ -1181,30 +1181,30 @@
                                    }

                                    var HEmpID = checkStatus.data[0].HItemID;
                                    var HEmpNumber = checkStatus.data[0].HNumber;
                                    var HEmpName = checkStatus.data[0].HName;
                                    var HShifts = getHShifts_BasedHEmpID(HEmpID);
                                    if (HShifts.count == 1) {
                                        var HShiftsID = HShifts.HShiftsID;
                                        var HShiftsNumber = HShifts.HShiftsNumber;
                                        var HShiftsName = HShifts.HShiftsName;
                                    var HEmpNumber = checkStatus.data[0].èååç§°;
                                    var HEmpName = checkStatus.data[0].èåä»£ç ;
                                    /*var HShifts = getHShifts_BasedHEmpID(HEmpID);*/
                                    //if (HShifts.count == 1) {
                                    //    var HShiftsID = HShifts.HShiftsID;
                                    //    var HShiftsNumber = HShifts.HShiftsNumber;
                                    //    var HShiftsName = HShifts.HShiftsName;
                                    //    //æ´æ°è¡¨æ ¼ç¼åçæ°æ®
                                    //    obj.update({
                                    //        "HEmpID": checkStatus.data[0].HItemID
                                    //        , "HEmpNumber": checkStatus.data[0].èååç§°
                                    //        , "HEmpName": checkStatus.data[0].èåä»£ç 
                                    //        , "HShiftsID": HShiftsID
                                    //        , "HShiftsNumber": HShiftsNumber
                                    //        , "HShiftsName": HShiftsName
                                    //    })
                                    //} else {
                                        //æ´æ°è¡¨æ ¼ç¼åçæ°æ®
                                        obj.update({
                                            "HEmpID": checkStatus.data[0].HItemID
                                            , "HEmpNumber": checkStatus.data[0].HNumber
                                            , "HEmpName": checkStatus.data[0].HName
                                            , "HShiftsID": HShiftsID
                                            , "HShiftsNumber": HShiftsNumber
                                            , "HShiftsName": HShiftsName
                                            , "HEmpNumber": checkStatus.data[0].èåä»£ç 
                                            , "HEmpName": checkStatus.data[0].èååç§°
                                        })
                                    } else {
                                        //æ´æ°è¡¨æ ¼ç¼åçæ°æ®
                                        obj.update({
                                            "HEmpID": checkStatus.data[0].HItemID
                                            , "HEmpNumber": checkStatus.data[0].HNumber
                                            , "HEmpName": checkStatus.data[0].HName
                                        })
                                    }
                                    
                                    layer.close(index);//å³éå¼¹çª
                                }
                            })

			@@ -170,7 +170,7 @@
			soulTable.render(this);
			}
			, cols: [[
			{ type: 'radio', fixed: 'left' }
			{ type: 'checkbox', fixed: 'left' }
			, { field: 'HItemID', title: 'HItemID', sort: true, hide: true }
			, { field: 'æ£è¡¥èµæä»£ç ', title: 'æ£è¡¥èµæä»£ç ', sort: true }
			, { field: 'æ£è¡¥èµæåç§°', title: 'æ£è¡¥èµæåç§°', sort: true}

			@@ -753,7 +753,7 @@
			, shift: 2 //å¼¹åºå¨ç»
			, area: ["90%", "90%"] //çªä½å¤§å°
			, maxmin: true //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
			, content: ["../../../views/Baseset/åºç¡èµæ/Gy_DepartmentList.html?Type=HDeptID", "yes"]
			, content: ["../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_DepartmentList.html", "yes"]
			, btn: ["ç¡®å®", "åæ¶"]
			, btn1: function (index, laero) {
			//æé®ä¸ çåè°
			@@ -765,7 +765,7 @@
			}

			$("#HDeptID").val(checkStatus.data[0].HItemID);//åç
			$("#HDeptName").val(checkStatus.data[0].HName);//åç§°
			$("#HDeptName").val(checkStatus.data[0].é¨é¨åç§°);//åç§°
			layer.close(index);//å³éå¼¹çª
			}
			, btn2: function (index, layero) { }
			@@ -784,7 +784,7 @@
			, shift: 2 //å¼¹åºå¨ç»
			, area: ["90%", "90%"] //çªä½å¤§å°
			, maxmin: true //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
			, content: ["../../../views/Baseset/åºç¡èµæ/Gy_EmployeeList.html?Type=HEmpID", "yes"]
			, content: ["../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_EmployeeList.html?Type=HManager", "yes"]
			, btn: ["ç¡®å®", "åæ¶"]
			, btn1: function (index, laero) {
			//æé®ä¸ çåè°
			@@ -796,7 +796,7 @@
			}

			$("#HMangerID").val(checkStatus.data[0].HItemID);//åç
			$("#HMangerName").val(checkStatus.data[0].HName);//åç§°
			$("#HMangerName").val(checkStatus.data[0].èååç§°);//åç§°
			layer.close(index);//å³éå¼¹çª
			}
			, btn2: function (index, layero) { }
			@@ -1110,7 +1110,7 @@
			, shift: 2 //å¼¹åºå¨ç»
			, area: ["90%", "90%"] //çªä½å¤§å°
			, maxmin: true //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
			, content: ["../../Baseset/åºç¡èµæ/Gy_EmployeeList.html", "yes"]
			, content: ["../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_EmployeeList.html?", "yes"]
			, btn: ["ç¡®å®", "åæ¶"]
			, btn1: function (index, laero) {
			//æé®ä¸ çåè°
			@@ -1123,8 +1123,8 @@
			//æ´æ°è¡¨æ ¼ç¼åçæ°æ®
			obj.update({
			"HEmpID": checkStatus.data[0].HItemID
			, "HEmpNumber": checkStatus.data[0].HNumber
			, "HEmpName": checkStatus.data[0].HName
			, "HEmpNumber": checkStatus.data[0].èåä»£ç
			, "HEmpName": checkStatus.data[0].èååç§°
			})
			layer.close(index);//å³éå¼¹çª
			}

			@@ -667,7 +667,7 @@
			, shift: 2 //å¼¹åºå¨ç»
			, area: ["90%", "90%"] //çªä½å¤§å°
			, maxmin: true //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
			, content: ["../../../views/Baseset/åºç¡èµæ/Gy_DepartmentList.html?Type=HDeptID", "yes"]
			, content: ["../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_DepartmentList.html", "yes"]
			, btn: ["ç¡®å®", "åæ¶"]
			, btn1: function (index, laero) {
			//æé®ä¸ çåè°
			@@ -679,7 +679,7 @@
			}

			$("#HDeptID").val(checkStatus.data[0].HItemID);//åç
			$("#HDeptName").val(checkStatus.data[0].HName);//åç§°
			$("#HDeptName").val(checkStatus.data[0].é¨é¨åç§°);//åç§°
			layer.close(index);//å³éå¼¹çª
			}
			, btn2: function (index, layero) { }
			@@ -1058,7 +1058,7 @@
			, shift: 2 //å¼¹åºå¨ç»
			, area: ["90%", "90%"] //çªä½å¤§å°
			, maxmin: true //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
			, content: ["../../../views/Baseset/åºç¡èµæ/Gy_MaterialList.html", "yes"]
			, content: ["../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_Material.html?", "yes"]
			, btn: ["ç¡®å®", "åæ¶"]
			, btn1: function (index, laero) {
			//æé®ä¸ çåè°
			@@ -1068,6 +1068,7 @@
			if (checkStatus.data.length != 1) {
			return layer.msg("è¯·éæ©ä¸æ¡æ°æ®");
			}
			OptionData = checkStatus.data[0];
			//è·åå·¥ä»·
			var HMaterID = checkStatus.data[0].HItemID;
			var HProcID = obj.data.hasOwnProperty("HProcID") ? obj.data.HProcID + "" : "0";
			@@ -1077,18 +1078,18 @@
			if (HOldPrice != -1) {
			//æ´æ°è¡¨æ ¼ç¼åçæ°æ®
			obj.update({
			"HMaterID": checkStatus.data[0].HItemID
			, "HMaterNumber": checkStatus.data[0].HNumber
			, "HMaterName": checkStatus.data[0].HName
			, "HMaterModel": checkStatus.data[0].HModel
			"HMaterID": OptionData.HItemID
			, "HMaterNumber": OptionData.ç©æä»£ç
			, "HMaterName": OptionData.ç©æåç§°
			, "HMaterModel": OptionData.è§æ ¼åå·
			, "HOldPrice": HOldPrice
			})
			} else {
			obj.update({
			"HMaterID": checkStatus.data[0].HItemID
			, "HMaterNumber": checkStatus.data[0].HNumber
			, "HMaterName": checkStatus.data[0].HName
			, "HMaterModel": checkStatus.data[0].HModel
			"HMaterID": OptionData.HItemID
			, "HMaterNumber": OptionData.ç©æä»£ç
			, "HMaterName": OptionData.ç©æåç§°
			, "HMaterModel": OptionData.è§æ ¼åå·
			})
			}
			layer.close(index);//å³éå¼¹çª
			@@ -1106,7 +1107,7 @@
			, shift: 2 //å¼¹åºå¨ç»
			, area: ["90%", "90%"] //çªä½å¤§å°
			, maxmin: true //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
			, content: ["../../../views/Baseset/åºç¡èµæ/Gy_ProcList.html", "yes"]
			, content: ["../../åºç¡èµæ/çäº§åºç¡èµæ/Gy_Process.html", "yes"]
			, btn: ["ç¡®å®", "åæ¶"]
			, btn1: function (index, laero) {
			//æé®ä¸ çåè°
			@@ -1116,6 +1117,7 @@
			if (checkStatus.data.length != 1) {
			return layer.msg("è¯·éæ©ä¸æ¡æ°æ®");
			}
			OptionData = checkStatus.data[0];
			//è·åå·¥ä»·
			var HMaterID = obj.data.hasOwnProperty("HMaterID") ? obj.data.HMaterID + "" : "0";
			var HProcID = checkStatus.data[0].HItemID;
			@@ -1127,14 +1129,14 @@
			obj.update({
			"HProcID": checkStatus.data[0].HItemID
			, "HProcNumber": checkStatus.data[0].å·¥åºä»£ç
			, "HProcName": checkStatus.data[0].å·¥åº
			, "HProcName": checkStatus.data[0].å·¥åºåç§°
			, "HOldPrice": HOldPrice
			})
			} else {
			obj.update({
			"HProcID": checkStatus.data[0].HItemID
			, "HProcNumber": checkStatus.data[0].å·¥åºä»£ç
			, "HProcName": checkStatus.data[0].å·¥åº
			, "HProcName": checkStatus.data[0].å·¥åºåç§°
			})
			}
			layer.close(index);//å³éå¼¹çª
			@@ -1152,7 +1154,7 @@
			, shift: 2 //å¼¹åºå¨ç»
			, area: ["90%", "90%"] //çªä½å¤§å°
			, maxmin: true //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
			, content: ["../../../views/åºç¡èµæ/çäº§åºç¡èµæ/Gy_Source.html", "yes"]
			, content: ["../../åºç¡èµæ/çäº§åºç¡èµæ/Gy_Source.html", "yes"]
			, btn: ["ç¡®å®", "åæ¶"]
			, btn1: function (index, laero) {
			//æé®ä¸ çåè°

			@@ -553,11 +553,11 @@
			, { type: 'numbers', title: 'åºå·' }
			, { field: 'RowID', title: 'è¡å·', hide: true } //è¡æ è¯ï¼ç¨äºä¸ä¸è¡ãä¸ä¸è¡è¯å«æå¨è¡
			, { field: 'HEmpID', title: 'èåID', hide: true }
			, { field: 'HEmpNumber', title: 'èåä»£ç ', event: "HEmpNumber" } //f7
			, { field: 'HEmpNumber', title: 'èåä»£ç ', edit: 'text', event: "HEmpNumber" } //f7
			, { field: 'HEmpName', title: 'èååç§°' }
			, { field: 'HEmpType', title: 'å·¥èµç±»å' }
			, { field: 'HPostID', title: 'å²ä½ID', hide: true }
			, { field: 'HPostNumber', title: 'å²ä½ä»£ç ' }
			, { field: 'HPostID', title: 'å²ä½ID', hide: true }
			, { field: 'HPostNumber', title: 'å²ä½ä»£ç '}
			, { field: 'HPostName', title: 'å²ä½åç§°' }
			, { field: 'HPiecePay', title: 'è®¡ä»¶å·¥èµ', totalRow: true }
			, { field: 'HTimesPay', title: 'è®¡æ¶å·¥èµ', event: "HTimesPay", totalRow: true }
			@@ -665,7 +665,7 @@
			, shift: 2 //å¼¹åºå¨ç»
			, area: ["90%", "90%"] //çªä½å¤§å°
			, maxmin: true //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
			, content: ["../../../views/Baseset/åºç¡èµæ/Gy_DepartmentList.html?Type=HDeptID", "yes"]
			, content: ["../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_DepartmentList.html", "yes"]
			, btn: ["ç¡®å®", "åæ¶"]
			, btn1: function (index, laero) {
			//æé®ä¸ çåè°
			@@ -677,7 +677,7 @@
			}

			$("#HDeptID").val(checkStatus.data[0].HItemID);//åç
			$("#HDeptName").val(checkStatus.data[0].HName);//åç§°
			$("#HDeptName").val(checkStatus.data[0].é¨é¨åç§°);//åç§°
			layer.close(index);//å³éå¼¹çª
			}
			, btn2: function (index, layero) { }
			@@ -971,7 +971,7 @@
			, shift: 2 //å¼¹åºå¨ç»
			, area: ["90%", "90%"] //çªä½å¤§å°
			, maxmin: true //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
			, content: ["../../Baseset/åºç¡èµæ/Gy_EmployeeList.html", "yes"]
			, content: ["../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_EmployeeList.html", "yes"]
			, btn: ["ç¡®å®", "åæ¶"]
			, btn1: function (index, laero) {
			//æé®ä¸ çåè°
			@@ -984,8 +984,11 @@
			//æ´æ°è¡¨æ ¼ç¼åçæ°æ®
			obj.update({
			"HEmpID": checkStatus.data[0].HItemID
			, "HEmpNumber": checkStatus.data[0].HNumber
			, "HEmpName": checkStatus.data[0].HName
			, "HEmpNumber": checkStatus.data[0].èåä»£ç
			, "HEmpName": checkStatus.data[0].èååç§°
			, "HPostID": checkStatus.data[0].HPostID
			, "HPostNumber": checkStatus.data[0].å²ä½ä»£ç
			, "HPostName": checkStatus.data[0].å²ä½åç§°
			})
			layer.close(index);//å³éå¼¹çª
			}
			@@ -1004,36 +1007,36 @@
			function openDetailTouchedByDblclick(obj) {
			$(document).off('dblclick', ".layui-table").on('dblclick', '.layui-table', function (e) {
			//èå
			if (obj.event == "HTimesPay") {
			//æå¼èåå°çªä½
			layer.open({
			type: 2
			, skin: "layui-layer-rim" //å ä¸è¾¹æ¡
			, title: "èååè¡¨" //æ é¢
			, closeBtn: 1 //çªä½å³ä¸è§å³é ç æ ·å¼
			, shift: 2 //å¼¹åºå¨ç»
			, area: ["90%", "90%"] //çªä½å¤§å°
			, maxmin: true //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
			, content: ["../../Baseset/åºç¡èµæ/Gy_EmployeeList.html", "yes"]
			, btn: ["ç¡®å®", "åæ¶"]
			, btn1: function (index, laero) {
			//æé®ä¸ çåè°
			var iframeWindow = window["layui-layer-iframe" + index];//è·åå¼¹æ¡é¡µé¢
			var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//è·åéä¸çæ°æ®
			//if (obj.event == "HTimesPay") {
			// //æå¼èåå°çªä½
			// layer.open({
			// type: 2
			// , skin: "layui-layer-rim" //å ä¸è¾¹æ¡
			// , title: "èååè¡¨" //æ é¢
			// , closeBtn: 1 //çªä½å³ä¸è§å³é ç æ ·å¼
			// , shift: 2 //å¼¹åºå¨ç»
			// , area: ["90%", "90%"] //çªä½å¤§å°
			// , maxmin: true //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
			// , content: ["../../Baseset/åºç¡èµæ/Gy_EmployeeList.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("è¯·éæ©ä¸æ¡æ°æ®");
			}
			//æ´æ°è¡¨æ ¼ç¼åçæ°æ®
			obj.update({
			"HEmpID": checkStatus.data[0].HItemID
			, "HEmpNumber": checkStatus.data[0].HNumber
			, "HEmpName": checkStatus.data[0].HName
			})
			layer.close(index);//å³éå¼¹çª
			}
			})
			}
			// if (checkStatus.data.length != 1) {
			// return layer.msg("è¯·éæ©ä¸æ¡æ°æ®");
			// }
			// //æ´æ°è¡¨æ ¼ç¼åçæ°æ®
			// obj.update({
			// "HEmpID": checkStatus.data[0].HItemID
			// , "HEmpNumber": checkStatus.data[0].HNumber
			// , "HEmpName": checkStatus.data[0].HName
			// })
			// layer.close(index);//å³éå¼¹çª
			// }
			// })
			//}
			obj.event = "";
			return false;
			})

			@@ -332,8 +332,8 @@
			, { field: 'HEmpName', title: 'èååç§°', width: 100, style: 'background-color: #f9f9f9;' }
			, { field: 'HMaterID', title: 'HMaterID', edit: 'text', width: 100, hide: true, style: 'background-color: #f9f9f9;' }
			, { field: 'HMaterNumber', title: 'ç©æä»£ç ', edit: 'text', event: 'HMaterNumber', width: 100 }
			, { field: 'HMaterName', title: 'ç©æåç§°', width: 300, style: 'background-color: #f9f9f9;' }
			, { field: 'HMaterModel', title: 'è§æ ¼åå·', width: 200, style: 'background-color: #f9f9f9;' }
			, { field: 'HMaterName', title: 'ç©æåç§°', width: 100, style: 'background-color: #f9f9f9;' }
			, { field: 'HMaterModel', title: 'è§æ ¼åå·', width: 100, style: 'background-color: #f9f9f9;' }
			, { field: 'HProcID', title: 'HProcID', edit: 'text', width: 100, hide: true, style: 'background-color: #f9f9f9;' }
			, { field: 'HProcNumber', title: 'å·¥åºä»£ç ', edit: 'text', event: "HProcNumber", width: 100 }
			, { field: 'HProcName', title: 'å·¥åºåç§°', width: 100, style: 'background-color: #f9f9f9;' }
			@@ -357,7 +357,7 @@
			$("#HMaker").val(sessionStorage["HUserName"]);
			//åå§å è½½è¡¨æ ¼{ "ID": 0, "HWasterReasonName": " ","HBadReasonID":0,"HEmpName": " ", "HSQProcName": " ","HProcID":0, "HZRProcName": " ", "HMRBChecker": " ", "HRemark": " ", "HPSProcName": " ", "HCloseMan": " " }
			option.data = [{
			"HEmpID": "", "HEmpNumber": "", "HEmpName": "", "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HProcID": "", "HProcNumber": "", "HProcName": ""
			"HEmpID": "", "HEmpNumber": "", "HEmpName": "", "HMaterID": 0, "HMaterNumber": "", "HMaterName": "", "HMaterModel": "", "HProcID": "", "HProcNumber": "", "HProcName": ""
			, "HTimes": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HRemark": ""
			, "HMainSourceInterID": 0, "HMainSourceEntryID": 0, "HMainSourceBillNo": 0, "HSourceBillType": "", "HCloseDate": 0
			}];
			@@ -398,7 +398,7 @@
			, data = checkStatus.data;;
			var AddRow = table.cache['mainTable'];
			var NewRow = {
			"HEmpID": "", "HEmpNumber": "", "HEmpName": "","HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "","HProcID":0, "HProcNumber": "", "HProcName": ""
			"HEmpID": "", "HEmpNumber": "", "HEmpName": "","HMaterID": 0, "HMaterNumber": "", "HMaterName": "", "HMaterModel": "","HProcID":0, "HProcNumber": "", "HProcName": ""
			, "HTimes": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HRemark": ""
			, "HMainSourceInterID": 0, "HMainSourceEntryID": 0, "HMainSourceBillNo": 0, "HSourceBillType": "", "HCloseDate": 0
			};
			@@ -450,7 +450,6 @@
			}
			});
			}

			$(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
			if (event.key == "F7") {
			if (obj.event === 'HEmpCheck') //èå
			@@ -463,7 +462,7 @@
			shift: 2,
			area: ['90%', '90%'],
			maxmin: true,
			content: ['../../../views/Baseset/åºç¡èµæ/Gy_EmployeeList.html', 'yes'],
			content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_EmployeeList.html?Type=HEmpList', 'yes'],
			btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {
			//æé®ãæé®ä¸ãçåè°
			@@ -472,23 +471,29 @@
			if (checkStatus.data.length === 0) {
			return layer.msg('è¯·éæ©æ°æ®');
			}
			OptionData = checkStatus.data[0];
			//æ´æ°è¡¨æ ¼ç¼åçæ°æ®
			obj.update({
			HEmpName: checkStatus.data[0].HName
			, HEmpID: checkStatus.data[0].HItemID
			, HEmpNumber: checkStatus.data[0].HNumber
			});
			"HEmpID": checkStatus.data[0].HItemID
			, "HEmpNumber": checkStatus.data[0].èåä»£ç
			, "HEmpName": checkStatus.data[0].èååç§°
			})

			layer.close(layer.index);
			}
			, btn2: function (index, layero) {
			},
			end: function () {

			obj.update({
			"HEmpID": OptionData.HItemID
			, "HEmpNumber": OptionData.èåä»£ç
			, "HEmpName": OptionData.èååç§°
			})
			}
			});
			}

			if (obj.event === 'HMaterCode') //ç©æä»£ç
			if (obj.event === 'HMaterNumber') //ç©æä»£ç
			{
			//é¡µé¢å±-èªå®ä¹
			layer.open({
			@@ -499,7 +504,7 @@
			shift: 2,
			area: ['80%', '80%'],
			maxmin: true,
			content: ['../../../views/Baseset/åºç¡èµæ/Gy_MaterialList.html', 'yes'],
			content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_Material.html?', 'yes'],
			btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {

			@@ -509,15 +514,15 @@
			if (checkStatus.data.length === 0) {
			return layer.msg('è¯·éæ©æ°æ®');
			}

			OptionData = checkStatus.data[0];
			//åæ¥æ´æ°è¡¨æ ¼åç¼åå¯¹åºçå¼
			obj.update({
			HMaterID: checkStatus.data[0].HItemID,
			HMaterCode: checkStatus.data[0].HNumber,
			HMaterName: checkStatus.data[0].HName,
			HMaterSpec: checkStatus.data[0].HModel,
			HQty: 1, //å®æ¶æ°é
			HMoney: 0, //éé¢
			"HMaterID": checkStatus.data[0].HItemID
			, "HMaterNumber": checkStatus.data[0].ç©æä»£ç
			, "HMaterName": checkStatus.data[0].ç©æåç§°
			, "HMaterModel": checkStatus.data[0].è§æ ¼åå·
			, "HQty": 1 //å®æ¶æ°é
			, "HMoney": 0 //éé¢
			});
			$.ajax({
			url: GetWEBURL() + "Pay_OtherBalBill/getOtherBalBillPrice",
			@@ -532,8 +537,8 @@

			} else {
			obj.update({
			HPrice: result.data[0].åä»·
			,HMoney: obj.data.HQty * result.data[0].åä»·
			"HPrice": result.data[0].åä»·
			,"HMoney": obj.data.HQty * result.data[0].åä»·
			});
			}
			}
			@@ -548,7 +553,7 @@
			//return false å¼å¯è¯¥ä»£ç å¯ç¦æ¢ç¹å»è¯¥æé®å³é
			},
			end: function () {


			}
			});
			}
			@@ -563,7 +568,7 @@
			shift: 2,
			area: ['90%', '90%'],
			maxmin: true,
			content: ['../../../views/Baseset/åºç¡èµæ/Gy_ProcList.html', 'yes'],
			content: ['../../åºç¡èµæ/çäº§åºç¡èµæ/Gy_Process.html', 'yes'],
			btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {
			//æé®ãæé®ä¸ãçåè°
			@@ -573,10 +578,11 @@
			return layer.msg('è¯·éæ©æ°æ®');
			}
			obj.update({
			HProcName: checkStatus.data[0].å·¥åº
			HProcName: checkStatus.data[0].å·¥åºåç§°
			, HProcID: checkStatus.data[0].HItemID
			, HProcNumber: checkStatus.data[0].å·¥åºä»£ç
			});
			OptionData = checkStatus.data[0];
			$.ajax({
			url: GetWEBURL() + "Pay_OtherBalBill/getOtherBalBillPrice",
			type: "GET",
			@@ -604,7 +610,11 @@
			, btn2: function (index, layero) {
			},
			end: function () {

			obj.update({
			"HProcID": OptionData.HItemID
			, "HProcNumber": OptionData.å·¥åºä»£ç
			, "HProcName": OptionData.å·¥åºåç§°
			})
			}
			});
			}
			@@ -744,7 +754,7 @@
			shift: 2,
			area: ['80%', '80%'],
			maxmin: true,
			content: ['../../../views/Baseset/åºç¡èµæ/Gy_GetProductionTeamList.html?Type=HGroupID', 'yes'],
			content: ['../../åºç¡èµæ/å·¥èµåºç¡èµæ/Gy_Group.html?Type=HGroup', 'yes'],
			btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {

			@@ -754,7 +764,7 @@
			if (checkStatus.data.length === 0) {
			return layer.msg('è¯·éæ©æ°æ®');
			}
			$("#HGroupName").val(checkStatus.data[0].çç»);
			$("#HGroupName").val(checkStatus.data[0].çç»åç§°);
			$("#HGroupID").val(checkStatus.data[0].HItemID);
			layer.close(layer.index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			}
			@@ -782,7 +792,7 @@
			shift: 2,
			area: ['80%', '80%'],
			maxmin: true,
			content: ['../../../views/Baseset/åºç¡èµæ/Gy_EmployeeList.html?Type=HEmpID', 'yes'],
			content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_EmployeeList.html?Type=HManager', 'yes'],
			btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {

			@@ -792,7 +802,7 @@
			if (checkStatus.data.length === 0) {
			return layer.msg('è¯·éæ©æ°æ®');
			}
			$("#HEmpName").val(checkStatus.data[0].HName);
			$("#HEmpName").val(checkStatus.data[0].èååç§°);
			$("#HEmpID").val(checkStatus.data[0].HItemID);
			layer.close(layer.index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			}
			@@ -820,7 +830,7 @@
			shift: 2,
			area: ['80%', '80%'],
			maxmin: true,
			content: ['../../../views/Baseset/åºç¡èµæ/Gy_DepartmentList.html?Type=HDeptID', 'yes'],
			content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_DepartmentList.html', 'yes'],
			btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {

			@@ -830,7 +840,7 @@
			if (checkStatus.data.length === 0) {
			return layer.msg('è¯·éæ©æ°æ®');
			}
			$("#HDeptName").val(checkStatus.data[0].HName);
			$("#HDeptName").val(checkStatus.data[0].é¨é¨åç§°);
			$("#HDeptID").val(checkStatus.data[0].HItemID);
			layer.close(layer.index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			}
			@@ -858,7 +868,7 @@
			shift: 2,
			area: ['80%', '80%'],
			maxmin: true,
			content: ['../../../views/å·¥èµç®¡ç/Gy_WorkPayTypeBillList.html?Type=HPayType', 'yes'],
			content: ['../../åºç¡èµæ/å·¥èµåºç¡èµæ/Gy_WorkPayTypeList.html?Type=HWorkPayType&OperationType=2', 'yes'],
			btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {

			@@ -1034,26 +1034,25 @@
			//æå¼é¨é¨å°çªä½
			layer.open({
			type: 2
			, skin: "layui-layer-rim" //å ä¸è¾¹æ¡
			, title: "é¨é¨åè¡¨" //æ é¢
			, closeBtn: 1 //çªä½å³ä¸è§å³é ç æ ·å¼
			, shift: 2 //å¼¹åºå¨ç»
			, area: ["90%", "90%"] //çªä½å¤§å°
			, maxmin: true //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
			, content: ["../../../views/Baseset/åºç¡èµæ/Gy_DepartmentList.html?Type=HDeptID", "yes"]
			, 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");//è·åéä¸çæ°æ®
			var iframeWindow = window["layui-layer-iframe" + index]; //è·åå¼¹æ¡é¡µé¢
			var checkStatus = iframeWindow.layui.table.checkStatus("mainTable"); //è·åéä¸çæ°æ®

			if (checkStatus.data.length != 1) {
			return layer.msg("è¯·éæ©ä¸æ¡æ°æ®");
			}

			$("#HDeptID").val(checkStatus.data[0].HItemID);//åç
			$("#HDeptName").val(checkStatus.data[0].HName);//åç§°
			layer.close(index);//å³éå¼¹çª
			$("#HDeptName").val(checkStatus.data[0].é¨é¨åç§°);
			$("#HDeptID").val(checkStatus.data[0].HItemID);
			layer.close(index); //å³éå¼¹çª å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			}
			, btn2: function (index, layero) { }
			})
			@@ -1664,7 +1663,7 @@
			, shift: 2 //å¼¹åºå¨ç»
			, area: ["90%", "90%"] //çªä½å¤§å°
			, maxmin: true //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
			, content: ["../../../views/Baseset/åºç¡èµæ/Gy_ProcList.html", "yes"]
			, content: ["../../åºç¡èµæ/çäº§åºç¡èµæ/Gy_Process.html", "yes"]
			, btn: ["ç¡®å®", "åæ¶"]
			, btn1: function (index, laero) {
			//æé®ä¸ çåè°
			@@ -1687,7 +1686,7 @@
			obj.update({
			"HProcID": checkStatus.data[0].HItemID
			, "HProcNumber": checkStatus.data[0].å·¥åºä»£ç
			, "HProcName": checkStatus.data[0].å·¥åº
			, "HProcName": checkStatus.data[0].å·¥åºåç§°
			, "HPrice": HPrice
			, "HMoney": HMoney
			})
			@@ -1695,7 +1694,7 @@
			obj.update({
			"HProcID": checkStatus.data[0].HItemID
			, "HProcNumber": checkStatus.data[0].å·¥åºä»£ç
			, "HProcName": checkStatus.data[0].å·¥åº
			, "HProcName": checkStatus.data[0].å·¥åºåç§°
			, "HPrice": 0
			, "HMoney": 0
			})
			@@ -2214,7 +2213,10 @@


			});

			function GetProcessValue(data) //è¿åå·¥åº
			{
			OptionData = data
			}

			</script>
			</body>

			@@ -97,7 +97,7 @@
			shift: 2,
			area: ['80%', '80%'],
			maxmin: true,
			content: ['../../PublicPage/DeptInformation.html', 'yes'],
			content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_DepartmentList.html', 'yes'],
			btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {

			@@ -107,7 +107,7 @@
			if (checkStatus.data.length === 0) {
			return layer.msg('è¯·éæ©æ°æ®');
			}
			$("#HDeptName").val(checkStatus.data[0].HName);
			$("#HDeptName").val(checkStatus.data[0].é¨é¨åç§°);
			$("#HDeptID").val(checkStatus.data[0].HItemID);
			layer.close(layer.index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			}

			@@ -803,7 +803,7 @@
			, shift: 2 //å¼¹åºå¨ç»
			, area: ["90%", "90%"] //çªä½å¤§å°
			, maxmin: true //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
			, content: ["../../../views/Baseset/åºç¡èµæ/Gy_DepartmentList.html?Type=HDeptID", "yes"]
			, content: ["../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_DepartmentList.html", "yes"]
			, btn: ["ç¡®å®", "åæ¶"]
			, btn1: function (index, laero) {
			//æé®ä¸ çåè°
			@@ -814,8 +814,8 @@
			return layer.msg("è¯·éæ©ä¸æ¡æ°æ®");
			}

			$("#HDeptID").val(checkStatus.data[0].HItemID);//åç
			$("#HDeptName").val(checkStatus.data[0].HName);//åç§°
			$("#HDeptName").val(checkStatus.data[0].é¨é¨åç§°);
			$("#HDeptID").val(checkStatus.data[0].HItemID);
			layer.close(index);//å³éå¼¹çª
			}
			, btn2: function (index, layero) { }
			@@ -834,7 +834,7 @@
			, shift: 2 //å¼¹åºå¨ç»
			, area: ["90%", "90%"] //çªä½å¤§å°
			, maxmin: true //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
			, content: ["../../../views/Baseset/åºç¡èµæ/Gy_GetProductionTeamList.html?Type=HGroupID", "yes"]
			, content: ["../../åºç¡èµæ/å·¥èµåºç¡èµæ/Gy_Group.html?Type=HGroup", "yes"]
			, btn: ["ç¡®å®", "åæ¶"]
			, btn1: function (index, laero) {
			//æé®ä¸ çåè°
			@@ -846,7 +846,7 @@
			}

			$("#HGroupID").val(checkStatus.data[0].HItemID);//åç
			$("#HGroupName").val(checkStatus.data[0].çç»);//åç§°
			$("#HGroupName").val(checkStatus.data[0].çç»åç§°);//åç§°
			layer.close(index);//å³éå¼¹çª
			}
			, btn2: function (index, layero) { }
			@@ -865,7 +865,7 @@
			, shift: 2 //å¼¹åºå¨ç»
			, area: ["90%", "90%"] //çªä½å¤§å°
			, maxmin: true //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
			, content: ["../../../views/Baseset/åºç¡èµæ/Gy_EmployeeList.html?Type=HEmpID", "yes"]
			, content: ["../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_EmployeeList.html?Type=HManager", "yes"]
			, btn: ["ç¡®å®", "åæ¶"]
			, btn1: function (index, laero) {
			//æé®ä¸ çåè°
			@@ -877,7 +877,7 @@
			}

			$("#HMangerID").val(checkStatus.data[0].HItemID);//åç
			$("#HMangerName").val(checkStatus.data[0].HName);//åç§°
			$("#HMangerName").val(checkStatus.data[0].èååç§°);//åç§°
			layer.close(index);//å³éå¼¹çª
			}
			, btn2: function (index, layero) { }
			@@ -896,7 +896,7 @@
			, shift: 2 //å¼¹åºå¨ç»
			, area: ["90%", "90%"] //çªä½å¤§å°
			, maxmin: true //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
			, content: ["../../../views/Baseset/åºç¡èµæ/Gy_MaterialList.html", "yes"]
			, content: ["../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_Material.html?", "yes"]
			, btn: ["ç¡®å®", "åæ¶"]
			, btn1: function (index, laero) {
			//æé®ä¸ çåè°
			@@ -908,7 +908,7 @@
			}

			$("#HMaterID").val(checkStatus.data[0].HItemID);//åç
			$("#HMaterName").val(checkStatus.data[0].HName);//åç§°
			$("#HMaterName").val(checkStatus.data[0].ç©æåç§°);//åç§°
			layer.close(index);//å³éå¼¹çª
			}
			})
			@@ -1382,7 +1382,7 @@
			, shift: 2 //å¼¹åºå¨ç»
			, area: ["90%", "90%"] //çªä½å¤§å°
			, maxmin: true //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
			, content: ["../../Baseset/åºç¡èµæ/Gy_EmployeeList.html", "yes"]
			, content: ["../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_EmployeeList.html?", "yes"]
			, btn: ["ç¡®å®", "åæ¶"]
			, btn1: function (index, laero) {
			//æé®ä¸ çåè°
			@@ -1403,8 +1403,8 @@
			success: function (result) {
			if (result.code == 1) { // è¯´æéªè¯æåäºï¼
			var HEmpID = checkStatus.data[0].HItemID;
			var HEmpNumber = checkStatus.data[0].HNumber;
			var HEmpName = checkStatus.data[0].HName;
			var HEmpNumber = checkStatus.data[0].èåä»£ç ;
			var HEmpName = checkStatus.data[0].èååç§°;
			var HWorkTypeID = result.data[0]["HWorkTypeID"];
			var HWorkTypeNumber = result.data[0]["HWorkTypeNumber"];
			var HWorkTypeName = result.data[0]["HWorkTypeName"];

			@@ -606,7 +606,7 @@
			, shift: 2 //å¼¹åºå¨ç»
			, area: ["90%", "90%"] //çªä½å¤§å°
			, maxmin: true //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
			, content: ["../../../views/Baseset/åºç¡èµæ/Gy_DepartmentList.html?Type=HDeptID", "yes"]
			, content: ["../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_DepartmentList.html", "yes"]
			, btn: ["ç¡®å®", "åæ¶"]
			, btn1: function (index, laero) {
			//æé®ä¸ çåè°
			@@ -618,7 +618,7 @@
			}

			$("#HDeptID").val(checkStatus.data[0].HItemID);//åç
			$("#HDeptName").val(checkStatus.data[0].HName);//åç§°
			$("#HDeptName").val(checkStatus.data[0].é¨é¨åç§°);//åç§°
			layer.close(index);//å³éå¼¹çª
			}
			, btn2: function (index, layero) { }
			@@ -637,7 +637,7 @@
			, shift: 2 //å¼¹åºå¨ç»
			, area: ["90%", "90%"] //çªä½å¤§å°
			, maxmin: true //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
			, content: ["../../../views/Baseset/åºç¡èµæ/Gy_GetProductionTeamList.html?Type=HGroupID", "yes"]
			, content: ["../../åºç¡èµæ/å·¥èµåºç¡èµæ/Gy_Group.html?Type=HGroup", "yes"]
			, btn: ["ç¡®å®", "åæ¶"]
			, btn1: function (index, laero) {
			//æé®ä¸ çåè°
			@@ -649,7 +649,7 @@
			}

			$("#HGroupID").val(checkStatus.data[0].HItemID);//åç
			$("#HGroupName").val(checkStatus.data[0].çç»);//åç§°
			$("#HGroupName").val(checkStatus.data[0].çç»åç§°);//åç§°
			layer.close(index);//å³éå¼¹çª
			}
			, btn2: function (index, layero) { }
			@@ -930,7 +930,7 @@
			, shift: 2 //å¼¹åºå¨ç»
			, area: ["90%", "90%"] //çªä½å¤§å°
			, maxmin: true //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
			, content: ["../../Baseset/åºç¡èµæ/Gy_EmployeeList.html", "yes"]
			, content: ["../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_EmployeeList.html?", "yes"]
			, btn: ["ç¡®å®", "åæ¶"]
			, btn1: function (index, laero) {
			//æé®ä¸ çåè°
			@@ -943,8 +943,8 @@
			//æ´æ°è¡¨æ ¼ç¼åçæ°æ®
			obj.update({
			"HEmpID": checkStatus.data[0].HItemID
			, "HEmpNumber": checkStatus.data[0].HNumber
			, "HEmpName": checkStatus.data[0].HName
			, "HEmpNumber": checkStatus.data[0].èåä»£ç
			, "HEmpName": checkStatus.data[0].èååç§°
			})
			layer.close(index);//å³éå¼¹çª
			}

			@@ -621,7 +621,7 @@
			, shift: 2 //å¼¹åºå¨ç»
			, area: ["90%", "90%"] //çªä½å¤§å°
			, maxmin: true //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
			, content: ["../../../views/Baseset/åºç¡èµæ/Gy_DepartmentList.html?Type=HDeptID", "yes"]
			, content: ["../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_DepartmentList.html", "yes"]
			, btn: ["ç¡®å®", "åæ¶"]
			, btn1: function (index, laero) {
			//æé®ä¸ çåè°
			@@ -633,7 +633,7 @@
			}

			$("#HDeptID").val(checkStatus.data[0].HItemID);//åç
			$("#HDeptName").val(checkStatus.data[0].HName);//åç§°
			$("#HDeptName").val(checkStatus.data[0].é¨é¨åç§°);//åç§°
			layer.close(index);//å³éå¼¹çª
			}
			, btn2: function (index, layero) { }
			@@ -955,7 +955,7 @@
			, shift: 2 //å¼¹åºå¨ç»
			, area: ["90%", "90%"] //çªä½å¤§å°
			, maxmin: true //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
			, content: ["../../Baseset/åºç¡èµæ/Gy_EmployeeList.html", "yes"]
			, content: ["../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_EmployeeList.html?", "yes"]
			, btn: ["ç¡®å®", "åæ¶"]
			, btn1: function (index, laero) {
			//æé®ä¸ çåè°
			@@ -968,8 +968,8 @@
			//æ´æ°è¡¨æ ¼ç¼åçæ°æ®
			obj.update({
			"HEmpID": checkStatus.data[0].HItemID
			, "HEmpNumber": checkStatus.data[0].HNumber
			, "HEmpName": checkStatus.data[0].HName
			, "HEmpNumber": checkStatus.data[0].èåä»£ç
			, "HEmpName": checkStatus.data[0].èååç§°
			})
			layer.close(index);//å³éå¼¹çª
			}

			@@ -320,7 +320,7 @@
			, area: ['90%', '90%']//å¤§å°
			, title: 'æå±ç»åè¡¨'//æ é¢
			, shift: 2//å¼¹åºå¨ç»
			, content: ['../../Baseset/åºç¡èµæ/Gy_ClassTimePrjGroupList.html', 'yes']
			, content: ['../../åºç¡èµæ/å·¥èµåºç¡èµæ/Gy_ClassTimePrjGroupList.html', 'yes']
			, btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {//æé®ãæé®ä¸ãçåè°
			var iframeWindow = window['layui-layer-iframe' + index] //è·åå¼¹æ¡é¡µé¢
			@@ -328,7 +328,7 @@
			if (checkStatus.data.length === 0) {
			return layer.msg('è¯·éæ©æ°æ®');
			}
			$("#HEntryName").val(checkStatus.data[0].HName);
			$("#HEntryName").val(checkStatus.data[0].æ ¸ç®æ¹å¼ç»åç§°);
			$("#HEntryID").val(checkStatus.data[0].HItemID);
			//$("#HDeptNumber").val(checkStatus.data[0].HNumber);
			layer.close(index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç

			@@ -338,7 +338,7 @@
			shift: 2,
			area: ['90%', '90%'],
			maxmin: true,
			content: ['../../../views/Baseset/åºç¡èµæ/Gy_EmployeeList.html', 'yes'],
			content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_EmployeeList.html?Type=HEmpList', 'yes'],
			btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {
			//æé®ãæé®ä¸ãçåè°
			@@ -348,9 +348,9 @@
			return layer.msg('è¯·éæ©æ°æ®');
			}
			obj.update({
			HEmpName: checkStatus.data[0].HName
			, HEmpID: checkStatus.data[0].HItemID
			, HEmpNumber: checkStatus.data[0].HNumber
			"HEmpID": checkStatus.data[0].HItemID
			, "HEmpNumber": checkStatus.data[0].èåä»£ç
			, "HEmpName": checkStatus.data[0].èååç§°
			});

			layer.close(layer.index);
			@@ -445,7 +445,7 @@
			shift: 2,
			area: ['80%', '80%'],
			maxmin: true,
			content: ['../../../views/Baseset/åºç¡èµæ/Gy_GetProductionTeamList.html?Type=HGroupID', 'yes'],
			content: ['../../åºç¡èµæ/å·¥èµåºç¡èµæ/Gy_Group.html?Type=HGroup', 'yes'],
			btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {

			@@ -455,7 +455,7 @@
			if (checkStatus.data.length === 0) {
			return layer.msg('è¯·éæ©æ°æ®');
			}
			$("#HGroupName").val(checkStatus.data[0].çç»);
			$("#HGroupName").val(checkStatus.data[0].çç»åç§°);
			$("#HGroupID").val(checkStatus.data[0].HItemID);
			layer.close(layer.index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			}

			@@ -779,7 +779,7 @@
			, shift: 2 //å¼¹åºå¨ç»
			, area: ["90%", "90%"] //çªä½å¤§å°
			, maxmin: true //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
			, content: ["../../../views/Baseset/åºç¡èµæ/Gy_DepartmentList.html?Type=HDeptID", "yes"]
			, content: ["../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_DepartmentList.html", "yes"]
			, btn: ["ç¡®å®", "åæ¶"]
			, btn1: function (index, laero) {
			//æé®ä¸ çåè°
			@@ -791,7 +791,7 @@
			}

			$("#HDeptID").val(checkStatus.data[0].HItemID);//åç
			$("#HDeptName").val(checkStatus.data[0].HName);//åç§°
			$("#HDeptName").val(checkStatus.data[0].é¨é¨åç§°);//åç§°
			layer.close(index);//å³éå¼¹çª
			}
			, btn2: function (index, layero) { }
			@@ -810,7 +810,7 @@
			, shift: 2 //å¼¹åºå¨ç»
			, area: ["90%", "90%"] //çªä½å¤§å°
			, maxmin: true //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
			, content: ["../../../views/Baseset/åºç¡èµæ/Gy_EmployeeList.html?Type=HEmpID", "yes"]
			, content: ["../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_EmployeeList.html?Type=HEmpID", "yes"]
			, btn: ["ç¡®å®", "åæ¶"]
			, btn1: function (index, laero) {
			//æé®ä¸ çåè°
			@@ -822,7 +822,7 @@
			}

			$("#HMangerID").val(checkStatus.data[0].HItemID);//åç
			$("#HMangerName").val(checkStatus.data[0].HName);//åç§°
			$("#HMangerName").val(checkStatus.data[0].èååç§°);//åç§°
			layer.close(index);//å³éå¼¹çª
			}
			, btn2: function (index, layero) { }
			@@ -1169,7 +1169,7 @@
			, shift: 2 //å¼¹åºå¨ç»
			, area: ["90%", "90%"] //çªä½å¤§å°
			, maxmin: true //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
			, content: ["../../Baseset/åºç¡èµæ/Gy_EmployeeList.html", "yes"]
			, content: ["../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_EmployeeList.html?Type=HManager", "yes"]
			, btn: ["ç¡®å®", "åæ¶"]
			, btn1: function (index, laero) {
			//æé®ä¸ çåè°
			@@ -1181,30 +1181,30 @@
			}

			var HEmpID = checkStatus.data[0].HItemID;
			var HEmpNumber = checkStatus.data[0].HNumber;
			var HEmpName = checkStatus.data[0].HName;
			var HShifts = getHShifts_BasedHEmpID(HEmpID);
			if (HShifts.count == 1) {
			var HShiftsID = HShifts.HShiftsID;
			var HShiftsNumber = HShifts.HShiftsNumber;
			var HShiftsName = HShifts.HShiftsName;
			var HEmpNumber = checkStatus.data[0].èååç§°;
			var HEmpName = checkStatus.data[0].èåä»£ç ;
			/var HShifts = getHShifts_BasedHEmpID(HEmpID);/
			//if (HShifts.count == 1) {
			// var HShiftsID = HShifts.HShiftsID;
			// var HShiftsNumber = HShifts.HShiftsNumber;
			// var HShiftsName = HShifts.HShiftsName;
			// //æ´æ°è¡¨æ ¼ç¼åçæ°æ®
			// obj.update({
			// "HEmpID": checkStatus.data[0].HItemID
			// , "HEmpNumber": checkStatus.data[0].èååç§°
			// , "HEmpName": checkStatus.data[0].èåä»£ç
			// , "HShiftsID": HShiftsID
			// , "HShiftsNumber": HShiftsNumber
			// , "HShiftsName": HShiftsName
			// })
			//} else {
			//æ´æ°è¡¨æ ¼ç¼åçæ°æ®
			obj.update({
			"HEmpID": checkStatus.data[0].HItemID
			, "HEmpNumber": checkStatus.data[0].HNumber
			, "HEmpName": checkStatus.data[0].HName
			, "HShiftsID": HShiftsID
			, "HShiftsNumber": HShiftsNumber
			, "HShiftsName": HShiftsName
			, "HEmpNumber": checkStatus.data[0].èåä»£ç
			, "HEmpName": checkStatus.data[0].èååç§°
			})
			} else {
			//æ´æ°è¡¨æ ¼ç¼åçæ°æ®
			obj.update({
			"HEmpID": checkStatus.data[0].HItemID
			, "HEmpNumber": checkStatus.data[0].HNumber
			, "HEmpName": checkStatus.data[0].HName
			})
			}

			layer.close(index);//å³éå¼¹çª
			}
			})