update:sop

src/api/course/courseAnswerlogs.js

@@ -4,8 +4,8 @@ import request from '@/utils/request'
 export function listLogs(query) {
   return request({
     url: '/course/courseAnswerLog/list',
-    method: 'get',
-    params: query
+    method: 'post',
+    data: query
   })
 }
 
@@ -47,7 +47,7 @@ export function delLogs(logId) {
 export function exportLogs(query) {
   return request({
     url: '/course/courseAnswerLog/export',
-    method: 'get',
-    params: query
+    method: 'post',
+    data: query
   })
 }

src/api/sop/companySopRole.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 查询公司SOP权限列表
 export function listCompanySopRole(query) {
   return request({
-    url: '/companySopRole/list',
+    url: '/sop/companySopRole/list',
     method: 'get',
     params: query
   })
@@ -12,7 +12,7 @@ export function listCompanySopRole(query) {
 // 查询公司SOP权限详细
 export function getCompanySopRole(id) {
   return request({
-    url: '/companySopRole/' + id,
+    url: '/sop/companySopRole/' + id,
     method: 'get'
   })
 }
@@ -20,7 +20,7 @@ export function getCompanySopRole(id) {
 // 新增公司SOP权限
 export function addCompanySopRole(data) {
   return request({
-    url: '/companySopRole',
+    url: '/sop/companySopRole',
     method: 'post',
     data: data
   })
@@ -29,7 +29,7 @@ export function addCompanySopRole(data) {
 // 修改公司SOP权限
 export function updateCompanySopRole(data) {
   return request({
-    url: '/companySopRole',
+    url: '/sop/companySopRole',
     method: 'put',
     data: data
   })
@@ -38,7 +38,7 @@ export function updateCompanySopRole(data) {
 // 删除公司SOP权限
 export function delCompanySopRole(id) {
   return request({
-    url: '/companySopRole/' + id,
+    url: '/sop/companySopRole/' + id,
     method: 'delete'
   })
 }
@@ -46,7 +46,7 @@ export function delCompanySopRole(id) {
 // 导出公司SOP权限
 export function exportCompanySopRole(query) {
   return request({
-    url: '/companySopRole/export',
+    url: '/sop/companySopRole/export',
     method: 'get',
     params: query
   })

src/views/course/courseAnswerLog/index/index.vue

@@ -1,172 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="关键词" prop="keyword">
-        <el-input v-model="queryParams.keyword" placeholder="请输入关键词" clearable size="small"
-          @keyup.enter.native="handleQuery" />
-      </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="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
-          v-hasPermi="['course:courseAnswerLog:add']">新增</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="['course:courseAnswerLog:remove']">删除</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
-    <el-table border v-loading="loading" :data="list" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="ID" align="center" prop="id" width="80" />
-      <el-table-column label="名称" align="center" prop="name" :show-overflow-tooltip="true" />
-      <el-table-column label="创建时间" align="center" prop="createTime" width="160">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.createTime) }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="180">
-        <template slot-scope="scope">
-          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
-            v-hasPermi="['course:courseAnswerLog:edit']">修改</el-button>
-          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
-            v-hasPermi="['course:courseAnswerLog:remove']">删除</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" />
-
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="名称" prop="name">
-          <el-input v-model="form.name" placeholder="请输入名称" />
-        </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>
-  </div>
-</template>
-
-<script>
-import { getRequest, postRequest, putRequest, delRequest } from "@/api/common";
-
-export default {
-  name: "CourseCourseanswerlog",
-  data() {
-    return {
-      loading: true,
-      ids: [],
-      multiple: true,
-      showSearch: true,
-      total: 0,
-      list: [],
-      title: "",
-      open: false,
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        keyword: null
-      },
-      form: {},
-      rules: {
-        name: [{ required: true, message: "名称不能为空", trigger: "blur" }],
-      },
-    };
-  },
-  created() {
-    this.getList();
-  },
-  methods: {
-    getList() {
-      this.loading = true;
-      getRequest("/course/courseAnswerLog/list", this.queryParams).then(response => {
-        this.list = response.rows || [];
-        this.total = response.total || 0;
-        this.loading = false;
-      }).catch(() => {
-        this.list = [];
-        this.total = 0;
-        this.loading = false;
-      });
-    },
-    handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
-    },
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    reset() {
-      this.form = { id: null, name: null };
-      this.resetForm("form");
-    },
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id);
-      this.multiple = !selection.length;
-    },
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "新增";
-    },
-    handleUpdate(row) {
-      this.reset();
-      const id = row.id || this.ids;
-      getRequest("/course/courseAnswerLog/" + id).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改";
-      });
-    },
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.id != null) {
-            putRequest("/course/courseAnswerLog", this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            postRequest("/course/courseAnswerLog", this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
-          }
-        }
-      });
-    },
-    handleDelete(row) {
-      const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除选中的数据项?', "警告", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning"
-      }).then(() => {
-        return delRequest("/course/courseAnswerLog/" + ids);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
-    },
-  },
-};
-</script>

