Merge remote-tracking branch 'origin/master'

src/views/course/courseWatchLog/watchLog.vue

@@ -60,6 +60,17 @@
                         range-separator="-" start-placeholder="开始日期"
                         end-placeholder="结束日期" @change="updateChange"></el-date-picker>
       </el-form-item>
+
+      <el-form-item label="类型" prop="type">
+        <el-select filterable  v-model="sourceTypeModel" placeholder="请选择小节"  clearable size="small">
+          <el-option
+            v-for="dict in userSourceTypeOptions"
+            :key="dict.dictValue"
+            :label="dict.dictLabel"
+            :value="dict.dictValue"
+          />
+        </el-select>
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -91,6 +102,7 @@
       <el-table-column label="记录编号" align="center" prop="logId"/>
 <!--      <el-table-column label="企微客户" align="center" prop="externalUserName"/>-->
       <el-table-column label="用户账号" align="center" prop="userName" />
+      <el-table-column label="企微客户" align="center" prop="externalUserName" v-if="queryParams.sourceType == 2"/>
 
       <el-table-column label="会员昵称" align="center" prop="fsNickName">
         <template slot-scope="scope">
@@ -122,6 +134,7 @@
 <!--      <el-table-column label="企微员工名称" align="center" prop="qwUserName"/>-->
 <!--      <el-table-column label="企微账号" align="center" prop="qwUserName"/>-->
 <!--      <el-table-column label="所属发送方式" align="center" prop="sendType"/>-->
+      <el-table-column label="企微员工名称" align="center" prop="qwUserName" v-if="queryParams.sourceType == 2"/>
       <el-table-column label="创建时间" align="center" prop="createTime" width="100px"/>
       <el-table-column label="更新时间" align="center" prop="updateTime" width="100px" />
       <el-table-column label="完课时间" align="center" prop="finishTime" width="100px" />
@@ -258,6 +271,7 @@ export default {
   name: "CourseWatchLog",
   data() {
     return {
+      userSourceTypeOptions: [],
       activeName:"00",
       createTime: null,
       updateTime:null,
@@ -330,6 +344,7 @@ export default {
         upETime:null,
         scheduleStartTime: null,
         scheduleEndTime: null,
+        sourceType: 1
       },
       // 表单参数
       form: {},
@@ -337,7 +352,21 @@ export default {
       rules: {}
     };
   },
+  computed: {
+    sourceTypeModel: {
+      get() {
+        return this.queryParams.sourceType !== null && this.queryParams.sourceType !== undefined ? this.queryParams.sourceType.toString() : null;
+      },
+      set(newVal) {
+        this.queryParams.sourceType = newVal;
+      }
+    }
+  },
   created() {
+    this.getDicts('user_source_type').then(response => {
+      this.userSourceTypeOptions = response.data;
+    })
+
     courseList().then(response => {
       this.courseLists = response.list;
     });