项目流转调用子流程活动

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

 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.common.utils.SnowFlake;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
     @PostMapping
     public AjaxResult add(@RequestBody CmcBudget cmcBudget)
     {
-        return toAjax(cmcBudgetService.insertCmcBudget(cmcBudget));
-    }
-
-    /**
-     * 新增cmc预算管理
-     */
-    @PreAuthorize("@ss.hasPermi('oa:budget:add')")
-    @Log(title = "cmc预算管理", businessType = BusinessType.INSERT)
-    @PostMapping( "/submit")
-    public AjaxResult submit(@RequestParam("form")String formData)
-    {
-        CmcBudget cmcBudget = new CmcBudget();
         cmcBudget.setCompiler(getLoginUser().getUserId());
         return toAjax(cmcBudgetService.insertCmcBudget(cmcBudget));
     }
     @PutMapping
     public AjaxResult edit(@RequestBody CmcBudget cmcBudget)
     {
+        cmcBudget.setAuditor(getLoginUser().getUserId());
         return toAjax(cmcBudgetService.updateCmcBudget(cmcBudget));
     }
 

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

+package com.ruoyi.web.controller.oa;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.security.access.prepost.PreAuthorize;
+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.CmcSafe;
+import com.ruoyi.oa.service.ICmcSafeService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * cmc安全交底Controller
+ * 
+ * @author cmc
+ * @date 2024-04-03
+ */
+@RestController
+@RequestMapping("/oa/safe")
+public class CmcSafeController extends BaseController
+{
+    @Autowired
+    private ICmcSafeService cmcSafeService;
+
+    /**
+     * 查询cmc安全交底列表
+     */
+    @PreAuthorize("@ss.hasPermi('oa:safe:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(CmcSafe cmcSafe)
+    {
+        startPage();
+        List<CmcSafe> list = cmcSafeService.selectCmcSafeList(cmcSafe);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出cmc安全交底列表
+     */
+    @PreAuthorize("@ss.hasPermi('oa:safe:export')")
+    @Log(title = "cmc安全交底", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, CmcSafe cmcSafe)
+    {
+        List<CmcSafe> list = cmcSafeService.selectCmcSafeList(cmcSafe);
+        ExcelUtil<CmcSafe> util = new ExcelUtil<CmcSafe>(CmcSafe.class);
+        util.exportExcel(response, list, "cmc安全交底数据");
+    }
+
+    /**
+     * 获取cmc安全交底详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('oa:safe:query')")
+    @GetMapping(value = "/{safeId}")
+    public AjaxResult getInfo(@PathVariable("safeId") String safeId)
+    {
+        return success(cmcSafeService.selectCmcSafeBySafeId(safeId));
+    }
+
+    /**
+     * 新增cmc安全交底
+     */
+    @PreAuthorize("@ss.hasPermi('oa:safe:add')")
+    @Log(title = "cmc安全交底", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody CmcSafe cmcSafe)
+    {
+        return toAjax(cmcSafeService.insertCmcSafe(cmcSafe));
+    }
+
+    /**
+     * 修改cmc安全交底
+     */
+    @PreAuthorize("@ss.hasPermi('oa:safe:edit')")
+    @Log(title = "cmc安全交底", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody CmcSafe cmcSafe)
+    {
+        return toAjax(cmcSafeService.updateCmcSafe(cmcSafe));
+    }
+
+    /**
+     * 删除cmc安全交底
+     */
+    @PreAuthorize("@ss.hasPermi('oa:safe:remove')")
+    @Log(title = "cmc安全交底", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{safeIds}")
+    public AjaxResult remove(@PathVariable String[] safeIds)
+    {
+        return toAjax(cmcSafeService.deleteCmcSafeBySafeIds(safeIds));
+    }
+}

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

 import org.flowable.bpmn.model.ExtensionAttribute;
 import org.flowable.bpmn.model.ExtensionElement;
 import org.flowable.bpmn.model.IOParameter;
+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;
     public void notify(DelegateExecution delegateExecution) {
         CallActivity callActivity = (CallActivity)delegateExecution.getCurrentFlowElement();
         String initiator = null;
-        Map<String, List<ExtensionElement>> extensionElements = callActivity.getExtensionElements();
-        for(Map.Entry<String, List<ExtensionElement>> entry: extensionElements.entrySet()) {
-            // 这一层读取的就是 button 类似的标签
-            String attributeName = entry.getKey();
-            List<ExtensionElement> attributeValueList = entry.getValue();
-            if (attributeName.equals("budgetInitiator")) {
-                for(ExtensionElement item: attributeValueList) {
-                    // 处理 类似button  ExtensionElement 里面的属性
-                    Map<String, List<ExtensionAttribute>> extensionElementAttributes = item.getAttributes();
-                    for (Map.Entry<String, List<ExtensionAttribute>> tmpEntry : extensionElementAttributes.entrySet()) {
-                        initiator = tmpEntry.getValue().get(0).getValue(); //  把子流程的发起人找到
-                    }
-                }
-            }
-        }
-        List<IOParameter> ioParameterList = callActivity.getInParameters();
-        for (IOParameter ioParameter: ioParameterList) {
-            String source = ioParameter.getSource();
-            if (source.equals("budgetInitiator")) {
-                delegateExecution.setVariable(source, initiator); // 把子流程的发起人先给到父流程，然后用引擎的能力进行传递
-            }
-        }
+        Map<String, Object> variables = delegateExecution.getVariables();
+        System.out.println(variables);
+        Authentication.setAuthenticatedUserId(variables.get("budgetInitiator").toString());
+        delegateExecution.setVariable("approval", variables.get("budgetInitiator").toString());
+//        List<IOParameter> ioParameterList = callActivity.getInParameters();
+//        for (IOParameter ioParameter: ioParameterList) {
+//            String source = ioParameter.getSource();
+//            if (source.equals("initiator")) {
+//                delegateExecution.setVariable(source, variables.get("budgetInitiator").toString()); // 把子流程的发起人先给到父流程，然后用引擎的能力进行传递
+//            }
+//        }
     }
 }

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

+package com.ruoyi.flowable.oa;
+
+import com.ruoyi.common.utils.SnowFlake;
+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("CallSafeActivityExecutionListener")
+public class CallSafeActivityExecutionListener implements ExecutionListener {
+    @Override
+    public void notify(DelegateExecution delegateExecution) {
+        Authentication.setAuthenticatedUserId("15");
+        delegateExecution.setVariable("safe_id", new SnowFlake().generateId());
+        delegateExecution.setVariable("approval", 15L);
+    }
+}

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

+package com.ruoyi.flowable.oa;
+
+import com.ruoyi.common.utils.SnowFlake;
+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("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("technical_id", new SnowFlake().generateId());
+        delegateExecution.setVariable("approval", userPostMapper.selectDeptLeaderByDeptId("110").getUserId().toString());
+    }
+}

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

+package com.ruoyi.oa.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+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_safe
+ * 
+ * @author cmc
+ * @date 2024-04-03
+ */
+public class CmcSafe extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 项目id */
+    private String safeId;
+
+    /** 项目id */
+    @Excel(name = "项目id")
+    private String projectId;
+
+    /** 接受交底人 */
+    @Excel(name = "接受交底人")
+    private Long disclosureAccepter;
+
+    /** 安全交底人 */
+    @Excel(name = "安全交底人")
+    private Long disclosurer;
+
+    /** 环境要求 */
+    @Excel(name = "环境要求")
+    private String environmentComment;
+
+    /** 外业要求 */
+    @Excel(name = "外业要求")
+    private String outsideComment;
+
+    /** 内业要求 */
+    @Excel(name = "内业要求")
+    private String insideComment;
+
+    /** 安全交底意见 */
+    @Excel(name = "安全交底意见")
+    private String disclosureComment;
+
+    /** 安全交底时间 */
+    @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 setSafeId(String safeId) 
+    {
+        this.safeId = safeId;
+    }
+
+    public String getSafeId() 
+    {
+        return safeId;
+    }
+    public void setProjectId(String projectId) 
+    {
+        this.projectId = projectId;
+    }
+
+    public String getProjectId() 
+    {
+        return projectId;
+    }
+    public void setDisclosureAccepter(Long disclosureAccepter) 
+    {
+        this.disclosureAccepter = disclosureAccepter;
+    }
+
+    public Long getDisclosureAccepter() 
+    {
+        return disclosureAccepter;
+    }
+    public void setDisclosurer(Long disclosurer) 
+    {
+        this.disclosurer = disclosurer;
+    }
+
+    public Long getDisclosurer() 
+    {
+        return disclosurer;
+    }
+    public void setEnvironmentComment(String environmentComment) 
+    {
+        this.environmentComment = environmentComment;
+    }
+
+    public String getEnvironmentComment() 
+    {
+        return environmentComment;
+    }
+    public void setOutsideComment(String outsideComment) 
+    {
+        this.outsideComment = outsideComment;
+    }
+
+    public String getOutsideComment() 
+    {
+        return outsideComment;
+    }
+    public void setInsideComment(String insideComment) 
+    {
+        this.insideComment = insideComment;
+    }
+
+    public String getInsideComment() 
+    {
+        return insideComment;
+    }
+    public void setDisclosureComment(String disclosureComment) 
+    {
+        this.disclosureComment = disclosureComment;
+    }
+
+    public String getDisclosureComment() 
+    {
+        return disclosureComment;
+    }
+    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("safeId", getSafeId())
+            .append("projectId", getProjectId())
+            .append("disclosureAccepter", getDisclosureAccepter())
+            .append("disclosurer", getDisclosurer())
+            .append("environmentComment", getEnvironmentComment())
+            .append("outsideComment", getOutsideComment())
+            .append("insideComment", getInsideComment())
+            .append("disclosureComment", getDisclosureComment())
+            .append("disclosureTime", getDisclosureTime())
+            .append("acceptTime", getAcceptTime())
+            .toString();
+    }
+}

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

 import com.ruoyi.common.core.domain.BaseEntity;
 
 /**
- * cmc技术方案对象 cmc_technical
- * 
+ * cmc技术交底对象 cmc_technical
+ *
  * @author cmc
- * @date 2024-04-02
+ * @date 2024-04-03
  */
 public class CmcTechnical extends BaseEntity
 {
 
     /** 技术安排意见 */
     @Excel(name = "技术安排意见")
-    private String technicalComment;
+    private String planComment;
 
     /** 质量检查员 */
     @Excel(name = "质量检查员")
     @Excel(name = "技术安排时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date technicalTime;
 
-    public void setTechnicalId(String technicalId) 
+    /** 技术方案 */
+    @Excel(name = "技术方案")
+    private String technicalDocument;
+
+    /** 方案说明 */
+    @Excel(name = "方案说明")
+    private String designDescription;
+
+    /** 技术审核意见 */
+    @Excel(name = "技术审核意见")
+    private String technicalComment;
+
+    /** 总工审核意见 */
+    @Excel(name = "总工审核意见")
+    private String manageComment;
+
+    /** 方案上传时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "方案上传时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date technicalUploadTime;
+
+    /** 技术审核时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "技术审核时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date techApprovalTime;
+
+    /** 总工审核时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "总工审核时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date manageApprovalTime;
+
+    public void setTechnicalId(String technicalId)
     {
         this.technicalId = technicalId;
     }
 
-    public String getTechnicalId() 
+    public String getTechnicalId()
     {
         return technicalId;
     }
-    public void setProjectId(String projectId) 
+    public void setProjectId(String projectId)
     {
         this.projectId = projectId;
     }
 
-    public String getProjectId() 
+    public String getProjectId()
     {
         return projectId;
     }
-    public void setTechnicalDirector(Long technicalDirector) 
+    public void setTechnicalDirector(Long technicalDirector)
     {
         this.technicalDirector = technicalDirector;
     }
 
-    public Long getTechnicalDirector() 
+    public Long getTechnicalDirector()
     {
         return technicalDirector;
     }
-    public void setTechnicalDesigner(Long technicalDesigner) 
+    public void setTechnicalDesigner(Long technicalDesigner)
     {
         this.technicalDesigner = technicalDesigner;
     }
 
-    public Long getTechnicalDesigner() 
+    public Long getTechnicalDesigner()
     {
         return technicalDesigner;
     }
-    public void setTechnicalPlanner(Long technicalPlanner) 
+    public void setTechnicalPlanner(Long technicalPlanner)
     {
         this.technicalPlanner = technicalPlanner;
     }
 
-    public Long getTechnicalPlanner() 
+    public Long getTechnicalPlanner()
     {
         return technicalPlanner;
     }
-    public void setTechnicalComment(String technicalComment) 
+    public void setPlanComment(String planComment)
     {
-        this.technicalComment = technicalComment;
+        this.planComment = planComment;
     }
 
-    public String getTechnicalComment() 
+    public String getPlanComment()
     {
-        return technicalComment;
+        return planComment;
     }
-    public void setQualityInspector(String qualityInspector) 
+    public void setQualityInspector(String qualityInspector)
     {
         this.qualityInspector = qualityInspector;
     }
 
-    public String getQualityInspector() 
+    public String getQualityInspector()
     {
         return qualityInspector;
     }
-    public void setTechnicalTime(Date technicalTime) 
+    public void setTechnicalTime(Date technicalTime)
     {
         this.technicalTime = technicalTime;
     }
 
-    public Date getTechnicalTime() 
+    public Date getTechnicalTime()
     {
         return technicalTime;
     }
+    public void setTechnicalDocument(String technicalDocument)
+    {
+        this.technicalDocument = technicalDocument;
+    }
+
+    public String getTechnicalDocument()
+    {
+        return technicalDocument;
+    }
+    public void setDesignDescription(String designDescription)
+    {
+        this.designDescription = designDescription;
+    }
+
+    public String getDesignDescription()
+    {
+        return designDescription;
+    }
+    public void setTechnicalComment(String technicalComment)
+    {
+        this.technicalComment = technicalComment;
+    }
+
+    public String getTechnicalComment()
+    {
+        return technicalComment;
+    }
+    public void setManageComment(String manageComment)
+    {
+        this.manageComment = manageComment;
+    }
+
+    public String getManageComment()
+    {
+        return manageComment;
+    }
+    public void setTechnicalUploadTime(Date technicalUploadTime)
+    {
+        this.technicalUploadTime = technicalUploadTime;
+    }
+
+    public Date getTechnicalUploadTime()
+    {
+        return technicalUploadTime;
+    }
+    public void setTechApprovalTime(Date techApprovalTime)
+    {
+        this.techApprovalTime = techApprovalTime;
+    }
+
+    public Date getTechApprovalTime()
+    {
+        return techApprovalTime;
+    }
+    public void setManageApprovalTime(Date manageApprovalTime)
+    {
+        this.manageApprovalTime = manageApprovalTime;
+    }
+
+    public Date getManageApprovalTime()
+    {
+        return manageApprovalTime;
+    }
 
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("technicalId", getTechnicalId())
-            .append("projectId", getProjectId())
-            .append("technicalDirector", getTechnicalDirector())
-            .append("technicalDesigner", getTechnicalDesigner())
-            .append("technicalPlanner", getTechnicalPlanner())
-            .append("technicalComment", getTechnicalComment())
-            .append("qualityInspector", getQualityInspector())
-            .append("technicalTime", getTechnicalTime())
-            .toString();
+                .append("technicalId", getTechnicalId())
+                .append("projectId", getProjectId())
+                .append("technicalDirector", getTechnicalDirector())
+                .append("technicalDesigner", getTechnicalDesigner())
+                .append("technicalPlanner", getTechnicalPlanner())
+                .append("planComment", getPlanComment())
+                .append("qualityInspector", getQualityInspector())
+                .append("technicalTime", getTechnicalTime())
+                .append("technicalDocument", getTechnicalDocument())
+                .append("designDescription", getDesignDescription())
+                .append("technicalComment", getTechnicalComment())
+                .append("manageComment", getManageComment())
+                .append("technicalUploadTime", getTechnicalUploadTime())
+                .append("techApprovalTime", getTechApprovalTime())
+                .append("manageApprovalTime", getManageApprovalTime())
+                .toString();
     }
 }

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

+package com.ruoyi.oa.mapper;
+
+import java.util.List;
+import com.ruoyi.oa.domain.CmcSafe;
+
+/**
+ * cmc安全交底Mapper接口
+ * 
+ * @author cmc
+ * @date 2024-04-03
+ */
+public interface CmcSafeMapper 
+{
+    /**
+     * 查询cmc安全交底
+     * 
+     * @param safeId cmc安全交底主键
+     * @return cmc安全交底
+     */
+    public CmcSafe selectCmcSafeBySafeId(String safeId);
+
+    /**
+     * 查询cmc安全交底列表
+     * 
+     * @param cmcSafe cmc安全交底
+     * @return cmc安全交底集合
+     */
+    public List<CmcSafe> selectCmcSafeList(CmcSafe cmcSafe);
+
+    /**
+     * 新增cmc安全交底
+     * 
+     * @param cmcSafe cmc安全交底
+     * @return 结果
+     */
+    public int insertCmcSafe(CmcSafe cmcSafe);
+
+    /**
+     * 修改cmc安全交底
+     * 
+     * @param cmcSafe cmc安全交底
+     * @return 结果
+     */
+    public int updateCmcSafe(CmcSafe cmcSafe);
+
+    /**
+     * 删除cmc安全交底
+     * 
+     * @param safeId cmc安全交底主键
+     * @return 结果
+     */
+    public int deleteCmcSafeBySafeId(String safeId);
+
+    /**
+     * 批量删除cmc安全交底
+     * 
+     * @param safeIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteCmcSafeBySafeIds(String[] safeIds);
+}

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

+package com.ruoyi.oa.service;
+
+import java.util.List;
+import com.ruoyi.oa.domain.CmcSafe;
+
+/**
+ * cmc安全交底Service接口
+ * 
+ * @author cmc
+ * @date 2024-04-03
+ */
+public interface ICmcSafeService 
+{
+    /**
+     * 查询cmc安全交底
+     * 
+     * @param safeId cmc安全交底主键
+     * @return cmc安全交底
+     */
+    public CmcSafe selectCmcSafeBySafeId(String safeId);
+
+    /**
+     * 查询cmc安全交底列表
+     * 
+     * @param cmcSafe cmc安全交底
+     * @return cmc安全交底集合
+     */
+    public List<CmcSafe> selectCmcSafeList(CmcSafe cmcSafe);
+
+    /**
+     * 新增cmc安全交底
+     * 
+     * @param cmcSafe cmc安全交底
+     * @return 结果
+     */
+    public int insertCmcSafe(CmcSafe cmcSafe);
+
+    /**
+     * 修改cmc安全交底
+     * 
+     * @param cmcSafe cmc安全交底
+     * @return 结果
+     */
+    public int updateCmcSafe(CmcSafe cmcSafe);
+
+    /**
+     * 批量删除cmc安全交底
+     * 
+     * @param safeIds 需要删除的cmc安全交底主键集合
+     * @return 结果
+     */
+    public int deleteCmcSafeBySafeIds(String[] safeIds);
+
+    /**
+     * 删除cmc安全交底信息
+     * 
+     * @param safeId cmc安全交底主键
+     * @return 结果
+     */
+    public int deleteCmcSafeBySafeId(String safeId);
+}

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

+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.CmcSafeMapper;
+import com.ruoyi.oa.domain.CmcSafe;
+import com.ruoyi.oa.service.ICmcSafeService;
+
+/**
+ * cmc安全交底Service业务层处理
+ * 
+ * @author cmc
+ * @date 2024-04-03
+ */
+@Service
+public class CmcSafeServiceImpl implements ICmcSafeService 
+{
+    @Autowired
+    private CmcSafeMapper cmcSafeMapper;
+
+    /**
+     * 查询cmc安全交底
+     * 
+     * @param safeId cmc安全交底主键
+     * @return cmc安全交底
+     */
+    @Override
+    public CmcSafe selectCmcSafeBySafeId(String safeId)
+    {
+        return cmcSafeMapper.selectCmcSafeBySafeId(safeId);
+    }
+
+    /**
+     * 查询cmc安全交底列表
+     * 
+     * @param cmcSafe cmc安全交底
+     * @return cmc安全交底
+     */
+    @Override
+    public List<CmcSafe> selectCmcSafeList(CmcSafe cmcSafe)
+    {
+        return cmcSafeMapper.selectCmcSafeList(cmcSafe);
+    }
+
+    /**
+     * 新增cmc安全交底
+     * 
+     * @param cmcSafe cmc安全交底
+     * @return 结果
+     */
+    @Override
+    public int insertCmcSafe(CmcSafe cmcSafe)
+    {
+        return cmcSafeMapper.insertCmcSafe(cmcSafe);
+    }
+
+    /**
+     * 修改cmc安全交底
+     * 
+     * @param cmcSafe cmc安全交底
+     * @return 结果
+     */
+    @Override
+    public int updateCmcSafe(CmcSafe cmcSafe)
+    {
+        return cmcSafeMapper.updateCmcSafe(cmcSafe);
+    }
+
+    /**
+     * 批量删除cmc安全交底
+     * 
+     * @param safeIds 需要删除的cmc安全交底主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCmcSafeBySafeIds(String[] safeIds)
+    {
+        return cmcSafeMapper.deleteCmcSafeBySafeIds(safeIds);
+    }
+
+    /**
+     * 删除cmc安全交底信息
+     * 
+     * @param safeId cmc安全交底主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCmcSafeBySafeId(String safeId)
+    {
+        return cmcSafeMapper.deleteCmcSafeBySafeId(safeId);
+    }
+}

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

+<?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.CmcSafeMapper">
+    
+    <resultMap type="CmcSafe" id="CmcSafeResult">
+        <result property="safeId"    column="safe_id"    />
+        <result property="projectId"    column="project_id"    />
+        <result property="disclosureAccepter"    column="disclosure_accepter"    />
+        <result property="disclosurer"    column="disclosurer"    />
+        <result property="environmentComment"    column="environment_comment"    />
+        <result property="outsideComment"    column="outside_comment"    />
+        <result property="insideComment"    column="inside_comment"    />
+        <result property="disclosureComment"    column="disclosure_comment"    />
+        <result property="disclosureTime"    column="disclosure_time"    />
+        <result property="acceptTime"    column="accept_time"    />
+    </resultMap>
+
+    <sql id="selectCmcSafeVo">
+        select safe_id, project_id, disclosure_accepter, disclosurer, environment_comment, outside_comment, inside_comment, disclosure_comment, disclosure_time, accept_time from cmc_safe
+    </sql>
+
+    <select id="selectCmcSafeList" parameterType="CmcSafe" resultMap="CmcSafeResult">
+        <include refid="selectCmcSafeVo"/>
+        <where>  
+            <if test="projectId != null  and projectId != ''"> and project_id = #{projectId}</if>
+            <if test="disclosureAccepter != null "> and disclosure_accepter = #{disclosureAccepter}</if>
+            <if test="disclosurer != null "> and disclosurer = #{disclosurer}</if>
+            <if test="environmentComment != null  and environmentComment != ''"> and environment_comment = #{environmentComment}</if>
+            <if test="outsideComment != null  and outsideComment != ''"> and outside_comment = #{outsideComment}</if>
+            <if test="insideComment != null  and insideComment != ''"> and inside_comment = #{insideComment}</if>
+            <if test="disclosureComment != null  and disclosureComment != ''"> and disclosure_comment = #{disclosureComment}</if>
+            <if test="disclosureTime != null "> and disclosure_time = #{disclosureTime}</if>
+            <if test="acceptTime != null "> and accept_time = #{acceptTime}</if>
+        </where>
+    </select>
+    
+    <select id="selectCmcSafeBySafeId" parameterType="String" resultMap="CmcSafeResult">
+        <include refid="selectCmcSafeVo"/>
+        where safe_id = #{safeId}
+    </select>
+        
+    <insert id="insertCmcSafe" parameterType="CmcSafe">
+        insert into cmc_safe
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="safeId != null">safe_id,</if>
+            <if test="projectId != null">project_id,</if>
+            <if test="disclosureAccepter != null">disclosure_accepter,</if>
+            <if test="disclosurer != null">disclosurer,</if>
+            <if test="environmentComment != null">environment_comment,</if>
+            <if test="outsideComment != null">outside_comment,</if>
+            <if test="insideComment != null">inside_comment,</if>
+            <if test="disclosureComment != null">disclosure_comment,</if>
+            <if test="disclosureTime != null">disclosure_time,</if>
+            <if test="acceptTime != null">accept_time,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="safeId != null">#{safeId},</if>
+            <if test="projectId != null">#{projectId},</if>
+            <if test="disclosureAccepter != null">#{disclosureAccepter},</if>
+            <if test="disclosurer != null">#{disclosurer},</if>
+            <if test="environmentComment != null">#{environmentComment},</if>
+            <if test="outsideComment != null">#{outsideComment},</if>
+            <if test="insideComment != null">#{insideComment},</if>
+            <if test="disclosureComment != null">#{disclosureComment},</if>
+            <if test="disclosureTime != null">#{disclosureTime},</if>
+            <if test="acceptTime != null">#{acceptTime},</if>
+         </trim>
+    </insert>
+
+    <update id="updateCmcSafe" parameterType="CmcSafe">
+        update cmc_safe
+        <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="environmentComment != null">environment_comment = #{environmentComment},</if>
+            <if test="outsideComment != null">outside_comment = #{outsideComment},</if>
+            <if test="insideComment != null">inside_comment = #{insideComment},</if>
+            <if test="disclosureComment != null">disclosure_comment = #{disclosureComment},</if>
+            <if test="disclosureTime != null">disclosure_time = #{disclosureTime},</if>
+            <if test="acceptTime != null">accept_time = #{acceptTime},</if>
+        </trim>
+        where safe_id = #{safeId}
+    </update>
+
+    <delete id="deleteCmcSafeBySafeId" parameterType="String">
+        delete from cmc_safe where safe_id = #{safeId}
+    </delete>
+
+    <delete id="deleteCmcSafeBySafeIds" parameterType="String">
+        delete from cmc_safe where safe_id in 
+        <foreach item="safeId" collection="array" open="(" separator="," close=")">
+            #{safeId}
+        </foreach>
+    </delete>
+</mapper>

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

 <?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">
+        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="technicalDirector"    column="technical_director"    />
         <result property="technicalDesigner"    column="technical_designer"    />
         <result property="technicalPlanner"    column="technical_planner"    />
-        <result property="technicalComment"    column="technical_comment"    />
+        <result property="planComment"    column="plan_comment"    />
         <result property="qualityInspector"    column="quality_inspector"    />
         <result property="technicalTime"    column="technical_time"    />
+        <result property="technicalDocument"    column="technical_document"    />
+        <result property="designDescription"    column="design_description"    />
+        <result property="technicalComment"    column="technical_comment"    />
+        <result property="manageComment"    column="manage_comment"    />
+        <result property="technicalUploadTime"    column="technical_upload_time"    />
+        <result property="techApprovalTime"    column="tech_approval_time"    />
+        <result property="manageApprovalTime"    column="manage_approval_time"    />
     </resultMap>
 
     <sql id="selectCmcTechnicalVo">
-        select technical_id, project_id, technical_director, technical_designer, technical_planner, technical_comment, quality_inspector, technical_time from cmc_technical
+        select technical_id, project_id, technical_director, technical_designer, technical_planner, plan_comment, quality_inspector, technical_time, technical_document, design_description, technical_comment, manage_comment, technical_upload_time, tech_approval_time, manage_approval_time from cmc_technical
     </sql>
 
     <select id="selectCmcTechnicalList" parameterType="CmcTechnical" resultMap="CmcTechnicalResult">
         <include refid="selectCmcTechnicalVo"/>
-        <where>  
+        <where>
             <if test="projectId != null  and projectId != ''"> and project_id = #{projectId}</if>
             <if test="technicalDirector != null "> and technical_director = #{technicalDirector}</if>
             <if test="technicalDesigner != null "> and technical_designer = #{technicalDesigner}</if>
             <if test="technicalPlanner != null "> and technical_planner = #{technicalPlanner}</if>
-            <if test="technicalComment != null  and technicalComment != ''"> and technical_comment = #{technicalComment}</if>
+            <if test="planComment != null  and planComment != ''"> and plan_comment = #{planComment}</if>
             <if test="qualityInspector != null  and qualityInspector != ''"> and quality_inspector = #{qualityInspector}</if>
             <if test="technicalTime != null "> and technical_time = #{technicalTime}</if>
+            <if test="technicalDocument != null  and technicalDocument != ''"> and technical_document = #{technicalDocument}</if>
+            <if test="designDescription != null  and designDescription != ''"> and design_description = #{designDescription}</if>
+            <if test="technicalComment != null  and technicalComment != ''"> and technical_comment = #{technicalComment}</if>
+            <if test="manageComment != null  and manageComment != ''"> and manage_comment = #{manageComment}</if>
+            <if test="technicalUploadTime != null "> and technical_upload_time = #{technicalUploadTime}</if>
+            <if test="techApprovalTime != null "> and tech_approval_time = #{techApprovalTime}</if>
+            <if test="manageApprovalTime != null "> and manage_approval_time = #{manageApprovalTime}</if>
         </where>
     </select>
-    
+
     <select id="selectCmcTechnicalByTechnicalId" parameterType="String" resultMap="CmcTechnicalResult">
         <include refid="selectCmcTechnicalVo"/>
         where technical_id = #{technicalId}
     </select>
-        
+
     <insert id="insertCmcTechnical" parameterType="CmcTechnical">
         insert into cmc_technical
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="technicalDirector != null">technical_director,</if>
             <if test="technicalDesigner != null">technical_designer,</if>
             <if test="technicalPlanner != null">technical_planner,</if>
-            <if test="technicalComment != null">technical_comment,</if>
+            <if test="planComment != null">plan_comment,</if>
             <if test="qualityInspector != null">quality_inspector,</if>
             <if test="technicalTime != null">technical_time,</if>
-         </trim>
+            <if test="technicalDocument != null">technical_document,</if>
+            <if test="designDescription != null">design_description,</if>
+            <if test="technicalComment != null">technical_comment,</if>
+            <if test="manageComment != null">manage_comment,</if>
+            <if test="technicalUploadTime != null">technical_upload_time,</if>
+            <if test="techApprovalTime != null">tech_approval_time,</if>
+            <if test="manageApprovalTime != null">manage_approval_time,</if>
+        </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="technicalId != null">#{technicalId},</if>
             <if test="projectId != null">#{projectId},</if>
             <if test="technicalDirector != null">#{technicalDirector},</if>
             <if test="technicalDesigner != null">#{technicalDesigner},</if>
             <if test="technicalPlanner != null">#{technicalPlanner},</if>
-            <if test="technicalComment != null">#{technicalComment},</if>
+            <if test="planComment != null">#{planComment},</if>
             <if test="qualityInspector != null">#{qualityInspector},</if>
             <if test="technicalTime != null">#{technicalTime},</if>
-         </trim>
+            <if test="technicalDocument != null">#{technicalDocument},</if>
+            <if test="designDescription != null">#{designDescription},</if>
+            <if test="technicalComment != null">#{technicalComment},</if>
+            <if test="manageComment != null">#{manageComment},</if>
+            <if test="technicalUploadTime != null">#{technicalUploadTime},</if>
+            <if test="techApprovalTime != null">#{techApprovalTime},</if>
+            <if test="manageApprovalTime != null">#{manageApprovalTime},</if>
+        </trim>
     </insert>
 
     <update id="updateCmcTechnical" parameterType="CmcTechnical">
             <if test="technicalDirector != null">technical_director = #{technicalDirector},</if>
             <if test="technicalDesigner != null">technical_designer = #{technicalDesigner},</if>
             <if test="technicalPlanner != null">technical_planner = #{technicalPlanner},</if>
-            <if test="technicalComment != null">technical_comment = #{technicalComment},</if>
+            <if test="planComment != null">plan_comment = #{planComment},</if>
             <if test="qualityInspector != null">quality_inspector = #{qualityInspector},</if>
             <if test="technicalTime != null">technical_time = #{technicalTime},</if>
+            <if test="technicalDocument != null">technical_document = #{technicalDocument},</if>
+            <if test="designDescription != null">design_description = #{designDescription},</if>
+            <if test="technicalComment != null">technical_comment = #{technicalComment},</if>
+            <if test="manageComment != null">manage_comment = #{manageComment},</if>
+            <if test="technicalUploadTime != null">technical_upload_time = #{technicalUploadTime},</if>
+            <if test="techApprovalTime != null">tech_approval_time = #{techApprovalTime},</if>
+            <if test="manageApprovalTime != null">manage_approval_time = #{manageApprovalTime},</if>
         </trim>
         where technical_id = #{technicalId}
     </update>
     </delete>
 
     <delete id="deleteCmcTechnicalByTechnicalIds" parameterType="String">
-        delete from cmc_technical where technical_id in 
+        delete from cmc_technical where technical_id in
         <foreach item="technicalId" collection="array" open="(" separator="," close=")">
             #{technicalId}
         </foreach>

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

+/*
+ * @Author: wrh
+ * @Date: 2024-03-22 17:42:30
+ * @LastEditors: wrh
+ * @LastEditTime: 2024-04-03 10:10:01
+ */
 import request from '@/utils/request'
 
 // 查询cmc预算管理列表
   })
 }
 
-// 新增cmc预算管理
-export function submitBudget(data) {
-  return request({
-    url: '/oa/budget/submit',
-    method: 'post',
-    data: data
-  })
-}
-
 // 修改cmc预算管理
 export function updateBudget(data) {
   return request({

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

+import request from '@/utils/request'
+
+// 查询cmc安全交底列表
+export function listSafe(query) {
+  return request({
+    url: '/oa/safe/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询cmc安全交底详细
+export function getSafe(safeId) {
+  return request({
+    url: '/oa/safe/' + safeId,
+    method: 'get'
+  })
+}
+
+// 新增cmc安全交底
+export function addSafe(data) {
+  return request({
+    url: '/oa/safe',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改cmc安全交底
+export function updateSafe(data) {
+  return request({
+    url: '/oa/safe',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除cmc安全交底
+export function delSafe(safeId) {
+  return request({
+    url: '/oa/safe/' + safeId,
+    method: 'delete'
+  })
+}

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

+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/projectProcess/arrangeProject.vue

  * @Author: ysh
  * @Date: 2024-03-19 09:24:06
  * @LastEditors: wrh
- * @LastEditTime: 2024-04-02 17:45:20
+ * @LastEditTime: 2024-04-03 10:13:04
 -->
 <template>
   <div class="app-container">

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

+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="项目id" prop="projectId">
+        <el-input
+          v-model="queryParams.projectId"
+          placeholder="请输入项目id"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="接受交底人" prop="disclosureAccepter">
+        <el-input
+          v-model="queryParams.disclosureAccepter"
+          placeholder="请输入接受交底人"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="安全交底人" prop="disclosurer">
+        <el-input
+          v-model="queryParams.disclosurer"
+          placeholder="请输入安全交底人"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="环境要求" prop="environmentComment">
+        <el-input
+          v-model="queryParams.environmentComment"
+          placeholder="请输入环境要求"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="外业要求" prop="outsideComment">
+        <el-input
+          v-model="queryParams.outsideComment"
+          placeholder="请输入外业要求"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="内业要求" prop="insideComment">
+        <el-input
+          v-model="queryParams.insideComment"
+          placeholder="请输入内业要求"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="安全交底意见" prop="disclosureComment">
+        <el-input
+          v-model="queryParams.disclosureComment"
+          placeholder="请输入安全交底意见"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="安全交底时间" prop="disclosureTime">
+        <el-date-picker clearable
+          v-model="queryParams.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="queryParams.acceptTime"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择接受交底时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['oa:safe:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['oa:safe:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['oa:safe:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['oa:safe:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="safeList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="项目id" align="center" prop="safeId" />
+      <el-table-column label="项目id" align="center" prop="projectId" />
+      <el-table-column label="接受交底人" align="center" prop="disclosureAccepter" />
+      <el-table-column label="安全交底人" align="center" prop="disclosurer" />
+      <el-table-column label="环境要求" align="center" prop="environmentComment" />
+      <el-table-column label="外业要求" align="center" prop="outsideComment" />
+      <el-table-column label="内业要求" align="center" prop="insideComment" />
+      <el-table-column label="安全交底意见" align="center" prop="disclosureComment" />
+      <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-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['oa:safe:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['oa:safe:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    
+    <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>
+  </div>
+</template>
+
+<script>
+import { listSafe, getSafe, delSafe, addSafe, updateSafe } from "@/api/oa/safe/safe";
+
+export default {
+  name: "Safe",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // cmc安全交底表格数据
+      safeList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: 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: {},
+      // 表单校验
+      rules: {
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询cmc安全交底列表 */
+    getList() {
+      this.loading = true;
+      listSafe(this.queryParams).then(response => {
+        this.safeList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        safeId: null,
+        projectId: null,
+        disclosureAccepter: null,
+        disclosurer: null,
+        environmentComment: null,
+        outsideComment: null,
+        insideComment: 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.safeId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加cmc安全交底";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const safeId = row.safeId || this.ids
+      getSafe(safeId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改cmc安全交底";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.safeId != null) {
+            updateSafe(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addSafe(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const safeIds = row.safeId || this.ids;
+      this.$modal.confirm('是否确认删除cmc安全交底编号为"' + safeIds + '"的数据项？').then(function() {
+        return delSafe(safeIds);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('oa/safe/export', {
+        ...this.queryParams
+      }, `safe_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>

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

+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="项目id" prop="projectId">
+        <el-input
+          v-model="queryParams.projectId"
+          placeholder="请输入项目id"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="技术负责人" prop="technicalDirector">
+        <el-input
+          v-model="queryParams.technicalDirector"
+          placeholder="请输入技术负责人"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="技术设计人" prop="technicalDesigner">
+        <el-input
+          v-model="queryParams.technicalDesigner"
+          placeholder="请输入技术设计人"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="技术安排人" prop="technicalPlanner">
+        <el-input
+          v-model="queryParams.technicalPlanner"
+          placeholder="请输入技术安排人"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="技术安排意见" prop="planComment">
+        <el-input
+          v-model="queryParams.planComment"
+          placeholder="请输入技术安排意见"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="质量检查员" prop="qualityInspector">
+        <el-input
+          v-model="queryParams.qualityInspector"
+          placeholder="请输入质量检查员"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="技术安排时间" prop="technicalTime">
+        <el-date-picker clearable
+          v-model="queryParams.technicalTime"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择技术安排时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="技术方案" prop="technicalDocument">
+        <el-input
+          v-model="queryParams.technicalDocument"
+          placeholder="请输入技术方案"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="方案说明" prop="designDescription">
+        <el-input
+          v-model="queryParams.designDescription"
+          placeholder="请输入方案说明"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="技术审核意见" prop="technicalComment">
+        <el-input
+          v-model="queryParams.technicalComment"
+          placeholder="请输入技术审核意见"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="总工审核意见" prop="manageComment">
+        <el-input
+          v-model="queryParams.manageComment"
+          placeholder="请输入总工审核意见"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="方案上传时间" prop="technicalUploadTime">
+        <el-date-picker clearable
+          v-model="queryParams.technicalUploadTime"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择方案上传时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="技术审核时间" prop="techApprovalTime">
+        <el-date-picker clearable
+          v-model="queryParams.techApprovalTime"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择技术审核时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="总工审核时间" prop="manageApprovalTime">
+        <el-date-picker clearable
+          v-model="queryParams.manageApprovalTime"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择总工审核时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['oa:technical: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:technical: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:technical: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: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="selection" width="55" align="center" />
+      <el-table-column label="项目id" align="center" prop="technicalId" />
+      <el-table-column label="项目id" align="center" prop="projectId" />
+      <el-table-column label="技术负责人" align="center" prop="technicalDirector" />
+      <el-table-column label="技术设计人" align="center" prop="technicalDesigner" />
+      <el-table-column label="技术安排人" align="center" prop="technicalPlanner" />
+      <el-table-column label="技术安排意见" align="center" prop="planComment" />
+      <el-table-column label="质量检查员" align="center" prop="qualityInspector" />
+      <el-table-column label="技术安排时间" align="center" prop="technicalTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.technicalTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </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="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">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.techApprovalTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="总工审核时间" align="center" prop="manageApprovalTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.manageApprovalTime, '{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-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['oa:technical:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['oa:technical:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    
+    <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="technicalDirector">
+          <el-input v-model="form.technicalDirector" placeholder="请输入技术负责人" />
+        </el-form-item>
+        <el-form-item label="技术设计人" prop="technicalDesigner">
+          <el-input v-model="form.technicalDesigner" placeholder="请输入技术设计人" />
+        </el-form-item>
+        <el-form-item label="技术安排人" prop="technicalPlanner">
+          <el-input v-model="form.technicalPlanner" placeholder="请输入技术安排人" />
+        </el-form-item>
+        <el-form-item label="技术安排意见" prop="planComment">
+          <el-input v-model="form.planComment" placeholder="请输入技术安排意见" />
+        </el-form-item>
+        <el-form-item label="质量检查员" prop="qualityInspector">
+          <el-input v-model="form.qualityInspector" placeholder="请输入质量检查员" />
+        </el-form-item>
+        <el-form-item label="技术安排时间" prop="technicalTime">
+          <el-date-picker clearable
+            v-model="form.technicalTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="请选择技术安排时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="技术方案" prop="technicalDocument">
+          <el-input v-model="form.technicalDocument" placeholder="请输入技术方案" />
+        </el-form-item>
+        <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>
+        <el-form-item label="总工审核意见" prop="manageComment">
+          <el-input v-model="form.manageComment" placeholder="请输入总工审核意见" />
+        </el-form-item>
+        <el-form-item label="方案上传时间" prop="technicalUploadTime">
+          <el-date-picker clearable
+            v-model="form.technicalUploadTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="请选择方案上传时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="技术审核时间" prop="techApprovalTime">
+          <el-date-picker clearable
+            v-model="form.techApprovalTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="请选择技术审核时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="总工审核时间" prop="manageApprovalTime">
+          <el-date-picker clearable
+            v-model="form.manageApprovalTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="请选择总工审核时间">
+          </el-date-picker>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listTechnical, getTechnical, delTechnical, addTechnical, updateTechnical } from "@/api/oa/technical/technical";
+
+export default {
+  name: "Technical",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // cmc技术交底表格数据
+      technicalList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        projectId: null,
+        technicalDirector: null,
+        technicalDesigner: null,
+        technicalPlanner: null,
+        planComment: null,
+        qualityInspector: null,
+        technicalTime: null,
+        technicalDocument: null,
+        designDescription: null,
+        technicalComment: null,
+        manageComment: null,
+        technicalUploadTime: null,
+        techApprovalTime: null,
+        manageApprovalTime: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      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;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        technicalId: null,
+        projectId: null,
+        technicalDirector: null,
+        technicalDesigner: null,
+        technicalPlanner: null,
+        planComment: null,
+        qualityInspector: null,
+        technicalTime: null,
+        technicalDocument: null,
+        designDescription: null,
+        technicalComment: null,
+        manageComment: null,
+        technicalUploadTime: null,
+        techApprovalTime: null,
+        manageApprovalTime: 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.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>