Explorar o código

Merge remote-tracking branch 'origin/master'

yjwang hai 3 días
pai
achega
816bee1519

+ 3 - 3
.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

+ 87 - 0
src/api/user/fsUser.js

@@ -0,0 +1,87 @@
+import request from '@/utils/request'
+import {params} from "svgo/plugins/prefixIds";
+
+// 查询用户列表
+export function listUser(query) {
+  return request({
+    url: '/user/fsUser/list',
+    method: 'post',
+    data: query
+  })
+}
+
+// 查询用户详细
+export function getUser(userId) {
+  return request({
+    url: '/user/fsUser/' + userId,
+    method: 'get'
+  })
+}
+
+// 新增用户
+export function addUser(data) {
+  return request({
+    url: '/user/fsUser',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改用户
+export function updateUser(data) {
+  return request({
+    url: '/user/fsUser',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除用户
+export function delUser(userId) {
+  return request({
+    url: '/user/fsUser/' + userId,
+    method: 'delete'
+  })
+}
+
+// 导出用户
+export function exportUser(query) {
+  return request({
+    url: '/user/fsUser/export',
+    method: 'post',
+    data: query
+  })
+}
+
+// 查询用户标签列表
+export function listUserTags() {
+  return request({
+    url: '/system/tag/list',
+    method: 'get'
+  })
+}
+
+// 查询销售员工列表
+export function listSalesStaff() {
+  return request({
+    url: '/system/user/company/list',
+    method: 'get'
+  })
+}
+// 移除小黑屋
+export function auditUser(data) {
+  return request({
+    url: '/user/fsUser/auditUser',
+    method: 'post',
+    data: data
+  })
+}
+
+// 获取企微重粉数据
+export function getQwRepeatData(data){
+  return request({
+    url: '/qw/externalContact/qwRepeatData',
+    method: 'post',
+    data: data
+  })
+}

+ 39 - 30
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>

+ 41 - 12
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: {},

+ 3 - 2
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,

+ 660 - 0
src/views/member/list.vue

@@ -0,0 +1,660 @@
+<template>
+  <div class="app-container">
+    <!-- Search Form -->
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="80px">
+      <el-form-item label="昵称" prop="nickname">
+        <el-input
+          style="width: 200px"
+          v-model="queryParams.nickname"
+          placeholder="请输入昵称"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="手机号码" prop="phone">
+        <el-input
+          style="width: 200px"
+          v-model="queryParams.phone"
+          placeholder="请输入手机号码"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <!--      <el-form-item label="状态" prop="status">-->
+      <!--        <el-select style="width: 200px" v-model="queryParams.status" placeholder="请选择状态" clearable size="small">-->
+      <!--          <el-option-->
+      <!--            v-for="item in statusOptions"-->
+      <!--            :key="item.dictValue"-->
+      <!--            :label="item.dictLabel"-->
+      <!--            :value="item.dictValue"-->
+      <!--          />-->
+      <!--        </el-select>-->
+      <!--      </el-form-item>-->
+      <!--      <el-form-item label="看课状态" prop="watchCourseType">-->
+      <!--        <el-select style="width: 200px" v-model="queryParams.watchCourseType" placeholder="请选择看课状态" clearable size="small">-->
+      <!--          <el-option label="全部" value="0" />-->
+      <!--          <el-option label="未看过课" value="1" />-->
+      <!--          <el-option label="正常看课" value="2" />-->
+      <!--          <el-option label="停止看课" value="3" />-->
+      <!--        </el-select>-->
+      <!--      </el-form-item>-->
+      <!--      <el-form-item label="缺课状态" prop="missCourseStatus">-->
+      <!--        <el-select style="width: 200px" v-model="queryParams.missCourseStatus" placeholder="请选择缺课状态" clearable size="small">-->
+      <!--          <el-option label="全部" value="0" />-->
+      <!--          <el-option label="已缺课" value="1" />-->
+      <!--          <el-option label="未缺课" value="2" />-->
+      <!--        </el-select>-->
+      <!--      </el-form-item>-->
+      <!--      <el-form-item label="标签" prop="tagIds">-->
+      <!--        <el-select style="width: 200px" v-model="queryParams.tagIds" placeholder="请选择标签" clearable size="small" multiple>-->
+      <!--          <el-option-->
+      <!--            v-for="item in tagOptions"-->
+      <!--            :key="item.tagId"-->
+      <!--            :label="item.tagName"-->
+      <!--            :value="item.tagId"-->
+      <!--          />-->
+      <!--        </el-select>-->
+      <!--      </el-form-item>-->
+      <el-form-item label="注册时间">
+        <el-date-picker
+          v-model="dateRange"
+          size="small"
+          style="width: 240px"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          value-format="yyyy-MM-dd"
+        ></el-date-picker>
+      </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>
+      </el-form-item>
+    </el-form>
+    <!-- 操作按钮区域 -->
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          icon="el-icon-d-arrow-right"
+          size="mini"
+          :disabled="multiple"
+          @click="handleTransfer"
+          v-hasPermi="['company:user:transfer']"
+        >转移</el-button>
+      </el-col>
+    </el-row>
+    <!-- Tab Selection -->
+    <!--    <el-tabs v-model="queryParams.tabValue" @tab-click="handleTabChange">-->
+    <!--      <el-tab-pane label="全部" name="0"></el-tab-pane>-->
+    <!--      <el-tab-pane label="今日新增" name="1"></el-tab-pane>-->
+    <!--      <el-tab-pane label="今日完播" name="2"></el-tab-pane>-->
+    <!--      <el-tab-pane label="未看过课" name="3"></el-tab-pane>-->
+    <!--    </el-tabs>-->
+
+    <!-- Toolbar -->
+    <el-row :gutter="10" class="mb8">
+      <!--      <el-col :span="1.5">-->
+      <!--        <el-button-->
+      <!--          type="primary"-->
+      <!--          plain-->
+      <!--          icon="el-icon-plus"-->
+      <!--          size="mini"-->
+      <!--          @click="handleAdd"-->
+      <!--          v-hasPermi="['user:fsUser:add']"-->
+      <!--        >新增</el-button>-->
+      <!--      </el-col>-->
+      <!--      <el-col :span="1.5">-->
+      <!--        <el-button-->
+      <!--          type="success"-->
+      <!--          plain-->
+      <!--          icon="el-icon-edit"-->
+      <!--          size="mini"-->
+      <!--          :disabled="single"-->
+      <!--          @click="handleUpdate"-->
+      <!--          v-hasPermi="['user:fsUser:edit']"-->
+      <!--        >编辑</el-button>-->
+      <!--      </el-col>-->
+      <!--      <el-col :span="1.5">-->
+      <!--        <el-button-->
+      <!--          type="danger"-->
+      <!--          plain-->
+      <!--          icon="el-icon-delete"-->
+      <!--          size="mini"-->
+      <!--          :disabled="multiple"-->
+      <!--          @click="handleDelete"-->
+      <!--          v-hasPermi="['user:fsUser:remove']"-->
+      <!--        >删除</el-button>-->
+      <!--      </el-col>-->
+      <!--      <el-col :span="1.5">-->
+      <!--        <el-button-->
+      <!--          type="warning"-->
+      <!--          plain-->
+      <!--          icon="el-icon-download"-->
+      <!--          size="mini"-->
+      <!--          @click="handleExport"-->
+      <!--          v-hasPermi="['user:fsUser:export']"-->
+      <!--        >导出</el-button>-->
+      <!--      </el-col>-->
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <!-- User Table -->
+    <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
+      <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" width="80">
+        <template slot-scope="scope">
+          <el-popover
+            placement="right"
+            title=""
+            trigger="hover"
+          >
+            <img slot="reference" :src="scope.row.avatar" width="50">
+            <img :src="scope.row.avatar" style="max-width: 120px;">
+          </el-popover>
+        </template>
+      </el-table-column>
+      <el-table-column label="手机号码" align="center" prop="phone" />
+      <el-table-column label="积分" align="center" prop="integral" v-if="false" />
+      <el-table-column label="看课数量" align="center" prop="watchCourseCount" />
+      <el-table-column label="缺课数量" align="center" prop="missCourseCount" />
+      <el-table-column label="参与营期数量" align="center" prop="partCourseCount" />
+      <el-table-column label="状态" align="center">
+        <template slot-scope="scope">
+          <el-tag :type="scope.row.status === 1 ? 'success' : 'danger'">
+            {{ scope.row.status === 1 ? '正常' : '禁止' }}
+          </el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column label="看课状态" align="center">
+        <template slot-scope="scope">
+          <el-tag :type="getCourseStatusType(scope.row.courseCountStatus)">
+            {{ getCourseStatusText(scope.row.courseCountStatus) }}
+          </el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column label="标签" align="center" prop="tag" show-overflow-tooltip />
+      <el-table-column label="最后看课时间" align="center" prop="lastWatchDate" width="160" />
+      <el-table-column label="停课天数" align="center" prop="stopWatchDays" />
+      <el-table-column label="注册时间" align="center" prop="createTime" width="160" />
+      <el-table-column label="备注" align="center" prop="remark" show-overflow-tooltip />
+      <el-table-column label="所属员工" align="center" prop="companyUserNickName" />
+      <el-table-column label="操作" align="center" width="120" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-check"
+            @click="handleAudit(scope.row)"
+            v-if="scope.row.isCurrentCompanyUser === 1 && scope.row.status === 0"
+          >审核会员</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- Edit User Dialog -->
+    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+        <el-form-item label="用户头像" prop="avatar">
+          <el-popover
+            placement="right"
+            title=""
+            trigger="hover"
+          >
+            <img slot="reference" :src="form.avatar" width="80">
+            <img :src="form.avatar" style="max-width: 120px;">
+          </el-popover>
+        </el-form-item>
+        <el-form-item label="昵称" prop="nickname">
+          <el-input v-model="form.nickname" placeholder="请输入昵称" />
+        </el-form-item>
+        <el-form-item label="手机号码" prop="phone">
+          <el-input v-model="form.phone" placeholder="请输入手机号码" />
+        </el-form-item>
+        <el-form-item label="最后登录IP" prop="lastIp" v-if="form.lastIp">
+          <el-input v-model="form.lastIp" disabled placeholder="最后一次登录IP" />
+        </el-form-item>
+        <el-form-item label="看课数量" prop="watchCourseCount" v-if="form.watchCourseCount">
+          <el-input v-model="form.watchCourseCount" disabled placeholder="看课数量" />
+        </el-form-item>
+        <el-form-item label="缺课数量" prop="missCourseCount" v-if="form.missCourseCount">
+          <el-input v-model="form.missCourseCount" disabled placeholder="缺课数量" />
+        </el-form-item>
+        <el-form-item label="标签" prop="tagIds">
+          <el-select v-model="form.tagIds" placeholder="请选择标签" clearable multiple>
+            <el-option
+              v-for="item in tagOptions"
+              :key="item.tagId"
+              :label="item.tagName"
+              :value="item.tagId"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="所属员工" prop="companyUserId">
+          <el-select v-model="form.companyUserId" placeholder="请选择所属员工" clearable>
+            <el-option
+              v-for="item in salesOptions"
+              :key="item.userId"
+              :label="item.nickName"
+              :value="item.userId"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="用户备注" prop="remark">
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入用户备注" />
+        </el-form-item>
+        <el-form-item label="状态">
+          <el-radio-group v-model="form.status">
+            <el-radio :label="1">正常</el-radio>
+            <el-radio :label="0">禁止</el-radio>
+          </el-radio-group>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+
+    <!-- 客户转移对话框 (可选,更复杂的转移逻辑可能需要) -->
+
+    <el-dialog title="客户转移" :visible.sync="openTransferDialog" width="500px" append-to-body>
+      <el-form ref="transferForm" :model="transferForm" label-width="100px" :rules="cusTransfer">
+        <el-alert
+          title="会经过总后台审核后才进行转移"
+          type="warning">
+        </el-alert>
+        <el-form-item label="转移至销售" prop="targetUserId">
+          <el-select v-model="transferForm.targetUserId" remote placeholder="请选择" filterable clearable>
+            <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="content">
+          <el-input type="textarea" v-model="transferForm.content" placeholder="转移原因"></el-input>
+        </el-form-item>
+        <p>确定要转移选中的 <strong>{{ ids.length }}</strong> 个客户吗?</p>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="danger" @click="submitTransfer">提交申请</el-button>
+        <el-button @click="cancelTransfer">取 消</el-button>
+      </div>
+    </el-dialog>
+
+  </div>
+</template>
+
+<script>
+import { listUser, getUser, addUser, updateUser, delUser, exportUser, auditUser } from "@/api/user/fsUser";
+import {transferUser} from "@/api/users/user";
+import {getUserList} from "@/api/company/companyUser";
+
+export default {
+  name: "FsUser",
+  data() {
+    return {
+      cusTransfer: {
+        targetUserId: [{required: true, message: '请选择转移至销售', trigger: 'change'}],
+        content: [{required: true, message: '请选择转移至销售', trigger: 'change'}]
+      },
+      companyUserList: [],
+      openTransferDialog: false,
+      transferForm: {
+        targetUserId: null,
+        content: null
+      },
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 用户表格数据
+      userList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 日期范围
+      dateRange: [],
+      // 状态数据字典
+      statusOptions: [],
+      // 标签选项
+      tagOptions: [],
+      // 销售员工选项
+      salesOptions: [],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        nickname: null,
+        isMyFsUser:false,
+        phone: null,
+        // status: null,
+        tagIds: [],
+        tabValue: "0",
+        watchCourseType: "0",
+        missCourseStatus: "0",
+        continueMissCourseSort: "0",
+        registerStartTime: null,
+        registerEndTime: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        nickname: [
+          { required: true, message: "昵称不能为空", trigger: "blur" }
+        ],
+        phone: [
+          { required: true, message: "手机号码不能为空", trigger: "blur" },
+          { pattern: /^1[3-9]\d{9}$/, message: "请输入正确的手机号码", trigger: "blur" }
+        ],
+        status: [
+          { required: true, message: "状态不能为空", trigger: "change" }
+        ]
+      }
+    };
+  },
+  created() {
+    getUserList().then(res=>{
+      if(res.code === 200) {
+        this.companyUserList = res.data
+      }
+    });
+    this.getList();
+    this.getDicts("user_status").then(response => {
+      this.statusOptions = response.data;
+    });
+    this.getTagOptions();
+    this.getSalesOptions();
+  },
+  methods: {
+    /** 提交转移按钮 (如果使用对话框) */
+
+    submitTransfer() {
+      this.$refs["transferForm"].validate(valid => {
+        if (valid) {
+          transferUser({
+            userIds: this.ids,
+            targetCompanyUserId: this.transferForm.targetUserId,
+            content: this.transferForm.content
+          }).then(response => {
+            if (response.code === 200) {
+              this.msgSuccess(response.msg);
+              this.openTransferDialog = false;
+              this.getList();
+            } else {
+              this.msgError(response.msg || "转移失败");
+            }
+          }).catch(() => {
+            this.msgError("转移请求失败");
+          });
+        }
+      });
+    },
+    // 重置表单
+    resetForm() {
+      this.linkForm={
+        days:null,
+        courseId:null,
+        videoId:null
+      }
+    },
+    /** 转移按钮操作 */
+    handleTransfer(row) {
+
+      const userIds = row.userId ? [row.userId] : this.ids;
+      if (userIds.length === 0) {
+        this.$message.warning("请至少选择一个客户进行转移");
+        return;
+      }
+      this.resetTransferForm();
+      this.openTransferDialog = true;
+    },
+    resetTransferForm() {
+      this.transferForm = {
+        targetUserId: null,
+        content: null
+      };
+      this.resetForm("transferForm"); // 假设 transferForm 是 el-form 的 ref
+    },
+    cancelTransfer() {
+      this.openTransferDialog = false;
+      this.resetTransferForm();
+    },
+    /** 查询用户列表 */
+    getList() {
+      this.loading = true;
+
+      // 处理日期范围
+      if (this.dateRange && this.dateRange.length > 0) {
+        this.queryParams.registerStartTime = this.dateRange[0];
+        this.queryParams.registerEndTime = this.dateRange[1];
+      } else {
+        this.queryParams.registerStartTime = null;
+        this.queryParams.registerEndTime = null;
+      }
+
+      listUser(this.queryParams).then(response => {
+        this.userList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+
+    /** 获取标签选项 */
+    getTagOptions() {
+      this.tagOptions = [
+        { tagId: "1", tagName: "VIP会员" },
+        { tagId: "2", tagName: "普通会员" },
+        { tagId: "3", tagName: "新用户" },
+        { tagId: "4", tagName: "高频用户" }
+      ];
+    },
+
+    /** 获取销售员工选项 */
+    getSalesOptions() {
+      this.salesOptions = [
+        { userId: 1, nickName: "销售A" },
+        { userId: 2, nickName: "销售B" },
+        { userId: 3, nickName: "销售C" }
+      ];
+    },
+
+    /** 获取看课状态类型 */
+    getCourseStatusType(status) {
+      if (status === 1) return "success";
+      if (status === 2) return "danger";
+      if (status === 3) return "info";
+      return "";
+    },
+
+    /** 获取看课状态文本 */
+    getCourseStatusText(status) {
+      if (status === 1) return "正常看课";
+      if (status === 2) return "停止看课";
+      if (status === 3) return "未看过课";
+      return "未知状态";
+    },
+
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+
+    // 表单重置
+    reset() {
+      this.form = {
+        userId: null,
+        nickname: null,
+        avatar: null,
+        phone: null,
+        status: 1,
+        tagIds: [],
+        companyUserId: null,
+        remark: null
+      };
+      this.resetForm("form");
+    },
+
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.dateRange = [];
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+
+    /** Tab切换操作 */
+    handleTabChange() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.userId);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
+    },
+
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加用户";
+    },
+
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const userId = row.userId || this.ids[0];
+      getUser(userId).then(response => {
+        this.form = response.data;
+
+        // 处理标签数据,将字符串转为数组
+        if (this.form.tagIds && typeof this.form.tagIds === 'string') {
+          this.form.tagIds = this.form.tagIds.split(',');
+        }
+
+        this.open = true;
+        this.title = "修改用户";
+      });
+    },
+
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          // 处理标签数据,将数组转为字符串
+          if (this.form.tagIds && Array.isArray(this.form.tagIds)) {
+            this.form.tagIds = this.form.tagIds.join(',');
+          }
+
+          if (this.form.userId != null) {
+            updateUser(this.form).then(response => {
+              if (response.code === 200) {
+                this.$message.success("修改成功");
+                this.open = false;
+                this.getList();
+              }
+            });
+          } else {
+            addUser(this.form).then(response => {
+              if (response.code === 200) {
+                this.$message.success("新增成功");
+                this.open = false;
+                this.getList();
+              }
+            });
+          }
+        }
+      });
+    },
+
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const userIds = row.userId || this.ids;
+      this.$confirm('是否确认删除用户编号为"' + userIds + '"的数据项?', "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(() => {
+        return delUser(userIds);
+      }).then(() => {
+        this.getList();
+        this.$message.success("删除成功");
+      }).catch(() => {});
+    },
+
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm('是否确认导出所有用户数据项?', "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(() => {
+        return exportUser(queryParams);
+      }).then(response => {
+        this.download(response.msg);
+      }).catch(() => {});
+    },
+
+    /** 审核会员操作 */
+    handleAudit(row) {
+      this.$confirm('是否确认将其移除小黑屋?', "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(() => {
+        auditUser([row.userId]).then(response => {
+          if (response.code === 200) {
+            this.msgSuccess("审核成功");
+            this.getList();
+          }
+        });
+      }).catch(() => {});
+    }
+  }
+};
+</script>
+
+<style scoped>
+.el-tag + .el-tag {
+  margin-left: 5px;
+}
+.mb8 {
+  margin-bottom: 8px;
+}
+</style>

