From b7579129632af7825ff8f73fa86818e6db7ac5a6 Mon Sep 17 00:00:00 2001
From: ryoeiken <754264374@qq.com>
Date: Fri, 22 Jan 2021 17:18:50 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=BC=80=E7=A5=A8=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fantang/controller/FtInvoiceDaoController.java |  4 +++-
 ruoyi-ui/src/views/fantang/settlement/index.vue    | 14 ++++++++++++--
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtInvoiceDaoController.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtInvoiceDaoController.java
index 6cce527bb..bbb41a13f 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtInvoiceDaoController.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtInvoiceDaoController.java
@@ -128,6 +128,8 @@ public class FtInvoiceDaoController extends BaseController {
         String taxId = params.getString("taxId");
         // 开票类型
         Integer invoiceType = params.getInteger("invoiceType");
+        // 开票金额
+        BigDecimal invoiceAmount = params.getBigDecimal("invoiceAmount");
 
         FtInvoiceDao invoiceDao = new FtInvoiceDao();
         Date today = new Date();
@@ -139,7 +141,7 @@ public class FtInvoiceDaoController extends BaseController {
         invoiceDao.setInvoiceName(invoiceName);
         invoiceDao.setTaxId(taxId);
         invoiceDao.setInvoiceType(invoiceType);
-        invoiceDao.setInvoiceAmount(receipts);
+        invoiceDao.setInvoiceAmount(invoiceAmount);
         iFtInvoiceDaoService.save(invoiceDao);
 
         FtSettlementDao settlementDao = new FtSettlementDao();
diff --git a/ruoyi-ui/src/views/fantang/settlement/index.vue b/ruoyi-ui/src/views/fantang/settlement/index.vue
index f90919578..c397c6ff1 100644
--- a/ruoyi-ui/src/views/fantang/settlement/index.vue
+++ b/ruoyi-ui/src/views/fantang/settlement/index.vue
@@ -105,8 +105,8 @@
         <el-form-item label="实收" prop="receipts">
           <el-input v-model="form.receipts" placeholder="请输入实收" :disabled="true"/>
         </el-form-item>
-        <el-form-item label="结算类型" prop="type">
-          <el-input v-model="form.type" placeholder="请输入结算类型" :disabled="true"/>
+        <el-form-item label="收款方式" prop="type">
+          <el-input v-model="form.type" placeholder="请输入收款方式" :disabled="true"/>
         </el-form-item>
         <el-form-item label="开票金额" prop="invoiceAmount">
           <el-input v-model="form.invoiceAmount" placeholder="请输入开票金额"/>
@@ -146,6 +146,16 @@
         <el-form-item label="实收" prop="receipts">
           <el-input v-model="form.receipts" placeholder="请输入实收" :disabled="true"/>
         </el-form-item>
+        <el-form-item label="收款方式" prop="type">
+          <el-select v-model="form.type" placeholder="请选择收款方式">
+            <el-option
+                v-for="item in typeOptions"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value">
+            </el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item label="开票金额" prop="invoiceAmount">
           <el-input v-model="form.invoiceAmount" placeholder="请输入开票金额"/>
         </el-form-item>