From 78f06ed7e252daacb610762bf864e23710f0afc1 Mon Sep 17 00:00:00 2001
From: ryoeiken <754264374@qq.com>
Date: Thu, 19 Nov 2020 15:52:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=89=8D=E7=AB=AF=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/FtPrepaymentDaoController.java |   6 +
 .../fantang/domain/FtPrepaymentDao.java       |  14 ++
 .../mapper/fantang/FtPrepaymentDaoMapper.xml  |   2 +
 .../src/views/fantang/careStaffInfo/index.vue |  98 ++++++------
 ruoyi-ui/src/views/fantang/demand/index.vue   |  99 ++++++------
 ruoyi-ui/src/views/fantang/depart/index.vue   |  71 +++++----
 ruoyi-ui/src/views/fantang/food/index.vue     |  89 ++++++-----
 ruoyi-ui/src/views/fantang/meals/index.vue    | 107 ++++++-------
 ruoyi-ui/src/views/fantang/order/index.vue    | 137 +++++++++--------
 ruoyi-ui/src/views/fantang/patient/index.vue  |  77 +++++-----
 .../src/views/fantang/prepayment/index.vue    | 144 +++++++++++++-----
 ruoyi-ui/src/views/fantang/settle/index.vue   | 111 +++++++-------
 .../src/views/fantang/staffInfo/index.vue     | 100 ++++++------
 .../src/views/fantang/staffSubsidy/index.vue  | 102 +++++++------
 ruoyi-ui/src/views/fantang/subsidy/index.vue  | 120 +++++++++------
 15 files changed, 728 insertions(+), 549 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 3dd48ba8c..088a55266 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
@@ -48,6 +48,12 @@ public class FtPrepaymentDaoController extends BaseController {
         if (ftPrepaymentDao.getSettlementFlag() != null) {
             lqw.eq(FtPrepaymentDao::getSettlementFlag, ftPrepaymentDao.getSettlementFlag());
         }
+        if (ftPrepaymentDao.getPrepaid() != null) {
+            lqw.eq(FtPrepaymentDao::getPrepaid, ftPrepaymentDao.getPrepaid());
+        }
+        if (ftPrepaymentDao.getPrepaidAt() != null) {
+            lqw.eq(FtPrepaymentDao::getPrepaidAt, ftPrepaymentDao.getPrepaidAt());
+        }
         List<FtPrepaymentDao> list = iFtPrepaymentDaoService.list(lqw);
         return getDataTable(list);
     }
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 7be72c8de..095e88864 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
@@ -11,6 +11,7 @@ import lombok.ToString;
 import lombok.experimental.Accessors;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.util.Date;
 
 /**
@@ -75,4 +76,17 @@ public class FtPrepaymentDao implements Serializable {
      */
     @Excel(name = "结算标志")
     private Long settlementFlag;
+
+    /**
+     * 预付费金额
+     */
+    @Excel(name = "预付费金额")
+    private BigDecimal prepaid;
+
+    /**
+     * 预付费时间
+     */
+    @Excel(name = "预付费时间", width = 30, dateFormat = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date prepaidAt;
 }
diff --git a/ruoyi-system/src/main/resources/mapper/fantang/FtPrepaymentDaoMapper.xml b/ruoyi-system/src/main/resources/mapper/fantang/FtPrepaymentDaoMapper.xml
index 0cf355b9d..919bf8e48 100644
--- a/ruoyi-system/src/main/resources/mapper/fantang/FtPrepaymentDaoMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/fantang/FtPrepaymentDaoMapper.xml
@@ -13,6 +13,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="settlementBy"    column="settlement_by"    />
         <result property="settlementId"    column="settlement_id"    />
         <result property="settlementFlag"    column="settlement_flag"    />
+        <result property="prepaid"    column="prepaid"    />
+        <result property="prepaidAt"    column="prepaid_at"    />
     </resultMap>
 
 
diff --git a/ruoyi-ui/src/views/fantang/careStaffInfo/index.vue b/ruoyi-ui/src/views/fantang/careStaffInfo/index.vue
index 868a31a68..27b8fab77 100644
--- a/ruoyi-ui/src/views/fantang/careStaffInfo/index.vue
+++ b/ruoyi-ui/src/views/fantang/careStaffInfo/index.vue
@@ -42,7 +42,8 @@
           size="mini"
           @click="handleAdd"
           v-hasPermi="['fantang:careStaffInfo:add']"
-        >新增</el-button>
+        >新增
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -52,7 +53,8 @@
           :disabled="single"
           @click="handleUpdate"
           v-hasPermi="['fantang:careStaffInfo:edit']"
-        >修改</el-button>
+        >修改
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -62,7 +64,8 @@
           :disabled="multiple"
           @click="handleDelete"
           v-hasPermi="['fantang:careStaffInfo:remove']"
-        >删除</el-button>
+        >删除
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -71,19 +74,20 @@
           size="mini"
           @click="handleExport"
           v-hasPermi="['fantang:careStaffInfo:export']"
-        >导出</el-button>
+        >导出
+        </el-button>
       </el-col>
-	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="careStaffInfoList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column type="selection" width="55" align="center"/>
       <el-table-column label="护工 id" align="center" prop="careStaffId" v-if="false"/>
-      <el-table-column label="姓名" align="center" prop="name" />
-      <el-table-column label="所属公司名称" align="center" prop="corpName" />
-      <el-table-column label="所属科室清单" align="center" prop="departList" />
-      <el-table-column label="照片" align="center" prop="photo" />
-      <el-table-column label="二维码" align="center" prop="qrCode" />
+      <el-table-column label="姓名" align="center" prop="name"/>
+      <el-table-column label="所属公司名称" align="center" prop="corpName"/>
+      <el-table-column label="所属科室清单" align="center" prop="departList"/>
+      <el-table-column label="照片" align="center" prop="photo"/>
+      <el-table-column label="二维码" align="center" prop="qrCode"/>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -92,18 +96,20 @@
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['fantang:careStaffInfo:edit']"
-          >修改</el-button>
+          >修改
+          </el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['fantang:careStaffInfo:remove']"
-          >删除</el-button>
+          >删除
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"
@@ -116,19 +122,19 @@
     <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-item label="姓名" prop="name">
-          <el-input v-model="form.name" placeholder="请输入姓名" />
+          <el-input v-model="form.name" placeholder="请输入姓名"/>
         </el-form-item>
         <el-form-item label="所属公司名称" prop="corpName">
-          <el-input v-model="form.corpName" placeholder="请输入所属公司名称" />
+          <el-input v-model="form.corpName" placeholder="请输入所属公司名称"/>
         </el-form-item>
         <el-form-item label="所属科室清单" prop="departList">
-          <el-input v-model="form.departList" placeholder="请输入所属科室清单" />
+          <el-input v-model="form.departList" placeholder="请输入所属科室清单"/>
         </el-form-item>
         <el-form-item label="照片" prop="photo">
-          <el-input v-model="form.photo" placeholder="请输入照片" />
+          <el-input v-model="form.photo" placeholder="请输入照片"/>
         </el-form-item>
         <el-form-item label="二维码" prop="qrCode">
-          <el-input v-model="form.qrCode" placeholder="请输入二维码" />
+          <el-input v-model="form.qrCode" placeholder="请输入二维码"/>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -140,12 +146,18 @@
 </template>
 
 <script>
-import { listCareStaffInfo, getCareStaffInfo, delCareStaffInfo, addCareStaffInfo, updateCareStaffInfo, exportCareStaffInfo } from "@/api/fantang/careStaffInfo";
+import {
+  addCareStaffInfo,
+  delCareStaffInfo,
+  exportCareStaffInfo,
+  getCareStaffInfo,
+  listCareStaffInfo,
+  updateCareStaffInfo
+} from "@/api/fantang/careStaffInfo";
 
 export default {
   name: "CareStaffInfo",
-  components: {
-  },
+  components: {},
   data() {
     return {
       // 遮罩层
@@ -179,13 +191,13 @@ export default {
       // 表单校验
       rules: {
         name: [
-          { required: true, message: "姓名不能为空", trigger: "blur" }
+          {required: true, message: "姓名不能为空", trigger: "blur"}
         ],
         corpName: [
-          { required: true, message: "所属公司名称不能为空", trigger: "blur" }
+          {required: true, message: "所属公司名称不能为空", trigger: "blur"}
         ],
         departList: [
-          { required: true, message: "所属科室清单不能为空", trigger: "blur" }
+          {required: true, message: "所属科室清单不能为空", trigger: "blur"}
         ],
       }
     };
@@ -234,7 +246,7 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.careStaffId)
-      this.single = selection.length!==1
+      this.single = selection.length !== 1
       this.multiple = !selection.length
     },
     /** 新增按钮操作 */
@@ -277,28 +289,28 @@ export default {
     handleDelete(row) {
       const careStaffIds = row.careStaffId || this.ids;
       this.$confirm('是否确认删除护工信息编号为"' + careStaffIds + '"的数据项?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return delCareStaffInfo(careStaffIds);
-        }).then(() => {
-          this.getList();
-          this.msgSuccess("删除成功");
-        })
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(function () {
+        return delCareStaffInfo(careStaffIds);
+      }).then(() => {
+        this.getList();
+        this.msgSuccess("删除成功");
+      })
     },
     /** 导出按钮操作 */
     handleExport() {
       const queryParams = this.queryParams;
       this.$confirm('是否确认导出所有护工信息数据项?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return exportCareStaffInfo(queryParams);
-        }).then(response => {
-          this.download(response.msg);
-        })
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(function () {
+        return exportCareStaffInfo(queryParams);
+      }).then(response => {
+        this.download(response.msg);
+      })
     }
   }
 };
