Merge branch 'dev' of 47.94.45.65:angelo/web-retail-admin into test

This commit is contained in:
woody 2025-07-11 10:17:39 +08:00
commit bfc5f69276
1 changed files with 240 additions and 186 deletions

View File

@ -6,228 +6,280 @@
--> -->
<template> <template>
<div class="page"> <div class="page">
<topBar v-if="topList.length > 0" <topBar
:topList="topList" v-if="topList.length > 0"
:moren="moren"></topBar> :top-list="topList"
:moren="moren"
/>
<div class="main"> <div class="main">
<el-form ref="select" <el-form
ref="select"
:model="select" :model="select"
style="background-color: #fff" style="background-color: #fff"
label-width="100px"> label-width="100px"
>
<el-row> <el-row>
<!-- 一层 --> <!-- 一层 -->
<el-col :span="4"> <el-col :span="4">
<el-form-item :label="'会员编号'"> <el-form-item :label="'会员编号'">
<el-input clearable <el-input
v-model="select.memberCode"></el-input> v-model="select.memberCode"
clearable
/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item :label="'会员姓名'"> <el-form-item :label="'会员姓名'">
<el-input clearable <el-input
v-model="select.memberName"></el-input> v-model="select.memberName"
clearable
/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item :label="'交易金额'"> <el-form-item :label="'交易金额'">
<el-input clearable <el-input
v-model="select.businessMoney"></el-input> v-model="select.businessMoney"
clearable
/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item :label="'交易类型'"> <el-form-item :label="'交易类型'">
<el-select clearable <el-select
v-model="select.businessType"
clearable
:placeholder="'请选择'" :placeholder="'请选择'"
v-model="select.businessType"> >
<el-option v-for="item in tradeTypeList" <el-option
v-for="item in tradeTypeList"
:key="item.value" :key="item.value"
:label="item.label" :label="item.label"
:value="item.value"></el-option> :value="item.value"
/>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item :label="'支付渠道'"> <el-form-item :label="'支付渠道'">
<el-select clearable <el-select
v-model="select.payChannel"
clearable
:placeholder="'请选择'" :placeholder="'请选择'"
v-model="select.payChannel"> >
<el-option v-for="item in channelList" <el-option
v-for="item in channelList"
:key="item.value" :key="item.value"
:label="item.label" :label="item.label"
:value="item.value"></el-option> :value="item.value"
/>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item :label="'支付方式'"> <el-form-item :label="'支付方式'">
<el-select clearable <el-select
v-model="select.payType"
clearable
:placeholder="'请选择'" :placeholder="'请选择'"
v-model="select.payType"> >
<el-option v-for="item in peyTypeList" <el-option
v-for="item in peyTypeList"
:key="item.value" :key="item.value"
:label="item.label" :label="item.label"
:value="item.value"></el-option> :value="item.value"
/>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item :label="'支付状态'"> <el-form-item :label="'支付状态'">
<el-select clearable <el-select
v-model="select.payStatus"
clearable
:placeholder="'请选择'" :placeholder="'请选择'"
v-model="select.payStatus"> >
<el-option v-for="item in statusList" <el-option
v-for="item in statusList"
:key="item.value" :key="item.value"
:label="item.label" :label="item.label"
:value="item.value"></el-option> :value="item.value"
/>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item :label="'单据编号'"> <el-form-item :label="'单据编号'">
<el-input clearable <el-input
v-model="select.businessCode"></el-input> v-model="select.businessCode"
clearable
/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item :label="'下单日期'"> <el-form-item :label="'下单日期'">
<el-date-picker v-model="select.creationTime" <el-date-picker
v-model="select.creationTime"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
type="daterange" type="daterange"
:range-separator="'至'" :range-separator="'至'"
:start-placeholder="'开始日期'" :start-placeholder="'开始日期'"
:end-placeholder="'结束日期'"> :end-placeholder="'结束日期'"
</el-date-picker> />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item :label="'支付日期'"> <el-form-item :label="'支付日期'">
<el-date-picker v-model="select.payTime" <el-date-picker
@change="changeTime1" v-model="select.payTime"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
type="daterange" type="daterange"
:range-separator="'至'" :range-separator="'至'"
:start-placeholder="'开始日期'" :start-placeholder="'开始日期'"
:end-placeholder="'结束日期'"> :end-placeholder="'结束日期'"
</el-date-picker> @change="changeTime1"
/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-button class="my_search" <el-button
class="my_search"
style="margin-left: 30px" style="margin-left: 30px"
@click="getDataList"> {{ '搜索' }}</el-button> @click="getDataList"
> {{ '搜索' }}</el-button>
<el-button class="my_reset" @click="reset"> {{ '重置' }}</el-button> <el-button class="my_reset" @click="reset"> {{ '重置' }}</el-button>
</el-col> </el-col>
</el-row> </el-row>
</el-form> </el-form>
<div class="maintop"> <div class="maintop">
<div class="mainbtn"> <div class="mainbtn">
<el-button size="small" <el-button
@click="handleExport"
v-has-buttons="['OnlinePayDetailsExport']" v-has-buttons="['OnlinePayDetailsExport']"
class="thebtn2"> {{ '导出' }}</el-button> size="small"
class="thebtn2"
@click="handleExport"
> {{ '导出' }}</el-button>
</div> </div>
</div> </div>
<div class="maintable"> <div class="maintable">
<el-table :data="tableData" <el-table
:data="tableData"
height="640px" height="640px"
style="width: 100%" style="width: 100%"
:header-cell-style="{ background: '#EEEEEE' }" :header-cell-style="{ background: '#EEEEEE' }"
:row-class-name="tableRowClassName" :row-class-name="tableRowClassName"
@selection-change="handleSelectionChange"> @selection-change="handleSelectionChange"
<el-table-column type="selection" >
width="55"> </el-table-column> <el-table-column
<!-- <el-table-column align="center"--> type="selection"
<!-- prop="title"--> width="55"
<!-- :label="'国家'">--> />
<!-- <template slot-scope="scope">--> <!-- <el-table-column align="center"-->
<!-- <div class="tem">--> <!-- prop="title"-->
<!-- <img :src="scope.row.pkCountryIcon"--> <!-- :label="'国家'">-->
<!-- alt="" />--> <!-- <template slot-scope="scope">-->
<!-- &lt;!&ndash; <div>{{ scope.row.pkCountryName }}</div> &ndash;&gt;--> <!-- <div class="tem">-->
<!-- </div>--> <!-- <img :src="scope.row.pkCountryIcon"-->
<!-- </template>--> <!-- alt="" />-->
<!-- </el-table-column>--> <!-- &lt;!&ndash; <div>{{ scope.row.pkCountryName }}</div> &ndash;&gt;-->
<el-table-column align="center" <!-- </div>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column
align="center"
prop="memberCode" prop="memberCode"
:label="'会员编号'" :label="'会员编号'"
width="140"> width="140"
</el-table-column> />
<el-table-column align="center" <el-table-column
align="center"
prop="memberName" prop="memberName"
:label="'会员姓名'"> :label="'会员姓名'"
</el-table-column> />
<el-table-column align="center" <el-table-column
align="center"
prop="phone" prop="phone"
label="联系方式" label="联系方式"
width="140"> width="140"
</el-table-column> />
<el-table-column align="center" <el-table-column
align="center"
prop="businessTypeVal" prop="businessTypeVal"
:label="'交易类型'"> :label="'交易类型'"
</el-table-column> />
<el-table-column align="center" <el-table-column
align="center"
prop="businessMoney" prop="businessMoney"
:formatter="stateFormat" :formatter="stateFormat"
:label="'交易金额'+`(${isLocalSymbol()})`" :label="'交易金额'"
width="150"> width="150"
</el-table-column> />
<el-table-column align="center" <el-table-column
align="center"
prop="payMoney" prop="payMoney"
:formatter="stateFormat" :formatter="stateFormat"
label="实际支付金额(¥)" label="实际支付金额"
width="150"> width="150"
</el-table-column> />
<!-- <el-table-column align="center"
prop="payMoney"
:formatter="stateFormat"
:label="'交易金额'+`(${isLocals()})`" width="150">
</el-table-column>
<el-table-column align="center"
:formatter="stateFormat"
prop="settleTradeBalance"
label="实际支付金额($)" width="150">
</el-table-column>
<el-table-column align="center"
prop="exchangeRate"
:label="'汇率'">
</el-table-column> -->
<el-table-column align="center" <el-table-column
align="center"
prop="payChannelVal" prop="payChannelVal"
:label="'支付渠道'"> :label="'支付渠道'"
</el-table-column> />
<el-table-column align="center" <el-table-column
align="center"
prop="payTypeVal" prop="payTypeVal"
:label="'支付方式'"> :label="'支付方式'"
</el-table-column> />
<el-table-column align="center" <el-table-column
align="center"
prop="payStatusVal" prop="payStatusVal"
:label="'支付状态'"> :label="'支付状态'"
</el-table-column> />
<el-table-column align="center" <el-table-column
align="center"
prop="creationTime" prop="creationTime"
:label="'下单日期'" :label="'下单日期'"
width="180"> width="180"
</el-table-column> />
<el-table-column align="center" <el-table-column
align="center"
prop="payTime" prop="payTime"
:label="'支付日期'" :label="'支付日期'"
width="180"> width="180"
</el-table-column> />
<el-table-column align="center" <el-table-column
align="center"
prop="businessCode" prop="businessCode"
min-width="180px" min-width="180px"
:label="'单据编号'"> :label="'单据编号'"
</el-table-column> />
<el-table-column align="center" <el-table-column
align="center"
prop="mainAccountMoney"
label="主账户金额"
width="150"
/>
<el-table-column
align="center"
prop="subAccountMoney"
label="子账户金额"
width="150"
/>
<el-table-column
align="center"
prop="time" prop="time"
:label="'操作'" :label="'操作'"
fixed="right"> fixed="right"
>
<template slot-scope="scope"> <template slot-scope="scope">
<el-button @click="toFixed(scope.row.pkId)" <el-button
style="color: #ffad41" style="color: #ffad41"
type="text" type="text"
size="small"> size="small"
@click="toFixed(scope.row.pkId)"
>
{{ '导出' }} {{ '导出' }}
</el-button> </el-button>
</template> </template>
@ -235,11 +287,13 @@
</el-table> </el-table>
</div> </div>
</div> </div>
<pagination v-show="total>0" <pagination
v-show="total>0"
:total="total" :total="total"
:page.sync="queryParams.pageNum" :page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize" :limit.sync="queryParams.pageSize"
@pagination="getDataList" /> @pagination="getDataList"
/>
</div> </div>
</template> </template>
@ -251,16 +305,16 @@ import { userCountryList } from '@/api/user'
export default { export default {
name: 'Bzpz', name: 'Bzpz',
components: { components: {
topBar, topBar
}, },
filters: { filters: {
isAgree(val) { isAgree(val) {
if (!val) { if (!val) {
return '允许'; return '允许'
} else { } else {
return '禁止'; return '禁止'
}
} }
},
}, },
data() { data() {
return { return {
@ -269,7 +323,7 @@ export default {
// //
queryParams: { queryParams: {
pageNum: 1, pageNum: 1,
pageSize: 50, pageSize: 50
}, },
total: 0, total: 0,
dialogVisible: false, dialogVisible: false,
@ -280,26 +334,26 @@ export default {
peyTypeList: [ peyTypeList: [
{ {
value: '1', value: '1',
label: '支付宝', label: '支付宝'
}, },
{ {
value: '2', value: '2',
label: '微信', label: '微信'
}, },
{ {
value: '3', value: '3',
label: '银行卡', label: '银行卡'
}, }
], ],
tradeTypeList: [], tradeTypeList: [],
moren: 'onlinePayDetails', moren: 'onlinePayDetails',
topList: [ topList: [
{ {
name: '在线支付明细', name: '在线支付明细',
path: 'onlinePayDetails', path: 'onlinePayDetails'
}, }
], ],
countryList: [], countryList: []
} }
}, },
mounted() { mounted() {
@ -329,7 +383,7 @@ export default {
// this.select.startDate = val[0] // this.select.startDate = val[0]
// this.select.endDate = val[1] // this.select.endDate = val[1]
}, },
reset(){ reset() {
this.select = {} this.select = {}
this.getDataList() this.getDataList()
}, },
@ -359,10 +413,10 @@ export default {
handleSelectionChange(val) {}, handleSelectionChange(val) {},
/** 导出按钮操作 */ /** 导出按钮操作 */
handleExport() { handleExport() {
this.$confirm( '是否确认导出所有数据项?', '警告', { this.$confirm('是否确认导出所有数据项?', '警告', {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning', type: 'warning'
}).then((_) => { }).then((_) => {
this.download( this.download(
'/pay/manage/online-payment/export', '/pay/manage/online-payment/export',
@ -378,8 +432,8 @@ export default {
return 'success-row' return 'success-row'
} }
return '' return ''
}, }
}, }
} }
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">