+ 658 - 0
src/views/member/mylist.vue

@@ -0,0 +1,658 @@
+<template>
+  <div class="app-container">
+    <!-- Search Form -->
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="80px">
+      <el-form-item label="昵称" prop="nickname">
+        <el-input
+          style="width: 200px"
+          v-model="queryParams.nickname"
+          placeholder="请输入昵称"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="手机号码" prop="phone">
+        <el-input
+          style="width: 200px"
+          v-model="queryParams.phone"
+          placeholder="请输入手机号码"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <!--      <el-form-item label="状态" prop="status">-->
+      <!--        <el-select style="width: 200px" v-model="queryParams.status" placeholder="请选择状态" clearable size="small">-->
+      <!--          <el-option-->
+      <!--            v-for="item in statusOptions"-->
+      <!--            :key="item.dictValue"-->
+      <!--            :label="item.dictLabel"-->
+      <!--            :value="item.dictValue"-->
+      <!--          />-->
+      <!--        </el-select>-->
+      <!--      </el-form-item>-->
+      <!--      <el-form-item label="看课状态" prop="watchCourseType">-->
+      <!--        <el-select style="width: 200px" v-model="queryParams.watchCourseType" placeholder="请选择看课状态" clearable size="small">-->
+      <!--          <el-option label="全部" value="0" />-->
+      <!--          <el-option label="未看过课" value="1" />-->
+      <!--          <el-option label="正常看课" value="2" />-->
+      <!--          <el-option label="停止看课" value="3" />-->
+      <!--        </el-select>-->
+      <!--      </el-form-item>-->
+      <!--      <el-form-item label="缺课状态" prop="missCourseStatus">-->
+      <!--        <el-select style="width: 200px" v-model="queryParams.missCourseStatus" placeholder="请选择缺课状态" clearable size="small">-->
+      <!--          <el-option label="全部" value="0" />-->
+      <!--          <el-option label="已缺课" value="1" />-->
+      <!--          <el-option label="未缺课" value="2" />-->
+      <!--        </el-select>-->
+      <!--      </el-form-item>-->
+      <!--      <el-form-item label="标签" prop="tagIds">-->
+      <!--        <el-select style="width: 200px" v-model="queryParams.tagIds" placeholder="请选择标签" clearable size="small" multiple>-->
+      <!--          <el-option-->
+      <!--            v-for="item in tagOptions"-->
+      <!--            :key="item.tagId"-->
+      <!--            :label="item.tagName"-->
+      <!--            :value="item.tagId"-->
+      <!--          />-->
+      <!--        </el-select>-->
+      <!--      </el-form-item>-->
+      <el-form-item label="注册时间">
+        <el-date-picker
+          v-model="dateRange"
+          size="small"
+          style="width: 240px"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          value-format="yyyy-MM-dd"
+        ></el-date-picker>
+      </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>
+      </el-form-item>
+    </el-form>
+    <!-- 操作按钮区域 -->
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          icon="el-icon-d-arrow-right"
+          size="mini"
+          :disabled="multiple"
+          @click="handleTransfer"
+          v-hasPermi="['company:user:transfer']"
+        >转移</el-button>
+      </el-col>
+    </el-row>
+    <!-- Tab Selection -->
+    <!--    <el-tabs v-model="queryParams.tabValue" @tab-click="handleTabChange">-->
+    <!--      <el-tab-pane label="全部" name="0"></el-tab-pane>-->
+    <!--      <el-tab-pane label="今日新增" name="1"></el-tab-pane>-->
+    <!--      <el-tab-pane label="今日完播" name="2"></el-tab-pane>-->
+    <!--      <el-tab-pane label="未看过课" name="3"></el-tab-pane>-->
+    <!--    </el-tabs>-->
+
+    <!-- Toolbar -->
+    <el-row :gutter="10" class="mb8">
+      <!--      <el-col :span="1.5">-->
+      <!--        <el-button-->
+      <!--          type="primary"-->
+      <!--          plain-->
+      <!--          icon="el-icon-plus"-->
+      <!--          size="mini"-->
+      <!--          @click="handleAdd"-->
+      <!--          v-hasPermi="['user:fsUser:add']"-->
+      <!--        >新增</el-button>-->
+      <!--      </el-col>-->
+      <!--      <el-col :span="1.5">-->
+      <!--        <el-button-->
+      <!--          type="success"-->
+      <!--          plain-->
+      <!--          icon="el-icon-edit"-->
+      <!--          size="mini"-->
+      <!--          :disabled="single"-->
+      <!--          @click="handleUpdate"-->
+      <!--          v-hasPermi="['user:fsUser:edit']"-->
+      <!--        >编辑</el-button>-->
+      <!--      </el-col>-->
+      <!--      <el-col :span="1.5">-->
+      <!--        <el-button-->
+      <!--          type="danger"-->
+      <!--          plain-->
+      <!--          icon="el-icon-delete"-->
+      <!--          size="mini"-->
+      <!--          :disabled="multiple"-->
+      <!--          @click="handleDelete"-->
+      <!--          v-hasPermi="['user:fsUser:remove']"-->
+      <!--        >删除</el-button>-->
+      <!--      </el-col>-->
+      <!--      <el-col :span="1.5">-->
+      <!--        <el-button-->
+      <!--          type="warning"-->
+      <!--          plain-->
+      <!--          icon="el-icon-download"-->
+      <!--          size="mini"-->
+      <!--          @click="handleExport"-->
+      <!--          v-hasPermi="['user:fsUser:export']"-->
+      <!--        >导出</el-button>-->
+      <!--      </el-col>-->
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <!-- User Table -->
+    <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
+      <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" width="80">
+        <template slot-scope="scope">
+          <el-popover
+            placement="right"
+            title=""
+            trigger="hover"
+          >
+            <img slot="reference" :src="scope.row.avatar" width="50">
+            <img :src="scope.row.avatar" style="max-width: 120px;">
+          </el-popover>
+        </template>
+      </el-table-column>
+      <el-table-column label="手机号码" align="center" prop="phone" />
+      <el-table-column label="积分" align="center" prop="integral" v-if="false" />
+      <el-table-column label="看课数量" align="center" prop="watchCourseCount" />
+      <el-table-column label="缺课数量" align="center" prop="missCourseCount" />
+      <el-table-column label="参与营期数量" align="center" prop="partCourseCount" />
+      <el-table-column label="状态" align="center">
+        <template slot-scope="scope">
+          <el-tag :type="scope.row.status === 1 ? 'success' : 'danger'">
+            {{ scope.row.status === 1 ? '正常' : '禁止' }}
+          </el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column label="看课状态" align="center">
+        <template slot-scope="scope">
+          <el-tag :type="getCourseStatusType(scope.row.courseCountStatus)">
+            {{ getCourseStatusText(scope.row.courseCountStatus) }}
+          </el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column label="标签" align="center" prop="tag" show-overflow-tooltip />
+      <el-table-column label="最后看课时间" align="center" prop="lastWatchDate" width="160" />
+      <el-table-column label="停课天数" align="center" prop="stopWatchDays" />
+      <el-table-column label="注册时间" align="center" prop="createTime" width="160" />
+      <el-table-column label="备注" align="center" prop="remark" show-overflow-tooltip />
+      <el-table-column label="所属员工" align="center" prop="companyUserNickName" />
+      <el-table-column label="操作" align="center" width="120" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-check"
+            @click="handleAudit(scope.row)"
+            v-if="scope.row.isCurrentCompanyUser === 1 && scope.row.status === 0"
+          >审核会员</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- Edit User Dialog -->
+    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+        <el-form-item label="用户头像" prop="avatar">
+          <el-popover
+            placement="right"
+            title=""
+            trigger="hover"
+          >
+            <img slot="reference" :src="form.avatar" width="80">
+            <img :src="form.avatar" style="max-width: 120px;">
+          </el-popover>
+        </el-form-item>
+        <el-form-item label="昵称" prop="nickname">
+          <el-input v-model="form.nickname" placeholder="请输入昵称" />
+        </el-form-item>
+        <el-form-item label="手机号码" prop="phone">
+          <el-input v-model="form.phone" placeholder="请输入手机号码" />
+        </el-form-item>
+        <el-form-item label="最后登录IP" prop="lastIp" v-if="form.lastIp">
+          <el-input v-model="form.lastIp" disabled placeholder="最后一次登录IP" />
+        </el-form-item>
+        <el-form-item label="看课数量" prop="watchCourseCount" v-if="form.watchCourseCount">
+          <el-input v-model="form.watchCourseCount" disabled placeholder="看课数量" />
+        </el-form-item>
+        <el-form-item label="缺课数量" prop="missCourseCount" v-if="form.missCourseCount">
+          <el-input v-model="form.missCourseCount" disabled placeholder="缺课数量" />
+        </el-form-item>
+        <el-form-item label="标签" prop="tagIds">
+          <el-select v-model="form.tagIds" placeholder="请选择标签" clearable multiple>
+            <el-option
+              v-for="item in tagOptions"
+              :key="item.tagId"
+              :label="item.tagName"
+              :value="item.tagId"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="所属员工" prop="companyUserId">
+          <el-select v-model="form.companyUserId" placeholder="请选择所属员工" clearable>
+            <el-option
+              v-for="item in salesOptions"
+              :key="item.userId"
+              :label="item.nickName"
+              :value="item.userId"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="用户备注" prop="remark">
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入用户备注" />
+        </el-form-item>
+        <el-form-item label="状态">
+          <el-radio-group v-model="form.status">
+            <el-radio :label="1">正常</el-radio>
+            <el-radio :label="0">禁止</el-radio>
+          </el-radio-group>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+    <!-- 客户转移对话框 (可选,更复杂的转移逻辑可能需要) -->
+
+    <el-dialog title="客户转移" :visible.sync="openTransferDialog" width="500px" append-to-body>
+      <el-form ref="transferForm" :model="transferForm" label-width="100px" :rules="cusTransfer">
+        <el-alert
+          title="会经过总后台审核后才进行转移"
+          type="warning">
+        </el-alert>
+        <el-form-item label="转移至销售" prop="targetUserId">
+          <el-select v-model="transferForm.targetUserId" remote placeholder="请选择" filterable clearable>
+            <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="content">
+          <el-input type="textarea" v-model="transferForm.content" placeholder="转移原因"></el-input>
+        </el-form-item>
+        <p>确定要转移选中的 <strong>{{ ids.length }}</strong> 个客户吗?</p>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="danger" @click="submitTransfer">提交申请</el-button>
+        <el-button @click="cancelTransfer">取 消</el-button>
+      </div>
+    </el-dialog>
+
+  </div>
+</template>
+
+<script>
+import { listUser, getUser, addUser, updateUser, delUser, exportUser, auditUser } from "@/api/user/fsUser";
+import {transferUser} from "@/api/users/user";
+import {getUserList} from "@/api/company/companyUser";
+
+export default {
+  name: "FsUser",
+  data() {
+    return {
+      cusTransfer: {
+        targetUserId: [{required: true, message: '请选择转移至销售', trigger: 'change'}],
+        content: [{required: true, message: '请选择转移至销售', trigger: 'change'}]
+      },
+      companyUserList: [],
+      openTransferDialog: false,
+      transferForm: {
+        targetUserId: null,
+        content: null
+      },
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 用户表格数据
+      userList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 日期范围
+      dateRange: [],
+      // 状态数据字典
+      statusOptions: [],
+      // 标签选项
+      tagOptions: [],
+      // 销售员工选项
+      salesOptions: [],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        nickname: null,
+        phone: null,
+        // status: null,
+        tagIds: [],
+        tabValue: "0",
+        watchCourseType: "0",
+        missCourseStatus: "0",
+        continueMissCourseSort: "0",
+        registerStartTime: null,
+        registerEndTime: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        nickname: [
+          { required: true, message: "昵称不能为空", trigger: "blur" }
+        ],
+        phone: [
+          { required: true, message: "手机号码不能为空", trigger: "blur" },
+          { pattern: /^1[3-9]\d{9}$/, message: "请输入正确的手机号码", trigger: "blur" }
+        ],
+        status: [
+          { required: true, message: "状态不能为空", trigger: "change" }
+        ]
+      }
+    };
+  },
+  created() {
+    getUserList().then(res=>{
+      if(res.code === 200) {
+        this.companyUserList = res.data
+      }
+    });
+    this.getList();
+    this.getDicts("user_status").then(response => {
+      this.statusOptions = response.data;
+    });
+    this.getTagOptions();
+    this.getSalesOptions();
+  },
+  methods: {
+    /** 提交转移按钮 (如果使用对话框) */
+
+    submitTransfer() {
+      this.$refs["transferForm"].validate(valid => {
+        if (valid) {
+          transferUser({
+            userIds: this.ids,
+            targetCompanyUserId: this.transferForm.targetUserId,
+            content: this.transferForm.content
+          }).then(response => {
+            if (response.code === 200) {
+              this.msgSuccess(response.msg);
+              this.openTransferDialog = false;
+              this.getList();
+            } else {
+              this.msgError(response.msg || "转移失败");
+            }
+          }).catch(() => {
+            this.msgError("转移请求失败");
+          });
+        }
+      });
+    },
+    /** 转移按钮操作 */
+    handleTransfer(row) {
+      const userIds = row.userId ? [row.userId] : this.ids;
+      if (userIds.length === 0) {
+        this.$message.warning("请至少选择一个客户进行转移");
+        return;
+      }
+
+      this.resetTransferForm();
+      this.openTransferDialog = true;
+    },
+    // 重置表单
+    resetForm() {
+      this.linkForm={
+        days:null,
+        courseId:null,
+        videoId:null
+      }
+    },
+    resetTransferForm() {
+      this.transferForm = {
+        targetUserId: null,
+        content: null
+      };
+      this.resetForm("transferForm"); // 假设 transferForm 是 el-form 的 ref
+    },
+    cancelTransfer() {
+      this.openTransferDialog = false;
+      this.resetTransferForm();
+    },
+    /** 查询用户列表 */
+    getList() {
+      this.loading = true;
+
+      // 处理日期范围
+      if (this.dateRange && this.dateRange.length > 0) {
+        this.queryParams.registerStartTime = this.dateRange[0];
+        this.queryParams.registerEndTime = this.dateRange[1];
+      } else {
+        this.queryParams.registerStartTime = null;
+        this.queryParams.registerEndTime = null;
+      }
+
+      listUser(this.queryParams).then(response => {
+        this.userList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+
+    /** 获取标签选项 */
+    getTagOptions() {
+      this.tagOptions = [
+        { tagId: "1", tagName: "VIP会员" },
+        { tagId: "2", tagName: "普通会员" },
+        { tagId: "3", tagName: "新用户" },
+        { tagId: "4", tagName: "高频用户" }
+      ];
+    },
+
+    /** 获取销售员工选项 */
+    getSalesOptions() {
+      this.salesOptions = [
+        { userId: 1, nickName: "销售A" },
+        { userId: 2, nickName: "销售B" },
+        { userId: 3, nickName: "销售C" }
+      ];
+    },
+
+    /** 获取看课状态类型 */
+    getCourseStatusType(status) {
+      if (status === 1) return "success";
+      if (status === 2) return "danger";
+      if (status === 3) return "info";
+      return "";
+    },
+
+    /** 获取看课状态文本 */
+    getCourseStatusText(status) {
+      if (status === 1) return "正常看课";
+      if (status === 2) return "停止看课";
+      if (status === 3) return "未看过课";
+      return "未知状态";
+    },
+
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+
+    // 表单重置
+    reset() {
+      this.form = {
+        userId: null,
+        nickname: null,
+        avatar: null,
+        phone: null,
+        status: 1,
+        tagIds: [],
+        companyUserId: null,
+        remark: null
+      };
+      this.resetForm("form");
+    },
+
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.dateRange = [];
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+
+    /** Tab切换操作 */
+    handleTabChange() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.userId);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
+    },
+
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加用户";
+    },
+
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const userId = row.userId || this.ids[0];
+      getUser(userId).then(response => {
+        this.form = response.data;
+
+        // 处理标签数据,将字符串转为数组
+        if (this.form.tagIds && typeof this.form.tagIds === 'string') {
+          this.form.tagIds = this.form.tagIds.split(',');
+        }
+
+        this.open = true;
+        this.title = "修改用户";
+      });
+    },
+
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          // 处理标签数据,将数组转为字符串
+          if (this.form.tagIds && Array.isArray(this.form.tagIds)) {
+            this.form.tagIds = this.form.tagIds.join(',');
+          }
+
+          if (this.form.userId != null) {
+            updateUser(this.form).then(response => {
+              if (response.code === 200) {
+                this.$message.success("修改成功");
+                this.open = false;
+                this.getList();
+              }
+            });
+          } else {
+            addUser(this.form).then(response => {
+              if (response.code === 200) {
+                this.$message.success("新增成功");
+                this.open = false;
+                this.getList();
+              }
+            });
+          }
+        }
+      });
+    },
+
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const userIds = row.userId || this.ids;
+      this.$confirm('是否确认删除用户编号为"' + userIds + '"的数据项?', "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(() => {
+        return delUser(userIds);
+      }).then(() => {
+        this.getList();
+        this.$message.success("删除成功");
+      }).catch(() => {});
+    },
+
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm('是否确认导出所有用户数据项?', "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(() => {
+        return exportUser(queryParams);
+      }).then(response => {
+        this.download(response.msg);
+      }).catch(() => {});
+    },
+
+    /** 审核会员操作 */
+    handleAudit(row) {
+      this.$confirm('是否确认将其移除小黑屋?', "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(() => {
+        auditUser([row.userId]).then(response => {
+          if (response.code === 200) {
+            this.msgSuccess("审核成功");
+            this.getList();
+          }
+        });
+      }).catch(() => {});
+    }
+  }
+};
+</script>
+
+<style scoped>
+.el-tag + .el-tag {
+  margin-left: 5px;
+}
+.mb8 {
+  margin-bottom: 8px;
+}
+</style>

