abu/wzj-boot
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

收费详情

Browse Source
This commit is contained in:
ryoeiken 2021-01-22 00:36:16 +08:00
parent fd6a2425c5
commit 1c4c13a83a
1 changed files with 89 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

156
ruoyi-ui/src/views/fantang/settle/index.vue
View File

@ -3,11 +3,11 @@
<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px"> <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="住院号" prop="hospitalId"> <el-form-item label="住院号" prop="hospitalId">
<el-input <el-input
v-model="queryParams.hospitalId" v-model="queryParams.hospitalId"
placeholder="请输入住院号" placeholder="请输入住院号"
clearable clearable
size="small" size="small"
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
@ -17,21 +17,21 @@
size="small" size="small"
@keyup.enter.native="handleQuery"> @keyup.enter.native="handleQuery">
<el-option <el-option
v-for="item in departOptions" v-for="item in departOptions"
:key="item.departName" :key="item.departName"
:label="item.departName" :label="item.departName"
:value="item.departId"> :value="item.departId">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="姓名" prop="name"> <el-form-item label="姓名" prop="name">
<el-input <el-input
v-model="queryParams.name" v-model="queryParams.name"
placeholder="请输入姓名" placeholder="请输入姓名"
clearable clearable
size="small" size="small"
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<!-- <el-form-item label="结算标志" prop="settlementFlag">--> <!-- <el-form-item label="结算标志" prop="settlementFlag">-->
@ -56,11 +56,11 @@
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
type="warning" type="warning"
icon="el-icon-download" icon="el-icon-download"
size="mini" size="mini"
@click="handleExport" @click="handleExport"
v-hasPermi="['fantang:settle:export']" v-hasPermi="['fantang:settle:export']"
>导出 >导出
</el-button> </el-button>
</el-col> </el-col>
@ -78,19 +78,19 @@
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
size="mini" size="mini"
type="text" type="text"
icon="el-icon-edit" icon="el-icon-edit"
@click="clickAddNewSettlement(scope.row)" @click="clickAddNewSettlement(scope.row)"
v-hasPermi="['fantang:settle:AddNewSettlement']" v-hasPermi="['fantang:settle:AddNewSettlement']"
>收费 >收费
</el-button> </el-button>
<el-button <el-button
size="mini" size="mini"
type="text" type="text"
icon="el-icon-edit" icon="el-icon-edit"
@click="clickAddLeaveSettlement(scope.row)" @click="clickAddLeaveSettlement(scope.row)"
v-hasPermi="['fantang:settle:AddLeaveSettlement']" v-hasPermi="['fantang:settle:AddLeaveSettlement']"
>查看详情 >查看详情
</el-button> </el-button>
</template> </template>
@ -98,11 +98,11 @@
</el-table> </el-table>
<pagination <pagination
v-show="total>0" v-show="total>0"
:total="total" :total="total"
:page.sync="queryParams.pageNum" :page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize" :limit.sync="queryParams.pageSize"
@pagination="getList" @pagination="getList"
/> />
<!-- 日常收费弹出层对话框--> <!-- 日常收费弹出层对话框-->
@ -131,14 +131,14 @@
<el-row :gutter="10"> <el-row :gutter="10">
<el-col :span="8"> <el-col :span="8">
<!-- <el-form-item label="上次结算日期" prop="lastBillingDate" v-if="lastBillFlag">--> <!-- <el-form-item label="上次结算日期" prop="lastBillingDate" v-if="lastBillFlag">-->
<el-form-item label="上次结算 / 用餐日期" prop="lastBillingDate"> <el-form-item label="上次结算 / 首次用餐" prop="lastBillingDate">
<!-- <el-input v-model="formAddNewSettlement.lastBillingDate" :disabled="true"/>--> <!-- <el-input v-model="formAddNewSettlement.lastBillingDate" :disabled="true"/>-->
<el-date-picker <el-date-picker
v-model="formAddNewSettlement.lastBillingDate" v-model="formAddNewSettlement.lastBillingDate"
align="right" align="right"
type="date" type="date"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
:disabled="true"> :disabled="true">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -161,13 +161,13 @@
<el-col :span="8"> <el-col :span="8">
<el-form-item label="结算日期" prop="selectBillingDate"> <el-form-item label="结算日期" prop="selectBillingDate">
<el-date-picker <el-date-picker
v-model="formAddNewSettlement.selectBillingDate" v-model="formAddNewSettlement.selectBillingDate"
align="right" align="right"
type="date" type="date"
placeholder="选择日期" placeholder="选择日期"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
@change="changeBillingDate" @change="changeBillingDate"
:picker-options="pickerOptions"> :picker-options="pickerOptions">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -175,10 +175,10 @@
<el-form-item label="支付方式" prop="payType"> <el-form-item label="支付方式" prop="payType">
<el-select v-model="formAddNewSettlement.payType" placeholder="请选择支付方式"> <el-select v-model="formAddNewSettlement.payType" placeholder="请选择支付方式">
<el-option <el-option
v-for="item in payTypeOptions" v-for="item in payTypeOptions"
:key="item.value" :key="item.value"
:label="item.label" :label="item.label"
:value="item.value"> :value="item.value">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
@ -193,7 +193,6 @@
<el-button type="primary" @click="submitForm">确 定</el-button> <el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="clickFormAddNewSettlementCancel">取 消</el-button> <el-button @click="clickFormAddNewSettlementCancel">取 消</el-button>
</div> </div>
<el-row> <el-row>
报餐明细 报餐明细
</el-row> </el-row>
@ -218,12 +217,11 @@
<el-table-column label="营养餐价格" align="center" prop="nutritionFoodPrice"/> <el-table-column label="营养餐价格" align="center" prop="nutritionFoodPrice"/>
<el-table-column label="报餐总价" align="center" prop="totalPrice"/> <el-table-column label="报餐总价" align="center" prop="totalPrice"/>
</el-table> </el-table>
</el-dialog> </el-dialog>
<!-- 出院结算弹出层对话框--> <!-- 出院结算弹出层对话框-->
<el-dialog title="用餐详情" :visible.sync="open" width="500px" append-to-body> <el-dialog title="用餐详情" :visible.sync="open" width="1000px" append-to-body>
<el-form ref="leaveForm" :model="leaveForm" :rules="rules" label-width="80px"> <el-form ref="leaveForm" :model="leaveForm" :rules="rules" label-width="160px">
<el-form-item label="住院号" prop="hospitalId"> <el-form-item label="住院号" prop="hospitalId">
<el-input v-model="leaveForm.hospitalId" :disabled="true"/> <el-input v-model="leaveForm.hospitalId" :disabled="true"/>
</el-form-item> </el-form-item>
@ -246,13 +244,13 @@
</el-row> </el-row>
<el-row :gutter="10"> <el-row :gutter="10">
<el-col :span="8"> <el-col :span="8">
<el-form-item label="上次结算 / 用餐日期" prop="lastBillingDate"> <el-form-item label="上次结算 / 首次用餐" prop="lastBillingDate">
<el-date-picker <el-date-picker
v-model="leaveForm.lastBillingDate" v-model="leaveForm.lastBillingDate"
align="right" align="right"
type="date" type="date"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
:disabled="true"> :disabled="true">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -268,7 +266,7 @@
</el-col> </el-col>
</el-row> </el-row>
<el-form-item label="已收预付伙食费" prop="prepayment"> <el-form-item label="已收预付伙食费" prop="prepayment">
<el-input v-model="formAddNewSettlement.prepayment" :disabled="true"/> <el-input v-model="leaveForm.prepayment" :disabled="true"/>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-row> <el-row>
@ -301,7 +299,7 @@
<script> <script>
import {addSettle, delSettle, exportSettle, getSettle, showMealsWithSelect} from "@/api/fantang/settle"; import {addSettle, delSettle, exportSettle, getSettle, showMealsWithSelect} from "@/api/fantang/settle";
import {getLastSettlementDate, listAll, listMealsWithInSettle, listNoPay, listPayoff} from "../../../api/fantang/meals"; import {getLastSettlementDate, listAll, listMealsWithInSettle, listNoPay, listPayoff} from "@/api/fantang/meals";
import {getUserProfile} from "@/api/system/user"; import {getUserProfile} from "@/api/system/user";
import {listDepart} from "@/api/fantang/depart"; import {listDepart} from "@/api/fantang/depart";
@ -491,7 +489,7 @@ export default {
console.log("最后结算时间-------", sDate1); console.log("最后结算时间-------", sDate1);
if (dateSpan < 0) { if (dateSpan < 0) {
this.msgError("你现在的结算日期小于上一次上次结算 / 用餐日期"); this.msgError("你现在的结算日期小于上一次上次结算 / 首次用餐日期");
} else { } else {
dateSpan = Math.abs(dateSpan); dateSpan = Math.abs(dateSpan);
@ -566,9 +564,33 @@ export default {
}, },
// 出院伙食费结算按钮 // 出院伙食费结算按钮
clickAddLeaveSettlement() { clickAddLeaveSettlement(row) {
this.open = true; getLastSettlementDate(row.patientId).then(response => {
this.flagAddPrepaymentShow = true; if (response.reportMeals.settlementAt === null) {
this.lastBillFlag = false;
this.leaveForm.lastBillingDate = response.reportMeals.lastCreateDate;
} else {
this.lastBillFlag = true;
this.leaveForm.lastBillingDate = response.reportMeals.settlementAt;
}
if (response.prepayment === null) {
this.leaveForm.prepayment = 0;
} else {
this.leaveForm.prepayment = response.prepayment.prepaid;
}
this.leaveForm.settlementDays = response.reportMeals.days;
this.open = true;
this.leaveForm.hospitalId = row.hospitalId;
this.leaveForm.name = row.name;
this.leaveForm.departName = row.departName;
this.leaveForm.bedId = row.bedId;
this.leaveForm.patientId = row.patientId;
this.leaveForm.price = row.price;
this.leaveForm.netPeceipt = null;
this.leaveForm.userName = this.userName;
});
}, },
// 处理筛选结算标志 // 处理筛选结算标志