安全交底管理、成果归档管理

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

@@ -73,6 +73,7 @@ public class CmcArchiveController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody CmcArchive cmcArchive)
     {
+        cmcArchive.setProjectLeader(getLoginUser().getUserId());
         return toAjax(cmcArchiveService.insertCmcArchive(cmcArchive));
     }
 

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

@@ -91,6 +91,6 @@ public class CmcProjectSubContractController extends BaseController
 	@DeleteMapping("/{subContractIds}")
     public AjaxResult remove(@PathVariable String[] subContractIds)
     {
-        return toAjax(cmcProjectSubContractService.deleteCmcProjectSubContractBySubContractIds(subContractIds));
+        return success(cmcProjectSubContractService.deleteCmcProjectSubContractBySubContractIds(subContractIds));
     }
 }

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

@@ -3,6 +3,8 @@ package com.ruoyi.web.controller.oa;
 import java.util.Date;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.system.service.ISysUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -34,6 +36,9 @@ public class CmcTechnicalController extends BaseController
     @Autowired
     private ICmcTechnicalService cmcTechnicalService;
 
+    @Autowired
+    private ISysUserService userService;
+
     /**
      * 查询cmc技术方案列表
      */
@@ -53,6 +58,15 @@ public class CmcTechnicalController extends BaseController
     public void export(HttpServletResponse response, CmcTechnical cmcTechnical)
     {
         List<CmcTechnical> list = cmcTechnicalService.selectCmcTechnicalList(cmcTechnical);
+        for (CmcTechnical technical : list) {
+            String qualityInspector = technical.getQualityInspector();
+            StringBuilder qualityInspectorName = new StringBuilder();
+            if (qualityInspector != null && !qualityInspector.equals("") && qualityInspector.split(",").length > 0) {
+                for (String inspector : qualityInspector.split(","))
+                    qualityInspectorName.append(userService.selectUserById(Long.parseLong(inspector)).getNickName()).append("、");
+                technical.setQualityInspectorName(qualityInspectorName.substring(0, qualityInspectorName.length() - 1));
+            }
+        }
         ExcelUtil<CmcTechnical> util = new ExcelUtil<CmcTechnical>(CmcTechnical.class);
         util.exportExcel(response, list, "cmc技术方案数据");
     }

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

@@ -29,31 +29,33 @@ public class CmcArchive extends BaseEntity
     private String projectName;
     private CmcProject project;
 
-    /** 成果汇交日期 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "成果汇交日期", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date submitTime;
-
-    /** 备注说明 */
-    @Excel(name = "备注说明")
-    private String submitSituation;
+    /** 项目负责人 */
+    @Excel(name = "项目负责人")
+    private String leaderUserName;
+    private Long projectLeader;
 
     /** 生产部门检查员 */
     @Excel(name = "生产部门检查员")
+    private String produceUserName;
     private Long produceInspector;
 
     /** 质量检查员 */
     @Excel(name = "质量检查员")
+    private String qualityUserName;
     private Long qualityInspector;
 
     /** 技术部负责人 */
     @Excel(name = "技术部负责人")
+    private String deptUserName;
     private Long deptLeader;
 
-    /** 归档人 */
-    @Excel(name = "归档人")
+    /** 资料归档人 */
+    @Excel(name = "资料归档人")
+    private String archiveUserName;
     private Long archiver;
 
+    private SysUser leaderUser;
+
     private SysUser produceUser;
 
     private SysUser qualityUser;
@@ -62,6 +64,11 @@ public class CmcArchive extends BaseEntity
 
     private SysUser archiveUser;
 
+    /** 成果提交日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "成果提交日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date submitTime;
+
     /** 资料接收时间 */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "资料接收时间", width = 30, dateFormat = "yyyy-MM-dd")
