Merge branch 'master' of http://1.14.104.71:10880/root/ylrz_his_scrm_companyUI

src/views/course/courseWatchLog/index.vue

@@ -588,7 +588,7 @@
             {{ currentRow ? currentRow.fsNickName : '-' }}
           </template>
         </el-table-column>
-        
+
         <el-table-column label="课程名称" align="center" min-width="150">
           <template slot-scope="scope">
              {{ currentRow ? currentRow.courseName : '-' }}
@@ -763,7 +763,7 @@ import Vue from 'vue'
 import Calendar from 'vue-mobile-calendar'
 import {infoSop} from "@/api/qw/sop";
 import {getCompanyUserListLikeName} from "../../../api/company/companyUser";
-import {getQwList} from "@/api/qw/qwUser";
+import { queryQwList as fetchQwListApi} from "@/api/qw/qwUser";
 import {treeselect} from "@/api/company/companyDept";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
@@ -1046,7 +1046,7 @@ export default {
       this.couponLogQueryParams.logId = row.logId;
       this.couponLogQueryParams.userId = row.userId; // 假设行数据中有userId
       this.getCouponLogList();
-      
+
     },
 
     // 获取优惠券记录列表
@@ -1216,7 +1216,7 @@ export default {
         disableCompanyId: 1
       };
       console.log("企微参数", this.queryParams);
-      getQwList(params).then(response => {
+      fetchQwListApi(params).then(response => {
         if (this.qwUserOptionsParams.pageNum === 1) {
           this.qwUserOptions = response.rows || [];
         } else {

src/views/qw/sopTemp/updateSopTemp.vue

@@ -525,7 +525,8 @@
                                                 <i class="el-icon-video-camera"></i>
                                                 <span>直播小程序</span>
                                               </div>
-                                              <el-form-item label="直播间" required>
+                                              <el-form-item label="直播间" prop="liveId"
+                                                            :rules="[{ required: true, message: '请选择直播间', trigger: 'change' }]">
                                                 <el-select  v-model="setList.liveId"
                                                             placeholder="请选择直播间" size="mini"
                                                             filterable
@@ -540,11 +541,13 @@
                                                 </el-select>
                                               </el-form-item>
 
-                                              <el-form-item label="标题" prop="miniprogramTitle" required>
+                                              <el-form-item label="标题" prop="miniprogramTitle"
+                                                            :rules="[{ required: true, message: '请输入标题', trigger: 'blur' }]">
                                                 <el-input  :disabled="content.type==20" v-model="setList.miniprogramTitle" placeholder="请输入小程序消息标题，最长为64字节" :rows="2" maxlength="64"
                                                           type="textarea" @input="checkByteLength(content,setList.contentType,content.isOfficial)"   />
                                               </el-form-item>
-                                              <el-form-item label="封面" prop="miniprogramPicUrl" required>
+                                              <el-form-item label="封面" prop="miniprogramPicUrl"
+                                                            :rules="[{ required: true, message: '请上传封面', trigger: 'change' }]">
                                                 <ImageUpload  :disabled="content.type==20" v-model="setList.miniprogramPicUrl" type="image" :num="10" :width="150" :height="150" />
                                               </el-form-item>
                                               <el-form-item label="appid" prop="miniprogramAppid" v-show="false">
@@ -1845,7 +1848,7 @@ export default {
       ruleList: [],
       ids: [],
       // startTimeRange: [],
-      courseTypeList: ['1','2', '4','5','6', '7','8','9','10','14','15','16','11'],
+      courseTypeList: ['1','2', '4','5','6', '7','8','9','10','14','15','16','11','20'],
       sysFsSopWatchStatus: [],
       //消息内容类型 企微版
       sysQwSopContentType: [],