1125 20:45

111

dist/static/css/chunk-49e7e960.e23294e5.css → dist/static/css/chunk-46bc8436.534fabbd.css

@@ -1 +1 @@
-.m-core[data-v-3bfcf84b]{margin-top:30px;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-ms-flex-pack:distribute;justify-content:space-around}.m-core .el-input[data-v-3bfcf84b]{width:180px}.m-core h4[data-v-3bfcf84b]{font-size:16px;background-color:#ccc;color:#fff;text-align:center;width:100%;height:40px;line-height:40px;margin-bottom:20px}.m-core .center[data-v-3bfcf84b],.m-core .right[data-v-3bfcf84b],.m-core .vipLeft[data-v-3bfcf84b]{width:400px}.planList[data-v-3bfcf84b]{padding:0 25px}.planList .planTop[data-v-3bfcf84b]{height:40px;line-height:40px;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;border-bottom:1px solid #ccc;margin-top:20px}.planList .planTop>p[data-v-3bfcf84b]{font-size:14px}.planList .planCore .row[data-v-3bfcf84b]{width:100%;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;-ms-flex-wrap:nowrap;flex-wrap:nowrap;height:40px;line-height:40px;font-size:14px;text-align:center}.planList .planCore .row div[data-v-3bfcf84b]{width:87px}.okBtn[data-v-3bfcf84b]{width:120px;height:40px;line-height:40px;text-align:center;color:#fff;border-radius:4px;margin-right:20px;cursor:pointer;background-color:#f97215;float:right}
+.m-core[data-v-e6d2ec7c]{margin-top:30px;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-ms-flex-pack:distribute;justify-content:space-around}.m-core .el-input[data-v-e6d2ec7c]{width:180px}.m-core h4[data-v-e6d2ec7c]{font-size:16px;background-color:#ccc;color:#fff;text-align:center;width:100%;height:40px;line-height:40px;margin-bottom:20px}.m-core .center[data-v-e6d2ec7c],.m-core .right[data-v-e6d2ec7c],.m-core .vipLeft[data-v-e6d2ec7c]{width:400px}.planList[data-v-e6d2ec7c]{padding:0 25px}.planList .planTop[data-v-e6d2ec7c]{height:40px;line-height:40px;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;border-bottom:1px solid #ccc;margin-top:20px}.planList .planTop>p[data-v-e6d2ec7c]{font-size:14px}.planList .planCore .row[data-v-e6d2ec7c]{width:100%;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;-ms-flex-wrap:nowrap;flex-wrap:nowrap;height:40px;line-height:40px;font-size:14px;text-align:center}.planList .planCore .row div[data-v-e6d2ec7c]{width:87px}.okBtn[data-v-e6d2ec7c]{width:120px;height:40px;line-height:40px;text-align:center;color:#fff;border-radius:4px;margin-right:20px;cursor:pointer;background-color:#f97215;float:right}

dist/static/css/chunk-76b0ae86.39860240.css → dist/static/css/chunk-c53f7e5a.a7dcb92a.css

@@ -1 +1 @@
-.pagination-container[data-v-31cb099a]{background:#fff;padding:32px 16px;width:100%;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.pagination-container.hidden[data-v-31cb099a]{display:none}.select[data-v-26fc51b4]{font-size:14px}.btnList[data-v-26fc51b4]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.btnList div[data-v-26fc51b4]{margin-right:15px}
+.pagination-container[data-v-31cb099a]{background:#fff;padding:32px 16px;width:100%;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.pagination-container.hidden[data-v-31cb099a]{display:none}.select[data-v-4e8285df]{font-size:14px}.btnList[data-v-4e8285df]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.btnList div[data-v-4e8285df]{margin-right:15px}

src/utils/vueFilter.js

@@ -170,6 +170,15 @@ Vue.filter('attendanceType', value => {
   }
   return template[value]
 })
+// 考情签退
+Vue.filter('attendanceOutType', value => {
+  let template = {
+    0: "异常签退",
+    1: "正常签退",
+    3: "未签退"
+  }
+  return template[value]
+})
 
 // 上课类型
 Vue.filter('workType', value => {

src/views/buildVip/index.vue

@@ -504,10 +504,8 @@ export default {
       if (res.code == 200) {
         this.subjectList = res.data;
       }
-
     })
     // 获取所有老师的接口  根据声部id获取老师
-
     // 获取课程类型的接口
     vipGroupCategory({ organId: this.$store.getters.organ }).then(res => {
       if (res.code == 200) {
@@ -530,6 +528,9 @@ export default {
     },
     // 选择课程类型
     changeType (val) {
+      // 在这里清空默认课酬
+      this.rightForm.offlineCourse = '';
+      this.rightForm.onlineCourse = '';
       this.leftForm.activeType = '';
       for (let i in this.courseTypeList) {
         if (this.courseTypeList[i].id == val) {

src/views/teacherManager/teacherDetail/components/courseInfo.vue

@@ -3,18 +3,21 @@
     <div class="tableWrap">
       <el-table :data='tableList'
                 :header-cell-style="{background:'#EDEEF0',color:'#444'}">
-        <el-table-column label="乐团编号" prop="musicGroupId">
+        <el-table-column label="乐团编号"
+                         prop="musicGroupId">
         </el-table-column>
-        <el-table-column label="乐团名称" prop="musicGroupName">
+        <el-table-column label="乐团名称"
+                         prop="musicGroupName">
         </el-table-column>
-        <el-table-column label="老师类型" prop="jobType">
+        <el-table-column label="老师类型"
+                         prop="jobType">
           <template slot-scope="scope">
             {{ scope.row.jobNature | jobNature }}
           </template>
         </el-table-column>
         <el-table-column label="乐团职位">
           <template slot-scope="scope">
-            {{ scope.row.jobType | jobType }}
+            {{ scope.row.teacherRole | workType }}
           </template>
         </el-table-column>
         <el-table-column label="执教班级">
@@ -27,14 +30,15 @@
             {{ scope.row.status | musicGroupType }}
           </template>
         </el-table-column>
-        <el-table-column label="出勤次数" prop="attendanceNum">
+        <el-table-column label="出勤次数"
+                         prop="attendanceNum">
         </el-table-column>
       </el-table>
       <pagination :total="pageInfo.total"
-                :page.sync="pageInfo.page"
-                :limit.sync="pageInfo.limit"
-                :page-sizes="pageInfo.page_size"
-                @pagination="getList" />
+                  :page.sync="pageInfo.page"
+                  :limit.sync="pageInfo.limit"
+                  :page-sizes="pageInfo.page_size"
+                  @pagination="getList" />
     </div>
   </div>
 </template>
@@ -60,17 +64,17 @@ export default {
       }
     }
   },
-  mounted() {
+  mounted () {
     this.getList()
   },
   methods: {
-    getList() {
-      getTeacherMusicClass({ 
+    getList () {
+      getTeacherMusicClass({
         rows: this.pageInfo.limit,
         page: this.pageInfo.page,
         search: this.teacherId
       }).then(res => {
-        if(res.code == 200) {
+        if (res.code == 200) {
           this.tableList = res.data.rows
           this.pageInfo.total = res.data.total
         }

src/views/teacherManager/teacherDetail/components/settlement.vue

@@ -50,7 +50,7 @@
                 :header-cell-style="{background:'#EDEEF0',color:'#444'}">
         <el-table-column label="上课时间">
           <template slot-scope="scope">
-            {{ scope.row.classDate }} {{ scope.row.classTime }}
+            {{ scope.row.classDate }}
           </template>
         </el-table-column>
         <el-table-column label="班级名称"
@@ -74,11 +74,16 @@
             </div>
           </template>
         </el-table-column>
-        <el-table-column label="考勤状态">
+        <el-table-column label="签到">
           <template slot-scope="scope">
             {{ scope.row.signInStatus | attendanceType }}
           </template>
         </el-table-column>
+        <el-table-column label="签退">
+          <template slot-scope="scope">
+            {{ scope.row.signOutStatus | attendanceOutType }}
+          </template>
+        </el-table-column>
         <el-table-column label="老师课酬"
                          prop="actualSalary">
         </el-table-column>
@@ -256,6 +261,7 @@ export default {
         courseScheduleType: null,
         signInStatus: null
       }
+      this.getList();
     }
   }
 }

src/views/teacherManager/teacherDetail/components/teacherRecord.vue

@@ -72,9 +72,9 @@
             </template>
           </el-table-column>
           <el-table-column align='center'
-                           label="签出">
+                           label="签退">
             <template slot-scope="scope">
-              {{ scope.row.signOutStatus | attendanceType }}
+              {{ scope.row.signOutStatus | attendanceOutType }}
             </template>
           </el-table-column>
           <el-table-column align='center'

src/views/teamBuild/teamSeting/components/setClass.vue

@@ -519,7 +519,6 @@ export default {
       this.$refs['teacherForm'].validate(res => {
         if (res) {
           // 发请求
-
           checkAllStudent({ musicGroupId: this.teamid, teacherId: this.teacherForm.name, improventClassesNum: this.hightNum }).then(res => {
             if (res.code == 200) {
               this.$refs['teacherForm'].resetFields()

src/views/teamDetail/components/courseList.vue

@@ -58,7 +58,7 @@
         <el-table-column align='center'
                          label="时间">
           <template slot-scope="scope">
-            {{ scope.row.classDate }} {{ scope.row.startClassTime ? scope.row.startClassTime.substr(0, 5) : '' }}
+            {{ scope.row.classDate }} {{ scope.row.startClassTime ? scope.row.startClassTime.substr(0, 5) : '' }}-{{ scope.row.endClassTime ? scope.row.endClassTime.substr(0, 5) : '' }}
           </template>
         </el-table-column>
         <el-table-column align='center'
@@ -97,10 +97,10 @@
           </template>
         </el-table-column>
         <el-table-column align='center'
-                         label="老师签出">
+                         label="老师签退">
           <template slot-scope="scope">
             <div>
-              {{ scope.row.signOutStatus | attendanceType}}
+              {{ scope.row.signOutStatus | attendanceOutType}}
             </div>
           </template>
         </el-table-column>

src/views/teamDetail/components/studentSignin.vue

@@ -14,8 +14,8 @@
         <el-form-item label='开课时间'>
           <el-date-picker v-model="searchForm.times"
                           type="datetimerange"
-                          value-format="yyyy-MM-dd"
-                          format="yyyy-MM-dd"
+                          value-format="yyyy-MM-dd HH:mm:ss"
+                          format="yyyy-MM-dd HH:mm:ss"
                           range-separator="至"
                           start-placeholder="开始日期"
                           end-placeholder="结束日期">

src/views/teamDetail/components/teamTeacherRecord.vue

@@ -3,7 +3,8 @@
     <h2>
       <!-- <div class='squrt'></div>
       {{name}} -->
-      <el-page-header @back="onCancel" :content="name"></el-page-header>
+      <el-page-header @back="onCancel"
+                      :content="name"></el-page-header>
     </h2>
     <p style="margin-bottom:20px;">老师上课记录</p>
     <!-- 搜索类型 -->
@@ -69,7 +70,7 @@
                          label="签退">
           <template slot-scope="scope">
             <div>
-              {{ scope.row.signOutStatus|attendanceType}}
+              {{ scope.row.signOutStatus|attendanceOutType}}
             </div>
           </template>
         </el-table-column>
@@ -121,7 +122,7 @@ export default {
     this.getList()
   },
   methods: {
-    onCancel() {
+    onCancel () {
       // window.history.back()
       let params = this.$route.query
       this.$router.push({

src/views/teamDetail/teamList.vue

@@ -139,17 +139,18 @@
               <div>
                 <el-button type="text"
                            v-if="scope.row.status == 'PREPARE'"
-                           @click="gotoImprovement(scope.row)">基础技能班设置</el-button>
+                           @click="gotoImprovement(scope.row)">基础技能班</el-button>
                 <el-button type="text"
                            v-if="scope.row.status == 'PREPARE'"
                            @click="gotodetailList(scope.row)">发放清单</el-button>
 
                 <el-button type="text"
-                           v-if="scope.row.status == 'PROGRESS' ||  scope.row.status == 'PAUSE'"
+                           v-if="scope.row.status == 'PROGRESS' ||  scope.row.status == 'PAUSE'||scope.row.status == 'APPLY'|| scope.row.status == 'PAY'"
                            @click="lookTeamDetail(scope.row)">查看</el-button>
                 <el-button type="text"
-                           v-if="scope.row.status != 'PROGRESS' && scope.row.status != 'CANCELED'  && scope.row.status != 'PAUSE'"
+                           v-if="scope.row.status != 'PROGRESS' && scope.row.status != 'CANCELED'  && scope.row.status != 'PAUSE' && scope.row.status != 'APPLY'&& scope.row.status != 'PAY'"
                            @click="lookTeamDetail(scope.row)">编辑</el-button>
+
                 <el-button v-if="scope.row.status == 'PREPARE'"
                            @click="startTeam(scope.row)"
                            type="text">确认成团</el-button>

src/views/vipClass/vipDetail/components/teacherRecord.vue

@@ -89,7 +89,6 @@
         <el-table-column align='center'
                          label="上课学员数"
                          prop="attendanceNum">
-
         </el-table-column>
         <el-table-column align='center'
                          prop="status"

src/views/vipClass/vipReset.vue

@@ -50,6 +50,20 @@
                          width="150"
                          prop="endClassTimeStr">
         </el-table-column>
+        <el-table-column label="课程类型"
+                         width="150"
+                         align="center">
+          <template slot-scope="scope">
+            <div>
+              {{ scope.row.teachMode | teachMode }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="教学点"
+                         align="center"
+                         width="300"
+                         prop="schoolName">
+        </el-table-column>
         <el-table-column label="操作">
           <template slot-scope="scope">
             <div>
@@ -108,6 +122,15 @@
                           }">
           </el-time-select>
         </el-form-item>
+        <el-form-item label="教学地点"
+                      v-if='maskForm.teachMode == "OFFLINE"'>
+          <el-select v-model="maskForm.address">
+            <el-option v-for="(item,index) in schoolList"
+                       :key="index"
+                       :value="item.id"
+                       :label="item.name"></el-option>
+          </el-select>
+        </el-form-item>
       </el-form>
       <div slot="footer"
            class="dialog-footer">
@@ -185,6 +208,7 @@
 </template>
 <script>
 import { resetCourse } from '@/api/buildTeam'
+import { getSchool } from '@/api/systemManage'
 import pagination from '@/components/Pagination/index'
 import { findVipGroupCourseSchedules, bathDelete, appendVipGroupCourseSchedules } from '@/api/vipSeting'
 export default {
@@ -203,7 +227,9 @@ export default {
         date: '',
         startTime: '',
         endTime: '',
-        id: ''
+        id: '',
+        address: '',
+        teachMode: ''
       },
       rules: {
         // 分页规则
@@ -217,6 +243,7 @@ export default {
         startTime: [{ required: true, message: '请选择上课开始时间', trigger: 'blur' },],
         endTime: [{ required: true, message: '请选择上课结束时间', trigger: 'blur' },],
       },
+      schoolList: []
     }
   },
   created () {
@@ -224,6 +251,11 @@ export default {
   },
   mounted () {
     this.getList();
+    getSchool({ organId: this.$store.getters.organ }).then(res => {
+      if (res.code == 200) {
+        this.schoolList = res.data;
+      }
+    })
   },
   methods: {
     getList () {
@@ -245,6 +277,8 @@ export default {
       this.maskForm.startTime = row.startClassTimeStr;
       this.maskForm.endTime = row.endClassTimeStr;
       this.maskForm.id = row.id;
+      this.maskForm.address = row.schoolId
+      this.maskForm.teachMode = row.teachMode
       // 修改课时
       this.courseVisible = true;
     },
@@ -257,7 +291,8 @@ export default {
         startClassTimeStr: this.maskForm.startTime,
         endClassTimeStr: this.maskForm.endTime,
         id: this.maskForm.id,
-        classDate: this.maskForm.date
+        classDate: this.maskForm.date,
+        schoolId: this.maskForm.address || null
       }
       resetCourse(obj).then(res => {
         if (res.code == 200) {