dianliang/oil-station
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

no message

Browse Source
This commit is contained in:
DESKTOP-369JRHT\12997 2024-07-23 00:33:53 +08:00
parent 002712b7c6
commit a4cb7a1dcc
8 changed files with 544 additions and 148 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

103
fuintAdmin_zt/src/api/system/Site/compant.js Normal file
View File

@ -0,0 +1,103 @@
import request from '@/utils/request'
// 年付费接口
export function getYearListApi(query) {
return request({
url: 'deptpay/deptPriceInfo/queryByPage',
method: 'get',
params: query
})
}
//
export function addYearApi(data) {
return request({
url: 'deptpay/deptPriceInfo',
method: 'post',
data: data
})
}
//
export function updateYearApi(data) {
return request({
url: 'deptpay/deptPriceInfo',
method: 'put',
data: data
})
}
export function delYearApi(data) {
return request({
url: 'deptpay/deptPriceInfo/delete/',
method: 'delete',
data: data
})
}
// 预付付费接口
export function getBeforeListApi(query) {
return request({
url: 'deptpay/deptTransactionInfo/queryByPage',
method: 'get',
params: query
})
}
//
export function addBeforeApi(data) {
return request({
url: 'deptpay/deptTransactionInfo',
method: 'post',
data: data
})
}
//
export function updateBeforeApi(data) {
return request({
url: 'deptpay/deptTransactionInfo',
method: 'put',
data: data
})
}
export function delBeforeApi(data) {
return request({
url: 'deptpay/deptTransactionInfo',
method: 'delete',
data: data
})
}
// 后付付费接口
export function getAfterListApi(query) {
return request({
url: 'deptpay/deptServiceFeeInfo/queryByPage',
method: 'get',
params: query
})
}
//
export function addAfterApi(data) {
return request({
url: 'deptpay/deptServiceFeeInfo',
method: 'post',
data: data
})
}
//
export function updateAfterApi(data) {
return request({
url: 'deptpay/deptServiceFeeInfo',
method: 'put',
data: data
})
}
export function delAfterApi(data) {
return request({
url: 'deptpay/deptServiceFeeInfo',
method: 'delete',
data: data
})
}

116
fuintAdmin_zt/src/views/Site/components/afterff.vue Normal file
View File

@ -0,0 +1,116 @@
<script>
export default {
name: "afterff",
data() {
return {
tableData: [{
price:2000,
yprice:2500,
date: '2016-05-02',
name: '王小虎',
address: '上海市普陀区金沙江路 1518 弄',
status:'进行中',
upadate: '2016-05-02',
}, ],
}
},
methods: {
onSubmit() {
console.log('表单提交', this.form);
// 在这里添加提交表单的逻辑
},
onCancel() {
console.log('取消操作');
// 在这里添加取消操作的逻辑
},
}
}
</script>
<template>
<div>
<el-table
:data="tableData"
border
style="width: 100%;margin-left: 55px ">
<el-table-column
prop="price"
align="center"
label="预付金额（元）">
</el-table-column>
<el-table-column
prop="yprice"
align="center"
label="扣点费率（‱）">
</el-table-column>
<el-table-column
prop="address"
align="center"
label="预估交易流量（万）">
</el-table-column>
<el-table-column
prop="status"
align="center"
label="剩余交易流量（万）">
</el-table-column>
<el-table-column
prop="upadate"
align="center"
label="状态">
</el-table-column>
<el-table-column
prop="name"
align="center"
label="创建时间">
</el-table-column>
<el-table-column
prop="name"
align="center"
label="创建人">
</el-table-column>
<el-table-column
align="center">
<template slot="header" slot-scope="scope">
<el-button
size="mini"
@click="handleUpdate1(scope.row)"
>新增</el-button>
</template>
<template slot-scope="scope">
<el-button
size="mini"
@click="handleEdit(scope.$index, scope.row)">修改</el-button>
</template>
</el-table-column>
</el-table>
<el-dialog
title="新增"
:visible.sync="dialogVisible"
width="30%">
<el-form :model="form" label-width="150px">
<el-form-item label="预付金额">
<el-input v-model="form.prepaidAmount" placeholder="请输入预付金额"></el-input>
</el-form-item>
<el-form-item label="扣点费率">
<el-input v-model="form.deductionRate" placeholder="请输入扣点费率" suffix-icon="el-icon-percent"></el-input>
</el-form-item>
<el-form-item label="预估交易流量">
<el-input v-model="form.estimatedTraffic" placeholder="请输入预估交易流量" suffix-icon="el-icon-percent"></el-input>
</el-form-item>
<el-form-item label="剩余交易流量">
<el-input v-model="form.remainingTraffic" placeholder="请输入剩余交易流量" suffix-icon="el-icon-percent" readonly></el-input>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="onSubmit">保存</el-button>
<el-button @click="onCancel">取消</el-button>
</el-form-item>
</el-form>
</el-dialog>
</div>
</template>
<style scoped lang="scss">
</style>

