Bläddra i källkod

05/25 17:25

111
mo 5 år sedan
förälder
incheckning
860656b857

+ 12 - 4
src/api/teacherManager.js

@@ -170,13 +170,21 @@ export function teacherFreeTime (data) {
     params: data
   })
 }
+// 获取老师签到信息
+export function getTeacherPersonalAttendanceDetail (data) {
+  return request({
+    url: api + '/teacherAttendance/getTeacherPersonalAttendanceDetail',
+    method: 'get',
+    params: data
+  })
+}
 
 // 修改网管课信息 /teacherFreeTime/updateSet
 export function resetTeacherFreeTime (data) {
   return request({
     url: api + '/teacherFreeTime/updateSet',
     method: 'post',
-     data:qs.stringify(data)
+    data: qs.stringify(data)
   })
 }
 
@@ -194,7 +202,7 @@ export function PracticeGroupSalaryUpdate (data) {
   return request({
     url: api + '/teacherDefaultPracticeGroupSalary/update',
     method: 'post',
-     data
+    data
   })
 }
 
@@ -212,7 +220,7 @@ export function sysTenantAccountAddMinutes (data) {
   return request({
     url: api + '/sysTenantAccount/addMinutes',
     method: 'post',
-    data:qs.stringify(data)
+    data: qs.stringify(data)
   })
 }
 
@@ -221,7 +229,7 @@ export function sysTenantAccountSubtractMinutes (data) {
   return request({
     url: api + '/sysTenantAccount/subtractMinutes',
     method: 'post',
-    data:qs.stringify(data)
+    data: qs.stringify(data)
   })
 }
 

+ 0 - 3
src/layout/components/TagsView.vue

