todo:收费-开票

ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtPrepaymentDaoController.java

@@ -68,8 +68,9 @@ public class FtPrepaymentDaoController extends BaseController {
     // 查询所有待缴费列表
     @PreAuthorize("@ss.hasPermi('fantang:prepayment:list')")
     @GetMapping("/listNoPrepay")
-    public AjaxResult listNoPrepay(@RequestParam("pageNum")Integer pageNum, @RequestParam("pageSize")Integer pageSize) {
+    public TableDataInfo listNoPrepay() {
-        return AjaxResult.success(iFtPrepaymentDaoService.listNoPrepay(pageNum, pageSize));
+        startPage();
+        return getDataTable(iFtPrepaymentDaoService.listNoPrepay());
     }
 
     // 查询所有已缴费列表

ruoyi-system/src/main/java/com/ruoyi/system/fantang/mapper/FtPrepaymentDaoMapper.java

@@ -19,7 +19,7 @@ import java.util.List;
 public interface FtPrepaymentDaoMapper extends BaseMapper<FtPrepaymentDao> {
 
     @Select("select a.patient_id , a.name,  a.hospital_id, a.bed_id, b.depart_name, b.depart_code  from ft_patient a LEFT JOIN ft_depart b on a.depart_id = b.depart_id where a.patient_id not in (select patient_id from ft_prepayment )")
-    IPage<FtPrepaymentVo> listNoPrepay(Page<FtOrderDao> page);
+    List<FtPrepaymentVo> listNoPrepay();
 
     @Select("SELECT a.*,b.hospital_id, b.name, b.bed_id, c.depart_name from ft_prepayment a LEFT JOIN ft_patient b on a.patient_id = b.patient_id LEFT JOIN ft_depart c on b.depart_id = c.depart_id where a.settlement_flag = 0")
     IPage<FtPrepaymentVo> listPrepay(Page<FtOrderDao> page);

ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/IFtPrepaymentDaoService.java

@@ -15,7 +15,7 @@ import java.util.List;
  */
 public interface IFtPrepaymentDaoService extends IService<FtPrepaymentDao> {
 
-    IPage<FtPrepaymentVo> listNoPrepay(Integer pageNum, Integer pageSize);
+    List<FtPrepaymentVo> listNoPrepay();
 
     IPage<FtPrepaymentVo> listPrepay(Integer pageNum, Integer pageSize);
 

ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/impl/FtPrepaymentDaoServiceImpl.java

@@ -23,9 +23,8 @@ import java.util.List;
 public class FtPrepaymentDaoServiceImpl extends ServiceImpl<FtPrepaymentDaoMapper, FtPrepaymentDao> implements IFtPrepaymentDaoService {
 
     @Override
-    public IPage<FtPrepaymentVo> listNoPrepay(Integer pageNum, Integer pageSize) {
+    public List<FtPrepaymentVo> listNoPrepay() {
-        Page<FtOrderDao> page = new Page<>(pageNum, pageSize);
+        return this.baseMapper.listNoPrepay();
-        return this.baseMapper.listNoPrepay(page);
     }
 
     @Override

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

@@ -54,28 +54,6 @@
         >预付收款
         </el-button>
       </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['fantang:prepayment:edit']"
-        >修改
-        </el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['fantang:prepayment:remove']"
-        >删除
-        </el-button>
-      </el-col>
       <el-col :span="1.5">
         <el-button
           type="warning"
@@ -98,7 +76,7 @@
       <el-table-column label="科室" align="center" prop="departName" width="180">
       </el-table-column>
       <el-table-column label="床号" align="center" prop="bedId"/>
-      <el-table-column label="结算" align="center" prop="prepaid" />
+      <el-table-column label="预付款余额" align="center" prop="prepaid" />
 <!--      <el-table-column label="结算时间" align="center" prop="settlementAt" width="180">-->
 <!--        <template slot-scope="scope">-->
 <!--          <span>{{ parseTime(scope.row.settlementAt, '{y}-{m}-{d}') }}</span>-->
@@ -109,18 +87,11 @@
           <el-button
             size="mini"
             type="text"
-            icon="el-icon-edit"
+            icon="el-icon-news"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['fantang:prepayment:edit']"
-          >修改
-          </el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
             v-hasPermi="['fantang:prepayment:remove']"
-          >删除
+            v-if=""
+          >出院结清
           </el-button>
         </template>
       </el-table-column>
@@ -135,7 +106,7 @@
     />
 
     <!-- 添加或修改收费管理对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="formAddPrepayment" :model="formAddPrepayment" :rules="rules" label-width="120px">
         <el-form-item label="住院号" prop="hospitalId">
           <el-autocomplete
@@ -143,32 +114,35 @@
             v-model="formAddPrepayment.hospitalId"
             :fetch-suggestions="querySearch"
             placeholder="请输入住院号"
-            @select="handleSelect">
+            @select="handleSelect" style="width: 250px">
             <i
               class="el-icon-edit el-input__icon"
               slot="suffix"
               @click="handleIconClick">
             </i>
-            <template slot-scope="{ item }">
+            <template slot-scope="{ item }" style="width: 300px">
               <div class="name">{{ item.name }}</div>
               <span class="addr">
                 {{ item.departName }}
                 <el-divider direction="vertical"></el-divider>
                 {{ item.bedId}}
+                <el-divider direction="vertical"></el-divider>
+                {{ item.value}}
               </span>
             </template>
           </el-autocomplete>
         </el-form-item>
         <el-form-item label="姓名" prop="name">
-          <el-input v-model="formAddPrepayment.name"  readonly/>
+          <el-input v-model="formAddPrepayment.name" style="width: 250px" readonly/>
         </el-form-item>
         <el-form-item label="预付费金额" prop="prepaid">
           <el-input v-model="formAddPrepayment.prepaid"
                     onKeypress="return(/[\d]/.test(String.fromCharCode(event.keyCode)))" type="number"
-                    placeholder="请输入预付费金额"/>
+                    placeholder="请输入预付费金额"
+                    style="width: 250px" />
         </el-form-item>
         <el-form-item label="预付费时间" prop="prepaidAt">
-          <el-date-picker clearable size="small" style="width: 200px"
+          <el-date-picker clearable size="small" style="width: 250px"
                           v-model="formAddPrepayment.prepaidAt"
                           type="date"
                           value-format="yyyy-MM-dd"
@@ -186,19 +160,18 @@
 </template>
 
 <script>
-  import {
+import {
-    addPrepayment,
+  addPrepayment,
-    delPrepayment,
+  delPrepayment,
-    exportPrepayment,
+  exportPrepayment,
-    getPrepayment,
+  getCountById,
-    listPrepayment,
+  getPrepayment,
-    listNoPrepayment,
+  listNoPrepayment,
-    updatePrepayment
+  listPrepay
-  } from "../../../api/fantang/prepayment";
+} from "../../../api/fantang/prepayment";
-  import {getCountById, listAllPrepay, listPrepay} from "../../../api/fantang/prepayment";
+import {getUserProfile} from "../../../api/system/user";
-  import {getUserProfile} from "../../../api/system/user";
 
-  export default {
+export default {
     name: "Prepayment",
     components: {},
     data() {
@@ -318,8 +291,9 @@
       },
 
       buildSuggestionList() {
-        listNoPrepayment(this.queryParams).then(response => {
+        listNoPrepayment().then(response => {
-          let prepaymentList = response.data.records;
+          console.log("aaaaaaaaaaaaa",response);
+          let prepaymentList = response.rows;
           this.suggestionList = prepaymentList.map(item => {
             return {
               "value": item.hospitalId,
@@ -336,8 +310,8 @@
       getDefaultNoPrepayment() {
         this.loading = true;
         listNoPrepayment(this.queryParams).then(response => {
-          this.prepaymentList = response.data.records;
+          this.prepaymentList = response.rows;
-          this.total = response.data.total;
+          this.total = response.total;
           this.suggestionList = this.prepaymentList.map(item => {
             return {
               "value": item.hospitalId,
@@ -418,34 +392,33 @@
         const prepaymentId = row.prepaymentId || this.ids
         getPrepayment(prepaymentId).then(response => {
           this.formAddPrepayment = response.data;
+          console.log(response.data)
           this.open = true;
-          this.title = "修改收费管理";
+          this.title = "出院结清";
         });
       },
       /** 提交按钮 */
       submitformAddPrepayment() {
+
+        // 1、检查该用户是否找推荐列表中，如果不在，认为该用户是已经缴费的用户
         let hospitalId = this.formAddPrepayment.hospitalId;
         this.formAddPrepayment.collectBy = this.user.userName;
         this.$refs["formAddPrepayment"].validate(valid => {
           if (valid) {
-            if (!this.NoPrepayments.find(function(x) {
+            if (!this.suggestionList.find(x=> {
-              return x.hospitalId === hospitalId;
+              return x.value === hospitalId;
             })) {
               this.msgError("未找到该住院号记录，请先添加！");
               return ;
             }
 
-            getCountById(this.formAddPrepayment.patientId).then(response => {
-              console.log("getCountbyId", response);
-            });
-
-
             this.formAddPrepayment.prepaidAt = null;
             console.log("form -->", this.formAddPrepayment)
             addPrepayment(this.formAddPrepayment).then(response => {
               this.msgSuccess("新增成功");
               this.open = false;
               this.getList();
+              this.buildSuggestionList();
             });
           }
         });

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

@@ -54,38 +54,6 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
-      <!--      <el-col :span="1.5">-->
-      <!--        <el-button-->
-      <!--          type="primary"-->
-      <!--          icon="el-icon-plus"-->
-      <!--          size="mini"-->
-      <!--          @click="handleAdd"-->
-      <!--          v-hasPermi="['fantang:settle:add']"-->
-      <!--        >伙食费收款-->
-      <!--        </el-button>-->
-      <!--      </el-col>-->
-      <el-col :span="1.5">
-        <el-button
-            type="success"
-            icon="el-icon-edit"
-            size="mini"
-            :disabled="single"
-            @click="handleUpdate"
-            v-hasPermi="['fantang:settle:edit']"
-        >出院结算
-        </el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-            type="danger"
-            icon="el-icon-delete"
-            size="mini"
-            :disabled="multiple"
-            @click="handleDelete"
-            v-hasPermi="['fantang:settle:remove']"
-        >删除
-        </el-button>
-      </el-col>
       <el-col :span="1.5">
         <el-button
             type="warning"
@@ -123,7 +91,7 @@
               icon="el-icon-edit"
               @click="clickAddLeaveSettlement(scope.row)"
               v-hasPermi="['fantang:settle:AddLeaveSettlement']"
-          >出院结算
+          >查看详情
           </el-button>
         </template>
       </el-table-column>
@@ -254,33 +222,79 @@
     </el-dialog>
 
     <!--    出院结算弹出层对话框-->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog title="用餐详情" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="leaveForm" :model="leaveForm" :rules="rules" label-width="80px">
-        <el-form-item label="记录清单" prop="list">
+        <el-form-item label="住院号" prop="hospitalId">
-          <el-input v-model="leaveForm.list" placeholder="请输入记录清单"/>
+          <el-input v-model="leaveForm.hospitalId" :disabled="true"/>
         </el-form-item>
-        <el-form-item label="结算总价" prop="price">
+        <el-row :gutter="10">
-          <el-input v-model="leaveForm.price" placeholder="请输入结算总价"/>
+          <el-col :span="8">
-        </el-form-item>
+            <el-form-item label="姓名" prop="name">
-        <el-form-item label="应收" prop="payable">
+              <el-input v-model="leaveForm.name" :disabled="true"/>
-          <el-input v-model="leaveForm.payable" placeholder="请输入应收"/>
+            </el-form-item>
-        </el-form-item>
+          </el-col>
-        <el-form-item label="实收" prop="receipts">
+          <el-col :span="8">
-          <el-input v-model="leaveForm.receipts" placeholder="请输入实收"/>
+            <el-form-item label="科室" prop="departName">
-        </el-form-item>
+              <el-input v-model="leaveForm.departName" :disabled="true"/>
-        <el-form-item label="结算类型" prop="type">
+            </el-form-item>
-          <el-select v-model="leaveForm.type" placeholder="请选择结算类型">
+          </el-col>
-            <el-option label="请选择字典生成" value=""/>
+          <el-col :span="8">
-          </el-select>
+            <el-form-item label="床号" prop="bedId">
-        </el-form-item>
+              <el-input v-model="leaveForm.bedId" :disabled="true"/>
-        <el-form-item label="退款总额" prop="refund">
+            </el-form-item>
-          <el-input v-model="leaveForm.refund" placeholder="请输入退款总额"/>
+          </el-col>
+        </el-row>
+        <el-row :gutter="10">
+          <el-col :span="8">
+            <el-form-item label="上次结算 / 用餐日期" prop="lastBillingDate">
+              <el-date-picker
+                  v-model="leaveForm.lastBillingDate"
+                  align="right"
+                  type="date"
+                  value-format="yyyy-MM-dd"
+                  :disabled="true">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="未结算天数" prop="settlementDays">
+              <el-input v-model="leaveForm.settlementDays" :disabled="true"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="结算总价" prop="price">
+              <el-input v-model="this.sumTotalPrice" :disabled="true"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-form-item label="已收预付伙食费" prop="prepayment">
+          <el-input v-model="formAddNewSettlement.prepayment" :disabled="true"/>
         </el-form-item>
       </el-form>
-      <div slot="footer" class="dialog-footer">
+      <el-row>
-        <el-button type="primary" @click="submitForm">确 定</el-button>
+        报餐明细
-        <el-button @click="cancel">取 消</el-button>
+      </el-row>
-      </div>
+      <el-row :gutter="10">
+        <el-col :span="4">
+          正餐总价：{{ dinnerTotalPrice }}
+        </el-col>
+        <el-col :span="4">
+          营养餐总价：{{ nutritionTotalPrice }}
+        </el-col>
+      </el-row>
+      <el-row>
+        报餐总价：{{ sumTotalPrice }}
+      </el-row>
+      <el-table v-loading="loading" :data="mealsList">
+        <el-table-column label="报餐日期" align="center" prop="createAt" width="180">
+          <template slot-scope="scope">
+            <span>{{ parseTime(scope.row.createAt, '{y}-{m}-{d}') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="正餐价格" align="center" prop="price"/>
+        <el-table-column label="营养餐价格" align="center" prop="nutritionFoodPrice"/>
+        <el-table-column label="报餐总价" align="center" prop="totalPrice"/>
+      </el-table>
     </el-dialog>
   </div>
 </template>
@@ -553,9 +567,8 @@ export default {
 
     // 出院伙食费结算按钮
     clickAddLeaveSettlement() {
-      this.flagAddNewSettlementOpen = true;
+      this.open = true;
       this.flagAddPrepaymentShow = true;
-
     },
 
     // 处理筛选结算标志

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

@@ -29,7 +29,12 @@
       <!--      </el-form-item>-->
       <el-form-item label="结算类型" prop="type">
         <el-select v-model="queryParams.type" placeholder="请选择结算类型" clearable size="small">
-          <el-option label="请选择字典生成" value=""/>
+          <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="refund">-->
@@ -60,33 +65,33 @@
       <!--      </el-col>-->
       <el-col :span="1.5">
         <el-button
-          type="success"
+            type="success"
-          icon="el-icon-edit"
+            icon="el-icon-edit"
-          size="mini"
+            size="mini"
-          :disabled="single"
+            :disabled="single"
-          @click="handleUpdate"
+            @click="handleUpdate"
-          v-hasPermi="['fantang:settlement:edit']"
+            v-hasPermi="['fantang:settlement:edit']"
         >开票
         </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="danger"
+            type="danger"
-          icon="el-icon-delete"
+            icon="el-icon-delete"
-          size="mini"
+            size="mini"
-          :disabled="multiple"
+            :disabled="multiple"
-          @click="handleDelete"
+            @click="handleDelete"
-          v-hasPermi="['fantang:settlement:remove']"
+            v-hasPermi="['fantang:settlement:remove']"
         >删除
         </el-button>
       </el-col>
       <el-col :span="1.5">
         <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:settlement:export']"
+            v-hasPermi="['fantang:settlement:export']"
         >导出
         </el-button>
       </el-col>
@@ -108,19 +113,19 @@
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
-            size="mini"
+              size="mini"
-            type="text"
+              type="text"
-            icon="el-icon-edit"
+              icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
+              @click="handleUpdate(scope.row)"
-            v-hasPermi="['fantang:settlement:edit']"
+              v-hasPermi="['fantang:settlement:edit']"
           >开票
           </el-button>
           <el-button
-            size="mini"
+              size="mini"
-            type="text"
+              type="text"
-            icon="el-icon-delete"
+              icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
+              @click="handleDelete(scope.row)"
-            v-hasPermi="['fantang:settlement:remove']"
+              v-hasPermi="['fantang:settlement:remove']"
           >删除
           </el-button>
         </template>
@@ -128,11 +133,11 @@
     </el-table>
 
     <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"
     />
 
     <!-- 添加或修改结算管理对话框 -->
@@ -151,14 +156,6 @@
           <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-input v-model="form.type" placeholder="请输入结算类型" :disabled="true"/>
         </el-form-item>
         <el-form-item label="发票名" prop="invoiceName">
@@ -173,10 +170,10 @@
         <el-form-item label="开票类型" prop="invoiceType">
           <el-select v-model="form.invoiceType" placeholder="请选择开票类型">
             <el-option
-              v-for="item in typeOptions"
+                v-for="item in invoiceTypeOptions"
-              :key="item.value"
+                :key="item.value"
-              :label="item.label"
+                :label="item.label"
-              :value="item.value">
+                :value="item.value">
             </el-option>
           </el-select>
         </el-form-item>
@@ -202,13 +199,29 @@ export default {
   components: {},
   data() {
     return {
-      typeOptions: [{
+      invoiceTypeOptions: [{
         value: 1,
         label: '开票'
       }, {
         value: 2,
         label: '挂账'
       }],
+      typeOptions: [{
+        value: '现金',
+        label: '现金'
+      }, {
+        value: '预付款冲减',
+        label: '预付款冲减'
+      }, {
+        value: '银行汇款',
+        label: '银行汇款'
+      }, {
+        value: '在线支付',
+        label: '在线支付'
+      }, {
+        value: '挂账',
+        label: '挂账'
+      }],
       // 遮罩层
       loading: true,
       // 选中数组
@@ -259,7 +272,19 @@ export default {
         ],
         refund: [
           {required: true, message: "退款总额不能为空", trigger: "blur"}
-        ]
+        ],
+        invoiceName: [
+          {required: true, message: "发票名不能为空", trigger: "blur"}
+        ],
+        taxId: [
+          {required: true, message: "税号不能为空", trigger: "blur"}
+        ],
+        invoiceNum: [
+          {required: true, message: "发票号不能为空", trigger: "blur"}
+        ],
+        invoiceType: [
+          {required: true, message: "开票类型不能为空", trigger: "blur"}
+        ],
       }
     };
   },
@@ -327,23 +352,14 @@ export default {
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
-
+      this.reset();
+      const settleId = row.settleId || this.ids
       console.log(row)
-
+      getSettlement(settleId).then(response => {
-      if (row.type!=="预付款冲减"){
+        this.form = response.data;
-        this.reset();
+        this.open = true;
-        const settleId = row.settleId || this.ids
+        this.title = "开票";
-        console.log(row)
+      });
-        getSettlement(settleId).then(response => {
-          this.form = response.data;
-          this.open = true;
-          this.title = "开票";
-        });
-      }else {
-          this.msgError("预付款冲减不能开票")
-      }
-
-
     },
     /** 提交按钮 */
     submitForm() {