src/views/course/courseAnswerlogs/index.vue

@@ -1,15 +1,38 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="120px">
-      <el-form-item label="用户ID" prop="userId">
+      <!--      <el-form-item label="销售公司" prop="companyId">-->
+      <!--        <el-select filterable v-model="queryParams.companyId" clearable placeholder="请选择公司名" size="small">-->
+      <!--          <el-option-->
+      <!--            v-for="item in companys"-->
+      <!--            :key="item.companyId"-->
+      <!--            :label="item.companyName"-->
+      <!--            :value="item.companyId"-->
+      <!--          />-->
+      <!--        </el-select>-->
+      <!--      </el-form-item>-->
+      <el-form-item label="会员id" prop="userId">
         <el-input
           v-model="queryParams.userId"
-          placeholder="请输入用户ID"
+          placeholder="请输入会员id"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="公司名" prop="companyId">
+        <select-tree
+          v-model="selectedCompanyList"
+          :raw-data="deptList"
+          placeholder="请选择销售"
+          :parentSelectable="true"
+          :multiple="true"
+          component-width="300px"
+          :max-display-tags="3"
+          :check-strictly="false"
+          :return-leaf-only="false"
+        ></select-tree>
+      </el-form-item>
       <el-form-item label="客户电话" prop="phone">
         <el-input
           v-model="queryParams.phone"
@@ -19,15 +42,6 @@
           @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="phoneMk">
         <el-input
           v-model="queryParams.phoneMk"
@@ -67,7 +81,7 @@
         />
       </el-form-item>
       <el-form-item label="公司" prop="companyId">
-        <el-select filterable  v-model="queryParams.companyId" placeholder="请输入"  clearable size="small">
+        <el-select filterable  v-model="queryParams.companyId" placeholder="请选择公司名"  clearable size="small">
           <el-option
             v-for="item in companys"
             :key="item.companyId"
@@ -87,8 +101,8 @@
         </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="timeChange"></el-date-picker>
+        <el-date-picker v-model="createTime" size="small" style="width: 220px" value-format="yyyy-MM-dd HH:mm:ss"
+                        type="datetimerange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" @change="timeChange"></el-date-picker>
 
       </el-form-item>
       <el-form-item>
@@ -114,22 +128,8 @@
 
     <el-table border v-loading="loading" :data="logsList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="小程序用户名" align="center" prop="userName">
-        <template slot-scope="scope">
-          <div style="display: flex;white-space: nowrap">
-            <div style="margin: auto">
-              {{scope.row.userName}}
-            </div>
-            <el-popover
-              placement="right"
-              title=""
-              trigger="hover">
-              <img slot="reference" :src="scope.row.fsAvatar" style="width: 30px;height: 30px">
-              <img :src="scope.row.fsAvatar" style="max-width: 200px;max-height: 200px">
-            </el-popover>
-          </div>
-        </template>
-      </el-table-column>
+      <el-table-column label="小程序会员id" align="center" prop="userId" />
+      <el-table-column label="小程序用户名" align="center" prop="userName" />
       <el-table-column label="课程名称" align="center" prop="courseName" />
       <el-table-column label="小节名称" align="center" prop="videoName" />
       <el-table-column label="是否全部正确" align="center" prop="isRight" >
