调整技术交底为技术方案

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

@@ -52,14 +52,14 @@ public class CmcCarApprovalController extends BaseController
             StringBuilder carNames = new StringBuilder();
             if (carIds != null && !carIds.equals("") && carIds.split(",").length > 0) {
                 for (String carId : carIds.split(","))
-                    carNames.append(cmcCarService.selectCmcCarByCarId(Integer.parseInt(carId)).getLicensePlate()).append("、");
+                    carNames.append(cmcCarService.selectCmcCarByCarId(Integer.parseInt(carId)).getLicensePlate()).append(",");
                 carApproval.setCarNames(carNames.substring(0, carNames.length() - 1));
             }
             String driverIds = carApproval.getDrivers();
             StringBuilder driverNames = new StringBuilder();
             if (driverIds != null && !driverIds.equals("") && driverIds.split(",").length > 0) {
                 for (String driverId : driverIds.split(","))
-                    driverNames.append(userService.selectUserById(Long.parseLong(driverId)).getNickName()).append("、");
+                    driverNames.append(userService.selectUserById(Long.parseLong(driverId)).getNickName()).append(",");
                 carApproval.setDriverNames(driverNames.substring(0, driverNames.length() - 1));
             }
         }
@@ -79,14 +79,14 @@ public class CmcCarApprovalController extends BaseController
             StringBuilder carNames = new StringBuilder();
             if (carIds != null && !carIds.equals("") && carIds.split(",").length > 0) {
                 for (String carId : carIds.split(","))
-                    carNames.append(cmcCarService.selectCmcCarByCarId(Integer.parseInt(carId)).getLicensePlate()).append("、");
+                    carNames.append(cmcCarService.selectCmcCarByCarId(Integer.parseInt(carId)).getLicensePlate()).append(",");
                 carApproval.setCarNames(carNames.substring(0, carNames.length() - 1));
             }
             String driverIds = carApproval.getDrivers();
             StringBuilder driverNames = new StringBuilder();
             if (driverIds != null && !driverIds.equals("") && driverIds.split(",").length > 0) {
                 for (String driverId : driverIds.split(","))
-                    driverNames.append(userService.selectUserById(Long.parseLong(driverId)).getNickName()).append("、");
+                    driverNames.append(userService.selectUserById(Long.parseLong(driverId)).getNickName()).append(",");
                 carApproval.setDriverNames(driverNames.substring(0, driverNames.length() - 1));
             }
         }

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

@@ -52,7 +52,7 @@ public class CmcDeviceApprovalController extends BaseController
                     CmcDevice device = cmcDeviceService.selectCmcDeviceByDeviceId(Integer.parseInt(deviceId));
                     deviceNames.append(device.getName()).append("【").append(device.getBrand() != null ? device.getBrand() : "")
                             .append(device.getSeries() != null ? "-" + device.getSeries() + "】" : "")
-                            .append(device.getCode() != null ? "（设备编号：" + device.getCode() + "）" : "").append("、");
+                            .append(device.getCode() != null ? "（设备编号：" + device.getCode() + "）" : "").append(",");
                 }
                 deviceApproval.setDeviceNames(deviceNames.substring(0, deviceNames.length() - 1));
             }
@@ -65,7 +65,7 @@ public class CmcDeviceApprovalController extends BaseController
                     modifyDeviceNumbers.append(device.getDeviceNumber());
                     modifyDeviceNames.append(device.getName()).append("【").append(device.getBrand() != null ? device.getBrand() : "")
                             .append(device.getSeries() != null ? "-" + device.getSeries() + "】" : "")
-                            .append(device.getCode() != null ? "（设备编号：" + device.getCode() + "）" : "").append("、");
+                            .append(device.getCode() != null ? "（设备编号：" + device.getCode() + "）" : "").append(",");
                 }
                 deviceApproval.setModifyDeviceNumbers(modifyDeviceNumbers.substring(0, modifyDeviceNumbers.length() - 1));
                 deviceApproval.setModifyDeviceNames(modifyDeviceNames.substring(0, modifyDeviceNames.length() - 1));
@@ -79,7 +79,7 @@ public class CmcDeviceApprovalController extends BaseController
                     repairDeviceNumbers.append(device.getDeviceNumber());
                     repairDeviceNames.append(device.getName()).append("【").append(device.getBrand() != null ? device.getBrand() : "")
                             .append(device.getSeries() != null ? "-" + device.getSeries() + "】" : "")
-                            .append(device.getCode() != null ? "（设备编号：" + device.getCode() + "）" : "").append("、");
+                            .append(device.getCode() != null ? "（设备编号：" + device.getCode() + "）" : "").append(",");
                 }
                 deviceApproval.setRepairDeviceNumbers(repairDeviceNumbers.substring(0, repairDeviceNumbers.length() - 1));
                 deviceApproval.setRepairDeviceNames(repairDeviceNames.substring(0, repairDeviceNames.length() - 1));
@@ -104,7 +104,7 @@ public class CmcDeviceApprovalController extends BaseController
                     CmcDevice device = cmcDeviceService.selectCmcDeviceByDeviceId(Integer.parseInt(deviceId));
                     deviceNames.append(device.getName()).append("【").append(device.getBrand() != null ? device.getBrand() : "")
                             .append(device.getSeries() != null ? "-" + device.getSeries() + "】" : "")
-                            .append(device.getCode() != null ? "（设备编号：" + device.getCode() + "）" : "").append("、");
+                            .append(device.getCode() != null ? "（设备编号：" + device.getCode() + "）" : "").append(",");
                 }
                 deviceApproval.setDeviceNames(deviceNames.substring(0, deviceNames.length() - 1));
             }
@@ -117,7 +117,7 @@ public class CmcDeviceApprovalController extends BaseController
                     modifyDeviceNumbers.append(device.getDeviceNumber());
                     modifyDeviceNames.append(device.getName()).append("【").append(device.getBrand() != null ? device.getBrand() : "")
                             .append(device.getSeries() != null ? "-" + device.getSeries() + "】" : "")
-                            .append(device.getCode() != null ? "（设备编号：" + device.getCode() + "）" : "").append("、");
+                            .append(device.getCode() != null ? "（设备编号：" + device.getCode() + "）" : "").append(",");
                 }
                 deviceApproval.setModifyDeviceNumbers(modifyDeviceNumbers.substring(0, modifyDeviceNumbers.length() - 1));
                 deviceApproval.setModifyDeviceNames(modifyDeviceNames.substring(0, modifyDeviceNames.length() - 1));
@@ -131,7 +131,7 @@ public class CmcDeviceApprovalController extends BaseController
                     repairDeviceNumbers.append(device.getDeviceNumber());
                     repairDeviceNames.append(device.getName()).append("【").append(device.getBrand() != null ? device.getBrand() : "")
                             .append(device.getSeries() != null ? "-" + device.getSeries() + "】" : "")
-                            .append(device.getCode() != null ? "（设备编号：" + device.getCode() + "）" : "").append("、");
+                            .append(device.getCode() != null ? "（设备编号：" + device.getCode() + "）" : "").append(",");
                 }
                 deviceApproval.setRepairDeviceNumbers(repairDeviceNumbers.substring(0, repairDeviceNumbers.length() - 1));
                 deviceApproval.setRepairDeviceNames(repairDeviceNames.substring(0, repairDeviceNames.length() - 1));

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

@@ -52,7 +52,7 @@ public class CmcProjectChangeController extends BaseController
             StringBuilder underTakingDeptName = new StringBuilder();
             if (underTakingDept != null && !underTakingDept.equals("") && underTakingDept.split(",").length > 0) {
                 for (String dept : underTakingDept.split(","))
-                    underTakingDeptName.append(deptService.selectDeptById(Long.parseLong(dept)).getDeptName()).append("、");
+                    underTakingDeptName.append(deptService.selectDeptById(Long.parseLong(dept)).getDeptName()).append(",");
                 project.setUndertakingDeptName(underTakingDeptName.substring(0, underTakingDeptName.length() - 1));
             }
         }
@@ -72,7 +72,7 @@ public class CmcProjectChangeController extends BaseController
             StringBuilder underTakingDeptName = new StringBuilder();
             if (underTakingDept != null && !underTakingDept.equals("") && underTakingDept.split(",").length > 0) {
                 for (String dept : underTakingDept.split(","))
-                    underTakingDeptName.append(deptService.selectDeptById(Long.parseLong(dept)).getDeptName()).append("、");
+                    underTakingDeptName.append(deptService.selectDeptById(Long.parseLong(dept)).getDeptName()).append(",");
                 project.setUndertakingDeptName(underTakingDeptName.substring(0, underTakingDeptName.length() - 1));
             }
         }

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

