党员关系转移记录

ruoyi-admin/src/main/java/com/ruoyi/web/controller/branch/TBranchMemTransferController.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.TBranchMemTransfer;
+import com.ruoyi.branch.service.ITBranchMemTransferService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 党员关系转移记录Controller
+ * 
+ * @author ruoyi
+ * @date 2023-07-13
+ */
+@RestController
+@RequestMapping("/branch/transfer")
+public class TBranchMemTransferController extends BaseController
+{
+    @Autowired
+    private ITBranchMemTransferService tBranchMemTransferService;
+
+    /**
+     * 查询党员关系转移记录列表
+     */
+    @PreAuthorize("@ss.hasPermi('branch:transfer:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(TBranchMemTransfer tBranchMemTransfer)
+    {
+        startPage();
+        List<TBranchMemTransfer> list = tBranchMemTransferService.selectTBranchMemTransferList(tBranchMemTransfer);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出党员关系转移记录列表
+     */
+    @PreAuthorize("@ss.hasPermi('branch:transfer:export')")
+    @Log(title = "党员关系转移记录", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, TBranchMemTransfer tBranchMemTransfer)
+    {
+        List<TBranchMemTransfer> list = tBranchMemTransferService.selectTBranchMemTransferList(tBranchMemTransfer);
+        ExcelUtil<TBranchMemTransfer> util = new ExcelUtil<TBranchMemTransfer>(TBranchMemTransfer.class);
+        util.exportExcel(response, list, "党员关系转移记录数据");
+    }
+
+    /**
+     * 获取党员关系转移记录详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('branch:transfer:query')")
+    @GetMapping(value = "/{transferId}")
+    public AjaxResult getInfo(@PathVariable("transferId") Long transferId)
+    {
+        return success(tBranchMemTransferService.selectTBranchMemTransferByTransferId(transferId));
+    }
+
+    /**
+     * 新增党员关系转移记录
+     */
+    @PreAuthorize("@ss.hasPermi('branch:transfer:add')")
+    @Log(title = "党员关系转移记录", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TBranchMemTransfer tBranchMemTransfer)
+    {
+        return toAjax(tBranchMemTransferService.insertTBranchMemTransfer(tBranchMemTransfer));
+    }
+
+    /**
+     * 修改党员关系转移记录
+     */
+    @PreAuthorize("@ss.hasPermi('branch:transfer:edit')")
+    @Log(title = "党员关系转移记录", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TBranchMemTransfer tBranchMemTransfer)
+    {
+        return toAjax(tBranchMemTransferService.updateTBranchMemTransfer(tBranchMemTransfer));
+    }
+
+    /**
+     * 删除党员关系转移记录
+     */
+    @PreAuthorize("@ss.hasPermi('branch:transfer:remove')")
+    @Log(title = "党员关系转移记录", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{transferIds}")
+    public AjaxResult remove(@PathVariable Long[] transferIds)
+    {
+        return toAjax(tBranchMemTransferService.deleteTBranchMemTransferByTransferIds(transferIds));
+    }
+}

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

@@ -0,0 +1,166 @@
+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_mem_transfer
+ * 
+ * @author ruoyi
+ * @date 2023-07-13
+ */
+public class TBranchMemTransfer extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键id */
+    @Excel(name = "主键id")
+    private Long transferId;
+
+    /** 用户id */
+    @Excel(name = "用户id")
+    private Long userId;
+
+    /** 原支部id */
+    @Excel(name = "原支部id")
+    private Long oldDeptId;
+
+    /** 转入支部id */
+    @Excel(name = "转入支部id")
+    private Long newDeptId;
+
+    /** 调转日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "调转日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date transferTime;
+
+    /** 党费交至日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "党费交至日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date duesPaidTo;
+
+    /** 备注 */
+    @Excel(name = "备注")
+    private String remarks;
+
+    /** 删除标志（0代表存在 2代表删除） */
+    private String delFlag;
+
+    /** 部门id */
+    @Excel(name = "部门id")
+    private Long deptId;
+
+    public void setTransferId(Long transferId) 
+    {
+        this.transferId = transferId;
+    }
+
+    public Long getTransferId() 
+    {
+        return transferId;
+    }
+
+    public void setUserId(Long userId) 
+    {
+        this.userId = userId;
+    }
+
+    public Long getUserId() 
+    {
+        return userId;
+    }
+
+    public void setOldDeptId(Long oldDeptId) 
+    {
+        this.oldDeptId = oldDeptId;
+    }
+
+    public Long getOldDeptId() 
+    {
+        return oldDeptId;
+    }
+
+    public void setNewDeptId(Long newDeptId) 
+    {
+        this.newDeptId = newDeptId;
+    }
+
+    public Long getNewDeptId() 
+    {
+        return newDeptId;
+    }
+
+    public void setTransferTime(Date transferTime) 
+    {
+        this.transferTime = transferTime;
+    }
+
+    public Date getTransferTime() 
+    {
+        return transferTime;
+    }
+
+    public void setDuesPaidTo(Date duesPaidTo) 
+    {
+        this.duesPaidTo = duesPaidTo;
+    }
+
+    public Date getDuesPaidTo() 
+    {
+        return duesPaidTo;
+    }
+
+    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("transferId", getTransferId())
+            .append("userId", getUserId())
+            .append("oldDeptId", getOldDeptId())
+            .append("newDeptId", getNewDeptId())
+            .append("transferTime", getTransferTime())
+            .append("duesPaidTo", getDuesPaidTo())
+            .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/TBranchMemTransferMapper.java

@@ -0,0 +1,61 @@
+package com.ruoyi.branch.mapper;
+
+import java.util.List;
+import com.ruoyi.branch.domain.TBranchMemTransfer;
+
+/**
+ * 党员关系转移记录Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2023-07-13
+ */
+public interface TBranchMemTransferMapper 
+{
+    /**
+     * 查询党员关系转移记录
+     * 
+     * @param transferId 党员关系转移记录主键
+     * @return 党员关系转移记录
+     */
+    public TBranchMemTransfer selectTBranchMemTransferByTransferId(Long transferId);
+
+    /**
+     * 查询党员关系转移记录列表
+     * 
+     * @param tBranchMemTransfer 党员关系转移记录
+     * @return 党员关系转移记录集合
+     */
+    public List<TBranchMemTransfer> selectTBranchMemTransferList(TBranchMemTransfer tBranchMemTransfer);
+
+    /**
+     * 新增党员关系转移记录
+     * 
+     * @param tBranchMemTransfer 党员关系转移记录
+     * @return 结果
+     */
+    public int insertTBranchMemTransfer(TBranchMemTransfer tBranchMemTransfer);
+
+    /**
+     * 修改党员关系转移记录
+     * 
+     * @param tBranchMemTransfer 党员关系转移记录
+     * @return 结果
+     */
+    public int updateTBranchMemTransfer(TBranchMemTransfer tBranchMemTransfer);
+
+    /**
+     * 删除党员关系转移记录
+     * 
+     * @param transferId 党员关系转移记录主键
+     * @return 结果
+     */
+    public int deleteTBranchMemTransferByTransferId(Long transferId);
+
+    /**
+     * 批量删除党员关系转移记录
+     * 
+     * @param transferIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteTBranchMemTransferByTransferIds(Long[] transferIds);
+}

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

@@ -0,0 +1,61 @@
+package com.ruoyi.branch.service;
+
+import java.util.List;
+import com.ruoyi.branch.domain.TBranchMemTransfer;
+
+/**
+ * 党员关系转移记录Service接口
+ * 
+ * @author ruoyi
+ * @date 2023-07-13
+ */
+public interface ITBranchMemTransferService 
+{
+    /**
+     * 查询党员关系转移记录
+     * 
+     * @param transferId 党员关系转移记录主键
+     * @return 党员关系转移记录
+     */
+    public TBranchMemTransfer selectTBranchMemTransferByTransferId(Long transferId);
+
+    /**
+     * 查询党员关系转移记录列表
+     * 
+     * @param tBranchMemTransfer 党员关系转移记录
+     * @return 党员关系转移记录集合
+     */
+    public List<TBranchMemTransfer> selectTBranchMemTransferList(TBranchMemTransfer tBranchMemTransfer);
+
+    /**
+     * 新增党员关系转移记录
+     * 
+     * @param tBranchMemTransfer 党员关系转移记录
+     * @return 结果
+     */
+    public int insertTBranchMemTransfer(TBranchMemTransfer tBranchMemTransfer);
+
+    /**
+     * 修改党员关系转移记录
+     * 
+     * @param tBranchMemTransfer 党员关系转移记录
+     * @return 结果
+     */
+    public int updateTBranchMemTransfer(TBranchMemTransfer tBranchMemTransfer);
+
+    /**
+     * 批量删除党员关系转移记录
+     * 
+     * @param transferIds 需要删除的党员关系转移记录主键集合
+     * @return 结果
+     */
+    public int deleteTBranchMemTransferByTransferIds(Long[] transferIds);
+
+    /**
+     * 删除党员关系转移记录信息
+     * 
+     * @param transferId 党员关系转移记录主键
+     * @return 结果
+     */
+    public int deleteTBranchMemTransferByTransferId(Long transferId);
+}

ruoyi-system/src/main/java/com/ruoyi/branch/service/impl/TBranchMemTransferServiceImpl.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.TBranchMemTransferMapper;
+import com.ruoyi.branch.domain.TBranchMemTransfer;
+import com.ruoyi.branch.service.ITBranchMemTransferService;
+
+/**
+ * 党员关系转移记录Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2023-07-13
+ */
+@Service
+public class TBranchMemTransferServiceImpl implements ITBranchMemTransferService 
+{
+    @Autowired
+    private TBranchMemTransferMapper tBranchMemTransferMapper;
+
+    /**
+     * 查询党员关系转移记录
+     * 
+     * @param transferId 党员关系转移记录主键
+     * @return 党员关系转移记录
+     */
+    @Override
+    public TBranchMemTransfer selectTBranchMemTransferByTransferId(Long transferId)
+    {
+        return tBranchMemTransferMapper.selectTBranchMemTransferByTransferId(transferId);
+    }
+
+    /**
+     * 查询党员关系转移记录列表
+     * 
+     * @param tBranchMemTransfer 党员关系转移记录
+     * @return 党员关系转移记录
+     */
+    @Override
+    @DataScope(deptAlias = "d", userAlias = "u")
+    public List<TBranchMemTransfer> selectTBranchMemTransferList(TBranchMemTransfer tBranchMemTransfer)
+    {
+        return tBranchMemTransferMapper.selectTBranchMemTransferList(tBranchMemTransfer);
+    }
+
+    /**
+     * 新增党员关系转移记录
+     * 
+     * @param tBranchMemTransfer 党员关系转移记录
+     * @return 结果
+     */
+    @Override
+    public int insertTBranchMemTransfer(TBranchMemTransfer tBranchMemTransfer)
+    {
+        tBranchMemTransfer.setCreateTime(DateUtils.getNowDate());
+        return tBranchMemTransferMapper.insertTBranchMemTransfer(tBranchMemTransfer);
+    }
+
+    /**
+     * 修改党员关系转移记录
+     * 
+     * @param tBranchMemTransfer 党员关系转移记录
+     * @return 结果
+     */
+    @Override
+    public int updateTBranchMemTransfer(TBranchMemTransfer tBranchMemTransfer)
+    {
+        tBranchMemTransfer.setUpdateTime(DateUtils.getNowDate());
+        return tBranchMemTransferMapper.updateTBranchMemTransfer(tBranchMemTransfer);
+    }
+
+    /**
+     * 批量删除党员关系转移记录
+     * 
+     * @param transferIds 需要删除的党员关系转移记录主键
+     * @return 结果
+     */
+    @Override
+    public int deleteTBranchMemTransferByTransferIds(Long[] transferIds)
+    {
+        return tBranchMemTransferMapper.deleteTBranchMemTransferByTransferIds(transferIds);
+    }
+
+    /**
+     * 删除党员关系转移记录信息
+     * 
+     * @param transferId 党员关系转移记录主键
+     * @return 结果
+     */
+    @Override
+    public int deleteTBranchMemTransferByTransferId(Long transferId)
+    {
+        return tBranchMemTransferMapper.deleteTBranchMemTransferByTransferId(transferId);
+    }
+}

ruoyi-system/src/main/resources/mapper/branch/TBranchMemTransferMapper.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.TBranchMemTransferMapper">
+    
+    <resultMap type="TBranchMemTransfer" id="TBranchMemTransferResult">
+        <result property="transferId"    column="transfer_id"    />
+        <result property="userId"    column="user_id"    />
+        <result property="oldDeptId"    column="old_dept_id"    />
+        <result property="newDeptId"    column="new_dept_id"    />
+        <result property="transferTime"    column="transfer_time"    />
+        <result property="duesPaidTo"    column="dues_paid_to"    />
+        <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="selectTBranchMemTransferVo">
+        select u.transfer_id, u.user_id, u.old_dept_id, u.new_dept_id, u.transfer_time, u.dues_paid_to, u.remarks, u.del_flag, u.create_by, u.create_time, u.update_by, u.update_time, u.dept_id from t_branch_mem_transfer u left join sys_dept d on u.dept_id = d.dept_id
+    </sql>
+
+    <select id="selectTBranchMemTransferList" parameterType="TBranchMemTransfer" resultMap="TBranchMemTransferResult">
+        <include refid="selectTBranchMemTransferVo"/>
+        <where>  
+            <if test="transferId != null "> and u.transfer_id = #{transferId}</if>
+            <if test="userId != null "> and u.user_id = #{userId}</if>
+            <if test="oldDeptId != null "> and u.old_dept_id = #{oldDeptId}</if>
+            <if test="newDeptId != null "> and u.new_dept_id = #{newDeptId}</if>
+            <if test="transferTime != null "> and u.transfer_time = #{transferTime}</if>
+            <if test="duesPaidTo != null "> and u.dues_paid_to = #{duesPaidTo}</if>
+            <if test="remarks != null  and remarks != ''"> and u.remarks = #{remarks}</if>
+            <if test="deptId != null "> and u.dept_id = #{deptId}</if>
+            and u.del_flag = 0
+        </where>
+        <!-- 数据范围过滤 -->
+        ${params.dataScope}
+    </select>
+    
+    <select id="selectTBranchMemTransferByTransferId" parameterType="Long" resultMap="TBranchMemTransferResult">
+        <include refid="selectTBranchMemTransferVo"/>
+        where u.transfer_id = #{transferId}
+        and u.del_flag = 0
+    </select>
+        
+    <insert id="insertTBranchMemTransfer" parameterType="TBranchMemTransfer">
+        <selectKey keyProperty="transferId" resultType="long" order="BEFORE">
+            SELECT seq_t_branch_mem_transfer.NEXTVAL as transferId FROM DUAL
+        </selectKey>
+        insert into t_branch_mem_transfer
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="transferId != null">transfer_id,</if>
+            <if test="userId != null">user_id,</if>
+            <if test="oldDeptId != null">old_dept_id,</if>
+            <if test="newDeptId != null">new_dept_id,</if>
+            <if test="transferTime != null">transfer_time,</if>
+            <if test="duesPaidTo != null">dues_paid_to,</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="transferId != null">#{transferId},</if>
+            <if test="userId != null">#{userId},</if>
+            <if test="oldDeptId != null">#{oldDeptId},</if>
+            <if test="newDeptId != null">#{newDeptId},</if>
+            <if test="transferTime != null">#{transferTime},</if>
+            <if test="duesPaidTo != null">#{duesPaidTo},</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="updateTBranchMemTransfer" parameterType="TBranchMemTransfer">
+        update t_branch_mem_transfer
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="userId != null">user_id = #{userId},</if>
+            <if test="oldDeptId != null">old_dept_id = #{oldDeptId},</if>
+            <if test="newDeptId != null">new_dept_id = #{newDeptId},</if>
+            <if test="transferTime != null">transfer_time = #{transferTime},</if>
+            <if test="duesPaidTo != null">dues_paid_to = #{duesPaidTo},</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 transfer_id = #{transferId}
+    </update>
+
+    <update id="deleteTBranchMemTransferByTransferId" parameterType="Long">
+        update t_branch_mem_transfer set del_flag = 2 where transfer_id = #{transferId}
+    </update>
+
+    <update id="deleteTBranchMemTransferByTransferIds" parameterType="String">
+        update t_branch_mem_transfer set del_flag = 2 where transfer_id in
+        <foreach item="transferId" collection="array" open="(" separator="," close=")">
+            #{transferId}
+        </foreach>
+    </update>
+</mapper>

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

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询党员关系转移记录列表
+export function listTransfer(query) {
+  return request({
+    url: '/branch/transfer/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询党员关系转移记录详细
+export function getTransfer(transferId) {
+  return request({
+    url: '/branch/transfer/' + transferId,
+    method: 'get'
+  })
+}
+
+// 新增党员关系转移记录
+export function addTransfer(data) {
+  return request({
+    url: '/branch/transfer',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改党员关系转移记录
+export function updateTransfer(data) {
+  return request({
+    url: '/branch/transfer',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除党员关系转移记录
+export function delTransfer(transferId) {
+  return request({
+    url: '/branch/transfer/' + transferId,
+    method: 'delete'
+  })
+}

ruoyi-ui/src/views/branch/transfer/index.vue

@@ -0,0 +1,568 @@
+<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="userId">
+        <el-input
+          v-model="queryParams.userId"
+          placeholder="请输入用户id"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="原支部id" prop="oldDeptId">
+        <el-input
+          v-model="queryParams.oldDeptId"
+          placeholder="请输入原支部id"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="转入支部id" prop="newDeptId">
+        <el-input
+          v-model="queryParams.newDeptId"
+          placeholder="请输入转入支部id"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="调转日期" prop="transferTime">
+        <el-date-picker clearable size="small" style="width: 200px"
+          v-model="queryParams.transferTime"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="选择调转日期">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="党费交至日期" prop="duesPaidTo">
+        <el-date-picker clearable size="small" style="width: 200px"
+          v-model="queryParams.duesPaidTo"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="选择党费交至日期">
+        </el-date-picker>
+      </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>
+        <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:transfer: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:transfer: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:transfer: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:transfer: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:transfer:export']"
+        >导出</el-button>
+      </el-col>
+	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="transferList" @selection-change="handleSelectionChange" :height="clientHeight" border>
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="姓名" align="center" prop="userId" :formatter="userListFormat" />
+      <el-table-column label="原支部名称" align="center" prop="oldDeptId" :formatter="oldDeptFormat" />
+      <el-table-column label="转入支部名称" align="center" prop="newDeptId" :formatter="newDeptFormat" />
+      <el-table-column label="调转日期" align="center" prop="transferTime" width="100">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.transferTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="党费交至日期" align="center" prop="duesPaidTo" width="100">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.duesPaidTo, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="备注" align="center" prop="remarks" />
+      <el-table-column label="归属部门" align="center" prop="deptId" :formatter="deptListFormat" />
+      <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:transfer:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['branch:transfer: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="姓名" prop="userId">
+          <el-select v-model="form.userId" 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="oldDeptId">
+          <treeselect v-model="form.oldDeptId" :options="deptOptions" :show-count="true" placeholder="请选择原支部" />
+        </el-form-item>
+        <el-form-item label="转入支部" prop="newDeptId">
+          <treeselect v-model="form.newDeptId" :options="deptOptions" :show-count="true" placeholder="请选择转入支部" />
+        </el-form-item>
+        <el-form-item label="调转日期" prop="transferTime">
+          <el-date-picker clearable size="small" style="width: 200px"
+            v-model="form.transferTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择调转日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="党费交至日期" prop="duesPaidTo">
+          <el-date-picker clearable size="small" style="width: 200px"
+            v-model="form.duesPaidTo"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择党费交至日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="备注" prop="remarks">
+          <el-input v-model="form.remarks" placeholder="请输入备注" />
+        </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 { listTransfer, getTransfer, delTransfer, addTransfer, updateTransfer, exportTransfer, importTemplate} from "@/api/branch/transfer";
+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: "Transfer",
+  components: { Treeselect },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: false,
+      // 总条数
+      total: 0,
+      // 党员关系转移记录表格数据
+      transferList: [],
+      // 弹出层标题
+      title: "",
+      // 部门树选项
+      deptOptions: undefined,
+      clientHeight:300,
+      // 是否显示弹出层
+      open: false,
+      // 主键id字典
+      transferIdOptions: [],
+      // 用户id字典
+      userIdOptions: [],
+      // 原支部id字典
+      oldDeptIdOptions: [],
+      // 转入支部id字典
+      newDeptIdOptions: [],
+      // 调转日期字典
+      transferTimeOptions: [],
+      // 党费交至日期字典
+      duesPaidToOptions: [],
+      // 备注字典
+      remarksOptions: [],
+      // 删除标志字典
+      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/transfer/importData"
+        },
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 20,
+        transferId: null,
+        userId: null,
+        oldDeptId: null,
+        newDeptId: null,
+        transferTime: null,
+        duesPaidTo: null,
+        remarks: null,
+        deptId: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        userId: [
+          { required: true, message: "绑定用户不能为空", trigger: "blur" }
+        ],
+        oldDeptId: [
+          { required: true, message: "原支部不能为空", trigger: "blur" }
+        ],
+        newDeptId: [
+          { required: true, message: "转入支部不能为空", trigger: "blur" }
+        ],
+        deptId: [
+          { required: true, message: "归属部门不能为空", trigger: "blur" }
+        ],
+      },
+      // 用户列表
+      userList: [],
+      // 部门列表
+      deptList: [],
+    };
+  },
+  watch: {
+        // 根据名称筛选部门树
+        deptName(val) {
+            this.$refs.tree.filter(val);
+        }
+   },
+  created() {
+      //设置表格高度对应屏幕高度
+      this.$nextTick(() => {
+          this.clientHeight = document.body.clientHeight -250
+      })
+    this.getList();
+    this.getTreeselect();
+    this.getUserList();
+    this.getDeptList();
+  },
+  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;
+      });
+    },
+    /** 查询用户列表 */
+    getUserList() {
+      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;
+      });
+    },
+    /** 查询党员关系转移记录列表 */
+    getList() {
+      this.loading = true;
+      listTransfer(this.queryParams).then(response => {
+        this.transferList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+     /** 查询部门下拉树结构 */
+     getTreeselect() {
+          treeselect().then(response => {
+              this.deptOptions = response.data;
+          });
+     },
+    // 用户列表字典翻译
+    userListFormat(row, column) {
+      return this.selectDictLabel(this.userList, row.userId);
+    },
+    // 部门列表字典翻译
+    deptListFormat(row, column) {
+      return this.selectDictLabel(this.deptList, row.deptId);
+    },
+    // 原支部名称字典翻译
+    oldDeptFormat(row, column) {
+      return this.selectDictLabel(this.deptList, row.oldDeptId);
+    },
+    // 转入支部名称字典翻译
+    newDeptFormat(row, column) {
+      return this.selectDictLabel(this.deptList, row.newDeptId);
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        transferId: null,
+        userId: null,
+        oldDeptId: null,
+        newDeptId: null,
+        transferTime: null,
+        duesPaidTo: 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.transferId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加党员关系转移记录";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const transferId = row.transferId || this.ids
+      getTransfer(transferId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改党员关系转移记录";
+      });
+    },
+      /** 提交按钮 */
+      submitForm() {
+          this.$refs["form"].validate(valid => {
+              if (valid) {
+                  if (this.form.transferId != null) {
+                      updateTransfer(this.form).then(response => {
+                          this.$modal.msgSuccess("修改成功");
+                          this.open = false;
+                          this.getList();
+                      });
+                  } else {
+                      addTransfer(this.form).then(response => {
+                          this.$modal.msgSuccess("新增成功");
+                          this.open = false;
+                          this.getList();
+                      });
+                  }
+              }
+          });
+      },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const transferIds = row.transferId || this.ids;
+      this.$confirm('是否确认删除?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return delTransfer(transferIds);
+        }).then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        })
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm('是否确认导出所有党员关系转移记录数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return exportTransfer(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>