From 8d6c43e4577b0ddb2a5cadf0707e4ed9b7afcf20 Mon Sep 17 00:00:00 2001 From: ryoeiken <754264374@qq.com> Date: Wed, 10 Feb 2021 10:25:49 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E4=BB=98=E8=B4=B9=E5=87=BA=E9=99=A2?= =?UTF-8?q?=E7=BB=93=E6=B8=85=EF=BC=8C=E6=94=B6=E8=B4=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/FtPrepaymentDaoController.java | 33 +++-- .../fantang/domain/FtPrepaymentDao.java | 2 +- ruoyi-ui/src/api/fantang/prepayment.js | 7 ++ .../src/views/fantang/prepayment/index.vue | 115 ++++++++---------- 4 files changed, 82 insertions(+), 75 deletions(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtPrepaymentDaoController.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtPrepaymentDaoController.java index 62ce8c784..5ec8ba0d9 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtPrepaymentDaoController.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtPrepaymentDaoController.java @@ -3,7 +3,6 @@ package com.ruoyi.system.fantang.controller; import cn.hutool.core.date.DateUtil; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.config.RuoYiConfig; @@ -22,6 +21,7 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; +import java.math.BigDecimal; import java.util.Arrays; import java.util.Date; import java.util.List; @@ -64,10 +64,6 @@ public class FtPrepaymentDaoController extends BaseController { */ @GetMapping("/getPrepaymentByPatientId/{patientId}") public AjaxResult getPrepaymentByPatientId(@PathVariable("patientId") Long patientId) { -// FtPrepaymentVo dao = iFtPrepaymentDaoService.getCountById(patientId); -// if (dao == null) -// return AjaxResult.error("无该记录"); -// return AjaxResult.success("操作成功", dao); FtPrepaymentDao ftPrepaymentDao = iFtPrepaymentDaoService.getByPatientId(patientId); if (ftPrepaymentDao == null) { return AjaxResult.error("无该记录"); @@ -164,14 +160,9 @@ public class FtPrepaymentDaoController extends BaseController { @PreAuthorize("@ss.hasPermi('fantang:prepayment:add')") @Log(title = "收费管理", businessType = BusinessType.INSERT) @PostMapping - public AjaxResult add(@RequestBody FtPrepaymentVo ftPrepaymentDao) { - - Long patientId = ftPrepaymentDao.getPatientId(); - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq("patient_id", patientId); - + public AjaxResult add(@RequestBody FtPrepaymentDao ftPrepaymentDao) { ftPrepaymentDao.setCollectAt(new Date()); - ftPrepaymentDao.setSettlementFlag(0L); + return toAjax(iFtPrepaymentDaoService.save(ftPrepaymentDao) ? 1 : 0); } @@ -195,6 +186,9 @@ public class FtPrepaymentDaoController extends BaseController { return toAjax(iFtPrepaymentDaoService.removeByIds(Arrays.asList(prepaymentIds)) ? 1 : 0); } + /** + * 生成 pdf 收据 + */ @PostMapping("/generateReceiptPdf") public AjaxResult generateReceiptPdf(@RequestBody JSONObject params) { @@ -213,6 +207,21 @@ public class FtPrepaymentDaoController extends BaseController { String downloadPath = "profile/upload/饭堂票据" + patientId + ".pdf"; return AjaxResult.success(fileWebUrl + downloadPath); + } + /** + * 出院结清 + */ + @PutMapping("/leaveSettlePrepayment/{prepaymentId}") + public AjaxResult leaveSettlePrepayment(@PathVariable Long prepaymentId){ + + FtPrepaymentDao prepaymentDao = new FtPrepaymentDao(); + prepaymentDao.setPrepaymentId(prepaymentId); + prepaymentDao.setPrepaid(new BigDecimal(0)); + prepaymentDao.setSettlementFlag(1); + prepaymentDao.setSettlementAt(new Date()); + + iFtPrepaymentDaoService.updateById(prepaymentDao); + return AjaxResult.success("已结清"); } } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtPrepaymentDao.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtPrepaymentDao.java index 609d9ae87..f269a6c0a 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtPrepaymentDao.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtPrepaymentDao.java @@ -74,7 +74,7 @@ public class FtPrepaymentDao implements Serializable { * 结算标志 */ @Excel(name = "结算标志") - private Long settlementFlag; + private Integer settlementFlag; /** * 预付费金额 diff --git a/ruoyi-ui/src/api/fantang/prepayment.js b/ruoyi-ui/src/api/fantang/prepayment.js index e135d4d3c..855c93f8b 100644 --- a/ruoyi-ui/src/api/fantang/prepayment.js +++ b/ruoyi-ui/src/api/fantang/prepayment.js @@ -109,3 +109,10 @@ export function generateReceiptPdf(data) { data: data }) } + +export function leaveSettlePrepayment(prepaymentId) { + return request({ + url: '/fantang/prepayment/leaveSettlePrepayment/' + prepaymentId, + method: 'put' + }) +} diff --git a/ruoyi-ui/src/views/fantang/prepayment/index.vue b/ruoyi-ui/src/views/fantang/prepayment/index.vue index 52657bbba..025d6b50f 100644 --- a/ruoyi-ui/src/views/fantang/prepayment/index.vue +++ b/ruoyi-ui/src/views/fantang/prepayment/index.vue @@ -19,7 +19,7 @@ @keyup.enter.native="handleQuery" /> - + - + - + + style="width: 250px" + :disabled="payFlag"/>
- 收 费 + 结 清 关 闭 打印收据
@@ -158,6 +159,7 @@ + style="width: 250px" + :disabled="!this.payFlag"/>
- 收 费 + 收 费 关 闭 - 打印收据
@@ -216,16 +218,18 @@ import { exportPrepayment, generateReceiptPdf, getPrepayment, + leaveSettlePrepayment, listNoPrepayment, listPrepay } from "../../../api/fantang/prepayment"; -import {getUserProfile} from "../../../api/system/user"; export default { name: "Prepayment", components: {}, data() { return { + // 缴费标志 + payFlag: true, openChargeDialogTitle: null, openChargeDialogFlag: false, // 权限相关的参数 @@ -238,7 +242,7 @@ export default { label: '已缴费' }, { value: 1, - label: '未交费' + label: '未缴费' }], suggestionList: [], NoPrepayments: [], @@ -279,7 +283,10 @@ export default { name: null, prepaid: null, collectAt: null, - row: null + row: null, + userName: null, + patientId: null, + settlementFlag: null, }, // 表单校验 rules: { @@ -296,7 +303,6 @@ export default { created() { this.getList(); this.buildSuggestionList(); - this.myGetUser(); }, mounted() { }, @@ -310,8 +316,7 @@ export default { // 相应处理出院结清功能 clickSettle(row) { this.open = true; - getPrepayment(row.prepaymentId).then(response =>{ - console.log(response); + getPrepayment(row.prepaymentId).then(response => { this.formAddPrepayment.hospitalId = row.hospitalId; this.formAddPrepayment.name = row.name; this.formAddPrepayment.collectAt = response.data.prepayment = response.data.collectAt; @@ -324,9 +329,7 @@ export default { if (this.queryParams.settlementFlag === 0) { // 查询已交预付费信息 listPrepay(this.queryParams).then(response => { - console.log(response); this.prepaymentList = response.rows.map((item) => { - console.log(item); item.noPrepayment = true; return item; }); @@ -344,27 +347,16 @@ export default { generateReceiptPdf(row).then(response => { window.open(response.msg) }) - console.log(process.env); - }, - // 获取用户相关信息 - myGetUser() { - getUserProfile().then(response => { - this.user = response.data; - this.roleGroup = response.roleGroup; - this.postGroup = response.postGroup; - }); }, // 处理筛选结算标志 selectSettlementFlag(value) { + this.payFlag = value !== 1; this.getList(); }, // 响应自动查询回显 querySearch(queryString, cb) { var restaurants = this.suggestionList; - console.log("restaurants-->", restaurants); - console.log("queryString", queryString) - console.log("cb-->", cb) var results = queryString ? restaurants.filter(this.createFilter(queryString)) : restaurants; // 调用 callback 返回建议列表的数据 cb(results); @@ -379,7 +371,6 @@ export default { buildSuggestionList() { listNoPrepayment(this.queryParams).then(response => { - console.log("aaaaaaaaaaaaa", response); let prepaymentList = response.rows; this.suggestionList = prepaymentList.map(item => { return { @@ -398,7 +389,6 @@ export default { this.loading = true; listNoPrepayment(this.queryParams).then(response => { this.prepaymentList = response.rows.map(item => { - console.log(item); item.noPrepayment = false; return item; }); @@ -428,12 +418,12 @@ export default { // 处理点击查询图标的事件 handleIconClick(ev) { - console.log(ev); }, // 取消按钮 cancel() { this.open = false; + this.openChargeDialogFlag = false; this.reset(); }, // 表单重置 @@ -482,7 +472,6 @@ export default { this.reset(); const prepaymentId = row.prepaymentId || this.ids - console.log('row:',row); this.formAddPrepayment.hospitalId = row.hospitalId; this.formAddPrepayment.name = row.name; this.formAddPrepayment.collectAt = new Date(); @@ -490,36 +479,38 @@ export default { this.formAddPrepayment.row = row; this.openChargeDialogFlag = true; }, - submitformChangePrepayment() { + submitFormChangePrepayment() { + this.formAddPrepayment.collectBy = this.$store.state.user.name; + this.formAddPrepayment.patientId = this.formAddPrepayment.row.patientId; + this.formAddPrepayment.settlementFlag = 0; + this.formAddPrepayment.collectAt = null; + this.formAddPrepayment.prepaidAt = null; + console.log("bbbbbbbbbb", this.formAddPrepayment); + addPrepayment(this.formAddPrepayment).then(response => { + this.msgSuccess("已收费") + this.openChargeDialogFlag = false; + this.reset(); + this.getList(); + }) }, /** 提交按钮 */ - submitformAddPrepayment() { - - // 1、检查该用户是否找推荐列表中，如果不在，认为该用户是已经缴费的用户 - let hospitalId = this.formAddPrepayment.hospitalId; - this.formAddPrepayment.collectBy = this.user.userName; - this.$refs["formAddPrepayment"].validate(valid => { - if (valid) { - if (!this.suggestionList.find(x => { - return x.value === hospitalId; - })) { - this.msgError("未找到该住院号记录，请先添加！"); - return; - } - - this.formAddPrepayment.prepaidAt = null; - console.log("form -->", this.formAddPrepayment) - addPrepayment(this.formAddPrepayment).then(response => { - this.msgSuccess("新增成功"); - this.open = false; - this.getList(); - this.buildSuggestionList(); - }); - } - }); + submitFormAddPrepayment() { + this.formAddPrepayment.userName = this.$store.state.user.name + console.log(this.formAddPrepayment); }, + + submitLeaveSettle() { + console.log(this.formAddPrepayment.row); + leaveSettlePrepayment(this.formAddPrepayment.row.prepaymentId).then(response => { + this.msgSuccess("已结清") + this.open = false; + this.reset(); + this.getList(); + }) + }, + /** 删除按钮操作 */ handleDelete(row) { const prepaymentIds = row.prepaymentId || this.ids;