浏览代码

提交以下

1
mo 3 年之前
父节点
当前提交
364c6ac161

+ 8 - 0
src/constant/index.js

@@ -398,3 +398,11 @@ export const coupontypeDetail = {
   FULLCOUPON:'全类券',
   MEMBER:'团练宝'
 }
+
+
+// 发券方式
+export const issue = {
+  0:'主动领取',
+  1:'手动发放',
+  2:'交易获取'
+}

+ 3 - 1
src/utils/searchArray.js

@@ -1,5 +1,5 @@
 // 搜索用的下拉数据列表
-import { payOrderType, auditType, auditPaymentType, orderServerType, orderAuditType, rewardModeType,classTime,musicClassType,ProbationPeriodStatus,downListType,musicGroupType,conclusion,vipResetType,courseViewType,clientType,couponType,backType,memberEnum,coupontypeDetail } from '../constant'
+import { payOrderType, auditType, auditPaymentType, orderServerType, orderAuditType, rewardModeType,classTime,musicClassType,ProbationPeriodStatus,downListType,musicGroupType,conclusion,vipResetType,courseViewType,clientType,couponType,backType,memberEnum,coupontypeDetail,issue } from '../constant'
 // 课程类型
 export const courseType = [
   { label: "声部课", value: "SINGLE" },
@@ -241,6 +241,8 @@ export const couponTypeList = getValueForKey(couponType)
 export const backTypeList =  getValueForKey(backType)
 export const memberEnumList =getValueForKey(memberEnum)
 export const coupontypeDetailList =getValueForKey(coupontypeDetail)
+export const issueList =getValueForKey(issue)
+
 
 //downListType
 function getValueForKey (obj) {

+ 4 - 0
src/utils/vueFilter.js

@@ -239,6 +239,10 @@ Vue.filter('jobType', value => {
 Vue.filter('jobNature', (value) => {
   return constant.jobNature[value]
 })
+// 发券方式
+Vue.filter('issueType', (value) => {
+  return constant.issue[value]
+})
 
 
 // 考勤状态

+ 32 - 0
src/views/couponManager/couponDetail.vue

@@ -62,6 +62,23 @@
             ></el-option>
           </el-select>
         </el-form-item>
+                <el-form-item prop="issueType">
+          <el-select
+            class="multiple"
+            v-model.trim="searchForm.issueType"
+            filterable
+            clearable
+            placeholder="获取方式"
+          >
+            <el-option
+              v-for="(item, index) in issueList"
+              :key="index"
+              :label="item.label"
+              :value="item.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <!--  -->
         <el-form-item>
           <el-button native-type="submit" type="primary">搜索</el-button>
           <el-button native-type="reset" type="danger">重置</el-button>
@@ -150,6 +167,19 @@
               </div>
             </template>
           </el-table-column>
+               <el-table-column
+            align="center"
+            prop="couponId"
+            width="100px"
+            label="获取途径"
+          >
+            <template slot-scope="scope">
+              <div>
+                <p>{{ scope.row.issueType| issueType}}</p>
+              </div>
+            </template>
+          </el-table-column>
+
           <el-table-column
             align="center"
             prop="couponId"
@@ -190,10 +220,12 @@ import pagination from "@/components/Pagination/index";
 import { getSysCouponCode } from "./api";
 import Tooltip from "@/components/Tooltip/index";
 import load from "@/utils/loading";
+import {issueList} from '@/utils/searchArray'
 export default {
   components: { pagination, Tooltip },
   data() {
     return {
+      issueList,
       searchForm: {
         search: null,
         couponName: null,

+ 1 - 1
src/views/courseRulersManager/components/offlineTeamRules.vue

@@ -673,7 +673,7 @@
           type="info"
         />
 
-        <!-- <p class="subtitle">考勤申诉:课程结束后,如果考勤异常,老师可以在APP端进行考勤申诉,但已结算的课程无法再进行申诉,系统常规会在次月6号进行结算。</p> -->
+        <p class="subtitle">考勤申诉:课程结束后,如果考勤异常,老师可以在APP端进行考勤申诉,但已结算的课程无法再进行申诉,系统常规会在次月6号进行结算。</p>
         <el-row>
           <el-form-item
             prop="184"