From f96f3264f081f6414871cec39a6846eab6fe41e6 Mon Sep 17 00:00:00 2001
From: ryoeiken <754264374@qq.com>
Date: Wed, 9 Dec 2020 11:31:10 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=97=A5=E5=B8=B8=E6=94=B6?=
 =?UTF-8?q?=E8=B4=B9-=E6=94=B6=E8=B4=B9=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/FtSettleDaoController.java     |  3 ++
 .../system/fantang/domain/FtSettleDao.java    |  4 ++
 ruoyi-ui/src/views/fantang/settle/index.vue   | 40 ++++++++++---------
 3 files changed, 29 insertions(+), 18 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 58bc2b0d4..5cef32e7a 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
@@ -17,6 +17,7 @@ import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.Arrays;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -92,6 +93,8 @@ public class FtSettleDaoController extends BaseController {
     @Log(title = "结算报", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody FtSettleDao ftSettleDao) {
+        ftSettleDao.setSettleAt(new Date());
+        ftSettleDao.setReceipts(ftSettleDao.getNetPeceipt());
         return toAjax(iFtSettleDaoService.save(ftSettleDao) ? 1 : 0);
     }
 
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtSettleDao.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtSettleDao.java
index c0e2ada4c..4125b440f 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtSettleDao.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtSettleDao.java
@@ -1,5 +1,6 @@
 package com.ruoyi.system.fantang.domain;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -94,4 +95,7 @@ public class FtSettleDao implements Serializable {
      */
     @Excel(name = "退款总额")
     private BigDecimal refund;
+
+    @TableField(exist = false)
+    private BigDecimal netPeceipt;
 }
diff --git a/ruoyi-ui/src/views/fantang/settle/index.vue b/ruoyi-ui/src/views/fantang/settle/index.vue
index 1f43afc83..8c76e77b3 100644
--- a/ruoyi-ui/src/views/fantang/settle/index.vue
+++ b/ruoyi-ui/src/views/fantang/settle/index.vue
@@ -161,7 +161,7 @@
 
     <!--    日常收费弹出层对话框-->
     <el-dialog title="伙食费结算窗口" :visible.sync="flagAddNewSettlementOpen" width="1000px" append-to-body>
-      <el-form ref="form" :model="formAddNewSettlement" :rules="rules" label-width="160px">
+      <el-form ref="formAddNewSettlement" :model="formAddNewSettlement" :rules="rules" label-width="160px">
         <el-form-item label="住院号" prop="hospitalId">
           <el-input v-model="formAddNewSettlement.hospitalId" :disabled="true"/>
         </el-form-item>
@@ -229,29 +229,27 @@
     </el-dialog>
 
     <!--    出院结算弹出层对话框-->
-
-    <!-- 添加或修改结算报对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+      <el-form ref="leaveForm" :model="leaveForm" :rules="rules" label-width="80px">
         <el-form-item label="记录清单" prop="list">
-          <el-input v-model="form.list" placeholder="请输入记录清单"/>
+          <el-input v-model="leaveForm.list" placeholder="请输入记录清单"/>
         </el-form-item>
         <el-form-item label="结算总价" prop="price">
-          <el-input v-model="form.price" placeholder="请输入结算总价"/>
+          <el-input v-model="leaveForm.price" placeholder="请输入结算总价"/>
         </el-form-item>
         <el-form-item label="应收" prop="payable">
-          <el-input v-model="form.payable" placeholder="请输入应收"/>
+          <el-input v-model="leaveForm.payable" placeholder="请输入应收"/>
         </el-form-item>
         <el-form-item label="实收" prop="receipts">
-          <el-input v-model="form.receipts" placeholder="请输入实收"/>
+          <el-input v-model="leaveForm.receipts" placeholder="请输入实收"/>
         </el-form-item>
         <el-form-item label="结算类型" prop="type">
-          <el-select v-model="form.type" placeholder="请选择结算类型">
+          <el-select v-model="leaveForm.type" placeholder="请选择结算类型">
             <el-option label="请选择字典生成" value=""/>
           </el-select>
         </el-form-item>
         <el-form-item label="退款总额" prop="refund">
-          <el-input v-model="form.refund" placeholder="请输入退款总额"/>
+          <el-input v-model="leaveForm.refund" placeholder="请输入退款总额"/>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -381,6 +379,7 @@ export default {
       },
       // 表单参数
       form: {},
+      leaveForm: {},
       // 表单校验
       rules: {
         list: [
@@ -419,15 +418,15 @@ export default {
       var dateSpan, iDays;
       let sDate1 = Date.parse(this.formAddNewSettlement.lastBillingDate);
       let sDate2 = Date.parse(value);
-      console.log("sDate1---",sDate1,"sDate2---",sDate2)
+      console.log("sDate1---", sDate1, "sDate2---", sDate2)
       dateSpan = sDate2 - sDate1;
-      console.log("qqqqqqqqqqqqqqqqqqqqqqqqqqq",dateSpan);
+      console.log("qqqqqqqqqqqqqqqqqqqqqqqqqqq", dateSpan);
       if (dateSpan <= 0) {
         this.msgError("你现在的结算日期小于上一次结算日期！！");
       } else {
         dateSpan = Math.abs(dateSpan);
         iDays = Math.floor(dateSpan / (24 * 3600 * 1000));
-        console.log("ddddddddddddddddddddddddddddd",iDays);
+        console.log("ddddddddddddddddddddddddddddd", iDays);
         this.formAddNewSettlement.settlementDays = iDays;
       }
     },
@@ -448,7 +447,7 @@ export default {
           this.lastBillFlag = false;
           this.formAddNewSettlement.lastBillingDate = response.data.lastCreateDate;
           this.msgInfo("该病人首次收费")
-        }else {
+        } else {
           this.lastBillFlag = true;
           this.formAddNewSettlement.lastBillingDate = response.data.settlementAt;
         }
@@ -574,7 +573,7 @@ export default {
     },
     /** 提交按钮 */
     submitForm() {
-      this.$refs["form"].validate(valid => {
+      this.$refs["formAddNewSettlement"].validate(valid => {
         if (valid) {
           if (this.form.settleId != null) {
             updateSettle(this.form).then(response => {
@@ -583,10 +582,15 @@ export default {
               this.getList();
             });
           } else {
-            addSettle(this.form).then(response => {
+            console.log(this.formAddNewSettlement);
+            addSettle(this.formAddNewSettlement).then(response => {
               this.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
+              this.flagAddNewSettlementOpen = false;
+              listNoPay(this.queryParams).then(response => {
+                this.settleList = response.rows;
+                this.total = response.total;
+                this.loading = false;
+              });
             });
           }
         }