diff --git a/ruoyi-ui/src/views/fantang/demand/index.vue b/ruoyi-ui/src/views/fantang/demand/index.vue
index 9c1ed58a7..a9a79c2bf 100644
--- a/ruoyi-ui/src/views/fantang/demand/index.vue
+++ b/ruoyi-ui/src/views/fantang/demand/index.vue
@@ -3,15 +3,15 @@
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="用餐类型" prop="type">
         <el-select v-model="queryParams.type" placeholder="请选择用餐类型" clearable size="small">
-          <el-option label="请选择字典生成" value="" />
+          <el-option label="请选择字典生成" value=""/>
         </el-select>
       </el-form-item>
       <el-form-item label="创建时间" prop="createAt">
         <el-date-picker clearable size="small" style="width: 200px"
-          v-model="queryParams.createAt"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="选择创建时间">
+                        v-model="queryParams.createAt"
+                        type="date"
+                        value-format="yyyy-MM-dd"
+                        placeholder="选择创建时间">
         </el-date-picker>
       </el-form-item>
       <el-form-item label="总价" prop="price">
@@ -46,7 +46,8 @@
           size="mini"
           @click="handleAdd"
           v-hasPermi="['fantang:demand:add']"
-        >新增</el-button>
+        >新增
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -56,7 +57,8 @@
           :disabled="single"
           @click="handleUpdate"
           v-hasPermi="['fantang:demand:edit']"
-        >修改</el-button>
+        >修改
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -66,7 +68,8 @@
           :disabled="multiple"
           @click="handleDelete"
           v-hasPermi="['fantang:demand:remove']"
-        >删除</el-button>
+        >删除
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -75,23 +78,24 @@
           size="mini"
           @click="handleExport"
           v-hasPermi="['fantang:demand:export']"
-        >导出</el-button>
+        >导出
+        </el-button>
       </el-col>
-	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="demandList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column type="selection" width="55" align="center"/>
       <el-table-column label="id" align="center" prop="id" v-if="false"/>
-      <el-table-column label="订单详情" align="center" prop="foods" />
-      <el-table-column label="用餐类型" align="center" prop="type" />
+      <el-table-column label="订单详情" align="center" prop="foods"/>
+      <el-table-column label="用餐类型" align="center" prop="type"/>
       <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="term" />
+      <el-table-column label="总价" align="center" prop="price"/>
+      <el-table-column label="有效期" align="center" prop="term"/>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -100,18 +104,20 @@
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['fantang:demand:edit']"
-          >修改</el-button>
+          >修改
+          </el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['fantang:demand:remove']"
-          >删除</el-button>
+          >删除
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"
@@ -124,18 +130,18 @@
     <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-item label="订单详情" prop="foods">
-          <el-input v-model="form.foods" placeholder="请输入订单详情" />
+          <el-input v-model="form.foods" placeholder="请输入订单详情"/>
         </el-form-item>
         <el-form-item label="用餐类型" prop="type">
           <el-select v-model="form.type" placeholder="请选择用餐类型">
-            <el-option label="请选择字典生成" value="" />
+            <el-option label="请选择字典生成" value=""/>
           </el-select>
         </el-form-item>
         <el-form-item label="总价" prop="price">
-          <el-input v-model="form.price" placeholder="请输入总价" />
+          <el-input v-model="form.price" placeholder="请输入总价"/>
         </el-form-item>
         <el-form-item label="有效期" prop="term">
-          <el-input v-model="form.term" placeholder="请输入有效期" />
+          <el-input v-model="form.term" placeholder="请输入有效期"/>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -147,12 +153,11 @@
 </template>
 
 <script>
-import { listDemand, getDemand, delDemand, addDemand, updateDemand, exportDemand } from "@/api/fantang/demand";
+import {addDemand, delDemand, exportDemand, getDemand, listDemand, updateDemand} from "@/api/fantang/demand";
 
 export default {
   name: "Demand",
-  components: {
-  },
+  components: {},
   data() {
     return {
       // 遮罩层
@@ -187,16 +192,16 @@ export default {
       // 表单校验
       rules: {
         foods: [
-          { required: true, message: "订单详情不能为空", trigger: "blur" }
+          {required: true, message: "订单详情不能为空", trigger: "blur"}
         ],
         type: [
-          { required: true, message: "用餐类型不能为空", trigger: "change" }
+          {required: true, message: "用餐类型不能为空", trigger: "change"}
         ],
         price: [
-          { required: true, message: "总价不能为空", trigger: "blur" }
+          {required: true, message: "总价不能为空", trigger: "blur"}
         ],
         term: [
-          { required: true, message: "有效期不能为空", trigger: "blur" }
+          {required: true, message: "有效期不能为空", trigger: "blur"}
         ],
       }
     };
@@ -248,7 +253,7 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.id)
-      this.single = selection.length!==1
+      this.single = selection.length !== 1
       this.multiple = !selection.length
     },
     /** 新增按钮操作 */
@@ -291,28 +296,28 @@ export default {
     handleDelete(row) {
       const ids = row.id || this.ids;
       this.$confirm('是否确认删除特殊用餐管理编号为"' + ids + '"的数据项?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return delDemand(ids);
-        }).then(() => {
-          this.getList();
-          this.msgSuccess("删除成功");
-        })
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(function () {
+        return delDemand(ids);
+      }).then(() => {
+        this.getList();
+        this.msgSuccess("删除成功");
+      })
     },
     /** 导出按钮操作 */
     handleExport() {
       const queryParams = this.queryParams;
       this.$confirm('是否确认导出所有特殊用餐管理数据项?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return exportDemand(queryParams);
-        }).then(response => {
-          this.download(response.msg);
-        })
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(function () {
+        return exportDemand(queryParams);
+      }).then(response => {
+        this.download(response.msg);
+      })
     }
   }
 };
diff --git a/ruoyi-ui/src/views/fantang/depart/index.vue b/ruoyi-ui/src/views/fantang/depart/index.vue
index d502f8a3a..fdc50c287 100644
--- a/ruoyi-ui/src/views/fantang/depart/index.vue
+++ b/ruoyi-ui/src/views/fantang/depart/index.vue
@@ -24,7 +24,8 @@
           size="mini"
           @click="handleAdd"
           v-hasPermi="['fantang:depart:add']"
-        >新增</el-button>
+        >新增
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -34,7 +35,8 @@
           :disabled="single"
           @click="handleUpdate"
           v-hasPermi="['fantang:depart:edit']"
-        >修改</el-button>
+        >修改
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -44,7 +46,8 @@
           :disabled="multiple"
           @click="handleDelete"
           v-hasPermi="['fantang:depart:remove']"
-        >删除</el-button>
+        >删除
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -53,15 +56,16 @@
           size="mini"
           @click="handleExport"
           v-hasPermi="['fantang:depart:export']"
-        >导出</el-button>
+        >导出
+        </el-button>
       </el-col>
-	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="departList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column type="selection" width="55" align="center"/>
       <el-table-column label="科室编号" align="center" prop="departId" v-if="false"/>
-      <el-table-column label="科室名称" align="center" prop="departName" />
+      <el-table-column label="科室名称" align="center" prop="departName"/>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -70,18 +74,20 @@
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['fantang:depart:edit']"
-          >修改</el-button>
+          >修改
+          </el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['fantang:depart:remove']"
-          >删除</el-button>
+          >删除
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"
@@ -94,7 +100,7 @@
     <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-item label="科室名称" prop="departName">
-          <el-input v-model="form.departName" placeholder="请输入科室名称" />
+          <el-input v-model="form.departName" placeholder="请输入科室名称"/>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -106,12 +112,11 @@
 </template>
 
 <script>
-import { listDepart, getDepart, delDepart, addDepart, updateDepart, exportDepart } from "@/api/fantang/depart";
+import {addDepart, delDepart, exportDepart, getDepart, listDepart, updateDepart} from "@/api/fantang/depart";
 
 export default {
   name: "Depart",
-  components: {
-  },
+  components: {},
   data() {
     return {
       // 遮罩层
@@ -143,7 +148,7 @@ export default {
       // 表单校验
       rules: {
         departName: [
-          { required: true, message: "科室名称不能为空", trigger: "blur" }
+          {required: true, message: "科室名称不能为空", trigger: "blur"}
         ]
       }
     };
@@ -187,7 +192,7 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.departId)
-      this.single = selection.length!==1
+      this.single = selection.length !== 1
       this.multiple = !selection.length
     },
     /** 新增按钮操作 */
@@ -230,28 +235,28 @@ export default {
     handleDelete(row) {
       const departIds = row.departId || this.ids;
       this.$confirm('是否确认删除科室管理编号为"' + departIds + '"的数据项?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return delDepart(departIds);
-        }).then(() => {
-          this.getList();
-          this.msgSuccess("删除成功");
-        })
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(function () {
+        return delDepart(departIds);
+      }).then(() => {
+        this.getList();
+        this.msgSuccess("删除成功");
+      })
     },
     /** 导出按钮操作 */
     handleExport() {
       const queryParams = this.queryParams;
       this.$confirm('是否确认导出所有科室管理数据项?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return exportDepart(queryParams);
-        }).then(response => {
-          this.download(response.msg);
-        })
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(function () {
+        return exportDepart(queryParams);
+      }).then(response => {
+        this.download(response.msg);
+      })
     }
   }
 };
