2

src/pages/studyAbroad/subscribe.vue

@@ -160,7 +160,7 @@
                     item.RList.length
                   )
                 "
-                @click.stop="showDetail(__item)"
+                @click.stop="showDetail(__item, item.ClassDate,_item.TeacherId)"
               >
                 <div v-if="viewType == 'day' || item.RList.length == 1">
                   <div class="itemRow">{{ _item.TeacherName }}</div>
@@ -211,10 +211,10 @@
                         ><span v-if="__item.ClassType == 3">约课</span></span
                       >
                     </div>
-                    
+
                     <div class="flex no-wrap">
                       <span class="detailLabel">进度：</span
-                      ><span>{{ __item.Ranks }}/{{ __item.TotalPlanNum }}</span>
+                      ><span>{{ __item.CompleteProgress>0?__item.CompleteProgress:0 }}%</span>
                     </div>
                     <div class="flex no-wrap">
                       <span class="detailLabel">学员：</span
@@ -226,21 +226,27 @@
                       <span class="detailLabel">
                         预约状态：<span></span
                         ><span v-if="__item.AppointState == 1">待确认</span
-                        ><span v-if="__item.AppointState == 2">已确认</span
-                        ></span
-                      >
+                        ><span v-if="__item.AppointState == 2">已确认</span>
+                        <q-btn
+                          color="accent"
+                          size="xs"
+                          label="确认"
+                          v-if="__item.AppointState == 1"
+                          @click="
+                            confirmSub(item.ClassDate, _item.TeacherId, __item)
+                          "
+                        />
+                      </span>
                     </div>
-                    <div class="flex no-wrap">
+                    <div class="flex no-wrap" v-if="__item.ClassType == 3">
                       <span class="">最小成班人数：</span
                       ><span>{{ __item.ScrollMinNum }}</span>
                     </div>
-                     <div class="flex no-wrap">
+                    <div class="flex no-wrap" v-if="__item.ClassType == 3">
                       <span class="">最大成班人数：</span
                       ><span>{{ __item.ScrollMaxNum }}</span>
                     </div>
-                    <div>
-
-                    </div>
+                    <div></div>
                   </div>
                 </el-popover>
               </div>
@@ -251,15 +257,20 @@
     </q-calendar>
     <SubscribeForm
       v-model="showForm"
+      :editType="editType"
       :dateObj="dateObj"
+      :saveObj="saveObj"
       :teacherList="TeacherList2"
+      @success="saveObj={},getData"
     />
   </div>
 </template>
 
 <script>
-import { GetAppointmentPlanStat } from "../../api/studyabroad/subscribe.js";
- import {queryChapterTree} from "../../api/course/index";
+import {
+  GetAppointmentPlanStat,
+  SetSureAppointment
+} from "../../api/studyabroad/subscribe.js";
 import { date } from "quasar";
 import {
   getTeacherDropDownList,
@@ -283,6 +294,7 @@ export default {
         }
       ],
       showForm: false,
+      editType: 1,
       selectedDate: "",
       msg: {
         StartDate: "",
@@ -346,7 +358,8 @@ export default {
       legendList: [],
       TeacherList2: [],
       events: [],
-      dateObj: {}
+      dateObj: {},
+      saveObj: {}
     };
   },
   components: {
@@ -493,14 +506,46 @@ export default {
     onClickTime2(data) {
       console.log(5, data);
       this.showForm = true;
+      this.editType = 1;
+      this.saveObj = {};
       this.dateObj = data.scope.timestamp;
       console.log("5.1", this.dateObj);
     },
     onClickIntervalHeader2(data) {
       console.log(6, data);
     },
-    showDetail(data) {
+    showDetail(data, date,tid) {
       console.log(7, data);
+      this.showForm = true;
+      this.editType = 2;
+      this.dateObj.date = date;
+      this.saveObj = data;
+      this.saveObj.Tid=tid
+    },
+    confirmSub(date, id, item) {
+      if (item.EnrollNum < item.ScrollMinNum) {
+        this.$q.notify({
+          message: `最小开班人数为${item.ScrollMinNum}`,
+          position: "top",
+          type: "negative"
+        });
+        return;
+      }
+      const msg = {
+        Date: date,
+        TeacherId: id,
+        ShiftSort: item.ShiftSort
+      };
+      SetSureAppointment(msg).then(res => {
+        if (res.Code == 1) {
+          this.$q.notify({
+            message: "操作成功",
+            position: "top",
+            type: "positive"
+          });
+          this.getData()
+        }
+      });
     }
   }
 };