Merge branch '04/14resetSalaryName' into dev

src/views/teamDetail/componentCourse/modals/resetCourses.vue

@@ -22,17 +22,34 @@
           placeholder="选择时间"
         ></el-time-picker>
       </el-form-item>
-      <el-form-item label=" 上课模式" prop="teachMode">
+      <el-form-item label=" 上课模式" prop="teachMode" v-if="groupType == 'VIP'">
         <el-select
           v-model.trim="timeForm.teachMode"
           style="width: 220px !important"
+          @change="()=>{timeForm.address=''}"
         >
           <el-option label="线上课" value="ONLINE"></el-option>
           <el-option label="线下课" value="OFFLINE"></el-option>
           <el-option label="不修改" value=""></el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label=" 教学地点" prop="address">
+      <el-form-item label=" 教学地点" prop="address" v-if="timeForm.teachMode == 'OFFLINE'&&groupType == 'VIP'">
+        <el-select
+          v-model.trim="timeForm.address"
+          style="width: 220px !important"
+          filterable
+          clearable
+        >
+          <el-option label="不修改" :value="''"></el-option>
+          <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-item label=" 教学地点" prop="address" v-if="groupType == 'MUSIC'">
         <el-select
           v-model.trim="timeForm.address"
           style="width: 220px !important"
@@ -72,11 +89,16 @@ export default {
         endTime: [
           { required: true, message: "请选择结束时间", trigger: "blur" },
         ],
+        address: [
+          { required: true, message: "请选教学地点", trigger: "blur" },
+        ],
       },
       schoolList: [],
+      groupType:''
     };
   },
   mounted() {
+    this.groupType = this.dataList[0].groupType
     getSchool().then((res) => {
       if (res.code == 200) {
         this.schoolList = res.data;

src/views/teamDetail/teamCourseList.vue

@@ -836,7 +836,7 @@ export default {
           if (res.code == 200) {
             this.$message.success("删除成功");
             this.getList();
-            this.deleteList = [];
+          this.clearCom()
           }
         }).catch((e)=>{
             this.$refs.addCompound.isLook = true
@@ -1052,8 +1052,11 @@ export default {
       if (indexNum + "") {
         this.deleteList.splice(indexNum, 1);
       }
-      console.log(row);
-      this.$refs.tableList.toggleRowSelection(row);
+      this.tableList.forEach((course,index)=>{
+        if(course.id == row.id){
+           this.$refs.tableList.toggleRowSelection(course,false);
+        }
+      })
     },
     clearCom() {
       // this.deleteList = [];