修改前端页面

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);
     }

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;
 }

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>
 
 

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,7 +74,8 @@
           size="mini"
           @click="handleExport"
           v-hasPermi="['fantang:careStaffInfo:export']"
-        >导出</el-button>
+        >导出
+        </el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
@@ -92,14 +96,16 @@
             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>
@@ -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 {
       // 遮罩层

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

@@ -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,7 +78,8 @@
           size="mini"
           @click="handleExport"
           v-hasPermi="['fantang:demand:export']"
-        >导出</el-button>
+        >导出
+        </el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
@@ -100,14 +104,16 @@
             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>
@@ -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 {
       // 遮罩层

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,7 +56,8 @@
           size="mini"
           @click="handleExport"
           v-hasPermi="['fantang:depart:export']"
-        >导出</el-button>
+        >导出
+        </el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
@@ -70,14 +74,16 @@
             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>
@@ -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 {
       // 遮罩层

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

@@ -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,7 +70,8 @@
           size="mini"
           @click="handleExport"
           v-hasPermi="['fantang:food:export']"
-        >导出</el-button>
+        >导出
+        </el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
@@ -87,14 +91,16 @@
             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>
@@ -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 {
       // 遮罩层

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

@@ -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,7 +78,8 @@
           size="mini"
           @click="handleExport"
           v-hasPermi="['fantang:meals:export']"
-        >导出</el-button>
+        >导出
+        </el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
@@ -100,14 +104,16 @@
             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>
@@ -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 {
       // 遮罩层

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

@@ -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,7 +118,8 @@
           size="mini"
           @click="handleExport"
           v-hasPermi="['fantang:order:export']"
-        >导出</el-button>
+        >导出
+        </el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
@@ -150,14 +154,16 @@
             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>
@@ -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 {
       // 遮罩层

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,7 +65,8 @@
           size="mini"
           @click="handleExport"
           v-hasPermi="['fantang:patient:export']"
-        >导出</el-button>
+        >导出
+        </el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
@@ -80,14 +84,16 @@
             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>
@@ -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 {
       // 遮罩层

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

@@ -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,7 +89,8 @@
           size="mini"
           @click="handleExport"
           v-hasPermi="['fantang:prepayment:export']"
-        >导出</el-button>
+        >导出
+        </el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
@@ -88,6 +109,12 @@
         </template>
       </el-table-column>
       <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,14 +123,16 @@
             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>
@@ -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");
     },

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

@@ -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,7 +96,8 @@
           size="mini"
           @click="handleExport"
           v-hasPermi="['fantang:settle:export']"
-        >导出</el-button>
+        >导出
+        </el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
@@ -120,14 +124,16 @@
             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>
@@ -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 {
       // 遮罩层

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,7 +74,8 @@
           size="mini"
           @click="handleExport"
           v-hasPermi="['fantang:staffInfo:export']"
-        >导出</el-button>
+        >导出
+        </el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
@@ -91,14 +95,16 @@
             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>
@@ -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 {
       // 遮罩层

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

@@ -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,7 +74,8 @@
           size="mini"
           @click="handleExport"
           v-hasPermi="['fantang:staffSubsidy:export']"
-        >导出</el-button>
+        >导出
+        </el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
@@ -95,14 +99,16 @@
             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>
@@ -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 {
       // 遮罩层

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">
@@ -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,7 +101,8 @@
           size="mini"
           @click="handleExport"
           v-hasPermi="['fantang:subsidy:export']"
-        >导出</el-button>
+        >导出
+        </el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
@@ -101,7 +110,7 @@
     <el-table v-loading="loading" :data="subsidyList" @selection-change="handleSelectionChange">
       <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="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"/>
@@ -119,14 +128,16 @@
             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>
@@ -144,7 +155,12 @@
       <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">
@@ -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,
@@ -224,6 +241,9 @@ export default {
   },
   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;