11/03 审核列表

11

src/constant/index.js

@@ -72,7 +72,7 @@ export const paymentType = {
 }
 
 export const payOrderType = {
-  STUDENT:'学生',
+  STUDENT:'个人',
   SCHOOL:'学校' 
 }
 
@@ -83,3 +83,10 @@ export const auditType = {
   OPEN:'开启缴费',
   OVER:'缴费已结束'
 }
+
+export const auditPaymentType = {
+  ADD_STUDENT:'新增学员',
+  ADD_COURSE:'临时加课',
+  MUSIC_APPLY:'乐团报名',
+  MUSIC_RENEW:'乐团续费'
+}

src/utils/searchArray.js

@@ -1,5 +1,5 @@
 // 搜索用的下拉数据列表
-import { payOrderType } from '../constant'
+import { payOrderType,auditType,auditPaymentType } from '../constant'
 // 课程类型
 export const courseType = [
   { label: "单技课", value: "SINGLE" },
@@ -209,8 +209,8 @@ export const classTimeList = [
 ]
 
 export const payOrderTypeList = getValueForKey(payOrderType)
-  
-
+export const auditTypeList = getValueForKey(auditType)
+export const auditPaymentTypeList = getValueForKey(auditPaymentType)
 
 function getValueForKey(obj){
   let arr = []

src/utils/vueFilter.js

@@ -1,7 +1,7 @@
 import Vue from 'vue'
 import dayjs from 'dayjs'
 import numeral from 'numeral'
-import { feeProject, feeType, saleType,payOrderType } from '../constant'
+import { feeProject, feeType, saleType,payOrderType,auditType,auditPaymentType } from '../constant'
 
 // 合并数组
 Vue.filter('joinArray', (value, type) => {
@@ -654,7 +654,17 @@ Vue.filter('receiveFormat', value => {
 })
 
 // 缴费方式
-payOrderType
+
 Vue.filter('payOrderType', value => {
   return payOrderType[value]
 })
+
+// 审核状态 auditType
+Vue.filter('auditType', value => {
+  return auditType[value]
+})
+
+// 审核申请类型 auditPaymentType
+Vue.filter('auditPaymentType', value => {
+  return auditPaymentType[value]
+})

src/views/auditList/index.vue

@@ -34,32 +34,32 @@
         <el-form-item>
           <el-select
             class="multiple"
-            v-model.trim="searchForm.organId"
+            v-model.trim="searchForm.paymentType"
             filterable
             clearable
             placeholder="申请类型"
           >
             <el-option
-              v-for="(item, index) in organList"
+              v-for="(item, index) in paymentTypeList"
               :key="index"
-              :label="item.name"
-              :value="item.id"
+              :label="item.label"
+              :value="item.value"
             ></el-option>
           </el-select>
         </el-form-item>
         <el-form-item>
           <el-select
             class="multiple"
-            v-model.trim="searchForm.organId"
+            v-model.trim="searchForm.status"
             filterable
             clearable
             placeholder="审核状态"
           >
             <el-option
-              v-for="(item, index) in organList"
+              v-for="(item, index) in statusList"
               :key="index"
-              :label="item.name"
-              :value="item.id"
+              :label="item.label"
+              :value="item.value"
             ></el-option>
           </el-select>
         </el-form-item>
@@ -71,10 +71,10 @@
         <el-table
           :data="tableList"
           :header-cell-style="{ background: '#EDEEF0', color: '#444' }"
-          >
+        >
           <el-table-column type="selection" width="55"></el-table-column>
           <el-table-column
-            width="120px"
+           
             align="center"
             prop="organName"
             label="分部名称"
@@ -86,67 +86,91 @@
           ></el-table-column>
           <el-table-column
             align="center"
+            width="180px"
             prop="musicGroupId"
             label="乐团编号"
           ></el-table-column>
+          <el-table-column align="center" prop="paymentType" label="申请类型">
+            <template slot-scope="scope">
+              <div>
+                {{ scope.row.paymentType | auditPaymentType }}
+              </div>
+            </template></el-table-column
+          >
+          <el-table-column align="center" prop="payUserType" label="订单类型">
+            <template slot-scope="scope">
+              <div>
+                {{ scope.row.payUserType | payOrderType }}
+              </div>
+            </template>
+          </el-table-column>
           <el-table-column
             align="center"
-            prop="paymentType"
-            label="申请类型"
-          ></el-table-column>
-           <el-table-column
-            align="center"
-            prop="payUserType"
-            label="订单类型"
-          ></el-table-column>
-           <el-table-column
-            align="center"
             prop="addCourseTotalTime"
             label="加课总时长(分钟)"
           ></el-table-column>
-           <el-table-column
+          <el-table-column
             align="center"
             prop="courseOriginalPrice"
-            label="原现价(分钟)"
-          ></el-table-column>
-             <el-table-column
+            label="原现价(元)"
+          >
+            <template slot-scope="scope">
+              <div>
+                {{ scope.row.courseOriginalPrice | moneyFormat }}
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column
             align="center"
             prop="courseCurrentPrice"
-            label="申请价格(分钟)"
-          ></el-table-column>
-           <el-table-column
+            label="申请价格(元)"
+          >
+               <template slot-scope="scope">
+              <div>
+                {{ scope.row.courseCurrentPrice | moneyFormat }}
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column
             align="center"
             prop="memo"
             label="备注"
-          ></el-table-column>
-           <el-table-column
+          >
+           <template slot-scope="scope">
+        <tooltip :content="scope.row.memo" />
+                    </template>
+          </el-table-column>
+          <el-table-column
             align="center"
             prop="operatorName"
             label="申请人"
           ></el-table-column>
-            <el-table-column
-            align="center"
-            prop="auditStatus"
-            label="状态"
-          ></el-table-column>
-               <el-table-column
+          <el-table-column align="center" prop="auditStatus" label="状态"  width="100px">
+            <template slot-scope="scope">
+              <div>
+                {{ scope.row.auditStatus | auditType }}
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column
             align="center"
             prop="createTime"
             label="申请时间"
-          ></el-table-column>
-          <el-table-column align="center" label="操作">
+            width="140px"
+          >
+           <template slot-scope="scope">
+              <div>
+                {{ scope.row.createTime | dateForMinFormat }}
+              </div>
+            </template></el-table-column>
+          <!--  -->
+          <el-table-column align="center" label="操作" width="100px" fixed="right">
             <template slot-scope="scope">
               <el-button
                 v-permission="'helpCenterContent/modify'"
                 @click="openTypes('update', scope.row)"
                 type="text"
-                >修改</el-button
-              >
-              <el-button
-                @click="onTypeDelOpeation(scope.row)"
-                v-permission="'helpCenterContent/delete'"
-                type="text"
-                >删除</el-button
+                >查看</el-button
               >
             </template>
           </el-table-column>
@@ -212,16 +236,24 @@
 <script>
 import pagination from "@/components/Pagination/index";
 // import store from '@/store'
-import {
- getAuditList
-} from "@/api/auditManager";
+import { getAuditList } from "@/api/auditManager";
+import { getEmployeeOrgan}from "@/api/buildTeam" 
+import Tooltip from '@/components/Tooltip/index'
+import {auditTypeList,auditPaymentTypeList} from '@/utils/searchArray'
+
 export default {
-  components: { pagination },
+  components: { pagination,Tooltip },
   name: "helpCategory",
   data() {
     return {
+      paymentTypeList:auditPaymentTypeList,
+      organList: [],
+      statusList:auditTypeList,
       searchForm: {
-        catalogId: null,
+        search: null,
+        paymentType:null,
+        status:null,
+        organId:null
       },
       tableList: [],
       formActionTitle: "create",
@@ -256,6 +288,11 @@ export default {
     this.getList();
   },
   mounted() {
+       getEmployeeOrgan().then(res => {
+        if (res.code == 200) {
+          this.organList = res.data;
+        }
+      });
     this.getList();
   },
   methods: {
@@ -314,6 +351,7 @@ export default {
       let params = {
         page: this.pageInfo.page,
         rows: this.pageInfo.limit,
+        ...this.searchForm
       };
       getAuditList(params).then((res) => {
         let result = res.data;

src/views/luckyDraw/trophyManager.vue

@@ -59,7 +59,7 @@
                         <tooltip :content="scope.row.memo" />
                     </template>
                 </el-table-column>
-                </el-table-column>
+
                 <el-table-column align="center" label="操作">
                     <template slot-scope="scope">
                         <el-button @click="onOperationTrophy('update', scope.row)" v-permission="'luckDrawPrize/update'" type="text">修改</el-button>