zyp

.env.development

@@ -9,11 +9,11 @@ VUE_APP_ICP_URL =https://beian.miit.gov.cn
 # 网站LOG
 VUE_APP_LOG_URL =@/assets/logo/myhk.png
 
-# 生产环境配置
-ENV = 'production'
+# 开发环境配置
+ENV = 'development'
 
 # FS管理系统/开发环境
-VUE_APP_BASE_API = '/prod-api'
+VUE_APP_BASE_API = '/dev-api'
 
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true

src/views/course/courseWatchLog/index.vue

@@ -1,24 +1,25 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px">
-<!--      <el-form-item label="会员ID" prop="userId">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.userId"-->
-<!--          placeholder="请输入会员ID"-->
-<!--          clearable-->
-<!--          size="small"-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="会员昵称" prop="nickName">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.nickName"-->
-<!--          placeholder="请输入会员昵称"-->
-<!--          clearable-->
-<!--          size="small"-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
+      <el-form-item label="看课方式" prop="sendType">
+        <el-select v-model="queryParams.sendType" placeholder="选择看课方式"  clearable size="small" @change="handleSendTypeChange">
+          <el-option
+            v-for="dict in sendTypeOptions"
+            :key="dict.dictValue"
+            :label="dict.dictLabel"
+            :value="dict.dictValue"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="会员昵称" prop="nickName">
+        <el-input
+          v-model="queryParams.nickName"
+          placeholder="请输入会员昵称"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <el-form-item label="企微客户昵称" prop="nickName" >
         <el-input
           v-model="queryParams.externalUserName"
@@ -106,18 +107,15 @@
     <el-table border v-loading="loading" :data="courseWatchLogList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="记录编号" align="center" prop="logId" />
-      <el-table-column label="客户昵称" align="center" prop="externalUserName"/>
-
-      <!--      <el-table-column label="会员ID" align="center" prop="userId"/>-->
-      <el-table-column label="客户头像" align="center" prop="externalUserAvatar">
+      <el-table-column label="用户昵称" align="center">
         <template slot-scope="scope">
-          <el-popover
-            placement="right"
-            title=""
-            trigger="hover">
-            <img slot="reference" :src="scope.row.externalUserAvatar" style="width: 50px;height: 50px">
-            <img :src="scope.row.externalUserAvatar" style="max-width: 200px;max-height: 200px">
-          </el-popover>
+          {{ queryParams.sendType=='1' ? scope.row.fsNickName : scope.row.externalUserName }}
+        </template>
+      </el-table-column>
+      <el-table-column label="头像" align="center">
+        <template slot-scope="scope">
+          <img v-if="queryParams.sendType=='1'" :src="scope.row.fsAvatar" style="width:50px;height:50px" />
+          <img v-else :src="scope.row.externalUserAvatar" style="width:50px;height:50px" />
         </template>
       </el-table-column>
       <el-table-column label="课程名称" align="center" prop="courseName" />
@@ -130,7 +128,7 @@
       <el-table-column label="播放时长" align="center" prop="duration" />
       <el-table-column label="所属销售" align="center" prop="companyUserName" />
 <!--      <el-table-column label="所属公司" align="center" prop="companyName" />-->
-      <el-table-column label="所属企微" align="center" prop="qwUserName" />
+      <el-table-column label="所属企微" align="center" prop="qwUserName" v-if="queryParams.sendType==2" />
 <!--      <el-table-column label="所属发送方式" align="center" prop="sendType" />-->
       <el-table-column label="创建时间" align="center" prop="createTime" />
       <el-table-column label="更新时间" align="center" prop="updateTime" />
@@ -163,6 +161,13 @@ export default {
       courseLists:[],
       videoList:[],
       logTypeOptions:[],
+      sendTypeOptions:[{
+        dictLabel:"会员",dictValue:'1'
+      },
+        {
+          dictLabel:"企微",dictValue:'2'
+        }
+      ],
       // 遮罩层
       loading: true,
       // 导出遮罩层
@@ -204,6 +209,7 @@ export default {
         upETime:null,
         scheduleStartTime: null,
         scheduleEndTime: null,
+        sendType:'1',
       },
       // 表单参数
       form: {},
@@ -401,6 +407,9 @@ export default {
         this.queryParams.scheduleEndTime = null;
       }
     },
+    handleSendTypeChange() {
+      this.handleQuery(); // 重新查询列表
+    }
   }
 };
 </script>

src/views/course/courseWatchLog/watchLog.vue

@@ -1,6 +1,16 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px">
+      <el-form-item label="看课方式" prop="sendType">
+        <el-select v-model="queryParams.sendType" placeholder="选择看课方式"  clearable size="small" @change="handleSendTypeChange">
+          <el-option
+            v-for="dict in sendTypeOptions"
+            :key="dict.dictValue"
+            :label="dict.dictLabel"
+            :value="dict.dictValue"
+          />
+        </el-select>
+      </el-form-item>
       <el-form-item label="企微账号" prop="qwUserId">
         <el-select v-model="queryParams.qwUserId" placeholder="企微账号" clearable size="small"
                    @change="updateQwuser()">
@@ -121,18 +131,29 @@
     <el-table border v-loading="loading" :data="courseWatchLogList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center"/>
       <el-table-column label="记录编号" align="center" prop="logId"/>
-      <el-table-column label="客户昵称" align="center" prop="externalUserName"/>
+<!--      <el-table-column label="客户昵称" align="center" prop="externalUserName"/>-->
 