@@ -87,6 +94,11 @@ public class CmcArchive extends BaseEntity
     @Excel(name = "归档时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date archiveTime;
 
+    /** 备注说明 */
+    @Excel(name = "备注说明")
+    private String submitSituation;
+
+
     /** 生产部门意见 */
     @Excel(name = "生产部门意见")
     private String produceComment;
@@ -150,6 +162,15 @@ public class CmcArchive extends BaseEntity
     {
         return submitSituation;
     }
+    public void setProjectLeader(Long projectLeader)
+    {
+        this.projectLeader = projectLeader;
+    }
+
+    public Long getProjectLeader()
+    {
+        return projectLeader;
+    }
     public void setProduceInspector(Long produceInspector) 
     {
         this.produceInspector = produceInspector;
@@ -267,9 +288,20 @@ public class CmcArchive extends BaseEntity
     {
         return archiveComment;
     }
+    public void setLeaderUser(SysUser leaderUser)
+    {
+        this.leaderUser = leaderUser;
+        this.leaderUserName = leaderUser == null ? "" : leaderUser.getNickName();
+    }
+
+    public SysUser getLeaderUser()
+    {
+        return leaderUser;
+    }
     public void setProduceUser(SysUser produceUser)
     {
         this.produceUser = produceUser;
+        this.produceUserName = produceUser == null ? "" : produceUser.getNickName();
     }
 
     public SysUser getProduceUser()
@@ -279,6 +311,7 @@ public class CmcArchive extends BaseEntity
     public void setQualityUser(SysUser qualityUser)
     {
         this.qualityUser = qualityUser;
+        this.qualityUserName = qualityUser == null ? "" : qualityUser.getNickName();
     }
 
     public SysUser getQualityUser()
@@ -288,6 +321,7 @@ public class CmcArchive extends BaseEntity
     public void setDeptUser(SysUser deptUser)
     {
         this.deptUser = deptUser;
+        this.deptUserName = deptUser == null ? "" : deptUser.getNickName();
     }
 
     public SysUser getDeptUser()
@@ -297,6 +331,7 @@ public class CmcArchive extends BaseEntity
     public void setArchiveUser(SysUser archiveUser)
     {
         this.archiveUser = archiveUser;
+        this.archiveUserName = archiveUser == null ? "" : archiveUser.getNickName();
     }
 
     public SysUser getArchiveUser()

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

@@ -22,18 +22,24 @@ public class CmcSafe extends BaseEntity
     private String safeId;
 
     /** 项目id */
-    @Excel(name = "项目id")
     private String projectId;
+    @Excel(name = "项目编号")
+    private String projectNumber;
+    @Excel(name = "项目名称")
+    private String projectName;
+    private CmcProject project;
 
     /** 接受交底人 */
-    @Excel(name = "接受交底人")
     private Long disclosureAccepter;
+    @Excel(name = "接受交底人")
+    private String acceptUserName;
 
-    private SysUser disclosureAccepterUser;
+    private SysUser accepterUser;
 
     /** 安全交底人 */
-    @Excel(name = "安全交底人")
     private Long disclosurer;
+    @Excel(name = "安全交底人")
+    private String disclosurerUserName;
 
     private SysUser disclosurerUser;
 
@@ -81,23 +87,35 @@ public class CmcSafe extends BaseEntity
     {
         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 setDisclosureAccepter(Long disclosureAccepter) 
     {
         this.disclosureAccepter = disclosureAccepter;
     }
 
-    public Long getDisclosureAccepter() 
+    public Long getDisclosureAccepter()
     {
         return disclosureAccepter;
     }
-    public void setDisclosureAccepterUser(SysUser disclosureAccepterUser)
+    public void setAccepterUser(SysUser accepterUser)
     {
-        this.disclosureAccepterUser = disclosureAccepterUser;
+        this.accepterUser = accepterUser;
+        this.acceptUserName = accepterUser == null ? "" : accepterUser.getNickName();
     }
 
-    public SysUser getDisclosureAccepterUser()
+    public SysUser getAccepterUser()
     {
-        return disclosureAccepterUser;
+        return accepterUser;
     }
     public void setDisclosurer(Long disclosurer) 
     {
@@ -112,6 +130,7 @@ public class CmcSafe extends BaseEntity
     public void setDisclosurerUser(SysUser disclosurerUser)
     {
         this.disclosurerUser = disclosurerUser;
+        this.disclosurerUserName = disclosurerUser == null ? "" : disclosurerUser.getNickName();
     }
 
     public SysUser getDisclosurerUser()

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

@@ -30,35 +30,38 @@ public class CmcTechnical extends BaseEntity
     private CmcProject project;
 
     /** 技术负责人 */
-    @Excel(name = "技术负责人")
     private Long technicalDirector;
 
     /** 技术设计人 */
-    @Excel(name = "技术设计人")
     private Long technicalDesigner;
 
     /** 技术安排人 */
-    @Excel(name = "技术安排人")
     private Long technicalPlanner;
 
+    /** 质量检查员 */
+    private String qualityInspector;
+
+    /** 总工审批人 */
+    private Long managerUserId;
+
+    @Excel(name = "技术负责人")
+    private String directUserName;
+    private SysUser directUser;
+
+    @Excel(name = "技术安排人")
+    private String planUserName;
     private SysUser planUser;
 
+    @Excel(name = "技术设计人")
+    private String designUserName;
     private SysUser designUser;
 
+    @Excel(name = "总工程师")
+    private String managerUserName;
     private SysUser managerUser;
 
-    /** 技术安排意见 */
-    @Excel(name = "技术安排意见")
-    private String planComment;
-
-    /** 质量检查员 */
     @Excel(name = "质量检查员")
-    private String qualityInspector;
-
-    /** 技术安排时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "技术安排时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date technicalTime;
+    private String qualityInspectorName;
 
     /** 技术方案 */
     @Excel(name = "技术方案")
@@ -76,18 +79,23 @@ public class CmcTechnical extends BaseEntity
     @Excel(name = "方案说明")
     private String designDescription;
 
+    /** 技术安排意见 */
+    @Excel(name = "技术安排意见")
+    private String planComment;
+
     /** 技术审核意见 */
     @Excel(name = "技术审核意见")
     private String technicalComment;
 
-    /** 总工审批人 */
-    @Excel(name = "总工审批人")
-    private Long managerUserId;
-
     /** 总工审核意见 */
     @Excel(name = "总工审核意见")
     private String manageComment;
 
+    /** 技术安排时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "技术安排时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date technicalTime;
+
     /** 方案上传时间 */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "方案上传时间", width = 30, dateFormat = "yyyy-MM-dd")
@@ -159,9 +167,22 @@ public class CmcTechnical extends BaseEntity
     {
         return technicalPlanner;
     }
+    public void setDirectUser(SysUser directUser)
+    {
+        this.directUser = directUser;
+        this.designUserName = directUser == null ? "" : directUser.getNickName();
+
+    }
+
+    public SysUser getDirectUser()
+    {
+        return directUser;
+    }
     public void setPlanUser(SysUser planUser)
     {
         this.planUser = planUser;
+        this.planUserName = planUser == null ? "" : planUser.getNickName();
+
     }
 
     public SysUser getPlanUser()
@@ -171,6 +192,7 @@ public class CmcTechnical extends BaseEntity
     public void setDesignUser(SysUser designUser)
     {
         this.designUser = designUser;
+        this.designUserName = designUser == null ? "" : designUser.getNickName();
     }
 
     public SysUser getDesignUser()
@@ -180,6 +202,7 @@ public class CmcTechnical extends BaseEntity
     public void setManagerUser(SysUser managerUser)
     {
         this.managerUser = managerUser;
+        this.managerUserName = managerUser == null ? "" : managerUser.getNickName();
     }
 
     public SysUser getManagerUser()
@@ -204,6 +227,15 @@ public class CmcTechnical extends BaseEntity
     {
         return qualityInspector;
     }
+    public void setQualityInspectorName(String qualityInspectorName)
+    {
+        this.qualityInspectorName = qualityInspectorName;
+    }
+
+    public String getQualityInspectorName()
+    {
+        return qualityInspectorName;
+    }
     public void setTechnicalTime(Date technicalTime)
     {
         this.technicalTime = technicalTime;

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

@@ -7,6 +7,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <resultMap type="CmcArchive" id="CmcArchiveResult">
         <result property="archiveId"    column="archive_id"    />
         <result property="projectId"    column="project_id"    />
+        <result property="projectLeader"    column="project_leader"    />
         <result property="submitTime"    column="submit_time"    />
         <result property="submitSituation"    column="submit_situation"    />
         <result property="produceInspector"    column="produce_inspector"    />
@@ -26,6 +27,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <association property="qualityUser"    javaType="SysUser"         resultMap="QualityUserResult" />
         <association property="deptUser"    javaType="SysUser"         resultMap="DeptUserResult" />
         <association property="archiveUser"    javaType="SysUser"         resultMap="ArchiveUserResult" />
+        <association property="leaderUser"    javaType="SysUser"         resultMap="LeaderUserResult" />
     </resultMap>
 
     <resultMap type="SysUser" id="ProduceUserResult">
@@ -48,20 +50,27 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="nickName"    column="archive_nick_name"    />
     </resultMap>
 
+    <resultMap type="SysUser" id="LeaderUserResult">
+        <result property="userId"    column="user_id"    />
+        <result property="nickName"    column="leader_nick_name"    />
+    </resultMap>
+
     <sql id="selectCmcArchiveVo">
-        select a.archive_id, a.project_id, a.submit_time, a.submit_situation, a.produce_inspector, u.nick_name as produce_nick_name, a.quality_inspector, u1.nick_name as quality_nick_name,
+        select a.archive_id, a.project_id, a.project_leader, a.submit_time, a.submit_situation, a.produce_inspector, u.nick_name as produce_nick_name, a.quality_inspector, u1.nick_name as quality_nick_name,
                a.dept_leader, u2.nick_name as dept_nick_name, a.archiver, u3.nick_name as archive_nick_name, a.receive_time, a.quality_time, a.produce_time, a.dept_time, a.archive_time,
                a.produce_comment, a.quality_comment, a.dept_comment, a.archive_comment from cmc_archive as a
         left join sys_user as u on u.user_id = a.produce_inspector
         left join sys_user as u1 on u1.user_id = a.quality_inspector
         left join sys_user as u2 on u2.user_id = a.dept_leader
         left join sys_user as u3 on u3.user_id = a.archiver
+        left join sys_user as u4 on u4.user_id = a.project_leader
     </sql>
 
     <select id="selectCmcArchiveList" parameterType="CmcArchive" resultMap="CmcArchiveResult">
         <include refid="selectCmcArchiveVo"/>
         <where>  
             <if test="projectId != null  and projectId != ''"> and a.project_id = #{projectId}</if>
+            <if test="projectLeader != null  and projectLeader != ''"> and a.project_leader = #{projectLeader}</if>
             <if test="submitTime != null "> and a.submit_time = #{submitTime}</if>
             <if test="submitSituation != null  and submitSituation != ''"> and a.submit_situation = #{submitSituation}</if>
             <if test="produceInspector != null "> and a.produce_inspector = #{produceInspector}</if>
@@ -90,6 +99,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="archiveId != null">archive_id,</if>
             <if test="projectId != null">project_id,</if>
+            <if test="projectLeader != null">project_leader,</if>
             <if test="submitTime != null">submit_time,</if>
             <if test="submitSituation != null">submit_situation,</if>
             <if test="produceInspector != null">produce_inspector,</if>
@@ -109,6 +119,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="archiveId != null">#{archiveId},</if>
             <if test="projectId != null">#{projectId},</if>
+            <if test="projectLeader != null">#{projectLeader},</if>
             <if test="submitTime != null">#{submitTime},</if>
             <if test="submitSituation != null">#{submitSituation},</if>
             <if test="produceInspector != null">#{produceInspector},</if>
@@ -131,6 +142,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         update cmc_archive
         <trim prefix="SET" suffixOverrides=",">
             <if test="projectId != null">project_id = #{projectId},</if>
+            <if test="projectLeader != null">project_leader = #{projectLeader},</if>
             <if test="submitTime != null">submit_time = #{submitTime},</if>
             <if test="submitSituation != null">submit_situation = #{submitSituation},</if>
             <if test="produceInspector != null">produce_inspector = #{produceInspector},</if>

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

@@ -15,11 +15,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="disclosureComment"    column="disclosure_comment"    />
         <result property="disclosureTime"    column="disclosure_time"    />
         <result property="acceptTime"    column="accept_time"    />
-        <association property="disclosureAccepterUser"    javaType="SysUser"         resultMap="DisclosureAccepterUserResult" />
+        <association property="accepterUser"    javaType="SysUser"         resultMap="AccepterUserResult" />
         <association property="disclosurerUser"    javaType="SysUser"         resultMap="DisclosurerUserResult" />
+        <association property="project"    javaType="CmcProject"         resultMap="CmcProjectResult" />
     </resultMap>
 
-    <resultMap type="SysUser" id="DisclosureAccepterUserResult">
+    <resultMap type="SysUser" id="AccepterUserResult">
         <result property="userId"    column="user_id"    />
         <result property="nickName"    column="accepter_nick_name"    />
     </resultMap>
@@ -29,10 +30,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="nickName"    column="disclosurer_nick_name"    />
     </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>
+
     <sql id="selectCmcSafeVo">
-        select s.safe_id, s.project_id, s.disclosure_accepter, u.nick_name as accepter_nick_name, s.disclosurer, u1.nick_name as disclosurer_nick_name, s.environment_comment, s.outside_comment, s.inside_comment, s.disclosure_comment, s.disclosure_time, s.accept_time from cmc_safe as s
+        select s.safe_id, s.project_id, p.project_number, p.project_name, s.disclosure_accepter, u.nick_name as accepter_nick_name, s.disclosurer, u1.nick_name as disclosurer_nick_name, s.environment_comment, s.outside_comment, s.inside_comment, s.disclosure_comment, s.disclosure_time, s.accept_time from cmc_safe as s
         left join sys_user as u on u.user_id = s.disclosure_accepter
         left join sys_user as u1 on u1.user_id = s.disclosurer
+        left join cmc_project as p on p.project_id = s.project_id
     </sql>
 
     <select id="selectCmcSafeList" parameterType="CmcSafe" resultMap="CmcSafeResult">

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

@@ -22,12 +22,18 @@
         <result property="technicalUploadTime"    column="technical_upload_time"    />
         <result property="techApprovalTime"    column="tech_approval_time"    />
         <result property="manageApprovalTime"    column="manage_approval_time"    />
+        <association property="directUser"    javaType="SysUser"         resultMap="DirectUserResult" />
         <association property="planUser"    javaType="SysUser"         resultMap="PlanUserResult" />
         <association property="designUser"    javaType="SysUser"         resultMap="DesignUserResult" />
         <association property="managerUser"    javaType="SysUser"         resultMap="ManagerUserResult" />
         <association property="project"    javaType="CmcProject"         resultMap="CmcProjectResult" />
     </resultMap>
 
+    <resultMap type="SysUser" id="DirectUserResult">
+        <result property="userId"    column="user_id"    />
+        <result property="nickName"    column="direct_nick_name"    />
+    </resultMap>
+
     <resultMap type="SysUser" id="PlanUserResult">
         <result property="userId"    column="user_id"    />
         <result property="nickName"    column="plan_nick_name"    />
@@ -50,14 +56,14 @@
     </resultMap>
 
     <sql id="selectCmcTechnicalVo">
-        select t.technical_id, t.project_id, p.project_number, p.project_name, t.technical_director, t.technical_designer, u.nick_name as design_nick_name, t.technical_planner, u1.nick_name as plan_nick_name,
-               t.plan_comment, t.quality_inspector, t.technical_time, t.technical_document, t.modify_document, t.final_document, t.design_description, t.technical_comment,
-               t.manager_user_id, u2.nick_name as manager_nick_name,
-               t.manage_comment, t.technical_upload_time, t.tech_approval_time, t.manage_approval_time from cmc_technical as t
-         left join sys_user as u on u.user_id = t.technical_designer
-         left join sys_user as u1 on u1.user_id = t.technical_planner
-         left join sys_user as u2 on u2.user_id = t.manager_user_id
-         left join cmc_project as p on p.project_id = t.project_id
+        select t.technical_id, t.project_id, p.project_number, p.project_name, t.technical_director, u.nick_name as direct_nick_name, t.technical_designer, u1.nick_name as design_nick_name,
+               t.technical_planner, u2.nick_name as plan_nick_name, t.plan_comment, t.quality_inspector, t.technical_time, t.technical_document, t.modify_document, t.final_document,
+               t.design_description, t.technical_comment, t.manager_user_id, u3.nick_name as manager_nick_name, t.manage_comment, t.technical_upload_time, t.tech_approval_time, t.manage_approval_time from cmc_technical as t
+        left join sys_user as u on u.user_id = t.technical_director
+        left join sys_user as u1 on u1.user_id = t.technical_designer
+        left join sys_user as u2 on u2.user_id = t.technical_planner
+        left join sys_user as u3 on u3.user_id = t.manager_user_id
+        left join cmc_project as p on p.project_id = t.project_id
     </sql>
 
     <select id="selectCmcTechnicalList" parameterType="CmcTechnical" resultMap="CmcTechnicalResult">

oa-back/sql/sql.sql

@@ -10064,7 +10064,8 @@ drop table if exists `cmc_archive`;
 create table `cmc_archive`  (
   `archive_id` 				char(19)  		not null 	comment '成果归档id',
   `project_id` 				char(19)  		default null comment '项目id',
-  `submit_time` 			date			default null comment '成果汇交日期',
+  `project_leader` 			bigint  		default null comment '项目负责人',
+  `submit_time` 			date			default null comment '成果提交日期',
   `submit_situation` 		varchar(255)	default null comment '备注说明',
   `produce_inspector` 		bigint			default null comment '生产部门检查员',
   `quality_inspector` 		bigint			default null comment '质量检查员',

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

@@ -1,8 +1,13 @@
 <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="项目id" prop="projectId">
-        <el-input v-model="queryParams.projectId" placeholder="请输入项目id" clearable @keyup.enter.native="handleQuery" />
+      <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="archiver">
         <el-select v-model="queryParams.archiver" filterable clearable @change="handleQuery">
@@ -11,9 +16,9 @@
           </el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="成果汇交日期" prop="submitTime" label-width="128px">
+      <el-form-item label="成果提交日期" prop="submitTime" label-width="128px">
         <el-date-picker clearable v-model="queryParams.submitTime" type="date" value-format="yyyy-MM-dd"
-          placeholder="请选择成果汇交日期">
+          placeholder="请选择成果提交日期">
         </el-date-picker>
       </el-form-item>
       <el-form-item label="归档时间" prop="archiveTime">
@@ -28,18 +33,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:archive: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:archive: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:archive: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:archive:export']">导出</el-button>
@@ -49,17 +42,19 @@
 
     <el-table v-loading="loading" :data="archiveList" @selection-change="handleSelectionChange">
       <el-table-column type="index" label="序号" width="55" align="center" />
-      <el-table-column label="项目id" align="center" prop="projectId" />
-      <el-table-column label="成果汇交日期" align="center" prop="submitTime" width="180">
+      <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="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="submitSituation" />
-      <el-table-column label="生产部门检查员" align="center" prop="produceInspector" />
-      <el-table-column label="质量检查员" align="center" prop="qualityInspector" />
-      <el-table-column label="技术部负责人" align="center" prop="deptLeader" />
-      <el-table-column label="归档人" align="center" prop="archiver" />
+      <el-table-column label="项目负责人" align="center" prop="leaderUser.nickName" />
+      <el-table-column label="生产部门检查员" align="center" prop="produceUser.nickName" />
+      <el-table-column label="质量检查员" align="center" prop="qualityUser.nickName" />
+      <el-table-column label="技术部负责人" align="center" prop="deptUser.nickName" />
+      <el-table-column label="归档人" align="center" prop="archiverUser.nickName" />
       <el-table-column label="资料接收时间" align="center" prop="receiveTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.receiveTime, '{y}-{m}-{d}') }}</span>
@@ -91,10 +86,8 @@
       <el-table-column label="归档审核意见" align="center" prop="archiveComment" /> -->
       <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:archive:edit']">修改</el-button>
-          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
-            v-hasPermi="['oa:archive:remove']">删除</el-button>
+          <el-button size="mini" type="text" icon="el-icon-view" @click="handleView(scope.row)"
+            v-hasPermi="['oa:technical:view']">查看</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -108,9 +101,9 @@
         <el-form-item label="项目id" prop="projectId">
           <el-input v-model="form.projectId" placeholder="请输入项目id" />
         </el-form-item>
-        <el-form-item label="成果汇交日期" prop="submitTime">
+        <el-form-item label="成果提交日期" prop="submitTime">
           <el-date-picker clearable v-model="form.submitTime" type="date" value-format="yyyy-MM-dd"
-            placeholder="请选择成果汇交日期">
+            placeholder="请选择成果提交日期">
           </el-date-picker>
         </el-form-item>
         <el-form-item label="备注说明" prop="submitSituation">
@@ -182,6 +175,7 @@
 
 <script>
 import { listArchive, getArchive, delArchive, addArchive, updateArchive } from "@/api/oa/archive/archive";
+import { listProject } from '@/api/oa/project/project';
 
 export default {
   name: "Archive",
@@ -201,6 +195,7 @@ export default {
       total: 0,
       // cmc成果归档表格数据
       archiveList: [],
+      projectList: [],
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -230,6 +225,9 @@ export default {
       },
       // 表单参数
       form: {},
+      taskForm: {
+        formId:''
+      },
       // 表单校验
       rules: {
       }
@@ -248,6 +246,15 @@ export default {
         this.loading = false;
       });
     },
+    remoteMethod(val) {
+      listProject({
+        pageNum: 1,
+        pageSize: 20, 
+        projectNumber: val
+      }).then(res => {
+        this.projectList = res.rows;
+      })
+    },
     // 取消按钮
     cancel() {
       this.open = false;
@@ -278,6 +285,10 @@ export default {
       };
       this.resetForm("form");
     },
+    handleView(row){
+      this.taskForm.formId = row.projectId;
+      this.infoOpen = true;
+    },
     /** 搜索按钮操作 */
     handleQuery() {
       this.queryParams.pageNum = 1;

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

@@ -384,7 +384,7 @@ export default {
       if (row == '3') {
         return 'primary'
       }
-      if (row == '3') {
+      if (row == '4') {
         return 'info'
       }
     }

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

@@ -213,7 +213,11 @@ export default {
       this.title = "添加合作单位";
     },
     handleView(row){
-
+      const partnerId = row.partnerId || this.ids
+      getPartner(partnerId).then(response => {
+        this.form = response.data;
+        this.open = true;
+      });
     },
     /** 修改按钮操作 */
     handleUpdate(row) {

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

@@ -1,8 +1,13 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="120px">
-      <el-form-item label="项目id" prop="projectId">
-        <el-input v-model="queryParams.projectId" placeholder="请输入项目id" clearable @keyup.enter.native="handleQuery" />
+      <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="disclosureAccepter">
         <el-select v-model="queryParams.disclosureAccepter" filterable clearable @change="handleQuery">
@@ -17,19 +22,7 @@
       </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:safe: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:safe: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:safe:remove']">删除</el-button>
-      </el-col>
+    <el-row :gutter="10" class="mb8">      
       <el-col :span="1.5">
         <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
           v-hasPermi="['oa:safe:export']">导出</el-button>
@@ -39,9 +32,10 @@
 
     <el-table v-loading="loading" :data="safeList" @selection-change="handleSelectionChange">
       <el-table-column type="index" label="序号" width="55" align="center" />
-      <el-table-column label="项目id" align="center" prop="projectId" />
-      <el-table-column label="接受交底人" align="center" prop="disclosureAccepter" />
-      <el-table-column label="安全交底人" align="center" prop="disclosurer" />
+      <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="accepterUser.nickName" />
+      <el-table-column label="安全交底人" align="center" prop="disclosurerUser.nickName" />
       <!-- <el-table-column label="环境要求" align="center" prop="environmentComment" />
       <el-table-column label="外业要求" align="center" prop="outsideComment" />
       <el-table-column label="内业要求" align="center" prop="insideComment" /> -->
@@ -60,10 +54,6 @@
         <template slot-scope="scope">
           <el-button size="mini" type="text" icon="el-icon-view" @click="handleView(scope.row)"
             v-hasPermi="['oa:safe:view']">查看</el-button>
-          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
-            v-hasPermi="['oa:safe:edit']">修改</el-button>
-          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
-            v-hasPermi="['oa:safe:remove']">删除</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -111,14 +101,20 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
+    <el-dialog :title="title" :visible.sync="infoOpen" width="50%" append-to-body>
+      <safe-tab :taskForm="taskForm"></safe-tab>
+    </el-dialog>
   </div>
 </template>
 
 <script>
 import { listSafe, getSafe, delSafe, addSafe, updateSafe } from "@/api/oa/safe/safe";
+import { listProject } from '@/api/oa/project/project';
+import safeTab from '../../flowable/form/projectProcess/safeTab.vue';
 
 export default {
   name: "Safe",
+  components: { safeTab, },
   data() {
     return {
       // 遮罩层
@@ -135,10 +131,12 @@ export default {
       total: 0,
       // cmc安全交底表格数据
       safeList: [],
+      projectList: [],
       // 弹出层标题
       title: "",
       // 是否显示弹出层
       open: false,
+      infoOpen: false,
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -155,6 +153,9 @@ export default {
       },
       // 表单参数
       form: {},
+      taskForm: {
+        formId:''
+      },
       // 表单校验
       rules: {
       }
@@ -173,6 +174,15 @@ export default {
         this.loading = false;
       });
     },
+    remoteMethod(val) {
+      listProject({
+        pageNum: 1,
+        pageSize: 20, 
+        projectNumber: val
+      }).then(res => {
+        this.projectList = res.rows;
+      })
+    },
     // 取消按钮
     cancel() {
       this.open = false;
@@ -217,7 +227,8 @@ export default {
       this.title = "添加cmc安全交底";
     },
     handleView(row){
-      
+      this.taskForm.formId = row.projectId;
+      this.infoOpen = true;
     },
     /** 修改按钮操作 */
     handleUpdate(row) {

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

@@ -1,8 +1,13 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="128px">
-      <el-form-item label="项目id" prop="projectId">
-        <el-input v-model="queryParams.projectId" placeholder="请输入项目id" clearable @keyup.enter.native="handleQuery" />
+      <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="technicalDirector">
         <el-select v-model="queryParams.technicalDirector" filterable clearable @change="handleQuery">
@@ -85,8 +90,8 @@
         <template slot-scope="scope">
           <el-button size="mini" type="text" icon="el-icon-view" @click="handleView(scope.row)"
             v-hasPermi="['oa:technical:view']">查看</el-button>
-          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
-            v-hasPermi="['oa:technical:remove']">删除</el-button>
+          <!-- <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+            v-hasPermi="['oa:technical:remove']">删除</el-button> -->
         </template>
       </el-table-column>
     </el-table>
@@ -162,6 +167,7 @@
 <script>
 import { listTechnical, getTechnical, delTechnical, addTechnical, updateTechnical } from "@/api/oa/technical/technical";
 import technicalTab from '../../flowable/form/projectProcess/technicalTab.vue';
+import { listProject } from '@/api/oa/project/project';
 
 export default {
   name: "Technical",
@@ -182,6 +188,7 @@ export default {
       total: 0,
       // cmc技术交底表格数据
       technicalList: [],
+      projectList: [],
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -229,6 +236,15 @@ export default {
         this.loading = false;
       });
     },
+    remoteMethod(val) {
+      listProject({
+        pageNum: 1,
+        pageSize: 20, 
+        projectNumber: val
+      }).then(res => {
+        this.projectList = res.rows;
+      })
+    },
     // 取消按钮
     cancel() {
       this.open = false;