Merge remote-tracking branch 'origin/master'

src/views/course/courseWatchLog/deptWatchLog.vue

@@ -746,6 +746,7 @@ export default {
       this.queryParams.sopId = null; // 重置SOP ID
       this.scheduleTime=null;
       this.updateTime=null;
+      this.queryParams.externalUserName=null;
 
       // 重置SOP搜索
       this.handleSopClear();

src/views/course/courseWatchLog/index.vue

@@ -1217,6 +1217,7 @@ export default {
       this.queryParams.qecETime = null;
       this.queryParams.periodSTime = null;
       this.queryParams.periodDTime = null;
+      this.queryParams.externalUserName=null;
       this.queryParams.scheduleStartTime = null;
       this.queryParams.scheduleEndTime = null;
       this.queryParams.sopId = null; // 重置SOP ID

src/views/course/courseWatchLog/myCourseWatchLog.vue

@@ -490,6 +490,7 @@ export default {
       this.queryParams.qecSTime = null;
       this.queryParams.qecETime = null;
       this.queryParams.scheduleStartTime = null;
+      this.queryParams.externalUserName=null;
       this.queryParams.scheduleEndTime = null;
       this.scheduleTime=null;
       this.handleQuery();

src/views/course/courseWatchLog/watchLog.vue

@@ -11,16 +11,16 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="项目" prop="project">
-        <el-select  v-model="queryParams.project" placeholder="请选择项目" clearable size="small" >
-          <el-option
-            v-for="item in projectOptions"
-            :key="item.dictValue"
-            :label="item.dictLabel"
-            :value="item.dictValue"
-          />
-        </el-select>
-      </el-form-item>
+<!--      <el-form-item label="项目" prop="project">-->
+<!--        <el-select  v-model="queryParams.project" placeholder="请选择项目" clearable size="small" >-->
+<!--          <el-option-->
+<!--            v-for="item in projectOptions"-->
+<!--            :key="item.dictValue"-->
+<!--            :label="item.dictLabel"-->
+<!--            :value="item.dictValue"-->
+<!--          />-->
+<!--        </el-select>-->
+<!--      </el-form-item>-->
       <el-form-item label="企微账号" prop="qwUserId" v-if="queryParams.sendType == 2">
         <el-select v-model="queryParams.qwUserId" placeholder="企微账号" clearable size="small"
                    @change="updateQwuser()">
@@ -1094,7 +1094,7 @@ export default {
       this.queryParams.sopId = null; // 重置SOP ID
       this.queryParams.isVip = null; // 重置 isVip 状态
       this.queryParams.qwUserId = null; // 重置 qwUserId
-
+      this.queryParams.externalUserName=null;
       // 重置SOP搜索
       this.handleSopClear();
       // 统一重置日历组件

src/views/course/courseWatchLog/watchLogStatistics.vue

@@ -247,8 +247,10 @@ export default {
       this.queryParams.upETime = null;
       this.queryParams.scheduleStartTime = null;
       this.queryParams.scheduleEndTime = null;
+      this.queryParams.externalUserName=null;
       this.scheduleTime=null;
       this.updateTime=null;
+
       this.handleQuery();
     },
     // 多选框选中数据

src/views/course/userCourse/index.vue

@@ -391,7 +391,8 @@ export default {
         likes:100000,
         shares:100000,
         favoriteNum:100000,
-        hotNum:100000
+        hotNum:100000,
+        companyIdsList:[]
       };
       this.tags=[];
       this.subCategoryOptions=[]

src/views/qw/qwUserVoiceLog/index.vue

@@ -573,6 +573,7 @@ export default {
       this.createTime=null;
       this.queryParams.sTime=null;
       this.queryParams.eTime=null;
+      this.queryParams.tagIds=null;
       this.handleQuery();
     },
     // 多选框选中数据

src/views/qw/qwUserVoiceLogTotal/index.vue

@@ -634,11 +634,13 @@ export default {
       this.createTime=null;
       this.queryParams.beginTime = null;
       this.queryParams.endTime = null;
+      this.queryParams.deptId = null;
       this.queryParams.corpId= this.myQwCompanyList[0].dictValue;
       this.selectTags=[];
       this.createTime=null;
       this.queryParams.sTime=null;
       this.queryParams.eTime=null;
+      this.queryParams.tagIds=null;
       this.handleQuery();
     },
     // 多选框选中数据