纪律考评

ruoyi-admin/src/main/java/com/ruoyi/web/controller/branch/TBranchAssessController.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.TBranchAssess;
+import com.ruoyi.branch.service.ITBranchAssessService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 纪律考评Controller
+ * 
+ * @author ruoyi
+ * @date 2023-07-31
+ */
+@RestController
+@RequestMapping("/branch/assess")
+public class TBranchAssessController extends BaseController
+{
+    @Autowired
+    private ITBranchAssessService tBranchAssessService;
+
+    /**
+     * 查询纪律考评列表
+     */
+    @PreAuthorize("@ss.hasPermi('branch:assess:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(TBranchAssess tBranchAssess)
+    {
+        startPage();
+        List<TBranchAssess> list = tBranchAssessService.selectTBranchAssessList(tBranchAssess);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出纪律考评列表
+     */
+    @PreAuthorize("@ss.hasPermi('branch:assess:export')")
+    @Log(title = "纪律考评", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, TBranchAssess tBranchAssess)
+    {
+        List<TBranchAssess> list = tBranchAssessService.selectTBranchAssessList(tBranchAssess);
+        ExcelUtil<TBranchAssess> util = new ExcelUtil<TBranchAssess>(TBranchAssess.class);
+        util.exportExcel(response, list, "纪律考评数据");
+    }
+
+    /**
+     * 获取纪律考评详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('branch:assess:query')")
+    @GetMapping(value = "/{assessId}")
+    public AjaxResult getInfo(@PathVariable("assessId") Long assessId)
+    {
+        return success(tBranchAssessService.selectTBranchAssessByAssessId(assessId));
+    }
+
+    /**
+     * 新增纪律考评
+     */
+    @PreAuthorize("@ss.hasPermi('branch:assess:add')")
+    @Log(title = "纪律考评", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TBranchAssess tBranchAssess)
+    {
+        return toAjax(tBranchAssessService.insertTBranchAssess(tBranchAssess));
+    }
+
+    /**
+     * 修改纪律考评
+     */
+    @PreAuthorize("@ss.hasPermi('branch:assess:edit')")
+    @Log(title = "纪律考评", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TBranchAssess tBranchAssess)
+    {
+        return toAjax(tBranchAssessService.updateTBranchAssess(tBranchAssess));
+    }
+
+    /**
+     * 删除纪律考评
+     */
+    @PreAuthorize("@ss.hasPermi('branch:assess:remove')")
+    @Log(title = "纪律考评", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{assessIds}")
+    public AjaxResult remove(@PathVariable Long[] assessIds)
+    {
+        return toAjax(tBranchAssessService.deleteTBranchAssessByAssessIds(assessIds));
+    }
+}

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

@@ -0,0 +1,132 @@
+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_assess
+ * 
+ * @author ruoyi
+ * @date 2023-07-31
+ */
+public class TBranchAssess extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键id */
+    @Excel(name = "主键id")
+    private Long assessId;
+
+    /** 党员姓名 */
+    @Excel(name = "党员姓名")
+    private Long assessMember;
+
+    /** 考核时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "考核时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date assessTime;
+
+    /** 考核分数 */
+    @Excel(name = "考核分数")
+    private Long assessScore;
+
+    /** 部门id */
+    @Excel(name = "部门id")
+    private Long deptId;
+
+    /** 删除标志（0代表存在 2代表删除） */
+    private String delFlag;
+
+    /** 用户昵称 */
+    @Excel(name = "用户名称")
+    private String nickName;
+
+    public String getNickName() {
+        return nickName;
+    }
+
+    public void setNickName(String nickName) {
+        this.nickName = nickName;
+    }
+
+    public void setAssessId(Long assessId)
+    {
+        this.assessId = assessId;
+    }
+
+    public Long getAssessId() 
+    {
+        return assessId;
+    }
+
+    public void setAssessMember(Long assessMember)
+    {
+        this.assessMember = assessMember;
+    }
+
+    public Long getAssessMember()
+    {
+        return assessMember;
+    }
+
+    public void setAssessTime(Date assessTime) 
+    {
+        this.assessTime = assessTime;
+    }
+
+    public Date getAssessTime() 
+    {
+        return assessTime;
+    }
+
+    public void setAssessScore(Long assessScore) 
+    {
+        this.assessScore = assessScore;
+    }
+
+    public Long getAssessScore() 
+    {
+        return assessScore;
+    }
+
+    public void setDeptId(Long deptId) 
+    {
+        this.deptId = deptId;
+    }
+
+    public Long getDeptId() 
+    {
+        return deptId;
+    }
+
+    public void setDelFlag(String delFlag) 
+    {
+        this.delFlag = delFlag;
+    }
+
+    public String getDelFlag() 
+    {
+        return delFlag;
+    }
+
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("assessId", getAssessId())
+            .append("assessMember", getAssessMember())
+            .append("assessTime", getAssessTime())
+            .append("assessScore", getAssessScore())
+            .append("deptId", getDeptId())
+            .append("delFlag", getDelFlag())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .toString();
+    }
+}

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

@@ -0,0 +1,61 @@
+package com.ruoyi.branch.mapper;
+
+import java.util.List;
+import com.ruoyi.branch.domain.TBranchAssess;
+
+/**
+ * 纪律考评Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2023-07-31
+ */
+public interface TBranchAssessMapper 
+{
+    /**
+     * 查询纪律考评
+     * 
+     * @param assessId 纪律考评主键
+     * @return 纪律考评
+     */
+    public TBranchAssess selectTBranchAssessByAssessId(Long assessId);
+
+    /**
+     * 查询纪律考评列表
+     * 
+     * @param tBranchAssess 纪律考评
+     * @return 纪律考评集合
+     */
+    public List<TBranchAssess> selectTBranchAssessList(TBranchAssess tBranchAssess);
+
+    /**
+     * 新增纪律考评
+     * 
+     * @param tBranchAssess 纪律考评
+     * @return 结果
+     */
+    public int insertTBranchAssess(TBranchAssess tBranchAssess);
+
+    /**
+     * 修改纪律考评
+     * 
+     * @param tBranchAssess 纪律考评
+     * @return 结果
+     */
+    public int updateTBranchAssess(TBranchAssess tBranchAssess);
+
+    /**
+     * 删除纪律考评
+     * 
+     * @param assessId 纪律考评主键
+     * @return 结果
+     */
+    public int deleteTBranchAssessByAssessId(Long assessId);
+
+    /**
+     * 批量删除纪律考评
+     * 
+     * @param assessIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteTBranchAssessByAssessIds(Long[] assessIds);
+}

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

@@ -0,0 +1,61 @@
+package com.ruoyi.branch.service;
+
+import java.util.List;
+import com.ruoyi.branch.domain.TBranchAssess;
+
+/**
+ * 纪律考评Service接口
+ * 
+ * @author ruoyi
+ * @date 2023-07-31
+ */
+public interface ITBranchAssessService 
+{
+    /**
+     * 查询纪律考评
+     * 
+     * @param assessId 纪律考评主键
+     * @return 纪律考评
+     */
+    public TBranchAssess selectTBranchAssessByAssessId(Long assessId);
+
+    /**
+     * 查询纪律考评列表
+     * 
+     * @param tBranchAssess 纪律考评
+     * @return 纪律考评集合
+     */
+    public List<TBranchAssess> selectTBranchAssessList(TBranchAssess tBranchAssess);
+
+    /**
+     * 新增纪律考评
+     * 
+     * @param tBranchAssess 纪律考评
+     * @return 结果
+     */
+    public int insertTBranchAssess(TBranchAssess tBranchAssess);
+
+    /**
+     * 修改纪律考评
+     * 
+     * @param tBranchAssess 纪律考评
+     * @return 结果
+     */
+    public int updateTBranchAssess(TBranchAssess tBranchAssess);
+
+    /**
+     * 批量删除纪律考评
+     * 
+     * @param assessIds 需要删除的纪律考评主键集合
+     * @return 结果
+     */
+    public int deleteTBranchAssessByAssessIds(Long[] assessIds);
+
+    /**
+     * 删除纪律考评信息
+     * 
+     * @param assessId 纪律考评主键
+     * @return 结果
+     */
+    public int deleteTBranchAssessByAssessId(Long assessId);
+}

ruoyi-system/src/main/java/com/ruoyi/branch/service/impl/TBranchAssessServiceImpl.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.TBranchAssessMapper;
+import com.ruoyi.branch.domain.TBranchAssess;
+import com.ruoyi.branch.service.ITBranchAssessService;
+
+/**
+ * 纪律考评Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2023-07-31
+ */
+@Service
+public class TBranchAssessServiceImpl implements ITBranchAssessService 
+{
+    @Autowired
+    private TBranchAssessMapper tBranchAssessMapper;
+
+    /**
+     * 查询纪律考评
+     * 
+     * @param assessId 纪律考评主键
+     * @return 纪律考评
+     */
+    @Override
+    public TBranchAssess selectTBranchAssessByAssessId(Long assessId)
+    {
+        return tBranchAssessMapper.selectTBranchAssessByAssessId(assessId);
+    }
+
+    /**
+     * 查询纪律考评列表
+     * 
+     * @param tBranchAssess 纪律考评
+     * @return 纪律考评
+     */
+    @Override
+    @DataScope(deptAlias = "d", userAlias = "u")
+    public List<TBranchAssess> selectTBranchAssessList(TBranchAssess tBranchAssess)
+    {
+        return tBranchAssessMapper.selectTBranchAssessList(tBranchAssess);
+    }
+
+    /**
+     * 新增纪律考评
+     * 
+     * @param tBranchAssess 纪律考评
+     * @return 结果
+     */
+    @Override
+    public int insertTBranchAssess(TBranchAssess tBranchAssess)
+    {
+        tBranchAssess.setCreateTime(DateUtils.getNowDate());
+        return tBranchAssessMapper.insertTBranchAssess(tBranchAssess);
+    }
+
+    /**
+     * 修改纪律考评
+     * 
+     * @param tBranchAssess 纪律考评
+     * @return 结果
+     */
+    @Override
+    public int updateTBranchAssess(TBranchAssess tBranchAssess)
+    {
+        tBranchAssess.setUpdateTime(DateUtils.getNowDate());
+        return tBranchAssessMapper.updateTBranchAssess(tBranchAssess);
+    }
+
+    /**
+     * 批量删除纪律考评
+     * 
+     * @param assessIds 需要删除的纪律考评主键
+     * @return 结果
+     */
+    @Override
+    public int deleteTBranchAssessByAssessIds(Long[] assessIds)
+    {
+        return tBranchAssessMapper.deleteTBranchAssessByAssessIds(assessIds);
+    }
+
+    /**
+     * 删除纪律考评信息
+     * 
+     * @param assessId 纪律考评主键
+     * @return 结果
+     */
+    @Override
+    public int deleteTBranchAssessByAssessId(Long assessId)
+    {
+        return tBranchAssessMapper.deleteTBranchAssessByAssessId(assessId);
+    }
+}

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

@@ -0,0 +1,107 @@
+<?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.TBranchAssessMapper">
+    
+    <resultMap type="TBranchAssess" id="TBranchAssessResult">
+        <result property="assessId"    column="assess_id"    />
+        <result property="assessMember"    column="assess_member"    />
+        <result property="assessTime"    column="assess_time"    />
+        <result property="assessScore"    column="assess_score"    />
+        <result property="deptId"    column="dept_id"    />
+        <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="nickName"    column="nick_name"    />
+    </resultMap>
+
+    <sql id="selectTBranchAssessVo">
+        select u.assess_id, u.assess_member, u.assess_time, u.assess_score, u.dept_id, u.del_flag, u.create_by, u.create_time, u.update_by, u.update_time,
+        us.NICK_NAME
+        from t_branch_assess u
+            left join sys_dept d on u.dept_id = d.dept_id
+            left join SYS_USER us on us.user_id = u.assess_member
+    </sql>
+
+    <select id="selectTBranchAssessList" parameterType="TBranchAssess" resultMap="TBranchAssessResult">
+        <include refid="selectTBranchAssessVo"/>
+        <where>  
+            <if test="assessId != null "> and u.assess_id = #{assessId}</if>
+            <if test="assessMember != null  and assessMember != ''"> and u.assess_member = #{assessMember}</if>
+            <if test="assessTime != null "> and u.assess_time = #{assessTime}</if>
+            <if test="assessScore != null "> and u.assess_score = #{assessScore}</if>
+            <if test="deptId != null "> and u.dept_id = #{deptId}</if>
+            <if test="nickName != null  and nickName != ''"> and us.nick_name like concat(concat('%', #{nickName}), '%')</if>
+            and u.del_flag = 0
+        </where>
+        <!-- 数据范围过滤 -->
+        ${params.dataScope}
+    </select>
+    
+    <select id="selectTBranchAssessByAssessId" parameterType="Long" resultMap="TBranchAssessResult">
+        <include refid="selectTBranchAssessVo"/>
+        where u.assess_id = #{assessId}
+        and u.del_flag = 0
+    </select>
+        
+    <insert id="insertTBranchAssess" parameterType="TBranchAssess">
+        <selectKey keyProperty="assessId" resultType="long" order="BEFORE">
+            SELECT seq_t_branch_assess.NEXTVAL as assessId FROM DUAL
+        </selectKey>
+        insert into t_branch_assess
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="assessId != null">assess_id,</if>
+            <if test="assessMember != null">assess_member,</if>
+            <if test="assessTime != null">assess_time,</if>
+            <if test="assessScore != null">assess_score,</if>
+            <if test="deptId != null">dept_id,</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>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="assessId != null">#{assessId},</if>
+            <if test="assessMember != null">#{assessMember},</if>
+            <if test="assessTime != null">#{assessTime},</if>
+            <if test="assessScore != null">#{assessScore},</if>
+            <if test="deptId != null">#{deptId},</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>
+         </trim>
+    </insert>
+
+    <update id="updateTBranchAssess" parameterType="TBranchAssess">
+        update t_branch_assess
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="assessMember != null">assess_member = #{assessMember},</if>
+            <if test="assessTime != null">assess_time = #{assessTime},</if>
+            <if test="assessScore != null">assess_score = #{assessScore},</if>
+            <if test="deptId != null">dept_id = #{deptId},</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>
+        </trim>
+        where assess_id = #{assessId}
+    </update>
+
+    <update id="deleteTBranchAssessByAssessId" parameterType="Long">
+        update t_branch_assess set del_flag = 2 where assess_id = #{assessId}
+    </update>
+
+    <update id="deleteTBranchAssessByAssessIds" parameterType="String">
+        update t_branch_assess set del_flag = 2 where assess_id in
+        <foreach item="assessId" collection="array" open="(" separator="," close=")">
+            #{assessId}
+        </foreach>
+    </update>
+</mapper>

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

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询纪律考评列表
+export function listAssess(query) {
+  return request({
+    url: '/branch/assess/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询纪律考评详细
+export function getAssess(assessId) {
+  return request({
+    url: '/branch/assess/' + assessId,
+    method: 'get'
+  })
+}
+
+// 新增纪律考评
+export function addAssess(data) {
+  return request({
+    url: '/branch/assess',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改纪律考评
+export function updateAssess(data) {
+  return request({
+    url: '/branch/assess',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除纪律考评
+export function delAssess(assessId) {
+  return request({
+    url: '/branch/assess/' + assessId,
+    method: 'delete'
+  })
+}

ruoyi-ui/src/views/branch/jlkp/assess/index.vue

@@ -0,0 +1,479 @@
+<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="nickName">
+        <el-input
+          v-model="queryParams.nickName"
+          placeholder="请输入党员姓名"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="考核时间" prop="assessTime">
+        <el-date-picker clearable size="small" style="width: 200px"
+          v-model="queryParams.assessTime"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="选择考核时间">
+        </el-date-picker>
+      </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:assess: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:assess: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:assess: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:assess: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:assess:export']"
+        >导出</el-button>
+      </el-col>
+	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="assessList" @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="assessMember" width="120" :formatter="userListFormat" />
+      <el-table-column label="考核时间" align="center" prop="assessTime" width="100">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.assessTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="考核分数" align="center" prop="assessScore" />
+      <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:assess:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['branch:assess: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="assessMember">
+          <el-select v-model="form.assessMember" 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="assessTime">
+          <el-date-picker clearable size="small" style="width: 200px"
+            v-model="form.assessTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择考核时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="考核分数" prop="assessScore">
+          <el-input v-model="form.assessScore" 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 { listAssess, getAssess, delAssess, addAssess, updateAssess, exportAssess, importTemplate} from "@/api/branch/assess";
+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 { listDept } from "@/api/system/dept";
+import { listUser} from "@/api/system/user";
+
+export default {
+  name: "Assess",
+  components: { Treeselect },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: false,
+      // 总条数
+      total: 0,
+      // 纪律考评表格数据
+      assessList: [],
+      // 弹出层标题
+      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/assess/importData"
+        },
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 20,
+        assessId: null,
+        assessMember: null,
+        assessTime: null,
+        assessScore: null,
+        deptId: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        assessMember: [
+          { required: true, message: "党员姓名不能为空", trigger: "blur" }
+        ],
+        assessTime: [
+          { required: true, message: "考核时间不能为空", trigger: "blur" }
+        ],
+        assessScore: [
+          { required: true, message: "考核分数不能为空", trigger: "blur" },
+          { pattern: /^-?\d+\.?\d*$/, message: '分数不能为非数值', trigger: 'blur' }
+        ],
+        deptId: [
+          { required: true, message: "归属部门不能为空", trigger: "blur" }
+        ],
+      },
+      // 用户列表
+      userList: [],
+      // 部门列表
+      deptList: [],
+    };
+  },
+  watch: {
+        // 根据名称筛选部门树
+        deptName(val) {
+            this.$refs.tree.filter(val);
+        }
+   },
+  created() {
+    this.getUserList();
+    this.getDeptList();
+      //设置表格高度对应屏幕高度
+      this.$nextTick(() => {
+          this.clientHeight = document.body.clientHeight -250
+      })
+    this.getList();
+    this.getTreeselect();
+  },
+  methods: {
+    /** 查询用户列表 */
+    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;
+      });
+    },
+    /** 查询部门列表 */
+    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;
+      });
+    },
+    // 用户列表字典翻译
+    userListFormat(row, column) {
+      return this.selectDictLabel(this.userList, row.assessMember);
+    },
+    // 部门列表字典翻译
+    deptListFormat(row, column) {
+      return this.selectDictLabel(this.deptList, row.deptId);
+    },
+    /** 查询纪律考评列表 */
+    getList() {
+      this.loading = true;
+      listAssess(this.queryParams).then(response => {
+        this.assessList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+     /** 查询部门下拉树结构 */
+     getTreeselect() {
+          treeselect().then(response => {
+              this.deptOptions = response.data;
+          });
+     },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        assessId: null,
+        assessMember: null,
+        assessTime: null,
+        assessScore: null,
+        deptId: null,
+        delFlag: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: 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.assessId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加纪律考评";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const assessId = row.assessId || this.ids
+      getAssess(assessId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改纪律考评";
+      });
+    },
+      /** 提交按钮 */
+      submitForm() {
+          this.$refs["form"].validate(valid => {
+              if (valid) {
+                  if (this.form.assessId != null) {
+                      updateAssess(this.form).then(response => {
+                          this.$modal.msgSuccess("修改成功");
+                          this.open = false;
+                          this.getList();
+                      });
+                  } else {
+                      addAssess(this.form).then(response => {
+                          this.$modal.msgSuccess("新增成功");
+                          this.open = false;
+                          this.getList();
+                      });
+                  }
+              }
+          });
+      },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const assessIds = row.assessId || this.ids;
+      this.$confirm('是否确认删除?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return delAssess(assessIds);
+        }).then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        })
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm('是否确认导出所有纪律考评数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return exportAssess(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>