瀏覽代碼

修改问题

lex-xin 5 年之前
父節點
當前提交
137831a266

+ 0 - 1
dist/css/PeriodAdjust.0aaec190.css

@@ -1 +0,0 @@
-.periodadjust[data-v-045787c0]{height:100vh;position:relative;background-color:#f3f4f8}.periodadjust .container[data-v-045787c0]{min-height:calc(100vh - 50px);overflow-y:auto;overflow-x:hidden;position:relative}.periodadjust .button-group[data-v-045787c0]{width:100%}.periodadjust .button-group .van-button[data-v-045787c0]{font-size:.16rem;width:50%}.periodadjust .button-group .van-button--primary[data-v-045787c0]{background:#14928a}[data-v-045787c0] .van-cell__title{font-size:.16rem;color:#444}[data-v-045787c0] .van-cell-group{margin-top:.05rem}.title-content[data-v-045787c0]{-webkit-box-flex:1;-ms-flex:1 auto;flex:1 auto;font-weight:700}.title-content .van-cell__label[data-v-045787c0]{font-weight:400;margin-top:.06rem;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.title-content .van-icon-location[data-v-045787c0]{margin-right:.05rem}[data-v-045787c0] .van-cell__label,[data-v-045787c0] .van-cell__value{color:#777;font-size:.14rem}[data-v-045787c0] .van-cell__label span,[data-v-045787c0] .van-cell__value span{padding-right:.1rem}.input-cell[data-v-045787c0]{padding:.12rem .16rem .2rem}.input-cell .van-radio[data-v-045787c0]{-webkit-box-pack:end;-ms-flex-pack:end;justify-content:flex-end}[data-v-045787c0] .van-radio__icon .van-icon{border-color:#aaa}[data-v-045787c0] .van-radio__icon--checked .van-icon{background:#f97215;border-color:#f97215}[data-v-045787c0] .icon{margin-top:.2rem}

+ 1 - 0
dist/css/PeriodAdjust.7fb428b9.css

@@ -0,0 +1 @@
+.periodadjust[data-v-76bb4eb2]{height:100vh;position:relative;background-color:#f3f4f8}.periodadjust .container[data-v-76bb4eb2]{min-height:calc(100vh - 50px);overflow-y:auto;overflow-x:hidden;position:relative}.periodadjust .button-group[data-v-76bb4eb2]{width:100%}.periodadjust .button-group .van-button[data-v-76bb4eb2]{font-size:.16rem;width:50%}.periodadjust .button-group .van-button--primary[data-v-76bb4eb2]{background:#14928a}[data-v-76bb4eb2] .van-cell__title{font-size:.16rem;color:#444}[data-v-76bb4eb2] .van-cell-group{margin-top:.05rem}.title-content[data-v-76bb4eb2]{-webkit-box-flex:1;-ms-flex:1 auto;flex:1 auto;font-weight:700}.title-content .van-cell__label[data-v-76bb4eb2]{font-weight:400;margin-top:.06rem;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.title-content .van-icon-location[data-v-76bb4eb2]{margin-right:.05rem}[data-v-76bb4eb2] .van-cell__label,[data-v-76bb4eb2] .van-cell__value{color:#777;font-size:.14rem}[data-v-76bb4eb2] .van-cell__label span,[data-v-76bb4eb2] .van-cell__value span{padding-right:.1rem}.input-cell[data-v-76bb4eb2]{padding:.12rem .16rem .2rem}.input-cell .van-radio[data-v-76bb4eb2]{-webkit-box-pack:end;-ms-flex-pack:end;justify-content:flex-end}[data-v-76bb4eb2] .van-radio__icon .van-icon{border-color:#aaa}[data-v-76bb4eb2] .van-radio__icon--checked .van-icon{background:#f97215;border-color:#f97215}[data-v-76bb4eb2] .icon{margin-top:.2rem}

+ 1 - 0
dist/css/PeriodChange.c99b25fc.css

@@ -0,0 +1 @@
+.periodchange[data-v-3761342a]{min-height:100vh;position:relative}.periodchange .container[data-v-3761342a]{height:calc(100vh - 50px);overflow-y:auto;overflow-x:hidden}.periodchange .button-group[data-v-3761342a]{width:100%;position:absolute;bottom:0;left:0}.periodchange .button-group .van-button--primary[data-v-3761342a]{background:#14928a}[data-v-3761342a] .van-cell__title{font-size:.16rem;color:#444}[data-v-3761342a] .van-cell-group{margin-top:.05rem}.title-content[data-v-3761342a]{font-weight:700}.title-content .van-cell__label[data-v-3761342a]{font-weight:400;margin-top:.06rem;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.title-content .van-icon-location[data-v-3761342a]{margin-right:.05rem}[data-v-3761342a] .van-cell__label,[data-v-3761342a] .van-cell__value{color:#777}[data-v-3761342a] .van-cell__label span,[data-v-3761342a] .van-cell__value span{padding-right:.1rem}.input-cell[data-v-3761342a]{padding:.12rem .16rem .2rem}.input-cell .van-radio[data-v-3761342a]{-webkit-box-pack:end;-ms-flex-pack:end;justify-content:flex-end}[data-v-3761342a] .van-radio__icon .van-icon{border-color:#aaa}[data-v-3761342a] .van-radio__icon--checked .van-icon{background:#f97215;border-color:#f97215}[data-v-3761342a] .icon{margin-top:.2rem}

+ 0 - 1
dist/css/PeriodChange.f0462853.css

@@ -1 +0,0 @@
-.periodchange[data-v-fbe45de0]{min-height:100vh;position:relative}.periodchange .container[data-v-fbe45de0]{height:calc(100vh - 50px);overflow-y:auto;overflow-x:hidden}.periodchange .button-group[data-v-fbe45de0]{width:100%;position:absolute;bottom:0;left:0}.periodchange .button-group .van-button--primary[data-v-fbe45de0]{background:#14928a}[data-v-fbe45de0] .van-cell__title{font-size:.16rem;color:#444}[data-v-fbe45de0] .van-cell-group{margin-top:.05rem}.title-content[data-v-fbe45de0]{font-weight:700}.title-content .van-cell__label[data-v-fbe45de0]{font-weight:400;margin-top:.06rem;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.title-content .van-icon-location[data-v-fbe45de0]{margin-right:.05rem}[data-v-fbe45de0] .van-cell__label,[data-v-fbe45de0] .van-cell__value{color:#777}[data-v-fbe45de0] .van-cell__label span,[data-v-fbe45de0] .van-cell__value span{padding-right:.1rem}.input-cell[data-v-fbe45de0]{padding:.12rem .16rem .2rem}.input-cell .van-radio[data-v-fbe45de0]{-webkit-box-pack:end;-ms-flex-pack:end;justify-content:flex-end}[data-v-fbe45de0] .van-radio__icon .van-icon{border-color:#aaa}[data-v-fbe45de0] .van-radio__icon--checked .van-icon{background:#f97215;border-color:#f97215}[data-v-fbe45de0] .icon{margin-top:.2rem}

File diff suppressed because it is too large
+ 0 - 0
dist/css/VIPApply.8a29c90b.css


File diff suppressed because it is too large
+ 0 - 0
dist/index.html


File diff suppressed because it is too large
+ 0 - 0
dist/js/Approval~Attendance~IStarted~Leave~PeriodAdjust~PeriodChange~TeachingSchool~TeachingSet~VIPApply~ord~3d35106e.b9d7ace2.js


File diff suppressed because it is too large
+ 0 - 0
dist/js/Approval~Attendance~IStarted~Leave~PeriodAdjust~PeriodChange~TeachingSchool~TeachingSet~VIPApply~ord~3d35106e.b9d7ace2.js.map


File diff suppressed because it is too large
+ 0 - 0
dist/js/Approval~Attendance~IStarted~Leave~PeriodAdjust~PeriodChange~TeachingSchool~TeachingSet~VIPApply~ord~3d35106e.ec45b0d3.js


File diff suppressed because it is too large
+ 0 - 0
dist/js/PeriodAdjust.178a9933.js


File diff suppressed because it is too large
+ 0 - 0
dist/js/PeriodAdjust.178a9933.js.map


File diff suppressed because it is too large
+ 0 - 0
dist/js/PeriodAdjust.460efc0a.js


File diff suppressed because it is too large
+ 0 - 0
dist/js/PeriodAdjust.460efc0a.js.map


File diff suppressed because it is too large
+ 0 - 0
dist/js/PeriodChange.24399c8e.js


File diff suppressed because it is too large
+ 0 - 0
dist/js/PeriodChange.24399c8e.js.map


File diff suppressed because it is too large
+ 0 - 0
dist/js/PeriodChange.ed7473cc.js


File diff suppressed because it is too large
+ 0 - 0
dist/js/PeriodChange.ed7473cc.js.map


File diff suppressed because it is too large
+ 0 - 0
dist/js/VIPApply.6d8a8c86.js


File diff suppressed because it is too large
+ 0 - 0
dist/js/VIPApply.6d8a8c86.js.map


File diff suppressed because it is too large
+ 0 - 0
dist/js/VIPApply.b931d231.js


File diff suppressed because it is too large
+ 0 - 0
dist/js/VIPApply.b931d231.js.map


File diff suppressed because it is too large
+ 0 - 0
dist/js/app.107b95aa.js


File diff suppressed because it is too large
+ 0 - 0
dist/js/app.107b95aa.js.map


+ 2 - 2
src/views/teacher/PeriodAdjust.vue

@@ -25,7 +25,7 @@
         <van-sticky v-if="dataShow">
             <div class="button-group">
                 <van-button type="default" @click="onDateChange" size="large">课时调整</van-button>
-                <van-button type="primary" @click="onSubmit" size="large">课时交换</van-button>
+                <van-button type="primary" @click="onSubmit" size="large">去换课</van-button>
             </div>
         </van-sticky>
         <van-popup v-model="dataForm.status" position="bottom">
@@ -182,7 +182,7 @@ export default {
             })
         },
         getDateInfo(value) {
-            let d = new Date(value)
+            let d = new Date(value.replace(/-/ig, '/'))
             let hour = d.getHours() >= 10 ? d.getHours() : '0' + d.getHours()
             let minute = d.getMinutes() >= 10 ? d.getMinutes() : '0' + d.getMinutes()
             return hour + ':' + minute + ':00'

+ 1 - 1
src/views/teacher/PeriodChange.vue

@@ -100,7 +100,7 @@ export default {
                 params = this.$route.query,
                 classTime = item.classDate.split(' ')[0],
                 startTime = item.startClassTime.split(' ')[1]
-            let firstClass = params.classDate + ' ' + params.name + ' ' + startTime + '<br/>与'
+            let firstClass = params.classDate + ' ' + params.name + ' ' + params.startTime + '<br/>与'
             let lastClass = classTime + ' ' + item.name + ' ' + startTime + '<br/>上课时间互换'
             this.$dialog.confirm({
                 message:  firstClass + lastClass

+ 16 - 5
src/views/teacher/VIPApply.vue

@@ -399,8 +399,8 @@ export default {
                 this.setTimeTable() // 重新排课
 
                 // 时间安排
-                form.registrationStartTime = value.startTime
-                form.coursesExpireDate = value.endTime
+                // form.registrationStartTime = value.startTime
+                // form.coursesExpireDate = value.endTime
             } else if(sheetForm.currentType == 'teacherSchool') { // 线下课地址
                 form.teacherSchoolId = value.value
                 formName.teacherSchoolName = value.text
@@ -646,14 +646,15 @@ export default {
                     let onss = obj.onlineSalarySettlement
                     // 有线上课
                     if(onss.salarySettlementType == 'TEACHER_DEFAULT') {
-                        let b = (vcs.singleClassMinutes / 30).toFixed(2) // 每30Min计算一些课酬
-                        form.onlineTeacherSalary = b * tc.onlineClassesSalary // 线上课酬
+                        let b = vcs.singleClassMinutes / 30 // 每30Min计算一些课酬
+                        form.onlineTeacherSalary = (b * tc.onlineClassesSalary).toFixed(2) // 线上课酬
                     } else if(onss.salarySettlementType == 'RATIO_DISCOUNT') {
                         // 老师课酬的折扣 如果有则不打折
-                        form.onlineTeacherSalary = vcs.onlineClassesUnitPrice * (onss.settlementValue ? onss.settlementValue : 100) / 10
+                        form.onlineTeacherSalary = (vcs.onlineClassesUnitPrice * (onss.settlementValue ? onss.settlementValue : 100) / 100).toFixed(2)
                     } else if(onss.salarySettlementType == 'FIXED_SALARY') {
                         form.onlineTeacherSalary = (onss.settlementValue).toFixed(2)
                     }
+                    form.onlineTeacherSalary = Number(form.onlineTeacherSalary)
                 }
                 if (obj && obj.offlineSalarySettlement) {
                     let offss = obj.offlineSalarySettlement
@@ -667,6 +668,7 @@ export default {
                     } else if(offss.salarySettlementType == 'FIXED_SALARY') {
                         form.offlineTeacherSalary = (offss.settlementValue).toFixed(2)
                     }
+                    form.offlineTeacherSalary = Number(form.offlineTeacherSalary)
                 }
             }
 
@@ -792,6 +794,15 @@ export default {
                 return false
             }
 
+            if(!form.registrationStartTime) {
+                this.$toast('请选择报名开始时间')
+                return false
+            }
+            if(!form.coursesExpireDate) {
+                this.$toast('请选择报名结束时间')
+                return false
+            }
+
             let vipGroupActivitySelect = this.loadData.vipGroupActivitySelect
             if(vipGroupActivitySelect.type == 'GIVE_CLASS' && !form.giveTeachMode) {
                 this.$toast('请选择赠课类型')

Some files were not shown because too many files changed in this diff