angelo
/
web-store-retail-admin
forked from angelo/web-retail-admin
3
0
Fork 0
Code Pull Requests Activity

Compare commits

base: angelo:400c1679fcaa3813b80b7bcef67c17b3905a614e
Branches Tags
angelo:master
angelo:base-online
angelo:test
angelo:dev
angelo:feat/withDrawal
angelo:test
angelo:dev
angelo:base-online
angelo:feat/bonusTotal
angelo:feat/goods-sort-config
angelo:feat/summaryDashboard
angelo:feat/goods/goodsAreaIncome
angelo:feat/goodsEdit-boxNum
angelo:feat/vertex-group
angelo:master
..
compare: angelo/web-store-retail-admin:aa69c0792fe2d6042af03c2a58a0531667f41bf4
Branches Tags
angelo/web-store-retail-admin:base-online
angelo/web-store-retail-admin:test
angelo/web-store-retail-admin:dev
angelo/web-store-retail-admin:feat/withDrawal
angelo/web-store-retail-admin:master
angelo:test
angelo:dev
angelo:base-online
angelo:feat/bonusTotal
angelo:feat/goods-sort-config
angelo:feat/summaryDashboard
angelo:feat/goods/goodsAreaIncome
angelo:feat/goodsEdit-boxNum
angelo:feat/vertex-group
angelo:master

1 Commits
400c1679fc ... aa69c0792f

Author SHA1 Message Date
woody aa69c0792f chore(env): app url 2025-07-16 09:12:42 +08:00
5 changed files with 177 additions and 363 deletions
Show Stats Expand all files Collapse all files

8
src/api/financialCase.js
View File

@ -271,11 +271,3 @@ export function getTreeType(params) {
}) })
} }
// 批量驳回
export function batchReject(data) {
return request({
url: '/member/manager/withdraw/reject',
method: 'post',
data
})
}

4
src/router/index.js
View File

