Merge branch 'iterationApp' into dev

src/views/audition/ArrangeWork.vue

@@ -319,11 +319,10 @@ export default {
         forbidClick: true,
         loadingType: 'spinner',
       })
-      let query = this.$route.query
       let params = {
         title: this.title,
         content: this.content,
-        courseScheduleId: query.courseId,
+        courseScheduleId: this.courseId,
         expiryDate: dayjs(this.dateSection.currentDate).format('YYYY-MM-DD'),
         musicScoreSubjectDto: musicScoreSubjectDto
       }

src/views/visitManager/api.js

@@ -4,6 +4,7 @@ export const queryStudyStandardWaitVisit = (data) => {
   return request({
     url: '/teacherCourseSchedule/queryStudyStandardWaitVisit',
     method: 'post',
-    data
+    data,
+    requestType: 'form'
   })
 }

src/views/visitManager/beforeVisitList.vue

@@ -118,6 +118,7 @@ export default {
           username: item.username,
           classDate: item.classDate,
           reviewId: item.courseScheduleReviewId,
+          courseScheduleId: item.courseScheduleId,
           objectId: item.studentAttendanceId,
           userId: item.userId,
           phone: item.phone
@@ -170,11 +171,13 @@ export default {
       }
       this.startDay = dayjs(start).format("YYYY-MM-DD");
       this.endDay = dayjs(end).format("YYYY-MM-DD");
-      //
-      this.changeDropDownItemStatus();
-    },
-    changeDropDownItemStatus() {
-      this.$refs.item.toggle(false);
+
+      this.list = [];
+      this.params.page = 1;
+      this.dataShow = true;
+      this.loading = true;
+      this.finished = false;
+      this.getList()
     },
     onClose() {
       // 关闭弹窗时初始化默认日期
@@ -182,16 +185,16 @@ export default {
     },
     async getList() {
       let params = this.params;
-      if (this.formatStartTime && this.formatEndTime) {
-        params.startTime = dayjs(new Date(this.formatStartTime)).format(
+      if (this.startDay && this.endDay) {
+        params.startDate = dayjs(new Date(this.startDay)).format(
           "YYYY-MM-DD"
         );
-        params.endTime = dayjs(new Date(this.formatEndTime)).format(
+        params.endDate = dayjs(new Date(this.endDay)).format(
           "YYYY-MM-DD"
         );
       } else {
-        params.startTime = null;
-        params.endTime = null;
+        params.startDate = null;
+        params.endDate = null;
       }
       try {
         const res = await queryStudyStandardWaitVisit(params);

src/views/visitManager/visitDetail.vue

@@ -74,7 +74,7 @@ export default {
   },
   async mounted() {
     try {
-      const detail = await getCurrentCourseDetail({ courseID: this.userInfo.objectId });
+      const detail = await getCurrentCourseDetail({ courseID: this.userInfo.courseScheduleId });
       const resultDetail = detail.data
       let tempMemo = resultDetail.coursePlan
       this.dataInfo = {