11

11

dist/static/css/chunk-2e595c1c.b997868d.css

@@ -0,0 +1 @@
+.number-input[data-v-0c89bf50]{width:100%}.number-input[data-v-0c89bf50] .el-input__inner,.number-input[data-v-bc860d70] .el-input__inner{text-align:left}

src/store/modules/selects.js

@@ -58,7 +58,7 @@ export default {
       }
     },
     async setTeachers ({ commit, state }, force) {
-      if (!state.subjects.length || force === true) {
+      if (!state.teachers.length || force === true) {
         try {
           const res = await getTeacher()
           commit('commit_teachers', res.data)
@@ -66,7 +66,7 @@ export default {
       }
     },
     async setSchools ({ commit, state }, force) {
-      if (!state.subjects.length || force === true) {
+      if (!state.schools.length || force === true) {
         try {
           const res = await getSchool()
           commit('commit_schools', res.data)
@@ -74,7 +74,7 @@ export default {
       }
     },
     async setVipGroupCategory ({ commit, state }, force) {
-      if (!state.subjects.length || force === true) {
+      if (!state.vipGroupCategory.length || force === true) {
         try {
           const res = await vipGroupCategory()
           commit('commit_vip_group_category', res.data)

src/views/resetTeaming/components/resetPayList.vue

@@ -41,7 +41,7 @@
         <el-table-column align="center"
                          prop="batchNo"
                          width="200"
-                         label="订单编号"></el-table-column>
+                         label="缴费编号"></el-table-column>
         <el-table-column align="center"
                          prop="paymentType"
                          label="缴费类型">

src/views/resetTeaming/components/resetPayListSchool.vue

@@ -41,7 +41,7 @@
         <el-table-column align="center"
                          prop="batchNo"
                          width="200"
-                         label="订单编号"></el-table-column>
+                         label="缴费编号"></el-table-column>
         <el-table-column align="center"
                          prop="paymentType"
                          label="缴费类型">

src/views/teamDetail/teamCourseList.vue

@@ -62,17 +62,6 @@
           </el-select>
         </el-form-item>
         <el-form-item>
-          <el-select v-model.trim="searchForm.mergeType"
-                     clearable
-                     filterable
-                     placeholder="合并类型">
-            <el-option v-for="(item, index) in mergeTypeOpions"
-                       :key="index"
-                       :value="item.value"
-                       :label="item.label"></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item>
           <el-select v-model.trim="searchForm.courseType"
                      clearable
                      filterable
@@ -446,7 +435,7 @@ import {
   getEmployeeOrgan,
   cleanAttendance
 } from "@/api/buildTeam";
-import { workType, mergeCourseType, mergeType } from '@/constant'
+import { workType, mergeCourseType } from '@/constant'
 import { objectToOptions, getTimes } from '@/utils'
 import { getTeacherPersonalAttendanceDetail } from "@/api/teacherManager";
 import { getSchool } from "@/api/systemManage";
@@ -494,8 +483,6 @@ export default {
       courseVisible: false,
       courseType: courseType,
       mergeCourseType,
-      mergeType,
-      mergeTypeOpions: objectToOptions(mergeType),
       courseListType: courseListType,
       searchForm: {...initSearch},
       tableList: [],