diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/vo/FtStaffInfoVo.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/vo/FtStaffInfoVo.java index e4ebe7be9..92d122312 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/vo/FtStaffInfoVo.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/vo/FtStaffInfoVo.java @@ -9,4 +9,5 @@ import lombok.NoArgsConstructor; @AllArgsConstructor public class FtStaffInfoVo { private String departName; + private Boolean giveOutFlag; } diff --git a/ruoyi-ui/src/views/fantang/subsidy/index.vue b/ruoyi-ui/src/views/fantang/subsidy/index.vue index 9ad156ad6..88df62f3c 100644 --- a/ruoyi-ui/src/views/fantang/subsidy/index.vue +++ b/ruoyi-ui/src/views/fantang/subsidy/index.vue @@ -140,14 +140,30 @@ - + - - - + + + + + + +
- 发放 + 发放补贴
@@ -249,14 +265,13 @@ export default { }, methods: { + filterDepart() { + return row.tag === value; + }, + // 响应发放补贴按钮 clickSubsidyGiveOut(row) { - staffListWithDepart().then(response => { - console.log(response); - this.staffData = response.data; - this.showPopupSubsidyGiveOut = true; - }) - + this.showPopupSubsidyGiveOut = true; }, // 控制补贴列表启用状态的回显 formatFlag(row) { @@ -274,6 +289,13 @@ export default { this.total = response.total; this.loading = false; }); + staffListWithDepart().then(response => { + this.staffData = response.data; + for (let i = 0; i < this.staffData.length; i++) { + this.staffData[i].giveOutFlag = true; + } + console.log(this.staffData); + }) }, // 补贴类型字典翻译 typeFormat(row, column) {