支部活动预告

ruoyi-admin/src/main/java/com/ruoyi/web/controller/branch/TBranchActivityBudgetController.java

@@ -0,0 +1,104 @@
+package com.ruoyi.web.controller.branch;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.branch.domain.TBranchActivityBudget;
+import com.ruoyi.branch.service.ITBranchActivityBudgetService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 支部活动预算Controller
+ * 
+ * @author ruoyi
+ * @date 2023-07-20
+ */
+@RestController
+@RequestMapping("/branch/activitybudget")
+public class TBranchActivityBudgetController extends BaseController
+{
+    @Autowired
+    private ITBranchActivityBudgetService tBranchActivityBudgetService;
+
+    /**
+     * 查询支部活动预算列表
+     */
+    @PreAuthorize("@ss.hasPermi('branch:activitybudget:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(TBranchActivityBudget tBranchActivityBudget)
+    {
+        startPage();
+        List<TBranchActivityBudget> list = tBranchActivityBudgetService.selectTBranchActivityBudgetList(tBranchActivityBudget);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出支部活动预算列表
+     */
+    @PreAuthorize("@ss.hasPermi('branch:activitybudget:export')")
+    @Log(title = "支部活动预算", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, TBranchActivityBudget tBranchActivityBudget)
+    {
+        List<TBranchActivityBudget> list = tBranchActivityBudgetService.selectTBranchActivityBudgetList(tBranchActivityBudget);
+        ExcelUtil<TBranchActivityBudget> util = new ExcelUtil<TBranchActivityBudget>(TBranchActivityBudget.class);
+        util.exportExcel(response, list, "支部活动预算数据");
+    }
+
+    /**
+     * 获取支部活动预算详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('branch:activitybudget:query')")
+    @GetMapping(value = "/{budgetId}")
+    public AjaxResult getInfo(@PathVariable("budgetId") Long budgetId)
+    {
+        return success(tBranchActivityBudgetService.selectTBranchActivityBudgetByBudgetId(budgetId));
+    }
+
+    /**
+     * 新增支部活动预算
+     */
+    @PreAuthorize("@ss.hasPermi('branch:activitybudget:add')")
+    @Log(title = "支部活动预算", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TBranchActivityBudget tBranchActivityBudget)
+    {
+        return toAjax(tBranchActivityBudgetService.insertTBranchActivityBudget(tBranchActivityBudget));
+    }
+
+    /**
+     * 修改支部活动预算
+     */
+    @PreAuthorize("@ss.hasPermi('branch:activitybudget:edit')")
+    @Log(title = "支部活动预算", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TBranchActivityBudget tBranchActivityBudget)
+    {
+        return toAjax(tBranchActivityBudgetService.updateTBranchActivityBudget(tBranchActivityBudget));
+    }
+
+    /**
+     * 删除支部活动预算
+     */
+    @PreAuthorize("@ss.hasPermi('branch:activitybudget:remove')")
+    @Log(title = "支部活动预算", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{budgetIds}")
+    public AjaxResult remove(@PathVariable Long[] budgetIds)
+    {
+        return toAjax(tBranchActivityBudgetService.deleteTBranchActivityBudgetByBudgetIds(budgetIds));
+    }
+}

ruoyi-admin/src/main/java/com/ruoyi/web/controller/branch/TBranchActivityNoticeController.java

@@ -0,0 +1,104 @@
+package com.ruoyi.web.controller.branch;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.branch.domain.TBranchActivityNotice;
+import com.ruoyi.branch.service.ITBranchActivityNoticeService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 支部活动预告Controller
+ * 
+ * @author ruoyi
+ * @date 2023-07-20
+ */
+@RestController
+@RequestMapping("/branch/activitynotice")
+public class TBranchActivityNoticeController extends BaseController
+{
+    @Autowired
+    private ITBranchActivityNoticeService tBranchActivityNoticeService;
+
+    /**
+     * 查询支部活动预告列表
+     */
+    @PreAuthorize("@ss.hasPermi('branch:activitynotice:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(TBranchActivityNotice tBranchActivityNotice)
+    {
+        startPage();
+        List<TBranchActivityNotice> list = tBranchActivityNoticeService.selectTBranchActivityNoticeList(tBranchActivityNotice);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出支部活动预告列表
+     */
+    @PreAuthorize("@ss.hasPermi('branch:activitynotice:export')")
+    @Log(title = "支部活动预告", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, TBranchActivityNotice tBranchActivityNotice)
+    {
+        List<TBranchActivityNotice> list = tBranchActivityNoticeService.selectTBranchActivityNoticeList(tBranchActivityNotice);
+        ExcelUtil<TBranchActivityNotice> util = new ExcelUtil<TBranchActivityNotice>(TBranchActivityNotice.class);
+        util.exportExcel(response, list, "支部活动预告数据");
+    }
+
+    /**
+     * 获取支部活动预告详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('branch:activitynotice:query')")
+    @GetMapping(value = "/{noticeId}")
+    public AjaxResult getInfo(@PathVariable("noticeId") Long noticeId)
+    {
+        return success(tBranchActivityNoticeService.selectTBranchActivityNoticeByNoticeId(noticeId));
+    }
+
+    /**
+     * 新增支部活动预告
+     */
+    @PreAuthorize("@ss.hasPermi('branch:activitynotice:add')")
+    @Log(title = "支部活动预告", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TBranchActivityNotice tBranchActivityNotice)
+    {
+        return toAjax(tBranchActivityNoticeService.insertTBranchActivityNotice(tBranchActivityNotice));
+    }
+
+    /**
+     * 修改支部活动预告
+     */
+    @PreAuthorize("@ss.hasPermi('branch:activitynotice:edit')")
+    @Log(title = "支部活动预告", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TBranchActivityNotice tBranchActivityNotice)
+    {
+        return toAjax(tBranchActivityNoticeService.updateTBranchActivityNotice(tBranchActivityNotice));
+    }
+
+    /**
+     * 删除支部活动预告
+     */
+    @PreAuthorize("@ss.hasPermi('branch:activitynotice:remove')")
+    @Log(title = "支部活动预告", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{noticeIds}")
+    public AjaxResult remove(@PathVariable Long[] noticeIds)
+    {
+        return toAjax(tBranchActivityNoticeService.deleteTBranchActivityNoticeByNoticeIds(noticeIds));
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/branch/domain/TBranchActivityBudget.java

@@ -0,0 +1,117 @@
+package com.ruoyi.branch.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 支部活动预算对象 t_branch_activity_budget
+ * 
+ * @author ruoyi
+ * @date 2023-07-20
+ */
+public class TBranchActivityBudget extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键id */
+    @Excel(name = "主键id")
+    private Long budgetId;
+
+    /** 活动预告id */
+    @Excel(name = "活动预告id")
+    private Long noticeId;
+
+    /** 分项 */
+    @Excel(name = "分项")
+    private String budgetItem;
+
+    /** 预算金额 */
+    @Excel(name = "预算金额")
+    private Long budgetAmount;
+
+    /** 删除标志（0代表存在 2代表删除） */
+    private String delFlag;
+
+    /** 部门id */
+    @Excel(name = "部门id")
+    private Long deptId;
+
+    public void setBudgetId(Long budgetId) 
+    {
+        this.budgetId = budgetId;
+    }
+
+    public Long getBudgetId() 
+    {
+        return budgetId;
+    }
+
+    public void setNoticeId(Long noticeId) 
+    {
+        this.noticeId = noticeId;
+    }
+
+    public Long getNoticeId() 
+    {
+        return noticeId;
+    }
+
+    public void setBudgetItem(String budgetItem) 
+    {
+        this.budgetItem = budgetItem;
+    }
+
+    public String getBudgetItem() 
+    {
+        return budgetItem;
+    }
+
+    public void setBudgetAmount(Long budgetAmount) 
+    {
+        this.budgetAmount = budgetAmount;
+    }
+
+    public Long getBudgetAmount() 
+    {
+        return budgetAmount;
+    }
+
+    public void setDelFlag(String delFlag) 
+    {
+        this.delFlag = delFlag;
+    }
+
+    public String getDelFlag() 
+    {
+        return delFlag;
+    }
+
+    public void setDeptId(Long deptId) 
+    {
+        this.deptId = deptId;
+    }
+
+    public Long getDeptId() 
+    {
+        return deptId;
+    }
+
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("budgetId", getBudgetId())
+            .append("noticeId", getNoticeId())
+            .append("budgetItem", getBudgetItem())
+            .append("budgetAmount", getBudgetAmount())
+            .append("delFlag", getDelFlag())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("deptId", getDeptId())
+            .toString();
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/branch/domain/TBranchActivityNotice.java

@@ -0,0 +1,165 @@
+package com.ruoyi.branch.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 支部活动预告对象 t_branch_activity_notice
+ * 
+ * @author ruoyi
+ * @date 2023-07-20
+ */
+public class TBranchActivityNotice extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键id */
+    @Excel(name = "主键id")
+    private Long noticeId;
+
+    /** 联系点领导 */
+    @Excel(name = "联系点领导")
+    private String contactLeader;
+
+    /** 活动时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "活动时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date activityTime;
+
+    /** 活动地点 */
+    @Excel(name = "活动地点")
+    private String activityVenue;
+
+    /** 活动内容 */
+    @Excel(name = "活动内容")
+    private String activityContent;
+
+    /** 联系点领导参加情况 */
+    @Excel(name = "联系点领导参加情况")
+    private String leaderAttendance;
+
+    /** 备注 */
+    @Excel(name = "备注")
+    private String remarks;
+
+    /** 删除标志（0代表存在 2代表删除） */
+    private String delFlag;
+
+    /** 部门id */
+    @Excel(name = "部门id")
+    private Long deptId;
+
+    public void setNoticeId(Long noticeId) 
+    {
+        this.noticeId = noticeId;
+    }
+
+    public Long getNoticeId() 
+    {
+        return noticeId;
+    }
+
+    public void setContactLeader(String contactLeader) 
+    {
+        this.contactLeader = contactLeader;
+    }
+
+    public String getContactLeader() 
+    {
+        return contactLeader;
+    }
+
+    public void setActivityTime(Date activityTime) 
+    {
+        this.activityTime = activityTime;
+    }
+
+    public Date getActivityTime() 
+    {
+        return activityTime;
+    }
+
+    public void setActivityVenue(String activityVenue) 
+    {
+        this.activityVenue = activityVenue;
+    }
+
+    public String getActivityVenue() 
+    {
+        return activityVenue;
+    }
+
+    public void setActivityContent(String activityContent) 
+    {
+        this.activityContent = activityContent;
+    }
+
+    public String getActivityContent() 
+    {
+        return activityContent;
+    }
+
+    public void setLeaderAttendance(String leaderAttendance) 
+    {
+        this.leaderAttendance = leaderAttendance;
+    }
+
+    public String getLeaderAttendance() 
+    {
+        return leaderAttendance;
+    }
+
+    public void setRemarks(String remarks) 
+    {
+        this.remarks = remarks;
+    }
+
+    public String getRemarks() 
+    {
+        return remarks;
+    }
+
+    public void setDelFlag(String delFlag) 
+    {
+        this.delFlag = delFlag;
+    }
+
+    public String getDelFlag() 
+    {
+        return delFlag;
+    }
+
+    public void setDeptId(Long deptId) 
+    {
+        this.deptId = deptId;
+    }
+
+    public Long getDeptId() 
+    {
+        return deptId;
+    }
+
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("noticeId", getNoticeId())
+            .append("contactLeader", getContactLeader())
+            .append("activityTime", getActivityTime())
+            .append("activityVenue", getActivityVenue())
+            .append("activityContent", getActivityContent())
+            .append("leaderAttendance", getLeaderAttendance())
+            .append("remarks", getRemarks())
+            .append("delFlag", getDelFlag())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("deptId", getDeptId())
+            .toString();
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/branch/mapper/TBranchActivityBudgetMapper.java

@@ -0,0 +1,61 @@
+package com.ruoyi.branch.mapper;
+
+import java.util.List;
+import com.ruoyi.branch.domain.TBranchActivityBudget;
+
+/**
+ * 支部活动预算Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2023-07-20
+ */
+public interface TBranchActivityBudgetMapper 
+{
+    /**
+     * 查询支部活动预算
+     * 
+     * @param budgetId 支部活动预算主键
+     * @return 支部活动预算
+     */
+    public TBranchActivityBudget selectTBranchActivityBudgetByBudgetId(Long budgetId);
+
+    /**
+     * 查询支部活动预算列表
+     * 
+     * @param tBranchActivityBudget 支部活动预算
+     * @return 支部活动预算集合
+     */
+    public List<TBranchActivityBudget> selectTBranchActivityBudgetList(TBranchActivityBudget tBranchActivityBudget);
+
+    /**
+     * 新增支部活动预算
+     * 
+     * @param tBranchActivityBudget 支部活动预算
+     * @return 结果
+     */
+    public int insertTBranchActivityBudget(TBranchActivityBudget tBranchActivityBudget);
+
+    /**
+     * 修改支部活动预算
+     * 
+     * @param tBranchActivityBudget 支部活动预算
+     * @return 结果
+     */
+    public int updateTBranchActivityBudget(TBranchActivityBudget tBranchActivityBudget);
+
+    /**
+     * 删除支部活动预算
+     * 
+     * @param budgetId 支部活动预算主键
+     * @return 结果
+     */
+    public int deleteTBranchActivityBudgetByBudgetId(Long budgetId);
+
+    /**
+     * 批量删除支部活动预算
+     * 
+     * @param budgetIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteTBranchActivityBudgetByBudgetIds(Long[] budgetIds);
+}

ruoyi-system/src/main/java/com/ruoyi/branch/mapper/TBranchActivityNoticeMapper.java

@@ -0,0 +1,61 @@
+package com.ruoyi.branch.mapper;
+
+import java.util.List;
+import com.ruoyi.branch.domain.TBranchActivityNotice;
+
+/**
+ * 支部活动预告Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2023-07-20
+ */
+public interface TBranchActivityNoticeMapper 
+{
+    /**
+     * 查询支部活动预告
+     * 
+     * @param noticeId 支部活动预告主键
+     * @return 支部活动预告
+     */
+    public TBranchActivityNotice selectTBranchActivityNoticeByNoticeId(Long noticeId);
+
+    /**
+     * 查询支部活动预告列表
+     * 
+     * @param tBranchActivityNotice 支部活动预告
+     * @return 支部活动预告集合
+     */
+    public List<TBranchActivityNotice> selectTBranchActivityNoticeList(TBranchActivityNotice tBranchActivityNotice);
+
+    /**
+     * 新增支部活动预告
+     * 
+     * @param tBranchActivityNotice 支部活动预告
+     * @return 结果
+     */
+    public int insertTBranchActivityNotice(TBranchActivityNotice tBranchActivityNotice);
+
+    /**
+     * 修改支部活动预告
+     * 
+     * @param tBranchActivityNotice 支部活动预告
+     * @return 结果
+     */
+    public int updateTBranchActivityNotice(TBranchActivityNotice tBranchActivityNotice);
+
+    /**
+     * 删除支部活动预告
+     * 
+     * @param noticeId 支部活动预告主键
+     * @return 结果
+     */
+    public int deleteTBranchActivityNoticeByNoticeId(Long noticeId);
+
+    /**
+     * 批量删除支部活动预告
+     * 
+     * @param noticeIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteTBranchActivityNoticeByNoticeIds(Long[] noticeIds);
+}

ruoyi-system/src/main/java/com/ruoyi/branch/service/ITBranchActivityBudgetService.java

@@ -0,0 +1,61 @@
+package com.ruoyi.branch.service;
+
+import java.util.List;
+import com.ruoyi.branch.domain.TBranchActivityBudget;
+
+/**
+ * 支部活动预算Service接口
+ * 
+ * @author ruoyi
+ * @date 2023-07-20
+ */
+public interface ITBranchActivityBudgetService 
+{
+    /**
+     * 查询支部活动预算
+     * 
+     * @param budgetId 支部活动预算主键
+     * @return 支部活动预算
+     */
+    public TBranchActivityBudget selectTBranchActivityBudgetByBudgetId(Long budgetId);
+
+    /**
+     * 查询支部活动预算列表
+     * 
+     * @param tBranchActivityBudget 支部活动预算
+     * @return 支部活动预算集合
+     */
+    public List<TBranchActivityBudget> selectTBranchActivityBudgetList(TBranchActivityBudget tBranchActivityBudget);
+
+    /**
+     * 新增支部活动预算
+     * 
+     * @param tBranchActivityBudget 支部活动预算
+     * @return 结果
+     */
+    public int insertTBranchActivityBudget(TBranchActivityBudget tBranchActivityBudget);
+
+    /**
+     * 修改支部活动预算
+     * 
+     * @param tBranchActivityBudget 支部活动预算
+     * @return 结果
+     */
+    public int updateTBranchActivityBudget(TBranchActivityBudget tBranchActivityBudget);
+
+    /**
+     * 批量删除支部活动预算
+     * 
+     * @param budgetIds 需要删除的支部活动预算主键集合
+     * @return 结果
+     */
+    public int deleteTBranchActivityBudgetByBudgetIds(Long[] budgetIds);
+
+    /**
+     * 删除支部活动预算信息
+     * 
+     * @param budgetId 支部活动预算主键
+     * @return 结果
+     */
+    public int deleteTBranchActivityBudgetByBudgetId(Long budgetId);
+}

ruoyi-system/src/main/java/com/ruoyi/branch/service/ITBranchActivityNoticeService.java

@@ -0,0 +1,61 @@
+package com.ruoyi.branch.service;
+
+import java.util.List;
+import com.ruoyi.branch.domain.TBranchActivityNotice;
+
+/**
+ * 支部活动预告Service接口
+ * 
+ * @author ruoyi
+ * @date 2023-07-20
+ */
+public interface ITBranchActivityNoticeService 
+{
+    /**
+     * 查询支部活动预告
+     * 
+     * @param noticeId 支部活动预告主键
+     * @return 支部活动预告
+     */
+    public TBranchActivityNotice selectTBranchActivityNoticeByNoticeId(Long noticeId);
+
+    /**
+     * 查询支部活动预告列表
+     * 
+     * @param tBranchActivityNotice 支部活动预告
+     * @return 支部活动预告集合
+     */
+    public List<TBranchActivityNotice> selectTBranchActivityNoticeList(TBranchActivityNotice tBranchActivityNotice);
+
+    /**
+     * 新增支部活动预告
+     * 
+     * @param tBranchActivityNotice 支部活动预告
+     * @return 结果
+     */
+    public int insertTBranchActivityNotice(TBranchActivityNotice tBranchActivityNotice);
+
+    /**
+     * 修改支部活动预告
+     * 
+     * @param tBranchActivityNotice 支部活动预告
+     * @return 结果
+     */
+    public int updateTBranchActivityNotice(TBranchActivityNotice tBranchActivityNotice);
+
+    /**
+     * 批量删除支部活动预告
+     * 
+     * @param noticeIds 需要删除的支部活动预告主键集合
+     * @return 结果
+     */
+    public int deleteTBranchActivityNoticeByNoticeIds(Long[] noticeIds);
+
+    /**
+     * 删除支部活动预告信息
+     * 
+     * @param noticeId 支部活动预告主键
+     * @return 结果
+     */
+    public int deleteTBranchActivityNoticeByNoticeId(Long noticeId);
+}

ruoyi-system/src/main/java/com/ruoyi/branch/service/impl/TBranchActivityBudgetServiceImpl.java

@@ -0,0 +1,99 @@
+package com.ruoyi.branch.service.impl;
+
+import java.util.List;
+
+import com.ruoyi.common.annotation.DataScope;
+import com.ruoyi.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.branch.mapper.TBranchActivityBudgetMapper;
+import com.ruoyi.branch.domain.TBranchActivityBudget;
+import com.ruoyi.branch.service.ITBranchActivityBudgetService;
+
+/**
+ * 支部活动预算Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2023-07-20
+ */
+@Service
+public class TBranchActivityBudgetServiceImpl implements ITBranchActivityBudgetService 
+{
+    @Autowired
+    private TBranchActivityBudgetMapper tBranchActivityBudgetMapper;
+
+    /**
+     * 查询支部活动预算
+     * 
+     * @param budgetId 支部活动预算主键
+     * @return 支部活动预算
+     */
+    @Override
+    public TBranchActivityBudget selectTBranchActivityBudgetByBudgetId(Long budgetId)
+    {
+        return tBranchActivityBudgetMapper.selectTBranchActivityBudgetByBudgetId(budgetId);
+    }
+
+    /**
+     * 查询支部活动预算列表
+     * 
+     * @param tBranchActivityBudget 支部活动预算
+     * @return 支部活动预算
+     */
+    @Override
+    @DataScope(deptAlias = "d", userAlias = "u")
+    public List<TBranchActivityBudget> selectTBranchActivityBudgetList(TBranchActivityBudget tBranchActivityBudget)
+    {
+        return tBranchActivityBudgetMapper.selectTBranchActivityBudgetList(tBranchActivityBudget);
+    }
+
+    /**
+     * 新增支部活动预算
+     * 
+     * @param tBranchActivityBudget 支部活动预算
+     * @return 结果
+     */
+    @Override
+    public int insertTBranchActivityBudget(TBranchActivityBudget tBranchActivityBudget)
+    {
+        tBranchActivityBudget.setCreateTime(DateUtils.getNowDate());
+        return tBranchActivityBudgetMapper.insertTBranchActivityBudget(tBranchActivityBudget);
+    }
+
+    /**
+     * 修改支部活动预算
+     * 
+     * @param tBranchActivityBudget 支部活动预算
+     * @return 结果
+     */
+    @Override
+    public int updateTBranchActivityBudget(TBranchActivityBudget tBranchActivityBudget)
+    {
+        tBranchActivityBudget.setUpdateTime(DateUtils.getNowDate());
+        return tBranchActivityBudgetMapper.updateTBranchActivityBudget(tBranchActivityBudget);
+    }
+
+    /**
+     * 批量删除支部活动预算
+     * 
+     * @param budgetIds 需要删除的支部活动预算主键
+     * @return 结果
+     */
+    @Override
+    public int deleteTBranchActivityBudgetByBudgetIds(Long[] budgetIds)
+    {
+        return tBranchActivityBudgetMapper.deleteTBranchActivityBudgetByBudgetIds(budgetIds);
+    }
+
+    /**
+     * 删除支部活动预算信息
+     * 
+     * @param budgetId 支部活动预算主键
+     * @return 结果
+     */
+    @Override
+    public int deleteTBranchActivityBudgetByBudgetId(Long budgetId)
+    {
+        return tBranchActivityBudgetMapper.deleteTBranchActivityBudgetByBudgetId(budgetId);
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/branch/service/impl/TBranchActivityNoticeServiceImpl.java

@@ -0,0 +1,99 @@
+package com.ruoyi.branch.service.impl;
+
+import java.util.List;
+
+import com.ruoyi.common.annotation.DataScope;
+import com.ruoyi.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.branch.mapper.TBranchActivityNoticeMapper;
+import com.ruoyi.branch.domain.TBranchActivityNotice;
+import com.ruoyi.branch.service.ITBranchActivityNoticeService;
+
+/**
+ * 支部活动预告Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2023-07-20
+ */
+@Service
+public class TBranchActivityNoticeServiceImpl implements ITBranchActivityNoticeService 
+{
+    @Autowired
+    private TBranchActivityNoticeMapper tBranchActivityNoticeMapper;
+
+    /**
+     * 查询支部活动预告
+     * 
+     * @param noticeId 支部活动预告主键
+     * @return 支部活动预告
+     */
+    @Override
+    public TBranchActivityNotice selectTBranchActivityNoticeByNoticeId(Long noticeId)
+    {
+        return tBranchActivityNoticeMapper.selectTBranchActivityNoticeByNoticeId(noticeId);
+    }
+
+    /**
+     * 查询支部活动预告列表
+     * 
+     * @param tBranchActivityNotice 支部活动预告
+     * @return 支部活动预告
+     */
+    @Override
+    @DataScope(deptAlias = "d", userAlias = "u")
+    public List<TBranchActivityNotice> selectTBranchActivityNoticeList(TBranchActivityNotice tBranchActivityNotice)
+    {
+        return tBranchActivityNoticeMapper.selectTBranchActivityNoticeList(tBranchActivityNotice);
+    }
+
+    /**
+     * 新增支部活动预告
+     * 
+     * @param tBranchActivityNotice 支部活动预告
+     * @return 结果
+     */
+    @Override
+    public int insertTBranchActivityNotice(TBranchActivityNotice tBranchActivityNotice)
+    {
+        tBranchActivityNotice.setCreateTime(DateUtils.getNowDate());
+        return tBranchActivityNoticeMapper.insertTBranchActivityNotice(tBranchActivityNotice);
+    }
+
+    /**
+     * 修改支部活动预告
+     * 
+     * @param tBranchActivityNotice 支部活动预告
+     * @return 结果
+     */
+    @Override
+    public int updateTBranchActivityNotice(TBranchActivityNotice tBranchActivityNotice)
+    {
+        tBranchActivityNotice.setUpdateTime(DateUtils.getNowDate());
+        return tBranchActivityNoticeMapper.updateTBranchActivityNotice(tBranchActivityNotice);
+    }
+
+    /**
+     * 批量删除支部活动预告
+     * 
+     * @param noticeIds 需要删除的支部活动预告主键
+     * @return 结果
+     */
+    @Override
+    public int deleteTBranchActivityNoticeByNoticeIds(Long[] noticeIds)
+    {
+        return tBranchActivityNoticeMapper.deleteTBranchActivityNoticeByNoticeIds(noticeIds);
+    }
+
+    /**
+     * 删除支部活动预告信息
+     * 
+     * @param noticeId 支部活动预告主键
+     * @return 结果
+     */
+    @Override
+    public int deleteTBranchActivityNoticeByNoticeId(Long noticeId)
+    {
+        return tBranchActivityNoticeMapper.deleteTBranchActivityNoticeByNoticeId(noticeId);
+    }
+}

ruoyi-system/src/main/resources/mapper/branch/TBranchActivityBudgetMapper.xml

@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.branch.mapper.TBranchActivityBudgetMapper">
+    
+    <resultMap type="TBranchActivityBudget" id="TBranchActivityBudgetResult">
+        <result property="budgetId"    column="budget_id"    />
+        <result property="noticeId"    column="notice_id"    />
+        <result property="budgetItem"    column="budget_item"    />
+        <result property="budgetAmount"    column="budget_amount"    />
+        <result property="delFlag"    column="del_flag"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="deptId"    column="dept_id"    />
+    </resultMap>
+
+    <sql id="selectTBranchActivityBudgetVo">
+        select u.budget_id, u.notice_id, u.budget_item, u.budget_amount, u.del_flag, u.create_by, u.create_time, u.update_by, u.update_time, u.dept_id from t_branch_activity_budget u left join sys_dept d on u.dept_id = d.dept_id
+    </sql>
+
+    <select id="selectTBranchActivityBudgetList" parameterType="TBranchActivityBudget" resultMap="TBranchActivityBudgetResult">
+        <include refid="selectTBranchActivityBudgetVo"/>
+        <where>  
+            <if test="budgetId != null "> and u.budget_id = #{budgetId}</if>
+            <if test="noticeId != null "> and u.notice_id = #{noticeId}</if>
+            <if test="budgetItem != null  and budgetItem != ''"> and u.budget_item = #{budgetItem}</if>
+            <if test="budgetAmount != null "> and u.budget_amount = #{budgetAmount}</if>
+            <if test="deptId != null "> and u.dept_id = #{deptId}</if>
+            and u.del_flag = 0
+        </where>
+        <!-- 数据范围过滤 -->
+        ${params.dataScope}
+    </select>
+    
+    <select id="selectTBranchActivityBudgetByBudgetId" parameterType="Long" resultMap="TBranchActivityBudgetResult">
+        <include refid="selectTBranchActivityBudgetVo"/>
+        where u.budget_id = #{budgetId}
+        and u.del_flag = 0
+    </select>
+        
+    <insert id="insertTBranchActivityBudget" parameterType="TBranchActivityBudget">
+        <selectKey keyProperty="budgetId" resultType="long" order="BEFORE">
+            SELECT seq_t_branch_activity_budget.NEXTVAL as budgetId FROM DUAL
+        </selectKey>
+        insert into t_branch_activity_budget
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="budgetId != null">budget_id,</if>
+            <if test="noticeId != null">notice_id,</if>
+            <if test="budgetItem != null">budget_item,</if>
+            <if test="budgetAmount != null">budget_amount,</if>
+            <if test="delFlag != null">del_flag,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="deptId != null">dept_id,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="budgetId != null">#{budgetId},</if>
+            <if test="noticeId != null">#{noticeId},</if>
+            <if test="budgetItem != null">#{budgetItem},</if>
+            <if test="budgetAmount != null">#{budgetAmount},</if>
+            <if test="delFlag != null">#{delFlag},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="deptId != null">#{deptId},</if>
+         </trim>
+    </insert>
+
+    <update id="updateTBranchActivityBudget" parameterType="TBranchActivityBudget">
+        update t_branch_activity_budget
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="noticeId != null">notice_id = #{noticeId},</if>
+            <if test="budgetItem != null">budget_item = #{budgetItem},</if>
+            <if test="budgetAmount != null">budget_amount = #{budgetAmount},</if>
+            <if test="delFlag != null">del_flag = #{delFlag},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="deptId != null">dept_id = #{deptId},</if>
+        </trim>
+        where budget_id = #{budgetId}
+    </update>
+
+    <update id="deleteTBranchActivityBudgetByBudgetId" parameterType="Long">
+        update t_branch_activity_budget set del_flag = 2 where budget_id = #{budgetId}
+    </update>
+
+    <update id="deleteTBranchActivityBudgetByBudgetIds" parameterType="String">
+        update t_branch_activity_budget set del_flag = 2 where budget_id in
+        <foreach item="budgetId" collection="array" open="(" separator="," close=")">
+            #{budgetId}
+        </foreach>
+    </update>
+</mapper>

ruoyi-system/src/main/resources/mapper/branch/TBranchActivityNoticeMapper.xml

@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.branch.mapper.TBranchActivityNoticeMapper">
+    
+    <resultMap type="TBranchActivityNotice" id="TBranchActivityNoticeResult">
+        <result property="noticeId"    column="notice_id"    />
+        <result property="contactLeader"    column="contact_leader"    />
+        <result property="activityTime"    column="activity_time"    />
+        <result property="activityVenue"    column="activity_venue"    />
+        <result property="activityContent"    column="activity_content"    />
+        <result property="leaderAttendance"    column="leader_attendance"    />
+        <result property="remarks"    column="remarks"    />
+        <result property="delFlag"    column="del_flag"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="deptId"    column="dept_id"    />
+    </resultMap>
+
+    <sql id="selectTBranchActivityNoticeVo">
+        select u.notice_id, u.contact_leader, u.activity_time, u.activity_venue, u.activity_content, u.leader_attendance, u.remarks, u.del_flag, u.create_by, u.create_time, u.update_by, u.update_time, u.dept_id from t_branch_activity_notice u left join sys_dept d on u.dept_id = d.dept_id
+    </sql>
+
+    <select id="selectTBranchActivityNoticeList" parameterType="TBranchActivityNotice" resultMap="TBranchActivityNoticeResult">
+        <include refid="selectTBranchActivityNoticeVo"/>
+        <where>  
+            <if test="noticeId != null "> and u.notice_id = #{noticeId}</if>
+            <if test="contactLeader != null  and contactLeader != ''"> and u.contact_leader = #{contactLeader}</if>
+            <if test="activityTime != null "> and u.activity_time = #{activityTime}</if>
+            <if test="activityVenue != null  and activityVenue != ''"> and u.activity_venue = #{activityVenue}</if>
+            <if test="activityContent != null  and activityContent != ''"> and u.activity_content like concat(concat('%', #{activityContent}), '%')</if>
+            <if test="leaderAttendance != null  and leaderAttendance != ''"> and u.leader_attendance like concat(concat('%', #{leaderAttendance}), '%')</if>
+            <if test="remarks != null  and remarks != ''"> and u.remarks like concat(concat('%', #{remarks}), '%')</if>
+            <if test="deptId != null "> and u.dept_id = #{deptId}</if>
+            and u.del_flag = 0
+        </where>
+        <!-- 数据范围过滤 -->
+        ${params.dataScope}
+    </select>
+    
+    <select id="selectTBranchActivityNoticeByNoticeId" parameterType="Long" resultMap="TBranchActivityNoticeResult">
+        <include refid="selectTBranchActivityNoticeVo"/>
+        where u.notice_id = #{noticeId}
+        and u.del_flag = 0
+    </select>
+        
+    <insert id="insertTBranchActivityNotice" parameterType="TBranchActivityNotice">
+        <selectKey keyProperty="noticeId" resultType="long" order="BEFORE">
+            SELECT seq_t_branch_activity_notice.NEXTVAL as noticeId FROM DUAL
+        </selectKey>
+        insert into t_branch_activity_notice
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="noticeId != null">notice_id,</if>
+            <if test="contactLeader != null">contact_leader,</if>
+            <if test="activityTime != null">activity_time,</if>
+            <if test="activityVenue != null">activity_venue,</if>
+            <if test="activityContent != null">activity_content,</if>
+            <if test="leaderAttendance != null">leader_attendance,</if>
+            <if test="remarks != null">remarks,</if>
+            <if test="delFlag != null">del_flag,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="deptId != null">dept_id,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="noticeId != null">#{noticeId},</if>
+            <if test="contactLeader != null">#{contactLeader},</if>
+            <if test="activityTime != null">#{activityTime},</if>
+            <if test="activityVenue != null">#{activityVenue},</if>
+            <if test="activityContent != null">#{activityContent},</if>
+            <if test="leaderAttendance != null">#{leaderAttendance},</if>
+            <if test="remarks != null">#{remarks},</if>
+            <if test="delFlag != null">#{delFlag},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="deptId != null">#{deptId},</if>
+         </trim>
+    </insert>
+
+    <update id="updateTBranchActivityNotice" parameterType="TBranchActivityNotice">
+        update t_branch_activity_notice
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="contactLeader != null">contact_leader = #{contactLeader},</if>
+            <if test="activityTime != null">activity_time = #{activityTime},</if>
+            <if test="activityVenue != null">activity_venue = #{activityVenue},</if>
+            <if test="activityContent != null">activity_content = #{activityContent},</if>
+            <if test="leaderAttendance != null">leader_attendance = #{leaderAttendance},</if>
+            <if test="remarks != null">remarks = #{remarks},</if>
+            <if test="delFlag != null">del_flag = #{delFlag},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="deptId != null">dept_id = #{deptId},</if>
+        </trim>
+        where notice_id = #{noticeId}
+    </update>
+
+    <update id="deleteTBranchActivityNoticeByNoticeId" parameterType="Long">
+        update t_branch_activity_notice set del_flag = 2 where notice_id = #{noticeId}
+    </update>
+
+    <update id="deleteTBranchActivityNoticeByNoticeIds" parameterType="String">
+        update t_branch_activity_notice set del_flag = 2 where notice_id in
+        <foreach item="noticeId" collection="array" open="(" separator="," close=")">
+            #{noticeId}
+        </foreach>
+    </update>
+</mapper>

ruoyi-ui/src/api/branch/activitybudget.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询支部活动预算列表
+export function listActivitybudget(query) {
+  return request({
+    url: '/branch/activitybudget/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询支部活动预算详细
+export function getActivitybudget(budgetId) {
+  return request({
+    url: '/branch/activitybudget/' + budgetId,
+    method: 'get'
+  })
+}
+
+// 新增支部活动预算
+export function addActivitybudget(data) {
+  return request({
+    url: '/branch/activitybudget',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改支部活动预算
+export function updateActivitybudget(data) {
+  return request({
+    url: '/branch/activitybudget',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除支部活动预算
+export function delActivitybudget(budgetId) {
+  return request({
+    url: '/branch/activitybudget/' + budgetId,
+    method: 'delete'
+  })
+}

ruoyi-ui/src/api/branch/activitynotice.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询支部活动预告列表
+export function listActivitynotice(query) {
+  return request({
+    url: '/branch/activitynotice/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询支部活动预告详细
+export function getActivitynotice(noticeId) {
+  return request({
+    url: '/branch/activitynotice/' + noticeId,
+    method: 'get'
+  })
+}
+
+// 新增支部活动预告
+export function addActivitynotice(data) {
+  return request({
+    url: '/branch/activitynotice',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改支部活动预告
+export function updateActivitynotice(data) {
+  return request({
+    url: '/branch/activitynotice',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除支部活动预告
+export function delActivitynotice(noticeId) {
+  return request({
+    url: '/branch/activitynotice/' + noticeId,
+    method: 'delete'
+  })
+}

ruoyi-ui/src/views/branch/zbfc/activitybudget/index.vue

@@ -0,0 +1,532 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" size="small" v-show="showSearch" label-width="68px">
+      <el-form-item label="主键id" prop="budgetId">
+        <el-input
+          v-model="queryParams.budgetId"
+          placeholder="请输入主键id"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="活动预告id" prop="noticeId">
+        <el-input
+          v-model="queryParams.noticeId"
+          placeholder="请输入活动预告id"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="分项" prop="budgetItem">
+        <el-input
+          v-model="queryParams.budgetItem"
+          placeholder="请输入分项"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="预算金额" prop="budgetAmount">
+        <el-input
+          v-model="queryParams.budgetAmount"
+          placeholder="请输入预算金额"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="部门id" prop="deptId">
+        <el-input
+          v-model="queryParams.deptId"
+          placeholder="请输入部门id"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['branch:activitybudget:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['branch:activitybudget:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['branch:activitybudget:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="info"
+          plain
+          icon="el-icon-upload2"
+          size="mini"
+          @click="handleImport"
+          v-hasPermi="['branch:activitybudget:edit']"
+        >导入</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['branch:activitybudget:export']"
+        >导出</el-button>
+      </el-col>
+	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="activitybudgetList" @selection-change="handleSelectionChange" :height="clientHeight" border>
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="主键id" align="center" prop="budgetId" />
+      <el-table-column label="活动预告id" align="center" prop="noticeId" />
+      <el-table-column label="分项" align="center" prop="budgetItem" />
+      <el-table-column label="预算金额" align="center" prop="budgetAmount" />
+      <el-table-column label="部门id" align="center" prop="deptId" />
+      <el-table-column label="操作" align="center" fixed="right" width="120" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['branch:activitybudget:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['branch:activitybudget:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改支部活动预算对话框 -->
+    <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="budgetId">
+          <el-input v-model="form.budgetId" placeholder="请输入主键id" />
+        </el-form-item>
+        <el-form-item label="活动预告id" prop="noticeId">
+          <el-input v-model="form.noticeId" placeholder="请输入活动预告id" />
+        </el-form-item>
+        <el-form-item label="分项" prop="budgetItem">
+          <el-input v-model="form.budgetItem" placeholder="请输入分项" />
+        </el-form-item>
+        <el-form-item label="预算金额" prop="budgetAmount">
+          <el-input v-model="form.budgetAmount" placeholder="请输入预算金额" />
+        </el-form-item>
+        <el-form-item label="删除标志" prop="delFlag">
+          <el-input v-model="form.delFlag" placeholder="请输入删除标志" />
+        </el-form-item>
+        <el-form-item label="部门id" prop="deptId">
+          <el-input v-model="form.deptId" placeholder="请输入部门id" />
+        </el-form-item>
+          <el-form-item label="归属部门" prop="deptId">
+              <treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" placeholder="请选择归属部门" />
+          </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+    <!-- 用户导入对话框 -->
+    <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
+        <el-upload
+                ref="upload"
+                :limit="1"
+                accept=".xlsx, .xls"
+                :headers="upload.headers"
+                :action="upload.url + '?updateSupport=' + upload.updateSupport"
+                :disabled="upload.isUploading"
+                :on-progress="handleFileUploadProgress"
+                :on-success="handleFileSuccess"
+                :auto-upload="false"
+                drag
+        >
+            <i class="el-icon-upload"></i>
+            <div class="el-upload__text">
+                将文件拖到此处，或
+                <em>点击上传</em>
+            </div>
+            <div class="el-upload__tip" slot="tip">
+                <el-checkbox v-model="upload.updateSupport" />是否更新已经存在的用户数据
+                <el-link type="info" style="font-size:12px" @click="importTemplate">下载模板</el-link>
+            </div>
+            <div class="el-upload__tip" style="color:red" slot="tip">提示：仅允许导入“xls”或“xlsx”格式文件！</div>
+        </el-upload>
+        <div slot="footer" class="dialog-footer">
+            <el-button type="primary" @click="submitFileForm">确 定</el-button>
+            <el-button @click="upload.open = false">取 消</el-button>
+        </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listActivitybudget, getActivitybudget, delActivitybudget, addActivitybudget, updateActivitybudget, exportActivitybudget, importTemplate} from "@/api/branch/activitybudget";
+import { treeselect } from "@/api/system/dept";
+import { getToken } from "@/utils/auth";
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+
+export default {
+  name: "Activitybudget",
+  components: { Treeselect },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: false,
+      // 总条数
+      total: 0,
+      // 支部活动预算表格数据
+      activitybudgetList: [],
+      // 弹出层标题
+      title: "",
+      // 部门树选项
+      deptOptions: undefined,
+      clientHeight:300,
+      // 是否显示弹出层
+      open: false,
+      // 主键id字典
+      budgetIdOptions: [],
+      // 活动预告id字典
+      noticeIdOptions: [],
+      // 分项字典
+      budgetItemOptions: [],
+      // 预算金额字典
+      budgetAmountOptions: [],
+      // 删除标志字典
+      delFlagOptions: [],
+      // 创建者字典
+      createByOptions: [],
+      // 创建时间字典
+      createTimeOptions: [],
+      // 更新者字典
+      updateByOptions: [],
+      // 更新时间字典
+      updateTimeOptions: [],
+      // 部门id字典
+      deptIdOptions: [],
+        // 用户导入参数
+        upload: {
+            // 是否显示弹出层（用户导入）
+            open: false,
+            // 弹出层标题（用户导入）
+            title: "",
+            // 是否禁用上传
+            isUploading: false,
+            // 是否更新已经存在的用户数据
+            updateSupport: 0,
+            // 设置上传的请求头部
+            headers: { Authorization: "Bearer " + getToken() },
+            // 上传的地址
+            url: process.env.VUE_APP_BASE_API + "/branch/activitybudget/importData"
+        },
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 20,
+        budgetId: null,
+        noticeId: null,
+        budgetItem: null,
+        budgetAmount: null,
+        deptId: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        budgetId: [
+          { required: true, message: "主键id不能为空", trigger: "blur" }
+        ],
+      }
+    };
+  },
+  watch: {
+        // 根据名称筛选部门树
+        deptName(val) {
+            this.$refs.tree.filter(val);
+        }
+   },
+  created() {
+      //设置表格高度对应屏幕高度
+      this.$nextTick(() => {
+          this.clientHeight = document.body.clientHeight -250
+      })
+    this.getList();
+    this.getTreeselect();
+    this.getDicts("${column.dictType}").then(response => {
+      this.budgetIdOptions = response.data;
+    });
+    this.getDicts("${column.dictType}").then(response => {
+      this.noticeIdOptions = response.data;
+    });
+    this.getDicts("${column.dictType}").then(response => {
+      this.budgetItemOptions = response.data;
+    });
+    this.getDicts("${column.dictType}").then(response => {
+      this.budgetAmountOptions = response.data;
+    });
+    this.getDicts("${column.dictType}").then(response => {
+      this.delFlagOptions = response.data;
+    });
+    this.getDicts("${column.dictType}").then(response => {
+      this.createByOptions = response.data;
+    });
+    this.getDicts("${column.dictType}").then(response => {
+      this.createTimeOptions = response.data;
+    });
+    this.getDicts("${column.dictType}").then(response => {
+      this.updateByOptions = response.data;
+    });
+    this.getDicts("${column.dictType}").then(response => {
+      this.updateTimeOptions = response.data;
+    });
+    this.getDicts("${column.dictType}").then(response => {
+      this.deptIdOptions = response.data;
+    });
+  },
+  methods: {
+    /** 查询支部活动预算列表 */
+    getList() {
+      this.loading = true;
+      listActivitybudget(this.queryParams).then(response => {
+        this.activitybudgetList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+     /** 查询部门下拉树结构 */
+     getTreeselect() {
+          treeselect().then(response => {
+              this.deptOptions = response.data;
+          });
+     },
+    // 主键id字典翻译
+    budgetIdFormat(row, column) {
+      return this.selectDictLabel(this.budgetIdOptions, row.budgetId);
+    },
+    // 活动预告id字典翻译
+    noticeIdFormat(row, column) {
+      return this.selectDictLabel(this.noticeIdOptions, row.noticeId);
+    },
+    // 分项字典翻译
+    budgetItemFormat(row, column) {
+      return this.selectDictLabel(this.budgetItemOptions, row.budgetItem);
+    },
+    // 预算金额字典翻译
+    budgetAmountFormat(row, column) {
+      return this.selectDictLabel(this.budgetAmountOptions, row.budgetAmount);
+    },
+    // 删除标志字典翻译
+    delFlagFormat(row, column) {
+      return this.selectDictLabel(this.delFlagOptions, row.delFlag);
+    },
+    // 创建者字典翻译
+    createByFormat(row, column) {
+      return this.selectDictLabel(this.createByOptions, row.createBy);
+    },
+    // 创建时间字典翻译
+    createTimeFormat(row, column) {
+      return this.selectDictLabel(this.createTimeOptions, row.createTime);
+    },
+    // 更新者字典翻译
+    updateByFormat(row, column) {
+      return this.selectDictLabel(this.updateByOptions, row.updateBy);
+    },
+    // 更新时间字典翻译
+    updateTimeFormat(row, column) {
+      return this.selectDictLabel(this.updateTimeOptions, row.updateTime);
+    },
+    // 部门id字典翻译
+    deptIdFormat(row, column) {
+      return this.selectDictLabel(this.deptIdOptions, row.deptId);
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        budgetId: null,
+        noticeId: null,
+        budgetItem: null,
+        budgetAmount: null,
+        delFlag: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null,
+        deptId: null,
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.budgetId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加支部活动预算";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const budgetId = row.budgetId || this.ids
+      getActivitybudget(budgetId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改支部活动预算";
+      });
+    },
+      /** 提交按钮 */
+      submitForm() {
+          this.$refs["form"].validate(valid => {
+              if (valid) {
+                  if (this.form.budgetId != null) {
+                      updateActivitybudget(this.form).then(response => {
+                          this.$modal.msgSuccess("修改成功");
+                          this.open = false;
+                          this.getList();
+                      });
+                  } else {
+                      addActivitybudget(this.form).then(response => {
+                          this.$modal.msgSuccess("新增成功");
+                          this.open = false;
+                          this.getList();
+                      });
+                  }
+              }
+          });
+      },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const budgetIds = row.budgetId || this.ids;
+      this.$confirm('是否确认删除?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return delActivitybudget(budgetIds);
+        }).then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        })
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm('是否确认导出所有支部活动预算数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return exportActivitybudget(queryParams);
+        }).then(response => {
+          this.download(response.msg);
+        })
+    },
+      /** 导入按钮操作 */
+      handleImport() {
+          this.upload.title = "用户导入";
+          this.upload.open = true;
+      },
+      /** 下载模板操作 */
+      importTemplate() {
+          importTemplate().then(response => {
+              this.download(response.msg);
+          });
+      },
+      // 文件上传中处理
+      handleFileUploadProgress(event, file, fileList) {
+          this.upload.isUploading = true;
+      },
+      // 文件上传成功处理
+      handleFileSuccess(response, file, fileList) {
+          this.upload.open = false;
+          this.upload.isUploading = false;
+          this.$refs.upload.clearFiles();
+          this.$alert(response.msg, "导入结果", { dangerouslyUseHTMLString: true });
+          this.getList();
+      },
+      // 提交上传文件
+      submitFileForm() {
+          this.$refs.upload.submit();
+      }
+  }
+};
+</script>
+
+<style>
+    /** 文本换行符处理 */
+    .el-table .cell{
+        white-space: pre-wrap;
+    }
+    /** textarea字体 */
+    textarea {
+        font-family: "Helvetica Neue",Helvetica,"PingFang SC","Hiragino Sans GB","Microsoft YaHei","微软雅黑",Arial,sans-serif;
+    }
+</style>

ruoyi-ui/src/views/branch/zbfc/activitynotice/index.vue

@@ -0,0 +1,512 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" size="small" v-show="showSearch" label-width="68px">
+      <el-form-item label="活动时间" prop="activityTime">
+        <el-date-picker clearable size="small" style="width: 200px"
+          v-model="queryParams.activityTime"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="选择活动时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="活动地点" prop="activityVenue">
+        <el-input
+          v-model="queryParams.activityVenue"
+          placeholder="请输入活动地点"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="备注" prop="remarks">
+        <el-input
+          v-model="queryParams.remarks"
+          placeholder="请输入备注"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="归属部门" prop="deptId" style="width: 268px;">
+        <treeselect style="width: 200px;" v-model="queryParams.deptId" :options="deptOptions" :show-count="true" placeholder="请选择归属部门" />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['branch:activitynotice:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['branch:activitynotice:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['branch:activitynotice:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="info"
+          plain
+          icon="el-icon-upload2"
+          size="mini"
+          @click="handleImport"
+          v-hasPermi="['branch:activitynotice:edit']"
+        >导入</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['branch:activitynotice:export']"
+        >导出</el-button>
+      </el-col>
+	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="activitynoticeList" @selection-change="handleSelectionChange" :height="clientHeight" border>
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="党支部" align="center" prop="deptId" width="120" :formatter="deptListFormat"/>
+      <el-table-column label="联系点领导" align="center" prop="contactLeaderString" width="120" />
+      <el-table-column label="活动时间" align="center" prop="activityTime" width="100">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.activityTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="活动地点" align="center" prop="activityVenue" width="120" />
+      <el-table-column label="活动内容" align="center" prop="activityContent" width="350" />
+      <el-table-column label="联系点领导参加情况" align="center" prop="leaderAttendance" width="120" />
+      <el-table-column label="备注" align="center" prop="remarks" width="120" />
+      <el-table-column label="操作" align="center" fixed="right" width="120" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['branch:activitynotice:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['branch:activitynotice:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改支部活动预告对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="85px">
+        <el-form-item label="党支部" prop="deptId">
+          <treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" placeholder="请选择党支部" />
+        </el-form-item>
+        <el-form-item label="联系点领导" prop="contactLeader">
+          <el-select v-model="form.contactLeader" multiple placeholder="请选择联系点领导">
+            <el-option
+              v-for="dict in userList"
+              :key="dict.dictValue"
+              :label="dict.dictLabel"
+              :value="dict.dictValue"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="活动时间" prop="activityTime">
+          <el-date-picker clearable size="small" style="width: 200px"
+            v-model="form.activityTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择活动时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="活动地点" prop="activityVenue">
+          <el-input v-model="form.activityVenue" placeholder="请输入活动地点" />
+        </el-form-item>
+        <el-form-item label="活动内容" prop="activityContent">
+          <el-input v-model="form.activityContent" placeholder="请输入活动内容" type="textarea" :rows="4" />
+        </el-form-item>
+        <el-form-item label="联系点领导参加情况" prop="leaderAttendance">
+          <el-input v-model="form.leaderAttendance" placeholder="请输入联系点领导参加情况" />
+        </el-form-item>
+        <el-form-item label="备注" prop="remarks">
+          <el-input v-model="form.remarks" placeholder="请输入备注" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+    <!-- 用户导入对话框 -->
+    <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
+        <el-upload
+                ref="upload"
+                :limit="1"
+                accept=".xlsx, .xls"
+                :headers="upload.headers"
+                :action="upload.url + '?updateSupport=' + upload.updateSupport"
+                :disabled="upload.isUploading"
+                :on-progress="handleFileUploadProgress"
+                :on-success="handleFileSuccess"
+                :auto-upload="false"
+                drag
+        >
+            <i class="el-icon-upload"></i>
+            <div class="el-upload__text">
+                将文件拖到此处，或
+                <em>点击上传</em>
+            </div>
+            <div class="el-upload__tip" slot="tip">
+                <el-checkbox v-model="upload.updateSupport" />是否更新已经存在的用户数据
+                <el-link type="info" style="font-size:12px" @click="importTemplate">下载模板</el-link>
+            </div>
+            <div class="el-upload__tip" style="color:red" slot="tip">提示：仅允许导入“xls”或“xlsx”格式文件！</div>
+        </el-upload>
+        <div slot="footer" class="dialog-footer">
+            <el-button type="primary" @click="submitFileForm">确 定</el-button>
+            <el-button @click="upload.open = false">取 消</el-button>
+        </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listActivitynotice, getActivitynotice, delActivitynotice, addActivitynotice, updateActivitynotice, exportActivitynotice, importTemplate} from "@/api/branch/activitynotice";
+import { treeselect } from "@/api/system/dept";
+import { getToken } from "@/utils/auth";
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+import { listUser} from "@/api/system/user";
+import { listDept } from "@/api/system/dept";
+
+export default {
+  name: "Activitynotice",
+  components: { Treeselect },
+  // components: { Editor },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: false,
+      // 总条数
+      total: 0,
+      // 支部活动预告表格数据
+      activitynoticeList: [],
+      // 弹出层标题
+      title: "",
+      // 部门树选项
+      deptOptions: undefined,
+      clientHeight:300,
+      // 是否显示弹出层
+      open: false,
+        // 用户导入参数
+        upload: {
+            // 是否显示弹出层（用户导入）
+            open: false,
+            // 弹出层标题（用户导入）
+            title: "",
+            // 是否禁用上传
+            isUploading: false,
+            // 是否更新已经存在的用户数据
+            updateSupport: 0,
+            // 设置上传的请求头部
+            headers: { Authorization: "Bearer " + getToken() },
+            // 上传的地址
+            url: process.env.VUE_APP_BASE_API + "/branch/activitynotice/importData"
+        },
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 20,
+        noticeId: null,
+        contactLeader: null,
+        activityTime: null,
+        activityVenue: null,
+        activityContent: null,
+        leaderAttendance: null,
+        remarks: null,
+        deptId: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        deptId: [
+          { required: true, message: "党支部不能为空", trigger: "blur" }
+        ],
+        activityTime: [
+          { required: true, message: "时间不能为空", trigger: "blur" }
+        ],
+        activityVenue: [
+          { required: true, message: "地点不能为空", trigger: "blur" }
+        ],
+      },
+      // 用户列表
+      userList: [],
+    };
+  },
+  watch: {
+        // 根据名称筛选部门树
+        deptName(val) {
+            this.$refs.tree.filter(val);
+        }
+   },
+  created() {
+      //设置表格高度对应屏幕高度
+      this.$nextTick(() => {
+          this.clientHeight = document.body.clientHeight -250
+      })
+    this.getDeptList();
+    this.getList();
+    this.getTreeselect();
+  },
+  methods: {
+    /** 查询部门列表 */
+    getDeptList() {
+      listDept().then(response => {
+        let data = response.data;
+        let deptList = [];
+        for(let i = 0; i < data.length; i++) {
+          let dept = { "dictValue" : data[i].deptId, "dictLabel" : data[i].deptName};
+          deptList.push(dept);
+        }
+        this.deptList = deptList;
+      });
+    },
+    // 部门列表字典翻译
+    deptListFormat(row, column) {
+      return this.selectDictLabel(this.deptList, row.deptId);
+    },
+    /** 查询支部活动预告列表 */
+    getList() {
+      this.loading = true;
+      listUser().then(response => {
+        let rows = response.rows;
+        let userList = [];
+        for(let i = 0; i < rows.length; i++) {
+          if (rows[i].userName != "admin") {
+            let user = { "dictValue" : rows[i].userId, "dictLabel" : rows[i].nickName};
+            userList.push(user);
+          }
+        }
+        this.userList = userList;
+        listActivitynotice(this.queryParams).then(response => {
+          this.activitynoticeList = response.rows;
+          for (let i = 0; i < this.activitynoticeList.length; i++) {
+            if (this.activitynoticeList[i].contactLeader != null) {
+              let contactLeader = this.activitynoticeList[i].contactLeader.split(",");
+              let contactLeaderString = "";
+              for (let j = 0; j < contactLeader.length; j++) {
+                if (j > 0) {
+                  contactLeaderString += "、" + this.selectDictLabel(this.userList, contactLeader[j]);
+                } else {
+                  contactLeaderString += this.selectDictLabel(this.userList, contactLeader[j]);
+                }
+              }
+              this.activitynoticeList[i].contactLeaderString = contactLeaderString;
+            }
+          }
+          this.total = response.total;
+          this.loading = false;
+        });
+      });
+    },
+     /** 查询部门下拉树结构 */
+     getTreeselect() {
+          treeselect().then(response => {
+              this.deptOptions = response.data;
+          });
+     },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        noticeId: null,
+        contactLeader: null,
+        activityTime: null,
+        activityVenue: null,
+        activityContent: null,
+        leaderAttendance: null,
+        remarks: null,
+        delFlag: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null,
+        deptId: null,
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.noticeId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加支部活动预告";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const noticeId = row.noticeId || this.ids
+      getActivitynotice(noticeId).then(response => {
+        this.form = response.data;
+        if (this.form.contactLeader != null) {
+          this.form.contactLeader = this.form.contactLeader.split(",").map(Number);
+        }
+        this.open = true;
+        this.title = "修改支部活动预告";
+      });
+    },
+      /** 提交按钮 */
+      submitForm() {
+        if (this.form.contactLeader != null) {
+          this.form.contactLeader = this.form.contactLeader.join();
+        }
+          this.$refs["form"].validate(valid => {
+              if (valid) {
+                  if (this.form.noticeId != null) {
+                      updateActivitynotice(this.form).then(response => {
+                          this.$modal.msgSuccess("修改成功");
+                          this.open = false;
+                          this.getList();
+                      });
+                  } else {
+                      addActivitynotice(this.form).then(response => {
+                          this.$modal.msgSuccess("新增成功");
+                          this.open = false;
+                          this.getList();
+                      });
+                  }
+              }
+          });
+      },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const noticeIds = row.noticeId || this.ids;
+      this.$confirm('是否确认删除?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return delActivitynotice(noticeIds);
+        }).then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        })
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm('是否确认导出所有支部活动预告数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return exportActivitynotice(queryParams);
+        }).then(response => {
+          this.download(response.msg);
+        })
+    },
+      /** 导入按钮操作 */
+      handleImport() {
+          this.upload.title = "用户导入";
+          this.upload.open = true;
+      },
+      /** 下载模板操作 */
+      importTemplate() {
+          importTemplate().then(response => {
+              this.download(response.msg);
+          });
+      },
+      // 文件上传中处理
+      handleFileUploadProgress(event, file, fileList) {
+          this.upload.isUploading = true;
+      },
+      // 文件上传成功处理
+      handleFileSuccess(response, file, fileList) {
+          this.upload.open = false;
+          this.upload.isUploading = false;
+          this.$refs.upload.clearFiles();
+          this.$alert(response.msg, "导入结果", { dangerouslyUseHTMLString: true });
+          this.getList();
+      },
+      // 提交上传文件
+      submitFileForm() {
+          this.$refs.upload.submit();
+      }
+  }
+};
+</script>
+
+<style>
+    /** 文本换行符处理 */
+    .el-table .cell{
+        white-space: pre-wrap;
+    }
+    /** textarea字体 */
+    textarea {
+        font-family: "Helvetica Neue",Helvetica,"PingFang SC","Hiragino Sans GB","Microsoft YaHei","微软雅黑",Arial,sans-serif;
+    }
+</style>