184
fuintAdmin_zt/src/views/Site/components/before.vue Normal file
View File

@ -0,0 +1,184 @@
<script>
export default {
name: "beforeff",
data() {
return {
tableData: [{
price:2000,
yprice:2500,
date: '2016-05-02',
name: '王小虎',
address: '上海市普陀区金沙江路 1518 弄',
status:'进行中',
upadate: '2016-05-02',
}, ],
form: {
deductionRate: '',
transactionFlow: '',
systemFee: '',
systemFeeLimit: ''
},
form2: {
form: {
deductionRate: 1, // 扣点费率
transactionVolume: '', // 已发生交易流量
systemServiceFee: 0, // 系统服务费统计（这里假设为0，实际可能需要计算）
serviceFeeLimit: 5000, // 系统服务费限制
receiptAmount: '', // 收款金额
},
}
}
},
methods: {
cancel() {
// 取消操作逻辑
console.log('取消操作');
},
save() {
// 保存操作逻辑
console.log('保存操作', this.form);
}
}
}
</script>
<template>
<div>
<el-table
:data="tableData"
border
style="width: 100%;margin-left: 55px ">
<el-table-column
prop="price"
align="center"
label="扣点税率（元）">
</el-table-column>
<el-table-column
prop="yprice"
align="center"
label="易发生交易流量（元）">
</el-table-column>
<el-table-column
prop="address"
align="center"
label="系统服务费统计">
</el-table-column>
<el-table-column
prop="status"
align="center"
label="系统服务费限制（元）">
</el-table-column>
<el-table-column
prop="upadate"
align="center"
label="收款金额">
</el-table-column>
<el-table-column
prop="name"
align="center"
label="状态">
</el-table-column>
<el-table-column
prop="name"
align="center"
label="创建时间">
</el-table-column>
<el-table-column
prop="name"
align="center"
label="创建人">
</el-table-column>
<el-table-column
align="center">
<template slot="header" slot-scope="scope">
<el-button
size="mini"
@click="handleUpdate1(scope.row)"
>新增</el-button>
</template>
<template slot-scope="scope">
<el-button
size="mini"
@click="handleEdit(scope.$index, scope.row)">修改</el-button>
</template>
</el-table-column>
</el-table>
<el-dialog
title="新增"
:visible.sync="dialogVisible"
width="30%">
<!-- 表头插入按钮 -->
<el-form :model="form" label-width="120px">
<el-form-item label="扣点费率">
<el-input v-model="form.deductionRate" placeholder="请输入扣点费率" suffix="%"></el-input>
</el-form-item>
<el-form-item label="已发生交易流量">
<el-input v-model="form.transactionFlow" placeholder="请输入已发生交易流量" suffix="万元"></el-input>
</el-form-item>
<el-form-item label="系统服务费">
<el-input v-model="form.systemFee" placeholder="请输入系统服务费" suffix="万元"></el-input>
</el-form-item>
<el-form-item label="系统服务费限制">
<el-input v-model="form.systemFeeLimit" placeholder="请输入系统服务费限制" suffix="万元"></el-input>
</el-form-item>
</el-form>
<div class="button-group">
<el-button type="danger" @click="cancel">取消</el-button>
<el-button type="primary" @click="save">保存</el-button>
</div>
</el-dialog
>
<el-dialog
title="新增"
:visible.sync="dialogVisible2"
width="30%">
<el-form :model="form" label-width="120px">
<el-form-item label="扣点费率">
<!-- 假设扣点费率是固定的，这里仅显示 -->
<span>{{ form.deductionRate }}%</span>
</el-form-item>
<el-form-item label="已发生交易流量">
<el-input v-model="form.transactionVolume" placeholder="请输入交易流量"></el-input>
</el-form-item>
<el-form-item label="系统服务费统计">
<!-- 假设这是计算得出的，这里仅显示 -->
<span>{{ form.systemServiceFee }}万元</span>
</el-form-item>
<el-form-item label="系统服务费限制">
<!-- 假设这是固定的，这里仅显示 -->
<span>{{ form.serviceFeeLimit }}万元</span>
</el-form-item>
<el-form-item label="收款金额">
<el-input v-model="form.receiptAmount" placeholder="请输入收款金额"></el-input>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="submitForm('form')">保存</el-button>
<el-button @click="resetForm('form')">取消</el-button>
</el-form-item>
</el-form>
</el-dialog>
</div>
</template>
<style scoped lang="scss">
.fee-form {
display: flex;
flex-direction: column;
align-items: center;
justify-content: space-between;
height: 100%;
padding: 20px;
}
.button-group {
margin-top: 20px;
}
.el-button {
margin-right: 10px;
}
</style>

