Merge remote-tracking branch 'origin/master'

.env.prod-fcky

@@ -1,7 +1,7 @@
 # 页面标题
-VUE_APP_TITLE =蜂巢快药客户管理系统
+VUE_APP_TITLE =CRM客户管理系统
 # 首页菜单标题
-VUE_APP_TITLE_INDEX =蜂巢快药客户管理系统
+VUE_APP_TITLE_INDEX =CRM客户管理系统
 # 公司名称
 VUE_APP_COMPANY_NAME =蜂巢快药（北京）医药连锁有限公司
 # ICP备案号

.env.prod-xfk

@@ -1,9 +1,9 @@
 # 页面标题
-VUE_APP_TITLE =小访客管理系统
+VUE_APP_TITLE =协和魔丽管理系统
 # 首页菜单标题
-VUE_APP_TITLE_INDEX =小访客
+VUE_APP_TITLE_INDEX =协和魔丽
 # 公司名称
-VUE_APP_COMPANY_NAME =西安小访客网络科技有限公司
+VUE_APP_COMPANY_NAME =西安协和魔丽网络科技有限公司
 # ICP备案号
 VUE_APP_ICP_RECORD =陕ICP备2025066365号-3
 # ICP网站访问地址
@@ -34,7 +34,7 @@ ENV = 'development'
 VUE_APP_BASE_API = '/prod-api'
 
 #默认 1、会员 2、企微
-VUE_APP_COURSE_DEFAULT = 1
+VUE_APP_COURSE_DEFAULT = 2
 
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true

src/views/course/courseWatchLog/index.vue

@@ -1,31 +1,6 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px">
-      <el-form-item label="用户" prop="userId">
-        <el-select v-model="queryParams.userId" remote placeholder="用户名/手机号" filterable clearable  style="width: 100%;"
-                   @keyup.enter.native="handleQuery"
-                   :remote-method="remoteGetFsUserList"
-                   @clear="handleClear"
-                   :loading="queryUserLoading"
-        >
-          <el-option
-            v-for="dict in fsUserList"
-            :key="`${dict.nickname} - ${dict.phone}`"
-            :label="`${dict.nickname} - ${dict.phone}`"
-            :value="dict.userId">
-          </el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="所属销售" prop="companyUserName">
-        <el-select v-model="queryParams.companyUserId" remote placeholder="请选择" filterable clearable  style="width: 100%;" @keyup.enter.native="handleQuery">
-          <el-option
-            v-for="dict in companyUserList"
-            :key="`${dict.nickName} - ${dict.userName}`"
-            :label="`${dict.nickName} - ${dict.userName}`"
-            :value="dict.userId">
-          </el-option>
-        </el-select>
-      </el-form-item>
       <el-form-item label="课程" prop="courseId">
         <el-select filterable  v-model="queryParams.courseId" placeholder="请选择课程"  clearable size="small" @change="courseChange(queryParams.courseId)">
           <el-option
@@ -68,16 +43,7 @@
                         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>
