审核记录字段修改

main 10
hansha 2 years ago
parent 2023a7da1a
commit ef6d7cb76d

@ -1,31 +1,25 @@
package com.ruoyi.szxc.controller; package com.ruoyi.szxc.controller;
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.annotation.Log;
import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.szxc.domain.SzxcXyAuditRecard; import com.ruoyi.szxc.domain.SzxcXyAuditRecard;
import com.ruoyi.szxc.service.ISzxcXyAuditRecardService; import com.ruoyi.szxc.service.ISzxcXyAuditRecardService;
import com.ruoyi.common.utils.poi.ExcelUtil; import org.springframework.beans.factory.annotation.Autowired;
import com.ruoyi.common.core.page.TableDataInfo; import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
/** /**
* Controller * Controller
* *
* @author hs * @author hs
* @date 2024-04-13 * @date 2024-04-15
*/ */
@RestController @RestController
@RequestMapping("/szxc/xyrecard") @RequestMapping("/szxc/xyrecard")
@ -35,7 +29,7 @@ public class SzxcXyAuditRecardController extends BaseController
private ISzxcXyAuditRecardService szxcXyAuditRecardService; private ISzxcXyAuditRecardService szxcXyAuditRecardService;
/** /**
* *
*/ */
@PreAuthorize("@ss.hasPermi('szxc:xyrecard:list')") @PreAuthorize("@ss.hasPermi('szxc:xyrecard:list')")
@GetMapping("/list") @GetMapping("/list")
@ -47,20 +41,20 @@ public class SzxcXyAuditRecardController extends BaseController
} }
/** /**
* *
*/ */
@PreAuthorize("@ss.hasPermi('szxc:xyrecard:export')") @PreAuthorize("@ss.hasPermi('szxc:xyrecard:export')")
@Log(title = "心愿审核记录", businessType = BusinessType.EXPORT) @Log(title = "审核记录", businessType = BusinessType.EXPORT)
@PostMapping("/export") @PostMapping("/export")
public void export(HttpServletResponse response, SzxcXyAuditRecard szxcXyAuditRecard) public void export(HttpServletResponse response, SzxcXyAuditRecard szxcXyAuditRecard)
{ {
List<SzxcXyAuditRecard> list = szxcXyAuditRecardService.selectSzxcXyAuditRecardList(szxcXyAuditRecard); List<SzxcXyAuditRecard> list = szxcXyAuditRecardService.selectSzxcXyAuditRecardList(szxcXyAuditRecard);
ExcelUtil<SzxcXyAuditRecard> util = new ExcelUtil<SzxcXyAuditRecard>(SzxcXyAuditRecard.class); ExcelUtil<SzxcXyAuditRecard> util = new ExcelUtil<SzxcXyAuditRecard>(SzxcXyAuditRecard.class);
util.exportExcel(response, list, "心愿审核记录数据"); util.exportExcel(response, list, "审核记录数据");
} }
/** /**
* *
*/ */
@PreAuthorize("@ss.hasPermi('szxc:xyrecard:query')") @PreAuthorize("@ss.hasPermi('szxc:xyrecard:query')")
@GetMapping(value = "/{id}") @GetMapping(value = "/{id}")
@ -70,10 +64,10 @@ public class SzxcXyAuditRecardController extends BaseController
} }
/** /**
* *
*/ */
@PreAuthorize("@ss.hasPermi('szxc:xyrecard:add')") @PreAuthorize("@ss.hasPermi('szxc:xyrecard:add')")
@Log(title = "心愿审核记录", businessType = BusinessType.INSERT) @Log(title = "审核记录", businessType = BusinessType.INSERT)
@PostMapping @PostMapping
public AjaxResult add(@RequestBody SzxcXyAuditRecard szxcXyAuditRecard) public AjaxResult add(@RequestBody SzxcXyAuditRecard szxcXyAuditRecard)
{ {
@ -81,10 +75,10 @@ public class SzxcXyAuditRecardController extends BaseController
} }
/** /**
* *
*/ */
@PreAuthorize("@ss.hasPermi('szxc:xyrecard:edit')") @PreAuthorize("@ss.hasPermi('szxc:xyrecard:edit')")
@Log(title = "心愿审核记录", businessType = BusinessType.UPDATE) @Log(title = "审核记录", businessType = BusinessType.UPDATE)
@PutMapping @PutMapping
public AjaxResult edit(@RequestBody SzxcXyAuditRecard szxcXyAuditRecard) public AjaxResult edit(@RequestBody SzxcXyAuditRecard szxcXyAuditRecard)
{ {
@ -92,11 +86,11 @@ public class SzxcXyAuditRecardController extends BaseController
} }
/** /**
* *
*/ */
@PreAuthorize("@ss.hasPermi('szxc:xyrecard:remove')") @PreAuthorize("@ss.hasPermi('szxc:xyrecard:remove')")
@Log(title = "心愿审核记录", businessType = BusinessType.DELETE) @Log(title = "审核记录", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}") @DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids) public AjaxResult remove(@PathVariable Long[] ids)
{ {
return toAjax(szxcXyAuditRecardService.deleteSzxcXyAuditRecardByIds(ids)); return toAjax(szxcXyAuditRecardService.deleteSzxcXyAuditRecardByIds(ids));

@ -6,21 +6,33 @@ import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity; import com.ruoyi.common.core.domain.BaseEntity;
/** /**
* szxc_xy_audit_recard * szxc_xy_audit_recard
* *
* @author hs * @author hs
* @date 2024-04-13 * @date 2024-04-15
*/ */
public class SzxcXyAuditRecard extends BaseEntity public class SzxcXyAuditRecard extends BaseEntity
{ {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** */ /** id */
private Long id; private Long id;
/** 心愿id */ /** 审核记录类型(字典) */
@Excel(name = "心愿id") @Excel(name = "审核记录类型(字典)")
private Long xyId; private String shRecardType;
/** 对应记录id */
@Excel(name = "对应记录id")
private Long jlId;
/** 审核部门 */
@Excel(name = "审核部门")
private String auditDept;
/** 审核人 */
@Excel(name = "审核人")
private String auditName;
/** 审核结果 */ /** 审核结果 */
@Excel(name = "审核结果") @Excel(name = "审核结果")
@ -30,10 +42,6 @@ public class SzxcXyAuditRecard extends BaseEntity
@Excel(name = "审核原因") @Excel(name = "审核原因")
private String auditReason; private String auditReason;
/** 审核人 */
@Excel(name = "审核人")
private String auditName;
public void setId(Long id) public void setId(Long id)
{ {
this.id = id; this.id = id;
@ -43,32 +51,32 @@ public class SzxcXyAuditRecard extends BaseEntity
{ {
return id; return id;
} }
public void setXyId(Long xyId) public void setShRecardType(String shRecardType)
{ {
this.xyId = xyId; this.shRecardType = shRecardType;
} }
public Long getXyId() public String getShRecardType()
{ {
return xyId; return shRecardType;
} }
public void setAuditResult(String auditResult) public void setJlId(Long jlId)
{ {
this.auditResult = auditResult; this.jlId = jlId;
} }
public String getAuditResult() public Long getJlId()
{ {
return auditResult; return jlId;
} }
public void setAuditReason(String auditReason) public void setAuditDept(String auditDept)
{ {
this.auditReason = auditReason; this.auditDept = auditDept;
} }
public String getAuditReason() public String getAuditDept()
{ {
return auditReason; return auditDept;
} }
public void setAuditName(String auditName) public void setAuditName(String auditName)
{ {
@ -79,20 +87,40 @@ public class SzxcXyAuditRecard extends BaseEntity
{ {
return auditName; return auditName;
} }
public void setAuditResult(String auditResult)
{
this.auditResult = auditResult;
}
public String getAuditResult()
{
return auditResult;
}
public void setAuditReason(String auditReason)
{
this.auditReason = auditReason;
}
public String getAuditReason()
{
return auditReason;
}
@Override @Override
public String toString() { public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("id", getId()) .append("id", getId())
.append("xyId", getXyId()) .append("shRecardType", getShRecardType())
.append("auditResult", getAuditResult()) .append("jlId", getJlId())
.append("auditReason", getAuditReason()) .append("auditDept", getAuditDept())
.append("auditName", getAuditName()) .append("auditName", getAuditName())
.append("remark", getRemark()) .append("auditResult", getAuditResult())
.append("createBy", getCreateBy()) .append("auditReason", getAuditReason())
.append("createTime", getCreateTime()) .append("remark", getRemark())
.append("updateBy", getUpdateBy()) .append("createBy", getCreateBy())
.append("updateTime", getUpdateTime()) .append("createTime", getCreateTime())
.toString(); .append("updateBy", getUpdateBy())
.append("updateTime", getUpdateTime())
.toString();
} }
} }

@ -5,55 +5,55 @@ import com.ruoyi.szxc.domain.SzxcXyAuditRecard;
import java.util.List; import java.util.List;
/** /**
* Mapper * Mapper
* *
* @author hs * @author hs
* @date 2024-04-13 * @date 2024-04-15
*/ */
public interface SzxcXyAuditRecardMapper public interface SzxcXyAuditRecardMapper
{ {
/** /**
* *
* *
* @param id * @param id
* @return * @return
*/ */
public SzxcXyAuditRecard selectSzxcXyAuditRecardById(Long id); public SzxcXyAuditRecard selectSzxcXyAuditRecardById(Long id);
/** /**
* *
* *
* @param szxcXyAuditRecard * @param szxcXyAuditRecard
* @return * @return
*/ */
public List<SzxcXyAuditRecard> selectSzxcXyAuditRecardList(SzxcXyAuditRecard szxcXyAuditRecard); public List<SzxcXyAuditRecard> selectSzxcXyAuditRecardList(SzxcXyAuditRecard szxcXyAuditRecard);
/** /**
* *
* *
* @param szxcXyAuditRecard * @param szxcXyAuditRecard
* @return * @return
*/ */
public int insertSzxcXyAuditRecard(SzxcXyAuditRecard szxcXyAuditRecard); public int insertSzxcXyAuditRecard(SzxcXyAuditRecard szxcXyAuditRecard);
/** /**
* *
* *
* @param szxcXyAuditRecard * @param szxcXyAuditRecard
* @return * @return
*/ */
public int updateSzxcXyAuditRecard(SzxcXyAuditRecard szxcXyAuditRecard); public int updateSzxcXyAuditRecard(SzxcXyAuditRecard szxcXyAuditRecard);
/** /**
* *
* *
* @param id * @param id
* @return * @return
*/ */
public int deleteSzxcXyAuditRecardById(Long id); public int deleteSzxcXyAuditRecardById(Long id);
/** /**
* *
* *
* @param ids * @param ids
* @return * @return

@ -5,57 +5,57 @@ import com.ruoyi.szxc.domain.SzxcXyAuditRecard;
import java.util.List; import java.util.List;
/** /**
* Service * Service
* *
* @author hs * @author hs
* @date 2024-04-13 * @date 2024-04-15
*/ */
public interface ISzxcXyAuditRecardService public interface ISzxcXyAuditRecardService
{ {
/** /**
* *
* *
* @param id * @param id
* @return * @return
*/ */
public SzxcXyAuditRecard selectSzxcXyAuditRecardById(Long id); public SzxcXyAuditRecard selectSzxcXyAuditRecardById(Long id);
/** /**
* *
* *
* @param szxcXyAuditRecard * @param szxcXyAuditRecard
* @return * @return
*/ */
public List<SzxcXyAuditRecard> selectSzxcXyAuditRecardList(SzxcXyAuditRecard szxcXyAuditRecard); public List<SzxcXyAuditRecard> selectSzxcXyAuditRecardList(SzxcXyAuditRecard szxcXyAuditRecard);
/** /**
* *
* *
* @param szxcXyAuditRecard * @param szxcXyAuditRecard
* @return * @return
*/ */
public int insertSzxcXyAuditRecard(SzxcXyAuditRecard szxcXyAuditRecard); public int insertSzxcXyAuditRecard(SzxcXyAuditRecard szxcXyAuditRecard);
/** /**
* *
* *
* @param szxcXyAuditRecard * @param szxcXyAuditRecard
* @return * @return
*/ */
public int updateSzxcXyAuditRecard(SzxcXyAuditRecard szxcXyAuditRecard); public int updateSzxcXyAuditRecard(SzxcXyAuditRecard szxcXyAuditRecard);
/** /**
* *
* *
* @param ids * @param ids
* @return * @return
*/ */
public int deleteSzxcXyAuditRecardByIds(Long[] ids); public int deleteSzxcXyAuditRecardByIds(Long[] ids);
/** /**
* *
* *
* @param id * @param id
* @return * @return
*/ */
public int deleteSzxcXyAuditRecardById(Long id); public int deleteSzxcXyAuditRecardById(Long id);

@ -10,10 +10,10 @@ import org.springframework.stereotype.Service;
import java.util.List; import java.util.List;
/** /**
* Service * Service
* *
* @author hs * @author hs
* @date 2024-04-13 * @date 2024-04-15
*/ */
@Service @Service
public class SzxcXyAuditRecardServiceImpl implements ISzxcXyAuditRecardService public class SzxcXyAuditRecardServiceImpl implements ISzxcXyAuditRecardService
@ -22,10 +22,10 @@ public class SzxcXyAuditRecardServiceImpl implements ISzxcXyAuditRecardService
private SzxcXyAuditRecardMapper szxcXyAuditRecardMapper; private SzxcXyAuditRecardMapper szxcXyAuditRecardMapper;
/** /**
* *
* *
* @param id * @param id
* @return * @return
*/ */
@Override @Override
public SzxcXyAuditRecard selectSzxcXyAuditRecardById(Long id) public SzxcXyAuditRecard selectSzxcXyAuditRecardById(Long id)
@ -34,10 +34,10 @@ public class SzxcXyAuditRecardServiceImpl implements ISzxcXyAuditRecardService
} }
/** /**
* *
* *
* @param szxcXyAuditRecard * @param szxcXyAuditRecard
* @return * @return
*/ */
@Override @Override
public List<SzxcXyAuditRecard> selectSzxcXyAuditRecardList(SzxcXyAuditRecard szxcXyAuditRecard) public List<SzxcXyAuditRecard> selectSzxcXyAuditRecardList(SzxcXyAuditRecard szxcXyAuditRecard)
@ -46,9 +46,9 @@ public class SzxcXyAuditRecardServiceImpl implements ISzxcXyAuditRecardService
} }
/** /**
* *
* *
* @param szxcXyAuditRecard * @param szxcXyAuditRecard
* @return * @return
*/ */
@Override @Override
@ -59,9 +59,9 @@ public class SzxcXyAuditRecardServiceImpl implements ISzxcXyAuditRecardService
} }
/** /**
* *
* *
* @param szxcXyAuditRecard * @param szxcXyAuditRecard
* @return * @return
*/ */
@Override @Override
@ -72,9 +72,9 @@ public class SzxcXyAuditRecardServiceImpl implements ISzxcXyAuditRecardService
} }
/** /**
* *
* *
* @param ids * @param ids
* @return * @return
*/ */
@Override @Override
@ -84,9 +84,9 @@ public class SzxcXyAuditRecardServiceImpl implements ISzxcXyAuditRecardService
} }
/** /**
* *
* *
* @param id * @param id
* @return * @return
*/ */
@Override @Override