@@ -158,13 +158,19 @@
 import { listLogs, getLogs, delLogs, addLogs, updateLogs, exportLogs } from "@/api/course/courseAnswerlogs";
 import { courseList, videoList } from '@/api/course/courseRedPacketLog'
 import { getCompanyList } from '@/api/company/company'
+import SelectTree from '@/components/TreeSelect/index.vue'
+import { getDeptData } from '@/api/system/employeeStats'
 
 export default {
   name: "Logs",
+  components: { SelectTree },
   data() {
     return {
+
+      selectedCompanyList: [],
+      deptList: [],
       // 遮罩层
-      loading: true,
+      loading: false,
       // 导出遮罩层
       exportLoading: false,
       // 选中数组
@@ -196,19 +202,19 @@ export default {
       open: false,
       // 查询参数
       queryParams: {
+        logId:null,
         pageNum: 1,
         pageSize: 10,
         phone: null,
+        userId: null,
         phoneMk: null,
         courseId: null,
         videoId: null,
-        userId:null,
         companyUserName: null,
         companyId: null,
         isRight: null,
         sTime:null,
         eTime:null,
-        userName: null,
       },
       //选择时间
       createTime:null,
@@ -221,31 +227,45 @@ export default {
   },
   created() {
 
+
+    getDeptData().then(response => {
+      this.deptList = response.data;
+    })
+
     courseList().then(response => {
       this.courseLists = response.list;
     });
 
     getCompanyList().then(response => {
       this.companys = response.data;
-      if(this.companys!=null&&this.companys.length>0){
-        this.companyId=this.companys[0].companyId;
-        this.getTreeselect();
-      }
+      // if(this.companys!=null&&this.companys.length>0){
+      //   this.companyId=this.companys[0].companyId;
+      //   this.getTreeselect();
+      // }
       this.companys.push({companyId:"-1",companyName:"无"})
     });
     this.getDicts("sys_company_or").then(response => {
       this.sysCompanyOr = response.data;
     });
-    this.getList();
+
+    // this.getList();
 
   },
   methods: {
     /** 查询答题日志列表 */
     getList() {
       this.loading = true;
+
+      if(this.selectedCompanyList != null && this.selectedCompanyList.length > 0) {
+        this.queryParams.companyUserIds = this.selectedCompanyList;
+      }else {
+        this.queryParams.companyUserIds = [];
+      }
+
+
       listLogs(this.queryParams).then(response => {
-        this.logsList = response.rows;
-        this.total = response.total;
+        this.logsList = response.data.list;
+        this.total = response.data.total;
         this.loading = false;
       });
     },
@@ -287,7 +307,6 @@ export default {
         companyId: null,
         sTime:null,
         eTime:null,
-        userName: null,
       };
       this.resetForm("form");
     },
@@ -350,30 +369,41 @@ export default {
     handleDelete(row) {
       const logIds = row.logId || this.ids;
       this.$confirm('是否确认删除答题日志编号为"' + logIds + '"的数据项?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return delLogs(logIds);
-        }).then(() => {
-          this.getList();
-          this.msgSuccess("删除成功");
-        }).catch(() => {});
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(function() {
+        return delLogs(logIds);
+      }).then(() => {
+        this.getList();
+        this.msgSuccess("删除成功");
+      }).catch(() => {});
     },
     /** 导出按钮操作 */
     handleExport() {
       const queryParams = this.queryParams;
-      this.$confirm('是否确认导出当前答题日志数据项?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(() => {
-          this.exportLoading = true;
-          return exportLogs(queryParams);
-        }).then(response => {
-          this.download(response.msg);
-          this.exportLoading = false;
-        }).catch(() => {});
+      this.$confirm('是否确认导出所有答题日志数据项?', "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(() => {
+
+        const loadingInstance = this.$loading({
+          lock: true,
+          text: '正在导出数据，请稍候...',
+          background: 'rgba(0, 0, 0, 0.7)'
+        });
+
+        this.exportLoading = true;
+        return exportLogs(queryParams).finally(res=>{
+          loadingInstance.close();
+        });
+      }).then(response => {
+        this.download(response.msg);
+        this.exportLoading = false;
+      }).catch(() => {}).finally(res=>{
+        this.exportLoading = false;
+      });
     }
   }
 };

