取消约课调整

src/components/stuMan/subscribe/deleteStu.vue

@@ -79,15 +79,25 @@
           Date: this.date,
           TeacherId: this.saveObj.Tid,
           ShiftSort: this.saveObj.ShiftSort,
-          AppointIds: this.selectStu.toString()
+          AppointIds: this.selectStu.toString(),
+          AccountId: this.saveObj.AccountId, //新取消接口参数
+          ChooseStuList: [], //新取消接口参数
         };
+        if (this.selectStu && this.selectStu.length > 0) {
+          this.selectStu.forEach(item => {
+            msg.ChooseStuList.push({
+              AppointId: item,
+              IsCalcStuCheck: 0
+            });
+          })
+        }
         cancelSureAppointment(msg).then(res => {
           if (res.Code == 1) {
             this.$q.notify({
               message: "操作成功",
               position: "top"
             });
-            this.$emit("success",this.selectStu);
+            this.$emit("success", this.selectStu);
             this.selectStu = []
             this.changeDig(false)
           }

src/components/stuMan/subscribe/detail.vue

@@ -201,6 +201,12 @@
       //取消预约
       cancelSub() {
         let that = this;
+        console.log("that.saveObj",that.saveObj);
+        const msg = {
+          Date: that.dateObj.date,
+          TeacherId: that.saveObj.Tid,
+          AppointIds: that.checkStuType2.toString()
+        };
         this.$q
           .dialog({
             title: "提示信息",
@@ -210,28 +216,24 @@
             cancel: "否"
           })
           .onOk(() => {
-            const msg = {
-              Date: that.dateObj.date,
-              TeacherId: that.saveObj.Tid,
-              AppointIds: that.checkStuType2.toString()
-            };
-            CancelAppointment(msg).then(res => {
-              if (res.Code == 1) {
-                that.$q.notify({
-                  message: "操作成功",
-                  position: "top"
-                });
-                that.checkStuType2.map(e => {
-                  that.saveObj.GuestList.map((_e, _i) => {
-                    if (e == _e.AppointmentId) {
-                      that.saveObj.GuestList.splice(_i, 1);
-                    }
-                  });
-                });
-                that.checkStuType2 = [];
-                that.$emit("success");
-              }
-            });
+
+            // CancelAppointment(msg).then(res => {
+            //   if (res.Code == 1) {
+            //     that.$q.notify({
+            //       message: "操作成功",
+            //       position: "top"
+            //     });
+            //     that.checkStuType2.map(e => {
+            //       that.saveObj.GuestList.map((_e, _i) => {
+            //         if (e == _e.AppointmentId) {
+            //           that.saveObj.GuestList.splice(_i, 1);
+            //         }
+            //       });
+            //     });
+            //     that.checkStuType2 = [];
+            //     that.$emit("success");
+            //   }
+            // });
           })
           .onCancel(() => {});
       },
@@ -270,12 +272,18 @@
           AppointIds: "",
           Date: this.dateObj.date,
           ShiftSort: item.ShiftSort,
-          TeacherId: item.Tid
+          TeacherId: item.Tid,
+          AccountId: item.AccountId, //新接口取消约课参数
+          ChooseStuList: [], //新接口取消约课参数
         };
         var tempList = [];
         if (item.GuestList && item.GuestList.length > 0) {
           item.GuestList.forEach(subItem => {
             tempList.push(subItem.AppointmentId);
+            postMsg.ChooseStuList.push({
+              AppointId: subItem.AppointmentId,
+              IsCalcStuCheck: 0
+            })
           })
         }
         if (tempList && tempList.length > 0) {

src/pages/studyAbroad/subscribe.vue

@@ -41,12 +41,12 @@
       <!-- <q-btn v-if="msg.ClassType==2" dense text-color="primary" icon="download" flat unelevated label="下载排课表"
         @click="DownLoadStuLearnChapterStatic" /> -->
       <div style="margin-left:10px;">
-        <q-btn dense text-color="primary"  flat unelevated  class="q-mr-md" size="sm" icon="download" label="下载老师排课表"
+        <q-btn dense text-color="primary" flat unelevated class="q-mr-md" size="sm" icon="download" label="下载老师排课表"
           @click="DownLoadStuLearnChapterStatic" />
       </div>
       <q-separator vertical />
       <div style="margin-left:10px;">
-        <q-btn dense text-color="primary"  flat unelevated  class="q-mr-md" size="sm" icon="download" label="下载学生发课表"
+        <q-btn dense text-color="primary" flat unelevated class="q-mr-md" size="sm" icon="download" label="下载学生发课表"
           @click="DownLoadPlanStudentExcel" />
       </div>
     </div>
@@ -450,7 +450,6 @@
         EduDownLoad("/TeacherClass/GetAppointmentPlanStudentExcel", this.msg, (dateStartDate.getMonth() + 1) + "月" +
           dateStartDate.getDate() + "日-" + (dateEndDate.getMonth() + 1) + "月" + dateEndDate.getDate() + "日学生排课统计.xls",
           res => {});
-
       },
       badgeStyles(event, type, timeStartPos, timeDurationHeight, index, total) {
         const s = {};
@@ -514,7 +513,6 @@
               TId: 0
             });
             this.legendList = JSON.parse(JSON.stringify(res.Data));
-
             this.legendList.forEach((item, index) => {
               item.bg = this.colorList[index];
             });
@@ -535,7 +533,6 @@
       },
       getData() {
         GetAppointmentPlanStat(this.msg).then(res => {
-          // this.events = res.Data;
           let data = JSON.parse(JSON.stringify(res.Data));
           res.Data.map((e, i) => {
             data[i].RList = [];