Browse Source

Merge branch 'Nov16thResetMusic' into online

mo 4 năm trước cách đây
mục cha
commit
2d729a2c53

BIN
dist/favicon1.ico


Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 0 - 0
dist/index.html


Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 0 - 0
dist/static/css/chunk-elementUI.b80cec6e.css


BIN
dist/static/fonts/element-icons.535877f5.woff


BIN
dist/static/fonts/element-icons.732389de.ttf


BIN
dist/static/img/404.a57b6f31.png


BIN
dist/static/img/404_cloud.0f4bc32b.png


BIN
dist/static/img/login-bg.6f4f8f30.png


BIN
dist/static/img/login-logo.a5b6300e.png


BIN
dist/static/img/logo.035598c1.png


BIN
dist/static/img/weekTimer.f983eb26.png


BIN
dist/static/img/woman.9995a81d.png


+ 1 - 1
src/views/accompanyManager/accompanys.vue

@@ -153,7 +153,7 @@
                           value-format="yyyy-MM-dd"
                           placeholder="选择日期"></el-date-picker>
         </el-form-item>
-        <div style="padding-left: 15px; color: red;">课程结束时间不得于,{{ expireForm.tempCoursesExpireDate }}</div>
+        <div style="padding-left: 15px; color: red;">课程结束时间不得于,{{ expireForm.tempCoursesExpireDate }}</div>
       </el-form>
       <div slot="footer"
            class="dialog-footer">

+ 124 - 2
src/views/teamDetail/componentCourse/teacherList.vue

@@ -66,6 +66,10 @@
                        v-if="teachMode == 'OFFLINE'"
                        size="small"
                        @click="lookGPS(scope.row)">GPS定位</el-button>
+            <el-button type="text"
+                       size="small"
+                       v-permission="'courseSchedule/queryTeacherSalary'"
+                       @click="setCourseInfo(scope.row)">课酬调整</el-button>
           </div>
         </template>
       </el-table-column>
@@ -77,10 +81,69 @@
       <gpsLoction v-if="gpsVisible"
                   :activeRow='activeRow' />
     </el-dialog>
+    <el-dialog title="课酬调整"
+               width="800px"
+               append-to-body
+               :visible.sync="dialogTableVisible">
+      <el-table :data="activeTeacherList"
+                :header-cell-style="{background:'#EDEEF0',color:'#444'}">
+        <el-table-column label="老师姓名"
+                         prop="teacherName"></el-table-column>
+        <el-table-column label="老师角色">
+          <template slot-scope="scope">
+            <div>
+              {{ scope.row.teacherRole |workType }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="课程课酬"
+                         prop="expectSalary"></el-table-column>
+        <!-- <el-table-column label="课时补贴"
+                         prop="subsidy"></el-table-column> -->
+        <el-table-column label="操作">
+          <template slot-scope="scope">
+            <div>
+              <el-button type='text'
+                         v-permission="'courseSchedule/updateTeacherCoursesSalary'"
+                         @click="resetTeacher(scope.row)">操作</el-button>
+            </div>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-dialog width="500px"
+                 title=""
+                 :visible.sync="innerVisible"
+                 append-to-body>
+        <!-- 修改代码 -->
+        <el-form :model="teacherMask"
+                 :rules="teacherRules"
+                 ref='teacherMask'>
+          <el-form-item label="调整范围"
+                        prop="radio">
+            <el-radio v-model.trim="teacherMask.radio"
+                      label="all">之后剩余课次</el-radio>
+            <el-radio v-model.trim="teacherMask.radio"
+                      label="one">仅限本次</el-radio>
+          </el-form-item>
+          <el-form-item label="课程课酬"
+                        prop="salary">
+            <el-input style="width:180px"
+                      v-model.trim="teacherMask.salary"></el-input>
+          </el-form-item>
+        </el-form>
+        <div slot="footer"
+             class="dialog-footer">
+          <el-button @click="innerVisible = false">取 消</el-button>
+          <el-button type="primary"
+                     @click="resetSalary">确 定</el-button>
+        </div>
+      </el-dialog>
+    </el-dialog>
   </div>
 </template>
 <script>
-import { updateTeacherAttendance } from "@/api/buildTeam";
+import { updateTeacherAttendance, getCourseList, getTeacherSalary } from "@/api/buildTeam";
+import { updateTeacherCoursesSalary } from '@/api/teacherManager'
 import { getCourseTeachers } from "@/api/teacherManager";
 import gpsLoction from "../componentCourse/gpsLocation";
 export default {
@@ -90,7 +153,21 @@ export default {
     return {
       tableList: [],
       gpsVisible: false,
-      activeRow: null
+      activeRow: null,
+      activeTeacherList: [],
+      dialogTableVisible: false,
+      innerVisible: false,
+      activeTeacher: null,
+      teacherMask: {
+        salary: '',
+        subsidy: '',
+        radio: ''
+      },
+      teacherRules: {
+        salary: [{ required: true, message: '请输入课程课酬', trigger: 'blur' }],
+        subsidy: [{ required: true, message: '请输入课时补贴', trigger: 'blur' }],
+        radio: [{ required: true, message: '请选择调整范围', trigger: 'blur' }]
+      },
     }
   },
   mounted () {
@@ -138,6 +215,51 @@ export default {
 
       }).catch(() => { })
 
+    },
+    setCourseInfo (row) {
+      this.tempSelectRow = row
+      getTeacherSalary({ courseScheduleId: this.courseScheduleId }).then(res => {
+        if (res.code == 200) {
+          this.dialogTableVisible = true;
+          // this.courseScheduleId = row.courseScheduleId;
+          // row.teachingTeachers
+          this.activeTeacherList = res.data;
+        }
+      })
+
+    },
+    resetTeacher (row) {
+      this.innerVisible = true;
+      this.activeTeacher = row;
+    },
+    resetSalary () {
+      let that = this
+      this.$refs['teacherMask'].validate(res => {
+        if (res) {
+          updateTeacherCoursesSalary({
+            courseScheduleId: this.courseScheduleId,
+            salary: this.teacherMask.salary,
+            teacherId: this.activeTeacher.teacherId,
+            scope: this.teacherMask.radio
+
+          }).then(res => {
+            if (res.code == 200) {
+              this.$message.success('修改成功')
+              this.teacherMask = {
+                salary: '',
+                subsidy: '',
+                radio: ''
+              }
+              // this.dialogTableVisible = false;
+              this.innerVisible = false;
+              that.setCourseInfo(this.tempSelectRow)
+            }
+          })
+        } else {
+          this.$message.error('请填写必要参数')
+        }
+      })
+
     }
   },
 }