src/views/course/courseRedPacketLog/index.vue

@@ -1,53 +1,78 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <!--		<el-form-item label="公司名" prop="companyId">-->
+      <!--		     <el-select filterable  v-model="queryParams.companyId" placeholder="请选择公司名"  clearable size="small">-->
+      <!--		         <el-option-->
+      <!--		           v-for="item in companys"-->
+      <!--		           :key="item.companyId"-->
+      <!--		           :label="item.companyName"-->
+      <!--		           :value="item.companyId"-->
+      <!--		         />-->
+      <!--		   </el-select>-->
+      <!--		 </el-form-item>-->
+      <el-form-item label="公司名" prop="companyId">
+        <select-tree
+          v-model="selectedCompanyList"
+          :raw-data="deptList"
+          placeholder="请选择销售"
+          :parentSelectable="true"
+          :multiple="true"
+          component-width="300px"
+          :max-display-tags="3"
+          :check-strictly="false"
+          :return-leaf-only="false"
+        ></select-tree>
+      </el-form-item>
+      <!--    <el-form-item label="部门" prop="type">-->
+      <!--      <TreeselectVue-->
+      <!--        style="width: 220px"-->
+      <!--        :clearable="false"-->
+      <!--        v-model="queryParams.deptId"-->
+      <!--        :options="deptOptions"-->
+      <!--        clearable-->
+      <!--        :show-count="true"-->
+      <!--        placeholder="请选择归属部门"-->
+      <!--      />-->
+      <!--    </el-form-item>-->
+      <el-form-item label="员工" prop="companyUserName">
+        <el-input
+          v-model="queryParams.companyUserName"
+          placeholder="所属员工"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <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="companyUserName">
-		  <el-input
-		    v-model="queryParams.companyUserName"
-		    placeholder="员工"
-		    clearable
-		    size="small"
-		    @keyup.enter.native="handleQuery"
-		  />
-		</el-form-item>
+      <el-form-item label="电话" prop="phone">
+        <el-input
+          v-model="queryParams.phone"
+          placeholder="请输入电话"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="加密电话" prop="phoneMk">
+        <el-input
+          v-model="queryParams.phoneMk"
+          placeholder="请输入电话"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
 
-    <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="phone">
-	    <el-input
-	      v-model="queryParams.phone"
-	      placeholder="请输入电话"
-	      clearable
-	      size="small"
-	      @keyup.enter.native="handleQuery"
-	    />
-	  </el-form-item>
-	  <el-form-item label="加密电话" prop="phoneMk">
-	    <el-input
-	      v-model="queryParams.phoneMk"
-	      placeholder="请输入电话"
-	      clearable
-	      size="small"
-	      @keyup.enter.native="handleQuery"
-	    />
-	  </el-form-item>
       <el-form-item label="营期" prop="courseId">
         <el-select
           v-model="queryParams.periodId"
@@ -70,29 +95,29 @@
       </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
-		           v-for="dict in courseLists"
-		           :key="dict.dictValue"
-		           :label="dict.dictLabel"
-		           :value="parseInt(dict.dictValue)"
-		         />
-		   </el-select>
-		 </el-form-item>
-		<el-form-item label="小节" prop="videoId">
-       <el-select filterable  v-model="queryParams.videoId" placeholder="请选择小节"  clearable size="small">
-           <el-option
-             v-for="dict in videoList"
-             :key="dict.dictValue"
-             :label="dict.dictLabel"
-             :value="parseInt(dict.dictValue)"
-           />
-     </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-form-item>
+        <el-select filterable  v-model="queryParams.courseId" placeholder="请选择课程"  clearable size="small" @change="courseChange(queryParams.courseId)">
+          <el-option
+            v-for="dict in courseLists"
+            :key="dict.dictValue"
+            :label="dict.dictLabel"
+            :value="parseInt(dict.dictValue)"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="小节" prop="videoId">
+        <el-select filterable  v-model="queryParams.videoId" placeholder="请选择小节"  clearable size="small">
+          <el-option
+            v-for="dict in videoList"
+            :key="dict.dictValue"
+            :label="dict.dictLabel"
+            :value="parseInt(dict.dictValue)"
+          />
+        </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 HH:mm:ss" type="daterange"
+                        range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" @change="change"></el-date-picker>
+      </el-form-item>
 
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -112,69 +137,39 @@
           v-hasPermi="['course:courseRedPacketLog:export']"
         >导出</el-button>
       </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          :loading="exportLoading"
