From ef75dedb13dc6bfc4a3a36ae9836bd5577945ae3 Mon Sep 17 00:00:00 2001
From: ryoeiken <754264374@qq.com>
Date: Tue, 22 Dec 2020 09:24:11 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=A5=E8=B4=B4=E6=B5=81=E6=B0=B4=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E5=9B=9E=E6=98=BE=EF=BC=8C=E4=BF=AE=E5=A4=8D=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2=E6=A1=86=E6=98=BE=E7=A4=BA=E9=80=89=E6=8B=A9=E5=AD=97?=
 =?UTF-8?q?=E5=85=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/fantang/staffSubsidy/index.vue  | 41 +++++++++++++++++--
 1 file changed, 37 insertions(+), 4 deletions(-)

diff --git a/ruoyi-ui/src/views/fantang/staffSubsidy/index.vue b/ruoyi-ui/src/views/fantang/staffSubsidy/index.vue
index fb3b19c94..75d55dd42 100644
--- a/ruoyi-ui/src/views/fantang/staffSubsidy/index.vue
+++ b/ruoyi-ui/src/views/fantang/staffSubsidy/index.vue
@@ -3,12 +3,22 @@
     <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
+            v-for="item in subsidyTypeOptions"
+            :key="item.dictValue"
+            :label="item.dictLabel"
+            :value="item.dictValue">
+          </el-option>
         </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
+            v-for="item in incomeTypeOptions"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value">
+          </el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="金额" prop="price">
@@ -83,8 +93,8 @@
     <el-table v-loading="loading" :data="staffSubsidyList" @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="subsidyType"/>
-      <el-table-column label="收支类型" align="center" prop="incomeType"/>
+      <el-table-column label="补贴类型" align="center" prop="subsidyType" :formatter="subsidyTypeFormat"/>
+      <el-table-column label="收支类型" align="center" prop="incomeType" :formatter="incomeTypeFormat"/>
       <el-table-column label="金额" align="center" prop="price"/>
       <el-table-column label="消费日期" align="center" prop="consumAt" width="180">
         <template slot-scope="scope">
@@ -161,6 +171,14 @@ export default {
   components: {},
   data() {
     return {
+      subsidyTypeOptions: [],
+      incomeTypeOptions: [{
+        value: 1,
+        label: '发放'
+      }, {
+        value: 2,
+        label: '消费'
+      }],
       // 遮罩层
       loading: true,
       // 选中数组
@@ -206,6 +224,9 @@ export default {
   },
   created() {
     this.getList();
+    this.getDicts("ft_subsidy").then(response => {
+      this.subsidyTypeOptions = response.data;
+    });
   },
   methods: {
     /** 查询补贴流水查看列表 */
@@ -287,6 +308,18 @@ export default {
         }
       });
     },
+    // 补贴类型回显
+    subsidyTypeFormat(row, column) {
+      return this.selectDictLabel(this.subsidyTypeOptions, row.subsidyType);
+    },
+    // 收支类型回显
+    incomeTypeFormat(row) {
+      if (row.incomeType === '1' || row.incomeType === 1) {
+        return "发放";
+      } else if (row.incomeType === '2' || row.incomeType === 2) {
+        return "消费";
+      }
+    },
     /** 删除按钮操作 */
     handleDelete(row) {
       const subsidyIds = row.subsidyId || this.ids;