联调修改

src/pages/system/courseManager/courseList/index.vue

@@ -119,6 +119,7 @@
               size="mini"
               type="warning"
               v-if="scope.row.Status===0"
+              @click="toSchedule(scope.row)"
               >排课</el-button>
             <el-button
               size="mini"
@@ -421,7 +422,10 @@ export default {
     handleCopy (row) {
       this.GetCourseByID({ id: row.CourseId })
       this.$router.push({ name: 'addCourse' })
-    }
+    },
+    toSchedule (row) {
+      this.$router.push({ name: 'scheduleManager', query: { id: row.CourseId } })
+    },
   }
 }
 </script>

src/pages/system/courseManager/scheduleManager/edit.vue

@@ -161,20 +161,29 @@ export default {
         pagesize: 10, // 请求数据量
         name: '', // 课程名称
         date: '',
+        courseid: '',
       },
     }
   },
   mounted () {
-    const { date, caseid } = this.$route.query
-    if (!date || date === '' || !caseid || caseid === '') {
+    const { date, caseid, courseid } = this.$route.query
+    if (!date || date === '') {
       this.$message({
         type: 'error',
-        message: '请先选择排课时间与案场'
+        message: '请先选择排课时间'
+      })
+      this.$router.push({ name: 'scheduleManager', query: { courseid: courseid } })
+    }
+    if ((!courseid && courseid === '') && (!caseid || caseid === '')) {
+      this.$message({
+        type: 'error',
+        message: '请先选择排课案场'
       })
       this.$router.push({ name: 'scheduleManager' })
     }
     this.postData.date = date
     this.postData.caseid = caseid
+    this.postData.courseid = courseid
     this.updateLocationInfo()
     this.$nextTick(function () {
       this.getList()

src/pages/system/courseManager/scheduleManager/index.vue

@@ -5,7 +5,7 @@
         <div class="flex-item flex-h">
           <!-- <el-button size="mini" type="success" @click="addSchedule">新增排课</el-button> -->
         </div>
-        <ul>
+        <ul v-if="courseid===''">
           <li>
             <el-select v-model="CaseId" placeholder="请选择案场">
               <el-option
@@ -116,6 +116,7 @@ export default {
     return {
       caseid: '',
       seldate: '',
+      courseid: '',
       currentCourseItem: {},
       centerDialogVisible: false,
     }
@@ -165,10 +166,11 @@ export default {
     ...mapScheduleActions([
       'GetDetailList',
       'UpdateDetail',
-      'DelDetail'
+      'DelDetail',
+      'SetListNull',
     ]),
     dayClick (day, jsEvent) { // 点击某天进入排课
-      this.$router.push({ name: 'editSchedule', query: {caseid: this.CaseId, date: this.toolClass.dateFormat(day, 'yyyy-MM-dd')} })
+      this.$router.push({ name: 'editSchedule', query: {caseid: this.CaseId, courseid: this.courseid, date: this.toolClass.dateFormat(day, 'yyyy-MM-dd')} })
     },
     eventClick (event, jsEvent, pos) { // 点击日历
       this.currentCourseItem = {...event.detail}
@@ -182,10 +184,15 @@ export default {
       this.getList()
     },
     getList () {
-      this.GetDetailList({
-        caseid: this.CaseId,
-        date: this.CurrentMonth,
-      })
+      if (this.CaseId !== '' || this.courseid !== '') {
+        this.GetDetailList({
+          caseid: this.CaseId,
+          date: this.CurrentMonth,
+          courseid: this.courseid,
+        })
+      } else {
+        this.SetListNull()
+      }
     },
     handlUpdateDetail () {
       this.UpdateDetail({...this.currentCourseItem,
@@ -214,6 +221,10 @@ export default {
   },
   mounted () {
     this.$nextTick(function () {
+      const { id } = this.$route.query
+      if (id && id !== '') {
+        this.courseid = id
+      }
       this.getList()
     })
   }

src/pages/system/verificationManager/phoneVerification/verificationList/index.vue

@@ -59,7 +59,7 @@
                     type="success"
                     v-if="scope.row.VerifyStatus!=='used'"
                     @click="check(scope.row)">核销</el-button>
-                  <span>已完成</span>
+                  <span v-else>已完成</span>
                 </template>
               </el-table-column>
             </el-table>

src/pages/system/verificationManager/qrcodeVerification/verificationList/index.vue

@@ -51,7 +51,7 @@
                     type="success"
                     v-if="scope.row.VerifyStatus!=='used'"
                     @click="check(scope.row)">核销</el-button>
-                  <span>已完成</span>
+                  <span v-else>已完成</span>
                 </template>
               </el-table-column>
             </el-table>

src/store/course/schedule.js

@@ -89,5 +89,8 @@ export default {
         }
       })
     },
+    SetListNull ({ commit }) {
+      commit('updatesSheduleList', [])
+    }
   }
 }