-          @click="handleRetry"
-        >重新发送</el-button>
-      </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
     <el-tabs type="card" v-model="activeName" @tab-click="handleClick">
-      <el-tab-pane label="全部订单" name="00"></el-tab-pane>
+      <el-tab-pane label="全部" name="00"></el-tab-pane>
       <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-tabs>
     <el-table border v-loading="loading" :data="courseRedPacketLogList" @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="logId" />-->
       <el-table-column label="批次单号" align="center" prop="outBatchNo" />
       <el-table-column label="营期名称" align="center" prop="periodName" />
-      <el-table-column label="课程名称" align="center" prop="courseName" />
-      <el-table-column label="小节名称" align="center" prop="title" />
-      <el-table-column label="会员id" align="center" prop="userId" />
-      <el-table-column label="会员昵称" align="center" prop="fsNickName">
+      <el-table-column label="课程名称" align="center" prop="courseId" >
         <template slot-scope="scope">
-          <div style="display: flex;white-space: nowrap">
-            <div style="margin: auto">
-              {{scope.row.fsNickName}}
-            </div>
-            <el-popover
-              placement="right"
-              title=""
-              trigger="hover">
-              <img slot="reference" :src="scope.row.fsAvatar" style="width: 30px;height: 30px">
-              <img :src="scope.row.fsAvatar" style="max-width: 200px;max-height: 200px">
-            </el-popover>
-          </div>
+          <span prop="status" v-for="(item, index) in courseLists"    v-if="scope.row.courseId==item.dictValue">{{item.dictLabel}}</span>
         </template>
       </el-table-column>
+      <el-table-column label="小节名称" align="center" prop="title" />
+      <el-table-column label="会员id" align="center" prop="userId" />
+      <el-table-column label="会员名称" align="center" prop="fsNickName" />
       <el-table-column label="会员电话" align="center" prop="phone" />
-      <el-table-column label="所属销售" align="center" prop="companyUserName" />
+      <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="amount" />
+      <el-table-column label="员工部门" align="center" prop="deptName" />
+      <el-table-column label="转帐金额" align="center" prop="amount" />
       <el-table-column label="状态" align="center" prop="status" >
         <template slot-scope="scope">
-          <el-tag>{{ scope.row.status === 0 ? "发送中" : scope.row.status === 1 ? "已完成" : "待补发" }}</el-tag>
+          <el-tag>{{ scope.row.status === 0 ? "发送中" : "已完成" }}</el-tag>
         </template>
       </el-table-column>
       <el-table-column label="企微账号" align="center" prop="qwUserName" />
       <el-table-column label="创建时间" align="center" prop="createTime" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-          <template slot-scope="scope">
-            <el-button v-if="scope.row.status==2"
-              size="mini"
-              type="text"
-              @click="handleRetry(scope.row)"
-            >重新发送</el-button>
-          </template>
-        </el-table-column>
+
     </el-table>
 
     <pagination
@@ -197,14 +192,14 @@
         <el-form-item label="小节id" prop="videoId">
           <el-input v-model="form.videoId" placeholder="请输入小节id" />
         </el-form-item>
-        <el-form-item label="公司员工id" prop="companyUserId">
-          <el-input v-model="form.companyUserId" placeholder="请输入公司员工id" />
+        <el-form-item label="员工id" prop="companyUserId">
+          <el-input v-model="form.companyUserId" placeholder="请输入员工id" />
         </el-form-item>
         <el-form-item label="公司id" prop="companyId">
           <el-input v-model="form.companyId" placeholder="请输入公司id" />
         </el-form-item>
