Merge branch 'Inspection' into online

src/views/main/schedule-branch/index.vue

@@ -3,10 +3,8 @@
     <save-form inline :model="search" @submit="submit" @reset="reset" saveKey="/main/main/schedule-branch">
       <el-form-item prop="organIds">
         <el-select
-          multiple
           clearable
           filterable
-          collapse-tags
           v-model="search.organId"
           placeholder="请选择分部"
         >
@@ -16,8 +14,8 @@
             :value="item.id"></el-option>
         </el-select>
       </el-form-item>
-      <el-form-item prop="teacherIdList">
-        <remote-search :commit='"setEducations"' :collapse-tags="true"  v-model='search.teacherIdList' :multiple="true" />
+      <el-form-item prop="userId">
+        <remote-search :commit='"setEducations"'  v-model='search.userId' />
       </el-form-item>
       <el-form-item prop="month">
         <el-date-picker
@@ -117,10 +115,9 @@ import pagination from "@/components/Pagination/index";
 import { inspectionQueryPage, inspectionDelete } from '@/views/main/api'
 import create from './modals/create'
 import view from './modals/view'
-import View from './modals/view.vue';
 const initSearch = {
-  organId: [],
-  teacherIdList: [],
+  organId: null,
+  userId: null,
   month: '',
 }
 export default {
@@ -184,8 +181,6 @@ export default {
       try {
         const res = await inspectionQueryPage({
           ...this.search,
-          organId: this.search.organId.join(','),
-          teacherIdList: this.search.teacherIdList.join(','),
           month: this.search.month ? this.$helpers.dayjs(this.search.month).format('YYYY-MM') : undefined,
           page: this.rules.page,
           rows: this.rules.limit,

src/views/main/teamSchedule/compontent/taskInfo.vue

@@ -70,7 +70,11 @@
           ></el-option>
         </el-select>
       </el-form-item>
+      <el-form-item>
+           <p style="color:red">注意:请确认当天该乐团有课，否则将无法提交乐团巡查表</p>
+      </el-form-item>
     </el-form>
+
   </div>
 </template>
 <script>
@@ -86,28 +90,42 @@ export default {
         startTimer: '',
         musicGroupId: "",
       },
+      timerStr:''
     };
   },
   mounted() {
+    this.checkTimes()
+
     if (this.taskInfo) {
-      console.log(this.taskInfo);
       this.taskForm.date = this.taskInfo.planStart;
       this.taskForm.startTimer = dayjs(this.taskInfo.planStart).format('HH:mm:ss')
       this.taskForm.endTimer = dayjs(this.taskInfo.planEnd).format('HH:mm:ss');
-      // console.log( dayjs(this.taskForm.planStart),this.taskForm.planEnd )
       this.taskForm.musicGroupId = this.taskInfo.musicGroupId;
+
     }
   },
   methods: {
     rangeDate(start, end) {
+      let that = this
       return {
         firstDayOfWeek: 1,
         disabledDate(time) {
           if (end && start) {
-            return (
-              new Date(end).getTime() - 86400000 <= time.getTime() ||
+            // 判断时间 当前时间在时间段之前 之中 之后
+            if(that.timerStr == 'before'){
+               return (
+              new Date(end).getTime() <= time.getTime() ||
+              new Date(start).getTime() - 86400000 >= time.getTime()
+            )
+            }else if(that.timerStr == 'middle'){
+              return (
+              new Date(end).getTime() <= time.getTime() ||
               new Date().getTime() - 86400000 >= time.getTime()
-            );
+            )
+            }else{
+               return true
+            }
+
           }
         },
       };
@@ -158,7 +176,22 @@ export default {
     changeStartTime(val) {
       this.taskForm.endTimer = "";
     },
+     checkTimes(){
+
+    // rangeStart, rangeEnd,now
+    let startTime = dayjs(this.rangeStart).valueOf()
+    let entTime = dayjs(this.rangeEnd).valueOf()
+    let now = dayjs(new Date()).valueOf()
+    if(now<startTime){
+      this.timerStr = 'before'
+    }else if(startTime<now&&now<entTime){
+       this.timerStr = 'middle'
+    }else if(now>entTime){
+      this.timerStr = 'after'
+    }
+  }
   },
+
 };
 </script>
 <style lang="scss" scoped>

src/views/main/teamSchedule/scheduleDetail.vue

@@ -17,7 +17,7 @@
     >
     </el-date-picker>
     <div class="taskList">
-      <div class="teamDot dotBtn" draggable="true">下校巡查</div>
+      <div class="teamDot dotBtn" draggable="true" @click="drop" @dragstart="dragstart($event)">下校巡查</div>
       <p>任务数量:<span :style="times>activeTotal?'color:red':''">{{activeTotal}}</span>/<span>{{times}}</span></p>
     </div>
     <div class="timeWrap">
@@ -226,7 +226,8 @@ export default {
       });
     },
 
-    drop(e, name) {
+    drop(e) {
+      console.log(e)
       this.isNew = true;
       this.activeTask = null;
       this.taskStatus = true;
@@ -234,6 +235,9 @@ export default {
     dragOver(event) {
       event.preventDefault();
     },
+    dragstart(e){
+      console.log(e)
+    },
     submitInfo(val) {
       // 新增修改提交
       this.$refs.taskinfo.submitInfo(val);