diff --git a/ruoyi-ui/src/views/fantang/food/index.vue b/ruoyi-ui/src/views/fantang/food/index.vue
index 177884e04..9aa1face4 100644
--- a/ruoyi-ui/src/views/fantang/food/index.vue
+++ b/ruoyi-ui/src/views/fantang/food/index.vue
@@ -21,7 +21,7 @@
       </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 label="请选择字典生成" value=""/>
         </el-select>
       </el-form-item>
       <el-form-item>
@@ -38,7 +38,8 @@
           size="mini"
           @click="handleAdd"
           v-hasPermi="['fantang:food:add']"
-        >新增</el-button>
+        >新增
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -48,7 +49,8 @@
           :disabled="single"
           @click="handleUpdate"
           v-hasPermi="['fantang:food:edit']"
-        >修改</el-button>
+        >修改
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -58,7 +60,8 @@
           :disabled="multiple"
           @click="handleDelete"
           v-hasPermi="['fantang:food:remove']"
-        >删除</el-button>
+        >删除
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -67,18 +70,19 @@
           size="mini"
           @click="handleExport"
           v-hasPermi="['fantang:food:export']"
-        >导出</el-button>
+        >导出
+        </el-button>
       </el-col>
-	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="foodList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column type="selection" width="55" align="center"/>
       <el-table-column label="食品id" align="center" prop="foodId" v-if="false"/>
-      <el-table-column label="名称" align="center" prop="name" />
-      <el-table-column label="图片地址" align="center" prop="pictureUrl" />
-      <el-table-column label="售价" align="center" prop="price" />
-      <el-table-column label="食品分类" align="center" prop="type" />
+      <el-table-column label="名称" align="center" prop="name"/>
+      <el-table-column label="图片地址" align="center" prop="pictureUrl"/>
+      <el-table-column label="售价" align="center" prop="price"/>
+      <el-table-column label="食品分类" align="center" prop="type"/>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -87,18 +91,20 @@
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['fantang:food:edit']"
-          >修改</el-button>
+          >修改
+          </el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['fantang:food:remove']"
-          >删除</el-button>
+          >删除
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"
@@ -111,17 +117,17 @@
     <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-item label="名称" prop="name">
-          <el-input v-model="form.name" placeholder="请输入名称" />
+          <el-input v-model="form.name" placeholder="请输入名称"/>
         </el-form-item>
         <el-form-item label="图片地址" prop="pictureUrl">
-          <el-input v-model="form.pictureUrl" placeholder="请输入图片地址" />
+          <el-input v-model="form.pictureUrl" placeholder="请输入图片地址"/>
         </el-form-item>
         <el-form-item label="售价" prop="price">
-          <el-input v-model="form.price" placeholder="请输入售价" />
+          <el-input v-model="form.price" placeholder="请输入售价"/>
         </el-form-item>
         <el-form-item label="食品分类" prop="type">
           <el-select v-model="form.type" placeholder="请选择食品分类">
-            <el-option label="请选择字典生成" value="" />
+            <el-option label="请选择字典生成" value=""/>
           </el-select>
         </el-form-item>
       </el-form>
@@ -134,12 +140,11 @@
 </template>
 
 <script>
-import { listFood, getFood, delFood, addFood, updateFood, exportFood } from "@/api/fantang/food";
+import {addFood, delFood, exportFood, getFood, listFood, updateFood} from "@/api/fantang/food";
 
 export default {
   name: "Food",
-  components: {
-  },
+  components: {},
   data() {
     return {
       // 遮罩层
@@ -173,13 +178,13 @@ export default {
       // 表单校验
       rules: {
         name: [
-          { required: true, message: "名称不能为空", trigger: "blur" }
+          {required: true, message: "名称不能为空", trigger: "blur"}
         ],
         price: [
-          { required: true, message: "售价不能为空", trigger: "blur" }
+          {required: true, message: "售价不能为空", trigger: "blur"}
         ],
         type: [
-          { required: true, message: "食品分类不能为空", trigger: "change" }
+          {required: true, message: "食品分类不能为空", trigger: "change"}
         ]
       }
     };
@@ -227,7 +232,7 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.foodId)
-      this.single = selection.length!==1
+      this.single = selection.length !== 1
       this.multiple = !selection.length
     },
     /** 新增按钮操作 */
@@ -270,28 +275,28 @@ export default {
     handleDelete(row) {
       const foodIds = row.foodId || this.ids;
       this.$confirm('是否确认删除食品管理编号为"' + foodIds + '"的数据项?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return delFood(foodIds);
-        }).then(() => {
-          this.getList();
-          this.msgSuccess("删除成功");
-        })
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(function () {
+        return delFood(foodIds);
+      }).then(() => {
+        this.getList();
+        this.msgSuccess("删除成功");
+      })
     },
     /** 导出按钮操作 */
     handleExport() {
       const queryParams = this.queryParams;
       this.$confirm('是否确认导出所有食品管理数据项?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return exportFood(queryParams);
-        }).then(response => {
-          this.download(response.msg);
-        })
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(function () {
+        return exportFood(queryParams);
+      }).then(response => {
+        this.download(response.msg);
+      })
     }
   }
 };
diff --git a/ruoyi-ui/src/views/fantang/meals/index.vue b/ruoyi-ui/src/views/fantang/meals/index.vue
index e07fa5d67..ddc7146f4 100644
--- a/ruoyi-ui/src/views/fantang/meals/index.vue
+++ b/ruoyi-ui/src/views/fantang/meals/index.vue
@@ -3,15 +3,15 @@
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="报餐日期" prop="createAt">
         <el-date-picker clearable size="small" style="width: 200px"
-          v-model="queryParams.createAt"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="选择报餐日期">
+                        v-model="queryParams.createAt"
+                        type="date"
+                        value-format="yyyy-MM-dd"
+                        placeholder="选择报餐日期">
         </el-date-picker>
       </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 label="请选择字典生成" value=""/>
         </el-select>
       </el-form-item>
       <el-form-item label="报餐人" prop="createBy">
@@ -46,7 +46,8 @@
           size="mini"
           @click="handleAdd"
           v-hasPermi="['fantang:meals:add']"
-        >新增</el-button>
+        >新增
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -56,7 +57,8 @@
           :disabled="single"
           @click="handleUpdate"
           v-hasPermi="['fantang:meals:edit']"
-        >修改</el-button>
+        >修改
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -66,7 +68,8 @@
           :disabled="multiple"
           @click="handleDelete"
           v-hasPermi="['fantang:meals:remove']"
-        >删除</el-button>
+        >删除
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -75,23 +78,24 @@
           size="mini"
           @click="handleExport"
           v-hasPermi="['fantang:meals:export']"
-        >导出</el-button>
+        >导出
+        </el-button>
       </el-col>
-	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="mealsList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column type="selection" width="55" align="center"/>
       <el-table-column label="总价" align="center" prop="id" v-if="false"/>
       <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="type" />
-      <el-table-column label="报餐人" align="center" prop="createBy" />
-      <el-table-column label="订单列表" align="center" prop="foods" />
-      <el-table-column label="总价" align="center" prop="price" />
+      <el-table-column label="报餐类型" align="center" prop="type"/>
+      <el-table-column label="报餐人" align="center" prop="createBy"/>
+      <el-table-column label="订单列表" align="center" prop="foods"/>
+      <el-table-column label="总价" align="center" prop="price"/>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -100,18 +104,20 @@
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['fantang:meals:edit']"
-          >修改</el-button>
+          >修改
+          </el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['fantang:meals:remove']"
-          >删除</el-button>
+          >删除
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"
@@ -125,22 +131,22 @@
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="报餐日期" prop="createAt">
           <el-date-picker clearable size="small" style="width: 200px"
-            v-model="form.createAt"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="选择报餐日期">
+                          v-model="form.createAt"
+                          type="date"
+                          value-format="yyyy-MM-dd"
+                          placeholder="选择报餐日期">
           </el-date-picker>
         </el-form-item>
         <el-form-item label="报餐类型" prop="type">
           <el-select v-model="form.type" placeholder="请选择报餐类型">
-            <el-option label="请选择字典生成" value="" />
+            <el-option label="请选择字典生成" value=""/>
           </el-select>
         </el-form-item>
         <el-form-item label="订单列表" prop="foods">
-          <el-input v-model="form.foods" placeholder="请输入订单列表" />
+          <el-input v-model="form.foods" placeholder="请输入订单列表"/>
         </el-form-item>
         <el-form-item label="总价" prop="price">
-          <el-input v-model="form.price" placeholder="请输入总价" />
+          <el-input v-model="form.price" placeholder="请输入总价"/>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -152,12 +158,11 @@
 </template>
 
 <script>