127
fuintAdmin_zt/src/views/Site/components/yearff.vue Normal file
View File

@ -0,0 +1,127 @@
<script>
export default {
name: "yearff",
data() {
return {
dialogVisible:false,
tableData: [{
price:2000,
yprice:2500,
date: '2016-05-02',
name: '王小虎',
address: '上海市普陀区金沙江路 1518 弄',
status:'进行中',
upadate: '2016-05-02',
}, ],
form: {
price: '',
paymentAmount: '',
validDate: [],
},
}
},
methods: {
onSubmit() {
console.log('表单提交', this.form);
// 这里可以添加提交表单的逻辑
},
onCancel() {
console.log('取消操作');
// 这里可以添加取消操作的逻辑
},
handleEdit(data) {
this.dialogVisible=false
},
}
}
</script>
<template>
<div>
<el-table
:data="tableData"
border
style="width: 80%;margin-left: 55px ">
<el-table-column
prop="price"
align="center"
label="价格（元）">
</el-table-column>
<el-table-column
prop="yprice"
align="center"
label="付款金额（元）">
</el-table-column>
<el-table-column
prop="address"
align="center"
label="系统生效时间">
</el-table-column>
<el-table-column
prop="status"
align="center"
label="状态">
</el-table-column>
<el-table-column
prop="upadate"
align="center"
label="创建时间">
</el-table-column>
<el-table-column
prop="name"
align="center"
label="创建人">
</el-table-column>
<el-table-column
align="center">
<template slot="header" slot-scope="scope">
<el-button
size="mini"
@click="dialogVisible=true"
>新增</el-button>
</template>
<template slot-scope="scope">
<el-button
size="mini"
@click="handleEdit(scope.row)">修改</el-button>
</template>
</el-table-column>
</el-table>
<el-dialog
title="新增"
:visible.sync="dialogVisible"
width="30%">
<el-form :model="form" label-width="120px">
<el-form-item label="价格">
<el-input v-model="form.price" placeholder="请输入价格"></el-input>
</el-form-item>
<el-form-item label="付款金额">
<el-input v-model="form.paymentAmount" placeholder="请输入付款金额"></el-input>
</el-form-item>
<el-form-item label="系统有效日期">
<el-date-picker
v-model="form.validDate"
type="daterange"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期">
</el-date-picker>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="onSubmit">保存</el-button>
<el-button @click="onCancel">取消</el-button>
</el-form-item>
</el-form>
</el-dialog>
</div>
</template>
<style scoped lang="scss">
</style>

156
fuintAdmin_zt/src/views/Site/index.vue
View File