+ 7 - 8
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}`;
 	    },
     /** 查询企微任务看板列表 */

+ 97 - 44
src/views/qw/sop/sop.vue

@@ -276,7 +276,7 @@
             size="mini"
             type="text"
             @click="handleUpdateOutTime(scope.row)"
-          >修改时间/评级/大小转
+          >修改规则
           </el-button>
           <el-button
             size="mini"
@@ -444,52 +444,97 @@
     </el-dialog>
 
     <!-- 单独的修改时间   -->
-    <el-dialog :title="outTimeOpen.title" :visible.sync="outTimeOpen.open" width="500px">
-
-      <el-col>
-
+    <el-dialog :title="outTimeOpen.title" :visible.sync="outTimeOpen.open" width="800px">
+      <el-card class="box-card">
         <el-row>
-          <span>过期时间:</span>
-          <el-input-number v-model="outTimeOpen.expiryTime" :min="1" :max="100"></el-input-number>
-          (小时)
-        </el-row>
 
-        <el-row style="margin-top: 3%">
-          <span>是否开启客户评级:</span>
-          <el-switch
-            v-model="outTimeOpen.isRating"
-            active-color="#13ce66"
-            inactive-color="#ff4949"
-            :active-value="1"
-            :inactive-value="2">
-          </el-switch>
-          <span v-if="outTimeOpen.isRating == '1'" style="margin-left: 10px;color: #13ce66">已开启</span>
-          <span v-if="outTimeOpen.isRating == '2'" style="margin-left: 10px;color: #ff4949">已关闭</span>
-        </el-row>
-        <el-row>
-          <span>小转天数:</span>
-          <el-input-number v-model="outTimeOpen.minConversionDay"></el-input-number>
-          (天)
-        </el-row>
-        <el-row>
-          <span>大转天数:</span>
-          <el-input-number v-model="outTimeOpen.maxConversionDay"></el-input-number>
-          (天)
-        </el-row>
-        <el-row>
-          <span>发课开始天数:</span>
-          <el-input-number v-model="outTimeOpen.courseDay" :min="1" :max="100"></el-input-number>
-          (天)
-        </el-row>
-        <el-row style="margin-top: 3%">
-
-          <el-button type="primary" icon="el-icon-search" size="mini" @click="handleUpdateExpiryTime">确定修改
-          </el-button>
-          <el-button icon="el-icon-refresh" size="mini" @click="resetUpdateExpiryTime">取消</el-button>
-        </el-row>
+          <el-col>
+            <span>过期时间:</span>
+            <el-input-number v-model="outTimeOpen.expiryTime" :min="1" :max="100"></el-input-number>
+            (小时)
+          </el-col>
+
+          <el-col style="margin-top: 3%">
+            <span>是否开启客户评级:</span>
+            <el-switch
+              v-model="outTimeOpen.isRating"
+              active-color="#13ce66"
+              inactive-color="#ff4949"
+              :active-value="1"
+              :inactive-value="2">
+            </el-switch>
+            <span v-if="outTimeOpen.isRating == '1'" style="margin-left: 10px;color: #13ce66">已开启</span>
+            <span v-if="outTimeOpen.isRating == '2'" style="margin-left: 10px;color: #ff4949">已关闭</span>
+          </el-col>
+          <el-col style="margin-top: 3%">
+            <span>小转天数:</span>
+            <el-input-number v-model="outTimeOpen.minConversionDay"></el-input-number>
+            (天)
+          </el-col>
+          <el-col style="margin-top: 3%">
+            <span>大转天数:</span>
+            <el-input-number v-model="outTimeOpen.maxConversionDay"></el-input-number>
+            (天)
+          </el-col>
+          <el-col style="margin-top: 3%">
+            <span>发课开始天数:</span>
+            <el-input-number v-model="outTimeOpen.courseDay" :min="1" :max="100"></el-input-number>
+            (天)
+          </el-col>
+          <el-col style="margin-top: 3%">
+            <el-card>
+              <el-radio-group v-model="outTimeOpen.isSampSend">
+                <el-row :gutter="20">
+                  <el-col>
+                    <el-radio
+                      border size="medium"
+                      :label="1"
+                      style="font-size: 16px; margin: 10px 0;font-weight: bold"
+                    >【官方群发】 按照【营期+插件补发】的形式发</el-radio>
+                    <div style="color: #999;font-size: 14px;display: flex;align-items: center;margin-top: 2%;margin-left: 3%">
+                      <i class="el-icon-question"></i>
+                      按照一个营期一个通用链接的形式,仅【营期详情】中(官方群发许可)为【是】的能用于官方群发,为【否】的按照 【sop插件】补发(ps:未注册用户全部不走官方群发,早上5点统一任务补发(官方群发的较少,补发及时))
+                    </div>
+                  </el-col>
+                  <el-col>
+                    <el-radio
+                      border size="medium"
+                      :label="2"
+                      style="font-size: 16px; margin: 10px 0;font-weight: bold"
+                    >【官方群发】 按照【营期+官方单链】的形式发</el-radio>
+                    <div style="color: #999;font-size: 14px;display: flex;align-items: center;margin-top: 2%;margin-left: 3%">
+                      <i class="el-icon-question"></i>
+                      按照一个营期一个通用链接的形式,仅【营期详情】中(官方群发许可)为【是】的能用于官方群发,为【否】的按照 【官方一对一链接】(ps:未注册用户也走官方群发,7点开始查询补发(官方群发较多,补发相对不及时))
+                    </div>
+                  </el-col>
+
+                </el-row>
+              </el-radio-group>
+            </el-card>
+            <!--            <el-switch-->
+            <!--              v-model="outTimeOpen.isSampSend"-->
+            <!--              active-color="#13ce66"-->
+            <!--              inactive-color="#ff4949"-->
+            <!--              :active-value="1"-->
+            <!--              :inactive-value="2">-->
+            <!--            </el-switch>-->
+            <!--            <span v-if="outTimeOpen.isSampSend == '1'" style="margin-left: 10px;color: #13ce66">是</span>-->
+            <!--            <span v-if="outTimeOpen.isSampSend == '2'" style="margin-left: 10px;color: #ff4949">否</span>-->
+            <!--            <div style="color: #999;font-size: 14px;display: flex;align-items: center;margin-top: 2%">-->
+            <!--              <i class="el-icon-info"></i>-->
+            <!--              作用于【官方群发】,如果选择是,则按照【营期】发官方消息(ps),如果选择否,则按照 【一对一 单链】的形式发官方消息-->
+            <!--            </div>-->
+          </el-col>
+          <el-col style="float: right;margin-top: 3%">
+
+            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleUpdateExpiryTime">确定修改
+            </el-button>
+            <el-button icon="el-icon-refresh" size="mini" @click="resetUpdateExpiryTime">取消</el-button>
+          </el-col>
 
 
-      </el-col>
+        </el-row>
+      </el-card>
     </el-dialog>
     <!-- 单独的修改时间   -->
     <el-dialog title="语音记录" :visible.sync="voiceForm.open" width="70%" append-to-body>
@@ -913,6 +958,7 @@ export default {
         tempId: null,
         expiryTime: null,
         isRating: null,
+        isSampSend:null,
       },
       voiceForm: {
         list: [],
@@ -1172,11 +1218,16 @@ export default {
 
     //修改过期时间
     handleUpdateOutTime(val) {
+      console.log("valval",val)
       this.outTimeOpen.title = "修改过期时间/评级";
       this.outTimeOpen.id = val.id;
       this.outTimeOpen.tempId = val.tempId;
       this.outTimeOpen.expiryTime = val.expiryTime;
       this.outTimeOpen.isRating = val.isRating;
+      this.outTimeOpen.minConversionDay=val.minConversionDay;
+      this.outTimeOpen.maxConversionDay=val.maxConversionDay;
+      this.outTimeOpen.courseDay=val.courseDay;
+      this.outTimeOpen.isSampSend=val.isSampSend;
       this.outTimeOpen.open = true;
     },
 
@@ -1188,7 +1239,8 @@ export default {
         isRating: this.outTimeOpen.isRating,
         minConversionDay: this.outTimeOpen.minConversionDay,
         maxConversionDay: this.outTimeOpen.maxConversionDay,
-        courseDay: this.outTimeOpen.courseDay
+        courseDay: this.outTimeOpen.courseDay,
+        isSampSend:this.outTimeOpen.isSampSend
       }).then(response => {
         this.msgSuccess("修改成功");
         this.resetUpdateExpiryTime()
@@ -1205,6 +1257,7 @@ export default {
         minConversionDay: null,
         maxConversionDay: null,
         isRating: null,
+        isSampSend:null,
       }
     },
     addContent(index) {

+ 20 - 0
src/views/qw/sopUserLogsInfo/sopUserLogsInfoDetails.vue

@@ -127,6 +127,26 @@
       <el-table-column label="添加日期" align="center" prop="createTime" width="180"/>
       <el-table-column label="添加时间" align="center" prop="crtTime" width="180"/>
       <el-table-column label="修改时间" align="center" prop="updateTime" width="180"/>
+      <el-table-column label="官方群发许可" align="center" prop="fsUserId" width="70">
+        <!-- 表头提示 -->
+        <template slot="header">
+          <el-tooltip effect="dark" content="即点过小程序链接的,通过插件助手发过一次课,且客户观看了的" placement="top">
+            <span>官方群发许可</span>
+          </el-tooltip>
+        </template>
+
+        <!-- 单元格提示 -->
+        <template slot-scope="scope">
+          <el-tooltip
+            effect="dark"
+            :content="`通过插件助手发过一次课,且客户观看了的`"
+            placement="top"
+          >
+            <el-tag v-if="scope.row.fsUserId > 0" type="success">是</el-tag>
+            <el-tag v-else type="danger">否</el-tag>
+          </el-tooltip>
+        </template>
+      </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="120" fixed="right">
         <template slot-scope="scope">
 <!--          <el-button-->

+ 1 - 1
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">