@@ -88,9 +88,6 @@ export default {
     },
     moveToCurrentTag () {
       const tags = this.$refs['tag']
-      // console.log('标签')
-      // console.log(this.$store.state.tagsView)
-      // console.log(this.$refs)
       this.$nextTick(() => {
         for (const tag of tags) {
           if (tag.to === this.$route.path) {

+ 79 - 49
src/views/studentManager/components/studentVip.vue

@@ -25,65 +25,91 @@
       </div>
     </div>-->
     <!-- 搜索类型 -->
-    <el-form :inline="true" class="searchForm" v-model.trim="searchForm">
+    <el-form :inline="true"
+             class="searchForm"
+             v-model.trim="searchForm">
       <el-form-item>
-        <el-input
-          placeholder="课程名称"
-          @keyup.enter.native="onSearch"
-          v-model.trim="searchForm.classGroupName"
-        ></el-input>
+        <el-input placeholder="课程名称"
+                  @keyup.enter.native="onSearch"
+                  v-model.trim="searchForm.classGroupName"></el-input>
       </el-form-item>
       <el-form-item>
-        <el-button @click="onSearch" type="danger">搜索</el-button>
+        <el-button @click="onSearch"
+                   type="danger">搜索</el-button>
       </el-form-item>
     </el-form>
 
     <div class="tableWrap">
-      <el-table :header-cell-style="{background:'#EDEEF0',color:'#444'}" :data="tableList">
-        <el-table-column label="VIP编号" align="center" prop="vipGroupId"></el-table-column>
-        <el-table-column label="VIP课名称" align="center" prop="vipGroupName"></el-table-column>
-        <el-table-column label="VIP课状态" align="center">
-          <template slot-scope="scope">{{ scope.row.vipGroupStatus | vipCourseStatus }}</template>
+      <el-table :header-cell-style="{background:'#EDEEF0',color:'#444'}"
+                :data="tableList">
+        <el-table-column label="VIP编号"
+                         align="center"
+                         prop="id"></el-table-column>
+        <el-table-column label="VIP课名称"
+                         align="center"
+                         prop="name"></el-table-column>
+        <el-table-column label="VIP课状态"
+                         align="center">
+          <template slot-scope="scope">{{ scope.row.status | vipCourseStatus }}</template>
         </el-table-column>
-        <el-table-column label="指导老师" align="center" prop="teacherName"></el-table-column>
-        <el-table-column label="班级人数" align="center" prop="studentNum"></el-table-column>
-        <el-table-column label="活动方案" align="center" prop="activeName"></el-table-column>
-        <el-table-column label="开课时间" width="150" align="center" prop="courseStartDate">
+        <el-table-column label="指导老师"
+                         align="center"
+                         prop="userName"></el-table-column>
+        <el-table-column label="教务老师"
+                         align="center"
+                         prop="educationalTeacherName"></el-table-column>
+        <el-table-column label="班级人数"
+                         align="center"
+                         prop="studentNum"></el-table-column>
+        <el-table-column label="活动方案"
+                         align="center"
+                         prop="vipGroupActivityName"></el-table-column>
+        <el-table-column label="开课时间"
+                         width="150"
+                         align="center"
+                         prop="courseStartDate">
           <template slot-scope="scope">{{ scope.row.courseStartDate | dateForMinFormat }}</template>
         </el-table-column>
-        <el-table-column label="当前课次" align="center" prop="currentClassTimes">
-          <template
-            slot-scope="scope"
-          >{{ scope.row.currentClassTimes }}/{{ scope.row.totalClassTimes }}</template>
+        <el-table-column label="当前课次"
+                         align="center"
+                         prop="currentClassTimes">
+          <template slot-scope="scope">{{ scope.row.currentClassTimes }}/{{ scope.row.totalClassTimes }}</template>
         </el-table-column>
-        <el-table-column label="操作" align="center">
+        <el-table-column label="操作"
+                         align="center">
           <template slot-scope="scope">
-            <el-button
-              @click="onCourse(scope.row)"
-              v-permission="'studentManage/findStudentVipGroups'"
-              type="text"
-            >课表</el-button>
+            <el-button @click="onCourse(scope.row)"
+                       v-permission="'studentManage/findStudentVipGroups'"
+                       type="text">课表</el-button>
           </template>
         </el-table-column>
       </el-table>
-      <pagination
-        :total="pageInfo.total"
-        :page.sync="pageInfo.page"
-        :limit.sync="pageInfo.limit"
-        :page-sizes="pageInfo.page_size"
-        @pagination="getCourseList"
-      />
+      <pagination :total="pageInfo.total"
+                  :page.sync="pageInfo.page"
+                  :limit.sync="pageInfo.limit"
+                  :page-sizes="pageInfo.page_size"
+                  @pagination="getCourseList" />
 
-      <el-dialog :title="dialogTitle" :visible.sync="dialogTableVisible">
+      <el-dialog :title="dialogTitle"
+                 :visible.sync="dialogTableVisible">
         <el-table :data="gridData">
-          <el-table-column prop="courseDate" label="时间" align="center" width="150">
-               <template slot-scope="scope">{{ scope.row.courseDate | dateForMinFormat }}</template>
+          <el-table-column prop="courseDate"
+                           label="时间"
+                           align="center"
+                           width="150">
+            <template slot-scope="scope">{{ scope.row.courseDate | dateForMinFormat }}</template>
           </el-table-column>
-          <el-table-column prop="classGroupName" label="课程名称" align="center" width="200"></el-table-column>
-          <el-table-column label="课程类型" align="center">
+          <el-table-column prop="classGroupName"
+                           label="课程名称"
+                           align="center"
+                           width="200"></el-table-column>
+          <el-table-column label="课程类型"
+                           align="center">
             <template slot-scope="scope">{{ scope.row.teachMode == 'ONLINE' ? '线上' : '线下' }}</template>
           </el-table-column>
-          <el-table-column prop="courseStatus" align="center" label="课程状态">
+          <el-table-column prop="courseStatus"
+                           align="center"
+                           label="课程状态">
             <template slot-scope="scope">{{ scope.row.courseStatus |coursesStatus }}</template>
           </el-table-column>
         </el-table>
@@ -98,14 +124,16 @@ import {
   findStudentVipGroupClass,
   findStudentCourses
 } from "@/api/studentManager";
+import { getVipList } from "@/api/vipSeting"
 export default {
   name: "studentvip",
   components: { pagination },
-  data() {
+  data () {
     return {
       searchForm: {
-        studentId: null,
-        classGroupName: null
+        userId: null,
+        search: null,
+        studentId: null
       },
       checkIndex: null, // 选中的课程
       dialogTableVisible: false,
@@ -124,14 +152,14 @@ export default {
       userId: ""
     };
   },
-  created() {
+  created () {
     this.userId = this.$route.query.userId || null;
   },
-  mounted() {
+  mounted () {
     this.searchForm.studentId = this.$route.query.userId;
     this.getCourseList();
   },
-  activated() {
+  activated () {
     this.userId = this.$route.query.userId || null;
     this.searchForm.studentId = this.$route.query.userId;
     this.getCourseList();
@@ -141,18 +169,20 @@ export default {
     //   this.checkIndex = item.id
     //   this.getList()
     // },
-    getCourseList() {
+    getCourseList () {
       let params = this.searchForm;
       params.rows = this.pageInfo.limit;
       params.page = this.pageInfo.page;
-      findStudentVipGroupClass(params).then(res => {
+      params.userId = this.searchForm.studentId;
+      params.studentId = null;
+      getVipList(params).then(res => {
         if (res.code == 200) {
           this.tableList = res.data.rows;
           this.pageInfo.total = res.data.total;
         }
       });
     },
-    onCourse(row) {
+    onCourse (row) {
       findStudentVipGroups({
         vipGroupId: row.vipGroupId,
         studentId: this.userId
@@ -164,7 +194,7 @@ export default {
         }
       });
     },
-    onSearch() {
+    onSearch () {
       this.pageInfo.page = 1;
       this.getCourseList();
     }

+ 1 - 1
src/views/teamBuild/components/teamSoundMoney.vue

@@ -275,7 +275,7 @@
       <div class="submitBtn"
            v-permission="{child: 'musicGroup/createGroup', parent: '/teamBuild/soundMoney'}"
            v-if="teamStatus != 'teamAudit'"
-           @click="submitInfo(2)">提交</div>
+           @click="submitInfo(2)">提交审核</div>
     </div>
     <el-dialog title="乐团预览"
                :visible.sync="previewVisible"

+ 0 - 1
src/views/teamBuild/teamSeting/components/salarySet.vue

@@ -174,7 +174,6 @@ export default {
     }
   },
   mounted () {
-    sessionStorage.setItem('setStep', 4)
     getTeamDetail({ musicGroupId: this.teamid }).then(res => {
       if (res.code == 200) {
         this.searchForm.salary = res.data.settlementType;

+ 10 - 10
src/views/teamDetail/components/baseInfo.vue

@@ -164,7 +164,7 @@ export default {
           let text = (new Response(blob)).text()
           text.then(res => {
             // 判断是否报错
-            if(res.indexOf('code') != -1) {
+            if (res.indexOf('code') != -1) {
               let json = JSON.parse(res)
               this.$message.error(json.msg)
             } else {
@@ -182,11 +182,11 @@ export default {
             }
           })
           load.endLoading();
-          
+
         }).catch(error => {
-            this.$message.error('导出数据失败,请联系管理员');
-            load.endLoading();
-          })
+          this.$message.error('导出数据失败,请联系管理员');
+          load.endLoading();
+        })
       }).catch(() => { })
 
     },
@@ -219,7 +219,7 @@ export default {
           let text = (new Response(blob)).text()
           text.then(res => {
             // 判断是否报错
-            if(res.indexOf('code') != -1) {
+            if (res.indexOf('code') != -1) {
               let json = JSON.parse(res)
               this.$message.error(json.msg)
             } else {
@@ -237,11 +237,11 @@ export default {
             }
           })
           load.endLoading();
-          
+
         }).catch(error => {
-            this.$message.error('导出数据失败,请联系管理员');
-            load.endLoading();
-          })
+          this.$message.error('导出数据失败,请联系管理员');
+          load.endLoading();
+        })
       }).catch(() => { })
     }
   },

+ 0 - 1
src/views/teamDetail/components/resetClass.vue

@@ -812,7 +812,6 @@ export default {
           // })
         }
       });
-      sessionStorage.setItem("resetCode", 3);
       // // 获取乐团下未分班的单技班
       // findNoClassSingle({ musicGroupId: this.teamid }).then(res => {
       //   if (res.code == 200) {

+ 3 - 1
src/views/teamDetail/components/teacherList.vue

@@ -27,7 +27,9 @@
              @click="search">搜索</div>
       </el-form-item>
       <el-form-item style="float: right;">
-        <div class="right newBand" style="margin-bottom: 0;" @click="gotoRecord"> 上课记录 </div>
+        <div class="right newBand"
+             style="margin-bottom: 0;"
+             @click="gotoRecord"> 上课记录 </div>
       </el-form-item>
     </el-form>
 

+ 3 - 4
src/views/teamDetail/index.vue

@@ -89,16 +89,16 @@ export default {
     }
   },
   created () {
-    this.activeIndex = '0';
+    this.activeIndex = '1';
     this.init()
   },
   activated () {
-    this.activeIndex = '0';
+    this.activeIndex = '1';
     this.$nextTick(res => {
       this.init()
     })
-
   },
+
   methods: {
     permission (str) {
       return permission(str)
@@ -115,7 +115,6 @@ export default {
       if (this.$route.query.rules) {
         this.Frules = this.$route.query.rules
       }
-      this.activeIndex = '1'
     },
     handleClick (val) {
       this.activeIndex = val.name;

+ 19 - 10
src/views/teamDetail/teamCourseList.vue

@@ -99,7 +99,8 @@
           <el-table-column align="center"
                            prop="organName"
                            label="分部名称"></el-table-column>
-          <el-table-column align="center" width="130px"
+          <el-table-column align="center"
+                           width="130px"
                            prop="musicGroupId"
                            label="乐团/课程组编号"></el-table-column>
           <el-table-column align="center"
@@ -151,25 +152,25 @@
               <div>{{ scope.row.status | coursesStatus }}</div>
             </template>
           </el-table-column>
-          <el-table-column align="center"
+          <!-- <el-table-column align="center"
                            label="是否签到">
             <template slot-scope="scope">
               <div>{{ scope.row.isSignIn | attendanceType}}</div>
             </template>
-          </el-table-column>
-          <el-table-column align="center"
+          </el-table-column> -->
+          <!-- <el-table-column align="center"
                            label="是否签退"
                            fixed="right">
             <template slot-scope="scope">
               <div>{{ scope.row.isSignOut | attendanceOutType}}</div>
             </template>
-          </el-table-column>
-          <el-table-column align="center"
+          </el-table-column> -->
+          <!-- <el-table-column align="center"
                            prop="isCallNames"
                            label="是否点名"
                            fixed="right">
             <template slot-scope="scope">{{ scope.row.isCallNames ? '是' : '否' }}</template>
-          </el-table-column>
+          </el-table-column> -->
           <el-table-column align="center"
                            prop="teacherName"
                            label="指导老师"
@@ -299,6 +300,7 @@ import {
   superFindCourseSchedules,
   getEmployeeOrgan
 } from "@/api/buildTeam";
+import { getTeacherPersonalAttendanceDetail } from "@/api/teacherManager";
 import { getSchool } from "@/api/systemManage";
 import { courseType } from "@/utils/searchArray";
 import studentRollCall from "./componentCourse/studentRollCall";
@@ -490,10 +492,17 @@ export default {
       });
     },
     lookDetail (row) {
-      this.maskForm = row;
+      // this.maskForm = row;
       this.activeName = "first";
-      // console.log(row)
-      this.classVisible = true;
+      // 发请求 获取详情 row.id
+      getTeacherPersonalAttendanceDetail({ courseScheduleId: row.id }).then(res => {
+        if (res.code == 200) {
+          this.activeName = "first";
+          this.maskForm = res.data;
+          this.classVisible = true;
+        }
+      })
+
     },
     handleClick (tab, event) {
       // console.log(tab, event);

+ 154 - 136
src/views/vipClass/vipList.vue

@@ -3,116 +3,125 @@
     <h2>
       <div class="squrt"></div>VIP课列表
     </h2>
-    <div class="newBand" v-permission="'/buildVip'" @click="gotoBuildVip">新建VIP课</div>
-    <div class="newBand" v-permission="'export/vipGroupList'" @click="onVIPCourseExport">导出VIP课</div>
-    <div
-      class="newBand"
-      v-permission="'export/vipGroup'"
-      @click="onStudentExport"
-      style="width: 120px;"
-    >VIP课程续费提醒</div>
+    <div class="newBand"
+         v-permission="'/buildVip'"
+         @click="gotoBuildVip">新建VIP课</div>
+    <div class="newBand"
+         v-permission="'export/vipGroupList'"
+         @click="onVIPCourseExport">导出VIP课</div>
+    <div class="newBand"
+         v-permission="'export/vipGroup'"
+         @click="onStudentExport"
+         style="width: 120px;">VIP课程续费提醒</div>
     <div class="m-core">
       <!-- 搜索类型 -->
-      <el-form :inline="true" class="searchForm" v-model.trim="searchForm">
+      <el-form :inline="true"
+               class="searchForm"
+               v-model.trim="searchForm">
         <!-- 状态 指导老师 活动方案-->
         <el-form-item>
-          <el-input
-            v-model.trim="searchForm.search"
-            @keyup.enter.native="search"
-            placeholder="课程名称"
-          ></el-input>
+          <el-input v-model.trim="searchForm.search"
+                    @keyup.enter.native="search"
+                    placeholder="课程名称"></el-input>
         </el-form-item>
         <el-form-item prop="orgin">
-          <el-select
-            class="multiple"
-            v-model.trim="searchForm.orgin"
-            filterable
-            clearable
-            placeholder="请选择分部"
-          >
-            <el-option
-              v-for="(item,index) in organList"
-              :key="index"
-              :label="item.name"
-              :value="item.id"
-            ></el-option>
+          <el-select class="multiple"
+                     v-model.trim="searchForm.orgin"
+                     filterable
+                     clearable
+                     placeholder="请选择分部">
+            <el-option v-for="(item,index) in organList"
+                       :key="index"
+                       :label="item.name"
+                       :value="item.id"></el-option>
           </el-select>
         </el-form-item>
         <!-- statusList -->
         <el-form-item prop="status">
-          <el-select
-            class="multiple"
-            v-model.trim="searchForm.status"
-            filterable
-            clearable
-            placeholder="请选课程状态"
-          >
-            <el-option
-              v-for="(item,index) in statusList"
-              :key="index"
-              :label="item.lable"
-              :value="item.value"
-            ></el-option>
+          <el-select class="multiple"
+                     v-model.trim="searchForm.status"
+                     filterable
+                     clearable
+                     placeholder="请选课程状态">
+            <el-option v-for="(item,index) in statusList"
+                       :key="index"
+                       :label="item.lable"
+                       :value="item.value"></el-option>
           </el-select>
         </el-form-item>
 
         <el-form-item>
-          <el-select v-model.trim="searchForm.teacherId" clearable filterable placeholder="指导老师">
-            <el-option
-              v-for="(item,index) in teacherList"
-              :key="index"
-              :value="item.id"
-              :label="item.realName"
-            ></el-option>
+          <el-select v-model.trim="searchForm.teacherId"
+                     clearable
+                     filterable
+                     placeholder="指导老师">
+            <el-option v-for="(item,index) in teacherList"
+                       :key="index"
+                       :value="item.id"
+                       :label="item.realName"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item>
-          <el-select v-model.trim="searchForm.activityId" clearable filterable placeholder="活动方案">
-            <el-option
-              v-for="(item,index) in activeList"
-              :key="index"
-              :value="item.id"
-              :label="item.name"
-            ></el-option>
+          <el-select v-model.trim="searchForm.activityId"
+                     clearable
+                     filterable
+                     placeholder="活动方案">
+            <el-option v-for="(item,index) in activeList"
+                       :key="index"
+                       :value="item.id"
+                       :label="item.name"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item prop="status">
-          <el-select
-            class="multiple"
-            v-model.trim="searchForm.hasEducationalTeacherId"
-            filterable
-            clearable
-            placeholder="是否有教务老师"
-          >
-            <el-option label="是" value="true"></el-option>
-            <el-option label="否" value="false"></el-option>
+          <el-select class="multiple"
+                     v-model.trim="searchForm.hasEducationalTeacherId"
+                     filterable
+                     clearable
+                     placeholder="是否有教务老师">
+            <el-option label="是"
+                       value="true"></el-option>
+            <el-option label="否"
+                       value="false"></el-option>
           </el-select>
         </el-form-item>
 
         <el-form-item>
-          <el-button @click="search" type="danger">搜索</el-button>
-          <el-button @click="onReSet" type="primary">重置</el-button>
+          <el-button @click="search"
+                     type="danger">搜索</el-button>
+          <el-button @click="onReSet"
+                     type="primary">重置</el-button>
         </el-form-item>
       </el-form>
       <!-- 查询列表 -->
       <!-- tab -->
       <div class="tableWrap">
-        <el-table
-          style="width: 100%"
-          :header-cell-style="{background:'#EDEEF0',color:'#444'}"
-          :data="tableData"
-        >
-          <el-table-column align="center" prop="id" label="课程组编号"></el-table-column>
-          <el-table-column align="center" prop="name" label="课程名称"></el-table-column>
-          <el-table-column align="center" prop="status" label="课程状态">
+        <el-table style="width: 100%"
+                  :header-cell-style="{background:'#EDEEF0',color:'#444'}"
+                  :data="tableData">
+          <el-table-column align="center"
+                           prop="id"
+                           label="课程组编号"></el-table-column>
+          <el-table-column align="center"
+                           prop="name"
+                           label="课程名称"></el-table-column>
+          <el-table-column align="center"
+                           prop="status"
+                           label="课程状态">
             <template slot-scope="scope">
               <div>{{ scope.row.status | formatterStatus}}</div>
             </template>
           </el-table-column>
-          <el-table-column align="center" prop="userName" label="指导老师"></el-table-column>
-          <el-table-column align="center" prop="educationalTeacherName" label="教务老师"></el-table-column>
-          <el-table-column align="center" prop="studentNum" label="班级人数"></el-table-column>
-          <el-table-column align="center" label="课程单价">
+          <el-table-column align="center"
+                           prop="userName"
+                           label="指导老师"></el-table-column>
+          <el-table-column align="center"
+                           prop="educationalTeacherName"
+                           label="教务老师"></el-table-column>
+          <el-table-column align="center"
+                           prop="studentNum"
+                           label="班级人数"></el-table-column>
+          <el-table-column align="center"
+                           label="课程单价">
             <template slot-scope="scope">
               <div>
                 <p>线上:{{scope.row.onlineClassesUnitPrice}}</p>
@@ -120,95 +129,104 @@
               </div>
             </template>
           </el-table-column>
-          <el-table-column align="center" prop="vipGroupActivityName" label="活动方案"></el-table-column>
-          <el-table-column align="center" label="当前课次">
+          <el-table-column align="center"
+                           prop="vipGroupActivityName"
+                           label="活动方案"></el-table-column>
+          <el-table-column align="center"
+                           label="当前课次">
             <template slot-scope="scope">
               <div>
                 <p>{{scope.row.currentClassTimes + '/' + scope.row.totalClassTimes}}</p>
               </div>
             </template>
           </el-table-column>
-          <el-table-column align="center" label="月均消耗">
+          <el-table-column align="center"
+                           label="月均消耗">
             <template slot-scope="scope">{{ scope.row.monthConsumeRate }}%</template>
           </el-table-column>
-          <el-table-column align="center" prop="createTime" label="上次课时间">
+          <el-table-column align="center"
+                           prop="createTime"
+                           label="上次课时间">
             <template slot-scope="scope">
               <div>
                 <p>{{scope.row.lastOverTime | formatterTime}}</p>
               </div>
             </template>
           </el-table-column>
-          <el-table-column align="center" prop="paymentExpireDate" label="开课时间">
+          <el-table-column align="center"
+                           prop="paymentExpireDate"
+                           label="开课时间">
             <template slot-scope="scope">
               <div>
                 <p>{{scope.row.courseStartDate | formatterTime}}</p>
               </div>
             </template>
           </el-table-column>
-          <el-table-column align="center" prop="coursesExpireDate" label="结束时间">
+          <el-table-column align="center"
+                           prop="coursesExpireDate"
+                           label="结束时间">
             <template slot-scope="scope">
               <div>
                 <p>{{scope.row.coursesExpireDate | formatterTime}}</p>
               </div>
             </template>
           </el-table-column>
-          <el-table-column align="center" prop="createTime" label="申请时间">
+          <el-table-column align="center"
+                           prop="createTime"
+                           label="申请时间">
             <template slot-scope="scope">
               <div>
                 <p>{{scope.row.createTime | formatterTime}}</p>
               </div>
             </template>
           </el-table-column>
-          <el-table-column align="center" width="150px" fixed="right" label="操作">
+          <el-table-column align="center"
+                           width="150px"
+                           fixed="right"
+                           label="操作">
             <template slot-scope="scope">
               <div>
-                <el-button
-                  type="text"
-                  v-permission="'/vipDetail'"
-                  @click="gotoVipDetail(scope.row)"
-                >查看</el-button>
+                <el-button type="text"
+                           v-permission="'/vipDetail'"
+                           @click="gotoVipDetail(scope.row)">查看</el-button>
                 <!-- 
                 <el-button type="text">启动</el-button>-->
                 <!-- <el-button type="text"
                            v-if="scope.row.status <3"
                 @click='closeVip(scope.row.id)'>关闭</el-button>-->
-                <el-popover
-                  placement="top"
-                  width="160"
-                  v-permission="'vipGroupManage/stopVipGroup'"
-                  v-if="scope.row.status <3"
-                  :ref="scope.$index"
-                >
+                <el-popover placement="top"
+                            width="160"
+                            v-permission="'vipGroupManage/stopVipGroup'"
+                            v-if="scope.row.status <3"
+                            :ref="scope.$index">
                   <p style="margin-bottom:10px;">确定停止该vip课?</p>
-                  <el-input v-model.trim="scope.row.stopReason" placeholder="请输入关闭原因"></el-input>
+                  <el-input v-model.trim="scope.row.stopReason"
+                            placeholder="请输入关闭原因"></el-input>
                   <div style="text-align: right; margin-top: 20px">
-                    <el-button
-                      size="mini"
-                      type="text"
-                      @click="scope._self.$refs[scope.$index].doClose()"
-                    >取消</el-button>
-                    <el-button type="primary" size="mini" @click="closeVip(scope)">确定</el-button>
+                    <el-button size="mini"
+                               type="text"
+                               @click="scope._self.$refs[scope.$index].doClose()">取消</el-button>
+                    <el-button type="primary"
+                               size="mini"
+                               @click="closeVip(scope)">确定</el-button>
                   </div>
-                  <el-button type="text" slot="reference">停止</el-button>
+                  <el-button type="text"
+                             slot="reference">停止</el-button>
                 </el-popover>
-                <el-button
-                  type="text"
-                  v-if="scope.row.status > 1&&scope.row.status != 3"
-                  v-permission="'/vipReset'"
-                  @click="resetVip(scope.row)"
-                >修改</el-button>
+                <el-button type="text"
+                           v-if="scope.row.status > 1&&scope.row.status != 3"
+                           v-permission="'/vipReset'"
+                           @click="resetVip(scope.row)">修改</el-button>
               </div>
             </template>
           </el-table-column>
         </el-table>
         <!-- 分页器 -->
-        <pagination
-          :total="rules.total"
-          :page.sync="rules.page"
-          :limit.sync="rules.limit"
-          :page-sizes="rules.page_size"
-          @pagination="getList"
-        />
+        <pagination :total="rules.total"
+                    :page.sync="rules.page"
+                    :limit.sync="rules.limit"
+                    :page-sizes="rules.page_size"
+                    @pagination="getList" />
       </div>
     </div>
   </div>
@@ -229,7 +247,7 @@ import load from "@/utils/loading";
 export default {
   components: { pagination },
   name: "vipList",
-  data() {
+  data () {
     return {
       organId: null,
       searchForm: {
@@ -262,7 +280,7 @@ export default {
       ]
     };
   },
-  created() {
+  created () {
     if (this.$route.query.searchForm) {
       this.$route.query.searchForm instanceof Object
         ? (this.searchForm = this.$route.query.searchForm)
@@ -274,14 +292,14 @@ export default {
         : (this.rules = JSON.parse(this.$route.query.rules));
     }
   },
-  mounted() {
+  mounted () {
     this.init();
   },
-  activated() {
+  activated () {
     this.init();
   },
   methods: {
-    init() {
+    init () {
       getEmployeeOrgan().then(res => {
         if (res.code == 200) {
           this.organList = res.data;
@@ -302,11 +320,11 @@ export default {
       });
       this.getList();
     },
-    search() {
+    search () {
       this.rules.page = 1;
       this.getList();
     },
-    onReSet() {
+    onReSet () {
       this.searchForm = {
         teacherId: null,
         activityId: null,
@@ -316,7 +334,7 @@ export default {
       };
       this.getList();
     },
-    getList() {
+    getList () {
       let params = this.searchForm;
       params.page = this.rules.page;
       params.rows = this.rules.limit;
@@ -335,7 +353,7 @@ export default {
       });
     },
     // 跳转到vip详情
-    gotoVipDetail(row) {
+    gotoVipDetail (row) {
       let rules = JSON.stringify(this.rules);
       let searchForm = JSON.stringify(this.searchForm);
       let id = row.id;
@@ -345,7 +363,7 @@ export default {
         query: { id, name, rules, searchForm }
       });
     },
-    closeVip(scope) {
+    closeVip (scope) {
       let id = scope.row.id;
       closeVip({ vipGroupId: id, stopReason: scope.row.stopReason }).then(
         res => {
@@ -357,7 +375,7 @@ export default {
         }
       );
     },
-    gotoBuildVip() {
+    gotoBuildVip () {
       let rules = JSON.stringify(this.rules);
       let searchForm = JSON.stringify(this.searchForm);
       this.$router.push({
@@ -365,7 +383,7 @@ export default {
         query: { rules, searchForm }
       });
     },
-    onVIPCourseExport() {
+    onVIPCourseExport () {
       // 导出VIP课
       let searchForm = this.searchForm;
       let data = {
@@ -423,9 +441,9 @@ export default {
               load.endLoading();
             });
         })
-        .catch(() => {});
+        .catch(() => { });
     },
-    onStudentExport() {
+    onStudentExport () {
       // 导出VIP课
       // let searchForm = this.searchForm;
       let data = {
@@ -483,10 +501,10 @@ export default {
               load.endLoading();
             });
         })
-        .catch(() => {});
+        .catch(() => { });
     },
     // 修改vip
-    resetVip(row) {
+    resetVip (row) {
       let id = row.id;
       let educationalTeacherId = row.educationalTeacherId;
       let rules = JSON.stringify(this.rules);
@@ -498,7 +516,7 @@ export default {
     }
   },
   filters: {
-    formatterTime(val) {
+    formatterTime (val) {
       let result;
       if (val) {
         result = val.split(" ")[0];
@@ -507,7 +525,7 @@ export default {
       }
       return result;
     },
-    formatterStatus(val) {
+    formatterStatus (val) {
       let arr = [
         "未开始",
         "报名中",

+ 20 - 18
src/views/workBenchManager/journal/studentComplain.vue

@@ -81,7 +81,8 @@
       </el-row>
 
       <el-row>
-        <el-col :span="4" style="height:40px;line-height:40px;">
+        <el-col :span="4"
+                style="height:40px;line-height:40px;">
           责任比:
         </el-col>
         <el-col :span="20"
@@ -94,9 +95,10 @@
                       max="100"
                       v-model.trim="teacherRate"
                       placeholder="请输入内容">
-                       <template slot="append">%</template></el-input></el-input>
+              <template slot="append">%</template></el-input>
+            </el-input>
           </div>
-          <div >
+          <div>
             <span style="padding-right: 8px;">学生</span>
             <el-input type="number"
                       @mousewheel.native.prevent
@@ -104,9 +106,9 @@
                       max="100"
                       v-model.trim="studentRate"
                       placeholder="请输入内容">
-                       <template slot="append">%</template></el-input>
+              <template slot="append">%</template></el-input>
           </div>
-          
+
         </el-col>
         <el-col :span="20"
                 v-else>
@@ -119,10 +121,10 @@
                       max="100"
                       v-model.trim="teacherRate"
                       placeholder="请输入内容">
-                       <template slot="append">%</template>
-                      </el-input>
+              <template slot="append">%</template>
+            </el-input>
           </div>
-          <div >
+          <div>
             <span style="padding-right: 8px;">学生</span>
             <el-input disabled
                       type="number"
@@ -131,13 +133,13 @@
                       max="100"
                       v-model.trim="studentRate"
                       placeholder="请输入内容">
-                       <template slot="append">%</template>
-                      </el-input>
+              <template slot="append">%</template>
+            </el-input>
           </div>
-           
+
         </el-col>
       </el-row>
-      <el-row >
+      <!-- <el-row >
         <el-col :span="4" style="height:40px;line-height:40px;">发放比例:</el-col>
         <el-col :span="20">
           <div>
@@ -153,7 +155,7 @@
                        <template slot="append">%</template></el-input>
           </div>
         </el-col>
-      </el-row>
+      </el-row> -->
       <el-row v-permission="'courseSchedule/courseScheduleCommplaintAudit'"
               v-if="showMessage.complaints.status == 'ING'">
         <el-col :span="24">
@@ -231,8 +233,8 @@ export default {
           this.showRight = true
           this.showMessage = result
           if (result.complaints.status != 'ING') {
-            this.teacherRate = result.complaints.teacherLiabilityRatio*10
-            this.studentRate = result.complaints.studentLiabilityRatio*10
+            this.teacherRate = result.complaints.teacherLiabilityRatio * 10
+            this.studentRate = result.complaints.studentLiabilityRatio * 10
           }
         }
       })
@@ -278,7 +280,7 @@ export default {
       }
       let teacherRate = this.teacherRate / 10
       let studentRate = this.studentRate / 10
- 
+
       if (type == 'submit') {
         if (teacherRate < 0 || teacherRate > 100 || Number(teacherRate) == NaN) {
           this.$message.error('老师责任比输入有误')
@@ -323,8 +325,8 @@ export default {
       }
     }
   },
-  computed:{
-   
+  computed: {
+
   }
 }
 </script>