UAT更新

GDYSL/addon/customer/web/js/atsOverTimeBillBatchEditEx.js

@@ -580,6 +580,25 @@ shr.defineClass("shr.customer.gtiit.AtsOverTimeBillBatchEditEx", shr.ats.AtsOver
         }
     },
 
+    /**
+     * 删除行
+     */
+    deleteRowAction: function(event) {
+        var $editGrid = this.getEditGrid(event.currentTarget);
+        var ids = $editGrid.jqGrid('getSelectedRows');
+        if (ids.length > 0) {
+            for (var i = ids.length - 1; i >= 0; i--) {
+                $editGrid.jqGrid('delRow', ids[i]);
+            }
+            this.countOvertimeHourAction();
+        }else{
+            shr.showInfo({
+                message: $.shrI18n.common.tips.chooseTableDataFirst,
+                hideAfter: 3
+            });
+        }
+    },
+
     countOvertimeHourAction:function(){
         var allRowData = $("#entries").jqGrid("getAllRowData");
         var length = allRowData.length;

GDYSL/addon/customer/web/js/atsOverTimeBillBatchEditForPerEx.js

@@ -346,6 +346,25 @@ shr.defineClass("shr.customer.gtiit.AtsOverTimeBillBatchEditForPerEx", shr.ats.a
         }
     },
 
+    /**
+     * 删除行
+     */
+    deleteRowAction: function(event) {
+        var $editGrid = this.getEditGrid(event.currentTarget);
+        var ids = $editGrid.jqGrid('getSelectedRows');
+        if (ids.length > 0) {
+            for (var i = ids.length - 1; i >= 0; i--) {
+                $editGrid.jqGrid('delRow', ids[i]);
+            }
+            this.countOvertimeHourAction();
+        }else{
+            shr.showInfo({
+                message: $.shrI18n.common.tips.chooseTableDataFirst,
+                hideAfter: 3
+            });
+        }  
+    },
+
     countOvertimeHourAction:function(){
         var allRowData = $("#entries").jqGrid("getAllRowData");
         var length = allRowData.length;

GDYSL/addon/customer/web/js/shr/rpt/AllSalaryList.js

@@ -1,4 +1,4 @@
-
+
 // 可以查看所有的工资套打js
 shr.defineClass("shr.customer.gtiit.rpt.AllSalaryList", shr.framework.List, {
 	initalizeDOM : function () {

GDYSL/addon/customer/web/js/shr/salary/salaryBagList.js

@@ -33,4 +33,25 @@ shr.defineClass('shr.salary.salaryBagList',shr.framework.List , {
 			return;
 		}
 	},
+
+	againstApproveAction:function(e){
+		var selectRows = $("#grid").jqGrid("getSelectedRows");
+		if (selectRows == undefined || selectRows.length==0 || (selectRows && selectRows.length == 1 && selectRows[0] == "")) {
+			shr.showWarning({message: "Please select Bank of China first！"});
+			return ;
+		}
+		var _self = this;
+		shr.showConfirm("Are you sure you want to cancel the approval process", function(){
+			_self.remoteCall({
+	            type:"post",
+	            async: false,
+	            method:"againstApprove",
+	            param:{"billIds":selectRows.join(",")},
+	            success:function(res){
+	                shr.showInfo({message: "Reverse approval successful"});
+	                _self.reloadGrid();
+	            }
+	        });
+		});
+	}
 });