工作填报首页

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcDeclareController.java

@@ -0,0 +1,97 @@
+package com.ruoyi.web.controller.oa;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+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.oa.domain.CmcDeclare;
+import com.ruoyi.oa.service.ICmcDeclareService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 工作填报Controller
+ * 
+ * @author cmc
+ * @date 2024-08-14
+ */
+@RestController
+@RequestMapping("/oa/declare")
+public class CmcDeclareController extends BaseController
+{
+    @Autowired
+    private ICmcDeclareService cmcDeclareService;
+
+    /**
+     * 查询工作填报列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo list(CmcDeclare cmcDeclare)
+    {
+        startPage();
+        List<CmcDeclare> list = cmcDeclareService.selectCmcDeclareList(cmcDeclare);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出工作填报列表
+     */
+    @Log(title = "工作填报", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, CmcDeclare cmcDeclare)
+    {
+        List<CmcDeclare> list = cmcDeclareService.selectCmcDeclareList(cmcDeclare);
+        ExcelUtil<CmcDeclare> util = new ExcelUtil<CmcDeclare>(CmcDeclare.class);
+        util.exportExcel(response, list, "工作填报数据");
+    }
+
+    /**
+     * 获取工作填报详细信息
+     */
+    @GetMapping(value = "/{formId}")
+    public AjaxResult getInfo(@PathVariable("formId") String formId)
+    {
+        return success(cmcDeclareService.selectCmcDeclareByFormId(formId));
+    }
+
+    /**
+     * 新增工作填报
+     */
+    @Log(title = "工作填报", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody CmcDeclare cmcDeclare)
+    {
+        return toAjax(cmcDeclareService.insertCmcDeclare(cmcDeclare));
+    }
+
+    /**
+     * 修改工作填报
+     */
+    @Log(title = "工作填报", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody CmcDeclare cmcDeclare)
+    {
+        return toAjax(cmcDeclareService.updateCmcDeclare(cmcDeclare));
+    }
+
+    /**
+     * 删除工作填报
+     */
+    @Log(title = "工作填报", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{formIds}")
+    public AjaxResult remove(@PathVariable String[] formIds)
+    {
+        return toAjax(cmcDeclareService.deleteCmcDeclareByFormIds(formIds));
+    }
+}

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/domain/CmcDeclare.java

@@ -0,0 +1,240 @@
+package com.ruoyi.oa.domain;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.domain.entity.SysUser;
+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;
+
+/**
+ * 工作填报对象 cmc_declare
+ * 
+ * @author cmc
+ * @date 2024-08-14
+ */
+public class CmcDeclare extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 填报id */
+    private String formId;
+
+    /** 项目id */
+    private String projectId;
+    @Excel(name = "项目编号")
+    private String projectNumber;
+    @Excel(name = "项目名称")
+    private String projectName;
+
+    /** 用户id */
+    @Excel(name = "填报人")
+    private String userName;
+    private Long userId;
+
+    /** 工作类别（内业、外业等） */
+    @Excel(name = "工作类别", readConverterExp = "内=业、外业等")
+    private String workType;
+
+    /** 工作项目 */
+    @Excel(name = "工作项目")
+    private String workItem;
+
+    /** 工作内容（每日工作日志） */
+    @Excel(name = "工作内容", readConverterExp = "每=日工作日志")
+    private String workContent;
+
+    /** 工天 */
+    @Excel(name = "工天")
+    private String workLoad;
+
+    /** 工天单价 */
+    @Excel(name = "工天单价")
+    private BigDecimal price;
+
+    /** 系数 */
+    @Excel(name = "系数")
+    private String coefficient;
+
+    /** 一审状态（0-未审核，1已审核） */
+    @Excel(name = "一审状态", readConverterExp = "0=-未审核，1已审核")
+    private String checkStatus;
+
+    /** 二审状态（0-未审核，1已审核） */
+    @Excel(name = "二审状态", readConverterExp = "0=-未审核，1已审核")
+    private String auditStatus;
+
+    /** 填报时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "填报时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date submitTime;
+
+    /** 确认状态 */
+    @Excel(name = "确认状态")
+    private String confirmStatus;
+
+    private SysUser user;
+
+    private CmcProject project;
+
+    public void setFormId(String formId) 
+    {
+        this.formId = formId;
+    }
+
+    public String getFormId() 
+    {
+        return formId;
+    }
+    public void setProjectId(String projectId) 
+    {
+        this.projectId = projectId;
+    }
+
+    public String getProjectId() 
+    {
+        return projectId;
+    }
+    public void setProject(CmcProject project)
+    {
+        this.project = project;
+        this.projectNumber = project == null ? "" : project.getProjectNumber();
+        this.projectName = project == null ? "" : project.getProjectName();
+    }
+
+    public CmcProject getProject()
+    {
+        return project;
+    }
+
+    public void setUserId(Long userId)
+    {
+        this.userId = userId;
+    }
+
+    public Long getUserId()
+    {
+        return userId;
+    }
+    public void setUser(SysUser user)
+    {
+        this.user = user;
+        this.userName = user == null ? "" : user.getNickName();
+    }
+
+    public SysUser getUser()
+    {
+        return user;
+    }
+    public void setWorkType(String workType) 
+    {
+        this.workType = workType;
+    }
+
+    public String getWorkType() 
+    {
+        return workType;
+    }
+    public void setWorkItem(String workItem) 
+    {
+        this.workItem = workItem;
+    }
+
+    public String getWorkItem() 
+    {
+        return workItem;
+    }
+    public void setWorkContent(String workContent) 
+    {
+        this.workContent = workContent;
+    }
+
+    public String getWorkContent() 
+    {
+        return workContent;
+    }
+    public void setWorkLoad(String workLoad) 
+    {
+        this.workLoad = workLoad;
+    }
+
+    public String getWorkLoad() 
+    {
+        return workLoad;
+    }
+    public void setPrice(BigDecimal price) 
+    {
+        this.price = price;
+    }
+
+    public BigDecimal getPrice() 
+    {
+        return price;
+    }
+    public void setCoefficient(String coefficient) 
+    {
+        this.coefficient = coefficient;
+    }
+
+    public String getCoefficient() 
+    {
+        return coefficient;
+    }
+    public void setCheckStatus(String checkStatus) 
+    {
+        this.checkStatus = checkStatus;
+    }
+
+    public String getCheckStatus() 
+    {
+        return checkStatus;
+    }
+    public void setAuditStatus(String auditStatus) 
+    {
+        this.auditStatus = auditStatus;
+    }
+
+    public String getAuditStatus() 
+    {
+        return auditStatus;
+    }
+    public void setSubmitTime(Date submitTime) 
+    {
+        this.submitTime = submitTime;
+    }
+
+    public Date getSubmitTime() 
+    {
+        return submitTime;
+    }
+    public void setConfirmStatus(String confirmStatus) 
+    {
+        this.confirmStatus = confirmStatus;
+    }
+
+    public String getConfirmStatus() 
+    {
+        return confirmStatus;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("formId", getFormId())
+            .append("projectId", getProjectId())
+            .append("userId", getUserId())
+            .append("workType", getWorkType())
+            .append("workItem", getWorkItem())
+            .append("workContent", getWorkContent())
+            .append("workLoad", getWorkLoad())
+            .append("price", getPrice())
+            .append("coefficient", getCoefficient())
+            .append("checkStatus", getCheckStatus())
+            .append("auditStatus", getAuditStatus())
+            .append("submitTime", getSubmitTime())
+            .append("confirmStatus", getConfirmStatus())
+            .toString();
+    }
+}

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/mapper/CmcDeclareMapper.java

