导出委外、采购表

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

@@ -2,6 +2,9 @@ package com.ruoyi.web.controller.oa;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.oa.domain.CmcProject;
+import com.ruoyi.oa.service.ICmcPartnerService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -33,6 +36,9 @@ public class CmcOutsourceController extends BaseController
     @Autowired
     private ICmcOutsourceService cmcOutsourceService;
 
+    @Autowired
+    private ICmcPartnerService cmcPartnerService;
+
     /**
      * 查询项目委外列表
      */
@@ -41,6 +47,8 @@ public class CmcOutsourceController extends BaseController
     {
         startPage();
         List<CmcOutsource> list = cmcOutsourceService.selectCmcOutsourceList(cmcOutsource);
+        for (CmcOutsource outsource : list)
+            partnerIdToName(outsource);
         return getDataTable(list);
     }
 
@@ -52,6 +60,8 @@ public class CmcOutsourceController extends BaseController
     public void export(HttpServletResponse response, CmcOutsource cmcOutsource)
     {
         List<CmcOutsource> list = cmcOutsourceService.selectCmcOutsourceList(cmcOutsource);
+        for (CmcOutsource outsource : list)
+            partnerIdToName(outsource);
         ExcelUtil<CmcOutsource> util = new ExcelUtil<CmcOutsource>(CmcOutsource.class);
         util.exportExcel(response, list, "项目委外数据");
     }
@@ -94,4 +104,14 @@ public class CmcOutsourceController extends BaseController
     {
         return toAjax(cmcOutsourceService.deleteCmcOutsourceByOutsoureIds(outsoureIds));
     }
+
+    public void partnerIdToName(CmcOutsource cmcOutsource) {
+        String partnerId = cmcOutsource.getPartnerId();
+        StringBuilder partnerName = new StringBuilder();
+        if (partnerId != null && !partnerId.equals("") && partnerId.split(",").length > 0) {
+            for (String partner : partnerId.split(","))
+                partnerName.append(cmcPartnerService.selectCmcPartnerByPartnerId(partner).getPartnerName()).append(",");
+            cmcOutsource.setPartnerName(partnerName.substring(0, partnerName.length() - 1));
+        }
+    }
 }

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

@@ -2,6 +2,8 @@ package com.ruoyi.oa.domain;
 
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.domain.entity.SysDept;
+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;
@@ -20,24 +22,31 @@ public class CmcOutsource extends BaseEntity
     /** 委外id */
     private String outsoureId;
 
-    /** 委外说明 */
-    @Excel(name = "委外说明")
-    private String applyReason;
-
     /** 项目id */
     @Excel(name = "项目id")
     private String projectId;
+    @Excel(name = "项目编号")
+    private String projectNumber;
+    @Excel(name = "项目名称")
+    private String projectName;
 
-    /** 合作单位id */
-    @Excel(name = "合作单位id")
+    /** 合作单位 */
     private String partnerId;
+    @Excel(name = "合作单位")
+    private String partnerName;
+
+    /** 委外说明 */
+    @Excel(name = "委外说明")
+    private String applyReason;
 
     /** 申请人 */
     @Excel(name = "申请人")
+    private String applierUserName;
     private Long applier;
 
     /** 申请部门 */
     @Excel(name = "申请部门")
+    private String deptName;
     private Long applyDept;
 
     /** 申请时间 */
