|
|
@@ -40,6 +40,7 @@ shr.defineClass("shr.emp.EmpSalaryItemDataPartEditEx", shr.emp.EmpSalaryItemData
|
|
|
var amount = 0;
|
|
|
var rowData = rowDatas[i];
|
|
|
var salaryItem = rowData.salaryItem;
|
|
|
+ if ("ADJ033" != salaryItem.number) {
|
|
|
//表头
|
|
|
var $th1 = "<th>" + salaryItem.name + "</th>";
|
|
|
$th.append($th1);
|
|
|
@@ -100,6 +101,7 @@ shr.defineClass("shr.emp.EmpSalaryItemDataPartEditEx", shr.emp.EmpSalaryItemData
|
|
|
}
|
|
|
}
|
|
|
$tr2.append($td2);
|
|
|
+ }
|
|
|
if (i == rowDatas.length - 1) {
|
|
|
//最后一次遍历,处理年薪合计
|
|
|
$th1 = "<th>年薪合计</th>";
|
|
|
@@ -143,6 +145,8 @@ shr.defineClass("shr.emp.EmpSalaryItemDataPartEditEx", shr.emp.EmpSalaryItemData
|
|
|
var amount = 0;
|
|
|
if ("ADJ021" == number) {
|
|
|
amount = _self.getAfterStdSalaryTotal();
|
|
|
+ } else if ("ADJ033" == number) {
|
|
|
+ amount = _self.getAfterMoneySum();
|
|
|
} else {
|
|
|
amount = parseFloat($("[name='" + number + "']").val() != '' ? $("[name='" + number + "']").val() : 0);
|
|
|
}
|