瀏覽代碼

修改课酬计算

lex-xin 5 年之前
父節點
當前提交
8061f50438

文件差異過大導致無法顯示
+ 0 - 0
dist/css/VIPApply.3ddcb8b2.css


文件差異過大導致無法顯示
+ 0 - 0
dist/index.html


文件差異過大導致無法顯示
+ 0 - 0
dist/js/Approval~Attendance~IStarted~Leave~PeriodAdjust~PeriodChange~TeachingSchool~TeachingSet~VIPApply~ord~3d35106e.b9d7ace2.js


文件差異過大導致無法顯示
+ 0 - 0
dist/js/Approval~Attendance~IStarted~Leave~PeriodAdjust~PeriodChange~TeachingSchool~TeachingSet~VIPApply~ord~3d35106e.b9d7ace2.js.map


文件差異過大導致無法顯示
+ 0 - 7
dist/js/Approval~Attendance~IStarted~Leave~PeriodAdjust~PeriodChange~TeachingSchool~TeachingSet~VIPApply~ord~3d35106e.ca99334f.js


文件差異過大導致無法顯示
+ 0 - 0
dist/js/Approval~Attendance~IStarted~Leave~PeriodAdjust~PeriodChange~TeachingSchool~TeachingSet~VIPApply~ord~3d35106e.ca99334f.js.map


文件差異過大導致無法顯示
+ 0 - 0
dist/js/PeriodAdjust.37cbbb00.js.map


文件差異過大導致無法顯示
+ 0 - 0
dist/js/PeriodAdjust.cf4dd0a7.js


文件差異過大導致無法顯示
+ 0 - 0
dist/js/PeriodAdjust.cf4dd0a7.js.map


文件差異過大導致無法顯示
+ 0 - 0
dist/js/VIPApply.3ea30488.js


文件差異過大導致無法顯示
+ 0 - 0
dist/js/VIPApply.3ea30488.js.map


文件差異過大導致無法顯示
+ 0 - 0
dist/js/VIPApply.a2744630.js


文件差異過大導致無法顯示
+ 0 - 0
dist/js/VIPApply.a2744630.js.map


文件差異過大導致無法顯示
+ 0 - 0
dist/js/app.97b42072.js


文件差異過大導致無法顯示
+ 0 - 0
dist/js/app.97b42072.js.map


+ 8 - 7
src/views/teacher/VIPApply.vue

@@ -678,17 +678,18 @@ export default {
                 let obj = JSON.parse(vas.salarySettlementJson)
                 // 获取每课时长
                 // 每45Min计算一些课酬
-                let b = form.singleClassMinutes ? (form.singleClassMinutes / 45) : 0
+                // let b = form.singleClassMinutes ? (form.singleClassMinutes / 45) : 0
+                // 课程按课来计算
                 if (obj && obj.onlineSalarySettlement) {
                     let onss = obj.onlineSalarySettlement
                     // 有线上课
                     if(onss.salarySettlementType == 'TEACHER_DEFAULT') {
-                        form.onlineTeacherSalary = Math.floor((b * tc.onlineClassesSalary) * 100) / 100 // 线上课酬
+                        form.onlineTeacherSalary = tc.onlineClassesSalary // 线上课酬
                     } else if(onss.salarySettlementType == 'RATIO_DISCOUNT') {
                         // 老师课酬的折扣 如果有则不打折
-                        form.onlineTeacherSalary = Math.floor((vcs.onlineClassesUnitPrice * (onss.settlementValue ? onss.settlementValue : 100) / 100) * 100 ) / 100
+                        form.onlineTeacherSalary = (vcs.onlineClassesUnitPrice * (onss.settlementValue ? onss.settlementValue : 100) / 100).toFixed(2)
                     } else if(onss.salarySettlementType == 'FIXED_SALARY') {
-                        form.onlineTeacherSalary = Math.floor((onss.settlementValue) * 100) / 100
+                        form.onlineTeacherSalary = (onss.settlementValue).toFixed(2)
                     }
                     form.onlineTeacherSalary = Number(form.onlineTeacherSalary)
                 }
@@ -696,12 +697,12 @@ export default {
                     let offss = obj.offlineSalarySettlement
                     // 有线下课
                     if(offss.salarySettlementType == 'TEACHER_DEFAULT') {
-                        form.offlineTeacherSalary = Math.floor((b * tc.offlineClassesSalary) * 100 ) / 100 // 线上课酬
+                        form.offlineTeacherSalary = tc.offlineClassesSalary // 线上课酬
                     } else if(offss.salarySettlementType == 'RATIO_DISCOUNT') {
                         // 老师课酬的折扣
-                        form.offlineTeacherSalary = Math.floor((vcs.offlineClassesUnitPrice * (offss.settlementValue ? offss.settlementValue : 100) / 100) * 100 ) / 100
+                        form.offlineTeacherSalary = (vcs.offlineClassesUnitPrice * (offss.settlementValue ? offss.settlementValue : 100) / 100).toFixed(2)
                     } else if(offss.salarySettlementType == 'FIXED_SALARY') {
-                        form.offlineTeacherSalary = Math.floor((offss.settlementValue) * 100) / 100
+                        form.offlineTeacherSalary = (offss.settlementValue).toFixed(2)
                     }
                     form.offlineTeacherSalary = Number(form.offlineTeacherSalary)
                 }

部分文件因文件數量過多而無法顯示