15 per รวม point
This commit is contained in:
parent
877207412a
commit
621bbdb967
1 changed files with 5 additions and 2 deletions
|
|
@ -158,7 +158,11 @@ export class SalaryPeriodController extends Controller {
|
||||||
org: item.root,
|
org: item.root,
|
||||||
total: item.total + (_salaryOrgGROUP2 == null ? 0 : _salaryOrgGROUP2.total),
|
total: item.total + (_salaryOrgGROUP2 == null ? 0 : _salaryOrgGROUP2.total),
|
||||||
fifteenPercent:
|
fifteenPercent:
|
||||||
item.fifteenPercent + (_salaryOrgGROUP2 == null ? 0 : _salaryOrgGROUP2.fifteenPercent),
|
item.fifteenPercent +
|
||||||
|
item.fifteenPoint +
|
||||||
|
(_salaryOrgGROUP2 == null
|
||||||
|
? 0
|
||||||
|
: _salaryOrgGROUP2.fifteenPercent + _salaryOrgGROUP2.fifteenPoint),
|
||||||
chosen:
|
chosen:
|
||||||
item.quantityUsed + (_salaryOrgGROUP2 == null ? 0 : _salaryOrgGROUP2.quantityUsed),
|
item.quantityUsed + (_salaryOrgGROUP2 == null ? 0 : _salaryOrgGROUP2.quantityUsed),
|
||||||
remaining:
|
remaining:
|
||||||
|
|
@ -1713,7 +1717,6 @@ export class SalaryPeriodController extends Controller {
|
||||||
});
|
});
|
||||||
await this.salaryProfileEmployeeRepository.remove(salaryProfileEmployee);
|
await this.salaryProfileEmployeeRepository.remove(salaryProfileEmployee);
|
||||||
await this.salaryOrgEmployeeRepository.remove(salaryOrgEmployee);
|
await this.salaryOrgEmployeeRepository.remove(salaryOrgEmployee);
|
||||||
|
|
||||||
let orgs = await new CallAPI().GetData(request, "org/unauthorize/active/root/id");
|
let orgs = await new CallAPI().GetData(request, "org/unauthorize/active/root/id");
|
||||||
let total = 1000;
|
let total = 1000;
|
||||||
let _orgProfiles = await new CallAPI().PostData(request, "org/unauthorize/salary/gen", {
|
let _orgProfiles = await new CallAPI().PostData(request, "org/unauthorize/salary/gen", {
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue