03/06 21:49

添加网管课teacherMode

dist/static/css/chunk-02d489a1.deba464c.css

@@ -0,0 +1 @@
+.m-core[data-v-3f2004b4]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row}.m-core .left[data-v-3f2004b4]{width:400px}.m-core .right[data-v-3f2004b4]{margin-left:30px;min-width:600px}.m-core .right .box-card[data-v-3f2004b4]{width:100%;min-height:500px}.m-core .right .box-card .cardWrap[data-v-3f2004b4]{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;width:100%;margin-top:30px}.m-core .right .box-card .cardWrap .row[data-v-3f2004b4]{height:30px;line-height:30px;font-size:14px}.m-core .right .box-card .cardWrap .title[data-v-3f2004b4]{text-align:center}.m-core .right .box-card .cardWrap .cardWrapleft[data-v-3f2004b4],.m-core .right .box-card .cardWrap .cardWrapright[data-v-3f2004b4]{width:48%}.m-core .right .box-card .cardWrap .cardWrapright .textWrap[data-v-3f2004b4]{margin-top:20px;width:100%;border:1px solid #999;min-height:100px}

dist/static/css/chunk-601e685c.7a8bb069.css

@@ -0,0 +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}.titlewrap[data-v-a3346508]{-webkit-box-align:center;-ms-flex-align:center;align-items:center}.titlewrap[data-v-a3346508],.wrap[data-v-a3346508]{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}.wrap div[data-v-a3346508]{margin-right:20px}

dist/static/css/chunk-d4058ea6.13a50115.css

@@ -1 +0,0 @@
-.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}.wrap[data-v-e03202b0]{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}.wrap div[data-v-e03202b0]{margin-right:20px}

dist/static/css/chunk-5686c47b.1955967a.css → dist/static/css/chunk-f1cf4274.f9f124ee.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}.vipwrap[data-v-e6f8683c]{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}.vipwrap .newBand[data-v-e6f8683c]{margin-right:20px}.resetClassForm[data-v-e6f8683c] .el-date-editor.el-input,.resetClassForm[data-v-e6f8683c] .el-date-editor.el-input__inner{width:180px!important}[data-v-e6f8683c] .el-date-editor.el-input,[data-v-e6f8683c] .el-date-editor.el-input__inner{width:100px!important}
+.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}.vipwrap[data-v-1ed1d452]{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}.vipwrap .newBand[data-v-1ed1d452]{margin-right:20px}.resetClassForm[data-v-1ed1d452] .el-date-editor.el-input,.resetClassForm[data-v-1ed1d452] .el-date-editor.el-input__inner{width:180px!important}[data-v-1ed1d452] .el-date-editor.el-input,[data-v-1ed1d452] .el-date-editor.el-input__inner{width:100px!important}

dist/static/css/chunk-f6deba5e.641b676e.css

@@ -0,0 +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}

src/router/index.js

@@ -246,6 +246,11 @@ export const asyncRoutes = {
   // 版本控制
   editionList:()=> import('@/views/editionManager/editionList'),
   // 定时任务
-  timedTask:()=> import('@/views/timedTask/index')
+  timedTask:()=> import('@/views/timedTask/index'),
+  // 评价管理
+  evaluateList:()=> import('@/views/evaluateManager/evaluateList'),
+  // 评价详情
+  evaluateDetail:()=> import('@/views/evaluateManager/evaluateDetail')
+  
 }
 export default router

src/store/modules/user.js

@@ -78,6 +78,7 @@ const actions = {
           resolve(data)
         }
       }).catch(error => {
+       
         reject(error)
       })
     })

src/views/accompanyManager/accompanys.vue

@@ -1,8 +1,12 @@
 <template>
   <div class="m-container">
-    <h2>
-      <el-page-header @back="goBack" :content="name"></el-page-header>
-    </h2>
+    <div class="titlewrap">
+      <h2>
+        <el-page-header @back="goBack" :content="name"></el-page-header>
+      </h2>
+      <p style="margin-bottom:10px; margin-left:30px;"> 课程有效期:{{ timers }}</p>
+    </div>
+
     <!--   v-permission="'vipGroupManage/updateVipBaseInfo'" -->
     <div class="wrap">
       <div
@@ -11,8 +15,16 @@
         v-permission="'courseSchedule/practiceGroupTeacherAdjust'"
       >课程组调整</div>
       <!-- // accompanys/addCourse -->
-      <div v-permission="{ child:'courseSchedule/batchAddCourses',parent:'/accompanys'}" class="newBand" @click="addCourse">网管课加课</div>
-      <div class="newBand" v-permission="'courseSchedule/batchUpdateCourseSchedule'" @click="adjustment">批量调整</div>
+      <div
+        v-permission="{ child:'courseSchedule/batchAddCourses',parent:'/accompanys'}"
+        class="newBand"
+        @click="addCourse"
+      >网管课加课</div>
+      <div
+        class="newBand"
+        v-permission="'courseSchedule/batchUpdateCourseSchedule'"
+        @click="adjustment"
+      >批量调整</div>
     </div>
 
     <div class="tableWrap">
@@ -184,7 +196,12 @@
           <el-input v-model.trim="teacherForm.name" disabled></el-input>
         </el-form-item>
         <el-form-item label="课程组声部" v-if="isMultiple">
-          <el-select v-model.trim="teacherForm.subjectId" @change="changeSound" filterable clearable>
+          <el-select
+            v-model.trim="teacherForm.subjectId"
+            @change="changeSound"
+            filterable
+            clearable
+          >
             <el-option
               v-for="(item,index) in subjectList"
               :key="index"
@@ -212,7 +229,7 @@
         <el-button type="primary" @click="subresetTeacher">确 定</el-button>
       </div>
     </el-dialog>
-    <el-dialog :title="adjustmentName" width="800px" :visible.sync="adjustmentVisible"> 
+    <el-dialog :title="adjustmentName" width="800px" :visible.sync="adjustmentVisible">
       <el-form
         :model="adjustmentForm"
         label-position="right"
@@ -401,7 +418,8 @@ export default {
         { value: "6", label: "星期六" },
         { value: "7", label: "星期日" }
       ],
-      activeList: []
+      activeList: [],
+      timers: null
     };
   },
   created() {
@@ -444,6 +462,10 @@ export default {
           this.courseData = res.data.rows;
           if (this.courseData.length > 0) {
             this.name = this.courseData[0].name;
+            this.timers =
+              this.courseData[0].coursesStartDate.substring(0, 10) +
+              "至" +
+              this.courseData[0].coursesExpireDate.substring(0, 10);
           }
         }
       });
@@ -536,24 +558,24 @@ export default {
         if (some) {
           if (this.isMultiple) {
             // 修改课程组老师
-    
-                practiceGroupTeacherAdjust({
-                  practiceGroupId: this.practiceId,
-                  teacherId: this.teacherForm.teacher,
-                    subjectId:this.teacherForm.subjectId
-                }).then(res => {
-                  if (res.code == 200) {
-                    this.$message.success("修改成功");
-                    this.getCourseGroup();
-                    this.getList();
-                    this.teacherVisible = false;
-                  }
-                });
+
+            practiceGroupTeacherAdjust({
+              practiceGroupId: this.practiceId,
+              teacherId: this.teacherForm.teacher,
+              subjectId: this.teacherForm.subjectId
+            }).then(res => {
+              if (res.code == 200) {
+                this.$message.success("修改成功");
+                this.getCourseGroup();
+                this.getList();
+                this.teacherVisible = false;
+              }
+            });
           } else {
             // 修改单节课老师
             practiceCourseTeacherAdjust({
               courseScheduleId: this.activeRow.id,
-              teacherId: this.teacherForm.teacher,
+              teacherId: this.teacherForm.teacher
             }).then(res => {
               if (res.code == 200) {
                 this.$message.success("修改成功");
@@ -600,16 +622,15 @@ export default {
         this.adjustmentVisible = true;
       }
     },
-    changeSound(val){
-      if(val){
-           this.subjectList.forEach(item=>{
-        if(item.id == val){
-          let strArr = this.teacherForm.name.split('•')
-          this.teacherForm.name = item.name+'•'+strArr[1]
-        }
-      })
+    changeSound(val) {
+      if (val) {
+        this.subjectList.forEach(item => {
+          if (item.id == val) {
+            let strArr = this.teacherForm.name.split("•");
+            this.teacherForm.name = item.name + "•" + strArr[1];
+          }
+        });
       }
-   
     },
     addWeek() {
       // 添加循环周期
@@ -645,13 +666,13 @@ export default {
           // courseScheduleIdList
           let courseScheduleIdList = idArr;
           obj.courseScheduleIdList = courseScheduleIdList;
-         obj.startDate = this.adjustmentForm.courseTime;
+          obj.startDate = this.adjustmentForm.courseTime;
           obj.coursesTimes = this.adjustmentForm.addCount;
           obj.teachingArrangementList = this.weekList;
 
           obj.isJumpHoliday = this.adjustmentForm.checked;
           obj.musicGroupId = this.practiceId;
-          obj.teachMode = this.adjustmentForm.courseType;
+          obj.teachMode = 'ONLINE';
           obj.type = "PRACTICE";
           batchUpdateCourseSchedule(obj).then(res => {
             if (res.code == 200) {
@@ -708,7 +729,7 @@ export default {
 
           obj.isJumpHoliday = this.adjustmentForm.checked;
           obj.musicGroupId = this.practiceId;
-          obj.teachMode = this.adjustmentForm.courseType;
+           obj.teachMode = 'ONLINE';
           obj.type = "PRACTICE";
           // console.log(obj)
           // return
@@ -736,22 +757,28 @@ export default {
           }
         });
       });
-    },
+    }
     // closeAdjustment(){
     //   console.log(111)
-   
+
     // }
   },
-  watch:{
-    adjustmentVisible(val){
-      if(!val){
-           this.$refs.adjustmentForm.resetFields();
+  watch: {
+    adjustmentVisible(val) {
+      if (!val) {
+        this.$refs.adjustmentForm.resetFields();
       }
     }
   }
 };
 </script>
 <style lang="scss" scoped>
+.titlewrap {
+  display: flex;
+  flex-direction: row;
+  justify-content: flex-start;
+  align-items: center;
+}
 .wrap {
   display: flex;
   flex-direction: row;

src/views/categroyManager/vipActiveList.vue

@@ -479,7 +479,7 @@ export default {
         switch (obj.offlineSalarySettlement.salarySettlementType) {
           case "RATIO_DISCOUNT": {
             if (obj.offlineSalarySettlement.settlementValue) {
-              return `线上:${obj.offlineSalarySettlement.settlementValue}%`;
+              return `线下:${obj.offlineSalarySettlement.settlementValue}%`;
             } else {
               return "-";
             }
@@ -491,7 +491,7 @@ export default {
           }
           case "FIXED_SALARY": {
             if (obj.offlineSalarySettlement.settlementValue) {
-              return `线上:${obj.offlineSalarySettlement.settlementValue}/次`;
+              return `线下:${obj.offlineSalarySettlement.settlementValue}/次`;
             } else {
               return "-";
             }

src/views/evaluateManager/evaluateDetail.vue

@@ -0,0 +1,103 @@
+<template>
+  <div class="m-container">
+    <h2>
+      <div class="squrt"></div>评价详情
+    </h2>
+    <div class="m-core">
+      <div class="left">
+        <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="id" label="操作"></el-table-column>
+        </el-table>
+      </div>
+      <div class="right">
+        <el-card class="box-card">
+          评价详情
+          <div class="cardWrap">
+            <div class="cardWrapleft">
+              <p class="title">授课内容</p>
+              <el-divider></el-divider>
+              <p class="row">评价时间：</p>
+              <p class="row">老师:</p>
+              <p class="row">声部:</p>
+              <p class="row">训练次数:</p>
+              <p class="row">训练时长</p>
+              <p class="title">授课内容</p>
+              <el-divider></el-divider>
+              <p class="row">乐理：</p>
+              <p class="row">曲子:</p>
+              <p class="row">教材:</p>
+            </div>
+            <div class="cardWrapright">
+              <p class="title">点评</p>
+              <el-divider></el-divider>
+              <p class="row">（选择1）填充文本</p>
+              <p class="row">（选择1）填充文本</p>
+              <p class="row">（选择1）填充文本</p>
+              <p class="row">（选择1）填充文本</p>
+              <div class="textWrap"></div>
+            </div>
+          </div>
+        </el-card>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+export default {
+  data() {
+    return {
+      tableData: []
+    };
+  }
+};
+</script>
+<style lang="scss" scoped>
+.m-core {
+  display: flex;
+  flex-direction: row;
+  .left {
+    width: 400px;
+  }
+  .right {
+    margin-left: 30px;
+    min-width: 600px;
+    .box-card {
+      width: 100%;
+      min-height: 500px;
+      .cardWrap {
+        display: flex;
+        flex-direction: row;
+        justify-content: space-between;
+        width: 100%;
+        margin-top: 30px;
+        .row {
+          height: 30px;
+          line-height: 30px;
+          font-size: 14px;
+        }
+          .title {
+            text-align: center;
+          }
+        .cardWrapleft {
+          width: 48%;
+        
+        }
+        .cardWrapright {
+          width: 48%;
+          .textWrap {
+              margin-top: 20px;
+              width:100%;
+              border: 1px solid #999;
+              min-height: 100px;
+          }
+        }
+      }
+    }
+  }
+}
+</style>

src/views/evaluateManager/evaluateList.vue

@@ -0,0 +1,87 @@
+<template>
+  <div class="m-container">
+    <h2>
+      <div class="squrt"></div>评论列表
+    </h2>
+    <div class="m-core">
+      <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="请输入课程组名称 ID"
+          ></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-select placeholder="请选择分部"></el-select>
+        </el-form-item>
+        <el-form-item>
+          <el-select placeholder="请选择状态"></el-select>
+        </el-form-item>
+        <el-form-item>
+          <el-select placeholder="请选择指导老师"></el-select>
+        </el-form-item>
+        <el-form-item>
+          <el-select placeholder="是否完成评价"></el-select>
+        </el-form-item>
+        <el-form-item>
+          <el-select placeholder="请选择指时间"></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-form-item>
+      </el-form>
+      <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="id" label="课程组名称"></el-table-column>
+          <el-table-column align="center" prop="id" label="分部名称"></el-table-column>
+          <el-table-column align="center" prop="id" label="类型"></el-table-column>
+          <el-table-column align="center" prop="id" label="收费类型"></el-table-column>
+          <el-table-column align="center" prop="id" label="状态"></el-table-column>
+          <el-table-column align="center" prop="id" label="指导老师"></el-table-column>
+          <el-table-column align="center" prop="id" label="课次"></el-table-column>
+          <el-table-column align="center" prop="id" label="是否评价"></el-table-column>
+          <el-table-column align="center" prop="id" label="操作"></el-table-column>
+        </el-table>
+              <pagination
+          :total="rules.total"
+          :page.sync="rules.page"
+          :limit.sync="rules.limit"
+          :page-sizes="rules.page_size"
+          @pagination="getList"
+        />
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+import pagination from "@/components/Pagination/index";
+export default {
+    components: { pagination },
+  data() {
+    return {
+      searchForm: {},
+        rules: {
+        // 分页规则
+        limit: 10, // 限制显示条数
+        page: 1, // 当前页
+        total: 0, // 总条数
+        page_size: [10, 20, 40, 50] // 选择限制显示条数
+      },
+      tableData:[]
+    };
+  },
+  methods: {
+    getList() {},
+    search(){},
+    onReSet(){}
+  }
+};
+</script>

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

@@ -151,7 +151,7 @@ export default {
       return result
     },
     formatterStatus (val) {
-      let arr = ["未开始", "报名中", "进行中", '取消', '已结束', '报名结束']
+      let arr = ["未开始", "报名中", "进行中", '取消', '已结束', '报名结束','暂停']
       return arr[val];
     }
   }

src/views/vipClass/vipReset.vue

@@ -75,7 +75,7 @@
               <el-button
                 type="text"
                 v-permission="{parent:'/vipReset',child:'courseSchedule/batchDelete'}"
-                 v-if="!scope.row.isSettlement"
+                 v-if="!scope.row.isSettlement&&scope.row.status != 'OVER'"
                 @click="removeClass(scope.row)"
               >删除</el-button>
               <!--   -->