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

src/views/course/courseWatchLog/index.vue

@@ -1104,6 +1104,14 @@ export default {
     },
     /** 搜索按钮操作 */
     handleQuery() {
+      // 如果用户没有手动选择是否为会员，则根据 qwUserId 自动判断
+      if (this.queryParams.isVip === null || this.queryParams.isVip === undefined || this.queryParams.isVip === '') {
+        if (this.queryParams.qwUserId) {
+          this.queryParams.isVip = 1; // 有 qwUserId 则为会员
+        } else if (this.queryParams.qwUserId === null || this.queryParams.qwUserId === '') {
+          this.queryParams.isVip = 0; // 没有 qwUserId 则不是会员
+        }
+      }
       this.queryParams.pageNum = 1;
       this.getList();
     },

src/views/course/courseWatchLog/watchLog.vue

@@ -1064,6 +1064,15 @@ export default {
     },
     /** 搜索按钮操作 */
     handleQuery() {
+      // 如果用户没有手动选择是否为会员，则根据 qwUserId 自动判断
+      if (this.queryParams.isVip === null || this.queryParams.isVip === undefined || this.queryParams.isVip === '') {
+        if (this.queryParams.qwUserId) {
+          this.queryParams.isVip = 1; // 有 qwUserId 则为会员
+        } else if (this.queryParams.qwUserId === null || this.queryParams.qwUserId === '') {
+          this.queryParams.isVip = 0; // 没有 qwUserId 则不是会员
+        }
+      }
+
       this.queryParams.pageNum = 1;
       this.getList();
     },
@@ -1082,6 +1091,8 @@ export default {
       this.queryParams.scheduleStartTime = null;
       this.queryParams.scheduleEndTime = null;
       this.queryParams.sopId = null; // 重置SOP ID
+      this.queryParams.isVip = null; // 重置 isVip 状态
+      this.queryParams.qwUserId = null; // 重置 qwUserId
 
       // 重置SOP搜索
       this.handleSopClear();

src/views/qw/externalContact/collection.vue

@@ -15,9 +15,12 @@
                     <span style="font-size: 15px;font-weight: bold;    margin-left: 31px">{{ answer.title }}</span>
                 </div>
                 <div style="margin-left: 31px;">
-                    <el-radio-group :disabled="form.answers[index].flag" v-model="form.answers[index].value">
+                    <el-checkbox-group :disabled="form.answers[index].flag" v-model="form.answers[index].value" size="mini" >
+                        <el-checkbox v-for="dict in answer.options" :label="dict.value" >{{ dict.name }}</el-checkbox>
+                    </el-checkbox-group>
+                    <!-- <el-radio-group :disabled="form.answers[index].flag" v-model="form.answers[index].value">
                         <el-radio v-for="dict in answer.options" :label="dict.value">{{ dict.name }}</el-radio>
-                    </el-radio-group>
+                    </el-radio-group> -->
                 </div>
 
             </div>

src/views/qw/externalContact/myExternalContact.vue

@@ -484,6 +484,14 @@
           >
             <span>初诊单</span>
           </el-button>
+          <el-button
+             size="mini"
+             type="text"
+             @click="handleMemberdetails(scope.row)"
+             v-if="scope.row.fsUserId"
+             >
+             <span>会员详情</span>
+          </el-button>
           <el-button
              size="mini"
              type="text"
@@ -913,6 +921,13 @@
         />
       </div>
     </el-drawer>
+    
+    <el-drawer
+        :with-header="false"
+        size="75%"
+          :title="member.title" :visible.sync="member.open">
+      <userDetails  ref="userDetails" />
+    </el-drawer>
 
     <!-- 绑定客户   -->
     <el-dialog :title="bindCustomer.title" :visible.sync="bindCustomer.open"  width="1200px" append-to-body>
@@ -991,11 +1006,16 @@ import {docList} from "@/api/doctor/doctor";
 import PaginationMore from "../../../components/PaginationMore/index.vue";
 import Collection from './collection.vue';
 import {courseList, videoList} from "@/api/course/courseRedPacketLog";
+import userDetails from '@/views/store/components/userDetails.vue';
 export default {
   name: "ExternalContact",
-  components:{PaginationMore, mycustomer,customerDetails,SopDialog,selectUser,info,Collection},
+  components:{PaginationMore, mycustomer,customerDetails,SopDialog,selectUser,info,Collection,userDetails},
   data() {
     return {
+      member:{
+        title:"客户详情",
+        open:false,
+      },
       projectOptions: [],
       courseLists: [],
       videoList: [],
@@ -1285,6 +1305,14 @@ export default {
         this.videoList = response.list
       });
     },
+
+    handleMemberdetails(row){
+            this.member.open=true;
+            setTimeout(() => {
+                 this.$refs.userDetails.getDetails(row.fsUserId);
+            }, 1);
+    },
+
     handleInfoCollection(row){
       this.collection.title = "信息采集";
       this.collection.open = true;