-        <el-form-item label="转账金额" prop="amount">
-          <el-input v-model="form.amount" placeholder="请输入转账金额" />
+        <el-form-item label="转帐金额" prop="amount">
+          <el-input v-model="form.amount" placeholder="请输入转帐金额" />
         </el-form-item>
         <el-form-item label="企微userid" prop="qwUserId">
           <el-input v-model="form.qwUserId" placeholder="请输入分享企微userid" />
@@ -219,15 +214,21 @@
 </template>
 
 <script>
-import { courseList,videoList,listCourseRedPacketLog,retryCourseRedPacketLog, myListCourseRedPacketLogNew, getCourseRedPacketLog, delCourseRedPacketLog, addCourseRedPacketLog, updateCourseRedPacketLog, exportCourseRedPacketLog } from "@/api/course/courseRedPacketLog";
+import { courseList,videoList,getCourseRedPacketLog, delCourseRedPacketLog, addCourseRedPacketLog, updateCourseRedPacketLog, exportCourseRedPacketLog,listCourseRedPacketLogPage } from "@/api/course/courseRedPacketLog";
 import { getCompanyList } from "@/api/company/company";
 import { periodList } from "@/api/course/userCoursePeriod";
+import {treeselect} from "../../../api/company/companyDept";
+import SelectTree from '@/components/TreeSelect/index.vue'
+import { getDeptData } from '@/api/system/employeeStats'
+
 export default {
   name: "CourseRedPacketLog",
+  components: {SelectTree},
   data() {
     return {
-	  companys:[],
-	  deptOptions:[],
+      companys:[],
+      selectedCompanyList: [],
+      deptList: [],
       // 遮罩层
       loading: true,
       loadingPeriod: false,
@@ -253,14 +254,16 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
+      queryPeriod: {
+        pageNum: 1,
+        pageSize: 20
+      },
       // 查询参数
       queryParams: {
         pageNum: 1,
         pageSize: 10,
         courseId: null,
-        periodId: null,
         userId: null,
-        nickName:null,
         videoId: null,
         companyUserId: null,
         companyId: null,
@@ -271,12 +274,9 @@ export default {
         phoneMk: null,
         sTime:null,
         eTime:null,
+        userIds: null
       },
-      queryPeriod: {
-        pageNum: 1,
-        pageSize: 20
-      },
-	   createTime:null,
+      createTime:null,
       // 表单参数
       form: {},
       // 表单校验
@@ -286,18 +286,22 @@ export default {
   },
   created() {
     this.getList();
-	    getCompanyList().then(response => {
-	    this.companys = response.data;
-	  });
-	  courseList().then(response => {
-	    this.courseLists = response.list;
-	  });
+    getCompanyList().then(response => {
+      this.companys = response.data;
+    });
+    courseList().then(response => {
+      this.courseLists = response.list;
+    });
+    getDeptData().then(response => {
+      this.deptList = response.data;
+    })
     periodList(this.queryPeriod).then(response => {
       this.periodLists = response.data;
     });
+
+    // this.getList();
   },
   methods: {
-
     // 远程搜索方法
     async remoteMethod(query) {
       this.searchKeyword = query
@@ -336,43 +340,50 @@ export default {
 
 
     handleClick(tab, event) {
-	    this.activeName=tab.name;
-	    this.queryParams.status=tab.name
-	    console.log(this.queryParams.status)
-	    this.getList();
-	  },
+      this.activeName=tab.name;
+      if(tab.name == "00") {
+        this.queryParams.status = null;
+      } else {
+        this.queryParams.status = tab.name;
+      }
+      this.getList();
+    },
     /** 查询短链课程看课记录列表 */
     getList() {
       this.loading = true;
-      listCourseRedPacketLog(this.queryParams).then(response => {
-        this.courseRedPacketLogList = response.rows;
-        this.total = response.total;
+      if(this.selectedCompanyList != null && this.selectedCompanyList.length > 0) {
+        this.queryParams.userIds = this.selectedCompanyList;
+      }else {
+        this.queryParams.userIds = [];
+      }
+      listCourseRedPacketLogPage(this.queryParams).then(response => {
+        this.courseRedPacketLogList = response.data.list;
+        this.total = response.data.total;
         this.loading = false;
-      });
+      })
     },
-	change(){
-	      if(this.createTime!=null){
-	        this.queryParams.sTime=this.createTime[0];
-	        this.queryParams.eTime=this.createTime[1];
-	      }else{
-	        this.queryParams.sTime=null;
-	        this.queryParams.eTime=null;
-	      }
-
-	    },
-	courseChange(row){
+    change(){
+      if(this.createTime!=null){
+        this.queryParams.sTime=this.createTime[0];
+        this.queryParams.eTime=this.createTime[1];
+      }else{
+        this.queryParams.sTime=null;
+        this.queryParams.eTime=null;
+      }
 
-		if(row==""){
-			this.videoList=[]
-			this.queryParams.videoId=null
-		}else{
-			videoList(row).then(response => {
+    },
+    courseChange(row){
+      if(row==""){
+        this.videoList=[]
+        this.queryParams.videoId=null
+      }else{
+        videoList(row).then(response => {
 
-				this.videoList=response.list
-			});
-		}
+          this.videoList=response.list
+        });
+      }
 
-	},
+    },
     // 取消按钮
     cancel() {
       this.open = false;
@@ -383,7 +394,6 @@ export default {
       this.form = {
         logId: null,
         courseId: null,
-        periodId: null,
         userId: null,
         videoId: null,
         companyUserId: null,
@@ -402,10 +412,13 @@ export default {
     /** 重置按钮操作 */
     resetQuery() {
       this.resetForm("queryForm");
-	   this.createTime=null;
-	  this.queryParams.sTime=null;
-	  this.queryParams.eTime=null;
-	  this.queryParams.periodId=null;
+      this.createTime=null;
+      this.queryParams.sTime=null;
+      this.queryParams.eTime=null;
+      this.selectedCompanyList = [];
+      this.queryParams.pageNum = 1;    // Reset to first page
+      this.queryParams.pageSize = 10;  // Reset to default page size
+      this.queryParams.periodId=null;
       this.handleQuery();
     },
     // 多选框选中数据
@@ -451,45 +464,49 @@ export default {
       });
     },
     /** 删除按钮操作 */
-    handleRetry(row) {
+    handleDelete(row) {
       const logIds = row.logId || this.ids;
-      this.$confirm('是否确认重新发送红包?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return retryCourseRedPacketLog(logIds);
-        }).then((response) => {
-          this.getList();
-
-          this.msgSuccess(response.msg); // Fallback message
-
-        }).catch(() => {});
+      this.$confirm('是否确认删除短链课程看课记录编号为"' + logIds + '"的数据项?', "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(function() {
+        return delCourseRedPacketLog(logIds);
+      }).then(() => {
+        this.getList();
+        this.msgSuccess("删除成功");
+      }).catch(() => {});
     },
-	getSubCateList(pid){
-	  this.form.subCateId=null;
-	  if(pid == ''){
-	    this.subCategoryOptions=[];
-	    return
-	  }
-	  getCateListByPid(pid).then(response => {
-	    this.subCategoryOptions = response.data;
-	  });
-	},
     /** 导出按钮操作 */
     handleExport() {
+      if(this.selectedCompanyList != null && this.selectedCompanyList.length > 0) {
+        this.queryParams.userIds = this.selectedCompanyList;
+      }else {
+        this.queryParams.userIds = [];
+      }
       const queryParams = this.queryParams;
       this.$confirm('是否确认导出所有短链课程看课记录数据项?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(() => {
-          this.exportLoading = true;
-          return exportCourseRedPacketLog(queryParams);
-        }).then(response => {
-          this.download(response.msg);
-          this.exportLoading = false;
-        }).catch(() => {});
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(() => {
+        const loadingInstance = this.$loading({
+          lock: true,
+          text: '正在导出数据，请稍候...',
+          background: 'rgba(0, 0, 0, 0.7)'
+        });
+
+        this.exportLoading = true;
+        // return exportCourseRedPacketLog(queryParams);
+        return exportCourseRedPacketLog(queryParams).finally(res=>{
+          loadingInstance.close();
+        })
+      }).then(response => {
+        this.download(response.msg);
+        this.exportLoading = false;
+      }).catch(() => {}).finally(res=>{
+
+      });
     }
   }
 };