-import { listMeals, getMeals, delMeals, addMeals, updateMeals, exportMeals } from "@/api/fantang/meals";
+import {addMeals, delMeals, exportMeals, getMeals, listMeals, updateMeals} from "@/api/fantang/meals";
 
 export default {
   name: "Meals",
-  components: {
-  },
+  components: {},
   data() {
     return {
       // 遮罩层
@@ -192,19 +197,19 @@ export default {
       // 表单校验
       rules: {
         createAt: [
-          { required: true, message: "报餐日期不能为空", trigger: "blur" }
+          {required: true, message: "报餐日期不能为空", trigger: "blur"}
         ],
         type: [
-          { required: true, message: "报餐类型不能为空", trigger: "change" }
+          {required: true, message: "报餐类型不能为空", trigger: "change"}
         ],
         createBy: [
-          { required: true, message: "报餐人不能为空", trigger: "blur" }
+          {required: true, message: "报餐人不能为空", trigger: "blur"}
         ],
         foods: [
-          { required: true, message: "订单列表不能为空", trigger: "blur" }
+          {required: true, message: "订单列表不能为空", trigger: "blur"}
         ],
         price: [
-          { required: true, message: "总价不能为空", trigger: "blur" }
+          {required: true, message: "总价不能为空", trigger: "blur"}
         ],
       }
     };
@@ -254,7 +259,7 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.id)
-      this.single = selection.length!==1
+      this.single = selection.length !== 1
       this.multiple = !selection.length
     },
     /** 新增按钮操作 */
@@ -297,28 +302,28 @@ export default {
     handleDelete(row) {
       const ids = row.id || this.ids;
       this.$confirm('是否确认删除报餐管理编号为"' + ids + '"的数据项?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return delMeals(ids);
-        }).then(() => {
-          this.getList();
-          this.msgSuccess("删除成功");
-        })
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(function () {
+        return delMeals(ids);
+      }).then(() => {
+        this.getList();
+        this.msgSuccess("删除成功");
+      })
     },
     /** 导出按钮操作 */
     handleExport() {
       const queryParams = this.queryParams;
       this.$confirm('是否确认导出所有报餐管理数据项?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return exportMeals(queryParams);
-        }).then(response => {
-          this.download(response.msg);
-        })
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(function () {
+        return exportMeals(queryParams);
+      }).then(response => {
+        this.download(response.msg);
+      })
     }
   }
 };
diff --git a/ruoyi-ui/src/views/fantang/order/index.vue b/ruoyi-ui/src/views/fantang/order/index.vue
index 08cb346ed..59db8fc0e 100644
--- a/ruoyi-ui/src/views/fantang/order/index.vue
+++ b/ruoyi-ui/src/views/fantang/order/index.vue
@@ -3,7 +3,7 @@
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="订单类型" prop="orderType">
         <el-select v-model="queryParams.orderType" placeholder="请选择订单类型" clearable size="small">
-          <el-option label="请选择字典生成" value="" />
+          <el-option label="请选择字典生成" value=""/>
         </el-select>
       </el-form-item>
       <el-form-item label="总价" prop="totalPrice">
@@ -35,10 +35,10 @@
       </el-form-item>
       <el-form-item label="创建时间" prop="createAt">
         <el-date-picker clearable size="small" style="width: 200px"
-          v-model="queryParams.createAt"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="选择创建时间">
+                        v-model="queryParams.createAt"
+                        type="date"
+                        value-format="yyyy-MM-dd"
+                        placeholder="选择创建时间">
         </el-date-picker>
       </el-form-item>
       <el-form-item label="订单来源" prop="orderSrc">
@@ -61,15 +61,15 @@
       </el-form-item>
       <el-form-item label="支付方式" prop="payType">
         <el-select v-model="queryParams.payType" placeholder="请选择支付方式" clearable size="small">
-          <el-option label="请选择字典生成" value="" />
+          <el-option label="请选择字典生成" value=""/>
         </el-select>
       </el-form-item>
       <el-form-item label="核销时间" prop="writeOffAt">
         <el-date-picker clearable size="small" style="width: 200px"
-          v-model="queryParams.writeOffAt"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="选择核销时间">
+                        v-model="queryParams.writeOffAt"
+                        type="date"
+                        value-format="yyyy-MM-dd"
+                        placeholder="选择核销时间">
         </el-date-picker>
       </el-form-item>
       <el-form-item>
@@ -86,7 +86,8 @@
           size="mini"
           @click="handleAdd"
           v-hasPermi="['fantang:order:add']"
-        >新增</el-button>
+        >新增
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -96,7 +97,8 @@
           :disabled="single"
           @click="handleUpdate"
           v-hasPermi="['fantang:order:edit']"
-        >修改</el-button>
+        >修改
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -106,7 +108,8 @@
           :disabled="multiple"
           @click="handleDelete"
           v-hasPermi="['fantang:order:remove']"
-        >删除</el-button>
+        >删除
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -115,33 +118,34 @@
           size="mini"
           @click="handleExport"
           v-hasPermi="['fantang:order:export']"
-        >导出</el-button>
+        >导出
+        </el-button>
       </el-col>
-	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="orderList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column type="selection" width="55" align="center"/>
       <el-table-column label="订单 id" align="center" prop="orderId" v-if="false"/>
-      <el-table-column label="订单类型" align="center" prop="orderType" />
-      <el-table-column label="清单" align="center" prop="orderList" />
-      <el-table-column label="总价" align="center" prop="totalPrice" />
-      <el-table-column label="折扣" align="center" prop="discount" />
-      <el-table-column label="实收" align="center" prop="receipts" />
+      <el-table-column label="订单类型" align="center" prop="orderType"/>
+      <el-table-column label="清单" align="center" prop="orderList"/>
+      <el-table-column label="总价" align="center" prop="totalPrice"/>
+      <el-table-column label="折扣" align="center" prop="discount"/>
+      <el-table-column label="实收" align="center" prop="receipts"/>
       <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="orderSrc" />
-      <el-table-column label="订单现售" align="center" prop="currentPrice" />
-      <el-table-column label="支付方式" align="center" prop="payType" />
+      <el-table-column label="订单来源" align="center" prop="orderSrc"/>
+      <el-table-column label="订单现售" align="center" prop="currentPrice"/>
+      <el-table-column label="支付方式" align="center" prop="payType"/>
       <el-table-column label="核销时间" align="center" prop="writeOffAt" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.writeOffAt, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="是否过期" align="center" prop="isExpired" />
+      <el-table-column label="是否过期" align="center" prop="isExpired"/>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -150,18 +154,20 @@
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['fantang:order:edit']"
-          >修改</el-button>
+          >修改
+          </el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['fantang:order:remove']"
-          >删除</el-button>
+          >删除
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"
@@ -175,35 +181,35 @@
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="订单类型" prop="orderType">
           <el-select v-model="form.orderType" placeholder="请选择订单类型">
-            <el-option label="请选择字典生成" value="" />
+            <el-option label="请选择字典生成" value=""/>
           </el-select>
         </el-form-item>
         <el-form-item label="清单" prop="orderList">
-          <el-input v-model="form.orderList" placeholder="请输入清单" />
+          <el-input v-model="form.orderList" placeholder="请输入清单"/>
         </el-form-item>
         <el-form-item label="总价" prop="totalPrice">
-          <el-input v-model="form.totalPrice" placeholder="请输入总价" />
+          <el-input v-model="form.totalPrice" placeholder="请输入总价"/>
         </el-form-item>
         <el-form-item label="折扣" prop="discount">
-          <el-input v-model="form.discount" placeholder="请输入折扣" />
+          <el-input v-model="form.discount" placeholder="请输入折扣"/>
         </el-form-item>
         <el-form-item label="实收" prop="receipts">
-          <el-input v-model="form.receipts" placeholder="请输入实收" />
+          <el-input v-model="form.receipts" placeholder="请输入实收"/>
         </el-form-item>
         <el-form-item label="订单来源" prop="orderSrc">
-          <el-input v-model="form.orderSrc" placeholder="请输入订单来源" />
+          <el-input v-model="form.orderSrc" placeholder="请输入订单来源"/>
         </el-form-item>
         <el-form-item label="订单现售" prop="currentPrice">
-          <el-input v-model="form.currentPrice" placeholder="请输入订单现售" />
+          <el-input v-model="form.currentPrice" placeholder="请输入订单现售"/>
         </el-form-item>
         <el-form-item label="支付方式" prop="payType">
           <el-select v-model="form.payType" placeholder="请选择支付方式">
-            <el-option label="请选择字典生成" value="" />
+            <el-option label="请选择字典生成" value=""/>
           </el-select>
         </el-form-item>
         <el-form-item label="是否过期" prop="isExpired">
           <el-select v-model="form.isExpired" placeholder="请选择是否过期">
-            <el-option label="请选择字典生成" value="" />
+            <el-option label="请选择字典生成" value=""/>
           </el-select>
         </el-form-item>
       </el-form>
@@ -216,12 +222,11 @@
 </template>
 
 <script>