@@ -4,15 +4,8 @@ import java.util.Date;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
-import com.alibaba.fastjson2.JSONObject;
-import com.ruoyi.common.utils.DateUtils;
-import com.ruoyi.common.utils.SnowFlake;
-import com.ruoyi.oa.domain.CmcPartyA;
-import com.ruoyi.oa.domain.CmcProjectWork;
-import com.ruoyi.oa.domain.CmcTechnical;
 import com.ruoyi.oa.service.ICmcPartyAService;
 import com.ruoyi.oa.service.ICmcProjectWorkService;
-import com.ruoyi.oa.service.ICmcTechnicalService;
 import com.ruoyi.system.service.ISysDeptService;
 import com.ruoyi.system.service.ISysUserService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -64,14 +57,14 @@ public class CmcProjectController extends BaseController
             StringBuilder underTakingDeptName = new StringBuilder();
             if (underTakingDept != null && !underTakingDept.equals("") && underTakingDept.split(",").length > 0) {
                 for (String dept : underTakingDept.split(","))
-                    underTakingDeptName.append(deptService.selectDeptById(Long.parseLong(dept)).getDeptName()).append("、");
+                    underTakingDeptName.append(deptService.selectDeptById(Long.parseLong(dept)).getDeptName()).append(",");
                 project.setUndertakingDeptName(underTakingDeptName.substring(0, underTakingDeptName.length() - 1));
             }
             String qualityInspector = project.getQualityInspector();
             StringBuilder qualityInspectorName = new StringBuilder();
             if (qualityInspector != null && !qualityInspector.equals("") && qualityInspector.split(",").length > 0) {
                 for (String inspector : qualityInspector.split(","))
-                    qualityInspectorName.append(userService.selectUserById(Long.parseLong(inspector)).getNickName()).append("、");
+                    qualityInspectorName.append(userService.selectUserById(Long.parseLong(inspector)).getNickName()).append(",");
                 project.setQualityInspectorName(qualityInspectorName.substring(0, qualityInspectorName.length() - 1));
             }
         }
@@ -101,14 +94,14 @@ public class CmcProjectController extends BaseController
         StringBuilder underTakingDeptName = new StringBuilder();
         if (underTakingDept != null && !underTakingDept.equals("") && underTakingDept.split(",").length > 0) {
             for (String dept : underTakingDept.split(","))
-                underTakingDeptName.append(deptService.selectDeptById(Long.parseLong(dept)).getDeptName()).append("、");
+                underTakingDeptName.append(deptService.selectDeptById(Long.parseLong(dept)).getDeptName()).append(",");
             cmcProject.setUndertakingDeptName(underTakingDeptName.substring(0, underTakingDeptName.length() - 1));
         }
         String qualityInspector = cmcProject.getQualityInspector();
         StringBuilder qualityInspectorName = new StringBuilder();
         if (qualityInspector != null && !qualityInspector.equals("") && qualityInspector.split(",").length > 0) {
             for (String inspector : qualityInspector.split(","))
-                qualityInspectorName.append(userService.selectUserById(Long.parseLong(inspector)).getNickName()).append("、");
+                qualityInspectorName.append(userService.selectUserById(Long.parseLong(inspector)).getNickName()).append(",");
             cmcProject.setQualityInspectorName(qualityInspectorName.substring(0, qualityInspectorName.length() - 1));
         }
         return success(cmcProject);

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

@@ -51,7 +51,7 @@ public class CmcSafeReportController extends BaseController
             StringBuilder userName = new StringBuilder();
             if (userId != null && !userId.equals("") && userId.split(",").length > 0) {
                 for (String user : userId.split(","))
-                    userName.append(userService.selectUserById(Long.parseLong(user)).getNickName()).append("、");
+                    userName.append(userService.selectUserById(Long.parseLong(user)).getNickName()).append(",");
                 safeReport.setUserNames(userName.substring(0, userName.length() - 1));
             }
         }
@@ -71,7 +71,7 @@ public class CmcSafeReportController extends BaseController
             StringBuilder userName = new StringBuilder();
             if (userId != null && !userId.equals("") && userId.split(",").length > 0) {
                 for (String user : userId.split(","))
-                    userName.append(userService.selectUserById(Long.parseLong(user)).getNickName()).append("、");
+                    userName.append(userService.selectUserById(Long.parseLong(user)).getNickName()).append(",");
                 safeReport.setUserNames(userName.substring(0, userName.length() - 1));
             }
         }

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

@@ -18,8 +18,8 @@ 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.oa.domain.CmcTechnicalPlan;
+import com.ruoyi.oa.service.ICmcTechnicalPlanService;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.common.core.page.TableDataInfo;
 
@@ -30,11 +30,11 @@ import com.ruoyi.common.core.page.TableDataInfo;
  * @date 2024-04-02
  */
 @RestController