+ 4 - 5
src/views/teamDetail/components/salaryList.vue

@@ -101,8 +101,8 @@
         </el-table-column>
         <el-table-column label="课程课酬"
                          prop="expectSalary"></el-table-column>
-        <el-table-column label="课时补贴"
-                         prop="subsidy"></el-table-column>
+        <!-- <el-table-column label="课时补贴"
+                         prop="subsidy"></el-table-column> -->
         <el-table-column label="操作">
           <template slot-scope="scope">
             <div>
@@ -133,11 +133,11 @@
             <el-input style="width:180px"
                       v-model.trim="teacherMask.salary"></el-input>
           </el-form-item>
-          <el-form-item label="课时补贴"
+          <!-- <el-form-item label="课时补贴"
                         prop="subsidy">
             <el-input style="width:180px"
                       v-model.trim="teacherMask.subsidy"></el-input>
-          </el-form-item>
+          </el-form-item> -->
         </el-form>
         <div slot="footer"
              class="dialog-footer">
@@ -256,7 +256,6 @@ export default {
             courseScheduleId: this.courseScheduleId,
             salary: this.teacherMask.salary,
             teacherId: this.activeTeacher.teacherId,
-            subsidy: this.teacherMask.subsidy,
             scope: this.teacherMask.radio
 
           }).then(res => {

+ 2 - 1
src/views/vipClass/vipList.vue

@@ -544,9 +544,10 @@ export default {
       let searchForm = JSON.stringify(this.searchForm);
       let name = row.name;
       let endTimeStr = row.coursesExpireDate
+      let startTimeStr = row.courseStartDate
       this.$router.push({
         path: "/business/vipReset",
-        query: { id, educationalTeacherId, organId, userId, rules, searchForm, name, endTimeStr }
+        query: { id, educationalTeacherId, organId, userId, rules, searchForm, name, endTimeStr, startTimeStr }
       });
     },
     // 删除VIP

+ 18 - 6
src/views/vipClass/vipReset.vue

@@ -1,12 +1,15 @@
 <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;">课程有效期:{{ startClassTime|dayjsFormat }} ~ {{endTime |dayjsFormat}}</p>
+    </div>
     <div class="vipwrap">
       <!-- <div class="newBand"
-           v-permission="'vipGroupManage/appendVipGroupCourseSchedules'"
+           v-permission="'vipGroupManage/appendVipGroupCourseSchedules'" 
            @click="addCourse">VIP加课</div> -->
       <div class="newBand"
            v-permission="'courseSchedule/vipCourseAdjust'"
@@ -544,10 +547,12 @@ export default {
       isaddCourse: false,
       adjustmentName: "",
       startTime: "",
+
       chioseVipList: [],
       organList: [],
       name: '',
-      endTime: ''
+      endTime: '',
+      startClassTime: ''
     };
   },
   created () { },
@@ -566,6 +571,7 @@ export default {
       let addrForm = this.addrForm
       this.name = this.$route.query.name;
       this.endTime = this.$route.query.endTimeStr
+      this.startClassTime = this.$route.query.startTimeStr
       if (query.educationalTeacherId) {
         addrForm.educationalTeacherId = Number(query.educationalTeacherId);
       } else {
@@ -1060,4 +1066,10 @@ export default {
     width: 220px !important;
   }
 }
+.titlewrap {
+  display: flex;
+  flex-direction: row;
+  justify-content: flex-start;
+  align-items: center;
+}
 </style>

Một số tệp đã không được hiển thị bởi vì quá nhiều tập tin thay đổi trong này khác