-import { listOrder, getOrder, delOrder, addOrder, updateOrder, exportOrder } from "@/api/fantang/order";
+import {addOrder, delOrder, exportOrder, getOrder, listOrder, updateOrder} from "@/api/fantang/order";
 
 export default {
   name: "Order",
-  components: {
-  },
+  components: {},
   data() {
     return {
       // 遮罩层
@@ -261,28 +266,28 @@ export default {
       // 表单校验
       rules: {
         orderType: [
-          { required: true, message: "订单类型不能为空", trigger: "change" }
+          {required: true, message: "订单类型不能为空", trigger: "change"}
         ],
         orderList: [
-          { required: true, message: "清单不能为空", trigger: "blur" }
+          {required: true, message: "清单不能为空", trigger: "blur"}
         ],
         totalPrice: [
-          { required: true, message: "总价不能为空", trigger: "blur" }
+          {required: true, message: "总价不能为空", trigger: "blur"}
         ],
         discount: [
-          { required: true, message: "折扣不能为空", trigger: "blur" }
+          {required: true, message: "折扣不能为空", trigger: "blur"}
         ],
         receipts: [
-          { required: true, message: "实收不能为空", trigger: "blur" }
+          {required: true, message: "实收不能为空", trigger: "blur"}
         ],
         orderSrc: [
-          { required: true, message: "订单来源不能为空", trigger: "blur" }
+          {required: true, message: "订单来源不能为空", trigger: "blur"}
         ],
         currentPrice: [
-          { required: true, message: "订单现售不能为空", trigger: "blur" }
+          {required: true, message: "订单现售不能为空", trigger: "blur"}
         ],
         isExpired: [
-          { required: true, message: "是否过期不能为空", trigger: "change" }
+          {required: true, message: "是否过期不能为空", trigger: "change"}
         ],
       }
     };
@@ -342,7 +347,7 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.orderId)
-      this.single = selection.length!==1
+      this.single = selection.length !== 1
       this.multiple = !selection.length
     },
     /** 新增按钮操作 */
@@ -385,28 +390,28 @@ export default {
     handleDelete(row) {
       const orderIds = row.orderId || this.ids;
       this.$confirm('是否确认删除订单管理编号为"' + orderIds + '"的数据项?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return delOrder(orderIds);
-        }).then(() => {
-          this.getList();
-          this.msgSuccess("删除成功");
-        })
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(function () {
+        return delOrder(orderIds);
+      }).then(() => {
+        this.getList();
+        this.msgSuccess("删除成功");
+      })
     },
     /** 导出按钮操作 */
     handleExport() {
       const queryParams = this.queryParams;
       this.$confirm('是否确认导出所有订单管理数据项?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return exportOrder(queryParams);
-        }).then(response => {
-          this.download(response.msg);
-        })
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(function () {
+        return exportOrder(queryParams);
+      }).then(response => {
+        this.download(response.msg);
+      })
     }
   }
 };
diff --git a/ruoyi-ui/src/views/fantang/patient/index.vue b/ruoyi-ui/src/views/fantang/patient/index.vue
index 591aa6d33..995877a94 100644
--- a/ruoyi-ui/src/views/fantang/patient/index.vue
+++ b/ruoyi-ui/src/views/fantang/patient/index.vue
@@ -33,7 +33,8 @@
           size="mini"
           @click="handleAdd"
           v-hasPermi="['fantang:patient:add']"
-        >新增</el-button>
+        >新增
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -43,7 +44,8 @@
           :disabled="single"
           @click="handleUpdate"
           v-hasPermi="['fantang:patient:edit']"
-        >修改</el-button>
+        >修改
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -53,7 +55,8 @@
           :disabled="multiple"
           @click="handleDelete"
           v-hasPermi="['fantang:patient:remove']"
-        >删除</el-button>
+        >删除
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -62,16 +65,17 @@
           size="mini"
           @click="handleExport"
           v-hasPermi="['fantang:patient:export']"
-        >导出</el-button>
+        >导出
+        </el-button>
       </el-col>
-	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="patientList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column type="selection" width="55" align="center"/>
       <el-table-column label="病人id" align="center" prop="patientId" v-if="false"/>
-      <el-table-column label="姓名" align="center" prop="name" />
-      <el-table-column label="床号" align="center" prop="bedId" />
+      <el-table-column label="姓名" align="center" prop="name"/>
+      <el-table-column label="床号" align="center" prop="bedId"/>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -80,18 +84,20 @@
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['fantang:patient:edit']"
-          >修改</el-button>
+          >修改
+          </el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['fantang:patient:remove']"
-          >删除</el-button>
+          >删除
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"
@@ -104,10 +110,10 @@
     <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-item label="姓名" prop="name">
-          <el-input v-model="form.name" placeholder="请输入姓名" />
+          <el-input v-model="form.name" placeholder="请输入姓名"/>
         </el-form-item>
         <el-form-item label="床号" prop="bedId">
-          <el-input v-model="form.bedId" placeholder="请输入床号" />
+          <el-input v-model="form.bedId" placeholder="请输入床号"/>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -119,12 +125,11 @@
 </template>
 
 <script>
-import { listPatient, getPatient, delPatient, addPatient, updatePatient, exportPatient } from "@/api/fantang/patient";
+import {addPatient, delPatient, exportPatient, getPatient, listPatient, updatePatient} from "@/api/fantang/patient";
 
 export default {
   name: "Patient",
-  components: {
-  },
+  components: {},
   data() {
     return {
       // 遮罩层
@@ -157,10 +162,10 @@ export default {
       // 表单校验
       rules: {
         name: [
-          { required: true, message: "姓名不能为空", trigger: "blur" }
+          {required: true, message: "姓名不能为空", trigger: "blur"}
         ],
         bedId: [
-          { required: true, message: "床号不能为空", trigger: "blur" }
+          {required: true, message: "床号不能为空", trigger: "blur"}
         ]
       }
     };
@@ -206,7 +211,7 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.patientId)
-      this.single = selection.length!==1
+      this.single = selection.length !== 1
       this.multiple = !selection.length
     },
     /** 新增按钮操作 */
@@ -249,28 +254,28 @@ export default {
     handleDelete(row) {
       const patientIds = row.patientId || this.ids;
       this.$confirm('是否确认删除病人管理编号为"' + patientIds + '"的数据项?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return delPatient(patientIds);
-        }).then(() => {
-          this.getList();
-          this.msgSuccess("删除成功");
-        })
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(function () {
+        return delPatient(patientIds);
+      }).then(() => {
+        this.getList();
+        this.msgSuccess("删除成功");
+      })
     },
     /** 导出按钮操作 */
     handleExport() {
       const queryParams = this.queryParams;
       this.$confirm('是否确认导出所有病人管理数据项?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return exportPatient(queryParams);
-        }).then(response => {
-          this.download(response.msg);
-        })
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(function () {
+        return exportPatient(queryParams);
+      }).then(response => {
+        this.download(response.msg);
+      })
     }
   }
 };
diff --git a/ruoyi-ui/src/views/fantang/prepayment/index.vue b/ruoyi-ui/src/views/fantang/prepayment/index.vue
index a40b515fb..f2b561bca 100644
--- a/ruoyi-ui/src/views/fantang/prepayment/index.vue
+++ b/ruoyi-ui/src/views/fantang/prepayment/index.vue
@@ -3,18 +3,18 @@
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="收款时间" prop="collectAt">
         <el-date-picker clearable size="small" style="width: 200px"
-          v-model="queryParams.collectAt"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="选择收款时间">
+                        v-model="queryParams.collectAt"
+                        type="date"
+                        value-format="yyyy-MM-dd"
+                        placeholder="选择收款时间">
         </el-date-picker>
       </el-form-item>
       <el-form-item label="结算时间" prop="settlementAt">
         <el-date-picker clearable size="small" style="width: 200px"
-          v-model="queryParams.settlementAt"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="选择结算时间">
+                        v-model="queryParams.settlementAt"
+                        type="date"
+                        value-format="yyyy-MM-dd"
+                        placeholder="选择结算时间">
         </el-date-picker>
       </el-form-item>
       <el-form-item label="结算标志" prop="settlementFlag">
@@ -26,6 +26,23 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="预付费金额" prop="prepaid">
+        <el-input
+          v-model="queryParams.prepaid"
+          placeholder="请输入预付费金额"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="预付费时间" prop="prepaidAt">
+        <el-date-picker clearable size="small" style="width: 200px"
+                        v-model="queryParams.prepaidAt"
+                        type="date"
+                        value-format="yyyy-MM-dd"
+                        placeholder="选择预付费时间">
+        </el-date-picker>
+      </el-form-item>
       <el-form-item>
         <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -40,7 +57,8 @@
           size="mini"
           @click="handleAdd"
           v-hasPermi="['fantang:prepayment:add']"
-        >新增</el-button>
+        >新增
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -50,7 +68,8 @@
           :disabled="single"
           @click="handleUpdate"
           v-hasPermi="['fantang:prepayment:edit']"
-        >修改</el-button>
+        >修改
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -60,7 +79,8 @@
           :disabled="multiple"
           @click="handleDelete"
           v-hasPermi="['fantang:prepayment:remove']"
-        >删除</el-button>
+        >删除
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -69,13 +89,14 @@
           size="mini"
           @click="handleExport"
           v-hasPermi="['fantang:prepayment:export']"
-        >导出</el-button>
+        >导出
+        </el-button>
       </el-col>
-	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="prepaymentList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column type="selection" width="55" align="center"/>
       <el-table-column label="预付费id" align="center" prop="prepaymentId" v-if="false"/>
       <el-table-column label="收款时间" align="center" prop="collectAt" width="180">
         <template slot-scope="scope">
