Merge branch 'master' into 企微聊天

src/views/course/courseUserStatistics/qw/my.vue

@@ -11,7 +11,14 @@
         />
       </el-form-item>
       <el-form-item label="添加时间" prop="createTime">
-        <el-date-picker v-model="createTime" size="small" style="width: 220px" value-format="yyyy-MM-dd" type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" @change="change"></el-date-picker>
+        <el-date-picker v-model="createTime" size="small"
+                        style="width: 220px"
+                        value-format="yyyy-MM-dd"
+                        type="daterange" range-separator="-"
+                        start-placeholder="开始日期"
+                        end-placeholder="结束日期"
+                        :picker-options="pickerOptions"
+                        @change="change"></el-date-picker>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -19,11 +26,11 @@
       </el-form-item>
     </el-form>
 
-    <el-table 
-    border 
-    v-loading="loading" 
+    <el-table
+    border
+    v-loading="loading"
     :data="courseWatchLogList"
-    @selection-change="handleSelectionChange" 
+    @selection-change="handleSelectionChange"
     :show-summary="true"
     :summary-method="getSummaries"
     ref="table1">
@@ -200,18 +207,53 @@ export default {
       rules: {
       },
       scheduleTime: null,
+      pickerOptions: {
+        disabledDate(time) {
+          // 获取6天前的日期（加上今天就是7天）
+          const sixDaysAgo = new Date();
+          sixDaysAgo.setDate(sixDaysAgo.getDate() - 6);
+          sixDaysAgo.setHours(0, 0, 0, 0);
+
+          // 获取明天的日期（不包括今天）
+          const tomorrow = new Date();
+          tomorrow.setDate(tomorrow.getDate() + 1);
+          tomorrow.setHours(0, 0, 0, 0);
+
+          return time.getTime() < sixDaysAgo.getTime() || time.getTime() >= tomorrow.getTime();
+
+        }
+      },
     };
   },
   created() {
     courseList().then(response => {
       this.courseLists = response.list;
     });
-    this.getList();
+
+    const today = new Date();
+    const sevenDaysAgo = new Date();
+    sevenDaysAgo.setDate(sevenDaysAgo.getDate() - 6);
+    this.queryParams.sTime = this.formatDate(sevenDaysAgo);
+    this.queryParams.eTime = this.formatDate(today);
+
     this.getDicts("sys_course_watch_log_type").then(response => {
       this.logTypeOptions = response.data;
     });
+
+    setTimeout(() => {
+      this.getList();
+    }, 200);
+
   },
   methods: {
+
+    formatDate(date) {
+      const year = date.getFullYear();
+      const month = String(date.getMonth() + 1).padStart(2, '0');
+      const day = String(date.getDate()).padStart(2, '0');
+      return `${year}-${month}-${day}`;
+    },
+
      getSummaries(param) {
       let totalNum = 0;
       const { columns, data } = param;
@@ -292,6 +334,7 @@ export default {
     },
     /** 查询短链课程看课记录列表 */
     getList() {
+
       this.loading = true;
       myQwWatchLogStatisticsList(this.queryParams).then(response => {
         this.courseWatchLogList = response.rows;
@@ -303,6 +346,7 @@ export default {
           this.$refs.table1?.doLayout();
         }, 2000);
       });
+
     },
     // 取消按钮
     cancel() {
@@ -337,8 +381,13 @@ export default {
       this.resetForm("queryForm");
       this.createTime = null;
       this.scheduleTime = null;
-      this.queryParams.sTime = null;
-      this.queryParams.eTime = null;
+
+      const today = new Date();
+      const sevenDaysAgo = new Date();
+      sevenDaysAgo.setDate(sevenDaysAgo.getDate() - 6);
+      this.queryParams.sTime = this.formatDate(sevenDaysAgo);
+      this.queryParams.eTime = this.formatDate(today);
+
       this.queryParams.scheduleStartTime = null;
       this.queryParams.scheduleEndTime = null;
       this.handleQuery();

src/views/qw/externalContactLoss/deptLossIndex.vue

@@ -30,7 +30,14 @@ deptLossIndex<template>
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-
+      <el-form-item label="添加时间" prop="createTime">
+        <el-date-picker clearable size="small"
+                        v-model="queryParams.createTime"
+                        type="date"
+                        value-format="yyyy-MM-dd"
+                        placeholder="添加时间">
+        </el-date-picker>
+      </el-form-item>
 
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -76,6 +83,7 @@ deptLossIndex<template>
           <dict-tag :options="typeOptions" :value="scope.row.type"/>
         </template>
       </el-table-column>
+      <el-table-column label="添加时间" align="center" prop="createTime"/>
        <el-table-column label="流失时间" align="center" prop="lossTime" v-if="queryParams.status==3"/>
        <el-table-column label="删除时间" align="center" prop="delTime" v-if="queryParams.status==4"/>
       <el-table-column label="状态" align="center" prop="status" width="100px">
@@ -239,6 +247,7 @@ export default {
         name: null,
         avatar: null,
         type: null,
+        createTime:null,
         gender: null,
         description: null,
         tagIds: null,

src/views/qw/externalContactLoss/index.vue

@@ -39,7 +39,14 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-
+      <el-form-item label="添加时间" prop="createTime">
+        <el-date-picker clearable size="small"
+                        v-model="queryParams.createTime"
+                        type="date"
+                        value-format="yyyy-MM-dd"
+                        placeholder="添加时间">
+        </el-date-picker>
+      </el-form-item>
 
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -85,6 +92,7 @@
           <dict-tag :options="typeOptions" :value="scope.row.type"/>
         </template>
       </el-table-column>
+      <el-table-column label="添加时间" align="center" prop="createTime"/>
        <el-table-column label="流失时间" align="center" prop="lossTime" v-if="queryParams.status==3"/>
        <el-table-column label="删除时间" align="center" prop="delTime" v-if="queryParams.status==4"/>
       <el-table-column label="状态" align="center" prop="status" width="100px">
@@ -247,6 +255,7 @@ export default {
         externalUserId: null,
         name: null,
         avatar: null,
+        createTime:null,
         type: null,
         gender: null,
         description: null,

src/views/qw/externalContactLoss/my.vue

@@ -31,6 +31,14 @@
         />
       </el-form-item>
 
+      <el-form-item label="添加时间" prop="createTime">
+        <el-date-picker clearable size="small"
+                        v-model="queryParams.createTime"
+                        type="date"
+                        value-format="yyyy-MM-dd"
+                        placeholder="添加时间">
+        </el-date-picker>
+      </el-form-item>
 
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -66,6 +74,7 @@
           <dict-tag :options="typeOptions" :value="scope.row.type"/>
         </template>
       </el-table-column>
+      <el-table-column label="添加时间" align="center" prop="createTime"/>
        <el-table-column label="流失时间" align="center" prop="lossTime" v-if="queryParams.status==3"/>
        <el-table-column label="删除时间" align="center" prop="delTime" v-if="queryParams.status==4"/>
       <el-table-column label="状态" align="center" prop="status" width="100px">
@@ -228,6 +237,7 @@ export default {
         externalUserId: null,
         name: null,
         avatar: null,
+        createTime:null,
         type: null,
         gender: null,
         description: null,

src/views/qw/user/cuDeptIdIndex.vue

@@ -44,6 +44,16 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="ipad状态" prop="loginStatus">
+        <el-select v-model="queryParams.loginStatus" placeholder="请选择ipad状态" clearable>
+          <el-option
+            v-for="item in loginStatusOption"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value">
+          </el-option>
+        </el-select>
+      </el-form-item>
       <el-form-item label="员工状态" prop="isDel">
         <el-select v-model="queryParams.isDel" placeholder="请选择员工状态" clearable>
           <el-option
@@ -501,6 +511,13 @@ export default {
         value: 2,
         label: '离职'
       }],
+      loginStatusOption: [{
+        value: 0,
+        label: '离线'
+      }, {
+        value: 1,
+        label: '在线'
+      }],
       // 遮罩层
       loading: true,
       // 导出遮罩层
@@ -573,6 +590,7 @@ export default {
         pageNum: 1,
         pageSize: 10,
         qwUserId: null,
+        loginStatus: null,
         corpId: null,
         qwUserName: null,
         deptId:null,
@@ -1072,6 +1090,7 @@ export default {
     /** 重置按钮操作 */
     resetQuery() {
       this.resetForm("queryForm");
+      this.queryParams.loginStatus = null;
       this.queryParams.corpId=this.myQwCompanyList[0].dictValue;
       this.queryParams.deptId = this.deptOptions[0] && this.deptOptions[0].id;
       this.handleQuery();

src/views/qw/user/index.vue

@@ -44,6 +44,17 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="ipad状态" prop="loginStatus">
+        <el-select v-model="queryParams.loginStatus" placeholder="请选择ipad状态" clearable>
+          <el-option
+            v-for="item in loginStatusOption"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value">
+          </el-option>
+        </el-select>
+      </el-form-item>
+
       <el-form-item label="员工状态" prop="isDel">
         <el-select v-model="queryParams.isDel" placeholder="请选择员工状态" clearable>
           <el-option
@@ -598,6 +609,13 @@ export default {
         value: 2,
         label: '离职'
       }],
+      loginStatusOption: [{
+        value: 0,
+        label: '离线'
+      }, {
+        value: 1,
+        label: '在线'
+      }],
       // 遮罩层
       loading: true,
       names: [],
@@ -677,6 +695,7 @@ export default {
         pageNum: 1,
         pageSize: 10,
         qwUserId: null,
+        loginStatus: null,
         corpId: null,
         qwUserName: null,
         deptId:null,
@@ -1199,6 +1218,7 @@ export default {
     resetQuery() {
       this.resetForm("queryForm");
       this.queryParams.corpId = this.myQwCompanyList[0].dictValue;
+      this.queryParams.loginStatus = null;
       this.queryParams.deptId = this.deptOptions[0] && this.deptOptions[0].id;
       this.handleQuery();
     },

src/views/qw/user/myIndex.vue

@@ -41,6 +41,18 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+
+      <el-form-item label="ipad状态" prop="loginStatus">
+        <el-select v-model="queryParams.loginStatus" placeholder="请选择ipad状态" clearable>
+          <el-option
+            v-for="item in loginStatusOption"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value">
+          </el-option>
+        </el-select>
+      </el-form-item>
+
       <el-form-item label="员工状态" prop="isDel">
         <el-select v-model="queryParams.isDel" placeholder="请选择员工状态" clearable>
           <el-option
@@ -675,9 +687,17 @@ export default {
         pageNum: 1,
         pageSize: 10,
         qwUserId: null,
+        loginStatus: null,
         corpId: null,
         qwUserName: null,
       },
+      loginStatusOption: [{
+        value: 0,
+        label: '离线'
+      }, {
+        value: 1,
+        label: '在线'
+      }],
       qwUserId:null,
       companyUserList:[],
       // 表单参数
@@ -1172,6 +1192,7 @@ export default {
     /** 重置按钮操作 */
     resetQuery() {
       this.resetForm("queryForm");
+      this.queryParams.loginStatus = null;
       this.queryParams.corpId = this.myQwCompanyList[0].dictValue;
       this.handleQuery();
     },