Merge branch 'bjcz_his_scrm' of http://1.14.104.71:10880/root/ylrz_his_scrm_adminUI into bjcz_his_scrm

src/views/course/courseWatchLog/index.vue

@@ -61,7 +61,7 @@
       </el-form-item>
       <!-- 小节：会员方式依赖营期，企微方式依赖课程 -->
       <el-form-item label="小节" prop="videoId">
-        <el-select filterable  v-model="queryParams.videoId" placeholder="请选择小节"  clearable size="small" 
+        <el-select filterable  v-model="queryParams.videoId" placeholder="请选择小节"  clearable size="small"
           :disabled="queryParams.sendType == 1 ? !queryParams.periodId : !queryParams.courseId">
           <el-option
             v-for="dict in videoList"
@@ -127,6 +127,17 @@
         />
       </el-form-item>
 
+      <el-form-item label="所属小程序" prop="coursePlaySourceConfigId">
+        <el-select v-model="queryParams.appid" placeholder="请选择所属小程序" clearable size="small">
+          <el-option
+            v-for="dict in appMallOptions"
+            :key="dict.appid"
+            :label="dict.name + '(' + dict.appid + ')'"
+            :value="dict.appid"
+          />
+        </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>
@@ -156,6 +167,7 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="记录编号" align="center" prop="logId" />
       <el-table-column label="客户ID" align="center" prop="userId"  />
+       <el-table-column label="所属小程序" align="center" prop="name" />
       <el-table-column :label="queryParams.sendType == 1 ? '会员昵称' : '企微客户'" align="center">
         <template slot-scope="scope">
           <div style="display: flex;white-space: nowrap" v-if="queryParams.sendType == 1">
@@ -224,10 +236,13 @@
 import { listCourseWatchLog, getCourseWatchLog, delCourseWatchLog, addCourseWatchLog, updateCourseWatchLog, exportCourseWatchLog } from "@/api/course/courseWatchLog";
 import {courseList, qwCourseList, videoList, qwVideoList, periodList} from '@/api/course/courseRedPacketLog'
 import {infoSop} from "@/api/qw/sop";
+//import {list as getAppMallOptions} from '@/api/course/coursePlaySourceConfig';
+import {getMiniProgramList } from "@/api/hisStore/storePayment";
 export default {
   name: "CourseWatchLog",
   data() {
     return {
+      appMallOptions: [],
       userSourceTypeOptions: [],
       activeName:"00",
       createTime:null,
@@ -299,6 +314,7 @@ export default {
         scheduleEndTime: null,
         sendType: 1,  // 默认会员方式
         sopId: null, // sopId
+        appid: null,
       },
       // 表单参数
       form: {},
@@ -319,7 +335,8 @@ export default {
     this.getDicts('user_source_type').then(response => {
       this.userSourceTypeOptions = response.data;
     })
-
+    //this.getAppMallOptions();
+    this.getMiniProgramList();
   },
   computed: {
     sourceTypeModel: {
@@ -332,6 +349,14 @@ export default {
     }
   },
   methods: {
+     // 获取小程序列表
+    getMiniProgramList() {
+      getMiniProgramList().then(response => {
+        if (response.code === 200) {
+          this.appMallOptions = response.data;
+        }
+      })
+    },
     handleClear(){ this.queryUserLoading = false;
       this.fsUserList = [];
     },
@@ -443,7 +468,7 @@ export default {
         this.videoList = [];
       });
     },
-    
+
     /**
      * 加载课程列表
      * 根据sendType加载不同的课程列表
@@ -481,10 +506,10 @@ export default {
       this.periodList = [];
       this.videoList = [];
       this.courseLists = [];
-      
+
       // 重新加载课程列表
       this.loadCourseList();
-      
+
       this.handleQuery(); // 重新查询列表
     },