修改项目流转、技术方案、技术交底流程

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

@@ -42,7 +42,7 @@ public class CmcTechnical extends BaseEntity
 
     /** 安全交底人 */
     @Excel(name = "安全交底人")
-    private String disclosurerUserName;
+    private String disclosureUserName;
     private Long disclosurer;
 
     /** 技术交底时间 */
@@ -57,16 +57,32 @@ public class CmcTechnical extends BaseEntity
     /** 接受交底人 */
     @Excel(name = "接受交底人")
     private String acceptUserName;
-    private Long disclosureAccepter;
+    private Long accepter;
 
     /** 接受交底时间 */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "接受交底时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date acceptTime;
 
-    private SysUser disclosurerUser;
+    /** 确认交底意见 */
+    @Excel(name = "确认交底意见")
+    private String confirmComment;
 
-    private SysUser accepterUser;
+    /** 接受交底人 */
+    @Excel(name = "确认交底人")
+    private String confirmUserName;
+    private Long confirmer;
+
+    /** 确认交底时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "确认交底时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date confirmTime;
+
+    private SysUser disclosureUser;
+
+    private SysUser acceptUser;
+
+    private SysUser confirmUser;
 
     private CmcProject project;
 
@@ -99,24 +115,24 @@ public class CmcTechnical extends BaseEntity
     {
         return project;
     }
-    public void setDisclosureAccepter(Long disclosureAccepter) 
+    public void setAccepter(Long accepter)
     {
-        this.disclosureAccepter = disclosureAccepter;
+        this.accepter = accepter;
     }
 
-    public Long getDisclosureAccepter() 
+    public Long getAccepter()
     {
-        return disclosureAccepter;
+        return accepter;
     }
-    public void setAccepterUser(SysUser accepterUser)
+    public void setAcceptUser(SysUser acceptUser)
     {
-        this.accepterUser = accepterUser;
-        this.acceptUserName = accepterUser == null ? "" : accepterUser.getNickName();
+        this.acceptUser = acceptUser;
+        this.acceptUserName = acceptUser == null ? "" : acceptUser.getNickName();
     }
 
-    public SysUser getAccepterUser()
+    public SysUser getAcceptUser()
     {
-        return accepterUser;
+        return acceptUser;
     }
     public void setDisclosurer(Long disclosurer)
     {
@@ -127,16 +143,35 @@ public class CmcTechnical extends BaseEntity
     {
         return disclosurer;
     }
+    public void setConfirmer(Long confirmer)
+    {
+        this.confirmer = confirmer;
+    }
+
+    public Long getConfirmer()
+    {
+        return confirmer;
+    }
+
+    public void setDisclosureUser(SysUser disclosureUser)
+    {
+        this.disclosureUser = disclosureUser;
+        this.disclosureUserName = disclosureUser == null ? "" : disclosureUser.getNickName();
+    }
 
-    public void setDisclosurerUser(SysUser disclosurerUser)
+    public SysUser getDisclosureUser()
+    {
+        return disclosureUser;
+    }
+    public void setConfirmUser(SysUser confirmUser)
     {
-        this.disclosurerUser = disclosurerUser;
-        this.disclosurerUserName = disclosurerUser == null ? "" : disclosurerUser.getNickName();
+        this.confirmUser = confirmUser;
+        this.confirmUserName = confirmUser == null ? "" : confirmUser.getNickName();
     }
 
-    public SysUser getDisclosurerUser()
+    public SysUser getConfirmUser()
     {
-        return disclosurerUser;
+        return confirmUser;
     }
     public void setContent(String content) 
     {
@@ -174,6 +209,15 @@ public class CmcTechnical extends BaseEntity
     {
         return acceptComment;
     }
+    public void setConfirmComment(String confirmComment)
+    {
+        this.confirmComment = confirmComment;
+    }
+
+    public String getConfirmComment()
+    {
+        return confirmComment;
+    }
     public void setDisclosureTime(Date disclosureTime) 
     {
         this.disclosureTime = disclosureTime;
@@ -192,13 +236,22 @@ public class CmcTechnical extends BaseEntity
     {
         return acceptTime;
     }
+    public void setConfirmTime(Date confirmTime)
+    {
+        this.confirmTime = confirmTime;
+    }
+
+    public Date getConfirmTime()
+    {
+        return confirmTime;
+    }
 
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
             .append("technicalId", getTechnicalId())
             .append("projectId", getProjectId())
-            .append("disclosureAccepter", getDisclosureAccepter())
+            .append("accepter", getAccepter())
             .append("disclosurer", getDisclosurer())
             .append("content", getContent())
             .append("document", getDocument())

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

@@ -80,6 +80,20 @@ public class CmcTechnicalPlan extends BaseEntity
     @Excel(name = "技术审核时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date techApprovalTime;
 
+    /** 技术质量与安全部审核意见 */
+    @Excel(name = "技术质量与安全部审核意见")
+    private String techDeptComment;
+
+    /** 技术质量与安全部审核人 */
+    @Excel(name = "技术质量与安全部审核人")
+    private String techDeptUserName;
+    private Long techDeptLeader;
+
+    /** 技术质量与安全部审核时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "技术质量与安全部审核时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date techDeptTime;
+
     /** 总工审核意见 */
     @Excel(name = "总工审核意见")
     private String manageComment;