@ -1,15 +1,17 @@
<?xml version="1.0" encoding="UTF-8" ?> <?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper <!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.szxc.mapper.SzxcXyAuditRecardMapper"> <mapper namespace="com.ruoyi.szxc.mapper.SzxcXyAuditRecardMapper">
<resultMap type="SzxcXyAuditRecard" id="SzxcXyAuditRecardResult"> <resultMap type="SzxcXyAuditRecard" id="SzxcXyAuditRecardResult">
<result property="id" column="id" /> <result property="id" column="id" />
<result property="xyId" column="xy_id" /> <result property="shRecardType" column="sh_recard_type" />
<result property="jlId" column="jl_id" />
<result property="auditDept" column="audit_dept" />
<result property="auditName" column="audit_name" />
<result property="auditResult" column="audit_result" /> <result property="auditResult" column="audit_result" />
<result property="auditReason" column="audit_reason" /> <result property="auditReason" column="audit_reason" />
<result property="auditName" column="audit_name" />
<result property="remark" column="remark" /> <result property="remark" column="remark" />
<result property="createBy" column="create_by" /> <result property="createBy" column="create_by" />
<result property="createTime" column="create_time" /> <result property="createTime" column="create_time" />
@ -18,16 +20,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap> </resultMap>
<sql id="selectSzxcXyAuditRecardVo"> <sql id="selectSzxcXyAuditRecardVo">
select id, xy_id, audit_result, audit_reason, audit_name, remark, create_by, create_time, update_by, update_time from szxc_xy_audit_recard select id, sh_recard_type, jl_id, audit_dept, audit_name, audit_result, audit_reason, remark, create_by, create_time, update_by, update_time from szxc_xy_audit_recard
</sql> </sql>
<select id="selectSzxcXyAuditRecardList" parameterType="SzxcXyAuditRecard" resultMap="SzxcXyAuditRecardResult"> <select id="selectSzxcXyAuditRecardList" parameterType="SzxcXyAuditRecard" resultMap="SzxcXyAuditRecardResult">
<include refid="selectSzxcXyAuditRecardVo"/> <include refid="selectSzxcXyAuditRecardVo"/>
<where> <where>
<if test="xyId != null "> and xy_id = #{xyId}</if> <if test="shRecardType != null and shRecardType != ''"> and sh_recard_type = #{shRecardType}</if>
<if test="jlId != null "> and jl_id = #{jlId}</if>
<if test="auditDept != null and auditDept != ''"> and audit_dept = #{auditDept}</if>
<if test="auditName != null and auditName != ''"> and audit_name like concat('%', #{auditName}, '%')</if>
<if test="auditResult != null and auditResult != ''"> and audit_result = #{auditResult}</if> <if test="auditResult != null and auditResult != ''"> and audit_result = #{auditResult}</if>
<if test="auditReason != null and auditReason != ''"> and audit_reason = #{auditReason}</if> <if test="auditReason != null and auditReason != ''"> and audit_reason = #{auditReason}</if>
<if test="auditName != null and auditName != ''"> and audit_name like concat('%', #{auditName}, '%')</if>
</where> </where>
</select> </select>
@ -39,36 +43,42 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<insert id="insertSzxcXyAuditRecard" parameterType="SzxcXyAuditRecard" useGeneratedKeys="true" keyProperty="id"> <insert id="insertSzxcXyAuditRecard" parameterType="SzxcXyAuditRecard" useGeneratedKeys="true" keyProperty="id">
insert into szxc_xy_audit_recard insert into szxc_xy_audit_recard
<trim prefix="(" suffix=")" suffixOverrides=","> <trim prefix="(" suffix=")" suffixOverrides=",">
<if test="xyId != null">xy_id,</if> <if test="shRecardType != null">sh_recard_type,</if>
<if test="jlId != null">jl_id,</if>
<if test="auditDept != null">audit_dept,</if>
<if test="auditName != null">audit_name,</if>
<if test="auditResult != null">audit_result,</if> <if test="auditResult != null">audit_result,</if>
<if test="auditReason != null">audit_reason,</if> <if test="auditReason != null">audit_reason,</if>
<if test="auditName != null">audit_name,</if>
<if test="remark != null">remark,</if> <if test="remark != null">remark,</if>
<if test="createBy != null">create_by,</if> <if test="createBy != null">create_by,</if>
<if test="createTime != null">create_time,</if> <if test="createTime != null">create_time,</if>
<if test="updateBy != null">update_by,</if> <if test="updateBy != null">update_by,</if>
<if test="updateTime != null">update_time,</if> <if test="updateTime != null">update_time,</if>
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="xyId != null">#{xyId},</if> <if test="shRecardType != null">#{shRecardType},</if>
<if test="jlId != null">#{jlId},</if>
<if test="auditDept != null">#{auditDept},</if>
<if test="auditName != null">#{auditName},</if>
<if test="auditResult != null">#{auditResult},</if> <if test="auditResult != null">#{auditResult},</if>
<if test="auditReason != null">#{auditReason},</if> <if test="auditReason != null">#{auditReason},</if>
<if test="auditName != null">#{auditName},</if>
<if test="remark != null">#{remark},</if> <if test="remark != null">#{remark},</if>
<if test="createBy != null">#{createBy},</if> <if test="createBy != null">#{createBy},</if>
<if test="createTime != null">#{createTime},</if> <if test="createTime != null">#{createTime},</if>
<if test="updateBy != null">#{updateBy},</if> <if test="updateBy != null">#{updateBy},</if>
<if test="updateTime != null">#{updateTime},</if> <if test="updateTime != null">#{updateTime},</if>
</trim> </trim>
</insert> </insert>
<update id="updateSzxcXyAuditRecard" parameterType="SzxcXyAuditRecard"> <update id="updateSzxcXyAuditRecard" parameterType="SzxcXyAuditRecard">
update szxc_xy_audit_recard update szxc_xy_audit_recard
<trim prefix="SET" suffixOverrides=","> <trim prefix="SET" suffixOverrides=",">
<if test="xyId != null">xy_id = #{xyId},</if> <if test="shRecardType != null">sh_recard_type = #{shRecardType},</if>
<if test="jlId != null">jl_id = #{jlId},</if>
<if test="auditDept != null">audit_dept = #{auditDept},</if>
<if test="auditName != null">audit_name = #{auditName},</if>
<if test="auditResult != null">audit_result = #{auditResult},</if> <if test="auditResult != null">audit_result = #{auditResult},</if>
<if test="auditReason != null">audit_reason = #{auditReason},</if> <if test="auditReason != null">audit_reason = #{auditReason},</if>
<if test="auditName != null">audit_name = #{auditName},</if>
<if test="remark != null">remark = #{remark},</if> <if test="remark != null">remark = #{remark},</if>
<if test="createBy != null">create_by = #{createBy},</if> <if test="createBy != null">create_by = #{createBy},</if>
<if test="createTime != null">create_time = #{createTime},</if> <if test="createTime != null">create_time = #{createTime},</if>

@ -1,6 +1,6 @@
import request from '@/utils/request' import request from '@/utils/request'
// 查询心愿审核记录列表 // 查询审核记录列表
export function listXyrecard(query) { export function listXyrecard(query) {
return request({ return request({
url: '/szxc/xyrecard/list', url: '/szxc/xyrecard/list',
@ -9,7 +9,7 @@ export function listXyrecard(query) {
}) })
} }
// 查询心愿审核记录详细 // 查询审核记录详细
export function getXyrecard(id) { export function getXyrecard(id) {
return request({ return request({
url: '/szxc/xyrecard/' + id, url: '/szxc/xyrecard/' + id,
@ -17,7 +17,7 @@ export function getXyrecard(id) {
}) })
} }
// 新增心愿审核记录 // 新增审核记录
export function addXyrecard(data) { export function addXyrecard(data) {
return request({ return request({
url: '/szxc/xyrecard', url: '/szxc/xyrecard',
@ -26,7 +26,7 @@ export function addXyrecard(data) {
}) })
} }
// 修改心愿审核记录 // 修改审核记录
export function updateXyrecard(data) { export function updateXyrecard(data) {
return request({ return request({
url: '/szxc/xyrecard', url: '/szxc/xyrecard',
@ -35,7 +35,7 @@ export function updateXyrecard(data) {
}) })
} }
// 删除心愿审核记录 // 删除审核记录
export function delXyrecard(id) { export function delXyrecard(id) {
return request({ return request({
url: '/szxc/xyrecard/' + id, url: '/szxc/xyrecard/' + id,

@ -1,10 +1,26 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px"> <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="心愿id" prop="xyId"> <el-form-item label="对应记录id" prop="jlId">
<el-input <el-input
v-model="queryParams.xyId" v-model="queryParams.jlId"
placeholder="请输入心愿id" placeholder="请输入对应记录id"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="审核部门" prop="auditDept">
<el-input
v-model="queryParams.auditDept"
placeholder="请输入审核部门"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="审核人" prop="auditName">
<el-input
v-model="queryParams.auditName"
placeholder="请输入审核人"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
@ -25,14 +41,6 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="审核人" prop="auditName">
<el-input
v-model="queryParams.auditName"
placeholder="请输入审核人"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery"></el-button> <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-button icon="el-icon-refresh" size="mini" @click="resetQuery"></el-button>
@ -87,11 +95,13 @@
<el-table v-loading="loading" :data="xyrecardList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="xyrecardList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column label=" " align="center" prop="id" /> <el-table-column label=" id" align="center" prop="id" />
<el-table-column label="心愿id" align="center" prop="xyId" /> <el-table-column label="审核记录类型(字典)" align="center" prop="shRecardType" />
<el-table-column label="对应记录id" align="center" prop="jlId" />
<el-table-column label="审核部门" align="center" prop="auditDept" />
<el-table-column label="审核人" align="center" prop="auditName" />
<el-table-column label="审核结果" align="center" prop="auditResult" /> <el-table-column label="审核结果" align="center" prop="auditResult" />
<el-table-column label="审核原因" align="center" prop="auditReason" /> <el-table-column label="审核原因" align="center" prop="auditReason" />
<el-table-column label="审核人" align="center" prop="auditName" />
<el-table-column label="备注" align="center" prop="remark" /> <el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope"> <template slot-scope="scope">
@ -121,11 +131,17 @@
@pagination="getList" @pagination="getList"
/> />
<!-- 添加或修改心愿审核记录对话框 --> <!-- 添加或修改审核记录对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body> <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 ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="心愿id" prop="xyId"> <el-form-item label="对应记录id" prop="jlId">
<el-input v-model="form.xyId" placeholder="请输入心愿id" /> <el-input v-model="form.jlId" placeholder="请输入对应记录id" />
</el-form-item>
<el-form-item label="审核部门" prop="auditDept">
<el-input v-model="form.auditDept" placeholder="请输入审核部门" />
</el-form-item>
<el-form-item label="审核人" prop="auditName">
<el-input v-model="form.auditName" placeholder="请输入审核人" />
</el-form-item> </el-form-item>
<el-form-item label="审核结果" prop="auditResult"> <el-form-item label="审核结果" prop="auditResult">
<el-input v-model="form.auditResult" placeholder="请输入审核结果" /> <el-input v-model="form.auditResult" placeholder="请输入审核结果" />
@ -133,9 +149,6 @@
<el-form-item label="审核原因" prop="auditReason"> <el-form-item label="审核原因" prop="auditReason">
<el-input v-model="form.auditReason" placeholder="请输入审核原因" /> <el-input v-model="form.auditReason" placeholder="请输入审核原因" />
</el-form-item> </el-form-item>
<el-form-item label="审核人" prop="auditName">
<el-input v-model="form.auditName" placeholder="请输入审核人" />
</el-form-item>
<el-form-item label="备注" prop="remark"> <el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" placeholder="请输入备注" /> <el-input v-model="form.remark" placeholder="请输入备注" />
</el-form-item> </el-form-item>
@ -149,148 +162,152 @@
</template> </template>
<script> <script>
import { listXyrecard, getXyrecard, delXyrecard, addXyrecard, updateXyrecard } from "@/api/szxc/xyrecard"; import { listXyrecard, getXyrecard, delXyrecard, addXyrecard, updateXyrecard } from "@/api/szxc/xyrecard";
export default { export default {
name: "Xyrecard", name: "Xyrecard",
data() { data() {
return { return {
// //
loading: true, loading: true,
// //
ids: [], ids: [],
// //
single: true, single: true,
// //
multiple: true, multiple: true,
// //
showSearch: true, showSearch: true,
// //
total: 0, total: 0,
// //
xyrecardList: [], xyrecardList: [],
// //
title: "", title: "",
// //
open: false, open: false,
// //
queryParams: { queryParams: {
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 10,
xyId: null, shRecardType: null,
auditResult: null, jlId: null,
auditReason: null, auditDept: null,
auditName: null, auditName: null,
}, auditResult: null,
// auditReason: null,
form: {}, },
// //
rules: { form: {},
} //
}; rules: {
}, }
created() {
this.getList();
},
methods: {
/** 查询心愿审核记录列表 */
getList() {
this.loading = true;
listXyrecard(this.queryParams).then(response => {
this.xyrecardList = response.rows;
this.total = response.total;
this.loading = false;
});
},
//
cancel() {
this.open = false;
this.reset();
},
//
reset() {
this.form = {
id: null,
xyId: null,
auditResult: null,
auditReason: null,
auditName: null,
remark: null,
createBy: null,
createTime: null,
updateBy: null,
updateTime: null
}; };
this.resetForm("form");
}, },
/** 搜索按钮操作 */ created() {
handleQuery() {
this.queryParams.pageNum = 1;
this.getList(); this.getList();
}, },
/** 重置按钮操作 */ methods: {
resetQuery() { /** 查询审核记录列表 */
this.resetForm("queryForm"); getList() {
this.handleQuery(); this.loading = true;
}, listXyrecard(this.queryParams).then(response => {
// this.xyrecardList = response.rows;
handleSelectionChange(selection) { this.total = response.total;
this.ids = selection.map(item => item.id) this.loading = false;
this.single = selection.length!==1 });
this.multiple = !selection.length },
}, //
/** 新增按钮操作 */ cancel() {
handleAdd() { this.open = false;
this.reset(); this.reset();
this.open = true; },
this.title = "添加心愿审核记录"; //
}, reset() {
/** 修改按钮操作 */ this.form = {
handleUpdate(row) { id: null,
this.reset(); shRecardType: null,
const id = row.id || this.ids jlId: null,
getXyrecard(id).then(response => { auditDept: null,
this.form = response.data; auditName: null,
auditResult: null,
auditReason: null,
remark: 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.id)
this.single = selection.length!==1
this.multiple = !selection.length
},
/** 新增按钮操作 */
handleAdd() {
this.reset();
this.open = true; this.open = true;
this.title = "修改心愿审核记录"; this.title = "添加审核记录";
}); },
}, /** 修改按钮操作 */
/** 提交按钮 */ handleUpdate(row) {
submitForm() { this.reset();
this.$refs["form"].validate(valid => { const id = row.id || this.ids
if (valid) { getXyrecard(id).then(response => {
if (this.form.id != null) { this.form = response.data;
updateXyrecard(this.form).then(response => { this.open = true;
this.$modal.msgSuccess("修改成功"); this.title = "修改审核记录";
this.open = false; });
this.getList(); },
}); /** 提交按钮 */
} else { submitForm() {
addXyrecard(this.form).then(response => { this.$refs["form"].validate(valid => {
this.$modal.msgSuccess("新增成功"); if (valid) {
this.open = false; if (this.form.id != null) {
this.getList(); updateXyrecard(this.form).then(response => {
}); this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
});
} else {
addXyrecard(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
});
}
} }
} });
}); },
}, /** 删除按钮操作 */
/** 删除按钮操作 */ handleDelete(row) {
handleDelete(row) { const ids = row.id || this.ids;
const ids = row.id || this.ids; this.$modal.confirm('是否确认删除审核记录编号为"' + ids + '"的数据项?').then(function() {
this.$modal.confirm('是否确认删除心愿审核记录编号为"' + ids + '"的数据项?').then(function() { return delXyrecard(ids);
return delXyrecard(ids); }).then(() => {
}).then(() => { this.getList();
this.getList(); this.$modal.msgSuccess("删除成功");
this.$modal.msgSuccess("删除成功"); }).catch(() => {});
}).catch(() => {}); },
}, /** 导出按钮操作 */
/** 导出按钮操作 */ handleExport() {
handleExport() { this.download('szxc/xyrecard/export', {
this.download('szxc/xyrecard/export', { ...this.queryParams
...this.queryParams }, `xyrecard_${new Date().getTime()}.xlsx`)
}, `xyrecard_${new Date().getTime()}.xlsx`) }
} }
} };
};
</script> </script>

Loading…
Cancel
Save