@@ -235,11 +201,7 @@ export default {
     this.getDicts("sys_course_watch_log_type").then(response => {
       this.logTypeOptions = response.data;
     });
-    getUserList().then(res=>{
-      if(res.code === 200) {
-        this.companyUserList = res.data
-      }
-    })
+
 
     this.getDicts('user_source_type').then(response => {
       this.userSourceTypeOptions = response.data;

src/views/course/userCourse/index.vue

@@ -210,6 +210,13 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="排序" prop="sort">
+                          <el-input-number v-model="form.sort"  :min="0"  label="排序"></el-input-number>
+            </el-form-item>
+          </el-col>
+        </el-row>
         <el-row>
           <el-col :span="24">
             <el-form-item label="课堂简介" prop="description">

src/views/his/company/index.vue

@@ -279,10 +279,10 @@
 <!--                              end: '24:00'-->
 <!--                            }"></el-time-select>-->
 <!--      </el-form-item>-->
-        <el-form-item label="公众号点播配置" prop="courseMaAppId">
+        <el-form-item label="服务号点播配置" prop="courseMaAppId">
           <el-select
             v-model="form.courseMaAppId"
-            placeholder="请选择公众号"
+            placeholder="请选择服务号"
             clearable
             size="small"
           >
@@ -297,7 +297,7 @@
       <el-form-item label="小程序点播配置" prop="courseMiniAppId">
         <el-select
           v-model="form.courseMiniAppId"
-          placeholder="请选择公众号"
+          placeholder="请选择小程序"
           clearable
           size="small"
         >
@@ -692,10 +692,10 @@ export default {
           let value = data?.configValue
           if (value) {
             const appList = JSON.parse(value);
-            this.maAppList = appList.filter(v => v.type === '1').map(v => {
+            this.maAppList = appList.filter(v => v.type === '2').map(v => {
               return { appId: v.appid, appName: v.name }
             })
-            this.miniAppList = appList.filter(v => v.type === '2').map(v => {
+            this.miniAppList = appList.filter(v => v.type === '1').map(v => {
               return { appId: v.appid, appName: v.name }
             })
           }

src/views/his/doctor/type1.vue

@@ -315,7 +315,7 @@
         <el-row>
               <el-col :span="12">
                 <el-form-item label="科室" prop="deptId">
-                <el-select v-model="form.deptId" multiple  placeholder="请选择所属科室">
+                <el-select v-model="form.deptId"  placeholder="请选择所属科室">
                       <el-option
                           v-for="dict in depList"
                           :key="dict.dictValue"
@@ -950,9 +950,9 @@ export default {
       this.sexOptions = response.data;
     });
     this.getdeplist();
-	listStore().then(response => {
-	  this.storeOPtions = response.rows;
-	});
+    listStore().then(response => {
+      this.storeOPtions = response.rows;
+    });
     this.getHospitaldeplist();
     getAllFollowDoctorList().then(response => {
 
@@ -1298,9 +1298,9 @@ export default {
         if(this.form.packageIds!=null){
            this.form.packageIds= ((this.form.packageIds).split(",")).map(Number)
         }
-		if(this.form.storeIds!=null){
-		   this.form.storeIds= ((this.form.storeIds).split(",")).map(Number)
-		}
+        if(this.form.storeIds!=null){
+          this.form.storeIds= ((this.form.storeIds).split(",")).map(Number)
+        }
         if(this.form.isSelf!=null){
           this.form.isSelf = String(this.form.isSelf)
         }
@@ -1316,7 +1316,10 @@ export default {
         if(this.form.isPrescribeDoctor!=null){
           this.form.isPrescribeDoctor = String(this.form.isPrescribeDoctor)
         }
-        this.form.cityIds=((this.form.cityIds).split(",")).map(Number)
+        if(this.form.cityIds){
+          this.form.cityIds=((this.form.cityIds).split(",")).map(Number)
+        }
+        
         if(this.form.prescribeDoctorName!=null){
               this.doctorName.name=this.form.prescribeDoctorName;
               this.getlistdocuser();
@@ -1366,6 +1369,9 @@ export default {
     },
     /** 提交按钮 */
     submitForm() {
+      if(this.form.isPrescribeDoctor!=null){
+          this.form.isPrescribeDoctor = String(this.form.isPrescribeDoctor)
+        }
       this.$refs["form"].validate(valid => {
         if (valid) {
           if(this.form.packageIds!=null){
@@ -1374,10 +1380,6 @@ export default {
           if(this.form.storeIds!=null){
             this.form.storeIds=(this.form.storeIds).toString()
           }
-          if(this.form.deptId!=null){
-            this.form.deptId=this.form.deptId.join(",");
-            console.log(this.form.deptId)
-          }
           this.form.cityIds=(this.form.cityIds).toString()
           if (this.form.doctorId != null) {
             this.form.doctorType=1;

src/views/his/user/index.vue

@@ -1,6 +1,40 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="所属公司" prop="companyName">
+        <el-select
+          v-model="queryCompanyId"
+          placeholder="请选择所属公司"
+          clearable
+          filterable 
+          size="small"
+          @change="handleQueryCompanyChange"
+        >
+          <el-option
+            v-for="item in companyQueryOptions"
+            :key="item.companyId"
+            :label="item.companyName"
+            :value="item.companyId">
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="所属销售" prop="companyUserId">
+        
+        <el-select
+          v-model="queryCompanyUserId"
+          placeholder="请选择所属销售"
+          clearable
+          filterable 
+          size="small"
+        >
+          <el-option
+            v-for="item in companyQueryUserOptions"
+            :key="item.userId"
+            :label="item.nickName"
+            :value="item.userId">
+          </el-option>
+        </el-select>
+      </el-form-item>    
       <el-form-item label="会员ID" prop="userId">
         <el-input
           v-model="queryParams.userId"
@@ -67,42 +101,9 @@
         </el-select>
       </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: 230px" value-format="yyyy-MM-dd" type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" @change="change"></el-date-picker>
       </el-form-item>
-      <el-form-item label="所属公司" prop="companyName">
-        <el-select
-          v-model="queryCompanyId"
-          placeholder="请选择所属公司"
-          clearable
-          filterable 
-          size="small"
-          @change="handleQueryCompanyChange"
-        >
-          <el-option
-            v-for="item in companyQueryOptions"
-            :key="item.companyId"
-            :label="item.companyName"
-            :value="item.companyId">
-          </el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="所属销售" prop="companyUserId">
-        
-        <el-select
-          v-model="queryCompanyUserId"
-          placeholder="请选择所属销售"
-          clearable
-          filterable 
-          size="small"
-        >
-          <el-option
-            v-for="item in companyQueryUserOptions"
-            :key="item.userId"
-            :label="item.nickName"
-            :value="item.userId">
-          </el-option>
-        </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>

src/views/system/config/config.vue

@@ -1083,8 +1083,8 @@
                  v-model="scope.row.type"
                   placeholder="请选择类型"
                  :disabled="!scope.row.editing">
-                 <el-option label="公众号" value="1"></el-option>
-                 <el-option label="小程序" value="2"></el-option>
+                 <el-option label="小程序" value="1"></el-option>
+                 <el-option label="服务号" value="2"></el-option>
                </el-select>
              </template>
            </el-table-column>