Prechádzať zdrojové kódy

修改计算结果类型

QuKatie 3 rokov pred
rodič
commit
92dd38427c

+ 111 - 99
src/views/salaryManagement/highSchool/detailsPage.vue

@@ -1748,129 +1748,141 @@ export default {
     },
     salaryAdd(row) {
       // 1. 基础工资 = +M153(校龄工资)+N153(增资)+O153(学历工资)+Q153(职级工资)+L153(履约奖)+R153(工资基数)
-      row.basicsSalary =
+      row.basicsSalary = Number(
         numCal(row.schoolAgeSalary) +
-        numCal(row.capitalIncrease) +
-        numCal(row.educationSalary) +
-        numCal(row.rankSalary) +
-        numCal(row.salaryBase) +
-        numCal(row.performanceAward);
-      //2. 工作量工资 = 月份工作量工资+代课工作量工资+双休日工作量工资+工作量工资1+…+工作量工资5
-      row.workloadSalary =
+          numCal(row.capitalIncrease) +
+          numCal(row.educationSalary) +
+          numCal(row.rankSalary) +
+          numCal(row.salaryBase) +
+          numCal(row.performanceAward)
+      ).toFixed(2);
+      //2. 工作量工资 = 月份工作量工资+代课工作量工资+双休日工作量工资+工作量工资1+…+工作量工资5-虚拟工作量工资标准-虚拟双休日工作量工资标准
+      row.workloadSalary = Number(
         numCal(row.momthWorkloadSalary) +
-        numCal(row.customTwo) +
-        numCal(row.doubleMoney) +
-        numCal(row.customThree) +
-        numCal(row.customFour) +
-        numCal(row.customFive) +
-        numCal(row.customSix) +
-        numCal(row.customSeven) -
-        numCal(row.virtualDailyAssessmentCriteria) -
-        numCal(row.virtualDoubleCease);
+          numCal(row.customTwo) +
+          numCal(row.doubleMoney) +
+          numCal(row.customThree) +
+          numCal(row.customFour) +
+          numCal(row.customFive) +
+          numCal(row.customSix) +
+          numCal(row.customSeven) -
+          numCal(row.virtualDailyAssessmentCriteria) -
+          numCal(row.virtualDoubleCease)
+      ).toFixed(2);
       //3.日常考核工资 =日常考核工资-虚拟日常考核标准
-      row.dailyAssessmentSalary =
+      row.dailyAssessmentSalary = Number(
         numCal(row.dailyAssessmentSalary) -
-        numCal(row.virtualDailyAssessmentCriteria);
+          numCal(row.virtualDailyAssessmentCriteria)
+      ).toFixed(2);
       // 4.绩效工资=学期绩效工资+学期绩效工资1+..+学期绩效工资5
-      row.customizeFour =
+      row.customizeFour = Number(
         numCal(row.termPerformanceSalary) +
-        numCal(row.customNine) +
-        numCal(row.customize) +
-        numCal(row.customizeOne) +
-        numCal(row.customizeTwo) +
-        numCal(row.customizeThree);
+          numCal(row.customNine) +
+          numCal(row.customize) +
+          numCal(row.customizeOne) +
+          numCal(row.customizeTwo) +
+          numCal(row.customizeThree)
+      ).toFixed(2);
       // 5.奖励工资=奖励1+…+奖励10
-      row.awardSalary =
+      row.awardSalary = Number(
         numCal(row.customAward) +
-        numCal(row.customAwardOne) +
-        numCal(row.customAwardTwo) +
-        numCal(row.customAwardThree) +
-        numCal(row.customAwardFour) +
-        numCal(row.customAwardFive) +
-        numCal(row.customAwardSix) +
-        numCal(row.customAwardSeven) +
-        numCal(row.customAwardEight) +
-        numCal(row.customAwardNine);
+          numCal(row.customAwardOne) +
+          numCal(row.customAwardTwo) +
+          numCal(row.customAwardThree) +
+          numCal(row.customAwardFour) +
+          numCal(row.customAwardFive) +
+          numCal(row.customAwardSix) +
+          numCal(row.customAwardSeven) +
+          numCal(row.customAwardEight) +
+          numCal(row.customAwardNine)
+      ).toFixed(2);
       // 6.职务津贴=领导干部补贴+领导干部考核补贴+备课组长+备课组长考核补贴+教研组长+教研组长考核补贴
-      row.dutyAllowances =
+      row.dutyAllowances = Number(
         numCal(row.leadingCadreSubsidy) +
-        numCal(row.customizeFive) +
-        numCal(row.prepareLessons) +
-        numCal(row.customizeSix) +
-        numCal(row.teachingResearch) +
-        numCal(row.customizeSeven);
+          numCal(row.customizeFive) +
+          numCal(row.prepareLessons) +
+          numCal(row.customizeSix) +
+          numCal(row.teachingResearch) +
+          numCal(row.customizeSeven)
+      ).toFixed(2);
       // 7.班主任津贴=班主任补贴+班额津贴-校车考核-班级微信群考核-财务考核+班主任考核津贴
-      row.classTeacherSubsidy =
+      row.classTeacherSubsidy = Number(
         numCal(row.classTeacherFee) +
-        numCal(row.classes) -
-        numCal(row.adjustTheBalance) -
-        numCal(row.payrollCredit) -
-        numCal(row.paid) +
-        numCal(row.customizeEight);
+          numCal(row.classes) -
+          numCal(row.adjustTheBalance) -
+          numCal(row.payrollCredit) -
+          numCal(row.paid) +
+          numCal(row.customizeEight)
+      ).toFixed(2);
       // 8.补贴项=微信+产假工资+周末工作量工资+补贴1+…+补贴10
-      row.subsidy =
+      row.subsidy = Number(
         numCal(row.wx) +
-        numCal(row.maternityLeaveSalary) +
-        numCal(row.overtimeAtWeekend) +
-        numCal(row.yearUpPerformance) +
-        numCal(row.yearDownPerformance) +
-        numCal(row.cadreAllowanceReservation) +
-        numCal(row.vacationOvertimePay) +
-        numCal(row.newPostTrain) +
-        numCal(row.winningPrize) +
-        numCal(row.classMinister) +
-        numCal(row.monthViceClassFee) +
-        numCal(row.safetyFees) +
-        numCal(row.reserveReplacement);
+          numCal(row.maternityLeaveSalary) +
+          numCal(row.overtimeAtWeekend) +
+          numCal(row.yearUpPerformance) +
+          numCal(row.yearDownPerformance) +
+          numCal(row.cadreAllowanceReservation) +
+          numCal(row.vacationOvertimePay) +
+          numCal(row.newPostTrain) +
+          numCal(row.winningPrize) +
+          numCal(row.classMinister) +
+          numCal(row.monthViceClassFee) +
+          numCal(row.safetyFees) +
+          numCal(row.reserveReplacement)
+      ).toFixed(2);
       // 9.扣除项=出勤+督查+超额电话费+学习强国+宿舍管理费+生育津贴+扣除1+…+扣除10
-      row.deductions =
+      row.deductions = Number(
         numCal(row.attendance) +
-        numCal(row.inspectorFines) +
-        numCal(row.telephoneBill) +
-        numCal(row.learningPower) +
-        numCal(row.dormitoryManagementFee) +
-        numCal(row.childbirthAllowance) +
-        numCal(row.ribbonOne) +
-        numCal(row.ribbonTwo) +
-        numCal(row.ribbonThree) +
-        numCal(row.ribbonFour) +
-        numCal(row.ribbonFive) +
-        numCal(row.ribbonSix) +
-        numCal(row.ribbonSeven) +
-        numCal(row.ribbonEight) +
-        numCal(row.ribbonNine) +
-        numCal(row.pauseNoPay);
+          numCal(row.inspectorFines) +
+          numCal(row.telephoneBill) +
+          numCal(row.learningPower) +
+          numCal(row.dormitoryManagementFee) +
+          numCal(row.childbirthAllowance) +
+          numCal(row.ribbonOne) +
+          numCal(row.ribbonTwo) +
+          numCal(row.ribbonThree) +
+          numCal(row.ribbonFour) +
+          numCal(row.ribbonFive) +
+          numCal(row.ribbonSix) +
+          numCal(row.ribbonSeven) +
+          numCal(row.ribbonEight) +
+          numCal(row.ribbonNine) +
+          numCal(row.pauseNoPay)
+      ).toFixed(2);
       // 10.应发工资=基本工资+工作量工资+日常考核工资+奖励工资+职务津贴+班主任津贴+补贴项-扣除项+保险(个人部分)+公积金(个人部分).. 大于800 保险(个人部分) 不加
       if (row.enjoyOfficeTreatment == "是") {
-        row.salary =
+        row.salary = Number(
           numCal(row.basicsSalary) +
-          numCal(row.workloadSalary) +
-          numCal(row.dailyAssessmentSalary) +
-          numCal(row.awardSalary) +
-          numCal(row.dutyAllowances) +
-          numCal(row.classTeacherSubsidy) +
-          numCal(row.subsidy) -
-          numCal(row.deductions) +
-          numCal(row.reservedFundsPersonage);
+            numCal(row.workloadSalary) +
+            numCal(row.dailyAssessmentSalary) +
+            numCal(row.awardSalary) +
+            numCal(row.dutyAllowances) +
+            numCal(row.classTeacherSubsidy) +
+            numCal(row.subsidy) -
+            numCal(row.deductions) +
+            numCal(row.reservedFundsPersonage)
+        ).toFixed(2);
       } else {
-        row.salary =
+        row.salary = Number(
           numCal(row.basicsSalary) +
-          numCal(row.workloadSalary) +
-          numCal(row.dailyAssessmentSalary) +
-          numCal(row.awardSalary) +
-          numCal(row.dutyAllowances) +
-          numCal(row.classTeacherSubsidy) +
-          numCal(row.subsidy) -
-          numCal(row.deductions) +
-          numCal(row.insurancePersonage) +
-          numCal(row.reservedFundsPersonage);
+            numCal(row.workloadSalary) +
+            numCal(row.dailyAssessmentSalary) +
+            numCal(row.awardSalary) +
+            numCal(row.dutyAllowances) +
+            numCal(row.classTeacherSubsidy) +
+            numCal(row.subsidy) -
+            numCal(row.deductions) +
+            numCal(row.insurancePersonage) +
+            numCal(row.reservedFundsPersonage)
+        ).toFixed(2);
       }
       // 11.实发工资=应发工资-个人所得税-个人保险-公积金个人
-      row.fSalary =
+      row.fSalary = Number(
         numCal(row.salary) -
-        numCal(row.personageTaxes) -
-        numCal(row.insurancePersonage) -
-        numCal(row.reservedFundsPersonage);
+          numCal(row.personageTaxes) -
+          numCal(row.insurancePersonage) -
+          numCal(row.reservedFundsPersonage)
+      ).toFixed(2);
     },
     //导出工资条
     exportSalary() {

+ 111 - 99
src/views/salaryManagement/juniorhighSchool/detailsPage.vue

@@ -1748,129 +1748,141 @@ export default {
     },
     salaryAdd(row) {
       // 1. 基础工资 = +M153(校龄工资)+N153(增资)+O153(学历工资)+Q153(职级工资)+L153(履约奖)+R153(工资基数)
-      row.basicsSalary =
+      row.basicsSalary = Number(
         numCal(row.schoolAgeSalary) +
-        numCal(row.capitalIncrease) +
-        numCal(row.educationSalary) +
-        numCal(row.rankSalary) +
-        numCal(row.salaryBase) +
-        numCal(row.performanceAward);
-      //2. 工作量工资 = 月份工作量工资+代课工作量工资+双休日工作量工资+工作量工资1+…+工作量工资5
-      row.workloadSalary =
+          numCal(row.capitalIncrease) +
+          numCal(row.educationSalary) +
+          numCal(row.rankSalary) +
+          numCal(row.salaryBase) +
+          numCal(row.performanceAward)
+      ).toFixed(2);
+      //2. 工作量工资 = 月份工作量工资+代课工作量工资+双休日工作量工资+工作量工资1+…+工作量工资5-虚拟工作量工资标准-虚拟双休日工作量工资标准
+      row.workloadSalary = Number(
         numCal(row.momthWorkloadSalary) +
-        numCal(row.customTwo) +
-        numCal(row.doubleMoney) +
-        numCal(row.customThree) +
-        numCal(row.customFour) +
-        numCal(row.customFive) +
-        numCal(row.customSix) +
-        numCal(row.customSeven) -
-        numCal(row.virtualDailyAssessmentCriteria) -
-        numCal(row.virtualDoubleCease);
+          numCal(row.customTwo) +
+          numCal(row.doubleMoney) +
+          numCal(row.customThree) +
+          numCal(row.customFour) +
+          numCal(row.customFive) +
+          numCal(row.customSix) +
+          numCal(row.customSeven) -
+          numCal(row.virtualDailyAssessmentCriteria) -
+          numCal(row.virtualDoubleCease)
+      ).toFixed(2);
       //3.日常考核工资 =日常考核工资-虚拟日常考核标准
-      row.dailyAssessmentSalary =
+      row.dailyAssessmentSalary = Number(
         numCal(row.dailyAssessmentSalary) -
-        numCal(row.virtualDailyAssessmentCriteria);
+          numCal(row.virtualDailyAssessmentCriteria)
+      ).toFixed(2);
       // 4.绩效工资=学期绩效工资+学期绩效工资1+..+学期绩效工资5
-      row.customizeFour =
+      row.customizeFour = Number(
         numCal(row.termPerformanceSalary) +
-        numCal(row.customNine) +
-        numCal(row.customize) +
-        numCal(row.customizeOne) +
-        numCal(row.customizeTwo) +
-        numCal(row.customizeThree);
+          numCal(row.customNine) +
+          numCal(row.customize) +
+          numCal(row.customizeOne) +
+          numCal(row.customizeTwo) +
+          numCal(row.customizeThree)
+      ).toFixed(2);
       // 5.奖励工资=奖励1+…+奖励10
-      row.awardSalary =
+      row.awardSalary = Number(
         numCal(row.customAward) +
-        numCal(row.customAwardOne) +
-        numCal(row.customAwardTwo) +
-        numCal(row.customAwardThree) +
-        numCal(row.customAwardFour) +
-        numCal(row.customAwardFive) +
-        numCal(row.customAwardSix) +
-        numCal(row.customAwardSeven) +
-        numCal(row.customAwardEight) +
-        numCal(row.customAwardNine);
+          numCal(row.customAwardOne) +
+          numCal(row.customAwardTwo) +
+          numCal(row.customAwardThree) +
+          numCal(row.customAwardFour) +
+          numCal(row.customAwardFive) +
+          numCal(row.customAwardSix) +
+          numCal(row.customAwardSeven) +
+          numCal(row.customAwardEight) +
+          numCal(row.customAwardNine)
+      ).toFixed(2);
       // 6.职务津贴=领导干部补贴+领导干部考核补贴+备课组长+备课组长考核补贴+教研组长+教研组长考核补贴
-      row.dutyAllowances =
+      row.dutyAllowances = Number(
         numCal(row.leadingCadreSubsidy) +
-        numCal(row.customizeFive) +
-        numCal(row.prepareLessons) +
-        numCal(row.customizeSix) +
-        numCal(row.teachingResearch) +
-        numCal(row.customizeSeven);
+          numCal(row.customizeFive) +
+          numCal(row.prepareLessons) +
+          numCal(row.customizeSix) +
+          numCal(row.teachingResearch) +
+          numCal(row.customizeSeven)
+      ).toFixed(2);
       // 7.班主任津贴=班主任补贴+班额津贴-校车考核-班级微信群考核-财务考核+班主任考核津贴
-      row.classTeacherSubsidy =
+      row.classTeacherSubsidy = Number(
         numCal(row.classTeacherFee) +
-        numCal(row.classes) -
-        numCal(row.adjustTheBalance) -
-        numCal(row.payrollCredit) -
-        numCal(row.paid) +
-        numCal(row.customizeEight);
+          numCal(row.classes) -
+          numCal(row.adjustTheBalance) -
+          numCal(row.payrollCredit) -
+          numCal(row.paid) +
+          numCal(row.customizeEight)
+      ).toFixed(2);
       // 8.补贴项=微信+产假工资+周末工作量工资+补贴1+…+补贴10
-      row.subsidy =
+      row.subsidy = Number(
         numCal(row.wx) +
-        numCal(row.maternityLeaveSalary) +
-        numCal(row.overtimeAtWeekend) +
-        numCal(row.yearUpPerformance) +
-        numCal(row.yearDownPerformance) +
-        numCal(row.cadreAllowanceReservation) +
-        numCal(row.vacationOvertimePay) +
-        numCal(row.newPostTrain) +
-        numCal(row.winningPrize) +
-        numCal(row.classMinister) +
-        numCal(row.monthViceClassFee) +
-        numCal(row.safetyFees) +
-        numCal(row.reserveReplacement);
+          numCal(row.maternityLeaveSalary) +
+          numCal(row.overtimeAtWeekend) +
+          numCal(row.yearUpPerformance) +
+          numCal(row.yearDownPerformance) +
+          numCal(row.cadreAllowanceReservation) +
+          numCal(row.vacationOvertimePay) +
+          numCal(row.newPostTrain) +
+          numCal(row.winningPrize) +
+          numCal(row.classMinister) +
+          numCal(row.monthViceClassFee) +
+          numCal(row.safetyFees) +
+          numCal(row.reserveReplacement)
+      ).toFixed(2);
       // 9.扣除项=出勤+督查+超额电话费+学习强国+宿舍管理费+生育津贴+扣除1+…+扣除10
-      row.deductions =
+      row.deductions = Number(
         numCal(row.attendance) +
-        numCal(row.inspectorFines) +
-        numCal(row.telephoneBill) +
-        numCal(row.learningPower) +
-        numCal(row.dormitoryManagementFee) +
-        numCal(row.childbirthAllowance) +
-        numCal(row.ribbonOne) +
-        numCal(row.ribbonTwo) +
-        numCal(row.ribbonThree) +
-        numCal(row.ribbonFour) +
-        numCal(row.ribbonFive) +
-        numCal(row.ribbonSix) +
-        numCal(row.ribbonSeven) +
-        numCal(row.ribbonEight) +
-        numCal(row.ribbonNine) +
-        numCal(row.pauseNoPay);
+          numCal(row.inspectorFines) +
+          numCal(row.telephoneBill) +
+          numCal(row.learningPower) +
+          numCal(row.dormitoryManagementFee) +
+          numCal(row.childbirthAllowance) +
+          numCal(row.ribbonOne) +
+          numCal(row.ribbonTwo) +
+          numCal(row.ribbonThree) +
+          numCal(row.ribbonFour) +
+          numCal(row.ribbonFive) +
+          numCal(row.ribbonSix) +
+          numCal(row.ribbonSeven) +
+          numCal(row.ribbonEight) +
+          numCal(row.ribbonNine) +
+          numCal(row.pauseNoPay)
+      ).toFixed(2);
       // 10.应发工资=基本工资+工作量工资+日常考核工资+奖励工资+职务津贴+班主任津贴+补贴项-扣除项+保险(个人部分)+公积金(个人部分).. 大于800 保险(个人部分) 不加
       if (row.enjoyOfficeTreatment == "是") {
-        row.salary =
+        row.salary = Number(
           numCal(row.basicsSalary) +
-          numCal(row.workloadSalary) +
-          numCal(row.dailyAssessmentSalary) +
-          numCal(row.awardSalary) +
-          numCal(row.dutyAllowances) +
-          numCal(row.classTeacherSubsidy) +
-          numCal(row.subsidy) -
-          numCal(row.deductions) +
-          numCal(row.reservedFundsPersonage);
+            numCal(row.workloadSalary) +
+            numCal(row.dailyAssessmentSalary) +
+            numCal(row.awardSalary) +
+            numCal(row.dutyAllowances) +
+            numCal(row.classTeacherSubsidy) +
+            numCal(row.subsidy) -
+            numCal(row.deductions) +
+            numCal(row.reservedFundsPersonage)
+        ).toFixed(2);
       } else {
-        row.salary =
+        row.salary = Number(
           numCal(row.basicsSalary) +
-          numCal(row.workloadSalary) +
-          numCal(row.dailyAssessmentSalary) +
-          numCal(row.awardSalary) +
-          numCal(row.dutyAllowances) +
-          numCal(row.classTeacherSubsidy) +
-          numCal(row.subsidy) -
-          numCal(row.deductions) +
-          numCal(row.insurancePersonage) +
-          numCal(row.reservedFundsPersonage);
+            numCal(row.workloadSalary) +
+            numCal(row.dailyAssessmentSalary) +
+            numCal(row.awardSalary) +
+            numCal(row.dutyAllowances) +
+            numCal(row.classTeacherSubsidy) +
+            numCal(row.subsidy) -
+            numCal(row.deductions) +
+            numCal(row.insurancePersonage) +
+            numCal(row.reservedFundsPersonage)
+        ).toFixed(2);
       }
       // 11.实发工资=应发工资-个人所得税-个人保险-公积金个人
-      row.fSalary =
+      row.fSalary = Number(
         numCal(row.salary) -
-        numCal(row.personageTaxes) -
-        numCal(row.insurancePersonage) -
-        numCal(row.reservedFundsPersonage);
+          numCal(row.personageTaxes) -
+          numCal(row.insurancePersonage) -
+          numCal(row.reservedFundsPersonage)
+      ).toFixed(2);
     },
     //导出工资条
     exportSalary() {

+ 111 - 99
src/views/salaryManagement/logisticsDepartment/detailsPage.vue

@@ -1733,129 +1733,141 @@ export default {
     },
     salaryAdd(row) {
       // 1. 基础工资 = +M153(校龄工资)+N153(增资)+O153(学历工资)+Q153(职级工资)+L153(履约奖)+R153(工资基数)
-      row.basicsSalary =
+      row.basicsSalary = Number(
         numCal(row.schoolAgeSalary) +
-        numCal(row.capitalIncrease) +
-        numCal(row.educationSalary) +
-        numCal(row.rankSalary) +
-        numCal(row.salaryBase) +
-        numCal(row.performanceAward);
-      //2. 工作量工资 = 月份工作量工资+代课工作量工资+双休日工作量工资+工作量工资1+…+工作量工资5
-      row.workloadSalary =
+          numCal(row.capitalIncrease) +
+          numCal(row.educationSalary) +
+          numCal(row.rankSalary) +
+          numCal(row.salaryBase) +
+          numCal(row.performanceAward)
+      ).toFixed(2);
+      //2. 工作量工资 = 月份工作量工资+代课工作量工资+双休日工作量工资+工作量工资1+…+工作量工资5-虚拟工作量工资标准-虚拟双休日工作量工资标准
+      row.workloadSalary = Number(
         numCal(row.momthWorkloadSalary) +
-        numCal(row.customTwo) +
-        numCal(row.doubleMoney) +
-        numCal(row.customThree) +
-        numCal(row.customFour) +
-        numCal(row.customFive) +
-        numCal(row.customSix) +
-        numCal(row.customSeven) -
-        numCal(row.virtualDailyAssessmentCriteria) -
-        numCal(row.virtualDoubleCease);
+          numCal(row.customTwo) +
+          numCal(row.doubleMoney) +
+          numCal(row.customThree) +
+          numCal(row.customFour) +
+          numCal(row.customFive) +
+          numCal(row.customSix) +
+          numCal(row.customSeven) -
+          numCal(row.virtualDailyAssessmentCriteria) -
+          numCal(row.virtualDoubleCease)
+      ).toFixed(2);
       //3.日常考核工资 =日常考核工资-虚拟日常考核标准
-      row.dailyAssessmentSalary =
+      row.dailyAssessmentSalary = Number(
         numCal(row.dailyAssessmentSalary) -
-        numCal(row.virtualDailyAssessmentCriteria);
+          numCal(row.virtualDailyAssessmentCriteria)
+      ).toFixed(2);
       // 4.绩效工资=学期绩效工资+学期绩效工资1+..+学期绩效工资5
-      row.customizeFour =
+      row.customizeFour = Number(
         numCal(row.termPerformanceSalary) +
-        numCal(row.customNine) +
-        numCal(row.customize) +
-        numCal(row.customizeOne) +
-        numCal(row.customizeTwo) +
-        numCal(row.customizeThree);
+          numCal(row.customNine) +
+          numCal(row.customize) +
+          numCal(row.customizeOne) +
+          numCal(row.customizeTwo) +
+          numCal(row.customizeThree)
+      ).toFixed(2);
       // 5.奖励工资=奖励1+…+奖励10
-      row.awardSalary =
+      row.awardSalary = Number(
         numCal(row.customAward) +
-        numCal(row.customAwardOne) +
-        numCal(row.customAwardTwo) +
-        numCal(row.customAwardThree) +
-        numCal(row.customAwardFour) +
-        numCal(row.customAwardFive) +
-        numCal(row.customAwardSix) +
-        numCal(row.customAwardSeven) +
-        numCal(row.customAwardEight) +
-        numCal(row.customAwardNine);
+          numCal(row.customAwardOne) +
+          numCal(row.customAwardTwo) +
+          numCal(row.customAwardThree) +
+          numCal(row.customAwardFour) +
+          numCal(row.customAwardFive) +
+          numCal(row.customAwardSix) +
+          numCal(row.customAwardSeven) +
+          numCal(row.customAwardEight) +
+          numCal(row.customAwardNine)
+      ).toFixed(2);
       // 6.职务津贴=领导干部补贴+领导干部考核补贴+备课组长+备课组长考核补贴+教研组长+教研组长考核补贴
-      row.dutyAllowances =
+      row.dutyAllowances = Number(
         numCal(row.leadingCadreSubsidy) +
-        numCal(row.customizeFive) +
-        numCal(row.prepareLessons) +
-        numCal(row.customizeSix) +
-        numCal(row.teachingResearch) +
-        numCal(row.customizeSeven);
+          numCal(row.customizeFive) +
+          numCal(row.prepareLessons) +
+          numCal(row.customizeSix) +
+          numCal(row.teachingResearch) +
+          numCal(row.customizeSeven)
+      ).toFixed(2);
       // 7.班主任津贴=班主任补贴+班额津贴-校车考核-班级微信群考核-财务考核+班主任考核津贴
-      row.classTeacherSubsidy =
+      row.classTeacherSubsidy = Number(
         numCal(row.classTeacherFee) +
-        numCal(row.classes) -
-        numCal(row.adjustTheBalance) -
-        numCal(row.payrollCredit) -
-        numCal(row.paid) +
-        numCal(row.customizeEight);
+          numCal(row.classes) -
+          numCal(row.adjustTheBalance) -
+          numCal(row.payrollCredit) -
+          numCal(row.paid) +
+          numCal(row.customizeEight)
+      ).toFixed(2);
       // 8.补贴项=微信+产假工资+周末工作量工资+补贴1+…+补贴10
-      row.subsidy =
+      row.subsidy = Number(
         numCal(row.wx) +
-        numCal(row.maternityLeaveSalary) +
-        numCal(row.overtimeAtWeekend) +
-        numCal(row.yearUpPerformance) +
-        numCal(row.yearDownPerformance) +
-        numCal(row.cadreAllowanceReservation) +
-        numCal(row.vacationOvertimePay) +
-        numCal(row.newPostTrain) +
-        numCal(row.winningPrize) +
-        numCal(row.classMinister) +
-        numCal(row.monthViceClassFee) +
-        numCal(row.safetyFees) +
-        numCal(row.reserveReplacement);
+          numCal(row.maternityLeaveSalary) +
+          numCal(row.overtimeAtWeekend) +
+          numCal(row.yearUpPerformance) +
+          numCal(row.yearDownPerformance) +
+          numCal(row.cadreAllowanceReservation) +
+          numCal(row.vacationOvertimePay) +
+          numCal(row.newPostTrain) +
+          numCal(row.winningPrize) +
+          numCal(row.classMinister) +
+          numCal(row.monthViceClassFee) +
+          numCal(row.safetyFees) +
+          numCal(row.reserveReplacement)
+      ).toFixed(2);
       // 9.扣除项=出勤+督查+超额电话费+学习强国+宿舍管理费+生育津贴+扣除1+…+扣除10
-      row.deductions =
+      row.deductions = Number(
         numCal(row.attendance) +
-        numCal(row.inspectorFines) +
-        numCal(row.telephoneBill) +
-        numCal(row.learningPower) +
-        numCal(row.dormitoryManagementFee) +
-        numCal(row.childbirthAllowance) +
-        numCal(row.ribbonOne) +
-        numCal(row.ribbonTwo) +
-        numCal(row.ribbonThree) +
-        numCal(row.ribbonFour) +
-        numCal(row.ribbonFive) +
-        numCal(row.ribbonSix) +
-        numCal(row.ribbonSeven) +
-        numCal(row.ribbonEight) +
-        numCal(row.ribbonNine) +
-        numCal(row.pauseNoPay);
+          numCal(row.inspectorFines) +
+          numCal(row.telephoneBill) +
+          numCal(row.learningPower) +
+          numCal(row.dormitoryManagementFee) +
+          numCal(row.childbirthAllowance) +
+          numCal(row.ribbonOne) +
+          numCal(row.ribbonTwo) +
+          numCal(row.ribbonThree) +
+          numCal(row.ribbonFour) +
+          numCal(row.ribbonFive) +
+          numCal(row.ribbonSix) +
+          numCal(row.ribbonSeven) +
+          numCal(row.ribbonEight) +
+          numCal(row.ribbonNine) +
+          numCal(row.pauseNoPay)
+      ).toFixed(2);
       // 10.应发工资=基本工资+工作量工资+日常考核工资+奖励工资+职务津贴+班主任津贴+补贴项-扣除项+保险(个人部分)+公积金(个人部分).. 大于800 保险(个人部分) 不加
       if (row.enjoyOfficeTreatment == "是") {
-        row.salary =
+        row.salary = Number(
           numCal(row.basicsSalary) +
-          numCal(row.workloadSalary) +
-          numCal(row.dailyAssessmentSalary) +
-          numCal(row.awardSalary) +
-          numCal(row.dutyAllowances) +
-          numCal(row.classTeacherSubsidy) +
-          numCal(row.subsidy) -
-          numCal(row.deductions) +
-          numCal(row.reservedFundsPersonage);
+            numCal(row.workloadSalary) +
+            numCal(row.dailyAssessmentSalary) +
+            numCal(row.awardSalary) +
+            numCal(row.dutyAllowances) +
+            numCal(row.classTeacherSubsidy) +
+            numCal(row.subsidy) -
+            numCal(row.deductions) +
+            numCal(row.reservedFundsPersonage)
+        ).toFixed(2);
       } else {
-        row.salary =
+        row.salary = Number(
           numCal(row.basicsSalary) +
-          numCal(row.workloadSalary) +
-          numCal(row.dailyAssessmentSalary) +
-          numCal(row.awardSalary) +
-          numCal(row.dutyAllowances) +
-          numCal(row.classTeacherSubsidy) +
-          numCal(row.subsidy) -
-          numCal(row.deductions) +
-          numCal(row.insurancePersonage) +
-          numCal(row.reservedFundsPersonage);
+            numCal(row.workloadSalary) +
+            numCal(row.dailyAssessmentSalary) +
+            numCal(row.awardSalary) +
+            numCal(row.dutyAllowances) +
+            numCal(row.classTeacherSubsidy) +
+            numCal(row.subsidy) -
+            numCal(row.deductions) +
+            numCal(row.insurancePersonage) +
+            numCal(row.reservedFundsPersonage)
+        ).toFixed(2);
       }
       // 11.实发工资=应发工资-个人所得税-个人保险-公积金个人
-      row.fSalary =
+      row.fSalary = Number(
         numCal(row.salary) -
-        numCal(row.personageTaxes) -
-        numCal(row.insurancePersonage) -
-        numCal(row.reservedFundsPersonage);
+          numCal(row.personageTaxes) -
+          numCal(row.insurancePersonage) -
+          numCal(row.reservedFundsPersonage)
+      ).toFixed(2);
     },
     //导出工资条
     exportSalary() {

+ 24 - 24
src/views/salaryManagement/primarySchool/detailsPage.vue

@@ -1735,15 +1735,15 @@ export default {
     },
     salaryAdd(row) {
       // 1. 基础工资 = +M153(校龄工资)+N153(增资)+O153(学历工资)+Q153(职级工资)+L153(履约奖)+R153(工资基数)
-      row.basicsSalary =
+      row.basicsSalary =Number(
         numCal(row.schoolAgeSalary) +
         numCal(row.capitalIncrease) +
         numCal(row.educationSalary) +
         numCal(row.rankSalary) +
         numCal(row.salaryBase) +
-        numCal(row.performanceAward);
+        numCal(row.performanceAward)).toFixed(2);
       //2. 工作量工资 = 月份工作量工资+代课工作量工资+双休日工作量工资+工作量工资1+…+工作量工资5-虚拟工作量工资标准-虚拟双休日工作量工资标准
-      row.workloadSalary =
+      row.workloadSalary =Number(
         numCal(row.momthWorkloadSalary) +
         numCal(row.customTwo) +
         numCal(row.doubleMoney) +
@@ -1753,21 +1753,21 @@ export default {
         numCal(row.customSix) +
         numCal(row.customSeven) -
         numCal(row.virtualDailyAssessmentCriteria) -
-        numCal(row.virtualDoubleCease);
+        numCal(row.virtualDoubleCease)).toFixed(2);
       //3.日常考核工资 =日常考核工资-虚拟日常考核标准
-      row.dailyAssessmentSalary =
+      row.dailyAssessmentSalary =Number(
         numCal(row.dailyAssessmentSalary) -
-        numCal(row.virtualDailyAssessmentCriteria);
+        numCal(row.virtualDailyAssessmentCriteria)).toFixed(2);
       // 4.绩效工资=学期绩效工资+学期绩效工资1+..+学期绩效工资5
-      row.customizeFour =
+      row.customizeFour =Number(
         numCal(row.termPerformanceSalary) +
         numCal(row.customNine) +
         numCal(row.customize) +
         numCal(row.customizeOne) +
         numCal(row.customizeTwo) +
-        numCal(row.customizeThree);
+        numCal(row.customizeThree)).toFixed(2);
       // 5.奖励工资=奖励1+…+奖励10
-      row.awardSalary =
+      row.awardSalary =Number(
         numCal(row.customAward) +
         numCal(row.customAwardOne) +
         numCal(row.customAwardTwo) +
@@ -1777,25 +1777,25 @@ export default {
         numCal(row.customAwardSix) +
         numCal(row.customAwardSeven) +
         numCal(row.customAwardEight) +
-        numCal(row.customAwardNine);
+        numCal(row.customAwardNine)).toFixed(2);
       // 6.职务津贴=领导干部补贴+领导干部考核补贴+备课组长+备课组长考核补贴+教研组长+教研组长考核补贴
-      row.dutyAllowances =
+      row.dutyAllowances =Number(
         numCal(row.leadingCadreSubsidy) +
         numCal(row.customizeFive) +
         numCal(row.prepareLessons) +
         numCal(row.customizeSix) +
         numCal(row.teachingResearch) +
-        numCal(row.customizeSeven);
+        numCal(row.customizeSeven)).toFixed(2);
       // 7.班主任津贴=班主任补贴+班额津贴-校车考核-班级微信群考核-财务考核+班主任考核津贴
-      row.classTeacherSubsidy =
+      row.classTeacherSubsidy =Number(
         numCal(row.classTeacherFee) +
         numCal(row.classes) -
         numCal(row.adjustTheBalance) -
         numCal(row.payrollCredit) -
         numCal(row.paid) +
-        numCal(row.customizeEight);
+        numCal(row.customizeEight)).toFixed(2);
       // 8.补贴项=微信+产假工资+周末工作量工资+补贴1+…+补贴10
-      row.subsidy =
+      row.subsidy =Number(
         numCal(row.wx) +
         numCal(row.maternityLeaveSalary) +
         numCal(row.overtimeAtWeekend) +
@@ -1808,9 +1808,9 @@ export default {
         numCal(row.classMinister) +
         numCal(row.monthViceClassFee) +
         numCal(row.safetyFees) +
-        numCal(row.reserveReplacement);
+        numCal(row.reserveReplacement)).toFixed(2);
       // 9.扣除项=出勤+督查+超额电话费+学习强国+宿舍管理费+生育津贴+扣除1+…+扣除10
-      row.deductions =
+      row.deductions =Number(
         numCal(row.attendance) +
         numCal(row.inspectorFines) +
         numCal(row.telephoneBill) +
@@ -1826,10 +1826,10 @@ export default {
         numCal(row.ribbonSeven) +
         numCal(row.ribbonEight) +
         numCal(row.ribbonNine) +
-        numCal(row.pauseNoPay);
+        numCal(row.pauseNoPay)).toFixed(2);
       // 10.应发工资=基本工资+工作量工资+日常考核工资+奖励工资+职务津贴+班主任津贴+补贴项-扣除项+保险(个人部分)+公积金(个人部分).. 大于800 保险(个人部分) 不加
       if (row.enjoyOfficeTreatment == "是") {
-        row.salary =
+        row.salary =Number(
           numCal(row.basicsSalary) +
           numCal(row.workloadSalary) +
           numCal(row.dailyAssessmentSalary) +
@@ -1838,9 +1838,9 @@ export default {
           numCal(row.classTeacherSubsidy) +
           numCal(row.subsidy) -
           numCal(row.deductions) +
-          numCal(row.reservedFundsPersonage);
+          numCal(row.reservedFundsPersonage)).toFixed(2);
       } else {
-        row.salary =
+        row.salary =Number(
           numCal(row.basicsSalary) +
           numCal(row.workloadSalary) +
           numCal(row.dailyAssessmentSalary) +
@@ -1850,14 +1850,14 @@ export default {
           numCal(row.subsidy) -
           numCal(row.deductions) +
           numCal(row.insurancePersonage) +
-          numCal(row.reservedFundsPersonage);
+          numCal(row.reservedFundsPersonage)).toFixed(2);
       }
       // 11.实发工资=应发工资-个人所得税-个人保险-公积金个人
-      row.fSalary =
+      row.fSalary =Number(
         numCal(row.salary) -
         numCal(row.personageTaxes) -
         numCal(row.insurancePersonage) -
-        numCal(row.reservedFundsPersonage);
+        numCal(row.reservedFundsPersonage)).toFixed(2);
     },
     //导出工资条
     exportSalary() {