diff --git a/fuintAdmin_zt/src/api/system/Site/compant.js b/fuintAdmin_zt/src/api/system/Site/compant.js
new file mode 100644
index 000000000..df772836c
--- /dev/null
+++ b/fuintAdmin_zt/src/api/system/Site/compant.js
@@ -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
+ })
+}
diff --git a/fuintAdmin_zt/src/views/Site/components/afterff.vue b/fuintAdmin_zt/src/views/Site/components/afterff.vue
new file mode 100644
index 000000000..9408150b6
--- /dev/null
+++ b/fuintAdmin_zt/src/views/Site/components/afterff.vue
@@ -0,0 +1,116 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 新增
+
+
+ 修改
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 保存
+ 取消
+
+
+
+
+
+
+
diff --git a/fuintAdmin_zt/src/views/Site/components/before.vue b/fuintAdmin_zt/src/views/Site/components/before.vue
new file mode 100644
index 000000000..1ef9c1264
--- /dev/null
+++ b/fuintAdmin_zt/src/views/Site/components/before.vue
@@ -0,0 +1,184 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 新增
+
+
+ 修改
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 取消
+ 保存
+
+
+
+
+
+
+ {{ form.deductionRate }}%
+
+
+
+
+
+
+ {{ form.systemServiceFee }}万元
+
+
+
+ {{ form.serviceFeeLimit }}万元
+
+
+
+
+
+ 保存
+ 取消
+
+
+
+
+
+
+
+
diff --git a/fuintAdmin_zt/src/views/Site/components/yearff.vue b/fuintAdmin_zt/src/views/Site/components/yearff.vue
new file mode 100644
index 000000000..f3fb8d7ea
--- /dev/null
+++ b/fuintAdmin_zt/src/views/Site/components/yearff.vue
@@ -0,0 +1,127 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 新增
+
+
+ 修改
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 保存
+ 取消
+
+
+
+
+
+
+
+
diff --git a/fuintAdmin_zt/src/views/Site/index.vue b/fuintAdmin_zt/src/views/Site/index.vue
index 2a94ea2fe..3d13ed97d 100644
--- a/fuintAdmin_zt/src/views/Site/index.vue
+++ b/fuintAdmin_zt/src/views/Site/index.vue
@@ -307,158 +307,29 @@
- 无限制
- 时间限制
+ 年付费
预付费
后付费
- 年付费
+ 无限制
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 至
-
-
-
-
-
-
-
-
-
- 元
-
-
-
-
-
-
-
- %
-
-
-
-
-
-
-
- 万元
-
-
-
+
-
-
-
- %
-
-
-
-
-
-
-
- 万元
-
-
-
-
-
-
-
- 万元
-
-
-
+
-
-
-
-
-
- 至
-
-
-
-
-
-
-
-
-
- 万元
-
-
-
+
@@ -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){
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/deptPay/controller/DeptPriceInfoController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/deptPay/controller/DeptPriceInfoController.java
index cc3589b25..cb7219245 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/deptPay/controller/DeptPriceInfoController.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/deptPay/controller/DeptPriceInfoController.java
@@ -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 {
/**
* 服务对象
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/deptPay/controller/DeptServiceFeeInfoController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/deptPay/controller/DeptServiceFeeInfoController.java
index 6bbc8076e..9c8d1c397 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/deptPay/controller/DeptServiceFeeInfoController.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/deptPay/controller/DeptServiceFeeInfoController.java
@@ -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 {
/**
* 服务对象
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/deptPay/controller/DeptTransactionInfoController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/deptPay/controller/DeptTransactionInfoController.java
index 507a10948..e0f6b6d01 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/deptPay/controller/DeptTransactionInfoController.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/deptPay/controller/DeptTransactionInfoController.java
@@ -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 {
/**
* 服务对象