@ -2096,7 +2096,7 @@ export const constantRoutes = [
{ {
path: 'memberRetailRegion', path: 'memberRetailRegion',
name: 'memberRetailRegion', name: 'memberRetailRegion',
meta: { title: i18n.t('会员区域配置') }, meta: { title: i18n.t('收益区域配置') },
component: ParentView, component: ParentView,
redirect: 'memberRetailRegion/index', redirect: 'memberRetailRegion/index',
children: [ children: [
@ -2104,7 +2104,7 @@ export const constantRoutes = [
path: 'memberRetailRegion', path: 'memberRetailRegion',
name: 'memberRetailRegion', name: 'memberRetailRegion',
component: () => import('@/views/configManage/memberRetailRegion/index'), component: () => import('@/views/configManage/memberRetailRegion/index'),
meta: { title: i18n.t('会员区域配置') } meta: { title: i18n.t('收益区域配置') }
} }
] ]

67
src/views/financial/cashDetails/index.vue
View File

@ -221,17 +221,7 @@
@click="handleExport" @click="handleExport"
> >
{{ '导出' }}</el-button> {{ '导出' }}</el-button>
<el-button
v-has-buttons="['CashDetailsReject']"
style="padding: 8px"
size="small"
class="thebtn2"
@click="batchRejectHandle"
>
驳回
</el-button>
</div> </div>
</div> </div>
<div style="overflow: auto"> <div style="overflow: auto">
@ -562,28 +552,6 @@
}}</el-button> }}</el-button>
</span> </span>
</el-dialog> </el-dialog>
<el-dialog
title="驳回原因"
:visible.sync="rejectDialogVisible"
width="30%"
:close-on-click-modal="false"
center
>
<el-form ref="rejectForm" :model="rejectForm" label-width="auto">
<el-form-item required label="驳回原因">
<el-input
v-model="rejectForm.rejectRemark"
:maxlength="80"
show-word-limit
type="textarea"
/>
</el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
<el-button @click="rejectDialogVisible = false">取消</el-button>
<el-button type="primary" @click="saveRejectForm">确认</el-button>
</span>
</el-dialog>
</div> </div>
</template> </template>
@ -784,11 +752,7 @@ export default {
key: '' key: ''
} }
], ],
showData: {}, showData: {}
rejectDialogVisible: false,
rejectForm: {
rejectRemark: ''
}
} }
}, },
computed: { computed: {
@ -808,35 +772,6 @@ export default {
methods: { methods: {
isLocals, isLocals,
isLocalSymbol, isLocalSymbol,
saveRejectForm() {
const data = {
idList: this.checkArr,
rejectRemark: this.rejectForm.rejectRemark
}
api.batchReject(data).then((res) => {
if (res.code == 200) {
this.$message({
message: res.msg,
type: 'success'
})
this.rejectDialogVisible = false
this.rejectForm.rejectRemark = ''
this.getDataList()
}
})
},
batchRejectHandle() {
const canReject = this.checkArrAll.every((item) => item.approveState == 1)
console.log(canReject)
if (!canReject) {
this.$message({
message: '存在已审核单据，请重新选择',
type: 'warning'
})
return false
}
this.rejectDialogVisible = true
},
getUserRole() { getUserRole() {
getRoleMenu('CashDetails').then((res) => { getRoleMenu('CashDetails').then((res) => {
const obj = {} const obj = {}

459
src/views/financial/onlinePayDetails/index.vue
View File

@ -6,242 +6,177 @@
--> -->
<template> <template>
<div class="page"> <div class="page">
<topBar <topBar v-if="topList.length > 0"
v-if="topList.length > 0" :topList="topList"
:top-list="topList" :moren="moren"></topBar>
:moren="moren"
/>
<div class="main"> <div class="main">
<el-form <el-form ref="select"
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 <el-input clearable
v-model="select.memberCode" v-model="select.memberCode"></el-input>
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 <el-input clearable
v-model="select.memberName" v-model="select.memberName"></el-input>
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 <el-input clearable
v-model="select.businessMoney" v-model="select.businessMoney"></el-input>
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 <el-select clearable
v-model="select.businessType" :placeholder="'请选择'"
clearable v-model="select.businessType">
:placeholder="'请选择'" <el-option v-for="item in tradeTypeList"
> :key="item.value"
<el-option :label="item.label"
v-for="item in tradeTypeList" :value="item.value"></el-option>
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="订单类型">
<el-select
v-model="select.orderType"
clearable
:placeholder="'请选择'"
>
<el-option
v-for="item in orderTypeList"
:key="item.value"
:label="item.label"
: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 <el-select clearable
v-model="select.payChannel" :placeholder="'请选择'"
clearable v-model="select.payChannel">
:placeholder="'请选择'" <el-option v-for="item in channelList"
> :key="item.value"
<el-option :label="item.label"
v-for="item in channelList" :value="item.value"></el-option>
:key="item.value"
:label="item.label"
: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 <el-select clearable
v-model="select.payType" :placeholder="'请选择'"
clearable v-model="select.payType">
:placeholder="'请选择'" <el-option v-for="item in peyTypeList"
> :key="item.value"
<el-option :label="item.label"
v-for="item in peyTypeList" :value="item.value"></el-option>
:key="item.value"
:label="item.label"
: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 <el-select clearable
v-model="select.payStatus" :placeholder="'请选择'"
clearable v-model="select.payStatus">
:placeholder="'请选择'" <el-option v-for="item in statusList"
> :key="item.value"
<el-option :label="item.label"
v-for="item in statusList" :value="item.value"></el-option>
:key="item.value"
:label="item.label"
: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 <el-input clearable
v-model="select.businessCode" v-model="select.businessCode"></el-input>
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 <el-date-picker v-model="select.creationTime"
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 <el-date-picker v-model="select.payTime"
v-model="select.payTime" @change="changeTime1"
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="'结束日期'">
@change="changeTime1" </el-date-picker>
/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-button <el-button class="my_search"
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 <el-button size="small"
v-has-buttons="['OnlinePayDetailsExport']" @click="handleExport"
size="small" v-has-buttons="['OnlinePayDetailsExport']"
class="thebtn2" class="thebtn2"> {{ '导出' }}</el-button>
@click="handleExport"
> {{ '导出' }}</el-button>
</div> </div>
</div> </div>
<div class="maintable"> <div class="maintable">
<el-table <el-table :data="tableData"
: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>--> prop="memberCode"
<!-- </template>--> :label="'会员编号'"
<!-- </el-table-column>--> width="140">
<el-table-column </el-table-column>
align="center" <el-table-column align="center"
prop="memberCode" prop="memberName"
:label="'会员编号'" :label="'会员姓名'">
width="140" </el-table-column>
/> <el-table-column align="center"
<el-table-column prop="phone"
align="center" label="联系方式"
prop="memberName" width="140">
:label="'会员姓名'" </el-table-column>
/> <el-table-column align="center"
<el-table-column prop="businessTypeVal"
align="center" :label="'交易类型'">
prop="phone" </el-table-column>
label="联系方式" <el-table-column align="center"
width="140" prop="businessMoney"
/> :formatter="stateFormat"
<el-table-column :label="'交易金额'+`(${isLocalSymbol()})`"
align="center" width="150">
prop="businessTypeVal" </el-table-column>
:label="'交易类型'" <el-table-column align="center"
/> prop="payMoney"
<el-table-column :formatter="stateFormat"
align="center" label="实际支付金额(¥)"
prop="orderTypeVal" width="150">
label="订单类型" </el-table-column>
/>
<el-table-column
align="center"
prop="businessMoney"
:formatter="stateFormat"
:label="'交易金额'+`(${isLocalSymbol()})`"
width="150"
/>
<el-table-column
align="center"
prop="payMoney"
:formatter="stateFormat"
label="实际支付金额(¥)"
width="150"
/>
<!-- <el-table-column align="center" <!-- <el-table-column align="center"
prop="payMoney" prop="payMoney"
:formatter="stateFormat" :formatter="stateFormat"
@ -257,64 +192,42 @@
:label="'汇率'"> :label="'汇率'">
</el-table-column> --> </el-table-column> -->
<el-table-column <el-table-column align="center"
align="center" prop="payChannelVal"
prop="payChannelVal" :label="'支付渠道'">
:label="'支付渠道'" </el-table-column>
/> <el-table-column align="center"
<el-table-column prop="payTypeVal"
align="center" :label="'支付方式'">
prop="payTypeVal" </el-table-column>
:label="'支付方式'" <el-table-column align="center"
/> prop="payStatusVal"
<el-table-column :label="'支付状态'">
align="center" </el-table-column>
prop="payStatusVal" <el-table-column align="center"
:label="'支付状态'" prop="creationTime"
/> :label="'下单日期'"
<el-table-column width="180">
align="center" </el-table-column>
prop="creationTime" <el-table-column align="center"
:label="'下单日期'" prop="payTime"
width="180" :label="'支付日期'"
/> width="180">
<el-table-column </el-table-column>
align="center" <el-table-column align="center"
prop="payTime" prop="businessCode"
:label="'支付日期'" min-width="180px"
width="180" :label="'单据编号'">
/> </el-table-column>
<el-table-column <el-table-column align="center"
align="center" prop="time"
prop="businessCode" :label="'操作'"
:label="'单据编号'" fixed="right">
width="200"
/>
<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"
:label="'操作'"
fixed="right"
>
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button @click="toFixed(scope.row.pkId)"
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>
@ -322,13 +235,11 @@
</el-table> </el-table>
</div> </div>
</div> </div>
<pagination <pagination v-show="total>0"
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>
@ -340,50 +251,26 @@ 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 {
creationTime: [], creationTime: [],
select: { select: {},
orderType: ''
},
// 查询参数 // 查询参数
queryParams: { queryParams: {
pageNum: 1, pageNum: 1,
pageSize: 50 pageSize: 50,
}, },
orderTypeList: [
{
value: '-1',
label: '充值订单'
},
{
value: '1',
label: '注册订单'
},
{
value: '2',
label: '升级订单'
},
{
value: '3',
label: '复购订单'
},
{
value: '10',
label: '重消订单'
}
],
total: 0, total: 0,
dialogVisible: false, dialogVisible: false,
tableData: [], tableData: [],
@ -393,26 +280,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() {
@ -442,7 +329,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()
}, },
@ -472,10 +359,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',
@ -491,8 +378,8 @@ export default {
return 'success-row' return 'success-row'
} }
return '' return ''
} },
} },
} }
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">

2
vue.config.js
View File

@ -44,7 +44,7 @@ module.exports = {
}, },
proxy: { proxy: {
'/prod-api': { '/prod-api': {
target: 'http://192.168.0.86:8080', target: 'http://192.168.0.104:8080',
changeOrigin: true, changeOrigin: true,
pathRewrite: { '^/prod-api': '' } pathRewrite: { '^/prod-api': '' }
} }