Merge branch '02/24resetMain' into test

src/views/buildVip/index.vue

@@ -448,7 +448,7 @@
             >
               <template slot-scope="scope">
                 <el-input-number
-                  :disabled="!isMusicTheory"
+                  :disabled="true"
                   size="mini"
                   @change="changeStudentMoney"
                   style="width: 90% !important"
@@ -472,7 +472,7 @@
                   size="mini"
                   style="width: 90% !important"
                   class="number-input"
-                  :disabled="!isMusicTheory"
+                  :disabled="true"
                   v-model="scope.row.offlineClassesUnitPrice"
                   :controls="false"
                   :min="0"
@@ -723,6 +723,7 @@ export default {
       offlineLookList: [], // 展示课表线下
       timeTable: [], // 真正的课表
       giveNum: "",
+      chioseStudent: [],
       weekDay: [
         "星期日",
         "星期一",
@@ -820,6 +821,7 @@ export default {
       studentList: [],
       courseTimeList: [],
       isMusicTheory: false,
+      chioseStudent: [],
     };
   },
   computed: {
@@ -869,9 +871,9 @@ export default {
       this.$confirm("检测到您有未提交的数据, 是否恢复?", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
-        closeOnClickModal:false,
+        closeOnClickModal: false,
         type: "warning",
-      }).then(() => {
+      }).then(async() => {
         this.activeStudentList = sotrage.activeStudentList;
         this.centerForm = sotrage.centerForm;
         this.leftForm = sotrage.leftForm;
@@ -879,12 +881,24 @@ export default {
         this.timeTable = sotrage.timeTable;
         this.educationList = sotrage.educationList;
         this.courseTypeList = sotrage.courseTypeList;
+        // 为了刷新线上课单价和线下课单价
+      await  vipGroupCategory({
+          organId: sotrage?.leftForm?.classOrganId,
+        }).then((res) => {
+          if (res.code == 200) {
+            this.courseTypeList = res.data;
+          }
+        });
         this.scetionList = sotrage.scetionList;
         this.studentList = sotrage.studentList;
         this.activeList = sotrage.activeList;
         this.studentLimit = sotrage.studentLimit;
-        this.teacherList = sotrage.teacherList
-        this.isMusicTheory = sotrage.isMusicTheory
+        this.teacherList = sotrage.teacherList;
+        this.isMusicTheory = sotrage.isMusicTheory;
+        this.chioseStudent = sotrage.chioseStudent;
+        if (this.leftForm?.courseType) {
+          this.changePrice(this.leftForm.courseType);
+        }
       });
     }
     this.init();
@@ -910,7 +924,8 @@ export default {
       studentList: this.studentList,
       activeList: this.activeList,
       studentLimit: this.studentLimit,
-      isMusicTheory:this.isMusicTheory
+      isMusicTheory: this.isMusicTheory,
+      chioseStudent: this.chioseStudent,
       // computationalBtn:this.computationalBtn,
     };
     localStorage.setItem(`newVip`, JSON.stringify(obj));
@@ -976,6 +991,7 @@ export default {
       this.offlineLookList = []; // 展示课表线下
       this.timeTable = []; // 真正的课表
       this.giveNum = "";
+      this.chioseStudent = [];
       this.$refs["leftForm"].resetFields();
       localStorage.removeItem("newVip");
     },
@@ -1088,6 +1104,9 @@ export default {
       this.rightForm.onlineCourse = "";
       this.leftForm.activeType = "";
       this.leftForm.students = []; // 重置所选学生
+      this.changePrice(val);
+    },
+    changePrice(val) {
       for (let i in this.courseTypeList) {
         if (this.courseTypeList[i].id == val) {
           // 学生人数
@@ -1107,6 +1126,24 @@ export default {
           this.isMusicTheory = this.courseTypeList[i].musicTheory;
         }
       }
+      this.activeStudentList = [];
+      this.studentList.forEach((stu) => {
+        if (this.chioseStudent.indexOf(stu.userId) != -1) {
+          this.activeStudentList.push({
+            studentId: stu.userId,
+            userName: stu.username,
+            onlineClassesUnitPrice: this.rightForm.onlinePrice,
+            offlineClassesUnitPrice: this.rightForm.offlinePrice,
+            paymentPrice: "",
+          });
+        }
+      });
+      console.log(
+        this.activeStudentList,
+        this.rightForm.offlinePrice,
+        this.rightForm.onlinePrice,
+        this.chioseStudent
+      );
     },
     // 选择活动方案
     chioseActive(val) {
@@ -1641,9 +1678,8 @@ export default {
       };
       // 新增
       createVip(obj).then((res) => {
-
         if (res.code == 200) {
-            this.resetFrom()
+          this.resetFrom();
           if (res.data == "ING") {
             this.$confirm(
               "课程提交成功，已提交运营主管审批,审批通过后，课程创建成功！",
@@ -1683,7 +1719,7 @@ export default {
             obj.allowOverstepActivityStudentNum = 1;
             createVip(obj).then((res) => {
               if (res.code == 200) {
-               this.resetFrom()
+                this.resetFrom();
                 this.$message.success("提交成功");
                 this.$store.dispatch("delVisitedViews", this.$route);
                 this.$router.push({
@@ -1935,7 +1971,7 @@ export default {
     changeStudent(val) {
       this.leftForm.activeType = "";
       this.activeStudentList = [];
-
+      this.chioseStudent = val;
       this.studentList.forEach((stu) => {
         if (val.indexOf(stu.userId) != -1) {
           this.activeStudentList.push({