收费详情

ruoyi-ui/src/views/fantang/settle/index.vue

@@ -131,7 +131,7 @@
         <el-row :gutter="10">
           <el-col :span="8">
             <!--            <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-date-picker
                 v-model="formAddNewSettlement.lastBillingDate"
@@ -193,7 +193,6 @@
         <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="clickFormAddNewSettlementCancel">取 消</el-button>
       </div>
-
       <el-row>
         报餐明细
       </el-row>
@@ -218,12 +217,11 @@
         <el-table-column label="营养餐价格" align="center" prop="nutritionFoodPrice"/>
         <el-table-column label="报餐总价" align="center" prop="totalPrice"/>
       </el-table>
-
     </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-input v-model="leaveForm.hospitalId" :disabled="true"/>
         </el-form-item>
@@ -246,7 +244,7 @@
         </el-row>
         <el-row :gutter="10">
           <el-col :span="8">
-            <el-form-item label="上次结算 / 用餐日期" prop="lastBillingDate">
+            <el-form-item label="上次结算 / 首次用餐" prop="lastBillingDate">
               <el-date-picker
                 v-model="leaveForm.lastBillingDate"
                 align="right"
@@ -268,7 +266,7 @@
           </el-col>
         </el-row>
         <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>
       <el-row>
@@ -301,7 +299,7 @@
 
 <script>
 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 {listDepart} from "@/api/fantang/depart";
 
@@ -491,7 +489,7 @@ export default {
       console.log("最后结算时间-------", sDate1);
 
       if (dateSpan < 0) {
-        this.msgError("你现在的结算日期小于上一次上次结算 / 用餐日期");
+        this.msgError("你现在的结算日期小于上一次上次结算 / 首次用餐日期");
       } else {
 
         dateSpan = Math.abs(dateSpan);
@@ -566,9 +564,33 @@ export default {
     },
 
     // 出院伙食费结算按钮
-    clickAddLeaveSettlement() {
+    clickAddLeaveSettlement(row) {
+      getLastSettlementDate(row.patientId).then(response => {
+        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.flagAddPrepaymentShow = 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;
+      });
     },
 
     // 处理筛选结算标志