Forráskód Böngészése

我的/部门/看课记录的红包记录-显示 发送的是积分发放还是红包转账

三七 1 hónapja
szülő
commit
c721a16638

+ 9 - 1
src/api/system/config.js

@@ -23,6 +23,7 @@ export function getConfigByKey(configKey) {
     method: 'get'
   })
 }
+
 // 根据参数键名查询参数值
 export function getConfigKey(configKey) {
   return request({
@@ -31,6 +32,13 @@ export function getConfigKey(configKey) {
   })
 }
 
+export function getCourseConfigByRewardType() {
+    return request({
+        url: '/system/config/getCourseConfigByRewardType',
+        method: 'get'
+    })
+}
+
 // 新增参数配置
 export function addConfig(data) {
   return request({
@@ -81,4 +89,4 @@ export function updateConfigByKey(data) {
     method: 'post',
     data: data
   })
-}
+}

+ 16 - 2
src/views/course/courseWatchLog/deptWatchLog.vue

@@ -467,7 +467,12 @@
 <!--        <el-table-column label="会员电话" align="center" prop="phone" />-->
 <!--        <el-table-column label="所属销售" align="center" prop="companyUserName" />-->
 <!--        <el-table-column label="所属公司" align="center" prop="companyName" />-->
-        <el-table-column label="转账金额" align="center" prop="amount" />
+<!--        <el-table-column label="转账金额" align="center" prop="amount" />-->
+          <el-table-column :label="RewardType === 1 ? '转账金额' : '积分发放(红包转)'" align="center">
+              <template slot-scope="scope">
+                  <span>{{ RewardType === 1 ? scope.row.amount : scope.row.amount * 1000 }}</span>
+              </template>
+          </el-table-column>
         <el-table-column label="状态" align="center" prop="status" >
           <template slot-scope="scope">
             <el-tag>
@@ -536,6 +541,7 @@ import {infoSop} from "@/api/qw/sop";
 import {myDeptTreeselect} from "../../../api/company/companyDept";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+import {getCourseConfigByRewardType} from "../../../api/system/config";
 
 Vue.use(Calendar)
 
@@ -545,6 +551,7 @@ export default {
   components: {Treeselect},
   data() {
     return {
+      RewardType: 1,
       companyName:process.env.VUE_APP_COURSE_COMPANY_NAME,
       sopSearchText: '', // SOP搜索框显示的文本
       selectedSopId: null, // 选中的SOP ID
@@ -698,6 +705,9 @@ export default {
     };
   },
   created() {
+
+    this.getCourseByRewardType();
+
     courseList().then(response => {
       this.courseLists = response.list;
     });
@@ -716,7 +726,11 @@ export default {
     this.loading=false;
   },
   methods: {
-
+      getCourseByRewardType(){
+          getCourseConfigByRewardType().then(res=>{
+              this.RewardType=res.rewardType;
+          })
+      },
     showContentDialog(questionJson){
       // 解析 JSON 字符串为 JavaScript 对象
       // 替换非法换行符等控制字符

+ 14 - 1
src/views/course/courseWatchLog/index.vue

@@ -546,7 +546,12 @@
 <!--        <el-table-column label="会员电话" align="center" prop="phone" />-->
 <!--        <el-table-column label="所属销售" align="center" prop="companyUserName" />-->
 <!--        <el-table-column label="所属公司" align="center" prop="companyName" />-->
-        <el-table-column label="转账金额" align="center" prop="amount" />
+<!--        <el-table-column label="转账金额" align="center" prop="amount" />-->
+          <el-table-column :label="RewardType === 1 ? '转账金额' : '积分发放(红包转)'" align="center">
+              <template slot-scope="scope">
+                  <span>{{ RewardType === 1 ? scope.row.amount : scope.row.amount * 1000 }}</span>
+              </template>
+          </el-table-column>
         <el-table-column label="状态" align="center" prop="status" >
           <template slot-scope="scope">
             <el-tag>
@@ -717,6 +722,7 @@ import {getQwList} from "@/api/qw/qwUser";
 import {treeselect} from "@/api/company/companyDept";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+import {getCourseConfigByRewardType} from "../../../api/system/config";
 
 Vue.use(Calendar)
 
@@ -725,6 +731,7 @@ export default {
   components: {Treeselect },
   data() {
     return {
+      RewardType: 1,
       watchTypeList: [
         { dictLabel: 'app', dictValue: 1 },
         { dictLabel: '小程序', dictValue: 2 }
@@ -935,6 +942,7 @@ export default {
     };
   },
   created() {
+    this.getCourseByRewardType();
     courseList().then(response => {
       this.courseLists = response.list;
     });
@@ -959,6 +967,11 @@ export default {
     this.loading=false;
   },
   methods: {
+    getCourseByRewardType(){
+          getCourseConfigByRewardType().then(res=>{
+              this.RewardType=res.rewardType;
+          })
+      },
 
     showContentDialog(questionJson){
       // 解析 JSON 字符串为 JavaScript 对象

+ 15 - 1
src/views/course/courseWatchLog/watchLog.vue

@@ -622,7 +622,12 @@
         <!--        <el-table-column label="会员电话" align="center" prop="phone" />-->
         <!--        <el-table-column label="所属销售" align="center" prop="companyUserName" />-->
         <!--        <el-table-column label="所属公司" align="center" prop="companyName" />-->
-        <el-table-column label="转账金额" align="center" prop="amount" />
+<!--        <el-table-column label="转账金额" align="center" prop="amount" />-->
+        <el-table-column :label="RewardType === 1 ? '转账金额' : '积分发放(红包转)'" align="center">
+          <template slot-scope="scope">
+              <span>{{ RewardType === 1 ? scope.row.amount : scope.row.amount * 1000 }}</span>
+          </template>
+        </el-table-column>
         <el-table-column label="状态" align="center" prop="status" >
           <template slot-scope="scope">
             <el-tag>
@@ -829,6 +834,7 @@ import {allListTagGroup} from "../../../api/qw/tagGroup";
 import Vue from 'vue'
 import Calendar from 'vue-mobile-calendar'
 import {infoSop} from "@/api/qw/sop";
+import {getCourseConfigByRewardType} from "../../../api/system/config";
 
 Vue.use(Calendar)
 
@@ -836,6 +842,7 @@ export default {
   name: "CourseWatchLog",
   data() {
     return {
+      RewardType: 1,
       watchTypeList: [
         { dictLabel: 'app', dictValue: 1 },
         { dictLabel: '小程序', dictValue: 2 }
@@ -1027,6 +1034,7 @@ export default {
     };
   },
   created() {
+    this.getCourseByRewardType();
     courseList().then(response => {
       this.courseLists = response.list;
     });
@@ -1058,6 +1066,12 @@ export default {
 
   },
   methods: {
+      getCourseByRewardType(){
+          getCourseConfigByRewardType().then(res=>{
+              this.RewardType=res.rewardType;
+          })
+      },
+
     copyText(text, event) {
       const clipboard = new ClipboardJS(event.currentTarget, {
         text: () => text,