@@ -87,7 +108,13 @@
           <span>{{ parseTime(scope.row.settlementAt, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="结算标志" align="center" prop="settlementFlag" />
+      <el-table-column label="结算标志" align="center" prop="settlementFlag"/>
+      <el-table-column label="预付费金额" align="center" prop="prepaid"/>
+      <el-table-column label="预付费时间" align="center" prop="prepaidAt" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.prepaidAt, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -96,18 +123,20 @@
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['fantang:prepayment:edit']"
-          >修改</el-button>
+          >修改
+          </el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['fantang:prepayment:remove']"
-          >删除</el-button>
+          >删除
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"
@@ -119,6 +148,20 @@
     <!-- 添加或修改收费管理对话框 -->
     <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-item label="病人id" prop="patientId">
+          <el-input v-model="form.patientId" placeholder="请输入病人id"/>
+        </el-form-item>
+        <el-form-item label="预付费金额" prop="prepaid">
+          <el-input v-model="form.prepaid" placeholder="请输入预付费金额"/>
+        </el-form-item>
+        <el-form-item label="预付费时间" prop="prepaidAt">
+          <el-date-picker clearable size="small" style="width: 200px"
+                          v-model="form.prepaidAt"
+                          type="date"
+                          value-format="yyyy-MM-dd"
+                          placeholder="选择预付费时间">
+          </el-date-picker>
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -129,12 +172,18 @@
 </template>
 
 <script>
-import { listPrepayment, getPrepayment, delPrepayment, addPrepayment, updatePrepayment, exportPrepayment } from "@/api/fantang/prepayment";
+import {
+  addPrepayment,
+  delPrepayment,
+  exportPrepayment,
+  getPrepayment,
+  listPrepayment,
+  updatePrepayment
+} from "@/api/fantang/prepayment";
 
 export default {
   name: "Prepayment",
-  components: {
-  },
+  components: {},
   data() {
     return {
       // 遮罩层
@@ -161,12 +210,23 @@ export default {
         pageSize: 10,
         collectAt: null,
         settlementAt: null,
-        settlementFlag: null
+        settlementFlag: null,
+        prepaid: null,
+        prepaidAt: null
       },
       // 表单参数
       form: {},
       // 表单校验
       rules: {
+        patientId: [
+          {required: true, message: "病人id不能为空", trigger: "blur"}
+        ],
+        prepaid: [
+          {required: true, message: "预付费金额不能为空", trigger: "blur"}
+        ],
+        prepaidAt: [
+          {required: true, message: "预付费时间不能为空", trigger: "blur"}
+        ]
       }
     };
   },
@@ -198,7 +258,9 @@ export default {
         settlementAt: null,
         settlementBy: null,
         settlementId: null,
-        settlementFlag: null
+        settlementFlag: null,
+        prepaid: null,
+        prepaidAt: null
       };
       this.resetForm("form");
     },
@@ -215,7 +277,7 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.prepaymentId)
-      this.single = selection.length!==1
+      this.single = selection.length !== 1
       this.multiple = !selection.length
     },
     /** 新增按钮操作 */
@@ -258,28 +320,28 @@ export default {
     handleDelete(row) {
       const prepaymentIds = row.prepaymentId || this.ids;
       this.$confirm('是否确认删除收费管理编号为"' + prepaymentIds + '"的数据项?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return delPrepayment(prepaymentIds);
-        }).then(() => {
-          this.getList();
-          this.msgSuccess("删除成功");
-        })
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(function () {
+        return delPrepayment(prepaymentIds);
+      }).then(() => {
+        this.getList();
+        this.msgSuccess("删除成功");
+      })
     },
     /** 导出按钮操作 */
     handleExport() {
       const queryParams = this.queryParams;
       this.$confirm('是否确认导出所有收费管理数据项?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return exportPrepayment(queryParams);
-        }).then(response => {
-          this.download(response.msg);
-        })
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(function () {
+        return exportPrepayment(queryParams);
+      }).then(response => {
+        this.download(response.msg);
+      })
     }
   }
 };
diff --git a/ruoyi-ui/src/views/fantang/settle/index.vue b/ruoyi-ui/src/views/fantang/settle/index.vue
index c6a45a466..31f7d3a07 100644
--- a/ruoyi-ui/src/views/fantang/settle/index.vue
+++ b/ruoyi-ui/src/views/fantang/settle/index.vue
@@ -3,10 +3,10 @@
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="结算日期" prop="settleAt">
         <el-date-picker clearable size="small" style="width: 200px"
-          v-model="queryParams.settleAt"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="选择结算日期">
+                        v-model="queryParams.settleAt"
+                        type="date"
+                        value-format="yyyy-MM-dd"
+                        placeholder="选择结算日期">
         </el-date-picker>
       </el-form-item>
       <el-form-item label="结算总价" prop="price">
@@ -38,7 +38,7 @@
       </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 label="请选择字典生成" value=""/>
         </el-select>
       </el-form-item>
       <el-form-item label="退款总额" prop="refund">
@@ -64,7 +64,8 @@
           size="mini"
           @click="handleAdd"
           v-hasPermi="['fantang:settle:add']"
-        >新增</el-button>
+        >新增
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -74,7 +75,8 @@
           :disabled="single"
           @click="handleUpdate"
           v-hasPermi="['fantang:settle:edit']"
-        >修改</el-button>
+        >修改
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -84,7 +86,8 @@
           :disabled="multiple"
           @click="handleDelete"
           v-hasPermi="['fantang:settle:remove']"
-        >删除</el-button>
+        >删除
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -93,25 +96,26 @@
           size="mini"
           @click="handleExport"
           v-hasPermi="['fantang:settle:export']"
-        >导出</el-button>
+        >导出
+        </el-button>
       </el-col>
-	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="settleList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column type="selection" width="55" align="center"/>
       <el-table-column label="结算 id" align="center" prop="settleId" v-if="false"/>
       <el-table-column label="结算日期" align="center" prop="settleAt" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.settleAt, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="记录清单" align="center" prop="list" />
-      <el-table-column label="结算总价" align="center" prop="price" />
-      <el-table-column label="应收" align="center" prop="payable" />
-      <el-table-column label="实收" align="center" prop="receipts" />
-      <el-table-column label="结算类型" align="center" prop="type" />
-      <el-table-column label="退款总额" align="center" prop="refund" />
+      <el-table-column label="记录清单" align="center" prop="list"/>
+      <el-table-column label="结算总价" align="center" prop="price"/>
+      <el-table-column label="应收" align="center" prop="payable"/>
+      <el-table-column label="实收" align="center" prop="receipts"/>
+      <el-table-column label="结算类型" align="center" prop="type"/>
+      <el-table-column label="退款总额" align="center" prop="refund"/>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -120,18 +124,20 @@
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['fantang:settle:edit']"
-          >修改</el-button>
+          >修改
+          </el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['fantang:settle:remove']"
-          >删除</el-button>
+          >删除
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"
@@ -144,24 +150,24 @@
     <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-item label="记录清单" prop="list">
-          <el-input v-model="form.list" placeholder="请输入记录清单" />
+          <el-input v-model="form.list" placeholder="请输入记录清单"/>
         </el-form-item>
         <el-form-item label="结算总价" prop="price">
-          <el-input v-model="form.price" placeholder="请输入结算总价" />
+          <el-input v-model="form.price" placeholder="请输入结算总价"/>
         </el-form-item>
         <el-form-item label="应收" prop="payable">
-          <el-input v-model="form.payable" placeholder="请输入应收" />
+          <el-input v-model="form.payable" placeholder="请输入应收"/>
         </el-form-item>
         <el-form-item label="实收" prop="receipts">
-          <el-input v-model="form.receipts" placeholder="请输入实收" />
+          <el-input v-model="form.receipts" placeholder="请输入实收"/>
         </el-form-item>
         <el-form-item label="结算类型" prop="type">
           <el-select v-model="form.type" placeholder="请选择结算类型">
-            <el-option label="请选择字典生成" value="" />
+            <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="form.refund" placeholder="请输入退款总额"/>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -173,12 +179,11 @@
 </template>
 
 <script>
-import { listSettle, getSettle, delSettle, addSettle, updateSettle, exportSettle } from "@/api/fantang/settle";
+import {addSettle, delSettle, exportSettle, getSettle, listSettle, updateSettle} from "@/api/fantang/settle";
 
 export default {
   name: "Settle",
-  components: {
-  },
+  components: {},
   data() {
     return {
       // 遮罩层
@@ -215,22 +220,22 @@ export default {
       // 表单校验
       rules: {
         list: [
-          { required: true, message: "记录清单不能为空", trigger: "blur" }
+          {required: true, message: "记录清单不能为空", trigger: "blur"}
         ],
         price: [
-          { required: true, message: "结算总价不能为空", trigger: "blur" }
+          {required: true, message: "结算总价不能为空", trigger: "blur"}
         ],
         payable: [
-          { required: true, message: "应收不能为空", trigger: "blur" }
+          {required: true, message: "应收不能为空", trigger: "blur"}
         ],
         receipts: [
-          { required: true, message: "实收不能为空", trigger: "blur" }
+          {required: true, message: "实收不能为空", trigger: "blur"}
         ],
         type: [
-          { required: true, message: "结算类型不能为空", trigger: "change" }
+          {required: true, message: "结算类型不能为空", trigger: "change"}
         ],
         refund: [
-          { required: true, message: "退款总额不能为空", trigger: "blur" }
+          {required: true, message: "退款总额不能为空", trigger: "blur"}
         ]
       }
     };
@@ -283,7 +288,7 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.settleId)
-      this.single = selection.length!==1
+      this.single = selection.length !== 1
       this.multiple = !selection.length
     },
     /** 新增按钮操作 */
@@ -326,28 +331,28 @@ export default {
     handleDelete(row) {
       const settleIds = row.settleId || this.ids;
       this.$confirm('是否确认删除结算报编号为"' + settleIds + '"的数据项?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return delSettle(settleIds);
-        }).then(() => {
-          this.getList();
-          this.msgSuccess("删除成功");
-        })
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(function () {
+        return delSettle(settleIds);
+      }).then(() => {
+        this.getList();
+        this.msgSuccess("删除成功");
+      })
     },
     /** 导出按钮操作 */
     handleExport() {
       const queryParams = this.queryParams;
       this.$confirm('是否确认导出所有结算报数据项?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return exportSettle(queryParams);
-        }).then(response => {
-          this.download(response.msg);
-        })
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(function () {
+        return exportSettle(queryParams);
+      }).then(response => {
+        this.download(response.msg);
+      })
     }
   }
 };