-@RequestMapping("/oa/technical")
-public class CmcTechnicalController extends BaseController
+@RequestMapping("/oa/technicalPlan")
+public class CmcTechnicalPlanController extends BaseController
 {
     @Autowired
-    private ICmcTechnicalService cmcTechnicalService;
+    private ICmcTechnicalPlanService cmcTechnicalPlanService;
 
     @Autowired
     private ISysUserService userService;
@@ -43,10 +43,10 @@ public class CmcTechnicalController extends BaseController
      * 查询cmc技术方案列表
      */
     @GetMapping("/list")
-    public TableDataInfo list(CmcTechnical cmcTechnical)
+    public TableDataInfo list(CmcTechnicalPlan cmcTechnicalPlan)
     {
         startPage();
-        List<CmcTechnical> list = cmcTechnicalService.selectCmcTechnicalList(cmcTechnical);
+        List<CmcTechnicalPlan> list = cmcTechnicalPlanService.selectCmcTechnicalPlanList(cmcTechnicalPlan);
         return getDataTable(list);
     }
 
@@ -55,29 +55,29 @@ public class CmcTechnicalController extends BaseController
      */
     @Log(title = "cmc技术方案", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, CmcTechnical cmcTechnical)
+    public void export(HttpServletResponse response, CmcTechnicalPlan cmcTechnicalPlan)
     {
-        List<CmcTechnical> list = cmcTechnicalService.selectCmcTechnicalList(cmcTechnical);
-        for (CmcTechnical technical : list) {
+        List<CmcTechnicalPlan> list = cmcTechnicalPlanService.selectCmcTechnicalPlanList(cmcTechnicalPlan);
+        for (CmcTechnicalPlan technical : list) {
             String qualityInspector = technical.getQualityInspector();
             StringBuilder qualityInspectorName = new StringBuilder();
             if (qualityInspector != null && !qualityInspector.equals("") && qualityInspector.split(",").length > 0) {
                 for (String inspector : qualityInspector.split(","))
-                    qualityInspectorName.append(userService.selectUserById(Long.parseLong(inspector)).getNickName()).append("、");
+                    qualityInspectorName.append(userService.selectUserById(Long.parseLong(inspector)).getNickName()).append(",");
                 technical.setQualityInspectorName(qualityInspectorName.substring(0, qualityInspectorName.length() - 1));
             }
         }
-        ExcelUtil<CmcTechnical> util = new ExcelUtil<CmcTechnical>(CmcTechnical.class);
+        ExcelUtil<CmcTechnicalPlan> util = new ExcelUtil<CmcTechnicalPlan>(CmcTechnicalPlan.class);
         util.exportExcel(response, list, "cmc技术方案数据");
     }
 
     /**
      * 获取cmc技术方案详细信息
      */
-    @GetMapping(value = "/{technicalId}")
-    public AjaxResult getInfo(@PathVariable("technicalId") String technicalId)
+    @GetMapping(value = "/{technicalPlanId}")
+    public AjaxResult getInfo(@PathVariable("technicalPlanId") String technicalPlanId)
     {
-        return success(cmcTechnicalService.selectCmcTechnicalByTechnicalId(technicalId));
+        return success(cmcTechnicalPlanService.selectCmcTechnicalPlanByTechnicalPlanId(technicalPlanId));
     }
 
     /**
@@ -85,10 +85,10 @@ public class CmcTechnicalController extends BaseController
      */
     @Log(title = "cmc技术方案", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody CmcTechnical cmcTechnical)
+    public AjaxResult add(@RequestBody CmcTechnicalPlan cmcTechnicalPlan)
     {
-        cmcTechnical.setTechnicalTime(new Date());
-        return toAjax(cmcTechnicalService.insertCmcTechnical(cmcTechnical));
+        cmcTechnicalPlan.setTechnicalTime(new Date());
+        return toAjax(cmcTechnicalPlanService.insertCmcTechnicalPlan(cmcTechnicalPlan));
     }
 
     /**
@@ -96,30 +96,30 @@ public class CmcTechnicalController extends BaseController
      */
     @Log(title = "cmc技术方案", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@RequestBody CmcTechnical cmcTechnical)
+    public AjaxResult edit(@RequestBody CmcTechnicalPlan cmcTechnicalPlan)
     {
-        if (cmcTechnical.getTechnicalDocument() != null && cmcTechnical.getTechnicalComment() == null && cmcTechnical.getModifyDocument() == null) {
-            cmcTechnical.setTechnicalDesigner(getLoginUser().getUserId());
-            cmcTechnical.setTechnicalUploadTime(new Date());
+        if (cmcTechnicalPlan.getTechnicalDocument() != null && cmcTechnicalPlan.getTechnicalComment() == null && cmcTechnicalPlan.getModifyDocument() == null) {
+            cmcTechnicalPlan.setTechnicalDesigner(getLoginUser().getUserId());
+            cmcTechnicalPlan.setTechnicalUploadTime(new Date());
         }
-        if ((cmcTechnical.getModifyDocument() != null || cmcTechnical.getTechnicalComment() != null) && cmcTechnical.getManageComment() == null) {
-            cmcTechnical.setTechnicalPlanner(getLoginUser().getUserId());
-            cmcTechnical.setTechApprovalTime(new Date());
+        if ((cmcTechnicalPlan.getModifyDocument() != null || cmcTechnicalPlan.getTechnicalComment() != null) && cmcTechnicalPlan.getManageComment() == null) {
+            cmcTechnicalPlan.setTechnicalPlanner(getLoginUser().getUserId());
+            cmcTechnicalPlan.setTechApprovalTime(new Date());
         }
-        if (cmcTechnical.getManageComment() != null) {
-            cmcTechnical.setManagerUserId(getLoginUser().getUserId());
-            cmcTechnical.setManageApprovalTime(new Date());
+        if (cmcTechnicalPlan.getManageComment() != null) {
+            cmcTechnicalPlan.setManagerUserId(getLoginUser().getUserId());
+            cmcTechnicalPlan.setManageApprovalTime(new Date());
         }
-        return toAjax(cmcTechnicalService.updateCmcTechnical(cmcTechnical));
+        return toAjax(cmcTechnicalPlanService.updateCmcTechnicalPlan(cmcTechnicalPlan));
     }
 
     /**
      * 删除cmc技术方案
      */
     @Log(title = "cmc技术方案", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{technicalIds}")
-    public AjaxResult remove(@PathVariable String[] technicalIds)
+	@DeleteMapping("/{technicalPlanIds}")
+    public AjaxResult remove(@PathVariable String[] technicalPlanIds)
     {
-        return success(cmcTechnicalService.deleteCmcTechnicalByTechnicalIds(technicalIds));
+        return success(cmcTechnicalPlanService.deleteCmcTechnicalPlanByTechnicalPlanIds(technicalPlanIds));
     }
 }

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

@@ -9,17 +9,17 @@ import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
 
 /**
- * cmc技术交底对象 cmc_technical
+ * cmc技术交底对象 cmc_technical_plan
  *
  * @author cmc
  * @date 2024-04-03
  */
-public class CmcTechnical extends BaseEntity
+public class CmcTechnicalPlan extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
-    /** 项目id */
-    private String technicalId;
+    /** 方案id */
+    private String technicalPlanId;
 
     /** 项目id */
     private String projectId;
@@ -111,14 +111,14 @@ public class CmcTechnical extends BaseEntity
     @Excel(name = "总工审核时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date manageApprovalTime;
 
-    public void setTechnicalId(String technicalId)
+    public void setTechnicalPlanId(String technicalPlanId)
     {
-        this.technicalId = technicalId;
+        this.technicalPlanId = technicalPlanId;
     }
 
-    public String getTechnicalId()
+    public String getTechnicalPlanId()
     {
-        return technicalId;
+        return technicalPlanId;
     }
     public void setProjectId(String projectId)
     {
@@ -339,7 +339,7 @@ public class CmcTechnical extends BaseEntity
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-                .append("technicalId", getTechnicalId())
+                .append("technicalPlanId", getTechnicalPlanId())
                 .append("projectId", getProjectId())
                 .append("technicalDirector", getTechnicalDirector())
                 .append("technicalDesigner", getTechnicalDesigner())

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

@@ -1,61 +0,0 @@
-package com.ruoyi.oa.mapper;
-
-import java.util.List;
-import com.ruoyi.oa.domain.CmcTechnical;
-
-/**
- * cmc技术方案Mapper接口
- * 
- * @author cmc
- * @date 2024-04-02
- */
-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/mapper/CmcTechnicalPlanMapper.java

@@ -0,0 +1,61 @@
+package com.ruoyi.oa.mapper;
+
+import java.util.List;
+import com.ruoyi.oa.domain.CmcTechnicalPlan;
+
+/**
+ * cmc技术方案Mapper接口
+ * 
+ * @author cmc
+ * @date 2024-04-02
+ */
+public interface CmcTechnicalPlanMapper 
+{
+    /**
+     * 查询cmc技术方案
+     * 
+     * @param technicalPlanId cmc技术方案主键
+     * @return cmc技术方案
+     */
+    public CmcTechnicalPlan selectCmcTechnicalPlanByTechnicalPlanId(String technicalPlanId);
+
+    /**
+     * 查询cmc技术方案列表
+     * 
+     * @param cmcTechnicalPlan cmc技术方案
+     * @return cmc技术方案集合
+     */
+    public List<CmcTechnicalPlan> selectCmcTechnicalPlanList(CmcTechnicalPlan cmcTechnicalPlan);
+
+    /**
+     * 新增cmc技术方案
+     * 
+     * @param cmcTechnicalPlan cmc技术方案
+     * @return 结果
+     */
+    public int insertCmcTechnicalPlan(CmcTechnicalPlan cmcTechnicalPlan);
+
+    /**
+     * 修改cmc技术方案
+     * 
+     * @param cmcTechnicalPlan cmc技术方案
+     * @return 结果
+     */
+    public int updateCmcTechnicalPlan(CmcTechnicalPlan cmcTechnicalPlan);
+
+    /**
+     * 删除cmc技术方案
+     * 
+     * @param technicalPlanId cmc技术方案主键
+     * @return 结果
+     */
+    public int deleteCmcTechnicalPlanByTechnicalPlanId(String technicalPlanId);
+
+    /**
+     * 批量删除cmc技术方案
+     * 
+     * @param technicalPlanIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteCmcTechnicalPlanByTechnicalPlanIds(String[] technicalPlanIds);
+}

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

@@ -0,0 +1,61 @@
+package com.ruoyi.oa.service;
+
+import java.util.List;
+import com.ruoyi.oa.domain.CmcTechnicalPlan;
+
+/**
+ * cmc技术方案Service接口
+ * 
+ * @author cmc
+ * @date 2024-04-02
+ */
+public interface ICmcTechnicalPlanService 
+{
+    /**
+     * 查询cmc技术方案
+     * 
+     * @param technicalPlanId cmc技术方案主键
+     * @return cmc技术方案
+     */
+    public CmcTechnicalPlan selectCmcTechnicalPlanByTechnicalPlanId(String technicalPlanId);
+
+    /**
+     * 查询cmc技术方案列表
+     * 
+     * @param cmcTechnicalPlan cmc技术方案
+     * @return cmc技术方案集合
+     */
+    public List<CmcTechnicalPlan> selectCmcTechnicalPlanList(CmcTechnicalPlan cmcTechnicalPlan);
+
+    /**
+     * 新增cmc技术方案
+     * 
+     * @param cmcTechnicalPlan cmc技术方案
+     * @return 结果
+     */
+    public int insertCmcTechnicalPlan(CmcTechnicalPlan cmcTechnicalPlan);
+
+    /**
+     * 修改cmc技术方案
+     * 
+     * @param cmcTechnicalPlan cmc技术方案
+     * @return 结果
+     */
+    public int updateCmcTechnicalPlan(CmcTechnicalPlan cmcTechnicalPlan);
+
+    /**
+     * 批量删除cmc技术方案
+     * 
+     * @param technicalPlanIds 需要删除的cmc技术方案主键集合
+     * @return 结果
+     */
+    public int deleteCmcTechnicalPlanByTechnicalPlanIds(String[] technicalPlanIds);
+
+    /**
+     * 删除cmc技术方案信息
+     * 
+     * @param technicalPlanId cmc技术方案主键
+     * @return 结果
+     */
+    public int deleteCmcTechnicalPlanByTechnicalPlanId(String technicalPlanId);
+}

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

@@ -1,61 +0,0 @@
-package com.ruoyi.oa.service;
-
-import java.util.List;
-import com.ruoyi.oa.domain.CmcTechnical;
-
-/**
- * cmc技术方案Service接口
- * 
- * @author cmc
- * @date 2024-04-02
- */
-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/CmcTechnicalPlanServiceImpl.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.CmcTechnicalPlanMapper;
+import com.ruoyi.oa.domain.CmcTechnicalPlan;
+import com.ruoyi.oa.service.ICmcTechnicalPlanService;
+
+/**
+ * cmc技术方案Service业务层处理
+ * 
+ * @author cmc
+ * @date 2024-04-02
+ */
+@Service
+public class CmcTechnicalPlanServiceImpl implements ICmcTechnicalPlanService 
+{
+    @Autowired
+    private CmcTechnicalPlanMapper cmcTechnicalPlanMapper;
+
+    /**
+     * 查询cmc技术方案
+     * 
+     * @param technicalPlanId cmc技术方案主键
+     * @return cmc技术方案
+     */
+    @Override
+    public CmcTechnicalPlan selectCmcTechnicalPlanByTechnicalPlanId(String technicalPlanId)
+    {
+        return cmcTechnicalPlanMapper.selectCmcTechnicalPlanByTechnicalPlanId(technicalPlanId);
+    }
+
+    /**
+     * 查询cmc技术方案列表
+     * 
+     * @param cmcTechnicalPlan cmc技术方案
+     * @return cmc技术方案
+     */
+    @Override
+    public List<CmcTechnicalPlan> selectCmcTechnicalPlanList(CmcTechnicalPlan cmcTechnicalPlan)
+    {
+        return cmcTechnicalPlanMapper.selectCmcTechnicalPlanList(cmcTechnicalPlan);
+    }
+
+    /**
+     * 新增cmc技术方案
+     * 
+     * @param cmcTechnicalPlan cmc技术方案
+     * @return 结果
+     */
+    @Override
+    public int insertCmcTechnicalPlan(CmcTechnicalPlan cmcTechnicalPlan)
+    {
+        return cmcTechnicalPlanMapper.insertCmcTechnicalPlan(cmcTechnicalPlan);
+    }
+
+    /**
+     * 修改cmc技术方案
+     * 
+     * @param cmcTechnicalPlan cmc技术方案
+     * @return 结果
+     */
+    @Override
+    public int updateCmcTechnicalPlan(CmcTechnicalPlan cmcTechnicalPlan)
+    {
+        return cmcTechnicalPlanMapper.updateCmcTechnicalPlan(cmcTechnicalPlan);
+    }
+
+    /**
+     * 批量删除cmc技术方案
+     * 
+     * @param technicalPlanIds 需要删除的cmc技术方案主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCmcTechnicalPlanByTechnicalPlanIds(String[] technicalPlanIds)
+    {
+        return cmcTechnicalPlanMapper.deleteCmcTechnicalPlanByTechnicalPlanIds(technicalPlanIds);
+    }
+
+    /**
+     * 删除cmc技术方案信息
+     * 
+     * @param technicalPlanId cmc技术方案主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCmcTechnicalPlanByTechnicalPlanId(String technicalPlanId)
+    {
+        return cmcTechnicalPlanMapper.deleteCmcTechnicalPlanByTechnicalPlanId(technicalPlanId);
+    }
+}

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

@@ -1,93 +0,0 @@
-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-04-02
- */
-@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/CmcProjectMapper.xml

@@ -67,12 +67,12 @@
     <sql id="selectCmcProjectVo">
         select p.project_id, p.project_number, p.project_name, p.project_leader, u.nick_name as leader_nick_name, p.is_finished, p.project_source, p.party_a_id, pa.party_a_name, p.contact_person, p.telephone,
                p.project_type, p.project_level, p.project_registrant, u1.nick_name as registrant_nick_name, p.undertaking_dept, p.project_planner, p.site_leader, p.organize_document, p.organize_time,
-               p.register_time, p.plan_time, p.entry_time, p.exit_time, p.remark, c.technical_director, u2.nick_name as director_nick_name, c.quality_inspector, p.project_kml, p.project_cp, p.kml_lng, p.kml_lat,
+               p.register_time, p.plan_time, p.entry_time, p.exit_time, p.remark, tp.technical_director, u2.nick_name as director_nick_name, tp.quality_inspector, p.project_kml, p.project_cp, p.kml_lng, p.kml_lat,
                p.cars, p.drivers, p.devices, p.participates, p.task_document, p.project_request from cmc_project as p
         left join sys_user as u on u.user_id = p.project_leader
         left join sys_user as u1 on u1.user_id = p.project_registrant
-        left join cmc_technical as c on c.project_id = p.project_id
-        left join sys_user as u2 on u2.user_id = c.technical_director
+        left join cmc_technical_plan as tp on tp.project_id = p.project_id
+        left join sys_user as u2 on u2.user_id = tp.technical_director
         left join cmc_party_a as pa on pa.party_a_id = p.party_a_id
     </sql>
 

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

@@ -2,10 +2,10 @@
 <!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">
+<mapper namespace="com.ruoyi.oa.mapper.CmcTechnicalPlanMapper">
 
-    <resultMap type="CmcTechnical" id="CmcTechnicalResult">
-        <result property="technicalId"    column="technical_id"    />
+    <resultMap type="CmcTechnicalPlan" id="CmcTechnicalPlanResult">
+        <result property="technicalPlanId"    column="technical_plan_id"    />
         <result property="projectId"    column="project_id"    />
         <result property="technicalDirector"    column="technical_director"    />
         <result property="technicalDesigner"    column="technical_designer"    />
@@ -55,10 +55,10 @@
         <result property="projectName"    column="project_name"    />
     </resultMap>
 
-    <sql id="selectCmcTechnicalVo">
-        select t.technical_id, t.project_id, p.project_number, p.project_name, t.technical_director, u.nick_name as direct_nick_name, t.technical_designer, u1.nick_name as design_nick_name,
+    <sql id="selectCmcTechnicalPlanVo">
+        select t.technical_plan_id, t.project_id, p.project_number, p.project_name, t.technical_director, u.nick_name as direct_nick_name, t.technical_designer, u1.nick_name as design_nick_name,
                t.technical_planner, u2.nick_name as plan_nick_name, t.plan_comment, t.quality_inspector, t.technical_time, t.technical_document, t.modify_document, t.final_document,
-               t.design_description, t.technical_comment, t.manager_user_id, u3.nick_name as manager_nick_name, t.manage_comment, t.technical_upload_time, t.tech_approval_time, t.manage_approval_time from cmc_technical as t
+               t.design_description, t.technical_comment, t.manager_user_id, u3.nick_name as manager_nick_name, t.manage_comment, t.technical_upload_time, t.tech_approval_time, t.manage_approval_time from cmc_technical_plan as t
         left join sys_user as u on u.user_id = t.technical_director
         left join sys_user as u1 on u1.user_id = t.technical_designer
         left join sys_user as u2 on u2.user_id = t.technical_planner
@@ -66,8 +66,8 @@
         left join cmc_project as p on p.project_id = t.project_id
     </sql>
 
-    <select id="selectCmcTechnicalList" parameterType="CmcTechnical" resultMap="CmcTechnicalResult">
-        <include refid="selectCmcTechnicalVo"/>
+    <select id="selectCmcTechnicalPlanList" parameterType="CmcTechnicalPlan" resultMap="CmcTechnicalPlanResult">
+        <include refid="selectCmcTechnicalPlanVo"/>
         <where>
             <if test="projectId != null  and projectId != ''"> and t.project_id = #{projectId}</if>
             <if test="technicalDirector != null "> and t.technical_director = #{technicalDirector}</if>
@@ -88,15 +88,15 @@
         order by technical_time desc
     </select>
 
-    <select id="selectCmcTechnicalByTechnicalId" parameterType="String" resultMap="CmcTechnicalResult">
-        <include refid="selectCmcTechnicalVo"/>
-        where t.technical_id = #{technicalId}
+    <select id="selectCmcTechnicalPlanByTechnicalPlanId" parameterType="String" resultMap="CmcTechnicalPlanResult">
+        <include refid="selectCmcTechnicalPlanVo"/>
+        where t.technical_plan_id = #{technicalPlanId}
     </select>
 
-    <insert id="insertCmcTechnical" parameterType="CmcTechnical">
-        insert into cmc_technical
+    <insert id="insertCmcTechnicalPlan" parameterType="CmcTechnicalPlan">
+        insert into cmc_technical_plan
         <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="technicalId != null">technical_id,</if>
+            <if test="technicalPlanId != null">technical_plan_id,</if>
             <if test="projectId != null">project_id,</if>
             <if test="technicalDirector != null">technical_director,</if>
             <if test="technicalDesigner != null">technical_designer,</if>
@@ -116,7 +116,7 @@
             <if test="manageApprovalTime != null">manage_approval_time,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="technicalId != null">#{technicalId},</if>
+            <if test="technicalPlanId != null">#{technicalPlanId},</if>
             <if test="projectId != null">#{projectId},</if>
             <if test="technicalDirector != null">#{technicalDirector},</if>
             <if test="technicalDesigner != null">#{technicalDesigner},</if>
@@ -137,8 +137,8 @@
         </trim>
     </insert>
 
-    <update id="updateCmcTechnical" parameterType="CmcTechnical">
-        update cmc_technical
+    <update id="updateCmcTechnicalPlan" parameterType="CmcTechnicalPlan">
+        update cmc_technical_plan
         <trim prefix="SET" suffixOverrides=",">
             <if test="projectId != null">project_id = #{projectId},</if>
             <if test="technicalDirector != null">technical_director = #{technicalDirector},</if>
@@ -158,17 +158,17 @@
             <if test="techApprovalTime != null">tech_approval_time = #{techApprovalTime},</if>
             <if test="manageApprovalTime != null">manage_approval_time = #{manageApprovalTime},</if>
         </trim>
-        where technical_id = #{technicalId}
+        where technical_plan_id = #{technicalPlanId}
     </update>
 
-    <delete id="deleteCmcTechnicalByTechnicalId" parameterType="String">
-        delete from cmc_technical where technical_id = #{technicalId}
+    <delete id="deleteCmcTechnicalPlanByTechnicalPlanId" parameterType="String">
+        delete from cmc_technical_plan where technical_plan_id = #{technicalPlanId}
     </delete>
 
-    <delete id="deleteCmcTechnicalByTechnicalIds" parameterType="String">
-        delete from cmc_technical where technical_id in
-        <foreach item="technicalId" collection="array" open="(" separator="," close=")">
-            #{technicalId}
+    <delete id="deleteCmcTechnicalPlanByTechnicalPlanIds" parameterType="String">
+        delete from cmc_technical_plan where technical_plan_id in
+        <foreach item="technicalPlanId" collection="array" open="(" separator="," close=")">
+            #{technicalPlanId}
         </foreach>
     </delete>
 </mapper>

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

@@ -1,44 +0,0 @@
-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/subContract.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-05-10 15:31:57
  * @LastEditors: wrh
- * @LastEditTime: 2024-06-27 13:17:26
+ * @LastEditTime: 2024-06-28 14:26:25
 -->
 <template>
   <div class="app-container">

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

@@ -14,7 +14,7 @@
     <zh-table :key="'zh'+taskForm.taskId" :taskForm="taskForm" :tableForm="tableForm" v-else-if="taskForm.procDefName == '综合事务部考核'"></zh-table>
     <project-process :key="'pro'+taskForm.taskId" :taskForm="taskForm" :taskName="''" v-else-if="taskForm.procDefName == '项目流转'"></project-process>
     <car-form :taskForm="taskForm" :taskName="''" v-else-if="taskForm.procDefName == '用车审批'"></car-form>
-    <technical-form :key="'tec'+taskForm.taskId" :taskForm="taskForm" v-else-if="taskForm.procDefName == '技术交底'"></technical-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>
     <settle-form :key="'fb'+taskForm.taskId" :taskForm="taskForm" :taskName="''" :disabled="true"
       v-else-if="taskForm.procDefName == '项目结算'"></settle-form>
@@ -41,7 +41,7 @@ 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/technicalForm.vue';
+import TechnicalForm from '@/views/flowable/form/technicalPlan.vue';
 import SafeForm from '@/views/flowable/form/safeForm.vue';
 import SettleForm from '@/views/flowable/form/settleForm.vue';
 import BudgetInfo from '../budget/budgetInfo.vue';

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

@@ -24,8 +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 == '承接合同评审'"
       @goBack="goBack"></contract-form>
     <sub-contract :taskName="taskName" :taskForm="taskForm" v-else-if="taskForm.procDefName == '分包合同评审'"
@@ -55,7 +55,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';
 import contractForm from '@/views/flowable/form/business/contractForm.vue';
@@ -80,7 +80,7 @@ export default {
     AddBudget,
     borrowForm,
     safeForm,
-    technicalForm,
+    technicalPlan,
     budgetIndex,
     businessReview,
     contractForm,

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

@@ -224,7 +224,7 @@ export default {
       this.peopleVisible = false;
     },
     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-06-13 18:38:04
+ * @LastEditors: wrh
+ * @LastEditTime: 2024-06-28 14:45:41
 -->
 
 <template>
@@ -21,9 +21,9 @@
           </el-tab-pane>
           <el-tab-pane label="安全交底" name="安全交底">
             <safe-tab :taskForm="taskForm"  @goBack="goBack"></safe-tab>
-          </el-tab-pane :taskForm="taskForm"  @goBack="goBack">
-          <el-tab-pane label="技术交底" name="技术交底">
-            <technical-tab :taskForm="taskForm" :taskName="taskName"  @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>
           <el-tab-pane label="经营审核" name="经营审核">
             <business-review :taskForm="taskForm" :taskName="taskName" :disabled="taskName != '经营审核'"
@@ -69,7 +69,7 @@ import ManageReview from './manageReview.vue'
 import ScConfirm from './scConfirm.vue'
 import InProgress from './inProgress.vue'
 import BudgetTab from './budgetTab.vue'
-import TechnicalTab from './technicalTab.vue'
+import TechnicalTab from './planTab.vue'
 import SafeTab from './safeTab.vue'
 export default {
   props: {

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

@@ -103,7 +103,7 @@ export default {
     this.getUserList();
   },
   methods: {
-    /** 查询cmc技术交底列表 */
+    /** 查询cmc技术方案列表 */
     initForm() {
       getSafe(this.taskForm.formId).then((res) => {
         if (res.data) {

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

@@ -1,262 +0,0 @@
-<!--
- * @Author: ysh
- * @Date: 2024-04-19 15:32:00
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-06-26 11:24:27
--->
-<template>
-  <div class="app-container">
-    <el-empty description="技术方案未编制" v-if="!haveTechnical"></el-empty>
-    <div v-if="haveTechnical">
-      <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="technicalDirector">
-          <el-select v-model="form.technicalDirector" filterable clearable style="width: 220px">
-            <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="technicalDesigner">
-          <el-select v-model="form.technicalDesigner" filterable clearable style="width:220px">
-            <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="qualityInspector">
-          <el-select v-model="form.qualityInspector" filterable multiple clearable style="width:220px">
-            <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="planComment">
-          <el-input type="textarea" v-model="form.planComment" placeholder="请输入技术安排意见" />
-        </el-form-item>
-        <el-row>
-          <el-col :span="6" :xs="24" :offset="12">
-            <el-form-item label="签名" prop="technicalPlanner">
-              <span class="auditor"> {{ form.planUser ? form.planUser.nickName : '' }} </span>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="日期：" label-width="120px">
-              <span> {{ form.technicalTime ? form.technicalTime : '' }} </span>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-form-item label="技术方案" prop="technicalDocument">
-          <div v-if="form.technicalDocument">
-            <el-link type="primary" @click="reviewWord(`${baseUrl}${'/profile/upload' + form.technicalDocument}`)">
-              {{ getFileName(form.technicalDocument) }}
-            </el-link>
-            <el-link class="ml20" type="warning" :href="`${baseUrl}${'/profile/upload' + form.technicalDocument}`"
-              :underline="false" target="_blank">
-              <span class="el-icon-download">下载文件</span>
-            </el-link>
-          </div>
-        </el-form-item>
-        <el-form-item label="方案说明" prop="designDescription">
-          <el-input type="textarea" v-model="form.designDescription" placeholder="请输入方案说明" />
-        </el-form-item>
-        <el-row>
-          <el-col :span="6" :xs="24" :offset="12">
-            <el-form-item label="签名" prop="designUser">
-              <span class="auditor"> {{ form.designUser ? form.designUser.nickName : '' }} </span>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="日期：" label-width="120px">
-              <span> {{ form.technicalUploadTime ? form.technicalUploadTime : '' }} </span>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-form-item label="修改技术方案" prop="modifyDocument">
-          <div v-if="form.modifyDocument">
-            <el-link type="primary" @click="reviewWord(`${baseUrl}${'/profile/upload' + form.modifyDocument}`)">
-              {{ getFileName(form.modifyDocument) }}
-            </el-link>
-            <el-link class="ml20" type="warning" :href="`${baseUrl}${'/profile/upload' + form.modifyDocument}`"
-              :underline="false" target="_blank">
-              <span class="el-icon-download">下载文件</span>
-            </el-link>
-          </div>
-        </el-form-item>
-        <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">
-            <el-form-item label="签名" prop="technicalPlanner">
-              <span class="auditor"> {{ form.planUser ? form.planUser.nickName : '' }} </span>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="日期：" label-width="120px">
-              <span> {{ form.techApprovalTime }} </span>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-form-item label="最终技术方案" prop="finalDocument">
-          <div v-if="form.finalDocument">
-            <el-link type="primary" @click="reviewWord(`${baseUrl}${'/profile/upload' + form.finalDocument}`)">
-              {{ getFileName(form.finalDocument) }}
-            </el-link>
-            <el-link class="ml20" type="warning" :href="`${baseUrl}${'/profile/upload' + form.finalDocument}`"
-              :underline="false" target="_blank">
-              <span class="el-icon-download">下载文件</span>
-            </el-link>
-          </div>
-        </el-form-item>
-        <el-form-item label="总工程师审核意见" prop="manageComment">
-          <el-input type="textarea" v-model="form.manageComment" placeholder="请输入总工审核意见" />
-        </el-form-item>
-        <el-row>
-          <el-col :span="6" :xs="24" :offset="12">
-            <el-form-item label="签名" prop="manager">
-              <span class="auditor"> {{ form.managerUser ? form.managerUser.nickName : '' }} </span>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="日期：" label-width="120px">
-              <span> {{ form.manageApprovalTime }} </span>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </div>
-  </div>
-</template>
-
-<script>
-import technicalForm from "../technicalForm.vue";
-import { listUser } from "@/api/system/user";
-import { getProject } from "@/api/oa/project/project";
-import {
-  listTechnical,
-  getTechnical,
-  delTechnical,
-  addTechnical,
-  updateTechnical,
-} from "@/api/oa/technical/technical";
-export default {
-  components: { technicalForm },
-  props: {
-    taskForm: {
-      type: Object,
-      require: true,
-    },
-  },
-  computed: {
-    projectNumber() {
-      return this.$store.state.projectProcess.projectNumber;
-    },
-    projectName() {
-      return this.$store.state.projectProcess.projectName;
-    },
-  },
-  watch: {
-    'taskForm.formId'(newval) {
-      this.initForm();
-      this.getUserList();
-    },
-    projectNumber(newval) {
-      this.$set(this.form, "projectNumber", newval);
-    },
-    projectName(newval) {
-      this.$set(this.form, "projectName", newval);
-    }
-  },
-  data() {
-    return {
-      baseUrl: process.env.VUE_APP_BASE_API,
-      haveTechnical: false,
-      form: {},
-      rules: {},
-      userList: [],
-    };
-  },
-  created() {
-
-  },
-  mounted() {
-    this.initForm();
-    this.getUserList();
-  },
-  methods: {
-    /** 查询cmc技术交底列表 */
-    initForm() {
-      this.loadTechnicalAndProjectData();
-    },
-    async loadTechnicalAndProjectData() {
-      try {
-        const technicalRes = await getTechnical(this.taskForm.formId);
-        if (technicalRes.data) {
-          this.haveTechnical = true;
-          let qualityInspector = this.processQualityInspector(technicalRes.data)
-          technicalRes.data.qualityInspector = qualityInspector
-          this.form = technicalRes.data;
-          if (!this.projectNumber || !this.projectName) {
-            // 仅在需要时调用getProject  
-            const projectRes = await getProject(this.taskForm.formId);
-            if (projectRes.data) {
-              this.$set(this.form, "projectNumber", projectRes.data.projectNumber);
-              this.$set(this.form, "projectName", projectRes.data.projectName);
-            }
-          }
-        }
-      } catch (error) {
-      }
-    },
-    processQualityInspector(form) {
-      if (Array.isArray(form.qualityInspector)) {
-      } else if (typeof form.qualityInspector === 'string') {
-        // 如果是一个字符串，则按逗号分割并转换为整数数组  
-        const qualityInspectorArr = form.qualityInspector.split(',').map(inspector => parseInt(inspector, 10));
-        return qualityInspectorArr
-        // this.$set(form, "qualityInspector", qualityInspectorArr);
-      } else if (form.qualityInspector === null || form.qualityInspector === undefined || form.qualityInspector === '') {
-        // 如果为空、null或undefined，则设置为空数组  
-        // this.$set(form, "qualityInspector", []);
-        return []
-      }
-    },
-    // 查询用户列表
-    getUserList() {
-      listUser({ pageSize: 9999, pageNum: 1 }).then((res) => {
-        this.userList = res.rows;
-      });
-    },
-    getFileName(name) {
-      if (name) {
-        let arr = name.split('/')
-        return arr[arr.length - 1];
-      }
-    },
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-@import "@/assets/styles/element-reset.scss";
-
-::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

@@ -1,513 +0,0 @@
-<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="130px">
-          <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-row>
-            <el-col :span="8" :xs="24">
-              <el-form-item label="技术负责人" prop="technicalDirector">
-                <el-select v-model="form.technicalDirector" filterable clearable style="width:220px"
-                  :disabled="taskName != '技术安排'">
-                  <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-col>
-            <el-col :span="8" :xs="24">
-              <el-form-item label="技术设计人" prop="technicalDesigner">
-                <el-select v-model="form.technicalDesigner" filterable clearable style="width:220px"
-                  :disabled="taskName != '技术安排'">
-                  <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-col>
-            <el-col :span="8" :xs="24">
-              <el-form-item label="质量检查员" prop="qualityInspector">
-                <el-select v-model="form.qualityInspector" filterable multiple clearable style="width:220px"
-                  :disabled="taskName != '技术安排'">
-                  <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-col>
-          </el-row>
-          <el-form-item label="技术安排意见" prop="planComment">
-            <el-input type="textarea" v-model="form.planComment" :autosize="{ minRows: 4 }" placeholder="请输入技术安排意见"
-              :disabled="taskName != '技术安排'" />
-          </el-form-item>
-          <el-row>
-            <el-col :span="6" :xs="24" :offset="12">
-              <el-form-item label="签名" prop="technicalPlanner" v-if="showFormItem('技术安排')">
-                <span class="auditor"> {{ form.planUser ? form.planUser.nickName : planUser }} </span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="日期：" label-width="120px" v-if="showFormItem('技术安排')">
-                <span> {{ form.technicalTime ? form.technicalTime : technicalTime }} </span>
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-divider></el-divider>
-          <el-form-item label="初始技术方案" prop="technicalDocument">
-            <FileUpload v-if="taskName == '方案上传'" ref="bsFile" :limit="1" :filePathName="'技术方案/初始'"
-              :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']" @input="getTechnicalDoc"></FileUpload>
-            <!-- <el-link v-if="taskName != '方案上传'" :href="`${baseUrl}${'/profile/upload' + form.technicalDocument}`"
-              :underline="false" target="_blank">
-              <span class="el-icon-document"> {{ getFileName(form.technicalDocument) }} </span>
-            </el-link> -->
-            <div v-if="form.technicalDocument && taskName != '方案上传'">
-              <el-link type="primary" @click="reviewWord(`${baseUrl}${'/profile/upload' + form.technicalDocument}`)">
-                {{ getFileName(form.technicalDocument) }}
-              </el-link>
-              <el-link class="ml20" type="warning" :href="`${baseUrl}${'/profile/upload' + form.technicalDocument}`"
-                :underline="false" target="_blank">
-                <span class="el-icon-download">下载文件</span>
-              </el-link>
-            </div>
-          </el-form-item>
-          <el-form-item label="方案说明" prop="designDescription">
-            <el-input type="textarea" v-model="form.designDescription" :autosize="{ minRows: 4 }" placeholder="请输入方案说明"
-              :disabled="taskName != '方案上传'" />
-          </el-form-item>
-          <el-row>
-            <el-col :span="6" :xs="24" :offset="12">
-              <el-form-item label="签名" prop="designUser" v-if="showFormItem('方案上传')">
-                <span class="auditor"> {{ form.designUser ? form.designUser.nickName : designUser }} </span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="日期：" label-width="120px" v-if="showFormItem('方案上传')">
-                <span> {{ form.technicalUploadTime ? form.technicalUploadTime : technicalUploadTime }} </span>
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-divider></el-divider>
-          <el-form-item label="修改技术方案" prop="modifyDocument">
-            <FileUpload v-if="taskName == '技术审核'" ref="jssh" :limit="1" :filePathName="'技术方案/修改'"
-              :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']" @input="getModifyDoc"></FileUpload>
-            <!-- <el-link v-if="taskName != '技术审核'" :href="`${baseUrl}${'/profile/upload' + form.modifyDocument}`"
-              :underline="false" target="_blank">
-              <span class="el-icon-document"> {{ getFileName(form.modifyDocument) }} </span>
-            </el-link> -->
-            <div v-if="form.modifyDocument && taskName != '技术审核'">
-              <el-link type="primary" @click="reviewWord(`${baseUrl}${'/profile/upload' + form.modifyDocument}`)">
-                {{ getFileName(form.modifyDocument) }}
-              </el-link>
-              <el-link class="ml20" type="warning" :href="`${baseUrl}${'/profile/upload' + form.modifyDocument}`"
-                :underline="false" target="_blank">
-                <span class="el-icon-download">下载文件</span>
-              </el-link>
-            </div>
-          </el-form-item>
-          <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>
-            <el-col :span="6" :xs="24" :offset="12">
-              <el-form-item label="签名" prop="technicalPlanner" v-if="showFormItem('技术审核')">
-                <span class="auditor"> {{ form.planUser ? form.planUser.nickName : planUser }} </span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="日期：" label-width="120px" v-if="showFormItem('技术审核')">
-                <span> {{ form.techApprovalTime ? form.techApprovalTime : techApprovalTime }} </span>
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-form-item label="最终技术方案" prop="finalDocument">
-            <FileUpload v-if="taskName == '总工审核'" ref="final" :limit="1" :filePathName="'技术方案/最终'"
-              :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']" @input="getFinalDoc"></FileUpload>
-            <!-- <el-link v-if="taskName != '总工审核'" :href="`${baseUrl}${'/profile/upload' + form.finalDocument}`"
-              :underline="false" target="_blank">
-              <span class="el-icon-document"> {{ getFileName(form.finalDocument) }} </span>
-            </el-link> -->
-            <div v-if="form.finalDocument && taskName != '总工审核'">
-              <el-link type="primary" @click="reviewWord(`${baseUrl}${'/profile/upload' + form.finalDocument}`)">
-                {{ getFileName(form.finalDocument) }}
-              </el-link>
-              <el-link class="ml20" type="warning" :href="`${baseUrl}${'/profile/upload' + form.finalDocument}`"
-                :underline="false" target="_blank">
-                <span class="el-icon-download">下载文件</span>
-              </el-link>
-            </div>
-          </el-form-item>
-          <el-form-item label="总工程师审核意见" prop="manageComment">
-            <el-input type="textarea" v-model="form.manageComment" :autosize="{ minRows: 4 }" placeholder="请输入总工审核意见"
-              :disabled="taskName != '总工审核'" />
-          </el-form-item>
-          <el-row>
-            <el-col :span="6" :xs="24" :offset="12">
-              <el-form-item label="签名" prop="manager" v-if="showFormItem('总工审核')">
-                <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="showFormItem('总工审核')">
-                <span> {{ form.manageApprovalTime ? form.manageApprovalTime : manageApprovalTime }} </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 { parseTime } from "@/utils/ruoyi";
-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";
-import { getUsersManageLeaderByDept } from '@/api/system/post'
-
-export default {
-  components: {
-    flow
-  },
-  name: "Technical",
-  props: {
-    taskName: {
-      type: String
-    },
-    taskForm: {
-      type: Object,
-      required: true
-    }
-  },
-  data() {
-    return {
-      baseUrl: process.env.VUE_APP_BASE_API,
-      planUser: '',
-      managerUser: '',
-      designUser: '',
-      technicalTime: undefined,
-      technicalUploadTime: undefined,
-      techApprovalTime: undefined,
-      manageApprovalTime: undefined,
-      // 遮罩层
-      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: {
-        qualityInspector: [],
-      },
-      // 表单校验
-      rules: {
-      },
-      userList: [],
-      chooseProject: {},
-      isSelect: false,
-      // 表单参数
-      form: {},
-      formTotal: 0,
-      flowData: {},
-      isDocumentValid: true
-    };
-  },
-  created() {
-    if (this.taskName == '技术安排') {
-      this.planUser = this.$store.getters.name;
-      this.technicalTime = parseTime(new Date(), '{y}-{m}-{d}')
-    }
-    if (this.taskName == '方案上传') {
-      this.designUser = this.$store.getters.name;
-      this.technicalUploadTime = parseTime(new Date(), '{y}-{m}-{d}')
-    }
-    if (this.taskName == '技术审核') {
-      this.planUser = this.$store.getters.name;
-      this.techApprovalTime = parseTime(new Date(), '{y}-{m}-{d}')
-    }
-    if (this.taskName == '总工审核') {
-      this.managerUser = this.$store.getters.name;
-      this.manageApprovalTime = parseTime(new Date(), '{y}-{m}-{d}')
-    }
-    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 = {
-          technicalDirector: [
-            { required: true, message: '请选择技术负责人', trigger: 'change' },
-          ],
-          technicalDesigner: [
-            { required: true, message: '请选择技术设计人', trigger: 'change' },
-          ],
-          qualityInspector: [
-            { required: true, message: '请选择质量检查员', trigger: 'change' },
-          ],
-        }
-      } else if (this.taskName == '技术审核') {
-        this.rules = {
-          technicalComment: [
-            { required: true, message: '请输入技术方案审核意见', trigger: 'blur' }
-          ]
-        }
-      } else if (this.taskName == '总工审核') {
-        this.rules = {
-          manageComment: [
-            { required: true, message: '请输入技术方案审核意见', trigger: 'blur' }
-          ]
-        }
-      }
-    },
-    initForm() {
-      getTechnical(this.taskForm.formId).then(res => {
-        if (this.isEmptyObject(res.data)) {
-          this.formTotal = 0;
-          this.form.technicalPlanner = this.$store.getters.userId;
-        }
-        else {
-          this.formTotal = 1;
-          let data = res.data;
-          if (res.data.qualityInspector == null || res.data.qualityInspector == undefined || res.data.qualityInspector == "") {
-            data.qualityInspector = []
-          } else {
-            let arr = []
-            data.qualityInspector = data.qualityInspector.split(',');
-            for (let inspector of data.qualityInspector) {
-              arr.push(parseInt(inspector))
-            }
-            data.qualityInspector = arr
-          }
-          this.form = data;
-        }
-      })
-    },
-    // 查询项目
-    getProjectById() {
-      getProject(this.taskForm.formId).then(response => {
-        this.chooseProject = response.data;
-        this.isSelect = true
-      });
-    },
-    // 查询用户列表
-    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;
-      });
-    },
-    getTechnicalDoc(val) {
-      this.getDoc(val, 'technicalDocument')
-    },
-    getModifyDoc(val) {
-      this.getDoc(val, 'modifyDocument')
-    },
-    getFinalDoc(val) {
-      this.getDoc(val, 'finalDocument')
-    },
-    getDoc(val, name) {
-      if (val) {
-        let arr = val.split('/upload')
-        this.form[name] = arr[1]
-        if (val == "") {
-          this.form[name] = ""
-        }
-      }
-    },
-    getFileName(name) {
-      if (name) {
-        let arr = name.split('/')
-        return arr[arr.length - 1];
-      }
-    },
-    isEmptyObject(obj) {
-      for (var key in obj) {
-        if (obj.hasOwnProperty(key)) {
-          return false;
-        }
-      }
-      return true;
-    },
-    validateDocument(doc) {
-      // 这里添加你的验证逻辑  
-      // 例如，检查tenderId是否为空或者是否符合其他规则  
-      if (!doc || doc.trim() === '') {
-        this.$message.error('请上传技术方案');
-        return false;
-      }
-      return true;
-    },
-    /** 提交按钮 */
-    submitForm() {
-      if (this.taskName == '方案上传') {
-        this.isDocumentValid = this.validateDocument(this.form.technicalDocument);
-        if (!this.isDocumentValid) {
-          return;
-        }
-      }
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.formTotal != 0) {
-            this.form.qualityInspector = this.form.qualityInspector.join(',');
-            updateTechnical(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-            const params = { taskId: this.taskForm.taskId };
-            getNextFlowNode(params).then(res => {
-              if (this.taskName == '方案上传') {
-                this.$set(this.taskForm.variables, "approval", this.form.technicalPlanner);
-                complete(this.taskForm).then(response => {
-                  this.$modal.msgSuccess(response.msg);
-                  this.$emit('goBack')
-                });
-              }
-              else if (this.taskName == '技术审核') {
-                getUsersManageLeaderByDept({ deptId: 110 }).then(res => {
-                  let userId = res.data.userId;
-                  this.$set(this.taskForm.variables, "approval", userId);
-                  complete(this.taskForm).then(response => {
-                    this.$modal.msgSuccess(response.msg);
-                    this.$emit('goBack')
-                  });
-                });
-              }
-              else if (this.taskName == '总工审核') {
-                complete(this.taskForm).then(response => {
-                  this.$modal.msgSuccess(response.msg);
-                  this.$emit('goBack')
-                });
-              }
-            })
-          } else {
-            this.form.qualityInspector = this.form.qualityInspector.join(',');
-            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.technicalDesigner);
-              complete(this.taskForm).then(response => {
-                this.$modal.msgSuccess(response.msg);
-                this.$emit('goBack')
-              });
-            })
-          }
-        }
-      });
-    },
-    showFormItem(name) {
-      let isShow = false;
-      if (name == '技术安排')
-        isShow = true;
-      else if (name == '方案上传')
-        isShow = (this.taskName != '技术安排');
-      else if (name == '技术审核')
-        isShow = (this.taskName != '技术安排' && this.taskName != '方案上传');
-      else if (name == '总工审核')
-        isShow = (this.taskName == '总工审核' || this.taskName == '');
-      return isShow;
-    },
-  }
-};
-</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/task/finished/detail/index.vue

@@ -23,7 +23,7 @@
           <zh-table :taskForm="taskForm" :tableForm="tableForm" v-else-if="taskForm.procDefName == '综合事务部考核'"></zh-table>
           <project-process :taskForm="taskForm" v-else-if="taskForm.procDefName == '项目流转'"></project-process>
           <car-form :taskForm="taskForm" :taskName="''" v-else-if="taskForm.procDefName == '用车审批'"></car-form>
-          <technical-form :taskForm="taskForm" v-else-if="taskForm.procDefName == '技术交底'"></technical-form>
+          <technical-plan :taskForm="taskForm" v-else-if="taskForm.procDefName == '技术方案'"></technical-plan>
           <safe-form :taskForm="taskForm" v-else-if="taskForm.procDefName == '安全交底'"></safe-form>
           <el-col :span="16" :offset="4" v-else>
             <div class="test-form">
@@ -97,7 +97,7 @@ 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 '../../../form/technicalForm.vue';
+import TechnicalForm from '../../../form/technicalPlan.vue';
 import SafeForm from '../../../form/safeForm.vue';
 import conditionDisplay from '@/views/flowable/form/components/conditionDisplay.vue'
 export default {

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

@@ -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.finishTime != null) {
         return true
       } else if (row.procDefName == '项目流转' && row.taskName != '项目登记') {
         return true

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

@@ -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 != "技术方案")
             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

@@ -478,7 +478,7 @@ 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.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 == '项目结算') {
         return false

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

@@ -48,7 +48,7 @@
                 项目级别
               </template>
               <el-tag :type="project.projectLevel ? (project.projectLevel === '0' ? 'info' : 'danger') : 'info'">
-                {{ project.projectLevel ? (project.projectLevel == '0' ? '一般项目' : '重大项目') : '一般项目'}}
+                {{ project.projectLevel ? (project.projectLevel == '0' ? '一般项目' : '重大项目') : '一般项目' }}
               </el-tag>
             </el-descriptions-item>
             <el-descriptions-item>
@@ -193,18 +193,18 @@
             </el-descriptions-item>
             <el-descriptions-item>
               <template slot="label">
-                <svg-icon slot="prefix" icon-class="date" />
-                组织交底时间
+                <svg-icon slot="prefix" icon-class="form" />
+                项目预算编制
               </template>
-              {{ project.organizeTime }}
+              <!-- v-hasPermi="['oa:project:edit']" -->
+              <el-link type="primary" @click="openBudget = true">项目预算表</el-link>
             </el-descriptions-item>
             <el-descriptions-item>
               <template slot="label">
                 <svg-icon slot="prefix" icon-class="date" />
-                项目预算
+                组织交底时间
               </template>
-              <!-- v-hasPermi="['oa:project:edit']" -->
-              <el-link type="primary" @click="openBudget = true">预算表</el-link>
+              {{ project.organizeTime }}
             </el-descriptions-item>
             <el-descriptions-item>
               <template slot="label">
@@ -224,6 +224,45 @@
           </el-descriptions>
         </div>
       </div>
+      <!-- 技术质量部安排 -->
+      <div class="box1 mt20">
+        <div class="title">技术质量部安排
+          <div class="line"></div>
+        </div>
+        <div class="info mt20">
+          <el-descriptions class="descriptions" border :column="3" style="text-align: center;">
+            <el-descriptions-item>
+              <template slot="label">
+                <svg-icon slot="prefix" icon-class="user" />
+                技术负责人
+              </template>
+              {{ project.technicalDirectorUser.nickName }}
+            </el-descriptions-item>
+            <el-descriptions-item>
+              <template slot="label">
+                <svg-icon slot="prefix" icon-class="user" />
+                技术设计人
+              </template>
+              {{ getUserName(project.projectLeader) }}
+            </el-descriptions-item>
+            <el-descriptions-item>
+              <template slot="label">
+                <svg-icon slot="prefix" icon-class="peoples" />
+                质量检查员
+              </template>
+              {{ project.qualityInspectorName }}
+            </el-descriptions-item>
+            <el-descriptions-item>
+              <template slot="label">
+                <svg-icon slot="prefix" icon-class="form" />
+                技术方案设计
+              </template>
+              <!-- v-hasPermi="['oa:project:edit']" -->
+              <el-link type="primary" @click="openPlan = true">技术方案审批表</el-link>
+            </el-descriptions-item>
+          </el-descriptions>
+        </div>
+      </div>
       <!-- 任务审核情况  -->
       <div class="box1 mt20">
         <div class="title">任务审核情况
@@ -372,21 +411,21 @@
             </el-descriptions-item>
             <el-descriptions-item :span="2">
               <template slot="label">
-                <svg-icon slot="prefix" icon-class="date" />
+                <svg-icon slot="prefix" icon-class="form" />
                 项目借款
               </template>
               <borrow-data :taskForm="taskForm"></borrow-data>
             </el-descriptions-item>
             <el-descriptions-item :span="2">
               <template slot="label">
-                <svg-icon slot="prefix" icon-class="date" />
+                <svg-icon slot="prefix" icon-class="form" />
                 成果汇交
               </template>
               <achi-data :taskForm="taskForm" class="table-warpper"></achi-data>
             </el-descriptions-item>
             <el-descriptions-item :span="2">
               <template slot="label">
-                <svg-icon slot="prefix" icon-class="date" />
+                <svg-icon slot="prefix" icon-class="form" />
                 产值结算
               </template>
               <settle-data :taskForm="taskForm"></settle-data>
@@ -398,11 +437,14 @@
     <el-dialog title="项目预算" :visible.sync="openBudget" width="1000px" append-to-body>
       <budget-tab :taskForm="taskForm"></budget-tab>
     </el-dialog>
+    <el-dialog title="技术方案审批表" :visible.sync="openPlan" width="1000px" append-to-body>
+      <plan-tab :taskForm="taskForm"></plan-tab>
+    </el-dialog>
     <el-dialog title="安全交底记录表" :visible.sync="openSafe" width="1000px" append-to-body>
       <safe-tab :taskForm="taskForm"></safe-tab>
     </el-dialog>
     <el-dialog title="技术交底记录表" :visible.sync="openTech" width="1000px" append-to-body>
-      <technical-tab :taskForm="taskForm"></technical-tab>
+      <plan-tab :taskForm="taskForm"></plan-tab>
     </el-dialog>
     <el-dialog title="更换项目负责人" :visible.sync="prLeaderOpen" width="1000px" append-to-body>
       <choose-people :multiple="false" @chooseUser="changeProjectLeader"></choose-people>
@@ -424,14 +466,14 @@ 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 TechnicalTab from '@/views/flowable/form/projectProcess/technicalTab.vue';
+import PlanTab 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, TechnicalTab, SettleData, BorrowData, BudgetTab, achiData, choosePeople },
+  components: { budgetInfo, SafeTab, PlanTab, SettleData, BorrowData, BudgetTab, achiData, choosePeople },
   created() {
     this.getUserList();
     this.getDeviceList();
@@ -461,6 +503,7 @@ export default {
       contractCode: "",
       contractNumber: "",
       openBudget: false,
+      openPlan: false,
       openSafe: false,
       openTech: false,
       prLeaderOpen: false,

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

@@ -1,348 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="128px">
-      <el-form-item label="项目编号" prop="projectId">
-        <el-select v-model="queryParams.projectId" clearable filterable remote reserve-keyword placeholder="请输入项目编号"
-          :remote-method="remoteMethod" :loading="loading" style="width: 400px;">
-          <el-option v-for="project in projectList" :key="project.projectId"
-            :label="project.projectNumber + '-' + project.projectName" :value="project.projectId">
-          </el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="技术负责人" prop="technicalDirector">
-        <el-select v-model="queryParams.technicalDirector" filterable clearable @change="handleQuery">
-          <el-option v-for="item in $store.state.user.userList" :key="item.userId" :label="item.nickName"
-            :value="item.userId">
-          </el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="技术设计人" prop="technicalDesigner">
-        <el-select v-model="queryParams.technicalDesigner" 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="technicalDirector">
-        <template slot-scope="scope">
-          {{ getUserName(scope.row.technicalDirector) }}
-        </template>
-      </el-table-column>
-      <el-table-column label="技术设计人" align="center" prop="technicalDesigner">
-        <template slot-scope="scope">
-          {{ getUserName(scope.row.technicalDesigner) }}
-        </template>
-      </el-table-column>
-      <!-- <el-table-column label="技术安排人" align="center" prop="technicalPlanner">
-        <template slot-scope="scope">
-          {{ getUserName(scope.row.technicalPlanner) }}
-        </template>
-      </el-table-column> -->
-      <!-- <el-table-column label="技术安排意见" align="center" prop="planComment" /> -->
-      <el-table-column label="质量检查员" align="center" prop="qualityInspector">
-        <template slot-scope="scope">
-          {{ getUserNames(scope.row.qualityInspector) }}
-        </template>
-      </el-table-column>
-      <!-- <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-view" @click="handleView(scope.row)"
-            v-hasPermi="['oa:technical:query']">查看</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>
-    <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 technicalTab from '../../flowable/form/projectProcess/technicalTab.vue';
-import { listProject } from '@/api/oa/project/project';
-
-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,
-        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: {},
-      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,
-        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技术交底";
-    },
-    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>