shish před 1 rokem
rodič
revize
ef5016f9cd

+ 6 - 1
ghs/src/service/custom-balance-change/index.js

@@ -3,7 +3,12 @@ import { BaseService, Service } from '@/cool';
 @Service('custom-balance-change')
 @Service('custom-balance-change')
 export class CustomBalanceChangeService extends BaseService {
 export class CustomBalanceChangeService extends BaseService {
 
 
-
+	getChangeList(data) {
+		return this.request({
+			url: '/list',
+			params: data
+		});
+	}
 
 
 }
 }
 export default new CustomBalanceChangeService();
 export default new CustomBalanceChangeService();

+ 27 - 3
ghs/src/views/member/custom-balance-list.vue

@@ -8,16 +8,32 @@
 				</el-tabs>
 				</el-tabs>
 			</template>
 			</template>
 
 
-			
 			<template #table-column-amount="{scope}">
 			<template #table-column-amount="{scope}">
 				<span> {{ scope.row.io == 1 ? '+' : '-' }} {{ scope.row.amount }} </span>
 				<span> {{ scope.row.io == 1 ? '+' : '-' }} {{ scope.row.amount }} </span>
 			</template>
 			</template>
 
 
+			<template #table-column-staffName="{scope}">
+				<span>{{ scope.row.staffName != '' ? scope.row.staffName : '-' }}</span>
+			</template>
+
 			<template #table-column-capitalType="{scope}">
 			<template #table-column-capitalType="{scope}">
 				<span v-if="scope.row.capitalType == 75">售后返充</span>
 				<span v-if="scope.row.capitalType == 75">售后返充</span>
 				<span v-else-if="scope.row.capitalType == 62">线下充值</span>
 				<span v-else-if="scope.row.capitalType == 62">线下充值</span>
 				<span v-else-if="scope.row.capitalType == 66">线上充值</span>
 				<span v-else-if="scope.row.capitalType == 66">线上充值</span>
 				<span v-else-if="scope.row.capitalType == 64">结账</span>
 				<span v-else-if="scope.row.capitalType == 64">结账</span>
+				<span v-else>其它</span>
+			</template>
+
+			<template #table-column-payWay="{scope}">
+				<span v-if="scope.row.capitalType == 62 || scope.row.capitalType == 66">
+					<span v-if="scope.row.payWay == 0">微信</span>
+					<span v-else-if="scope.row.payWay == 1">支付宝</span>
+					<span v-else-if="scope.row.payWay == 2">余额支付</span>
+					<span v-else-if="scope.row.payWay == 4">现金</span>
+					<span v-else-if="scope.row.payWay == 5">银行卡</span>
+					<span v-else>其它</span>
+				</span>
+				<span v-else>-</span>
 			</template>
 			</template>
 
 
 			<template #slot-search-list="{scope}">
 			<template #slot-search-list="{scope}">
@@ -32,8 +48,9 @@
 				class="custom-date-picker" end-placeholder="结束日期" :picker-options="pickerOptions" size="middle" style="margin-right:8px;">
 				class="custom-date-picker" end-placeholder="结束日期" :picker-options="pickerOptions" size="middle" style="margin-right:8px;">
 				</el-date-picker>
 				</el-date-picker>
 
 
-			</template>
+				<el-button type="primary" size="middle" style="margin-left:10px;" @click="exportData()">导出数据</el-button>
 
 
+			</template>
 
 
 		</x-crud>
 		</x-crud>
 	</div>
 	</div>
@@ -133,7 +150,7 @@ export default {
 						},
 						},
 						{
 						{
 							prop: 'payWay',
 							prop: 'payWay',
-							label: '渠道',
+							label: '支付方式',
 							align: 'center',
 							align: 'center',
 							width: 120
 							width: 120
 						},
 						},
@@ -203,6 +220,13 @@ export default {
 		refreshData(){
 		refreshData(){
       		this.app.refresh({searchTime:this.searchTime,startTime:this.startTime,endTime:this.endTime,customId:this.customId})
       		this.app.refresh({searchTime:this.searchTime,startTime:this.startTime,endTime:this.endTime,customId:this.customId})
     	},
     	},
+		exportData(){
+			this.$service.customBalanceChange.getChangeList({searchTime:this.searchTime,startTime:this.startTime,endTime:this.endTime,customId:this.customId,pageSize:9999999,export:1}).then(res => {
+				if(res.file){
+					window.location.href = res.file
+				}
+			})
+		},
 		searchCpInfo(query) {
 		searchCpInfo(query) {
 			let that = this
 			let that = this
 			if (query !== '') {
 			if (query !== '') {