2

src/App.vue

@@ -25,7 +25,7 @@ export default {
 </script>
 
 <style>
-@import url("//at.alicdn.com/t/font_2077629_w1o8daso6r9.css");
+@import url("//at.alicdn.com/t/font_2077629_5htvfk5d53o.css");
 @font-face {
   font-family: "din";
   src: url("./assets/font/DIN-Bold.otf") format("opentype");

src/api/studyabroad/subscribe.js

@@ -160,4 +160,14 @@ export function setAdminScrollMakeUp(data) {
         method: 'post',
         data
     })
+}
+/**
+ * 取消已确认的约课
+ */
+export function cancelSureAppointment(data) {
+    return request({
+        url: '/Scroll/CancelSureAppointment',
+        method: 'post',
+        data
+    })
 }
\ No newline at end of file

src/components/stuMan/subscribe/deleteStu.vue

+<template>
+  <div>
+    <q-dialog v-model="show" persistent transition-show="scale" transition-hide="scale" @input="changeDig">
+      <q-card style="width: 600px;max-width:900px;">
+        <q-card-section class="row items-center q-pb-none">
+          <div class="text-h6">取消约课</div>
+          <q-space />
+          <q-btn icon="close" flat round dense @click="changeDig(false)" />
+        </q-card-section>
+        <q-card-section class="q-pt-none scroll" style="max-height: 70vh">
+          <q-field filled label="学员列表" stack-label>
+            <template v-slot:control>
+              <div class="row">
+                <q-checkbox v-model="selectStu" v-for="(x, y) in saveObj.GuestList" :key="y" :val="x.AppointmentId">
+                  {{ x.GuestName }}
+                </q-checkbox>
+              </div>
+            </template>
+          </q-field>
+
+        </q-card-section>
+        <q-separator />
+        <q-card-actions align="right" class="bg-white">
+          <q-btn label="取消" flat color="grey-10" @click="changeDig(false)" />
+          <q-btn label="确定" dense color="accent" @click="save" />
+        </q-card-actions>
+      </q-card>
+    </q-dialog>
+  </div>
+</template>
+<script>
+  import {
+    cancelSureAppointment
+  } from "../../../api/studyabroad/subscribe.js";
+  export default {
+    model: {
+      prop: "show",
+      event: "changeshow"
+    },
+    props: {
+      saveObj: {
+        type: Object,
+        default: null
+      },
+      date: {
+        type: String,
+        default: ""
+      },
+      show: {
+        type: Boolean,
+        default: false
+      }
+    },
+    data() {
+      return {
+        msg: {
+          Date: "",
+          TeacherId: 0,
+          StuIds: 0,
+          ShiftSort: "",
+        },
+        selectStu: []
+      };
+    },
+    methods: {
+      //开关弹窗
+      changeDig(val) {
+        this.$emit("changeshow", val);
+      },
+      save() {
+        if (this.selectStu.length == 0) {
+          this.$q.notify({
+            message: "请选择学生",
+            position: "top"
+          });
+          return;
+        }
+        const msg = {
+          Date: this.date,
+          TeacherId: this.saveObj.Tid,
+          ShiftSort: this.saveObj.ShiftSort,
+          AppointIds: this.selectStu.toString()
+        };
+        cancelSureAppointment(msg).then(res => {
+          if (res.Code == 1) {
+            this.$q.notify({
+              message: "操作成功",
+              position: "top"
+            });
+            this.$emit("success",this.selectStu);
+            this.selectStu = []
+            this.changeDig(false)
+          }
+        });
+      }
+    }
+  };
+
+</script>

src/components/stuMan/subscribe/detail.vue

@@ -101,9 +101,11 @@
               </q-checkbox>
             </div>
           </div>
-          <div  class="row col-12 relative-position" v-else >
+          <div class="row col-12 relative-position" v-else>
             <div class="absolute" style="top:-20px;right:0" v-if="auth.IsEdit">
-              <q-btn color="accent" size="xs" label="补录" @click="showMakeUpDig = true" />
+              <q-btn color="accent" size="xs" label="取消" @click="showCancelDig = true" />
+              <q-btn color="accent" size="xs" label="补录" @click="showMakeUpDig = true" class="q-ml-sm" />
+
             </div>
             <span v-for="(x, y) in saveObj.GuestList" :key="y">
               {{ x.GuestName }}
@@ -127,6 +129,7 @@
     </div>
     <ChangeCourse v-model="showChangeDig" :saveObj="CourseObj" @success="ChangeCourseSuccessHandle" />
     <MakeUp v-model="showMakeUpDig" :saveObj="saveObj" :date="dateObj.date" @success="makeUpHandle"></MakeUp>
+    <CancelSub v-model="showCancelDig" :saveObj="saveObj" :date="dateObj.date" @success="cancelHandle"></CancelSub>
   </div>
 </template>
 <script>
@@ -136,10 +139,12 @@
   } from "../../../api/studyabroad/subscribe.js";
   import ChangeCourse from "./changeCourse";
   import MakeUp from "./makeUp.vue"
+  import CancelSub from './deleteStu'
   export default {
     components: {
       ChangeCourse,
-      MakeUp
+      MakeUp,
+      CancelSub
     },
     props: {
       dateObj: {
@@ -164,6 +169,7 @@
         checkStuType2: [], //
         showChangeDig: false,
         showMakeUpDig: false,
+        showCancelDig: false,
         CourseObj: {}
       };
     },
@@ -249,6 +255,16 @@
         this.$set(this.saveObj, "GuestList", arr);
         this.$emit("success");
       },
+      cancelHandle(val) {
+        val.map(e => {
+          this.saveObj.GuestList.map((_e, _i) => {
+            if (e == _e.AppointmentId) {
+              this.saveObj.GuestList.splice(_i, 1);
+            }
+          });
+        });
+        this.$emit("success");
+      },
       isShowTag(arr, min) {
         let n = 0;
         arr.map(e => {

src/pages/studyAbroad/subscribe.vue

@@ -356,7 +356,8 @@
         dateObj: {},
         saveObj: {},
         auth: {
-          IsEdit: false
+          IsEdit: false,
+          addBefore:false,//新增今天以前的约课
         }
       };
     },
@@ -381,6 +382,15 @@
       } else {
         this.auth.IsEdit = false;
       }
+      
+      const res2 = ActionMenuList.find(e => {
+        return e.FunctionCode == "subscribe_addBefore";
+      });
+      if (res2) {
+        this.auth.addBefore = true;
+      } else {
+        this.auth.addBefore = false;
+      }
     },
     methods: {
       badgeClasses(event, type, TeacherId) {