diff --git a/ruoyi-ui/src/views/fantang/staffInfo/index.vue b/ruoyi-ui/src/views/fantang/staffInfo/index.vue
index 4f54f0b3f..d1d466688 100644
--- a/ruoyi-ui/src/views/fantang/staffInfo/index.vue
+++ b/ruoyi-ui/src/views/fantang/staffInfo/index.vue
@@ -42,7 +42,8 @@
           size="mini"
           @click="handleAdd"
           v-hasPermi="['fantang:staffInfo:add']"
-        >新增</el-button>
+        >新增
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -52,7 +53,8 @@
           :disabled="single"
           @click="handleUpdate"
           v-hasPermi="['fantang:staffInfo:edit']"
-        >修改</el-button>
+        >修改
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -62,7 +64,8 @@
           :disabled="multiple"
           @click="handleDelete"
           v-hasPermi="['fantang:staffInfo:remove']"
-        >删除</el-button>
+        >删除
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -71,18 +74,19 @@
           size="mini"
           @click="handleExport"
           v-hasPermi="['fantang:staffInfo:export']"
-        >导出</el-button>
+        >导出
+        </el-button>
       </el-col>
-	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="staffInfoList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column type="selection" width="55" align="center"/>
       <el-table-column label="员工 id" align="center" prop="staffId" v-if="false"/>
-      <el-table-column label="姓名" align="center" prop="name" />
-      <el-table-column label="岗位" align="center" prop="post" />
-      <el-table-column label="角色" align="center" prop="role" />
-      <el-table-column label="补贴余额" align="center" prop="balance" />
+      <el-table-column label="姓名" align="center" prop="name"/>
+      <el-table-column label="岗位" align="center" prop="post"/>
+      <el-table-column label="角色" align="center" prop="role"/>
+      <el-table-column label="补贴余额" align="center" prop="balance"/>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -91,18 +95,20 @@
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['fantang:staffInfo:edit']"
-          >修改</el-button>
+          >修改
+          </el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['fantang:staffInfo:remove']"
-          >删除</el-button>
+          >删除
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"
@@ -115,19 +121,19 @@
     <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-item label="姓名" prop="name">
-          <el-input v-model="form.name" placeholder="请输入姓名" />
+          <el-input v-model="form.name" placeholder="请输入姓名"/>
         </el-form-item>
         <el-form-item label="岗位" prop="post">
-          <el-input v-model="form.post" placeholder="请输入岗位" />
+          <el-input v-model="form.post" placeholder="请输入岗位"/>
         </el-form-item>
         <el-form-item label="角色" prop="role">
-          <el-input v-model="form.role" placeholder="请输入角色" />
+          <el-input v-model="form.role" placeholder="请输入角色"/>
         </el-form-item>
         <el-form-item label="密码" prop="password">
-          <el-input v-model="form.password" placeholder="请输入密码" />
+          <el-input v-model="form.password" placeholder="请输入密码"/>
         </el-form-item>
         <el-form-item label="补贴余额" prop="balance">
-          <el-input v-model="form.balance" placeholder="请输入补贴余额" />
+          <el-input v-model="form.balance" placeholder="请输入补贴余额"/>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -139,12 +145,18 @@
 </template>
 
 <script>
-import { listStaffInfo, getStaffInfo, delStaffInfo, addStaffInfo, updateStaffInfo, exportStaffInfo } from "@/api/fantang/staffInfo";
+import {
+  addStaffInfo,
+  delStaffInfo,
+  exportStaffInfo,
+  getStaffInfo,
+  listStaffInfo,
+  updateStaffInfo
+} from "@/api/fantang/staffInfo";
 
 export default {
   name: "StaffInfo",
-  components: {
-  },
+  components: {},
   data() {
     return {
       // 遮罩层
@@ -178,19 +190,19 @@ export default {
       // 表单校验
       rules: {
         name: [
-          { required: true, message: "姓名不能为空", trigger: "blur" }
+          {required: true, message: "姓名不能为空", trigger: "blur"}
         ],
         post: [
-          { required: true, message: "岗位不能为空", trigger: "blur" }
+          {required: true, message: "岗位不能为空", trigger: "blur"}
         ],
         role: [
-          { required: true, message: "角色不能为空", trigger: "blur" }
+          {required: true, message: "角色不能为空", trigger: "blur"}
         ],
         password: [
-          { required: true, message: "密码不能为空", trigger: "blur" }
+          {required: true, message: "密码不能为空", trigger: "blur"}
         ],
         balance: [
-          { required: true, message: "补贴余额不能为空", trigger: "blur" }
+          {required: true, message: "补贴余额不能为空", trigger: "blur"}
         ]
       }
     };
@@ -242,7 +254,7 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.staffId)
-      this.single = selection.length!==1
+      this.single = selection.length !== 1
       this.multiple = !selection.length
     },
     /** 新增按钮操作 */
@@ -285,28 +297,28 @@ export default {
     handleDelete(row) {
       const staffIds = row.staffId || this.ids;
       this.$confirm('是否确认删除员工管理编号为"' + staffIds + '"的数据项?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return delStaffInfo(staffIds);
-        }).then(() => {
-          this.getList();
-          this.msgSuccess("删除成功");
-        })
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(function () {
+        return delStaffInfo(staffIds);
+      }).then(() => {
+        this.getList();
+        this.msgSuccess("删除成功");
+      })
     },
     /** 导出按钮操作 */
     handleExport() {
       const queryParams = this.queryParams;
       this.$confirm('是否确认导出所有员工管理数据项?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return exportStaffInfo(queryParams);
-        }).then(response => {
-          this.download(response.msg);
-        })
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(function () {
+        return exportStaffInfo(queryParams);
+      }).then(response => {
+        this.download(response.msg);
+      })
     }
   }
 };
diff --git a/ruoyi-ui/src/views/fantang/staffSubsidy/index.vue b/ruoyi-ui/src/views/fantang/staffSubsidy/index.vue
index 9a32babb0..fb3b19c94 100644
--- a/ruoyi-ui/src/views/fantang/staffSubsidy/index.vue
+++ b/ruoyi-ui/src/views/fantang/staffSubsidy/index.vue
@@ -3,12 +3,12 @@
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="补贴类型" prop="subsidyType">
         <el-select v-model="queryParams.subsidyType" placeholder="请选择补贴类型" clearable size="small">
-          <el-option label="请选择字典生成" value="" />
+          <el-option label="请选择字典生成" value=""/>
         </el-select>
       </el-form-item>
       <el-form-item label="收支类型" prop="incomeType">
         <el-select v-model="queryParams.incomeType" placeholder="请选择收支类型" clearable size="small">
-          <el-option label="请选择字典生成" value="" />
+          <el-option label="请选择字典生成" value=""/>
         </el-select>
       </el-form-item>
       <el-form-item label="金额" prop="price">
@@ -22,10 +22,10 @@
       </el-form-item>
       <el-form-item label="消费日期" prop="consumAt">
         <el-date-picker clearable size="small" style="width: 200px"
-          v-model="queryParams.consumAt"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="选择消费日期">
+                        v-model="queryParams.consumAt"
+                        type="date"
+                        value-format="yyyy-MM-dd"
+                        placeholder="选择消费日期">
         </el-date-picker>
       </el-form-item>
       <el-form-item>
@@ -42,7 +42,8 @@
           size="mini"
           @click="handleAdd"
           v-hasPermi="['fantang:staffSubsidy:add']"
-        >新增</el-button>
+        >新增
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -52,7 +53,8 @@
           :disabled="single"
           @click="handleUpdate"
           v-hasPermi="['fantang:staffSubsidy:edit']"
-        >修改</el-button>
+        >修改
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -62,7 +64,8 @@
           :disabled="multiple"
           @click="handleDelete"
           v-hasPermi="['fantang:staffSubsidy:remove']"
-        >删除</el-button>
+        >删除
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -71,17 +74,18 @@
           size="mini"
           @click="handleExport"
           v-hasPermi="['fantang:staffSubsidy:export']"
-        >导出</el-button>
+        >导出
+        </el-button>
       </el-col>
-	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="staffSubsidyList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column type="selection" width="55" align="center"/>
       <el-table-column label="补贴流水 id" align="center" prop="subsidyId" v-if="false"/>
-      <el-table-column label="补贴类型" align="center" prop="subsidyType" />
-      <el-table-column label="收支类型" align="center" prop="incomeType" />
-      <el-table-column label="金额" align="center" prop="price" />
+      <el-table-column label="补贴类型" align="center" prop="subsidyType"/>
+      <el-table-column label="收支类型" align="center" prop="incomeType"/>
+      <el-table-column label="金额" align="center" prop="price"/>
       <el-table-column label="消费日期" align="center" prop="consumAt" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.consumAt, '{y}-{m}-{d}') }}</span>
@@ -95,18 +99,20 @@
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['fantang:staffSubsidy:edit']"
-          >修改</el-button>
+          >修改
+          </el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['fantang:staffSubsidy:remove']"
-          >删除</el-button>
+          >删除
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"
@@ -120,16 +126,16 @@
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="补贴类型" prop="subsidyType">
           <el-select v-model="form.subsidyType" placeholder="请选择补贴类型">
-            <el-option label="请选择字典生成" value="" />
+            <el-option label="请选择字典生成" value=""/>
           </el-select>
         </el-form-item>
         <el-form-item label="收支类型" prop="incomeType">
           <el-select v-model="form.incomeType" placeholder="请选择收支类型">
-            <el-option label="请选择字典生成" value="" />
+            <el-option label="请选择字典生成" value=""/>
           </el-select>
         </el-form-item>
         <el-form-item label="金额" prop="price">
