diff --git a/jinbooks-ui/src/views/hr/calc-salary.vue b/jinbooks-ui/src/views/hr/calc-salary.vue
index 4b729e7..0fbfe7b 100644
--- a/jinbooks-ui/src/views/hr/calc-salary.vue
+++ b/jinbooks-ui/src/views/hr/calc-salary.vue
@@ -171,6 +171,12 @@
{{ formatAmount(scope.row.taxDeduction) }}
+
+
+
+ {{ formatAmount(scope.row.payAmount) }}
+
diff --git a/jinbooks-ui/src/views/hr/calc-salary/edit.vue b/jinbooks-ui/src/views/hr/calc-salary/edit.vue
index 05f574f..89b1e57 100644
--- a/jinbooks-ui/src/views/hr/calc-salary/edit.vue
+++ b/jinbooks-ui/src/views/hr/calc-salary/edit.vue
@@ -49,14 +49,14 @@
- 应发金额 {{(form.payBasic +
+ 工资金额 {{(form.payBasic +
form.payPost +
form.payMerit +
form.laborFee +
form.bonus +
form.overtime +
form.allowance +
- form.backPay).toFixed(2)}}
+ form.backPay).toFixed(2)}} 应发金额 {{(form.payAmount||0.00).toFixed(2)}}
diff --git a/jinbooks-ui/src/views/hr/salary-detail.vue b/jinbooks-ui/src/views/hr/salary-detail.vue
index 2b1742a..e7d6c30 100644
--- a/jinbooks-ui/src/views/hr/salary-detail.vue
+++ b/jinbooks-ui/src/views/hr/salary-detail.vue
@@ -187,6 +187,12 @@
{{ formatAmount(scope.row.taxDeduction) }}
+
+
+ {{ formatAmount(scope.row.payAmount) }}
+
+
diff --git a/jinbooks-ui/src/views/hr/salary-summary.vue b/jinbooks-ui/src/views/hr/salary-summary.vue
index f4bcb4b..15d7d72 100644
--- a/jinbooks-ui/src/views/hr/salary-summary.vue
+++ b/jinbooks-ui/src/views/hr/salary-summary.vue
@@ -162,12 +162,19 @@
{{ formatAmount(scope.row.taxDeduction) }}
-
-
- {{ formatAmount(scope.row.taxableWages) }}
-
- -->
+ -->
+
+
+ {{ formatAmount(scope.row.payAmount) }}
+
+
+
+
+ {{ formatAmount(scope.row.taxableWages) }}
+
+
diff --git a/jinbooks/jinbooks-core/src/main/java/com/jinbooks/entity/hr/EmployeeSalary.java b/jinbooks/jinbooks-core/src/main/java/com/jinbooks/entity/hr/EmployeeSalary.java
index 2155923..bde3592 100644
--- a/jinbooks/jinbooks-core/src/main/java/com/jinbooks/entity/hr/EmployeeSalary.java
+++ b/jinbooks/jinbooks-core/src/main/java/com/jinbooks/entity/hr/EmployeeSalary.java
@@ -79,6 +79,10 @@ public class EmployeeSalary extends BaseEntity {
private BigDecimal personalTax;
+ /**
+ * 应发工资 = 工资+应增-应扣
+ */
+ private BigDecimal payAmount;
private BigDecimal totalAmount;
private String bookId;
diff --git a/jinbooks/jinbooks-core/src/main/java/com/jinbooks/entity/hr/EmployeeSalarySummary.java b/jinbooks/jinbooks-core/src/main/java/com/jinbooks/entity/hr/EmployeeSalarySummary.java
index c822411..f7a7420 100644
--- a/jinbooks/jinbooks-core/src/main/java/com/jinbooks/entity/hr/EmployeeSalarySummary.java
+++ b/jinbooks/jinbooks-core/src/main/java/com/jinbooks/entity/hr/EmployeeSalarySummary.java
@@ -83,7 +83,11 @@ public class EmployeeSalarySummary extends BaseEntity {
/*个税*/
private BigDecimal personalTax;
-
+ /**
+ * 应发工资 = 工资+应增-应扣
+ */
+ private BigDecimal payAmount;
+
/*实发工资*/
private BigDecimal totalAmount;
diff --git a/jinbooks/jinbooks-core/src/main/java/com/jinbooks/entity/hr/EmployeeSalaryTemp.java b/jinbooks/jinbooks-core/src/main/java/com/jinbooks/entity/hr/EmployeeSalaryTemp.java
index 8659ecb..0bb0a74 100644
--- a/jinbooks/jinbooks-core/src/main/java/com/jinbooks/entity/hr/EmployeeSalaryTemp.java
+++ b/jinbooks/jinbooks-core/src/main/java/com/jinbooks/entity/hr/EmployeeSalaryTemp.java
@@ -79,6 +79,14 @@ public class EmployeeSalaryTemp extends BaseEntity {
private BigDecimal personalTax;
+ /**
+ * 应发工资 = 工资+应增-应扣
+ */
+ private BigDecimal payAmount;
+
+ /**
+ * 实发合计
+ */
private BigDecimal totalAmount;
private String bookId;
diff --git a/jinbooks/jinbooks-core/src/main/java/com/jinbooks/entity/hr/dto/SalaryDetailChangeDto.java b/jinbooks/jinbooks-core/src/main/java/com/jinbooks/entity/hr/dto/SalaryDetailChangeDto.java
index d5e39ba..a6b5aa4 100644
--- a/jinbooks/jinbooks-core/src/main/java/com/jinbooks/entity/hr/dto/SalaryDetailChangeDto.java
+++ b/jinbooks/jinbooks-core/src/main/java/com/jinbooks/entity/hr/dto/SalaryDetailChangeDto.java
@@ -63,6 +63,8 @@ public class SalaryDetailChangeDto {
private BigDecimal personalTax;
+ private BigDecimal payAmount;
+
private BigDecimal totalAmount;
private String bookId;
diff --git a/jinbooks/jinbooks-persistence/src/main/java/com/jinbooks/persistence/service/impl/EmployeeSalaryTempServiceImpl.java b/jinbooks/jinbooks-persistence/src/main/java/com/jinbooks/persistence/service/impl/EmployeeSalaryTempServiceImpl.java
index 3f7ddb1..71b75a9 100644
--- a/jinbooks/jinbooks-persistence/src/main/java/com/jinbooks/persistence/service/impl/EmployeeSalaryTempServiceImpl.java
+++ b/jinbooks/jinbooks-persistence/src/main/java/com/jinbooks/persistence/service/impl/EmployeeSalaryTempServiceImpl.java
@@ -461,6 +461,18 @@ public class EmployeeSalaryTempServiceImpl extends ServiceImpl