@@ -0,0 +1,61 @@
+package com.ruoyi.oa.mapper;
+
+import java.util.List;
+import com.ruoyi.oa.domain.CmcDeclare;
+
+/**
+ * 工作填报Mapper接口
+ * 
+ * @author cmc
+ * @date 2024-08-14
+ */
+public interface CmcDeclareMapper 
+{
+    /**
+     * 查询工作填报
+     * 
+     * @param formId 工作填报主键
+     * @return 工作填报
+     */
+    public CmcDeclare selectCmcDeclareByFormId(String formId);
+
+    /**
+     * 查询工作填报列表
+     * 
+     * @param cmcDeclare 工作填报
+     * @return 工作填报集合
+     */
+    public List<CmcDeclare> selectCmcDeclareList(CmcDeclare cmcDeclare);
+
+    /**
+     * 新增工作填报
+     * 
+     * @param cmcDeclare 工作填报
+     * @return 结果
+     */
+    public int insertCmcDeclare(CmcDeclare cmcDeclare);
+
+    /**
+     * 修改工作填报
+     * 
+     * @param cmcDeclare 工作填报
+     * @return 结果
+     */
+    public int updateCmcDeclare(CmcDeclare cmcDeclare);
+
+    /**
+     * 删除工作填报
+     * 
+     * @param formId 工作填报主键
+     * @return 结果
+     */
+    public int deleteCmcDeclareByFormId(String formId);
+
+    /**
+     * 批量删除工作填报
+     * 
+     * @param formIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteCmcDeclareByFormIds(String[] formIds);
+}

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/service/ICmcDeclareService.java

@@ -0,0 +1,61 @@
+package com.ruoyi.oa.service;
+
+import java.util.List;
+import com.ruoyi.oa.domain.CmcDeclare;
+
+/**
+ * 工作填报Service接口
+ * 
+ * @author cmc
+ * @date 2024-08-14
+ */
+public interface ICmcDeclareService 
+{
+    /**
+     * 查询工作填报
+     * 
+     * @param formId 工作填报主键
+     * @return 工作填报
+     */
+    public CmcDeclare selectCmcDeclareByFormId(String formId);
+
+    /**
+     * 查询工作填报列表
+     * 
+     * @param cmcDeclare 工作填报
+     * @return 工作填报集合
+     */
+    public List<CmcDeclare> selectCmcDeclareList(CmcDeclare cmcDeclare);
+
+    /**
+     * 新增工作填报
+     * 
+     * @param cmcDeclare 工作填报
+     * @return 结果
+     */
+    public int insertCmcDeclare(CmcDeclare cmcDeclare);
+
+    /**
+     * 修改工作填报
+     * 
+     * @param cmcDeclare 工作填报
+     * @return 结果
+     */
+    public int updateCmcDeclare(CmcDeclare cmcDeclare);
+
+    /**
+     * 批量删除工作填报
+     * 
+     * @param formIds 需要删除的工作填报主键集合
+     * @return 结果
+     */
+    public int deleteCmcDeclareByFormIds(String[] formIds);
+
+    /**
+     * 删除工作填报信息
+     * 
+     * @param formId 工作填报主键
+     * @return 结果
+     */
+    public int deleteCmcDeclareByFormId(String formId);
+}

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/service/impl/CmcDeclareServiceImpl.java

@@ -0,0 +1,93 @@
+package com.ruoyi.oa.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.oa.mapper.CmcDeclareMapper;
+import com.ruoyi.oa.domain.CmcDeclare;
+import com.ruoyi.oa.service.ICmcDeclareService;
+
+/**
+ * 工作填报Service业务层处理
+ * 
+ * @author cmc
+ * @date 2024-08-14
+ */
+@Service
+public class CmcDeclareServiceImpl implements ICmcDeclareService 
+{
+    @Autowired
+    private CmcDeclareMapper cmcDeclareMapper;
+
+    /**
+     * 查询工作填报
+     * 
+     * @param formId 工作填报主键
+     * @return 工作填报
+     */
+    @Override
+    public CmcDeclare selectCmcDeclareByFormId(String formId)
+    {
+        return cmcDeclareMapper.selectCmcDeclareByFormId(formId);
+    }
+
+    /**
+     * 查询工作填报列表
+     * 
+     * @param cmcDeclare 工作填报
+     * @return 工作填报
+     */
+    @Override
+    public List<CmcDeclare> selectCmcDeclareList(CmcDeclare cmcDeclare)
+    {
+        return cmcDeclareMapper.selectCmcDeclareList(cmcDeclare);
+    }
+
+    /**
+     * 新增工作填报
+     * 
+     * @param cmcDeclare 工作填报
+     * @return 结果
+     */
+    @Override
+    public int insertCmcDeclare(CmcDeclare cmcDeclare)
+    {
+        return cmcDeclareMapper.insertCmcDeclare(cmcDeclare);
+    }
+
+    /**
+     * 修改工作填报
+     * 
+     * @param cmcDeclare 工作填报
+     * @return 结果
+     */
+    @Override
+    public int updateCmcDeclare(CmcDeclare cmcDeclare)
+    {
+        return cmcDeclareMapper.updateCmcDeclare(cmcDeclare);
+    }
+
+    /**
+     * 批量删除工作填报
+     * 
+     * @param formIds 需要删除的工作填报主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCmcDeclareByFormIds(String[] formIds)
+    {
+        return cmcDeclareMapper.deleteCmcDeclareByFormIds(formIds);
+    }
+
+    /**
+     * 删除工作填报信息
+     * 
+     * @param formId 工作填报主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCmcDeclareByFormId(String formId)
+    {
+        return cmcDeclareMapper.deleteCmcDeclareByFormId(formId);
+    }
+}

oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcDeclareMapper.xml

@@ -0,0 +1,129 @@
+<?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.oa.mapper.CmcDeclareMapper">
+    
+    <resultMap type="CmcDeclare" id="CmcDeclareResult">
+        <result property="formId"    column="form_id"    />
+        <result property="projectId"    column="project_id"    />
+        <result property="userId"    column="user_id"    />
+        <result property="workType"    column="work_type"    />
+        <result property="workItem"    column="work_item"    />
+        <result property="workContent"    column="work_content"    />
+        <result property="workLoad"    column="work_load"    />
+        <result property="price"    column="price"    />
+        <result property="coefficient"    column="coefficient"    />
+        <result property="checkStatus"    column="check_status"    />
+        <result property="auditStatus"    column="audit_status"    />
+        <result property="submitTime"    column="submit_time"    />
+        <result property="confirmStatus"    column="confirm_status"    />
+        <association property="user"    javaType="SysUser"         resultMap="UserResult" />
+        <association property="project"    javaType="CmcProject"         resultMap="CmcProjectResult" />
+    </resultMap>
+
+    <resultMap type="SysUser" id="UserResult">
+        <result property="userId"    column="user_id"    />
+        <result property="nickName"    column="nick_name"    />
+    </resultMap>
+
+    <sql id="selectCmcDeclareVo">
+        select d.form_id, d.project_id, p.project_number, p.project_name, d.user_id, u.nick_name, d.work_type, d.work_item, d.work_content, d.work_load, d.price, d.coefficient, d.check_status, d.audit_status, d.submit_time, d.confirm_status from cmc_declare as d
+        left join sys_user as u on u.user_id = d.user_id
+        left join cmc_project as p on p.project_id = d.project_id
+    </sql>
+
+    <resultMap type="CmcProject" id="CmcProjectResult">
+        <result property="projectId"    column="project_id"    />
+        <result property="projectNumber"    column="project_number"    />
+        <result property="projectName"    column="project_name"    />
+    </resultMap>
+
+    <select id="selectCmcDeclareList" parameterType="CmcDeclare" resultMap="CmcDeclareResult">
+        <include refid="selectCmcDeclareVo"/>
+        <where>  
+            <if test="projectId != null  and projectId != ''"> and d.project_id = #{projectId}</if>
+            <if test="userId != null"> and d.user_id = #{userId}</if>
+            <if test="workType != null  and workType != ''"> and d.work_type = #{workType}</if>
+            <if test="workItem != null  and workItem != ''"> and d.work_item = #{workItem}</if>
+            <if test="workContent != null  and workContent != ''"> and d.work_content = #{workContent}</if>
+            <if test="workLoad != null  and workLoad != ''"> and d.work_load = #{workLoad}</if>
+            <if test="price != null "> and d.price = #{price}</if>
+            <if test="coefficient != null  and coefficient != ''"> and d.coefficient = #{coefficient}</if>
+            <if test="checkStatus != null  and checkStatus != ''"> and d.check_status = #{checkStatus}</if>
+            <if test="auditStatus != null  and auditStatus != ''"> and d.audit_status = #{auditStatus}</if>
+            <if test="submitTime != null "> and d.submit_time = #{submitTime}</if>
+            <if test="confirmStatus != null  and confirmStatus != ''"> and d.confirm_status = #{confirmStatus}</if>
+        </where>
+        order by d.submit_time desc
+    </select>
+    
+    <select id="selectCmcDeclareByFormId" parameterType="String" resultMap="CmcDeclareResult">
+        <include refid="selectCmcDeclareVo"/>
+        where d.form_id = #{formId}
+    </select>
+        
+    <insert id="insertCmcDeclare" parameterType="CmcDeclare">
+        insert into cmc_declare
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="formId != null">form_id,</if>
+            <if test="projectId != null">project_id,</if>
+            <if test="userId != null">user_id,</if>
+            <if test="workType != null">work_type,</if>
+            <if test="workItem != null">work_item,</if>
+            <if test="workContent != null">work_content,</if>
+            <if test="workLoad != null">work_load,</if>
+            <if test="price != null">price,</if>
+            <if test="coefficient != null">coefficient,</if>
+            <if test="checkStatus != null">check_status,</if>
+            <if test="auditStatus != null">audit_status,</if>
+            <if test="submitTime != null">submit_time,</if>
+            <if test="confirmStatus != null">confirm_status,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="formId != null">#{formId},</if>
+            <if test="projectId != null">#{projectId},</if>
+            <if test="userId != null">#{userId},</if>
+            <if test="workType != null">#{workType},</if>
+            <if test="workItem != null">#{workItem},</if>
+            <if test="workContent != null">#{workContent},</if>
+            <if test="workLoad != null">#{workLoad},</if>
+            <if test="price != null">#{price},</if>
+            <if test="coefficient != null">#{coefficient},</if>
+            <if test="checkStatus != null">#{checkStatus},</if>
+            <if test="auditStatus != null">#{auditStatus},</if>
+            <if test="submitTime != null">#{submitTime},</if>
+            <if test="confirmStatus != null">#{confirmStatus},</if>
+         </trim>
+    </insert>
+
+    <update id="updateCmcDeclare" parameterType="CmcDeclare">
+        update cmc_declare
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="projectId != null">project_id = #{projectId},</if>
+            <if test="userId != null">user_id = #{userId},</if>
+            <if test="workType != null">work_type = #{workType},</if>
+            <if test="workItem != null">work_item = #{workItem},</if>
+            <if test="workContent != null">work_content = #{workContent},</if>
+            <if test="workLoad != null">work_load = #{workLoad},</if>
+            <if test="price != null">price = #{price},</if>
+            <if test="coefficient != null">coefficient = #{coefficient},</if>
+            <if test="checkStatus != null">check_status = #{checkStatus},</if>
+            <if test="auditStatus != null">audit_status = #{auditStatus},</if>
+            <if test="submitTime != null">submit_time = #{submitTime},</if>
+            <if test="confirmStatus != null">confirm_status = #{confirmStatus},</if>
+        </trim>
+        where form_id = #{formId}
+    </update>
+
+    <delete id="deleteCmcDeclareByFormId" parameterType="String">
+        delete from cmc_declare where form_id = #{formId}
+    </delete>
+
+    <delete id="deleteCmcDeclareByFormIds" parameterType="String">
+        delete from cmc_declare where form_id in 
+        <foreach item="formId" collection="array" open="(" separator="," close=")">
+            #{formId}
+        </foreach>
+    </delete>
+</mapper>

oa-ui/src/api/oa/declare/declare.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询工作填报列表
+export function listDeclare(query) {
+  return request({
+    url: '/oa/declare/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询工作填报详细
+export function getDeclare(formId) {
+  return request({
+    url: '/oa/declare/' + formId,
+    method: 'get'
+  })
+}
+
+// 新增工作填报
+export function addDeclare(data) {
+  return request({
+    url: '/oa/declare',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改工作填报
+export function updateDeclare(data) {
+  return request({
+    url: '/oa/declare',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除工作填报
+export function delDeclare(formId) {
+  return request({
+    url: '/oa/declare/' + formId,
+    method: 'delete'
+  })
+}

oa-ui/src/views/oa/declare/index.vue

@@ -0,0 +1,361 @@
+<!--
+ * @Author: wrh
+ * @Date: 2024-08-14 14:24:11
+ * @LastEditors: wrh
+ * @LastEditTime: 2024-08-14 15:11:29
+-->
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="项目编号" prop="projectId">
+        <el-select v-model="queryParams.projectId" clearable filterable remote reserve-keyword placeholder="请输入项目编号"
+          :remote-method="remoteMethod" :loading="loading" style="width: 400px;">
+          <el-option v-for="project in projectList" :key="project.projectId"
+            :label="project.projectNumber + '-' + project.projectName" :value="project.projectId">
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="填报人" prop="userId">
+        <el-select v-model="queryParams.userId" filterable clearable @change="handleQuery">
+          <el-option v-for="item in $store.state.user.userList" :key="item.userId" :label="item.nickName"
+            :value="item.userId">
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="工作项目" prop="workItem">
+        <el-input
+          v-model="queryParams.workItem"
+          placeholder="请输入工作项目"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="填报时间" prop="submitTime">
+        <el-date-picker clearable
+          v-model="queryParams.submitTime"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择填报时间">
+        </el-date-picker>
+      </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="['oa:declare: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="['oa:declare: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="['oa:declare:remove']"
+        >删除</el-button>
+      </el-col> -->
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['oa:declare:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="declareList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <!-- <el-table-column label="填报id" align="center" prop="formId" /> -->
+      <el-table-column label="项目编号" align="center" prop="project.projectNumber" />
+      <el-table-column label="项目名称" align="center" prop="project.projectName" />
+      <el-table-column label="填报人" align="center" prop="user.nickName" />
+      <el-table-column label="工作类别" align="center" prop="workType" />
+      <el-table-column label="工作项目" align="center" prop="workItem" />
+      <el-table-column label="工作内容" align="center" prop="workContent" />
+      <el-table-column label="工天" align="center" prop="workLoad" />
+      <el-table-column label="工天单价" align="center" prop="price" />
+      <el-table-column label="系数" align="center" prop="coefficient" />
+      <el-table-column label="一审状态" align="center" prop="checkStatus">
+        <template slot-scope="scope">
+          <span>{{ scope.row.checkStatus == '0' ? '待审核' : '已审核' }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="二审状态" align="center" prop="auditStatus">
+        <template slot-scope="scope">
+          <span>{{ scope.row.auditStatus == '0' ? '待审核' : '已审核' }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="填报时间" align="center" prop="submitTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.submitTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="确认状态" align="center" prop="confirmStatus">
+        <template slot-scope="scope">
+          <span>{{ scope.row.confirmStatus == '0' ? '待确认' : '已确认' }}</span>
+        </template>
+      </el-table-column>
+      <!-- <el-table-column label="操作" align="center" 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="['oa:declare:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['oa:declare:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column> -->
+    </el-table>
+    
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改工作填报对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="项目id" prop="projectId">
+          <el-input v-model="form.projectId" placeholder="请输入项目id" />
+        </el-form-item>
+        <el-form-item label="用户id" prop="userId">
+          <el-input v-model="form.userId" placeholder="请输入用户id" />
+        </el-form-item>
+        <el-form-item label="工作项目" prop="workItem">
+          <el-input v-model="form.workItem" placeholder="请输入工作项目" />
+        </el-form-item>
+        <el-form-item label="工作内容">
+          <editor v-model="form.workContent" :min-height="192"/>
+        </el-form-item>
+        <el-form-item label="工天" prop="workLoad">
+          <el-input v-model="form.workLoad" placeholder="请输入工天" />
+        </el-form-item>
+        <el-form-item label="工天单价" prop="price">
+          <el-input v-model="form.price" placeholder="请输入工天单价" />
+        </el-form-item>
+        <el-form-item label="系数" prop="coefficient">
+          <el-input v-model="form.coefficient" placeholder="请输入系数" />
+        </el-form-item>
+        <el-form-item label="填报时间" prop="submitTime">
+          <el-date-picker clearable
+            v-model="form.submitTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="请选择填报时间">
+          </el-date-picker>
+        </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>
+  </div>
+</template>
+
+<script>
+import { listDeclare, getDeclare, delDeclare, addDeclare, updateDeclare } from "@/api/oa/declare/declare";
+import { listProject } from '@/api/oa/project/project';
+
+export default {
+  name: "Declare",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 工作填报表格数据
+      declareList: [],
+      projectList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        projectId: null,
+        userId: null,
+        workType: null,
+        workItem: null,
+        workContent: null,
+        workLoad: null,
+        price: null,
+        coefficient: null,
+        checkStatus: null,
+        auditStatus: null,
+        submitTime: null,
+        confirmStatus: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询工作填报列表 */
+    getList() {
+      this.loading = true;
+      listDeclare(this.queryParams).then(response => {
+        this.declareList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    remoteMethod(val) {
+      listProject({
+        pageNum: 1,
+        pageSize: 20,
+        projectNumber: val
+      }).then(res => {
+        this.projectList = res.rows;
+      })
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        formId: null,
+        projectId: null,
+        userId: null,
+        workType: null,
+        workItem: null,
+        workContent: null,
+        workLoad: null,
+        price: null,
+        coefficient: null,
+        checkStatus: null,
+        auditStatus: null,
+        submitTime: null,
+        confirmStatus: 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.formId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加工作填报";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const formId = row.formId || this.ids
+      getDeclare(formId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改工作填报";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.formId != null) {
+            updateDeclare(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addDeclare(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const formIds = row.formId || this.ids;
+      this.$modal.confirm('是否确认删除工作填报编号为"' + formIds + '"的数据项？').then(function() {
+        return delDeclare(formIds);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('oa/declare/export', {
+        ...this.queryParams
+      }, `declare_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>