From 0434262959b99f29148c9582b04a55c1a7ee7988 Mon Sep 17 00:00:00 2001
From: ryoeiken <754264374@qq.com>
Date: Fri, 22 Jan 2021 17:02:02 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E9=A2=84=E5=BC=80=E7=A5=A8?=
=?UTF-8?q?=E7=AE=A1=E7=90=86=EF=BC=8C=E5=AE=8C=E5=96=84=E5=BC=80=E7=A5=A8?=
=?UTF-8?q?=E7=AE=A1=E7=90=86=E5=89=8D=E7=AB=AF=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../controller/FtSettleDaoController.java | 6 +
.../src/views/fantang/preSettle/index.vue | 343 +++++++++++++-----
ruoyi-ui/src/views/fantang/settle/index.vue | 2 +-
.../src/views/fantang/settlement/index.vue | 121 +++++-
4 files changed, 366 insertions(+), 106 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtSettleDaoController.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtSettleDaoController.java
index 2be16f083..e36aa32e2 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtSettleDaoController.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtSettleDaoController.java
@@ -162,6 +162,12 @@ public class FtSettleDaoController extends BaseController {
case 3:
ftSettleDao.setType("在线支付");
break;
+ case 4 :
+ ftSettleDao.setType("银行汇款");
+ break;
+ case 5:
+ ftSettleDao.setType("挂账");
+ break;
default:
}
diff --git a/ruoyi-ui/src/views/fantang/preSettle/index.vue b/ruoyi-ui/src/views/fantang/preSettle/index.vue
index b4c7c761c..81c607ab1 100644
--- a/ruoyi-ui/src/views/fantang/preSettle/index.vue
+++ b/ruoyi-ui/src/views/fantang/preSettle/index.vue
@@ -3,11 +3,11 @@