@ -307,158 +307,29 @@
</span>
<span v-else>
<el-radio-group :disabled="isTopDept" v-model="ruleForm.turnoverType" @input="changeTheBillingRule">
<el-radio label=1>无限制</el-radio>
<el-radio label=2>时间限制</el-radio>
<el-radio label=5>年付费</el-radio>
<el-radio label=3>预付费</el-radio>
<el-radio label=4>后付费</el-radio>
<el-radio label=5>年付费</el-radio>
<el-radio label=1>无限制</el-radio>
</el-radio-group>
</span>
</el-form-item>
<div>
</div>
<el-table
:data="tableData"
border
style="width: 100%;margin-left: 55px ">
<el-table-column
prop="price"
label="价格（元）">
</el-table-column>
<el-table-column
prop="yprice"
label="已付金额（元）">
</el-table-column>
<el-table-column
prop="address"
label="系统生效时间">
</el-table-column>
<el-table-column
prop="status"
label="状态">
</el-table-column>
<el-table-column
prop="upadate"
label="创建时间">
</el-table-column>
<el-table-column
prop="name"
label="创建人">
</el-table-column>
</el-table>
</el-col>
</el-row>
<el-row>
<template v-if="ruleForm.turnoverType === '2'">
<el-col :span="12">
<el-row>
<el-form-item label="时间限制" prop="turnoverType" >
<el-date-picker
v-model="beginTime"
:disabled="isTopDept"
style="width: 140px"
type="date"
value-format="yyyy-MM-dd"
placeholder="开始日期">
</el-date-picker>
至
<el-date-picker
v-model="endTime"
:disabled="isTopDept"
style="width: 140px"
type="date"
value-format="yyyy-MM-dd"
placeholder="结束日期">
</el-date-picker>
</el-form-item>
</el-row>
</el-col>
</template>
<template v-if="ruleForm.turnoverType === '3'">
<el-col :span="8">
<el-form-item label="预付金额">
<el-input type="number" :disabled="isTopDept" v-model="ruleForm.prepaidAmount" @input="rateCalculation()">
<template slot="append">元</template>
</el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="费率">
<el-input :disabled="isTopDept" v-model="ruleForm.rates" @input="rateCalculation()">
<template slot="append">%</template>
</el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="可跑流量">
<el-input v-model="ruleForm.turnoverLimit" :disabled="true">
<template slot="append">万元</template>
</el-input>
</el-form-item>
</el-col>
<beforeff></beforeff>
</template>
<template v-if="ruleForm.turnoverType === '4'">
<el-col :span="6">
<el-form-item label="费率">
<el-input :disabled="isTopDept" v-model="ruleForm.rates" @input="rateCalculation()">
<template slot="append">%</template>
</el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="实际交易量">
<el-input v-model="ruleForm.turnoverLimit" :disabled="true">
<template slot="append">万元</template>
</el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="系统服务费">
<el-input v-model="ruleForm.prepaidAmount" :disabled="true">
<template slot="append">万元</template>
</el-input>
</el-form-item>
</el-col>
<afterff></afterff>
</template>
<template v-if="ruleForm.turnoverType === '5'">
<el-col :span="10">
<el-row>
<el-form-item label="时间范围">
<el-date-picker
:disabled="isTopDept"
v-model="beginTime"
style="width: 140px"
type="date"
value-format="yyyy-MM-dd"
placeholder="开始日期">
</el-date-picker>
至
<el-date-picker
:disabled="isTopDept"
v-model="endTime"
style="width: 140px"
type="date"
value-format="yyyy-MM-dd"
placeholder="结束日期">
</el-date-picker>
</el-form-item>
</el-row>
</el-col>
<el-col :span="8">
<el-form-item label="价格">
<el-input :disabled="isTopDept" v-model="ruleForm.prepaidAmount">
<template slot="append">万元</template>
</el-input>
</el-form-item>
</el-col>
<yearff></yearff>
</template>
<template v-if="ruleForm.turnoverType === '6'">
<el-col :span="10">
@ -943,6 +814,9 @@ import BigNumber from 'bignumber.js';
import {dutyDelete, dutyEdit, dutyList, dutyLists} from "@/api/duty/duty";
import {addRole, delRole, getRole, updateRole} from "@/api/system/role";
import {getButtonPermi, treeselect as menuTreeselect} from "@/api/system/menu";
import Yearff from "@/views/Site/components/yearff.vue";
import Beforeff from "@/views/Site/components/before.vue";
import Afterff from "@/views/Site/components/afterff.vue";
@ -971,15 +845,7 @@ export default {
isTopDept:true,
parentDeptType:"",
isAdd:false,
tableData: [{
price:2000,
yprice:2500,
date: '2016-05-02',
name: '王小虎',
address: '上海市普陀区金沙江路 1518 弄',
status:'进行中',
upadate: '2016-05-02',
}, ],
timeFrame:[],
value10:true,
@ -1256,7 +1122,7 @@ export default {
}
},
components: { Treeselect },
components: {Afterff, Beforeff, Yearff, Treeselect },
methods: {
// 获取权限信息
getPermi(path){

2
fuintBackend/fuint-application/src/main/java/com/fuint/business/deptPay/controller/DeptPriceInfoController.java
View File

@ -19,7 +19,7 @@ import javax.annotation.Resource;
* @since 2024-07-22 17:42:01
*/
@RestController
@RequestMapping("deptPriceInfo")
@RequestMapping("deptpay/deptPriceInfo")
public class DeptPriceInfoController extends BaseController {
/**
* 服务对象

2
fuintBackend/fuint-application/src/main/java/com/fuint/business/deptPay/controller/DeptServiceFeeInfoController.java
View File

@ -19,7 +19,7 @@ import javax.annotation.Resource;
* @since 2024-07-22 17:42:41
*/
@RestController
@RequestMapping("deptServiceFeeInfo")
@RequestMapping("deptpay/deptServiceFeeInfo")
public class DeptServiceFeeInfoController extends BaseController {
/**
* 服务对象

2
fuintBackend/fuint-application/src/main/java/com/fuint/business/deptPay/controller/DeptTransactionInfoController.java
View File

@ -19,7 +19,7 @@ import javax.annotation.Resource;
* @since 2024-07-22 17:43:00
*/
@RestController
@RequestMapping("deptTransactionInfo")
@RequestMapping("deptpay/deptTransactionInfo")
public class DeptTransactionInfoController extends BaseController {
/**
* 服务对象