@@ -109,6 +123,8 @@ public class CmcTechnicalPlan extends BaseEntity
 
     private SysUser designUser;
 
+    private SysUser techDeptUser;
+
     private SysUser managerUser;
 
     private CmcProject project;
@@ -183,6 +199,15 @@ public class CmcTechnicalPlan extends BaseEntity
     {
         return technicalAuditor;
     }
+    public void setTechDeptLeader(Long techDeptLeader)
+    {
+        this.techDeptLeader = techDeptLeader;
+    }
+
+    public Long getTechDeptLeader()
+    {
+        return techDeptLeader;
+    }
     public void setDirectUser(SysUser directUser)
     {
         this.directUser = directUser;
@@ -223,6 +248,16 @@ public class CmcTechnicalPlan extends BaseEntity
     {
         return auditUser;
     }
+    public void setTechDeptUser(SysUser techDeptUser)
+    {
+        this.techDeptUser = techDeptUser;
+        this.techDeptUserName = techDeptUser == null ? "" : techDeptUser.getNickName();
+    }
+
+    public SysUser getTechDeptUser()
+    {
+        return techDeptUser;
+    }
     public void setManagerUser(SysUser managerUser)
     {
         this.managerUser = managerUser;
@@ -314,6 +349,15 @@ public class CmcTechnicalPlan extends BaseEntity
     {
         return technicalComment;
     }
+    public void setTechDeptComment(String techDeptComment)
+    {
+        this.techDeptComment = techDeptComment;
+    }
+
+    public String getTechDeptComment()
+    {
+        return techDeptComment;
+    }
     public void setManagerUserId(Long managerUserId)
     {
         this.managerUserId = managerUserId;
@@ -359,6 +403,15 @@ public class CmcTechnicalPlan extends BaseEntity
     {
         return manageApprovalTime;
     }
+    public void setTechDeptTime(Date techDeptTime)
+    {
+        this.techDeptTime = techDeptTime;
+    }
+
+    public Date getTechDeptTime()
+    {
+        return techDeptTime;
+    }
 
     @Override
     public String toString() {

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

@@ -111,7 +111,7 @@
             <if test="exitTime != null "> and p.exit_time = #{exitTime}</if>
             <if test="participates != null  and participates != ''"> and find_in_set(#{participates}, p.participates)</if>
         </where>
-        order by p.register_time desc
+        order by p.register_time desc, p.project_number desc
     </select>
 
     <select id="selectCmcProjectByProjectId" parameterType="String" resultMap="CmcProjectResult">

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

@@ -7,27 +7,36 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <resultMap type="CmcTechnical" id="CmcTechnicalResult">
         <result property="technicalId"    column="technical_id"    />
         <result property="projectId"    column="project_id"    />
-        <result property="disclosureAccepter"    column="disclosure_accepter"    />
+        <result property="accepter"    column="accepter"    />
         <result property="disclosurer"    column="disclosurer"    />
+        <result property="confirmer"    column="confirmer"    />
         <result property="content"    column="content"    />
         <result property="document"    column="document"    />
         <result property="disclosureComment"    column="disclosure_comment"    />
         <result property="acceptComment"    column="accept_comment"    />
+        <result property="confirmComment"    column="confirm_comment"    />
         <result property="disclosureTime"    column="disclosure_time"    />
         <result property="acceptTime"    column="accept_time"    />
-        <association property="accepterUser"    javaType="SysUser"         resultMap="AccepterUserResult" />
-        <association property="disclosurerUser"    javaType="SysUser"         resultMap="DisclosurerUserResult" />
+        <result property="confirmTime"    column="confirm_time"    />
+        <association property="acceptUser"    javaType="SysUser"         resultMap="AcceptUserResult" />
+        <association property="disclosureUser"    javaType="SysUser"         resultMap="DisclosureUserResult" />
+        <association property="confirmUser"    javaType="SysUser"         resultMap="confirmUserResult" />
         <association property="project"    javaType="CmcProject"         resultMap="CmcProjectResult" />
     </resultMap>
 
-    <resultMap type="SysUser" id="AccepterUserResult">
+    <resultMap type="SysUser" id="AcceptUserResult">
         <result property="userId"    column="user_id"    />
-        <result property="nickName"    column="accepter_nick_name"    />
+        <result property="nickName"    column="accept_nick_name"    />
     </resultMap>
 
-    <resultMap type="SysUser" id="DisclosurerUserResult">
+    <resultMap type="SysUser" id="DisclosureUserResult">
         <result property="userId"    column="user_id"    />
-        <result property="nickName"    column="disclosurer_nick_name"    />
+        <result property="nickName"    column="disclosure_nick_name"    />
+    </resultMap>
+
+    <resultMap type="SysUser" id="ConfirmUserResult">
+        <result property="userId"    column="user_id"    />
+        <result property="nickName"    column="confirm_nick_name"    />
     </resultMap>
 
     <resultMap type="CmcProject" id="CmcProjectResult">
@@ -37,10 +46,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectCmcTechnicalVo">
-        select t.technical_id, t.project_id, p.project_number, p.project_name, t.disclosure_accepter, u.nick_name as accepter_nick_name, t.disclosurer, 
-        u1.nick_name as disclosurer_nick_name, t.content, t.document, t.disclosure_comment, t.accept_comment, t.disclosure_time, t.accept_time from cmc_technical as t
-        left join sys_user as u on u.user_id = t.disclosure_accepter
+        select t.technical_id, t.project_id, p.project_number, p.project_name, t.accepter, u.nick_name as accept_nick_name, t.disclosurer, u1.nick_name as disclosure_nick_name,
+               t.confirmer, u2.nick_name as confirm_nick_name, t.content, t.document, t.disclosure_comment, t.accept_comment, t.confirm_comment, t.disclosure_time, t.accept_time, t.confirm_time from cmc_technical as t
+        left join sys_user as u on u.user_id = t.accepter
         left join sys_user as u1 on u1.user_id = t.disclosurer
+        left join sys_user as u2 on u2.user_id = t.confirmer
         left join cmc_project as p on p.project_id = t.project_id
     </sql>
 
@@ -48,14 +58,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectCmcTechnicalVo"/>
         <where>  
             <if test="projectId != null  and projectId != ''"> and t.project_id = #{projectId}</if>
-            <if test="disclosureAccepter != null "> and t.disclosure_accepter = #{disclosureAccepter}</if>
+            <if test="accepter != null "> and t.accepter = #{accepter}</if>
             <if test="disclosurer != null "> and t.disclosurer = #{disclosurer}</if>
+            <if test="confirmer != null "> and t.confirmer = #{confirmer}</if>
             <if test="content != null  and content != ''"> and t.content = #{content}</if>
             <if test="document != null  and document != ''"> and t.document = #{document}</if>
             <if test="disclosureComment != null  and disclosureComment != ''"> and t.disclosure_comment = #{disclosureComment}</if>
             <if test="acceptComment != null  and acceptComment != ''"> and t.accept_comment = #{acceptComment}</if>
+            <if test="confirmComment != null  and confirmComment != ''"> and t.confirm_comment = #{confirmComment}</if>
             <if test="disclosureTime != null "> and t.disclosure_time = #{disclosureTime}</if>
             <if test="acceptTime != null "> and t.accept_time = #{acceptTime}</if>
+            <if test="confirmTime != null "> and t.confirm_time = #{confirmTime}</if>
         </where>
         order by t.disclosure_time desc
     </select>
@@ -70,7 +83,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="technicalId != null">technical_id,</if>
             <if test="projectId != null">project_id,</if>
-            <if test="disclosureAccepter != null">disclosure_accepter,</if>
+            <if test="accepter != null">accepter,</if>
             <if test="disclosurer != null">disclosurer,</if>
             <if test="content != null">content,</if>
             <if test="document != null">document,</if>
@@ -82,7 +95,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="technicalId != null">#{technicalId},</if>
             <if test="projectId != null">#{projectId},</if>
-            <if test="disclosureAccepter != null">#{disclosureAccepter},</if>
+            <if test="accepter != null">#{accepter},</if>
             <if test="disclosurer != null">#{disclosurer},</if>
             <if test="content != null">#{content},</if>
             <if test="document != null">#{document},</if>
@@ -97,14 +110,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         update cmc_technical
         <trim prefix="SET" suffixOverrides=",">
             <if test="projectId != null">project_id = #{projectId},</if>
-            <if test="disclosureAccepter != null">disclosure_accepter = #{disclosureAccepter},</if>
+            <if test="accepter != null">accepter = #{accepter},</if>
             <if test="disclosurer != null">disclosurer = #{disclosurer},</if>
+            <if test="confirmer != null">confirmer = #confirmer},</if>
             <if test="content != null">content = #{content},</if>
             <if test="document != null">document = #{document},</if>
             <if test="disclosureComment != null">disclosure_comment = #{disclosureComment},</if>
             <if test="acceptComment != null">accept_comment = #{acceptComment},</if>
+            <if test="confirmComment != null">confirm_comment = #{confirmComment},</if>
             <if test="disclosureTime != null">disclosure_time = #{disclosureTime},</if>
             <if test="acceptTime != null">accept_time = #{acceptTime},</if>
+            <if test="confirmTime != null">confirm_time = #{confirmTime},</if>
         </trim>
         where technical_id = #{technicalId}
     </update>

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

@@ -11,6 +11,7 @@
         <result property="technicalDesigner"    column="technical_designer"    />
         <result property="technicalPlanner"    column="technical_planner"    />
         <result property="technicalAuditor"    column="technical_auditor"    />
+        <result property="techDeptLeader"    column="tech_dept_leader"    />
         <result property="planComment"    column="plan_comment"    />
         <result property="qualityInspector"    column="quality_inspector"    />
         <result property="technicalTime"    column="technical_time"    />
@@ -20,13 +21,16 @@
         <result property="designDescription"    column="design_description"    />
         <result property="technicalComment"    column="technical_comment"    />
         <result property="manageComment"    column="manage_comment"    />
+        <result property="techDeptComment"    column="tech_dept_comment"    />
         <result property="technicalUploadTime"    column="technical_upload_time"    />
         <result property="techApprovalTime"    column="tech_approval_time"    />
         <result property="manageApprovalTime"    column="manage_approval_time"    />
+        <result property="techDeptTime"    column="tech_dept_time"    />
         <association property="directUser"    javaType="SysUser"         resultMap="DirectUserResult" />
         <association property="planUser"    javaType="SysUser"         resultMap="PlanUserResult" />
         <association property="designUser"    javaType="SysUser"         resultMap="DesignUserResult" />
         <association property="auditUser"    javaType="SysUser"         resultMap="AuditUserResult" />
+        <association property="techDeptUser"    javaType="SysUser"         resultMap="TechDeptLeaderResult" />
         <association property="managerUser"    javaType="SysUser"         resultMap="ManagerUserResult" />
         <association property="project"    javaType="CmcProject"         resultMap="CmcProjectResult" />
     </resultMap>
@@ -51,6 +55,11 @@
         <result property="nickName"    column="audit_nick_name"    />
     </resultMap>
 
+    <resultMap type="SysUser" id="TechDeptLeaderResult">
+        <result property="userId"    column="user_id"    />
+        <result property="nickName"    column="tech_nick_name"    />
+    </resultMap>
+
     <resultMap type="SysUser" id="ManagerUserResult">
         <result property="userId"    column="user_id"    />
         <result property="nickName"    column="manager_nick_name"    />
@@ -65,13 +74,14 @@
     <sql id="selectCmcTechnicalPlanVo">
         select t.technical_plan_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.technical_auditor, u3.nick_name as audit_nick_name, t.manager_user_id, u4.nick_name as manager_nick_name, t.manage_comment,
-               t.technical_upload_time, t.tech_approval_time, t.manage_approval_time from cmc_technical_plan as t
+               t.design_description, t.technical_comment, t.technical_auditor, u3.nick_name as audit_nick_name, t.tech_dept_leader, u4.nick_name as tech_nick_name, t.tech_dept_comment, t.manager_user_id,
+               u5.nick_name as manager_nick_name, t.manage_comment, t.technical_upload_time, t.tech_approval_time, t.tech_dept_time, t.manage_approval_time from cmc_technical_plan 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.technical_auditor
-        left join sys_user as u4 on u4.user_id = t.manager_user_id
+        left join sys_user as u4 on u4.user_id = t.tech_dept_leader
+        left join sys_user as u5 on u5.user_id = t.manager_user_id
         left join cmc_project as p on p.project_id = t.project_id
     </sql>
 
@@ -157,6 +167,7 @@
             <if test="technicalDesigner != null">technical_designer = #{technicalDesigner},</if>
             <if test="technicalPlanner != null">technical_planner = #{technicalPlanner},</if>
             <if test="technicalAuditor != null">technical_auditor = #{technicalAuditor},</if>
+            <if test="techDeptLeader != null">tech_dept_leader = #{techDeptLeader},</if>
             <if test="planComment != null">plan_comment = #{planComment},</if>
             <if test="qualityInspector != null">quality_inspector = #{qualityInspector},</if>
             <if test="technicalTime != null">technical_time = #{technicalTime},</if>
@@ -165,10 +176,12 @@
             <if test="finalDocument != null">final_document = #{finalDocument},</if>
             <if test="designDescription != null">design_description = #{designDescription},</if>
             <if test="technicalComment != null">technical_comment = #{technicalComment},</if>
+            <if test="techDeptComment != null">tech_dept_comment = #{techDeptComment},</if>
             <if test="managerUserId != null">manager_user_id = #{managerUserId},</if>
             <if test="manageComment != null">manage_comment = #{manageComment},</if>
             <if test="technicalUploadTime != null">technical_upload_time = #{technicalUploadTime},</if>
             <if test="techApprovalTime != null">tech_approval_time = #{techApprovalTime},</if>
+            <if test="techDeptTime != null">tech_dept_time = #{techDeptTime},</if>
             <if test="manageApprovalTime != null">manage_approval_time = #{manageApprovalTime},</if>
         </trim>
         where technical_plan_id = #{technicalPlanId}

oa-ui/src/views/flowable/form/components/chooseProject.vue

@@ -29,7 +29,7 @@
       <el-table-column label="项目名称" align="center" key="projectName" prop="projectName" :show-overflow-tooltip="true" />
       <el-table-column label="项目负责人" align="center" key="projectLeader" prop="projectLeaderUser.nickName"
         :show-overflow-tooltip="true" />
-      <el-table-column label="甲方单位" align="center" key="partyA" prop="partyA.partyName" :show-overflow-tooltip="true" />
+      <el-table-column label="甲方单位" align="center" key="partyA" prop="partyA.partyAName" :show-overflow-tooltip="true" />
       <el-table-column label="项目类型" align="center" key="projectType" prop="projectType" />
     </el-table>
     <div style="text-align: right;" class="mt20 mr20">

oa-ui/src/views/flowable/form/technicalForm.vue

@@ -20,8 +20,8 @@
               }}</el-descriptions-item>
             </el-descriptions>
           </el-form-item>
-          <el-form-item label="接受交底人" prop="disclosureAccepter">
-            <el-select v-model="form.disclosureAccepter" style="width:220px" :disabled="true">
+          <el-form-item label="接受交底人" prop="accepter">
+            <el-select v-model="form.accepter" style="width:220px" :disabled="true">
               <el-option v-for="item in userList" :key="item.userId" :label="item.nickName" :value="item.userId"
                 v-if="item.nickName != 'admin'">
               </el-option>
@@ -51,7 +51,7 @@
           <el-row>
             <el-col :span="6" :xs="24" :offset="12">
               <el-form-item label="签名" prop="disclosurer">
-                <span class="auditor"> {{ form.disclosurerUser ? form.disclosurerUser.nickName : disclosurerUser }}
+                <span class="auditor"> {{ form.disclosureUser ? form.disclosureUser.nickName : disclosureUser }}
                 </span>
               </el-form-item>
             </el-col>
@@ -68,7 +68,7 @@
           <el-row>
             <el-col :span="6" :xs="24" :offset="12">
               <el-form-item label="签名" v-if="taskName != '技术交底'">
-                <span class="auditor"> {{ form.accepterUser ? form.accepterUser.nickName : accepterUser }} </span>
+                <span class="auditor"> {{ form.acceptUser ? form.acceptUser.nickName : acceptUser }} </span>
               </el-form-item>
             </el-col>
             <el-col :span="6">
@@ -77,6 +77,23 @@
               </el-form-item>
             </el-col>
           </el-row>
+          
+          <el-form-item label="确认交底意见" prop="confirmComment" v-if="taskName != '技术交底' && taskName != '接受交底'">
+            <el-input v-model="form.confirmComment" placeholder="请输入确认交底意见" type="textarea" :autosize="{ minRows: 4 }"
+              :disabled="taskName == ''" />
+          </el-form-item>
+          <el-row>
+            <el-col :span="6" :xs="24" :offset="12">
+              <el-form-item label="签名" v-if="taskName != '技术交底' && taskName != '接受交底'">
+                <span class="auditor"> {{ form.confirmUser ? form.confirmUser.nickName : confirmUser }} </span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="日期：" label-width="120px" v-if="taskName != '技术交底' && taskName != '接受交底'">
+                <span> {{ parseTime(form.confirmTime, '{y}-{m}-{d}') }} </span>
+              </el-form-item>
+            </el-col>
+          </el-row>
         </el-form>
         <div style="text-align: center;" v-if="taskName">
           <el-button type="primary" @click="submitForm">提 交</el-button>
@@ -120,8 +137,9 @@ export default {
   data() {
     return {
       baseUrl: process.env.VUE_APP_BASE_API,
-      disclosurerUser: '',
-      accepterUser: '',
+      disclosureUser: '',
+      acceptUser: '',
+      confirmUser: '',
       // 遮罩层
       loading: true,
       // 选中数组
@@ -145,8 +163,9 @@ export default {
         pageNum: 1,
         pageSize: 10,
         projectId: null,
-        disclosureAccepter: null,
+        accepter: null,
         disclosurer: null,
+        confirmer: null,
         content: null,
         document: null,
         disclosureComment: null,
@@ -196,19 +215,26 @@ export default {
           ],
         }
       }
+      else if (this.taskName == '确认交底') {
+        this.rules = {
+          confirmComment: [
+            { required: true, message: '请输入确认交底意见', trigger: 'blur' },
+          ],
+        }
+      }
     },
     initForm() {
       getTechnical(this.taskForm.formId).then(res => {
         if (this.isEmptyObject(res.data)) {
           this.formTotal = 0;
           this.form.disclosurer = this.$store.getters.userId;
-          this.disclosurerUser = this.$store.getters.name;
+          this.disclosureUser = this.$store.getters.name;
           this.form.disclosureTime = new Date();
         }
         else {
           this.formTotal = 1;
           this.form = res.data;
-          this.accepterUser = this.$store.getters.name;
+          this.acceptUser = this.$store.getters.name;
           this.form.acceptTime = new Date();
         }
       })
@@ -218,7 +244,7 @@ export default {
       getProject(this.taskForm.formId).then(response => {
         this.chooseProject = response.data;
         this.isSelect = true;
-        this.form.disclosureAccepter = response.data.projectLeader;
+        this.form.accepter = response.data.projectLeader;
       });
     },
     // 查询用户列表
@@ -254,7 +280,7 @@ export default {
       this.form = {
         technicalId: null,
         projectId: null,
-        disclosureAccepter: null,
+        accepter: null,
         disclosurer: null,
         content: null,
         document: null,
@@ -309,7 +335,7 @@ export default {
             const params = { taskId: this.taskForm.taskId };
             getNextFlowNode(params).then(res => {
               if (this.taskName == '技术交底')                
-                this.$set(this.taskForm.variables, "approval", this.form.disclosureAccepter);
+                this.$set(this.taskForm.variables, "approval", this.form.accepter);
               complete(this.taskForm).then(response => {
                 this.$modal.msgSuccess(response.msg);
                 this.$emit('goBack')
@@ -326,7 +352,7 @@ export default {
             const params = { taskId: this.taskForm.taskId };
             getNextFlowNode(params).then(res => {
               this.$set(this.taskForm.variables, "formId", this.taskForm.formId);
-              this.$set(this.taskForm.variables, "approval", this.form.disclosureAccepter);
+              this.$set(this.taskForm.variables, "approval", this.form.accepter);
               complete(this.taskForm).then(response => {
                 this.$modal.msgSuccess(response.msg);
                 this.$emit('goBack')

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

@@ -492,7 +492,7 @@ export default {
       },
       // 表单参数
       expenseForm: {
-        userId: 18,
+        userId: 17,
       },
       handoverForm: {},
       scrapForm: {},
@@ -832,7 +832,7 @@ export default {
       if (val == '1') {
         this.expenseName = '设备/维修保养费'
       }
-      if (val == '2') {
+      if (val == '3') {
         this.expenseName = '设备/检定费'
       }
     },
@@ -843,7 +843,7 @@ export default {
       if (row == '1') {
         return '维修/保养费'
       }
-      if (row == '2') {
+      if (row == '3') {
         return '检定费'
       }
     },
@@ -854,7 +854,7 @@ export default {
       if (row == '1') {
         return 'warning'
       }
-      if (row == '2') {
+      if (row == '3') {
         return 'success'
       }
     },