技术交底、人员部门更新、领导分管

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

@@ -0,0 +1,97 @@
+package com.ruoyi.web.controller.oa;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.oa.domain.CmcManageDept;
+import com.ruoyi.oa.service.ICmcManageDeptService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * cmc领导分管Controller
+ * 
+ * @author cmc
+ * @date 2024-07-04
+ */
+@RestController
+@RequestMapping("/oa/manageDept")
+public class CmcManageDeptController extends BaseController
+{
+    @Autowired
+    private ICmcManageDeptService cmcManageDeptService;
+
+    /**
+     * 查询cmc领导分管列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo list(CmcManageDept cmcManageDept)
+    {
+        startPage();
+        List<CmcManageDept> list = cmcManageDeptService.selectCmcManageDeptList(cmcManageDept);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出cmc领导分管列表
+     */
+    @Log(title = "cmc领导分管", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, CmcManageDept cmcManageDept)
+    {
+        List<CmcManageDept> list = cmcManageDeptService.selectCmcManageDeptList(cmcManageDept);
+        ExcelUtil<CmcManageDept> util = new ExcelUtil<CmcManageDept>(CmcManageDept.class);
+        util.exportExcel(response, list, "cmc领导分管数据");
+    }
+
+    /**
+     * 获取cmc领导分管详细信息
+     */
+    @GetMapping(value = "/{userId}")
+    public AjaxResult getInfo(@PathVariable("userId") Long userId)
+    {
+        return success(cmcManageDeptService.selectCmcManageDeptByUserId(userId));
+    }
+
+    /**
+     * 新增cmc领导分管
+     */
+    @Log(title = "cmc领导分管", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody CmcManageDept cmcManageDept)
+    {
+        return toAjax(cmcManageDeptService.insertCmcManageDept(cmcManageDept));
+    }
+
+    /**
+     * 修改cmc领导分管
+     */
+    @Log(title = "cmc领导分管", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody CmcManageDept cmcManageDept)
+    {
+        return toAjax(cmcManageDeptService.updateCmcManageDept(cmcManageDept));
+    }
+
+    /**
+     * 删除cmc领导分管
+     */
+    @Log(title = "cmc领导分管", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{userIds}")
+    public AjaxResult remove(@PathVariable Long[] userIds)
+    {
+        return toAjax(cmcManageDeptService.deleteCmcManageDeptByUserIds(userIds));
+    }
+}

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

@@ -0,0 +1,97 @@
+package com.ruoyi.web.controller.oa;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.oa.domain.CmcTechnical;
+import com.ruoyi.oa.service.ICmcTechnicalService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * cmc技术交底Controller
+ * 
+ * @author cmc
+ * @date 2024-07-04
+ */
+@RestController
+@RequestMapping("/oa/technical")
+public class CmcTechnicalController extends BaseController
+{
+    @Autowired
+    private ICmcTechnicalService cmcTechnicalService;
+
+    /**
+     * 查询cmc技术交底列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo list(CmcTechnical cmcTechnical)
+    {
+        startPage();
+        List<CmcTechnical> list = cmcTechnicalService.selectCmcTechnicalList(cmcTechnical);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出cmc技术交底列表
+     */
+    @Log(title = "cmc技术交底", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, CmcTechnical cmcTechnical)
+    {
+        List<CmcTechnical> list = cmcTechnicalService.selectCmcTechnicalList(cmcTechnical);
+        ExcelUtil<CmcTechnical> util = new ExcelUtil<CmcTechnical>(CmcTechnical.class);
+        util.exportExcel(response, list, "cmc技术交底数据");
+    }
+
+    /**
+     * 获取cmc技术交底详细信息
+     */
+    @GetMapping(value = "/{technicalId}")
+    public AjaxResult getInfo(@PathVariable("technicalId") String technicalId)
+    {
+        return success(cmcTechnicalService.selectCmcTechnicalByTechnicalId(technicalId));
+    }
+
+    /**
+     * 新增cmc技术交底
+     */
+    @Log(title = "cmc技术交底", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody CmcTechnical cmcTechnical)
+    {
+        return toAjax(cmcTechnicalService.insertCmcTechnical(cmcTechnical));
+    }
+
+    /**
+     * 修改cmc技术交底
+     */
+    @Log(title = "cmc技术交底", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody CmcTechnical cmcTechnical)
+    {
+        return toAjax(cmcTechnicalService.updateCmcTechnical(cmcTechnical));
+    }
+
+    /**
+     * 删除cmc技术交底
+     */
+    @Log(title = "cmc技术交底", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{technicalIds}")
+    public AjaxResult remove(@PathVariable String[] technicalIds)
+    {
+        return toAjax(cmcTechnicalService.deleteCmcTechnicalByTechnicalIds(technicalIds));
+    }
+}

oa-back/ruoyi-flowable/src/main/java/com/ruoyi/flowable/oa/CallPlanActivityExecutionListener.java

@@ -0,0 +1,18 @@
+package com.ruoyi.flowable.oa;
+
+import com.ruoyi.common.utils.spring.SpringUtils;
+import com.ruoyi.system.mapper.SysUserPostMapper;
+import org.flowable.common.engine.impl.identity.Authentication;
+import org.flowable.engine.delegate.DelegateExecution;
+import org.flowable.engine.delegate.ExecutionListener;
+import org.springframework.stereotype.Component;
+
+@Component("CallPlanActivityExecutionListener")
+public class CallPlanActivityExecutionListener implements ExecutionListener {
+    @Override
+    public void notify(DelegateExecution delegateExecution) {
+        SysUserPostMapper userPostMapper = SpringUtils.getBean(SysUserPostMapper.class);
+        Authentication.setAuthenticatedUserId(userPostMapper.selectDeptLeaderByDeptId("110").getUserId().toString());
+        delegateExecution.setVariable("approval", userPostMapper.selectDeptLeaderByDeptId("110").getUserId().toString());
+    }
+}

oa-back/ruoyi-flowable/src/main/java/com/ruoyi/flowable/oa/CallTechActivityExecutionListener.java

@@ -7,12 +7,14 @@ import org.flowable.engine.delegate.DelegateExecution;
 import org.flowable.engine.delegate.ExecutionListener;
 import org.springframework.stereotype.Component;
 
+import java.util.Map;
+
 @Component("CallTechActivityExecutionListener")
 public class CallTechActivityExecutionListener implements ExecutionListener {
     @Override
     public void notify(DelegateExecution delegateExecution) {
-        SysUserPostMapper userPostMapper = SpringUtils.getBean(SysUserPostMapper.class);
-        Authentication.setAuthenticatedUserId(userPostMapper.selectDeptLeaderByDeptId("110").getUserId().toString());
-        delegateExecution.setVariable("approval", userPostMapper.selectDeptLeaderByDeptId("110").getUserId().toString());
+        Map<String, Object> variables = delegateExecution.getVariables();
+        Authentication.setAuthenticatedUserId(variables.get("techInitiator").toString());
+        delegateExecution.setVariable("approval", variables.get("techInitiator").toString());
     }
 }

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

@@ -0,0 +1,63 @@
+package com.ruoyi.oa.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * cmc领导分管对象 cmc_manage_dept
+ * 
+ * @author cmc
+ * @date 2024-07-04
+ */
+public class CmcManageDept extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 分管领导id */
+    private Long userId;
+
+    /** 分管部门id */
+    private Long deptId;
+
+    /** 院内对接单位 */
+    private String partyAId;
+
+    public void setUserId(Long userId) 
+    {
+        this.userId = userId;
+    }
+
+    public Long getUserId() 
+    {
+        return userId;
+    }
+    public void setDeptId(Long deptId) 
+    {
+        this.deptId = deptId;
+    }
+
+    public Long getDeptId() 
+    {
+        return deptId;
+    }
+    public void setPartyAId(String partyAId) 
+    {
+        this.partyAId = partyAId;
+    }
+
+    public String getPartyAId() 
+    {
+        return partyAId;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("userId", getUserId())
+            .append("deptId", getDeptId())
+            .append("partyAId", getPartyAId())
+            .toString();
+    }
+}

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

@@ -18,7 +18,7 @@ public class CmcSafe extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
-    /** 项目id */
+    /** 安全交底id */
     private String safeId;
 
     /** 项目id */

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

@@ -0,0 +1,210 @@
+package com.ruoyi.oa.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.domain.entity.SysUser;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * cmc技术交底对象 cmc_technical
+ * 
+ * @author cmc
+ * @date 2024-07-04
+ */
+public class CmcTechnical extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 技术交底id */
+    private String technicalId;
+
+    /** 项目id */
+    private String projectId;
+    @Excel(name = "项目编号")
+    private String projectNumber;
+    @Excel(name = "项目名称")
+    private String projectName;
+    private CmcProject project;
+
+    /** 接受交底人 */
+    private Long disclosureAccepter;
+    @Excel(name = "接受交底人")
+    private String acceptUserName;
+
+    private SysUser accepterUser;
+
+    /** 安全交底人 */
+    private Long disclosurer;
+    @Excel(name = "安全交底人")
+    private String disclosurerUserName;
+
+    private SysUser disclosurerUser;
+
+    /** 技术交底内容 */
+    @Excel(name = "技术交底内容")
+    private String content;
+
+    /** 附件 */
+    @Excel(name = "附件")
+    private String document;
+
+    /** 技术交底意见 */
+    @Excel(name = "技术交底意见")
+    private String disclosureComment;
+
+    /** 接受交底意见 */
+    @Excel(name = "接受交底意见")
+    private String acceptComment;
+
+    /** 技术交底时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "技术交底时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date disclosureTime;
+
+    /** 接受交底时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "接受交底时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date acceptTime;
+
+    public void setTechnicalId(String technicalId) 
+    {
+        this.technicalId = technicalId;
+    }
+
+    public String getTechnicalId() 
+    {
+        return technicalId;
+    }
+    public void setProjectId(String projectId) 
+    {
+        this.projectId = projectId;
+    }
+
+    public String getProjectId() 
+    {
+        return projectId;
+    }
+    public void setProject(CmcProject project)
+    {
+        this.project = project;
+        this.projectNumber = project == null ? "" : project.getProjectNumber();
+        this.projectName = project == null ? "" : project.getProjectName();
+    }
+
+    public CmcProject getProject()
+    {
+        return project;
+    }
+    public void setDisclosureAccepter(Long disclosureAccepter) 
+    {
+        this.disclosureAccepter = disclosureAccepter;
+    }
+
+    public Long getDisclosureAccepter() 
+    {
+        return disclosureAccepter;
+    }
+    public void setAccepterUser(SysUser accepterUser)
+    {
+        this.accepterUser = accepterUser;
+        this.acceptUserName = accepterUser == null ? "" : accepterUser.getNickName();
+    }
+
+    public SysUser getAccepterUser()
+    {
+        return accepterUser;
+    }
+    public void setDisclosurer(Long disclosurer)
+    {
+        this.disclosurer = disclosurer;
+    }
+
+    public Long getDisclosurer()
+    {
+        return disclosurer;
+    }
+
+    public void setDisclosurerUser(SysUser disclosurerUser)
+    {
+        this.disclosurerUser = disclosurerUser;
+        this.disclosurerUserName = disclosurerUser == null ? "" : disclosurerUser.getNickName();
+    }
+
+    public SysUser getDisclosurerUser()
+    {
+        return disclosurerUser;
+    }
+    public void setContent(String content) 
+    {
+        this.content = content;
+    }
+
+    public String getContent() 
+    {
+        return content;
+    }
+    public void setDocument(String document) 
+    {
+        this.document = document;
+    }
+
+    public String getDocument() 
+    {
+        return document;
+    }
+    public void setDisclosureComment(String disclosureComment) 
+    {
+        this.disclosureComment = disclosureComment;
+    }
+
+    public String getDisclosureComment() 
+    {
+        return disclosureComment;
+    }
+    public void setAcceptComment(String acceptComment) 
+    {
+        this.acceptComment = acceptComment;
+    }
+
+    public String getAcceptComment() 
+    {
+        return acceptComment;
+    }
+    public void setDisclosureTime(Date disclosureTime) 
+    {
+        this.disclosureTime = disclosureTime;
+    }
+
+    public Date getDisclosureTime() 
+    {
+        return disclosureTime;
+    }
+    public void setAcceptTime(Date acceptTime) 
+    {
+        this.acceptTime = acceptTime;
+    }
+
+    public Date getAcceptTime() 
+    {
+        return acceptTime;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("technicalId", getTechnicalId())
+            .append("projectId", getProjectId())
+            .append("disclosureAccepter", getDisclosureAccepter())
+            .append("disclosurer", getDisclosurer())
+            .append("content", getContent())
+            .append("document", getDocument())
+            .append("disclosureComment", getDisclosureComment())
+            .append("acceptComment", getAcceptComment())
+            .append("disclosureTime", getDisclosureTime())
+            .append("acceptTime", getAcceptTime())
+            .toString();
+    }
+}

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

@@ -0,0 +1,61 @@
+package com.ruoyi.oa.mapper;
+
+import java.util.List;
+import com.ruoyi.oa.domain.CmcManageDept;
+
+/**
+ * cmc领导分管Mapper接口
+ * 
+ * @author cmc
+ * @date 2024-07-04
+ */
+public interface CmcManageDeptMapper 
+{
+    /**
+     * 查询cmc领导分管
+     * 
+     * @param userId cmc领导分管主键
+     * @return cmc领导分管
+     */
+    public CmcManageDept selectCmcManageDeptByUserId(Long userId);
+
+    /**
+     * 查询cmc领导分管列表
+     * 
+     * @param cmcManageDept cmc领导分管
+     * @return cmc领导分管集合
+     */
+    public List<CmcManageDept> selectCmcManageDeptList(CmcManageDept cmcManageDept);
+
+    /**
+     * 新增cmc领导分管
+     * 
+     * @param cmcManageDept cmc领导分管
+     * @return 结果
+     */
+    public int insertCmcManageDept(CmcManageDept cmcManageDept);
+
+    /**
+     * 修改cmc领导分管
+     * 
+     * @param cmcManageDept cmc领导分管
+     * @return 结果
+     */
+    public int updateCmcManageDept(CmcManageDept cmcManageDept);
+
+    /**
+     * 删除cmc领导分管
+     * 
+     * @param userId cmc领导分管主键
+     * @return 结果
+     */
+    public int deleteCmcManageDeptByUserId(Long userId);
+
+    /**
+     * 批量删除cmc领导分管
+     * 
+     * @param userIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteCmcManageDeptByUserIds(Long[] userIds);
+}

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

@@ -0,0 +1,61 @@
+package com.ruoyi.oa.mapper;
+
+import java.util.List;
+import com.ruoyi.oa.domain.CmcTechnical;
+
+/**
+ * cmc技术交底Mapper接口
+ * 
+ * @author cmc
+ * @date 2024-07-04
+ */
+public interface CmcTechnicalMapper 
+{
+    /**
+     * 查询cmc技术交底
+     * 
+     * @param technicalId cmc技术交底主键
+     * @return cmc技术交底
+     */
+    public CmcTechnical selectCmcTechnicalByTechnicalId(String technicalId);
+
+    /**
+     * 查询cmc技术交底列表
+     * 
+     * @param cmcTechnical cmc技术交底
+     * @return cmc技术交底集合
+     */
+    public List<CmcTechnical> selectCmcTechnicalList(CmcTechnical cmcTechnical);
+
+    /**
+     * 新增cmc技术交底
+     * 
+     * @param cmcTechnical cmc技术交底
+     * @return 结果
+     */
+    public int insertCmcTechnical(CmcTechnical cmcTechnical);
+
+    /**
+     * 修改cmc技术交底
+     * 
+     * @param cmcTechnical cmc技术交底
+     * @return 结果
+     */
+    public int updateCmcTechnical(CmcTechnical cmcTechnical);
+
+    /**
+     * 删除cmc技术交底
+     * 
+     * @param technicalId cmc技术交底主键
+     * @return 结果
+     */
+    public int deleteCmcTechnicalByTechnicalId(String technicalId);
+
+    /**
+     * 批量删除cmc技术交底
+     * 
+     * @param technicalIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteCmcTechnicalByTechnicalIds(String[] technicalIds);
+}

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

@@ -0,0 +1,61 @@
+package com.ruoyi.oa.service;
+
+import java.util.List;
+import com.ruoyi.oa.domain.CmcManageDept;
+
+/**
+ * cmc领导分管Service接口
+ * 
+ * @author cmc
+ * @date 2024-07-04
+ */
+public interface ICmcManageDeptService 
+{
+    /**
+     * 查询cmc领导分管
+     * 
+     * @param userId cmc领导分管主键
+     * @return cmc领导分管
+     */
+    public CmcManageDept selectCmcManageDeptByUserId(Long userId);
+
+    /**
+     * 查询cmc领导分管列表
+     * 
+     * @param cmcManageDept cmc领导分管
+     * @return cmc领导分管集合
+     */
+    public List<CmcManageDept> selectCmcManageDeptList(CmcManageDept cmcManageDept);
+
+    /**
+     * 新增cmc领导分管
+     * 
+     * @param cmcManageDept cmc领导分管
+     * @return 结果
+     */
+    public int insertCmcManageDept(CmcManageDept cmcManageDept);
+
+    /**
+     * 修改cmc领导分管
+     * 
+     * @param cmcManageDept cmc领导分管
+     * @return 结果
+     */
+    public int updateCmcManageDept(CmcManageDept cmcManageDept);
+
+    /**
+     * 批量删除cmc领导分管
+     * 
+     * @param userIds 需要删除的cmc领导分管主键集合
+     * @return 结果
+     */
+    public int deleteCmcManageDeptByUserIds(Long[] userIds);
+
+    /**
+     * 删除cmc领导分管信息
+     * 
+     * @param userId cmc领导分管主键
+     * @return 结果
+     */
+    public int deleteCmcManageDeptByUserId(Long userId);
+}

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

@@ -0,0 +1,61 @@
+package com.ruoyi.oa.service;
+
+import java.util.List;
+import com.ruoyi.oa.domain.CmcTechnical;
+
+/**
+ * cmc技术交底Service接口
+ * 
+ * @author cmc
+ * @date 2024-07-04
+ */
+public interface ICmcTechnicalService 
+{
+    /**
+     * 查询cmc技术交底
+     * 
+     * @param technicalId cmc技术交底主键
+     * @return cmc技术交底
+     */
+    public CmcTechnical selectCmcTechnicalByTechnicalId(String technicalId);
+
+    /**
+     * 查询cmc技术交底列表
+     * 
+     * @param cmcTechnical cmc技术交底
+     * @return cmc技术交底集合
+     */
+    public List<CmcTechnical> selectCmcTechnicalList(CmcTechnical cmcTechnical);
+
+    /**
+     * 新增cmc技术交底
+     * 
+     * @param cmcTechnical cmc技术交底
+     * @return 结果
+     */
+    public int insertCmcTechnical(CmcTechnical cmcTechnical);
+
+    /**
+     * 修改cmc技术交底
+     * 
+     * @param cmcTechnical cmc技术交底
+     * @return 结果
+     */
+    public int updateCmcTechnical(CmcTechnical cmcTechnical);
+
+    /**
+     * 批量删除cmc技术交底
+     * 
+     * @param technicalIds 需要删除的cmc技术交底主键集合
+     * @return 结果
+     */
+    public int deleteCmcTechnicalByTechnicalIds(String[] technicalIds);
+
+    /**
+     * 删除cmc技术交底信息
+     * 
+     * @param technicalId cmc技术交底主键
+     * @return 结果
+     */
+    public int deleteCmcTechnicalByTechnicalId(String technicalId);
+}

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

@@ -0,0 +1,93 @@
+package com.ruoyi.oa.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.oa.mapper.CmcManageDeptMapper;
+import com.ruoyi.oa.domain.CmcManageDept;
+import com.ruoyi.oa.service.ICmcManageDeptService;
+
+/**
+ * cmc领导分管Service业务层处理
+ * 
+ * @author cmc
+ * @date 2024-07-04
+ */
+@Service
+public class CmcManageDeptServiceImpl implements ICmcManageDeptService 
+{
+    @Autowired
+    private CmcManageDeptMapper cmcManageDeptMapper;
+
+    /**
+     * 查询cmc领导分管
+     * 
+     * @param userId cmc领导分管主键
+     * @return cmc领导分管
+     */
+    @Override
+    public CmcManageDept selectCmcManageDeptByUserId(Long userId)
+    {
+        return cmcManageDeptMapper.selectCmcManageDeptByUserId(userId);
+    }
+
+    /**
+     * 查询cmc领导分管列表
+     * 
+     * @param cmcManageDept cmc领导分管
+     * @return cmc领导分管
+     */
+    @Override
+    public List<CmcManageDept> selectCmcManageDeptList(CmcManageDept cmcManageDept)
+    {
+        return cmcManageDeptMapper.selectCmcManageDeptList(cmcManageDept);
+    }
+
+    /**
+     * 新增cmc领导分管
+     * 
+     * @param cmcManageDept cmc领导分管
+     * @return 结果
+     */
+    @Override
+    public int insertCmcManageDept(CmcManageDept cmcManageDept)
+    {
+        return cmcManageDeptMapper.insertCmcManageDept(cmcManageDept);
+    }
+
+    /**
+     * 修改cmc领导分管
+     * 
+     * @param cmcManageDept cmc领导分管
+     * @return 结果
+     */
+    @Override
+    public int updateCmcManageDept(CmcManageDept cmcManageDept)
+    {
+        return cmcManageDeptMapper.updateCmcManageDept(cmcManageDept);
+    }
+
+    /**
+     * 批量删除cmc领导分管
+     * 
+     * @param userIds 需要删除的cmc领导分管主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCmcManageDeptByUserIds(Long[] userIds)
+    {
+        return cmcManageDeptMapper.deleteCmcManageDeptByUserIds(userIds);
+    }
+
+    /**
+     * 删除cmc领导分管信息
+     * 
+     * @param userId cmc领导分管主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCmcManageDeptByUserId(Long userId)
+    {
+        return cmcManageDeptMapper.deleteCmcManageDeptByUserId(userId);
+    }
+}

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

@@ -0,0 +1,93 @@
+package com.ruoyi.oa.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.oa.mapper.CmcTechnicalMapper;
+import com.ruoyi.oa.domain.CmcTechnical;
+import com.ruoyi.oa.service.ICmcTechnicalService;
+
+/**
+ * cmc技术交底Service业务层处理
+ * 
+ * @author cmc
+ * @date 2024-07-04
+ */
+@Service
+public class CmcTechnicalServiceImpl implements ICmcTechnicalService 
+{
+    @Autowired
+    private CmcTechnicalMapper cmcTechnicalMapper;
+
+    /**
+     * 查询cmc技术交底
+     * 
+     * @param technicalId cmc技术交底主键
+     * @return cmc技术交底
+     */
+    @Override
+    public CmcTechnical selectCmcTechnicalByTechnicalId(String technicalId)
+    {
+        return cmcTechnicalMapper.selectCmcTechnicalByTechnicalId(technicalId);
+    }
+
+    /**
+     * 查询cmc技术交底列表
+     * 
+     * @param cmcTechnical cmc技术交底
+     * @return cmc技术交底
+     */
+    @Override
+    public List<CmcTechnical> selectCmcTechnicalList(CmcTechnical cmcTechnical)
+    {
+        return cmcTechnicalMapper.selectCmcTechnicalList(cmcTechnical);
+    }
+
+    /**
+     * 新增cmc技术交底
+     * 
+     * @param cmcTechnical cmc技术交底
+     * @return 结果
+     */
+    @Override
+    public int insertCmcTechnical(CmcTechnical cmcTechnical)
+    {
+        return cmcTechnicalMapper.insertCmcTechnical(cmcTechnical);
+    }
+
+    /**
+     * 修改cmc技术交底
+     * 
+     * @param cmcTechnical cmc技术交底
+     * @return 结果
+     */
+    @Override
+    public int updateCmcTechnical(CmcTechnical cmcTechnical)
+    {
+        return cmcTechnicalMapper.updateCmcTechnical(cmcTechnical);
+    }
+
+    /**
+     * 批量删除cmc技术交底
+     * 
+     * @param technicalIds 需要删除的cmc技术交底主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCmcTechnicalByTechnicalIds(String[] technicalIds)
+    {
+        return cmcTechnicalMapper.deleteCmcTechnicalByTechnicalIds(technicalIds);
+    }
+
+    /**
+     * 删除cmc技术交底信息
+     * 
+     * @param technicalId cmc技术交底主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCmcTechnicalByTechnicalId(String technicalId)
+    {
+        return cmcTechnicalMapper.deleteCmcTechnicalByTechnicalId(technicalId);
+    }
+}

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

@@ -85,7 +85,7 @@
             <if test="signScan != null  and signScan != ''"> and c.sign_scan = #{signScan}</if>
             <if test="commentType != null  and commentType != ''"> and c.comment_type = #{commentType}</if>
         </where>
-        order by c.contract_code desc
+        order by c.draft_time desc
     </select>
 
     <select id="selectCmcContractByContractId" parameterType="String" resultMap="CmcContractResult">

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

@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.oa.mapper.CmcManageDeptMapper">
+    
+    <resultMap type="CmcManageDept" id="CmcManageDeptResult">
+        <result property="userId"    column="user_id"    />
+        <result property="deptId"    column="dept_id"    />
+        <result property="partyAId"    column="party_a_id"    />
+    </resultMap>
+
+    <sql id="selectCmcManageDeptVo">
+        select user_id, dept_id, party_a_id from cmc_manage_dept
+    </sql>
+
+    <select id="selectCmcManageDeptList" parameterType="CmcManageDept" resultMap="CmcManageDeptResult">
+        <include refid="selectCmcManageDeptVo"/>
+        <where>  
+        </where>
+    </select>
+    
+    <select id="selectCmcManageDeptByUserId" parameterType="Long" resultMap="CmcManageDeptResult">
+        <include refid="selectCmcManageDeptVo"/>
+        where user_id = #{userId}
+    </select>
+        
+    <insert id="insertCmcManageDept" parameterType="CmcManageDept">
+        insert into cmc_manage_dept
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="userId != null">user_id,</if>
+            <if test="deptId != null">dept_id,</if>
+            <if test="partyAId != null">party_a_id,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="userId != null">#{userId},</if>
+            <if test="deptId != null">#{deptId},</if>
+            <if test="partyAId != null">#{partyAId},</if>
+         </trim>
+    </insert>
+
+    <update id="updateCmcManageDept" parameterType="CmcManageDept">
+        update cmc_manage_dept
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="deptId != null">dept_id = #{deptId},</if>
+            <if test="partyAId != null">party_a_id = #{partyAId},</if>
+        </trim>
+        where user_id = #{userId}
+    </update>
+
+    <delete id="deleteCmcManageDeptByUserId" parameterType="Long">
+        delete from cmc_manage_dept where user_id = #{userId}
+    </delete>
+
+    <delete id="deleteCmcManageDeptByUserIds" parameterType="String">
+        delete from cmc_manage_dept where user_id in 
+        <foreach item="userId" collection="array" open="(" separator="," close=")">
+            #{userId}
+        </foreach>
+    </delete>
+</mapper>

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

@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.oa.mapper.CmcTechnicalMapper">
+    
+    <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="disclosurer"    column="disclosurer"    />
+        <result property="content"    column="content"    />
+        <result property="document"    column="document"    />
+        <result property="disclosureComment"    column="disclosure_comment"    />
+        <result property="acceptComment"    column="accept_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" />
+        <association property="project"    javaType="CmcProject"         resultMap="CmcProjectResult" />
+    </resultMap>
+
+    <resultMap type="SysUser" id="AccepterUserResult">
+        <result property="userId"    column="user_id"    />
+        <result property="nickName"    column="accepter_nick_name"    />
+    </resultMap>
+
+    <resultMap type="SysUser" id="DisclosurerUserResult">
+        <result property="userId"    column="user_id"    />
+        <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="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
+        left join sys_user as u1 on u1.user_id = t.disclosurer
+        left join cmc_project as p on p.project_id = t.project_id
+    </sql>
+
+    <select id="selectCmcTechnicalList" parameterType="CmcTechnical" resultMap="CmcTechnicalResult">
+        <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="disclosurer != null "> and t.disclosurer = #{disclosurer}</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="disclosureTime != null "> and t.disclosure_time = #{disclosureTime}</if>
+            <if test="acceptTime != null "> and t.accept_time = #{acceptTime}</if>
+        </where>
+    </select>
+    
+    <select id="selectCmcTechnicalByTechnicalId" parameterType="String" resultMap="CmcTechnicalResult">
+        <include refid="selectCmcTechnicalVo"/>
+        where t.technical_id = #{technicalId}
+    </select>
+        
+    <insert id="insertCmcTechnical" parameterType="CmcTechnical">
+        insert into cmc_technical
+        <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="disclosurer != null">disclosurer,</if>
+            <if test="content != null">content,</if>
+            <if test="document != null">document,</if>
+            <if test="disclosureComment != null">disclosure_comment,</if>
+            <if test="acceptComment != null">accept_comment,</if>
+            <if test="disclosureTime != null">disclosure_time,</if>
+            <if test="acceptTime != null">accept_time,</if>
+         </trim>
+        <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="disclosurer != null">#{disclosurer},</if>
+            <if test="content != null">#{content},</if>
+            <if test="document != null">#{document},</if>
+            <if test="disclosureComment != null">#{disclosureComment},</if>
+            <if test="acceptComment != null">#{acceptComment},</if>
+            <if test="disclosureTime != null">#{disclosureTime},</if>
+            <if test="acceptTime != null">#{acceptTime},</if>
+         </trim>
+    </insert>
+
+    <update id="updateCmcTechnical" parameterType="CmcTechnical">
+        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="disclosurer != null">disclosurer = #{disclosurer},</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="disclosureTime != null">disclosure_time = #{disclosureTime},</if>
+            <if test="acceptTime != null">accept_time = #{acceptTime},</if>
+        </trim>
+        where technical_id = #{technicalId}
+    </update>
+
+    <delete id="deleteCmcTechnicalByTechnicalId" parameterType="String">
+        delete from cmc_technical where technical_id = #{technicalId}
+    </delete>
+
+    <delete id="deleteCmcTechnicalByTechnicalIds" parameterType="String">
+        delete from cmc_technical where technical_id in 
+        <foreach item="technicalId" collection="array" open="(" separator="," close=")">
+            #{technicalId}
+        </foreach>
+    </delete>
+</mapper>

oa-ui/src/api/oa/manage/manageDept.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询cmc领导分管列表
+export function listManageDept(query) {
+  return request({
+    url: '/oa/manageDept/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询cmc领导分管详细
+export function getManageDept(userId) {
+  return request({
+    url: '/oa/manageDept/' + userId,
+    method: 'get'
+  })
+}
+
+// 新增cmc领导分管
+export function addManageDept(data) {
+  return request({
+    url: '/oa/manageDept',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改cmc领导分管
+export function updateManageDept(data) {
+  return request({
+    url: '/oa/manageDept',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除cmc领导分管
+export function delManageDept(userId) {
+  return request({
+    url: '/oa/manageDept/' + userId,
+    method: 'delete'
+  })
+}

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

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询cmc技术交底列表
+export function listTechnical(query) {
+  return request({
+    url: '/oa/technical/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询cmc技术交底详细
+export function getTechnical(technicalId) {
+  return request({
+    url: '/oa/technical/' + technicalId,
+    method: 'get'
+  })
+}
+
+// 新增cmc技术交底
+export function addTechnical(data) {
+  return request({
+    url: '/oa/technical',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改cmc技术交底
+export function updateTechnical(data) {
+  return request({
+    url: '/oa/technical',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除cmc技术交底
+export function delTechnical(technicalId) {
+  return request({
+    url: '/oa/technical/' + technicalId,
+    method: 'delete'
+  })
+}

oa-ui/src/views/flowable/form/business/contractForm.vue

@@ -362,12 +362,12 @@
           </el-form-item>
           <el-row>
             <el-col :span="6" :xs="24" :offset="12">
-              <el-form-item label="签名：" label-width="120px" v-if="taskName == '分管审核'">
+              <el-form-item label="签名：" label-width="120px" v-if="taskName != '合同拟稿' && taskName != '线上会审' && taskName != '会议评审'">
                 <span class="auditor"> {{ form.managerUser ? form.managerUser.nickName : managerUser }} </span>
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="日期：" label-width="120px" v-if="taskName == '分管审核'">
+              <el-form-item label="日期：" label-width="120px" v-if="taskName != '合同拟稿' && taskName != '线上会审' && taskName != '会议评审'">
                 <span> {{ form.managerTime ? form.managerTime : managerTime }} </span>
               </el-form-item>
             </el-col>

oa-ui/src/views/flowable/form/business/subContract.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: ysh
  * @Date: 2024-05-10 15:31:57
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-07-02 10:11:22
+ * @LastEditors: wrh
+ * @LastEditTime: 2024-07-03 13:51:41
 -->
 <template>
   <div class="app-container">
@@ -357,12 +357,12 @@
           </el-form-item>
           <el-row>
             <el-col :span="6" :xs="24" :offset="12">
-              <el-form-item label="签名：" label-width="120px" v-if="taskName == '分管审核'">
+              <el-form-item label="签名：" label-width="120px" v-if="taskName != '合同拟稿' && taskName != '线上会审' && taskName != '会议评审'">
                 <span class="auditor"> {{ form.managerUser ? form.managerUser.nickName : managerUser }} </span>
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="日期：" label-width="120px" v-if="taskName == '分管审核'">
+              <el-form-item label="日期：" label-width="120px" v-if="taskName != '合同拟稿' && taskName != '线上会审' && taskName != '会议评审'">
                 <span> {{ form.managerTime ? form.managerTime : managerTime }} </span>
               </el-form-item>
             </el-col>
@@ -689,18 +689,56 @@ export default {
               this.paymentList = res.rows;
           });
           listContractComment({ contractId: this.taskForm.formId }).then(res => {
-            if (res.rows)
+            if (res.rows && res.rows.length != 0) {
               this.commentList = res.rows;
-            for (let comment of this.commentList) {
-              if (comment.commentTime == undefined) {
-                if (comment.userId != this.$store.getters.userId) {
-                  comment.commentUser = undefined;
-                }
-                else {
-                  comment.commentTime = parseTime(new Date(), '{y}-{m}-{d}');
+              for (let comment of this.commentList) {
+                if (comment.commentTime == undefined) {
+                  if (comment.userId != this.$store.getters.userId) {
+                    comment.commentUser = undefined;
+                  }
+                  else {
+                    comment.commentTime = parseTime(new Date(), '{y}-{m}-{d}');
+                  }
                 }
               }
             }
+            else {
+              this.commentList = [
+                {
+                  deptId: 105,
+                  userId: '',
+                  comment: '',
+                  document: '',
+                  commentTime: undefined
+                },
+                {
+                  deptId: 110,
+                  userId: '',
+                  comment: '',
+                  document: '',
+                  commentTime: undefined
+                },
+                {
+                  deptId: 107,
+                  userId: '',
+                  comment: '',
+                  document: '',
+                  commentTime: undefined
+                },
+                {
+                  deptId: 106,
+                  userId: '',
+                  comment: '',
+                  document: '',
+                  commentTime: undefined
+                },
+              ]
+              for (let comment of this.commentList) {
+                getUsersDeptLeaderByDept({ deptId: comment.deptId }).then(res => {
+                  comment.userId = res.data.userId;
+                })
+              }
+            }
           });
           getContractMeeting(this.taskForm.formId).then(res => {
             if (res.data) {

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

@@ -1,8 +1,8 @@
 <!--
  * @Author: ysh
  * @Date: 2024-04-23 17:08:16
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-06-07 16:13:25
+ * @LastEditors: wrh
+ * @LastEditTime: 2024-07-04 12:58:36
 -->
 <template>
   <div>
@@ -16,6 +16,7 @@
     <car-form :taskForm="taskForm" :taskName="''" v-else-if="taskForm.procDefName == '用车审批'"></car-form>
     <technical-plan :key="'tec'+taskForm.taskId" :taskForm="taskForm" v-else-if="taskForm.procDefName == '技术方案'"></technical-plan>
     <safe-form :key="'safe'+taskForm.taskId" :taskForm="taskForm" :taskName="''" v-else-if="taskForm.procDefName == '安全交底'"></safe-form>
+    <technical-form :key="'technical'+taskForm.taskId" :taskForm="taskForm" :taskName="''" v-else-if="taskForm.procDefName == '技术交底'"></technical-form>
     <settle-form :key="'fb'+taskForm.taskId" :taskForm="taskForm" :taskName="''" :disabled="true"
       v-else-if="taskForm.procDefName == '项目结算'"></settle-form>
     <!-- <budget-in :key="'budget'+taskForm.taskId" :taskForm="taskForm" v-else-if="taskForm.procDefName == '项目预算'"></budget-in> -->
@@ -41,8 +42,9 @@ import XmTable from "@/views/flowable/form/access/xmTable.vue";
 import CwTable from "@/views/flowable/form/access/cwTable.vue";
 import CarForm from '@/views/flowable/form/oa/carForm.vue';
 import projectProcess from '@/views/flowable/form/projectProcess/index'
-import TechnicalForm from '@/views/flowable/form/technicalPlan.vue';
+import TechnicalPlan from '@/views/flowable/form/technicalPlan.vue';
 import SafeForm from '@/views/flowable/form/safeForm.vue';
+import TechnicalForm from '@/views/flowable/form/technicalForm.vue';
 import SettleForm from '@/views/flowable/form/settleForm.vue';
 import BudgetInfo from '../budget/budgetInfo.vue';
 import ContractForm from '../business/contractForm.vue';
@@ -73,6 +75,7 @@ export default {
     JyTable,
     CarForm,
     projectProcess,
+    TechnicalPlan,
     TechnicalForm,
     SafeForm,
     SettleForm,

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

@@ -24,6 +24,8 @@
       @goBack="goBack"></borrow-form>
     <safe-form :taskName="taskName" :taskForm="taskForm" v-else-if="taskForm.procDefName == '安全交底'"
       @goBack="goBack"></safe-form>
+    <technical-form :taskName="taskName" :taskForm="taskForm" v-else-if="taskForm.procDefName == '技术交底'"
+      @goBack="goBack"></technical-form>
     <technical-plan :taskName="taskName" :taskForm="taskForm" v-else-if="taskForm.procDefName == '技术方案'"
       @goBack="goBack"></technical-plan>
     <contract-form :taskName="taskName" :taskForm="taskForm" v-else-if="taskForm.procDefName == '承接合同评审'"
@@ -55,6 +57,7 @@ import deviceForm from "@/views/flowable/form/oa/deviceForm";
 import projectProcess from "@/views/flowable/form/projectProcess/index.vue"
 import AddBudget from '@/views/flowable/form/budget/addBudget.vue';
 import safeForm from '@/views/flowable/form/safeForm.vue';
+import technicalForm from '@/views/flowable/form/technicalForm.vue';
 import technicalPlan from '@/views/flowable/form/technicalPlan.vue';
 import budgetIndex from '@/views/flowable/form/budget/budget.vue';
 import businessReview from '@/views/flowable/form/projectProcess/businessReview.vue';
@@ -80,6 +83,7 @@ export default {
     AddBudget,
     borrowForm,
     safeForm,
+    technicalForm,
     technicalPlan,
     budgetIndex,
     businessReview,

oa-ui/src/views/flowable/form/inProgress/achiData.vue

@@ -22,7 +22,7 @@
           {{ findUserName(scope.row.qualityInspector) }}
         </template>
       </el-table-column>
-      <el-table-column label="技术部负责人" prop="deptLeader" show-overflow-tooltip width="120">
+      <el-table-column label="技术质量与安全部负责人" prop="deptLeader" show-overflow-tooltip width="120">
         <template slot-scope="scope">
           {{ findUserName(scope.row.deptLeader) }}
         </template>
@@ -38,7 +38,7 @@
       <el-table-column label="归档时间" prop="archiveTime" show-overflow-tooltip width="120" />
       <el-table-column label="生产部门意见" prop="produceComment" show-overflow-tooltip width="120" />
       <el-table-column label="质量检查意见" prop="qualityComment" show-overflow-tooltip width="120" />
-      <el-table-column label="技术部审核意见" prop="deptComment" show-overflow-tooltip width="120" />
+      <el-table-column label="技术质量与安全部审核意见" prop="deptComment" show-overflow-tooltip width="120" />
       <el-table-column label="归档意见" prop="archiveComment" show-overflow-tooltip width="120" />
       <el-table-column label="操作" fixed="right" header-align="center">
         <template slot-scope="scope">

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

@@ -1,8 +1,8 @@
 <!--
  * @Author: ysh
  * @Date: 2024-03-19 09:24:06
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-07-02 17:36:44
+ * @LastEditors: wrh
+ * @LastEditTime: 2024-07-04 13:00:36
 -->
 <template>
   <div class="app-container">
@@ -234,7 +234,7 @@ export default {
       updateProject(this.form)
     },
     confirmPlanForm() {
-      this.$confirm('项目安排之后会自动发起预算编制、技术方案、安全交底三个子流程，将无法进行撤回操作，是否继续提交？', '提示', {
+      this.$confirm('项目安排之后会自动发起预算编制、技术方案、安全交底、技术交底四个子流程，将无法进行撤回操作，是否继续提交？', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'

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

@@ -1,8 +1,8 @@
 <!--
  * @Author: ysh
  * @Date: 2024-02-27 14:49:15
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-07-02 15:13:18
+ * @LastEditors: wrh
+ * @LastEditTime: 2024-07-04 13:02:34
 -->
 
 <template>
@@ -22,6 +22,9 @@
           <el-tab-pane label="安全交底" name="安全交底">
             <safe-tab :taskForm="taskForm"  @goBack="goBack"></safe-tab>
           </el-tab-pane>
+          <el-tab-pane label="技术交底" name="技术交底">
+            <technical-tab :taskForm="taskForm"  @goBack="goBack"></technical-tab>
+          </el-tab-pane>
           <el-tab-pane label="技术方案" name="技术方案">
             <plan-tab :taskForm="taskForm" :taskName="taskName"  @goBack="goBack"></plan-tab>
           </el-tab-pane>
@@ -71,6 +74,7 @@ import InProgress from './inProgress.vue'
 import BudgetTab from './budgetTab.vue'
 import planTab from './planTab.vue'
 import SafeTab from './safeTab.vue'
+import TechnicalTab from './technicalTab.vue'
 export default {
   props: {
     taskName: {
@@ -80,7 +84,7 @@ export default {
       type: Object,
     }
   },
-  components: { addproject, arrangeProject, businessReview, flow, ManageReview, ScConfirm, InProgress, BudgetTab, planTab, SafeTab },
+  components: { addproject, arrangeProject, businessReview, flow, ManageReview, ScConfirm, InProgress, BudgetTab, planTab, SafeTab, TechnicalTab },
   data() {
     return {
       activeName: '项目登记',

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

@@ -89,8 +89,8 @@
             </el-link>
           </div>
         </el-form-item>
-        <el-form-item label="技术部审核意见" prop="technicalComment">
-          <el-input type="textarea" v-model="form.technicalComment" placeholder="请输入技术审核意见" />
+        <el-form-item label="技术质量与安全部审核意见" prop="technicalComment">
+          <el-input type="textarea" v-model="form.technicalComment" placeholder="请输入技术质量与安全部审核意见" />
         </el-form-item>
         <el-row>
           <el-col :span="6" :xs="24" :offset="12">

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

@@ -0,0 +1,146 @@
+<template>
+  <div class="app-container">
+    <el-empty description="未进行技术交底" v-if="isEmpty"></el-empty>
+    <div v-if="!isEmpty">
+      <h3 class="text-center"><b>{{ form.projectNumber + '-' + form.projectName + ' 技术交底' }}</b></h3>
+      <el-form ref="technicalForm" :model="form" :rules="rules" label-width="125px" disabled>
+        <el-form-item label="项目编号：" prop="projectNumber">
+          {{ form.projectNumber }}
+        </el-form-item>
+        <el-form-item label="项目名称：" prop="projectName">
+          {{ form.projectName }}
+        </el-form-item>
+        <el-form-item label="接受交底人" prop="disclosureAccepter">
+          <el-select v-model="form.disclosureAccepter" filterable clearable style="width:220px">
+            <el-option v-for="item in userList" :key="item.userId" :label="item.nickName" :value="item.userId">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="技术交底内容" prop="content">
+          <el-input v-model="form.content" placeholder="请输入技术交底内容" type="textarea"
+            :autosize="{ minRows: 8 }" />
+        </el-form-item>
+        <el-form-item label="附件" prop="document">
+          <el-input v-model="form.document" placeholder="请输入附件" type="textarea"
+            :autosize="{ minRows: 8 }" />
+        </el-form-item>
+        <el-form-item label="技术交底意见" prop="disclosureComment">
+          <el-input v-model="form.disclosureComment" placeholder="请输入技术交底意见" type="textarea" :autosize="{ minRows: 4 }" />
+        </el-form-item>
+        <el-row>
+          <el-col :span="6" :xs="24" :offset="12">
+            <el-form-item label="签名" prop="disclosurer">
+              <span class="auditor"> {{ form.disclosurerUser ? form.disclosurerUser.nickName : '' }}
+              </span>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="日期：" label-width="120px">
+              <span> {{ parseTime(form.disclosureTime, '{y}-{m}-{d}') }} </span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-form-item label="接受交底意见" prop="acceptComment">
+          <el-input v-model="form.acceptComment" placeholder="请输入接受交底意见" type="textarea" :autosize="{ minRows: 4 }" />
+        </el-form-item>
+        <el-row>
+          <el-col :span="6" :xs="24" :offset="12">
+            <el-form-item label="签名">
+              <span class="auditor"> {{ form.accepterUser ? form.accepterUser.nickName : '' }} </span>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="日期：" label-width="120px">
+              <span> {{ parseTime(form.acceptTime, '{y}-{m}-{d}') }} </span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
+  </div>
+</template>
+
+<script>
+import { listTechnical, getTechnical, delTechnical, addTechnical, updateTechnical } from "@/api/oa/technical/technical";
+import { listUser } from '@/api/system/user';
+import { getProject } from "@/api/oa/project/project";
+export default {
+  props: {
+    taskForm: {
+      type: Object,
+      required: true
+    }
+  },
+  computed: {
+    projectNumber() {
+      return this.$store.state.projectProcess.projectNumber;
+    },
+    projectName() {
+      return this.$store.state.projectProcess.projectName;
+    },
+  },
+  watch: {
+    projectNumber(newval) {
+      this.$set(this.form, "projectNumber", newval);
+    },
+    projectName(newval) {
+      this.$set(this.form, "projectName", newval);
+    }
+  },
+  data() {
+    return {
+      isEmpty: true,
+      form: {},
+      rules: {},
+      userList: [],
+    }
+  },
+  mounted() {
+    this.initForm();
+    this.getUserList();
+  },
+  methods: {
+    /** 查询cmc技术方案列表 */
+    initForm() {
+      getTechnical(this.taskForm.formId).then((res) => {
+        if (res.data) {
+          this.isEmpty = false;
+          this.form = res.data;
+          if (this.projectNumber != '' && this.projectName != '') {
+            this.$set(this.form, "projectNumber", this.projectNumber);
+            this.$set(this.form, "projectName", this.projectName);
+          } else {
+            getProject(this.taskForm.formId).then(res => {
+              if (res.data) {
+                this.$set(this.form, "projectNumber", res.data.projectNumber);
+                this.$set(this.form, "projectName", res.data.projectName);
+              }
+            })
+          }
+        }
+      });
+    },
+    // 查询用户列表
+    getUserList() {
+      listUser({ pageSize: 9999, pageNum: 1 }).then((res) => {
+        this.userList = res.rows;
+      });
+    },
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+::v-deep .el-input.is-disabled .el-input__inner {
+  color: #686a6e;
+}
+
+::v-deep .el-textarea.is-disabled .el-textarea__inner,
+.el-radio__input.is-disabled+span.el-radio__label {
+  color: #686a6e;
+}
+
+::v-deep .el-radio__input.is-disabled+span.el-radio__label {
+  color: #686a6e;
+}
+</style>

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

@@ -0,0 +1,349 @@
+<template>
+  <div class="app-container">
+    <el-row :gutter="20">
+      <el-col :span="18" :xs="24">
+        <el-form ref="form" :model="form" :rules="rules" label-width="150px">
+          <el-form-item label="项目编号：" prop="projectId" v-if="taskForm.procDefName == '技术交底'">
+            <el-input v-model="chooseProject.projectNumber" placeholder="请输入项目编号" disabled style="width: 300px" />
+            <el-descriptions border v-if="isSelect" style="margin-top: 10px;" :column="1">
+              <el-descriptions-item label="项目编号" label-class-name="my-label">{{ chooseProject.projectNumber
+              }}</el-descriptions-item>
+              <el-descriptions-item label="项目名称" label-class-name="my-label">{{ chooseProject.projectName
+              }}</el-descriptions-item>
+              <el-descriptions-item label="项目负责人" label-class-name="my-label">{{ chooseProject.projectLeaderUser ?
+                chooseProject.projectLeaderUser.nickName : ''
+              }}</el-descriptions-item>
+              <el-descriptions-item label="承担部门" label-class-name="my-label">
+                <el-tag size="small">{{ chooseProject.undertakingDeptName }}</el-tag>
+              </el-descriptions-item>
+              <el-descriptions-item label="项目类型" label-class-name="my-label">{{ chooseProject.projectType
+              }}</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-option v-for="item in userList" :key="item.userId" :label="item.nickName" :value="item.userId"
+                v-if="item.nickName != 'admin'">
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="技术交底内容" prop="content">
+            <el-input v-model="form.content" placeholder="请输入技术交底内容" type="textarea"
+              :disabled="taskName != '技术交底'" :autosize="{ minRows: 8 }" />
+          </el-form-item>
+          <el-form-item label="附件" prop="document">
+            <el-input v-model="form.document" placeholder="请输入附件" type="textarea"
+              :disabled="taskName != '技术交底'" :autosize="{ minRows: 8 }" />
+          </el-form-item>
+          <el-form-item label="技术交底意见" prop="disclosureComment">
+            <el-input v-model="form.disclosureComment" placeholder="请输入技术交底意见" type="textarea"
+              :disabled="taskName != '技术交底'" :autosize="{ minRows: 4 }" />
+          </el-form-item>
+          <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>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="日期：" label-width="120px">
+                <span> {{ parseTime(form.disclosureTime, '{y}-{m}-{d}') }} </span>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-form-item label="接受交底意见" prop="acceptComment" v-if="taskName != '技术交底'">
+            <el-input v-model="form.acceptComment" 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 != '技术交底'">
+                <span class="auditor"> {{ form.accepterUser ? form.accepterUser.nickName : accepterUser }} </span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="日期：" label-width="120px" v-if="taskName != '技术交底'">
+                <span> {{ parseTime(form.acceptTime, '{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>
+        </div>
+      </el-col>
+      <el-col :span="6" :xs="24">
+        <el-card>
+          <h2 style="text-align: center;">流程进度</h2>
+          <div>
+            <flow :flowData="flowData" />
+          </div>
+        </el-card>
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import { listTechnical, getTechnical, delTechnical, addTechnical, updateTechnical } from "@/api/oa/technical/technical";
+import { getProject } from "@/api/oa/project/project";
+import { listUser } from '@/api/system/user';
+import flow from '@/views/flowable/task/todo/detail/flow';
+import { complete, getNextFlowNode } from "@/api/flowable/todo";
+import { flowXmlAndNode } from "@/api/flowable/definition";
+
+export default {
+  components: {
+    flow
+  },
+  name: "Technical",
+  props: {
+    taskName: {
+      type: String,
+      required: true
+    },
+    taskForm: {
+      type: Object,
+      required: true
+    }
+  },
+  data() {
+    return {
+      disclosurerUser: '',
+      accepterUser: '',
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // cmc技术交底表格数据
+      technicalList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        projectId: null,
+        disclosureAccepter: null,
+        disclosurer: null,
+        content: null,
+        document: null,
+        disclosureComment: null,
+        disclosureTime: null,
+        acceptTime: null
+      },
+      userList: [],
+      chooseProject: {},
+      isSelect: false,
+      // 表单参数
+      form: {
+        user: {
+          nickName: '',
+        }
+      },
+      // 表单校验
+      rules: {},
+      formTotal: 0,
+      flowData: {}
+    };
+  },
+  created() {
+    this.getProjectById();
+    this.getUserList();
+    this.getList();
+    flowXmlAndNode({ procInsId: this.taskForm.procInsId, deployId: this.taskForm.deployId }).then(res => {
+      this.flowData = res.data;
+    })
+  },
+  mounted() {
+    this.initRules();
+    this.initForm();
+  },
+  methods: {
+    initRules() {
+      if (this.taskName == '技术交底') {
+        this.rules = {
+          disclosureComment: [
+            { required: true, message: '请输入技术交底意见', trigger: 'blur' },
+          ],
+        }
+      }
+      else if (this.taskName == '接受交底') {
+        this.rules = {
+          acceptComment: [
+            { 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.form.disclosureTime = new Date();
+        }
+        else {
+          this.formTotal = 1;
+          this.form = res.data;
+          this.accepterUser = this.$store.getters.name;
+          this.form.acceptTime = new Date();
+        }
+      })
+    },
+    // 查询项目
+    getProjectById() {
+      getProject(this.taskForm.formId).then(response => {
+        this.chooseProject = response.data;
+        this.isSelect = true;
+        this.form.disclosureAccepter = response.data.projectLeader;
+      });
+    },
+    // 查询用户列表
+    getUserList() {
+      listUser({ pageSize: 9999, pageNum: 1 }).then(res => {
+        this.userList = res.rows
+      })
+    },
+    /** 查询cmc技术交底列表 */
+    getList() {
+      this.loading = true;
+      listTechnical(this.queryParams).then(response => {
+        this.technicalList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    isEmptyObject(obj) {
+      for (var key in obj) {
+        if (obj.hasOwnProperty(key)) {
+          return false;
+        }
+      }
+      return true;
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        technicalId: null,
+        projectId: null,
+        disclosureAccepter: null,
+        disclosurer: null,
+        content: null,
+        document: null,
+        disclosureComment: null,
+        disclosureTime: null,
+        acceptTime: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.technicalId)
+      this.single = selection.length !== 1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加cmc技术交底";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const technicalId = row.technicalId || this.ids
+      getTechnical(technicalId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改cmc技术交底";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.formTotal != 0) {
+            updateTechnical(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+            const params = { taskId: this.taskForm.taskId };
+            getNextFlowNode(params).then(res => {
+              complete(this.taskForm).then(response => {
+                this.$modal.msgSuccess(response.msg);
+                this.$emit('goBack')
+              });
+            })
+          } else {
+            this.form.technicalId = this.taskForm.formId;
+            this.form.projectId = this.taskForm.formId;
+            addTechnical(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+            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);
+              complete(this.taskForm).then(response => {
+                this.$modal.msgSuccess(response.msg);
+                this.$emit('goBack')
+              });
+            })
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const technicalIds = row.technicalId || this.ids;
+      this.$modal.confirm('是否确认删除cmc技术交底编号为"' + technicalIds + '"的数据项？').then(function () {
+        return delTechnical(technicalIds);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => { });
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('oa/technical/export', {
+        ...this.queryParams
+      }, `technical_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+@import "@/assets/styles/element-reset.scss";
+</style>

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

@@ -120,8 +120,8 @@
               </el-link>
             </div>
           </el-form-item>
-          <el-form-item label="技术部审核意见" prop="technicalComment">
-            <el-input type="textarea" v-model="form.technicalComment" :autosize="{ minRows: 4 }" placeholder="请输入技术审核意见"
+          <el-form-item label="技术质量与安全部审核意见" prop="technicalComment">
+            <el-input type="textarea" v-model="form.technicalComment" :autosize="{ minRows: 4 }" placeholder="请输入技术质量与安全部审核意见"
               :disabled="taskName != '技术审核'" />
           </el-form-item>
           <el-row>

oa-ui/src/views/flowable/task/myProcess/index.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: ysh
  * @Date: 2024-01-03 09:23:11
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-06-19 16:29:56
+ * @LastEditors: wrh
+ * @LastEditTime: 2024-07-04 13:06:15
 -->
 <template>
   <div class="app-container">
@@ -476,7 +476,7 @@ export default {
     },
     // 子流程不可以删除
     beDeleted(row) {
-      if (row.procDefName == '项目预算' || row.procDefName == '技术方案' || row.procDefName == '安全交底' || row.finishTime != null) {
+      if (row.procDefName == '项目预算' || row.procDefName == '技术方案' || row.procDefName == '安全交底' || row.procDefName == '技术交底' || row.finishTime != null) {
         return true
       } else if (row.procDefName == '项目流转' && row.taskName != '项目登记') {
         return true

oa-ui/src/views/flowable/task/myProcess/progressTree.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: ysh
  * @Date: 2024-04-18 15:14:45
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-06-03 14:49:25
+ * @LastEditors: wrh
+ * @LastEditTime: 2024-07-04 13:06:39
 -->
 <template>
   <div>
@@ -80,7 +80,7 @@ export default {
           this.treeData[0].children.push(i);
         }
         else if (i.category == "project") {
-          if (i.name != "项目预算" && i.name != "安全交底" && i.name != "技术方案")
+          if (i.name != "项目预算" && i.name != "安全交底" && i.name != "技术交底" && i.name != "技术方案")
             this.treeData[1].children.push(i);
         } else if (i.category == "finance") {
           this.treeData[2].children.push(i);

oa-ui/src/views/flowable/task/todo/detail/index.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: ysh
  * @Date: 2024-01-03 09:23:11
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-05-27 14:54:08
+ * @LastEditors: wrh
+ * @LastEditTime: 2024-07-04 13:07:30
 -->
 <template>
   <div class="app-container">
@@ -478,9 +478,9 @@ export default {
     // 是否显示审批通过
     isShowApprove() {
       if (this.taskName == '员工填报' || this.taskForm.procDefName == '用车审批' || this.taskForm.procDefName == '设备审批' || this.taskForm.procDefName == '项目流转'
-        || (this.taskForm.procDefName == '项目预算' && this.taskName != '预算审核') || this.taskForm.procDefName == '借款审批' || this.taskForm.procDefName == '安全交底' || this.taskForm.procDefName == '技术方案'
-        || this.taskForm.procDefName == '承接合同评审' || this.taskForm.procDefName == '分包合同评审' || this.taskForm.procDefName == '品牌项目支付' || this.taskForm.procDefName == '保证金审批'
-        || this.taskForm.procDefName == '成果归档' || this.taskForm.procDefName == '项目结算') {
+        || (this.taskForm.procDefName == '项目预算' && this.taskName != '预算审核') || this.taskForm.procDefName == '借款审批' || this.taskForm.procDefName == '安全交底' ||
+        this.taskForm.procDefName == '技术交底' || this.taskForm.procDefName == '技术方案' || this.taskForm.procDefName == '承接合同评审' || this.taskForm.procDefName == '分包合同评审'
+        || this.taskForm.procDefName == '品牌项目支付' || this.taskForm.procDefName == '保证金审批' || this.taskForm.procDefName == '成果归档' || this.taskForm.procDefName == '项目结算') {
         return false
       } else {
         return true

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

@@ -48,7 +48,7 @@
       <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="deptUser.nickName" />
       <el-table-column label="归档人" align="center" prop="archiverUser.nickName" />
       <el-table-column label="成果提交日期" align="center" prop="submitTime" width="180">
         <template slot-scope="scope">
@@ -70,7 +70,7 @@
           <span>{{ parseTime(scope.row.produceTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="技术部审核时间" align="center" prop="deptTime" width="180">
+      <el-table-column label="技术质量与安全部审核时间" align="center" prop="deptTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.deptTime, '{y}-{m}-{d}') }}</span>
         </template>
@@ -82,7 +82,7 @@
       </el-table-column>
       <!-- <el-table-column label="生产部门意见" align="center" prop="produceComment" />
       <el-table-column label="质量检查意见" align="center" prop="qualityComment" />
-      <el-table-column label="技术部审核意见" align="center" prop="deptComment" />
+      <el-table-column label="技术质量与安全部审核意见" align="center" prop="deptComment" />
       <el-table-column label="归档审核意见" align="center" prop="archiveComment" /> -->
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -121,8 +121,8 @@
         <el-form-item label="质量检查员" prop="qualityInspector">
           <el-input v-model="form.qualityInspector" placeholder="请输入质量检查员" />
         </el-form-item>
-        <el-form-item label="技术部负责人" prop="deptLeader">
-          <el-input v-model="form.deptLeader" placeholder="请输入技术部负责人" />
+        <el-form-item label="技术质量与安全部负责人" prop="deptLeader">
+          <el-input v-model="form.deptLeader" placeholder="请输入技术质量与安全部负责人" />
         </el-form-item>
         <el-form-item label="归档人" prop="archiver">
           <el-input v-model="form.archiver" placeholder="请输入归档人" />
@@ -142,9 +142,9 @@
             placeholder="请选择生产部门检查时间">
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="技术部审核时间" prop="deptTime">
+        <el-form-item label="技术质量与安全部审核时间" prop="deptTime">
           <el-date-picker clearable v-model="form.deptTime" type="date" value-format="yyyy-MM-dd"
-            placeholder="请选择技术部审核时间">
+            placeholder="请选择技术质量与安全部审核时间">
           </el-date-picker>
         </el-form-item>
         <el-form-item label="归档时间" prop="archiveTime">
@@ -158,8 +158,8 @@
         <el-form-item label="质量检查意见" prop="qualityComment">
           <el-input v-model="form.qualityComment" placeholder="请输入质量检查意见" />
         </el-form-item>
-        <el-form-item label="技术部审核意见" prop="deptComment">
-          <el-input v-model="form.deptComment" placeholder="请输入技术部审核意见" />
+        <el-form-item label="技术质量与安全部审核意见" prop="deptComment">
+          <el-input v-model="form.deptComment" placeholder="请输入技术质量与安全部审核意见" />
         </el-form-item>
         <el-form-item label="归档审核意见" prop="archiveComment">
           <el-input v-model="form.archiveComment" placeholder="请输入归档审核意见" />

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

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-03-18 09:05:41
  * @LastEditors: wrh
- * @LastEditTime: 2024-06-27 11:21:23
+ * @LastEditTime: 2024-07-03 11:33:28
 -->
 <template>
   <div class="app-container">
@@ -62,14 +62,14 @@
     </el-row>
 
     <el-table v-loading="loading" border :data="contractList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
       <!-- <el-table-column label="合同id" align="center" prop="contractId" /> -->
-      <el-table-column label="甲方单位" align="center" prop="partyA.partyAName" width="220px" />
+      <el-table-column type="index" label="序号" width="55" align="center" />
       <el-table-column label="合同名称" align="center" prop="contractName" width="220px" />
+      <el-table-column label="合同金额" align="center" prop="amount" />
+      <el-table-column label="甲方单位" align="center" prop="partyA.partyAName" width="220px" />
       <el-table-column label="合同编码" align="center" prop="contractCode" />
       <el-table-column label="合同编号" align="center" prop="contractNumber" />
-      <el-table-column label="合同金额" align="center" prop="amount" />
-      <el-table-column label="履约保证金" align="center" prop="deposit" />
+      <!-- <el-table-column label="履约保证金" align="center" prop="deposit" /> -->
       <el-table-column label="合同文件" align="center" prop="contractDocument" show-overflow-tooltip>
         <template slot-scope="scope">
           <el-link type="primary" @click="reviewWord(`${baseUrl}${'/profile/upload' + scope.row.contractDocument}`)">
@@ -77,11 +77,11 @@
           </el-link>
         </template>
       </el-table-column>
-      <!-- <el-table-column label="拟稿日期" align="center" prop="draftTime" width="180">
+      <el-table-column label="拟稿日期" align="center" prop="draftTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.draftTime, '{y}-{m}-{d}') }}</span>
         </template>
-      </el-table-column> -->
+      </el-table-column>
       <el-table-column label="签订日期" align="center" prop="signDate" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.signDate, '{y}-{m}-{d}') }}</span>
@@ -97,10 +97,12 @@
       </el-table-column>
       <el-table-column label="评审方式" align="center" prop="commentType">
         <template slot-scope="scope">
-          {{ getCommentType(scope.row.commentType) }}
+          <el-tag :type="scope.row.commentType == '2' ? 'success' : 'warning'">
+            {{ getCommentType(scope.row.commentType) }}
+          </el-tag>
         </template>
       </el-table-column>
-      <el-table-column label="合同备注" align="center" prop="remark" />
+      <!-- <el-table-column label="合同备注" align="center" prop="remark" /> -->
       <el-table-column label="拟稿人" align="center" prop="drafter">
         <template slot-scope="scope">
           {{ getUserName(scope.row.drafter) }}

oa-ui/src/views/oa/contract/subContract.vue

@@ -40,24 +40,25 @@
       <el-table-column label="分包合同金额" align="center" prop="subAmount" />
       <el-table-column label="承接单位" align="center" prop="partner.partnerName" />
       <!-- <el-table-column label="承接单位联系人" align="center" prop="contactPerson" /> -->
-      <el-table-column label="拟稿人" align="center" prop="drafter">
+      <el-table-column label="合同文件" align="center" prop="contractDocument" show-overflow-tooltip>
         <template slot-scope="scope">
-          {{ getUserName(scope.row.drafter) }}
+          <el-link type="primary" @click="reviewWord(`${baseUrl}${'/profile/upload' + scope.row.contractDocument}`)">
+            {{ getFileName(scope.row.contractDocument) }}
+          </el-link>
         </template>
       </el-table-column>
-
       <el-table-column label="拟稿日期" align="center" prop="draftTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.draftTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="合同备注" align="center" prop="remark" />
+      <!-- <el-table-column label="合同备注" align="center" prop="remark" /> -->
       <el-table-column label="签订日期" align="center" prop="signDate" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.signDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="签订备注" align="center" prop="signRemark" />
+      <!-- <el-table-column label="签订备注" align="center" prop="signRemark" /> -->
       <el-table-column label="签订扫描件" align="center" prop="signScan">
         <template slot-scope="scope">
           <el-link type="primary" @click="reviewWord(`${baseUrl}${'/profile/upload' + scope.row.signScan}`)">
@@ -72,6 +73,12 @@
           </el-tag>
         </template>
       </el-table-column>
+      <el-table-column label="拟稿人" align="center" prop="drafter">
+        <template slot-scope="scope">
+          {{ getUserName(scope.row.drafter) }}
+        </template>
+      </el-table-column>
+
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button size="mini" type="text" icon="el-icon-view" @click="handleView(scope.row)"
@@ -129,7 +136,7 @@
     </el-dialog>
 
     <el-dialog :title="title" :visible.sync="openInfo" append-to-body width="70%">
-      <sub-contract :taskForm="taskForm" :flowDisabled="false"></sub-contract>
+      <sub-contract :taskForm="taskForm" :taskName="''" :flowDisabled="false"></sub-contract>
     </el-dialog>
   </div>
 </template>

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

@@ -0,0 +1,235 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <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:manageDept: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:manageDept: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:manageDept: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:manageDept:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="manageDeptList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="分管领导id" align="center" prop="userId" />
+      <el-table-column label="分管部门id" align="center" prop="deptId" />
+      <el-table-column label="院内对接单位" align="center" prop="partyAId" />
+      <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:manageDept:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['oa:manageDept:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改cmc领导分管对话框 -->
+    <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>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listManageDept, getManageDept, delManageDept, addManageDept, updateManageDept } from "@/api/oa/manage/manageDept";
+
+export default {
+  name: "ManageDept",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // cmc领导分管表格数据
+      manageDeptList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询cmc领导分管列表 */
+    getList() {
+      this.loading = true;
+      listManageDept(this.queryParams).then(response => {
+        this.manageDeptList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        userId: null,
+        deptId: null,
+        partyAId: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.userId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加cmc领导分管";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const userId = row.userId || this.ids
+      getManageDept(userId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改cmc领导分管";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.userId != null) {
+            updateManageDept(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addManageDept(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const userIds = row.userId || this.ids;
+      this.$modal.confirm('是否确认删除cmc领导分管编号为"' + userIds + '"的数据项？').then(function() {
+        return delManageDept(userIds);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('oa/manageDept/export', {
+        ...this.queryParams
+      }, `manageDept_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>

oa-ui/src/views/oa/project/info.vue

@@ -444,7 +444,7 @@
       <safe-tab :taskForm="taskForm"></safe-tab>
     </el-dialog>
     <el-dialog title="技术交底记录表" :visible.sync="openTech" width="1000px" append-to-body>
-      <plan-tab :taskForm="taskForm"></plan-tab>
+      <technical-tab :taskForm="taskForm"></technical-tab>
     </el-dialog>
     <el-dialog title="更换项目负责人" :visible.sync="prLeaderOpen" width="1000px" append-to-body>
       <choose-people :multiple="false" @chooseUser="changeProjectLeader"></choose-people>
@@ -466,14 +466,15 @@ import { listDevice } from "@/api/oa/device/device";
 import { listCar } from '@/api/oa/car/car';
 import budgetInfo from '@/views/flowable/form/budget/budgetInfo.vue';
 import SafeTab from '@/views/flowable/form/projectProcess/safeTab.vue';
-import PlanTab from '@/views/flowable/form/projectProcess/planTab.vue';
+import PlanTab from '@/views/flowable/form/projectProcess/technicalTab.vue';
+import TechnicalTab from '@/views/flowable/form/projectProcess/planTab.vue';
 import SettleData from '@/views/flowable/form/inProgress/settleData.vue';
 import BorrowData from '@/views/flowable/form/inProgress/borrowData.vue';
 import BudgetTab from '@/views/flowable/form/projectProcess/budgetTab.vue';
 import achiData from "@/views/flowable/form/inProgress/achiData.vue";
 import choosePeople from '@/views/flowable/form/budget/components/choosePeople.vue'
 export default {
-  components: { budgetInfo, SafeTab, PlanTab, SettleData, BorrowData, BudgetTab, achiData, choosePeople },
+  components: { budgetInfo, SafeTab, TechnicalTab, PlanTab, SettleData, BorrowData, BudgetTab, achiData, choosePeople },
   created() {
     this.getUserList();
     this.getDeviceList();

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

@@ -0,0 +1,275 @@
+<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="项目编号" 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">
+          <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>
+        <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="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
+          v-hasPermi="['oa:technical:export']">导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="technicalList" @selection-change="handleSelectionChange">
+      <el-table-column type="index" label="序号" width="55" align="center" />
+      <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="disclosureComment" width="180" show-overflow-tooltip />
+      <el-table-column label="技术交底时间" align="center" prop="disclosureTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.disclosureTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="接受交底时间" align="center" prop="acceptTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.acceptTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button size="mini" type="text" icon="el-icon-view" @click="handleView(scope.row)"
+            v-hasPermi="['oa:technical:query']">查看</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+      @pagination="getList" />
+
+    <!-- 添加或修改cmc技术交底对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="项目id" prop="projectId">
+          <el-input v-model="form.projectId" placeholder="请输入项目id" />
+        </el-form-item>
+        <el-form-item label="接受交底人" prop="disclosureAccepter">
+          <el-input v-model="form.disclosureAccepter" placeholder="请输入接受交底人" />
+        </el-form-item>
+        <el-form-item label="技术交底人" prop="disclosurer">
+          <el-input v-model="form.disclosurer" placeholder="请输入技术交底人" />
+        </el-form-item>
+        <el-form-item label="环境要求" prop="environmentComment">
+          <el-input v-model="form.environmentComment" placeholder="请输入环境要求" />
+        </el-form-item>
+        <el-form-item label="外业要求" prop="outsideComment">
+          <el-input v-model="form.outsideComment" placeholder="请输入外业要求" />
+        </el-form-item>
+        <el-form-item label="内业要求" prop="insideComment">
+          <el-input v-model="form.insideComment" placeholder="请输入内业要求" />
+        </el-form-item>
+        <el-form-item label="技术交底意见" prop="disclosureComment">
+          <el-input v-model="form.disclosureComment" placeholder="请输入技术交底意见" />
+        </el-form-item>
+        <el-form-item label="技术交底时间" prop="disclosureTime">
+          <el-date-picker clearable v-model="form.disclosureTime" type="date" value-format="yyyy-MM-dd"
+            placeholder="请选择技术交底时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="接受交底时间" prop="acceptTime">
+          <el-date-picker clearable v-model="form.acceptTime" 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>
+    <el-dialog :title="title" :visible.sync="infoOpen" width="50%" append-to-body>
+      <technical-tab :taskForm="taskForm"></technical-tab>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listTechnical, getTechnical, delTechnical, addTechnical, updateTechnical } from "@/api/oa/technical/technical";
+import { listProject } from '@/api/oa/project/project';
+import technicalTab from '../../flowable/form/projectProcess/technicalTab.vue';
+
+export default {
+  name: "Technical",
+  components: { technicalTab, },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // cmc技术交底表格数据
+      technicalList: [],
+      projectList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      infoOpen: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        projectId: null,
+        disclosureAccepter: null,
+        disclosurer: null,
+        environmentComment: null,
+        outsideComment: null,
+        insideComment: null,
+        disclosureComment: null,
+        disclosureTime: null,
+        acceptTime: null
+      },
+      // 表单参数
+      form: {},
+      taskForm: {
+        formId:''
+      },
+      // 表单校验
+      rules: {
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询cmc技术交底列表 */
+    getList() {
+      this.loading = true;
+      listTechnical(this.queryParams).then(response => {
+        this.technicalList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    remoteMethod(val) {
+      listProject({
+        pageNum: 1,
+        pageSize: 20, 
+        projectNumber: val
+      }).then(res => {
+        this.projectList = res.rows;
+      })
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        technicalId: null,
+        projectId: null,
+        disclosureAccepter: null,
+        disclosurer: null,
+        disclosureComment: null,
+        disclosureTime: null,
+        acceptTime: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.technicalId)
+      this.single = selection.length !== 1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加cmc技术交底";
+    },
+    handleView(row){
+      this.taskForm.formId = row.projectId;
+      this.infoOpen = true;
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const technicalId = row.technicalId || this.ids
+      getTechnical(technicalId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改cmc技术交底";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.technicalId != null) {
+            updateTechnical(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addTechnical(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const technicalIds = row.technicalId || this.ids;
+      this.$modal.confirm('是否确认删除cmc技术交底编号为"' + technicalIds + '"的数据项？').then(function () {
+        return delTechnical(technicalIds);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => { });
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('oa/technical/export', {
+        ...this.queryParams
+      }, `technical_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>

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

@@ -32,7 +32,7 @@
     <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:technical:export']">导出</el-button>
+          v-hasPermi="['oa:plan:export']">导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
@@ -69,14 +69,14 @@
       </el-table-column> -->
       <el-table-column label="技术方案" align="center" prop="technicalDocument" />
       <el-table-column label="方案说明" align="center" prop="designDescription" />
-      <!-- <el-table-column label="技术审核意见" align="center" prop="technicalComment" />
+      <!-- <el-table-column label="技术质量与安全部审核意见" align="center" prop="technicalComment" />
       <el-table-column label="总工审核意见" align="center" prop="manageComment" /> -->
       <el-table-column label="方案上传时间" align="center" prop="technicalUploadTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.technicalUploadTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <!-- <el-table-column label="技术审核时间" align="center" prop="techApprovalTime" width="180">
+      <!-- <el-table-column label="技术质量与安全部审核时间" align="center" prop="techApprovalTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.techApprovalTime, '{y}-{m}-{d}') }}</span>
         </template>
@@ -89,9 +89,9 @@
       <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-view" @click="handleView(scope.row)"
-            v-hasPermi="['oa:technical:query']">查看</el-button>
+            v-hasPermi="['oa:plan:query']">查看</el-button>
           <!-- <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
-            v-hasPermi="['oa:technical:remove']">删除</el-button> -->
+            v-hasPermi="['oa:plan:remove']">删除</el-button> -->
         </template>
       </el-table-column>
     </el-table>
@@ -131,8 +131,8 @@
         <el-form-item label="方案说明" prop="designDescription">
           <el-input v-model="form.designDescription" placeholder="请输入方案说明" />
         </el-form-item>
-        <el-form-item label="技术审核意见" prop="technicalComment">
-          <el-input v-model="form.technicalComment" placeholder="请输入技术审核意见" />
+        <el-form-item label="技术质量与安全部审核意见" prop="technicalComment">
+          <el-input v-model="form.technicalComment" placeholder="请输入技术质量与安全部审核意见" />
         </el-form-item>
         <el-form-item label="总工审核意见" prop="manageComment">
           <el-input v-model="form.manageComment" placeholder="请输入总工审核意见" />
@@ -142,9 +142,9 @@
             placeholder="请选择方案上传时间">
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="技术审核时间" prop="techApprovalTime">
+        <el-form-item label="技术质量与安全部审核时间" prop="techApprovalTime">
           <el-date-picker clearable v-model="form.techApprovalTime" type="date" value-format="yyyy-MM-dd"
-            placeholder="请选择技术审核时间">
+            placeholder="请选择技术质量与安全部审核时间">
           </el-date-picker>
         </el-form-item>
         <el-form-item label="总工审核时间" prop="manageApprovalTime">