Merge remote-tracking branch 'origin/master'

src/views/course/courseWatchLog/deptWatchLog.vue

@@ -653,7 +653,10 @@ export default {
       this.queryParams.eTime = this.formatDate(todayEnd);
     },
     handleSendTypeChange() {
-      this.handleQuery(); // 重新查询列表
+      setTimeout(() => {
+        this.handleQuery(); // 重新查询列表
+      }, 200);
+
     },
 
     // 重置日历组件

src/views/course/courseWatchLog/index.vue

@@ -1437,7 +1437,10 @@ export default {
       if(this.queryParams.sendType == 1) {
         this.queryParams.qwUserName = null;
       }
-      this.handleQuery(); // 重新查询列表
+      setTimeout(() => {
+        this.handleQuery();
+      }, 200);
+
     },
 
 

src/views/course/courseWatchLog/watchLog.vue

@@ -939,7 +939,10 @@ export default {
       // 强制重新渲染表格
       this.tableKey += 1;
 
-      this.getList();
+      setTimeout(() => {
+        this.getList();
+      }, 200);
+
     },
 
     // 重置日历组件

src/views/qw/sopTemp/updateSopTemp.vue

@@ -89,7 +89,7 @@
                                       v-model="content.time"
                                       value-format="HH:mm"
                                       format="HH:mm"
-                                      :picker-options="{ selectableRange: startTimeRange }"
+                                      :picker-options="{ selectableRange: ['01:00:00 - 01:59:00','05:00:00 - 23:59:59'] }"
                                       placeholder="时间"
                                       style="width: 100px;height: 20px;">
                                     </el-time-picker>
@@ -101,7 +101,7 @@
                                       :disabled="formType == 3 || !roles.includes('update_sop_temp_time')"
                                       class="custom-input"
                                       v-model="content.time"
-                                      :picker-options="{ selectableRange: startTimeRange }"
+                                      :picker-options="{ selectableRange: ['00:01:00 - 00:59:00','05:00:00 - 23:59:59']}"
                                       value-format="HH:mm"
                                       format="HH:mm"
                                       placeholder="时间"
@@ -766,7 +766,7 @@ export default {
       dayList: [],
       ruleList: [],
       ids: [],
-      startTimeRange: [],
+      // startTimeRange: [],
       courseTypeList: ['1','2', '4','5','6', '7','8','9','10'],
       sysFsSopWatchStatus: [],
       //消息内容类型 企微版
@@ -851,9 +851,9 @@ export default {
     this.getDicts("sys_fs_sop_watch_status").then(response => {
       this.sysFsSopWatchStatus = response.data;
     });
-    getSelectableRange().then(e => {
-      this.startTimeRange = e.data;
-    })
+    // getSelectableRange().then(e => {
+    //   this.startTimeRange = e.data;
+    // })
 
     this.getDicts("sys_qwSop_contentType").then(response => {
       this.sysQwSopContentType = response.data;