-<!--      <el-table-column label="会员ID" align="center" prop="userId"/>-->
-      <el-table-column label="客户头像" align="center" prop="externalUserAvatar">
+<!--&lt;!&ndash;      <el-table-column label="会员ID" align="center" prop="userId"/>&ndash;&gt;-->
+<!--      <el-table-column label="客户头像" align="center" prop="externalUserAvatar">-->
+<!--        <template slot-scope="scope">-->
+<!--          <el-popover-->
+<!--            placement="right"-->
+<!--            title=""-->
+<!--            trigger="hover">-->
+<!--            <img slot="reference" :src="scope.row.externalUserAvatar" style="width: 50px;height: 50px">-->
+<!--            <img :src="scope.row.externalUserAvatar" style="max-width: 200px;max-height: 200px">-->
+<!--          </el-popover>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
+      <el-table-column label="用户昵称" align="center">
+        <template slot-scope="scope">
+          {{ queryParams.sendType=='1' ? scope.row.fsNickName : scope.row.externalUserName }}
+        </template>
+      </el-table-column>
+      <el-table-column label="头像" align="center">
         <template slot-scope="scope">
-          <el-popover
-            placement="right"
-            title=""
-            trigger="hover">
-            <img slot="reference" :src="scope.row.externalUserAvatar" style="width: 50px;height: 50px">
-            <img :src="scope.row.externalUserAvatar" style="max-width: 200px;max-height: 200px">
-          </el-popover>
+          <img v-if="queryParams.sendType=='1'" :src="scope.row.fsAvatar" style="width:50px;height:50px" />
+          <img v-else :src="scope.row.externalUserAvatar" style="width:50px;height:50px" />
         </template>
       </el-table-column>
       <el-table-column label="课程名称" align="center" prop="courseName"/>
@@ -146,8 +167,8 @@
 <!--      <el-table-column label="所属销售" align="center" prop="companyUserName"/>-->
 <!--      <el-table-column label="所属公司" align="center" prop="companyName"/>-->
 <!--      <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.sendType==2" />
+      <!--      <el-table-column label="所属发送方式" align="center" prop="sendType"/>-->
       <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" />
@@ -318,6 +339,13 @@ export default {
         pageNum: 1,
         pageSize: 10,
       },
+      sendTypeOptions:[{
+        dictLabel:"会员",dictValue:'1'
+      },
+        {
+          dictLabel:"企微",dictValue:'2'
+        }
+      ],
 
 
       openRedLog: false,
@@ -354,6 +382,7 @@ export default {
         upETime:null,
         scheduleStartTime: null,
         scheduleEndTime: null,
+        sendType:'1',
       },
       // 表单参数
       form: {},

src/views/index.vue

@@ -219,6 +219,7 @@
 
         <div class="action-group">
           <el-radio-group v-model="userTypeText" @change="handleUserType">
+            <el-radio-button label="会员"></el-radio-button>
             <el-radio-button label="企微"></el-radio-button>
           </el-radio-group>
 
@@ -857,8 +858,8 @@ export default {
       smsRemainCount: 0,
       viewerType: '0',
       viewerChart: null,
-      userTypeText: '企微',
-      userType: 2,
+      userTypeText: '会员',
+      userType: 1,
       dealerChart: null,
       // 分公司数量
       dealderCount: 0,

src/views/qw/QwWorkTask/allTask.vue

@@ -19,7 +19,7 @@
     </el-form>
 
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
+
 
     <el-table border v-loading="loading" :data="QwWorkTaskList" @selection-change="handleSelectionChange">
     <el-table-column type="selection" width="55" align="center" />
@@ -92,7 +92,6 @@ export default {
         pageNum: 1,
         pageSize: 10,
         extId: null,
-        qwUserId: null,
         status: 0,
         type: null,
         title: null,
@@ -100,7 +99,7 @@ export default {
         sopId: null,
         companyId: null,
         companyUserId: null,
-		qwUserId: null,
+		    qwUserId: null,
       },
       // 表单参数
       form: {},
@@ -130,7 +129,7 @@ export default {
 	  } else {
 		backgroundColor = '#ffffff';    // 白色
 	  }
-	  return { 
+	  return {
 		'background-color': backgroundColor,
 		'padding': '5px 10px',
 		'border-radius': '4px'
@@ -138,17 +137,17 @@ export default {
 	},
 	formatTime(timeStr) {
 	      if (!timeStr && timeStr !== 0) return '';
-	      
+
 	      // 处理数字和字符串输入
 	      const str = String(timeStr).padStart(4, '0');
-	      
+
 	      // 提取有效部分
 	      const hours = str.substring(0, 2);
 	      const minutes = str.substring(2, 4);
-	      
+
 	      // 简单验证
 	      if (hours > 23 || minutes > 59) return '无效时间';
-	      
+
 	      return `${hours}:${minutes}`;
 	    },
     /** 查询企微任务看板列表 */

src/views/users/user/transfer.vue

@@ -48,7 +48,7 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="客户ID" align="center" prop="userId" />
       <el-table-column label="昵称" align="center" prop="nickname" />
-      <el-table-column label="所属销售" align="center" prop="companyUserName" />
+      <el-table-column label="所属销售" align="center" prop="companyUserNickName" />
       <el-table-column label="手机号码" align="center" prop="phone" />
       <el-table-column label="状态" align="center" prop="statusText" >
         <template slot-scope="scope">