01/20 11:09

修复BUG

src/views/teacherManager/teacherOperation/components/salarySet.vue

@@ -107,11 +107,10 @@
 
         <el-form style="margin-top: 20px;">
           <el-form-item label="生效日期">
-            <el-date-picker
-              v-model="startDate"
-              type="date"
-              value-format="yyyy-MM-dd"
-              placeholder="选择日期">
+            <el-date-picker v-model="startDate"
+                            type="date"
+                            value-format="yyyy-MM-dd"
+                            placeholder="选择日期">
             </el-date-picker>
           </el-form-item>
         </el-form>
@@ -128,7 +127,7 @@
 <script>
 import { vipGroupSalaryList, vipGroupSalarySet, teacherSalaryList, teacherSalaryBatchUpset } from '@/api/teacherManager'
 import { sysConfigList } from '@/api/generalSettings'
-import { findTeacherDefaultSalary } from '@/api/vipSeting' 
+import { findTeacherDefaultSalary } from '@/api/vipSeting'
 let nowTime = new Date()
 let checkTime = nowTime.getFullYear() + '-' + (nowTime.getMonth() + 1) + '-' + nowTime.getDate()
 export default {
@@ -192,7 +191,7 @@ export default {
       musicGroupTable: [],
       ruleList: [],
       vipList: [],
-      startDate: checkTime
+      startDate: null
     }
   },
   created () {
@@ -334,7 +333,10 @@ export default {
         }
       })
       // 判断输入的值是否正确
-      if (!checkStatus) return false
+      if (!this.startDate) {
+        this.$message.error('请填写生效日期')
+        return;
+      }
 
       this.$confirm('您确定更改老师课酬', '提示', {
         confirmButtonText: '确定',
@@ -361,8 +363,8 @@ export default {
             })
           }
         })
-      }).catch(() => {})
-      
+      }).catch(() => { })
+
     }
   }
 }

src/views/teamBuild/components/teamSoundMoney.vue

@@ -292,7 +292,7 @@
     <el-dialog title="乐团预览"
                :visible.sync="previewVisible">
       <div class="baseRight">
-        <header>乐团注册</header>
+        <header>乐团缴费</header>
         <div class="section">
           <h2 class="title line_bottom">课程</h2>
           <p class="indate line_bottom"

src/views/teamDetail/components/courseList.vue

@@ -38,7 +38,7 @@
                      value="OVER"></el-option>
         </el-select>
       </el-form-item>
-      <el-form-item >
+      <el-form-item>
         <!-- getMusicGroupAllClass -->
         <el-select v-model="searchForm.class"
                    placeholder="班级名称"
@@ -55,8 +55,10 @@
                    placeholder="是否结算"
                    filterable
                    clearable>
-          <el-option value="0" label="未结算"></el-option>
-          <el-option value="1" label="已结算"></el-option>
+          <el-option value="0"
+                     label="未结算"></el-option>
+          <el-option value="1"
+                     label="已结算"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item>
@@ -162,9 +164,11 @@
           <template slot-scope="scope">
             <div>
               <el-button v-if="scope.row.courseScheduleStatus == 'OVER' && !scope.row.settlementTime && permission('teacherAttendance/updateTeacherAttendance')"
-                         type="text" @click="onMarkAttendance(scope.row)">补考勤</el-button>
+                         type="text"
+                         @click="onMarkAttendance(scope.row)">补考勤</el-button>
               <el-button v-if="scope.row.courseScheduleStatus == 'OVER' && !scope.row.settlementTime && permission('studentAttendance/updateStudentAttendances')"
-                         type="text" @click="onCallName(scope.row)">点名表</el-button>
+                         type="text"
+                         @click="onCallName(scope.row)">点名表</el-button>
               <!-- OVER -->
               <el-button v-if="scope.row.courseScheduleStatus == 'OVER' && permission('courseSchedule/classStartDateAdjust1')"
                          type="text"
@@ -288,14 +292,15 @@
                :visible.sync="markAttendance.status">
       <el-form>
         <el-form-item label="签到状态">{{ markAttendance.dataInfo.signInStatus | attendanceType }} </el-form-item>
-        <el-form-item label="签到时间">{{ markAttendance.dataInfo.classDate + ' ' + markAttendance.dataInfo.startClassTime}}</el-form-item>
+        <el-form-item label="签到时间">{{ markAttendance.dataInfo.signInTime}}</el-form-item>
         <el-form-item label="签退状态">{{ markAttendance.dataInfo.signOutStatus | attendanceOutType }} </el-form-item>
-        <el-form-item label="签到时间">{{ markAttendance.dataInfo.classDate + ' ' + markAttendance.dataInfo.endClassTime}}</el-form-item>
+        <el-form-item label="签退时间">{{ markAttendance.dataInfo.signOutTime}}</el-form-item>
       </el-form>
       <div slot="footer"
            class="dialog-footer">
         <el-button @click="markAttendance.status = false">取 消</el-button>
-        <el-button type="primary" :disabled="markAttendance.dataInfo.signOutStatus == 1 && markAttendance.dataInfo.signInStatus == 1 ? true : false"
+        <el-button type="primary"
+                   :disabled="markAttendance.dataInfo.signOutStatus == 1 && markAttendance.dataInfo.signInStatus == 1 ? true : false"
                    @click="batchAdjustmentTime">确定补卡</el-button>
       </div>
     </el-dialog>