-          <el-input v-model="form.price" placeholder="请输入金额" />
+          <el-input v-model="form.price" placeholder="请输入金额"/>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -141,12 +147,18 @@
 </template>
 
 <script>
-import { listStaffSubsidy, getStaffSubsidy, delStaffSubsidy, addStaffSubsidy, updateStaffSubsidy, exportStaffSubsidy } from "@/api/fantang/staffSubsidy";
+import {
+  addStaffSubsidy,
+  delStaffSubsidy,
+  exportStaffSubsidy,
+  getStaffSubsidy,
+  listStaffSubsidy,
+  updateStaffSubsidy
+} from "@/api/fantang/staffSubsidy";
 
 export default {
   name: "StaffSubsidy",
-  components: {
-  },
+  components: {},
   data() {
     return {
       // 遮罩层
@@ -181,13 +193,13 @@ export default {
       // 表单校验
       rules: {
         subsidyType: [
-          { required: true, message: "补贴类型不能为空", trigger: "change" }
+          {required: true, message: "补贴类型不能为空", trigger: "change"}
         ],
         incomeType: [
-          { required: true, message: "收支类型不能为空", trigger: "change" }
+          {required: true, message: "收支类型不能为空", trigger: "change"}
         ],
         price: [
-          { required: true, message: "金额不能为空", trigger: "blur" }
+          {required: true, message: "金额不能为空", trigger: "blur"}
         ],
       }
     };
@@ -236,7 +248,7 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.subsidyId)
-      this.single = selection.length!==1
+      this.single = selection.length !== 1
       this.multiple = !selection.length
     },
     /** 新增按钮操作 */
@@ -279,28 +291,28 @@ export default {
     handleDelete(row) {
       const subsidyIds = row.subsidyId || this.ids;
       this.$confirm('是否确认删除补贴流水查看编号为"' + subsidyIds + '"的数据项?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return delStaffSubsidy(subsidyIds);
-        }).then(() => {
-          this.getList();
-          this.msgSuccess("删除成功");
-        })
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(function () {
+        return delStaffSubsidy(subsidyIds);
+      }).then(() => {
+        this.getList();
+        this.msgSuccess("删除成功");
+      })
     },
     /** 导出按钮操作 */
     handleExport() {
       const queryParams = this.queryParams;
       this.$confirm('是否确认导出所有补贴流水查看数据项?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return exportStaffSubsidy(queryParams);
-        }).then(response => {
-          this.download(response.msg);
-        })
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(function () {
+        return exportStaffSubsidy(queryParams);
+      }).then(response => {
+        this.download(response.msg);
+      })
     }
   }
 };
diff --git a/ruoyi-ui/src/views/fantang/subsidy/index.vue b/ruoyi-ui/src/views/fantang/subsidy/index.vue
index e154da3ec..b13e742ed 100644
--- a/ruoyi-ui/src/views/fantang/subsidy/index.vue
+++ b/ruoyi-ui/src/views/fantang/subsidy/index.vue
@@ -3,7 +3,12 @@
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="补贴类型" prop="type">
         <el-select v-model="queryParams.type" placeholder="请选择补贴类型" clearable size="small">
-          <el-option label="请选择字典生成" value="" />
+          <el-option
+            v-for="dict in typeOptions"
+            :key="dict.dictValue"
+            :label="dict.dictLabel"
+            :value="dict.dictValue"
+          />
         </el-select>
       </el-form-item>
       <el-form-item label="金额" prop="price">
@@ -35,10 +40,10 @@
       </el-form-item>
       <el-form-item label="创建日期" prop="createAt">
         <el-date-picker clearable size="small" style="width: 200px"
-          v-model="queryParams.createAt"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="选择创建日期">
+                        v-model="queryParams.createAt"
+                        type="date"
+                        value-format="yyyy-MM-dd"
+                        placeholder="选择创建日期">
         </el-date-picker>
       </el-form-item>
       <el-form-item label="创建人" prop="createBy">
@@ -64,7 +69,8 @@
           size="mini"
           @click="handleAdd"
           v-hasPermi="['fantang:subsidy:add']"
-        >新增</el-button>
+        >新增
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -74,7 +80,8 @@
           :disabled="single"
           @click="handleUpdate"
           v-hasPermi="['fantang:subsidy:edit']"
-        >修改</el-button>
+        >修改
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -84,7 +91,8 @@
           :disabled="multiple"
           @click="handleDelete"
           v-hasPermi="['fantang:subsidy:remove']"
-        >删除</el-button>
+        >删除
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -93,24 +101,25 @@
           size="mini"
           @click="handleExport"
           v-hasPermi="['fantang:subsidy:export']"
-        >导出</el-button>
+        >导出
+        </el-button>
       </el-col>
-	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="subsidyList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column type="selection" width="55" align="center"/>
       <el-table-column label="补贴 id" align="center" prop="subsidyId" v-if="false"/>
-      <el-table-column label="补贴类型" align="center" prop="type" />
-      <el-table-column label="金额" align="center" prop="price" />
-      <el-table-column label="范围" align="center" prop="range" />
-      <el-table-column label="周期" align="center" prop="cycle" />
+      <el-table-column label="补贴类型" align="center" prop="type" :formatter="typeFormat"/>
+      <el-table-column label="金额" align="center" prop="price"/>
+      <el-table-column label="范围" align="center" prop="range"/>
+      <el-table-column label="周期" align="center" prop="cycle"/>
       <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="createBy" />
+      <el-table-column label="创建人" align="center" prop="createBy"/>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -119,18 +128,20 @@
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['fantang:subsidy:edit']"
-          >修改</el-button>
+          >修改
+          </el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['fantang:subsidy:remove']"
-          >删除</el-button>
+          >删除
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"
@@ -144,17 +155,22 @@
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="补贴类型" prop="type">
           <el-select v-model="form.type" placeholder="请选择补贴类型">
-            <el-option label="请选择字典生成" value="" />
+            <el-option
+              v-for="dict in typeOptions"
+              :key="dict.dictValue"
+              :label="dict.dictLabel"
+              :value="dict.dictValue"
+            ></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="金额" prop="price">
-          <el-input v-model="form.price" placeholder="请输入金额" />
+          <el-input v-model="form.price" placeholder="请输入金额"/>
         </el-form-item>
         <el-form-item label="范围" prop="range">
-          <el-input v-model="form.range" placeholder="请输入范围" />
+          <el-input v-model="form.range" placeholder="请输入范围"/>
         </el-form-item>
         <el-form-item label="周期" prop="cycle">
-          <el-input v-model="form.cycle" placeholder="请输入周期" />
+          <el-input v-model="form.cycle" placeholder="请输入周期"/>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -166,12 +182,11 @@
 </template>
 
 <script>
-import { listSubsidy, getSubsidy, delSubsidy, addSubsidy, updateSubsidy, exportSubsidy } from "@/api/fantang/subsidy";
+import {addSubsidy, delSubsidy, exportSubsidy, getSubsidy, listSubsidy, updateSubsidy} from "@/api/fantang/subsidy";
 
 export default {
   name: "Subsidy",
-  components: {
-  },
+  components: {},
   data() {
     return {
       // 遮罩层
@@ -192,6 +207,8 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
+      // 补贴类型字典
+      typeOptions: [],
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -208,22 +225,25 @@ export default {
       // 表单校验
       rules: {
         type: [
-          { required: true, message: "补贴类型不能为空", trigger: "change" }
+          {required: true, message: "补贴类型不能为空", trigger: "change"}
         ],
         price: [
-          { required: true, message: "金额不能为空", trigger: "blur" }
+          {required: true, message: "金额不能为空", trigger: "blur"}
         ],
         range: [
-          { required: true, message: "范围不能为空", trigger: "blur" }
+          {required: true, message: "范围不能为空", trigger: "blur"}
         ],
         cycle: [
-          { required: true, message: "周期不能为空", trigger: "blur" }
+          {required: true, message: "周期不能为空", trigger: "blur"}
         ],
       }
     };
   },
   created() {
     this.getList();
+    this.getDicts("ft_subsidy").then(response => {
+      this.typeOptions = response.data;
+    });
   },
   methods: {
     /** 查询补贴管理列表 */
@@ -235,6 +255,10 @@ export default {
         this.loading = false;
       });
     },
+    // 补贴类型字典翻译
+    typeFormat(row, column) {
+      return this.selectDictLabel(this.typeOptions, row.type);
+    },
     // 取消按钮
     cancel() {
       this.open = false;
@@ -267,7 +291,7 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.subsidyId)
-      this.single = selection.length!==1
+      this.single = selection.length !== 1
       this.multiple = !selection.length
     },
     /** 新增按钮操作 */
@@ -310,28 +334,28 @@ export default {
     handleDelete(row) {
       const subsidyIds = row.subsidyId || this.ids;
       this.$confirm('是否确认删除补贴管理编号为"' + subsidyIds + '"的数据项?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return delSubsidy(subsidyIds);
-        }).then(() => {
-          this.getList();
-          this.msgSuccess("删除成功");
-        })
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(function () {
+        return delSubsidy(subsidyIds);
+      }).then(() => {
+        this.getList();
+        this.msgSuccess("删除成功");
+      })
     },
     /** 导出按钮操作 */
     handleExport() {
       const queryParams = this.queryParams;
       this.$confirm('是否确认导出所有补贴管理数据项?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return exportSubsidy(queryParams);
-        }).then(response => {
-          this.download(response.msg);
-        })
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(function () {
+        return exportSubsidy(queryParams);
+      }).then(response => {
+        this.download(response.msg);
+      })
     }
   }
 };