@@ -45,32 +54,44 @@ public class CmcOutsource extends BaseEntity
     @Excel(name = "申请时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date applyTime;
 
-    /** 分管审核人 */
-    @Excel(name = "分管审核人")
-    private Long managerUserId;
-
     /** 分管审核意见 */
     @Excel(name = "分管审核意见")
     private String managerComment;
 
+    /** 分管审核人 */
+    @Excel(name = "分管审核人")
+    private String managerUserName;
+    private Long managerUserId;
+
     /** 分管审核时间 */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "分管审核时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date managerTime;
 
-    /** 总经理审批人 */
-    @Excel(name = "总经理审批人")
-    private Long zjlUserId;
-
     /** 总经理审批意见 */
     @Excel(name = "总经理审批意见")
     private String zjlComment;
 
+    /** 总经理审批人 */
+    @Excel(name = "总经理审批人")
+    private String zjlUserName;
+    private Long zjlUserId;
+
     /** 总经理审批时间 */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "总经理审批时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date zjlTime;
 
+    private CmcProject project;
+
+    private SysUser applierUser;
+
+    private SysUser managerUser;
+
+    private SysUser zjlUser;
+
+    private SysDept dept;
+
     public void setOutsoureId(String outsoureId) 
     {
         this.outsoureId = outsoureId;
@@ -116,6 +137,16 @@ public class CmcOutsource extends BaseEntity
     {
         return applier;
     }
+    public void setApplierUser(SysUser applierUser)
+    {
+        this.applierUser = applierUser;
+        this.applierUserName = applierUser == null ? "" : applierUser.getNickName();
+    }
+
+    public SysUser getApplierUser()
+    {
+        return applierUser;
+    }
     public void setApplyDept(Long applyDept) 
     {
         this.applyDept = applyDept;
@@ -125,6 +156,16 @@ public class CmcOutsource extends BaseEntity
     {
         return applyDept;
     }
+    public void setDept(SysDept dept)
+    {
+        this.dept = dept;
+        this.deptName = dept == null ? "" : dept.getDeptName();
+    }
+
+    public SysDept getDept()
+    {
+        return dept;
+    }
     public void setApplyTime(Date applyTime) 
     {
         this.applyTime = applyTime;
@@ -143,6 +184,16 @@ public class CmcOutsource extends BaseEntity
     {
         return managerUserId;
     }
+    public void setManagerUser(SysUser managerUser)
+    {
+        this.managerUser = managerUser;
+        this.managerUserName = managerUser == null ? "" : managerUser.getNickName();
+    }
+
+    public SysUser getManagerUser()
+    {
+        return managerUser;
+    }
     public void setManagerComment(String managerComment) 
     {
         this.managerComment = managerComment;
@@ -170,6 +221,16 @@ public class CmcOutsource extends BaseEntity
     {
         return zjlUserId;
     }
+    public void setZjlUser(SysUser zjlUser)
+    {
+        this.zjlUser = zjlUser;
+        this.zjlUserName = zjlUser == null ? "" : zjlUser.getNickName();
+    }
+
+    public SysUser getZjlUser()
+    {
+        return zjlUser;
+    }
     public void setZjlComment(String zjlComment) 
     {
         this.zjlComment = zjlComment;
@@ -188,6 +249,26 @@ public class CmcOutsource extends BaseEntity
     {
         return zjlTime;
     }
+    public void setPartnerName(String partnerName)
+    {
+        this.partnerName = partnerName;
+    }
+
+    public String getPartnerName()
+    {
+        return partnerName;
+    }
+    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;
+    }
 
     @Override
     public String toString() {

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

@@ -29,7 +29,7 @@ public class CmcPerformance extends BaseEntity
     private Long reportDept;
 
     /** 附件 */
-    @Excel(name = "附件")
+//    @Excel(name = "附件")
     private String document;
 
     /** 上报日期 */
@@ -37,27 +37,27 @@ public class CmcPerformance extends BaseEntity
     @Excel(name = "上报日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date reportTime;
 
-    /** 分管审核人 */
-    @Excel(name = "分管审核人")
-    private Long managerUserId;
-
     /** 分管审核意见 */
     @Excel(name = "分管审核意见")
     private String managerComment;
 
+    /** 分管审核人 */
+    @Excel(name = "分管审核人")
+    private Long managerUserId;
+
     /** 分管审核时间 */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "分管审核时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date managerTime;
 
-    /** 总经理审批人 */
-    @Excel(name = "总经理审批人")
-    private Long zjlUserId;
-
     /** 总经理审批意见 */
     @Excel(name = "总经理审批意见")
     private String zjlComment;
 
+    /** 总经理审批人 */
+    @Excel(name = "总经理审批人")
+    private Long zjlUserId;
+
     /** 总经理审批时间 */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "总经理审批时间", width = 30, dateFormat = "yyyy-MM-dd")

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

@@ -2,6 +2,8 @@ package com.ruoyi.oa.domain;
 
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.domain.entity.SysDept;
+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;
@@ -26,10 +28,12 @@ public class CmcProcureApproval extends BaseEntity
 
     /** 申请人 */
     @Excel(name = "申请人")
+    private String applierUserName;
     private Long applier;
 
     /** 申请部门 */
     @Excel(name = "申请部门")
+    private String deptName;
     private Long applyDept;
 
     /** 申请时间 */
@@ -37,34 +41,41 @@ public class CmcProcureApproval extends BaseEntity
     @Excel(name = "申请时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date applyTime;
 
-    /** 分管审核人 */
-    @Excel(name = "分管审核人")
-    private Long managerUserId;
-
     /** 分管审核意见 */
     @Excel(name = "分管审核意见")
     private String managerComment;
 
+    /** 分管审核人 */
+    @Excel(name = "分管审核人")
+    private String managerUserName;
+    private Long managerUserId;
+
     /** 分管审核时间 */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "分管审核时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date managerTime;
 
-    /** 总经理审批人 */
-    @Excel(name = "总经理审批人")
-    private Long zjlUserId;
-
     /** 总经理审批意见 */
     @Excel(name = "总经理审批意见")
     private String zjlComment;
 
+    /** 总经理审批人 */
+    @Excel(name = "总经理审批人")
+    private String zjlUserName;
+    private Long zjlUserId;
+
     /** 总经理审批时间 */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "总经理审批时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date zjlTime;
 
+    /** 计划编制意见 */
+    @Excel(name = "计划编制意见")
+    private String planComment;
+
     /** 计划编制人 */
     @Excel(name = "计划编制人")
+    private String planUserName;
     private Long planUserId;
 
     /** 计划编制时间 */
@@ -72,9 +83,15 @@ public class CmcProcureApproval extends BaseEntity
     @Excel(name = "计划编制时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date planTime;
 
-    /** 计划编制意见 */
-    @Excel(name = "计划编制意见")
-    private String planComment;
+    private SysUser applierUser;
+
+    private SysUser managerUser;
+
+    private SysUser zjlUser;
+
+    private SysUser planUser;
+
+    private SysDept dept;
 
     public void setProcureApplyId(String procureApplyId) 
     {
@@ -103,6 +120,16 @@ public class CmcProcureApproval extends BaseEntity
     {
         return applier;
     }
+    public void setApplierUser(SysUser applierUser)
+    {
+        this.applierUser = applierUser;
+        this.applierUserName = applierUser == null ? "" : applierUser.getNickName();
+    }
+
+    public SysUser getApplierUser()
+    {
+        return applierUser;
+    }
     public void setApplyDept(Long applyDept) 
     {
         this.applyDept = applyDept;
@@ -112,6 +139,16 @@ public class CmcProcureApproval extends BaseEntity
     {
         return applyDept;
     }
+    public void setDept(SysDept dept)
+    {
+        this.dept = dept;
+        this.deptName = dept == null ? "" : dept.getDeptName();
+    }
+
+    public SysDept getDept()
+    {
+        return dept;
+    }
     public void setApplyTime(Date applyTime)
     {
         this.applyTime = applyTime;
@@ -130,6 +167,16 @@ public class CmcProcureApproval extends BaseEntity
     {
         return managerUserId;
     }
+    public void setManagerUser(SysUser managerUser)
+    {
+        this.managerUser = managerUser;
+        this.managerUserName = managerUser == null ? "" : managerUser.getNickName();
+    }
+
+    public SysUser getManagerUser()
+    {
+        return managerUser;
+    }
     public void setManagerComment(String managerComment) 
     {
         this.managerComment = managerComment;
@@ -157,6 +204,16 @@ public class CmcProcureApproval extends BaseEntity
     {
         return zjlUserId;
     }
+    public void setZjlUser(SysUser zjlUser)
+    {
+        this.zjlUser = zjlUser;
+        this.zjlUserName = zjlUser == null ? "" : zjlUser.getNickName();
+    }
+
+    public SysUser getZjlUser()
+    {
+        return zjlUser;
+    }
     public void setZjlComment(String zjlComment) 
     {
         this.zjlComment = zjlComment;
@@ -184,6 +241,16 @@ public class CmcProcureApproval extends BaseEntity
     {
         return planUserId;
     }
+    public void setPlanUser(SysUser planUser)
+    {
+        this.planUser = planUser;
+        this.planUserName = planUser == null ? "" : planUser.getNickName();
+    }
+
+    public SysUser getPlanUser()
+    {
+        return planUser;
+    }
     public void setPlanTime(Date planTime) 
     {
         this.planTime = planTime;

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

@@ -18,33 +18,71 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="zjlUserId"    column="zjl_user_id"    />
         <result property="zjlComment"    column="zjl_comment"    />
         <result property="zjlTime"    column="zjl_time"    />
+        <association property="project"    javaType="CmcProject"         resultMap="CmcProjectResult" />
+        <association property="applierUser"    javaType="SysUser"         resultMap="ApplierUserResult" />
+        <association property="managerUser"    javaType="SysUser"         resultMap="ManagerUserResult" />
+        <association property="zjlUser"    javaType="SysUser"         resultMap="ZjlUserResult" />
+        <association property="dept"    javaType="SysDept"         resultMap="SysDeptResult" />
+    </resultMap>
+
+    <resultMap type="CmcProject" id="CmcProjectResult">
+        <result property="projectId"    column="project_id"    />
+        <result property="projectNumber"    column="project_number"    />
+        <result property="projectName"    column="project_name"    />
+    </resultMap>
+
+    <resultMap type="SysUser" id="ApplierUserResult">
+        <result property="userId"    column="user_id"    />
+        <result property="nickName"    column="applier_nick_name"    />
+    </resultMap>
+
+    <resultMap type="SysUser" id="ManagerUserResult">
+        <result property="userId"    column="user_id"    />
+        <result property="nickName"    column="manager_nick_name"    />
+    </resultMap>
+
+    <resultMap type="SysUser" id="ZjlUserResult">
+        <result property="userId"    column="user_id"    />
+        <result property="nickName"    column="zjl_nick_name"    />
+    </resultMap>
+
+    <resultMap type="SysDept" id="SysDeptResult">
+        <result property="deptId"    column="dept_id"    />
+        <result property="deptName"    column="dept_name"    />
     </resultMap>
 
     <sql id="selectCmcOutsourceVo">
-        select outsoure_id, apply_reason, project_id, partner_id, applier, apply_dept, apply_time, manager_user_id, manager_comment, manager_time, zjl_user_id, zjl_comment, zjl_time from cmc_outsource
+        select o.outsoure_id, o.apply_reason, o.project_id, p.project_number, p.project_name, o.partner_id, o.applier, u.nick_name as applier_nick_name,
+               o.apply_dept, d.dept_name, o.apply_time, o.manager_user_id, u1.nick_name as manager_nick_name, o.manager_comment, o.manager_time,
+               o.zjl_user_id, u2.nick_name as zjl_nick_name, o.zjl_comment, o.zjl_time from cmc_outsource as o
+        left join cmc_project as p on o.project_id = p.project_id
+        left join sys_user as u on u.user_id = o.applier
+        left join sys_user as u1 on u1.user_id = o.manager_user_id
+        left join sys_user as u2 on u2.user_id = o.zjl_user_id
+        left join sys_dept as d on d.dept_id = o.apply_dept
     </sql>
 
     <select id="selectCmcOutsourceList" parameterType="CmcOutsource" resultMap="CmcOutsourceResult">
         <include refid="selectCmcOutsourceVo"/>
         <where>  
-            <if test="applyReason != null  and applyReason != ''"> and apply_reason = #{applyReason}</if>
-            <if test="projectId != null  and projectId != ''"> and project_id = #{projectId}</if>
-            <if test="partnerId != null  and partnerId != ''"> and partner_id = #{partnerId}</if>
-            <if test="applier != null "> and applier = #{applier}</if>
-            <if test="applyDept != null "> and apply_dept = #{applyDept}</if>
-            <if test="applyTime != null "> and apply_time = #{applyTime}</if>
-            <if test="managerUserId != null "> and manager_user_id = #{managerUserId}</if>
-            <if test="managerComment != null  and managerComment != ''"> and manager_comment = #{managerComment}</if>
-            <if test="managerTime != null "> and manager_time = #{managerTime}</if>
-            <if test="zjlUserId != null "> and zjl_user_id = #{zjlUserId}</if>
-            <if test="zjlComment != null  and zjlComment != ''"> and zjl_comment = #{zjlComment}</if>
-            <if test="zjlTime != null "> and zjl_time = #{zjlTime}</if>
+            <if test="applyReason != null  and applyReason != ''"> and o.apply_reason = #{applyReason}</if>
+            <if test="projectId != null  and projectId != ''"> and o.project_id = #{projectId}</if>
+            <if test="partnerId != null  and partnerId != ''"> and o.partner_id = #{partnerId}</if>
+            <if test="applier != null "> and o.applier = #{applier}</if>
+            <if test="applyDept != null "> and o.apply_dept = #{applyDept}</if>
+            <if test="applyTime != null "> and o.apply_time = #{applyTime}</if>
+            <if test="managerUserId != null "> and o.manager_user_id = #{managerUserId}</if>
+            <if test="managerComment != null  and managerComment != ''"> and o.manager_comment = #{managerComment}</if>
+            <if test="managerTime != null "> and o.manager_time = #{managerTime}</if>
+            <if test="zjlUserId != null "> and o.zjl_user_id = #{zjlUserId}</if>
+            <if test="zjlComment != null  and zjlComment != ''"> and o.zjl_comment = #{zjlComment}</if>
+            <if test="zjlTime != null "> and o.zjl_time = #{zjlTime}</if>
         </where>
     </select>
     
     <select id="selectCmcOutsourceByOutsoureId" parameterType="String" resultMap="CmcOutsourceResult">
         <include refid="selectCmcOutsourceVo"/>
-        where outsoure_id = #{outsoureId}
+        where o.outsoure_id = #{outsoureId}
     </select>
         
     <insert id="insertCmcOutsource" parameterType="CmcOutsource">

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

@@ -19,34 +19,71 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="planUserId"    column="plan_user_id"    />
         <result property="planTime"    column="plan_time"    />
         <result property="planComment"    column="plan_comment"    />
+        <association property="applierUser"    javaType="SysUser"         resultMap="ApplierUserResult" />
+        <association property="managerUser"    javaType="SysUser"         resultMap="ManagerUserResult" />
+        <association property="zjlUser"    javaType="SysUser"         resultMap="ZjlUserResult" />
+        <association property="planUser"    javaType="SysUser"         resultMap="PlanUserResult" />
+        <association property="dept"    javaType="SysDept"         resultMap="SysDeptResult" />
+    </resultMap>
+
+    <resultMap type="SysUser" id="ApplierUserResult">
+        <result property="userId"    column="user_id"    />
+        <result property="nickName"    column="applier_nick_name"    />
+    </resultMap>
+
+    <resultMap type="SysUser" id="ManagerUserResult">
+        <result property="userId"    column="user_id"    />
+        <result property="nickName"    column="manager_nick_name"    />
+    </resultMap>
+
+    <resultMap type="SysUser" id="ZjlUserResult">
+        <result property="userId"    column="user_id"    />
+        <result property="nickName"    column="zjl_nick_name"    />
+    </resultMap>
+
+    <resultMap type="SysUser" id="PlanUserResult">
+        <result property="userId"    column="user_id"    />
+        <result property="nickName"    column="plan_nick_name"    />
+    </resultMap>
+
+    <resultMap type="SysDept" id="SysDeptResult">
+        <result property="deptId"    column="dept_id"    />
+        <result property="deptName"    column="dept_name"    />
     </resultMap>
 
     <sql id="selectCmcProcureApprovalVo">
-        select procure_apply_id, apply_reason, applier, apply_dept, apply_time, manager_user_id, manager_comment, manager_time, zjl_user_id, zjl_comment, zjl_time, plan_user_id, plan_time, plan_comment from cmc_procure_approval
+        select pa.procure_apply_id, pa.apply_reason, pa.applier, u.nick_name as applier_nick_name, pa.apply_dept, d.dept_name, pa.apply_time,
+               pa.manager_user_id, u1.nick_name as manager_nick_name, pa.manager_comment, pa.manager_time, pa.zjl_user_id, u2.nick_name as zjl_nick_name,
+               pa.zjl_comment, pa.zjl_time, pa.plan_user_id, u3.nick_name as plan_nick_name, pa.plan_time, pa.plan_comment from cmc_procure_approval as pa
+        left join sys_user as u on u.user_id = pa.applier
+        left join sys_user as u1 on u1.user_id = pa.manager_user_id
+        left join sys_user as u2 on u2.user_id = pa.zjl_user_id
+        left join sys_user as u3 on u3.user_id = pa.plan_user_id
+        left join sys_dept as d on d.dept_id = pa.apply_dept
     </sql>
 
     <select id="selectCmcProcureApprovalList" parameterType="CmcProcureApproval" resultMap="CmcProcureApprovalResult">
         <include refid="selectCmcProcureApprovalVo"/>
         <where>  
-            <if test="applyReason != null  and applyReason != ''"> and apply_reason = #{applyReason}</if>
-            <if test="applier != null "> and applier = #{applier}</if>
-            <if test="applyDept != null "> and apply_dept = #{applyDept}</if>
-            <if test="applyTime != null "> and apply_time = #{applyTime}</if>
-            <if test="managerUserId != null "> and manager_user_id = #{managerUserId}</if>
-            <if test="managerComment != null  and managerComment != ''"> and manager_comment = #{managerComment}</if>
-            <if test="managerTime != null "> and manager_time = #{managerTime}</if>
-            <if test="zjlUserId != null "> and zjl_user_id = #{zjlUserId}</if>
-            <if test="zjlComment != null  and zjlComment != ''"> and zjl_comment = #{zjlComment}</if>
-            <if test="zjlTime != null "> and zjl_time = #{zjlTime}</if>
-            <if test="planUserId != null "> and plan_user_id = #{planUserId}</if>
-            <if test="planTime != null "> and plan_time = #{planTime}</if>
-            <if test="planComment != null  and planComment != ''"> and plan_comment = #{planComment}</if>
+            <if test="applyReason != null  and applyReason != ''"> and pa.apply_reason = #{applyReason}</if>
+            <if test="applier != null "> and pa.applier = #{applier}</if>
+            <if test="applyDept != null "> and pa.apply_dept = #{applyDept}</if>
+            <if test="applyTime != null "> and pa.apply_time = #{applyTime}</if>
+            <if test="managerUserId != null "> and pa.manager_user_id = #{managerUserId}</if>
+            <if test="managerComment != null  and managerComment != ''"> and pa.manager_comment = #{managerComment}</if>
+            <if test="managerTime != null "> and pa.manager_time = #{managerTime}</if>
+            <if test="zjlUserId != null "> and pa.zjl_user_id = #{zjlUserId}</if>
+            <if test="zjlComment != null  and zjlComment != ''"> and pa.zjl_comment = #{zjlComment}</if>
+            <if test="zjlTime != null "> and pa.zjl_time = #{zjlTime}</if>
+            <if test="planUserId != null "> and pa.plan_user_id = #{planUserId}</if>
+            <if test="planTime != null "> and pa.plan_time = #{planTime}</if>
+            <if test="planComment != null  and planComment != ''"> and pa.plan_comment = #{planComment}</if>
         </where>
     </select>
     
     <select id="selectCmcProcureApprovalByProcureApplyId" parameterType="String" resultMap="CmcProcureApprovalResult">
         <include refid="selectCmcProcureApprovalVo"/>
-        where procure_apply_id = #{procureApplyId}
+        where pa.procure_apply_id = #{procureApplyId}
     </select>
         
     <insert id="insertCmcProcureApproval" parameterType="CmcProcureApproval">

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

@@ -95,7 +95,7 @@
     </resultMap>
 
     <sql id="selectCmcProjectVo">
-        select p.project_id, p.project_number, p.project_name, p.project_leader, u.nick_name as leader_nick_name, p.is_finished, p.project_source, p.party_a_id, pa.party_a_name, p.contact_person, p.telephone,
+        select distinct(p.project_id), p.project_number, p.project_name, p.project_leader, u.nick_name as leader_nick_name, p.is_finished, p.project_source, p.party_a_id, pa.party_a_name, p.contact_person, p.telephone,
                p.project_type, p.project_level, p.project_registrant, u1.nick_name as registrant_nick_name, p.undertaking_dept, p.project_planner, p.site_leader, p.organize_document, p.organize_time,
                p.register_time, p.plan_time, p.entry_time, p.exit_time, p.remark, tp.technical_director, u2.nick_name as director_nick_name, tp.quality_inspector, p.project_kml, p.project_cp, p.kml_lng, p.kml_lat,
                p.cars, p.drivers, p.devices, p.participates, p.task_document, p.project_request, tp.technical_designer, u3.nick_name as designer_nick_name, u4.nick_name as planner_nick_name,

oa-ui/src/views/flowable/form/outsource/outsourceForm.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: ysh
  * @Date: 2024-09-20 16:09:07
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-09-23 16:22:14
+ * @LastEditors: wrh
+ * @LastEditTime: 2024-09-24 10:38:33
 -->
 <template>
   <div class="app-container">
@@ -49,7 +49,7 @@
             </el-descriptions>
           </el-form-item>
           <el-form-item label="合作单位：" prop="partnerId">
-            <el-tag class="mr10" v-for="item in partnerList" v-if="partnerList.length != 0">
+            <el-tag class="mr10" v-for="item in partnerList" :key="item.partnerId" v-if="partnerList.length != 0">
               {{ item.partnerName }}
             </el-tag>
             <el-button icon="el-icon-plus" type="primary" @click="partOpen = true" size="mini"
@@ -202,7 +202,7 @@ export default {
       })
     },
     async saves() {
-      if (this.formTotal) {
+      if (this.formTotal != 0) {
         if (this.taskName == '分管审核') {
           this.form.managerUserId = this.$refs.fgRef.localSignatureUserId;
           this.form.managerTime = this.$refs.fgRef.loaclSignTime;

oa-ui/src/views/flowable/form/procure/procureForm.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: ysh
  * @Date: 2024-09-19 13:45:43
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-09-23 14:27:46
+ * @LastEditors: wrh
+ * @LastEditTime: 2024-09-24 11:32:36
 -->
 <template>
   <div class="app-container">
@@ -34,6 +34,13 @@
           <el-form-item label="采购计划表：">
             <plan ref="planRef" :procureApplyId="form.procureApplyId" :taskName="taskName"></plan>
           </el-form-item>
+          <el-form-item label="综合事务部意见：" prop="planComment" label-width="130px">
+            <el-input type="textarea" v-model="form.planComment" :autosize="{ minRows: 4 }"
+              :disabled="taskName != '编制计划'"></el-input>
+            <auditor-row ref="zhRef" :isCurrent="taskName == '编制计划'"
+              :signature="form.planUserId ? form.planUserId : null"
+              :signTime="form.planTime"></auditor-row>
+          </el-form-item>
           <el-form-item label="分管审核意见：" prop="managerComment" label-width="130px">
             <el-input type="textarea" v-model="form.managerComment" :autosize="{ minRows: 4 }"
               :disabled="taskName != '分管审核'"></el-input>
@@ -148,6 +155,12 @@ export default {
           this.form.applier = this.$store.getters.userId;
           this.form.applyDept = this.$store.getters.deptId;
           this.form.applyTime = parseTime(new Date(), "{y}-{m}-{d}")
+        } else if (this.taskName == '编制计划') {
+          this.rules = {
+            planComment: [
+              { required: true, message: '请输入综合事务部意见', trigger: 'blur' }
+            ]
+          }
         } else if (this.taskName == '分管审核') {
           this.rules = {
             managerComment: [
@@ -165,8 +178,11 @@ export default {
     },
     // 保存表单
     async saves() {
-      if (this.formTotal) {
-        if (this.taskName == '分管审核') {
+      if (this.formTotal != 0) {
+        if (this.taskName == '编制计划') {
+          this.form.planUserId = this.$refs.zhRef.localSignatureUserId;
+          this.form.planTime = this.$refs.zhRef.loaclSignTime;
+        } else if (this.taskName == '分管审核') {
           this.form.managerUserId = this.$refs.fgRef.localSignatureUserId;
           this.form.managerTime = this.$refs.fgRef.loaclSignTime;
         } else if (this.taskName == '总经理审批') {

oa-ui/src/views/flowable/form/projectProcess/businessReview.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: ysh
  * @Date: 2024-04-08 13:56:14
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-09-10 15:33:46
+ * @LastEditors: wrh
+ * @LastEditTime: 2024-09-24 10:31:28
 -->
 <template>
   <div class="app-container">
@@ -123,7 +123,7 @@ export default {
     },
     confirm() {
       this.form.projectId = this.taskForm.formId
-      if (this.formTotal) {
+      if (this.formTotal != 0) {
         updateProjectComment(this.form)
       } else {
         addProjectComment({ projectId: this.taskForm.formId, jyComment: this.form.jyComment })

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

@@ -1,141 +1,35 @@
 <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="applyReason">
-        <el-input
-          v-model="queryParams.applyReason"
-          placeholder="请输入委外说明"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="项目id" prop="projectId">
-        <el-input
-          v-model="queryParams.projectId"
-          placeholder="请输入项目id"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="合作单位id" prop="partnerId">
-        <el-input
-          v-model="queryParams.partnerId"
-          placeholder="请输入合作单位id"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+    <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="applier">
-        <el-input
-          v-model="queryParams.applier"
-          placeholder="请输入申请人"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
+        <el-select v-model="queryParams.applier" 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="applyDept">
-        <el-input
-          v-model="queryParams.applyDept"
-          placeholder="请输入申请部门"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="申请时间" prop="applyTime">
-        <el-date-picker clearable
-          v-model="queryParams.applyTime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="请选择申请时间">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="分管审核人" prop="managerUserId">
-        <el-input
-          v-model="queryParams.managerUserId"
-          placeholder="请输入分管审核人"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="分管审核意见" prop="managerComment">
-        <el-input
-          v-model="queryParams.managerComment"
-          placeholder="请输入分管审核意见"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="分管审核时间" prop="managerTime">
-        <el-date-picker clearable
-          v-model="queryParams.managerTime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="请选择分管审核时间">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="总经理审批人" prop="zjlUserId">
-        <el-input
-          v-model="queryParams.zjlUserId"
-          placeholder="请输入总经理审批人"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="总经理审批意见" prop="zjlComment">
-        <el-input
-          v-model="queryParams.zjlComment"
-          placeholder="请输入总经理审批意见"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="总经理审批时间" prop="zjlTime">
-        <el-date-picker clearable
-          v-model="queryParams.zjlTime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="请选择总经理审批时间">
-        </el-date-picker>
-      </el-form-item>
+        <el-select v-model="queryParams.applyDept" filterable clearable @change="handleQuery">
+          <el-option v-for="item in $store.state.user.deptList" :key="item.deptId" :label="item.deptName"
+            :value="item.deptId">
+          </el-option>
+        </el-select>
+      </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:outsource: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:outsource: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:outsource:remove']"
-        >删除</el-button>
-      </el-col>
+    <el-row :gutter="10" class="mb8">      
       <el-col :span="1.5">
         <el-button
           type="warning"
@@ -151,47 +45,49 @@
 
     <el-table v-loading="loading" :data="outsourceList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="委外id" align="center" prop="outsoureId" />
-      <el-table-column label="委外说明" align="center" prop="applyReason" />
-      <el-table-column label="项目id" align="center" prop="projectId" />
-      <el-table-column label="合作单位id" align="center" prop="partnerId" />
-      <el-table-column label="申请人" align="center" prop="applier" />
-      <el-table-column label="申请部门" align="center" prop="applyDept" />
+      <!-- <el-table-column label="委外id" align="center" prop="outsoureId" /> -->
+      <el-table-column label="委外说明" align="center" prop="applyReason" />      
+      <el-table-column label="项目编号" align="center" prop="project.projectNumber" />
+      <el-table-column label="项目名称" align="center" prop="project.projectName" width="200px" />
+      <el-table-column label="合作单位" align="center" prop="partnerName" />
+      <el-table-column label="申请人" align="center" prop="applier">
+        <template slot-scope="scope">
+          {{ getUserName(scope.row.applier) }}
+        </template>
+      </el-table-column>
+      <el-table-column label="申请部门" align="center" prop="applyDept" >
+        <template slot-scope="scope">
+          {{ getDeptName(scope.row.applyDept) }}
+        </template>
+      </el-table-column>
       <el-table-column label="申请时间" align="center" prop="applyTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.applyTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="分管审核人" align="center" prop="managerUserId" />
+      <!-- <el-table-column label="分管审核人" align="center" prop="managerUserId" /> -->
       <el-table-column label="分管审核意见" align="center" prop="managerComment" />
-      <el-table-column label="分管审核时间" align="center" prop="managerTime" width="180">
+      <!-- <el-table-column label="分管审核时间" align="center" prop="managerTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.managerTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="总经理审批人" align="center" prop="zjlUserId" />
+      <el-table-column label="总经理审批人" align="center" prop="zjlUserId" /> -->
       <el-table-column label="总经理审批意见" align="center" prop="zjlComment" />
-      <el-table-column label="总经理审批时间" align="center" prop="zjlTime" width="180">
+      <!-- <el-table-column label="总经理审批时间" align="center" prop="zjlTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.zjlTime, '{y}-{m}-{d}') }}</span>
         </template>
-      </el-table-column>
+      </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:outsource:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['oa:outsource:remove']"
-          >删除</el-button>
+            icon="el-icon-view"
+            @click="handleView(scope.row)"
+            v-hasPermi="['oa:outsource:query']"
+          >查看</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -203,74 +99,19 @@
       :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="applyReason">
-          <el-input v-model="form.applyReason" placeholder="请输入委外说明" />
-        </el-form-item>
-        <el-form-item label="项目id" prop="projectId">
-          <el-input v-model="form.projectId" placeholder="请输入项目id" />
-        </el-form-item>
-        <el-form-item label="合作单位id" prop="partnerId">
-          <el-input v-model="form.partnerId" placeholder="请输入合作单位id" />
-        </el-form-item>
-        <el-form-item label="申请人" prop="applier">
-          <el-input v-model="form.applier" placeholder="请输入申请人" />
-        </el-form-item>
-        <el-form-item label="申请部门" prop="applyDept">
-          <el-input v-model="form.applyDept" placeholder="请输入申请部门" />
-        </el-form-item>
-        <el-form-item label="申请时间" prop="applyTime">
-          <el-date-picker clearable
-            v-model="form.applyTime"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="请选择申请时间">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="分管审核人" prop="managerUserId">
-          <el-input v-model="form.managerUserId" placeholder="请输入分管审核人" />
-        </el-form-item>
-        <el-form-item label="分管审核意见" prop="managerComment">
-          <el-input v-model="form.managerComment" placeholder="请输入分管审核意见" />
-        </el-form-item>
-        <el-form-item label="分管审核时间" prop="managerTime">
-          <el-date-picker clearable
-            v-model="form.managerTime"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="请选择分管审核时间">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="总经理审批人" prop="zjlUserId">
-          <el-input v-model="form.zjlUserId" placeholder="请输入总经理审批人" />
-        </el-form-item>
-        <el-form-item label="总经理审批意见" prop="zjlComment">
-          <el-input v-model="form.zjlComment" placeholder="请输入总经理审批意见" />
-        </el-form-item>
-        <el-form-item label="总经理审批时间" prop="zjlTime">
-          <el-date-picker clearable
-            v-model="form.zjlTime"
-            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 :title="title" :visible.sync="open" width="65%" append-to-body>
+      <outsource-form :taskForm="taskForm" :taskName="''" :isFlow="false"></outsource-form>
     </el-dialog>
   </div>
 </template>
 
 <script>
 import { listOutsource, getOutsource, delOutsource, addOutsource, updateOutsource } from "@/api/oa/outsource/outsource";
+import outsourceForm from '../../flowable/form/outsource/outsourceForm.vue';
+import { listProject } from '@/api/oa/project/project';
 
 export default {
+  components: { outsourceForm },
   name: "Outsource",
   data() {
     return {
@@ -313,7 +154,11 @@ export default {
       form: {},
       // 表单校验
       rules: {
-      }
+      },
+      taskForm: {
+        formId: ''
+      },      
+      projectList: []
     };
   },
   created() {
@@ -385,6 +230,10 @@ export default {
         this.title = "修改项目委外";
       });
     },
+    handleView(row) {
+      this.open = true;
+      this.taskForm.formId = row.outsoureId;
+    },
     /** 提交按钮 */
     submitForm() {
       this.$refs["form"].validate(valid => {
@@ -420,7 +269,16 @@ export default {
       this.download('oa/outsource/export', {
         ...this.queryParams
       }, `outsource_${new Date().getTime()}.xlsx`)
-    }
+    },    
+    remoteMethod(val) {
+      listProject({
+        pageNum: 1,
+        pageSize: 20,
+        projectNumber: val
+      }).then(res => {
+        this.projectList = res.rows;
+      })
+    },
   }
 };
 </script>

oa-ui/src/views/oa/procure/approval.vue

@@ -1,102 +1,20 @@
 <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="applyReason">
-        <el-input
-          v-model="queryParams.applyReason"
-          placeholder="请输入购置说明"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item label="申请人" prop="applier">
-        <el-input
-          v-model="queryParams.applier"
-          placeholder="请输入申请人"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
+        <el-select v-model="queryParams.applier" 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="applyDept">
-        <el-input
-          v-model="queryParams.applyDept"
-          placeholder="请输入申请部门"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="分管审核人" prop="managerUserId">
-        <el-input
-          v-model="queryParams.managerUserId"
-          placeholder="请输入分管审核人"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="分管审核意见" prop="managerComment">
-        <el-input
-          v-model="queryParams.managerComment"
-          placeholder="请输入分管审核意见"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="分管审核时间" prop="managerTime">
-        <el-date-picker clearable
-          v-model="queryParams.managerTime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="请选择分管审核时间">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="总经理审批人" prop="zjlUserId">
-        <el-input
-          v-model="queryParams.zjlUserId"
-          placeholder="请输入总经理审批人"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="总经理审批意见" prop="zjlComment">
-        <el-input
-          v-model="queryParams.zjlComment"
-          placeholder="请输入总经理审批意见"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="总经理审批时间" prop="zjlTime">
-        <el-date-picker clearable
-          v-model="queryParams.zjlTime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="请选择总经理审批时间">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="计划编制人" prop="planUserId">
-        <el-input
-          v-model="queryParams.planUserId"
-          placeholder="请输入计划编制人"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="计划编制时间" prop="planTime">
-        <el-date-picker clearable
-          v-model="queryParams.planTime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="请选择计划编制时间">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="计划编制意见" prop="planComment">
-        <el-input
-          v-model="queryParams.planComment"
-          placeholder="请输入计划编制意见"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
+          <el-select v-model="queryParams.applyDept" filterable clearable @change="handleQuery">
+            <el-option v-for="item in $store.state.user.deptList" :key="item.deptId" :label="item.deptName"
+              :value="item.deptId">
+            </el-option>
+          </el-select>
+        </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>
@@ -104,38 +22,6 @@
     </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:procureApproval: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:procureApproval: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:procureApproval:remove']"
-        >删除</el-button>
-      </el-col>
       <el-col :span="1.5">
         <el-button
           type="warning"
@@ -151,34 +37,42 @@
 
     <el-table v-loading="loading" :data="procureApprovalList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="采购申请id" align="center" prop="procureApplyId" />
+      <!-- <el-table-column label="采购申请id" align="center" prop="procureApplyId" /> -->
       <el-table-column label="购置说明" align="center" prop="applyReason" />
-      <el-table-column label="申请人" align="center" prop="applier" />
-      <el-table-column label="申请部门" align="center" prop="applyDept" />
-      <el-table-column label="分管审核人" align="center" prop="managerUserId" />
+      <el-table-column label="申请人" align="center" prop="applier">
+        <template slot-scope="scope">
+          {{ getUserName(scope.row.applier) }}
+        </template>
+      </el-table-column>
+      <el-table-column label="申请部门" align="center" prop="applyDept" >
+        <template slot-scope="scope">
+          {{ getDeptName(scope.row.applyDept) }}
+        </template>
+      </el-table-column>
+      <!-- <el-table-column label="分管审核人" align="center" prop="managerUserId" /> -->
       <el-table-column label="分管审核意见" align="center" prop="managerComment" />
-      <el-table-column label="分管审核时间" align="center" prop="managerTime" width="180">
+      <!-- <el-table-column label="分管审核时间" align="center" prop="managerTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.managerTime, '{y}-{m}-{d}') }}</span>
         </template>
-      </el-table-column>
-      <el-table-column label="总经理审批人" align="center" prop="zjlUserId" />
+      </el-table-column> -->
+      <!-- <el-table-column label="总经理审批人" align="center" prop="zjlUserId" /> -->
       <el-table-column label="总经理审批意见" align="center" prop="zjlComment" />
-      <el-table-column label="总经理审批时间" align="center" prop="zjlTime" width="180">
+      <!-- <el-table-column label="总经理审批时间" align="center" prop="zjlTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.zjlTime, '{y}-{m}-{d}') }}</span>
         </template>
-      </el-table-column>
-      <el-table-column label="计划编制人" align="center" prop="planUserId" />
+      </el-table-column> -->
+      <!-- <el-table-column label="计划编制人" align="center" prop="planUserId" /> -->
       <el-table-column label="计划编制时间" align="center" prop="planTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.planTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="计划编制意见" align="center" prop="planComment" />
+      <!-- <el-table-column label="计划编制意见" align="center" prop="planComment" /> -->
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
-          <el-button
+          <!-- <el-button
             size="mini"
             type="text"
             icon="el-icon-edit"
@@ -191,11 +85,18 @@
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['oa:procureApproval:remove']"
-          >删除</el-button>
+          >删除</el-button> -->
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-view"
+            @click="handleView(scope.row)"
+            v-hasPermi="['oa:procureApproval:query']"
+          >查看</el-button>
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"
@@ -203,74 +104,19 @@
       :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="applyReason">
-          <el-input v-model="form.applyReason" placeholder="请输入购置说明" />
-        </el-form-item>
-        <el-form-item label="申请人" prop="applier">
-          <el-input v-model="form.applier" placeholder="请输入申请人" />
-        </el-form-item>
-        <el-form-item label="申请部门" prop="applyDept">
-          <el-input v-model="form.applyDept" placeholder="请输入申请部门" />
-        </el-form-item>
-        <el-form-item label="分管审核人" prop="managerUserId">
-          <el-input v-model="form.managerUserId" placeholder="请输入分管审核人" />
-        </el-form-item>
-        <el-form-item label="分管审核意见" prop="managerComment">
-          <el-input v-model="form.managerComment" placeholder="请输入分管审核意见" />
-        </el-form-item>
-        <el-form-item label="分管审核时间" prop="managerTime">
-          <el-date-picker clearable
-            v-model="form.managerTime"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="请选择分管审核时间">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="总经理审批人" prop="zjlUserId">
-          <el-input v-model="form.zjlUserId" placeholder="请输入总经理审批人" />
-        </el-form-item>
-        <el-form-item label="总经理审批意见" prop="zjlComment">
-          <el-input v-model="form.zjlComment" placeholder="请输入总经理审批意见" />
-        </el-form-item>
-        <el-form-item label="总经理审批时间" prop="zjlTime">
-          <el-date-picker clearable
-            v-model="form.zjlTime"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="请选择总经理审批时间">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="计划编制人" prop="planUserId">
-          <el-input v-model="form.planUserId" placeholder="请输入计划编制人" />
-        </el-form-item>
-        <el-form-item label="计划编制时间" prop="planTime">
-          <el-date-picker clearable
-            v-model="form.planTime"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="请选择计划编制时间">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="计划编制意见" prop="planComment">
-          <el-input v-model="form.planComment" 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 :title="title" :visible.sync="open" width="65%" append-to-body>
+      <procure-form :taskForm="taskForm" :taskName="''" :isFlow="false"></procure-form>
     </el-dialog>
   </div>
 </template>
 
 <script>
 import { listProcureApproval, getProcureApproval, delProcureApproval, addProcureApproval, updateProcureApproval } from "@/api/oa/procure/procureApproval";
+import procureForm from '../../flowable/form/procure/procureForm.vue';
 
 export default {
+  components: { procureForm },
   name: "ProcureApproval",
   data() {
     return {
@@ -313,6 +159,9 @@ export default {
       form: {},
       // 表单校验
       rules: {
+      },
+      taskForm: {
+        formId: ''
       }
     };
   },
@@ -384,6 +233,10 @@ export default {
         this.open = true;
         this.title = "修改采购审批";
       });
+    },    
+    handleView(row) {
+      this.open = true;
+      this.taskForm.formId = row.procureApplyId;
     },
     /** 提交按钮 */
     submitForm() {