@@ -304,19 +309,37 @@
                width="700px"
                :visible.sync="rollCall.status">
       <el-table :data="rollCall.gridData">
-        <el-table-column align='center' property="userName" label="学员姓名"></el-table-column>
-        <el-table-column align='center' property="phone" label="手机号"></el-table-column>
-        <el-table-column align='center' property="subjectName" label="学员声部"></el-table-column>
-        <el-table-column align='center' label="到课状态">
+        <el-table-column align='center'
+                         property="userName"
+                         label="学员姓名"></el-table-column>
+        <el-table-column align='center'
+                         property="phone"
+                         label="手机号"></el-table-column>
+        <el-table-column align='center'
+                         property="subjectName"
+                         label="学员声部"></el-table-column>
+        <el-table-column align='center'
+                         label="到课状态">
           <template slot-scope="scope">
             {{ scope.row.status | studentCallName }}
           </template>
         </el-table-column>
-        <el-table-column align='center' label="操作" width="220px">
+        <el-table-column align='center'
+                         label="操作"
+                         width="220px">
           <template slot-scope="scope">
-            <el-button size="small" @click="onChangeRollCall('TRUANT', scope.row)" type="primary" round>未到</el-button>
-            <el-button size="small" @click="onChangeRollCall('LEAVE', scope.row)" type="warning" round>请假</el-button>
-            <el-button size="small" @click="onChangeRollCall('NORMAL', scope.row)" type="success" round>到课</el-button>
+            <el-button size="small"
+                       @click="onChangeRollCall('TRUANT', scope.row)"
+                       type="primary"
+                       round>未到</el-button>
+            <el-button size="small"
+                       @click="onChangeRollCall('LEAVE', scope.row)"
+                       type="warning"
+                       round>请假</el-button>
+            <el-button size="small"
+                       @click="onChangeRollCall('NORMAL', scope.row)"
+                       type="success"
+                       round>到课</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -423,18 +446,19 @@ export default {
         }
       })
     },
-    onMarkAttendance(item) { // 补考勤
+    onMarkAttendance (item) { // 补考勤
+      console.log(item)
       this.markAttendance = {
         status: true,
         dataInfo: item
       }
     },
-    onCallName(item) { // 点名表
+    onCallName (item) { // 点名表
       this.rollCall.page = 1
       this.rollCall.selectItem = item
       this.getCallName()
     },
-    getCallName() {
+    getCallName () {
       let rollCall = this.rollCall
       let params = {
         page: rollCall.page,
@@ -444,23 +468,23 @@ export default {
       findAttendanceStudentByCourseWithPage(params).then(res => {
         let result = res.data
         rollCall.status = true
-        if(res.code == 200) {
+        if (res.code == 200) {
           rollCall.gridData = result.rows
           rollCall.total = result.total
         }
       })
     },
-    onChangeRollCall(type, row) {
+    onChangeRollCall (type, row) {
       let rollCall = this.rollCall
       let params = {
         courseScheduleId: rollCall.selectItem.courseScheduleId,
-        studentAttendances:[{
-            userId: row.studentId,
-            status: type
+        studentAttendances: [{
+          userId: row.studentId,
+          status: type
         }]
       }
       updateStudentAttendances(params).then(res => {
-        if(res.code == 200) {
+        if (res.code == 200) {
           this.$message.success('修改成功')
           row.status = type
           this.getList();
@@ -487,7 +511,7 @@ export default {
         musicGroupId: this.teamid,
         startTime: searchForm.timer[0] || null,
         endTime: searchForm.timer[1] || null,
-        page: this.rules.page, 
+        page: this.rules.page,
         rows: this.rules.limit,
         classGroupId: searchForm.class || null,
         isSettlement: searchForm.isSettlement || null
@@ -609,7 +633,7 @@ export default {
         startTime: '',
         endTime: ''
       },
-      this.$refs['maskForm'].resetFields()
+        this.$refs['maskForm'].resetFields()
     },
     handleSelectionChange (val) {
       this.activeCourseList = val;
@@ -626,7 +650,7 @@ export default {
         "signOutStatus": 1
       }
       updateTeacherAttendance(params).then(res => {
-        if(res.code == 200) {
+        if (res.code == 200) {
           this.$message.success('补卡成功')
           this.markAttendance.status = false
           this.getList()

vue.config.js

@@ -20,8 +20,8 @@ const name = defaultSettings.title || '管乐迷后台管理系统' // page titl
 // let target = 'http://testadm.dayaedu.com/' //test环境
 // let target = 'http://192.168.3.27:8000' // 箭河
 // let target = 'http://192.168.3.28:8000' //邹璇
-let target = 'http://192.168.3.8:8000' //勇哥
-// let target = 'http://admin.dayaedu.com' // 测试服
+// let target = 'http://192.168.3.8:8000' //勇哥
+let target = 'http://admin.dayaedu.com' // 测试服
 // let target = 'http://192.168.3.48:8080' // 乔
 // All configuration item explanations can be find in https://cli.vuejs.org/config/
 module.exports = {