From 2e1af4e2b20e16fedf49f3cd9f8677ad6e37a31e Mon Sep 17 00:00:00 2001 From: xd <844539747@qq.com> Date: Tue, 9 Apr 2024 11:05:06 +0800 Subject: [PATCH] '123' --- .../web/controller/quot/QuotController.java | 9 +- .../technicalConfirm/QuotJsqrController.java | 88 ++++++- .../technicalConfirm/domain/QuotJsqr.java | 32 +-- .../technicalConfirm/QuotJsqrMapper.xml | 40 +-- .../api/technicalConfirm/technicalConfirm.js | 9 + .../technicalConfirm/index.vue | 245 ++++++++++-------- 6 files changed, 276 insertions(+), 147 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/quot/QuotController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/quot/QuotController.java index 49768c2..06dd6fc 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/quot/QuotController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/quot/QuotController.java @@ -8,7 +8,6 @@ import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.file.FileUploadUtils; import com.ruoyi.common.utils.file.MinioUtil; import com.ruoyi.common.utils.uuid.UUID; -import com.ruoyi.customer.domain.Customer; import com.ruoyi.quot.domain.QuotFile; import com.ruoyi.quot.service.IQuotFileService; import com.ruoyi.technicalConfirm.domain.QuotJsqr; @@ -230,25 +229,25 @@ public class QuotController extends BaseController //特缆、低压、中压、其他 协助状态设置 if(quotJsxzGroup.indexOf("TL")!=-1){ quotJsqr.setQuotJsqrTlApprovalStatus("1"); - quotJsqr.setQuotJsqrTlOperateStatus("0"); + quotJsqr.setQuotJsqrTlOperateState("0"); quotJsqr.setQuotJsqrTlCheckState("0"); quotJsqr.setQuotJsqrTlLeaderState("0"); } if(quotJsxzGroup.indexOf("DY")!=-1){ quotJsqr.setQuotJsqrDyApprovalStatus("1"); - quotJsqr.setQuotJsqrDyOperateStatus("0"); + quotJsqr.setQuotJsqrDyOperateState("0"); quotJsqr.setQuotJsqrDyCheckState("0"); quotJsqr.setQuotJsqrDyLeaderState("0"); } if(quotJsxzGroup.indexOf("ZY")!=-1){ quotJsqr.setQuotJsqrZyApprovalStatus("1"); - quotJsqr.setQuotJsqrZyOperateStatus("0"); + quotJsqr.setQuotJsqrZyOperateState("0"); quotJsqr.setQuotJsqrZyCheckState("0"); quotJsqr.setQuotJsqrZyLeaderState("0"); } if(quotJsxzGroup.indexOf("QT")!=-1){ quotJsqr.setQuotJsqrQtApprovalStatus("1"); - quotJsqr.setQuotJsqrQtOperateStatus("0"); + quotJsqr.setQuotJsqrQtOperateState("0"); quotJsqr.setQuotJsqrQtCheckState("0"); quotJsqr.setQuotJsqrQtLeaderState("0"); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/technicalConfirm/QuotJsqrController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/technicalConfirm/QuotJsqrController.java index 8dc7aeb..2b2e881 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/technicalConfirm/QuotJsqrController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/technicalConfirm/QuotJsqrController.java @@ -2,6 +2,7 @@ package com.ruoyi.web.controller.technicalConfirm; import javax.servlet.http.HttpServletResponse; +import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.technicalConfirm.domain.QuotJsqr; import com.ruoyi.technicalConfirm.service.IQuotJsqrService; @@ -52,7 +53,7 @@ public class QuotJsqrController extends BaseController * 导出报价单-技术确认单列表 */ @PreAuthorize("@ss.hasPermi('jsqr:jsqr:export')") - @Log(title = "报价单-技术确认单", businessType = BusinessType.EXPORT) + @Log(title = "报价单-技术确认单导出", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, QuotJsqr quotJsqr) { @@ -86,10 +87,93 @@ public class QuotJsqrController extends BaseController * 删除报价单-技术确认单 */ @PreAuthorize("@ss.hasPermi('jsqr:jsqr:remove')") - @Log(title = "报价单-技术确认单", businessType = BusinessType.DELETE) + @Log(title = "报价单-技术确认单删除", businessType = BusinessType.DELETE) @DeleteMapping("/{quotJsqrIds}") public AjaxResult remove(@PathVariable String[] quotJsqrIds) { return toAjax(quotJsqrService.deleteQuotJsqrByQuotJsqrIds(quotJsqrIds)); } + + /** + * 操作人确认事件 + */ + @PreAuthorize("@ss.hasPermi('jsqr:jsqr:query')") + @Log(title = "报价单-技术确认单协助操作", businessType = BusinessType.UPDATE) + @PostMapping("/doOperate") + public AjaxResult doOperate(HttpServletResponse response, String quotJsxzGroup,String type,String state, String quotJsqrId) + { + QuotJsqr quotJsqr = new QuotJsqr(); + quotJsqr.setQuotJsqrId(quotJsqrId); + if("TL".equals(quotJsxzGroup)){ + if("operater".equals(type)){ + quotJsqr.setQuotJsqrTlOperateUserName(getLoginUser().getUser().getNickName()); + quotJsqr.setQuotJsqrTlOperateTime(DateUtils.getTime()); + quotJsqr.setQuotJsqrTlOperateState(state); + } + if("checker".equals(type)){ + quotJsqr.setQuotJsqrTlCheckUserName(getLoginUser().getUser().getNickName()); + quotJsqr.setQuotJsqrTlCheckTime(DateUtils.getTime()); + quotJsqr.setQuotJsqrTlCheckState(state); + } + if("leader".equals(type)){ + quotJsqr.setQuotJsqrTlLeaderUserName(getLoginUser().getUser().getNickName()); + quotJsqr.setQuotJsqrTlLeaderTime(DateUtils.getTime()); + quotJsqr.setQuotJsqrTlLeaderState(state); + //TODO 协助状态更新 + } + }else if("DY".equals(quotJsxzGroup)){ + if("operater".equals(type)){ + quotJsqr.setQuotJsqrDyOperateUserName(getLoginUser().getUser().getNickName()); + quotJsqr.setQuotJsqrDyOperateTime(DateUtils.getTime()); + quotJsqr.setQuotJsqrDyOperateState(state); + } + if("checker".equals(type)){ + quotJsqr.setQuotJsqrDyCheckUserName(getLoginUser().getUser().getNickName()); + quotJsqr.setQuotJsqrDyCheckTime(DateUtils.getTime()); + quotJsqr.setQuotJsqrDyCheckState(state); + } + if("leader".equals(type)){ + quotJsqr.setQuotJsqrDyLeaderUserName(getLoginUser().getUser().getNickName()); + quotJsqr.setQuotJsqrDyLeaderTime(DateUtils.getTime()); + quotJsqr.setQuotJsqrDyLeaderState(state); + //TODO 协助状态更新 + } + }else if("ZY".equals(quotJsxzGroup)){ + if("operater".equals(type)){ + quotJsqr.setQuotJsqrZyOperateUserName(getLoginUser().getUser().getNickName()); + quotJsqr.setQuotJsqrZyOperateTime(DateUtils.getTime()); + quotJsqr.setQuotJsqrZyOperateState(state); + } + if("checker".equals(type)){ + quotJsqr.setQuotJsqrZyCheckUserName(getLoginUser().getUser().getNickName()); + quotJsqr.setQuotJsqrZyCheckTime(DateUtils.getTime()); + quotJsqr.setQuotJsqrZyCheckState(state); + } + if("leader".equals(type)){ + quotJsqr.setQuotJsqrZyLeaderUserName(getLoginUser().getUser().getNickName()); + quotJsqr.setQuotJsqrZyLeaderTime(DateUtils.getTime()); + quotJsqr.setQuotJsqrZyLeaderState(state); + //TODO 协助状态更新 + } + }else if("QT".equals(quotJsxzGroup)){ + if("operater".equals(type)){ + quotJsqr.setQuotJsqrQtOperateUserName(getLoginUser().getUser().getNickName()); + quotJsqr.setQuotJsqrQtOperateTime(DateUtils.getTime()); + quotJsqr.setQuotJsqrQtOperateState(state); + } + if("checker".equals(type)){ + quotJsqr.setQuotJsqrQtCheckUserName(getLoginUser().getUser().getNickName()); + quotJsqr.setQuotJsqrQtCheckTime(DateUtils.getTime()); + quotJsqr.setQuotJsqrQtCheckState(state); + } + if("leader".equals(type)){ + quotJsqr.setQuotJsqrQtLeaderUserName(getLoginUser().getUser().getNickName()); + quotJsqr.setQuotJsqrQtLeaderTime(DateUtils.getTime()); + quotJsqr.setQuotJsqrQtLeaderState(state); + //TODO 协助状态更新 + } + } + quotJsqrService.updateQuotJsqr(quotJsqr); + return success(quotJsqr); + } } diff --git a/ruoyi-system/src/main/java/com/ruoyi/technicalConfirm/domain/QuotJsqr.java b/ruoyi-system/src/main/java/com/ruoyi/technicalConfirm/domain/QuotJsqr.java index 9cfde43..5960c77 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/technicalConfirm/domain/QuotJsqr.java +++ b/ruoyi-system/src/main/java/com/ruoyi/technicalConfirm/domain/QuotJsqr.java @@ -30,7 +30,7 @@ public class QuotJsqr extends BaseEntity private String quotJsqrTlOperateUserName; /** 特缆操作状态 */ - private String quotJsqrTlOperateStatus; + private String quotJsqrTlOperateState; /** 特缆操作时间 */ private String quotJsqrTlOperateTime; @@ -70,7 +70,7 @@ public class QuotJsqr extends BaseEntity private String quotJsqrDyOperateUserName; /** 低压操作状态 */ - private String quotJsqrDyOperateStatus; + private String quotJsqrDyOperateState; /** 低压操作时间 */ private String quotJsqrDyOperateTime; @@ -110,7 +110,7 @@ public class QuotJsqr extends BaseEntity private String quotJsqrZyOperateUserName; /** 中压操作状态 */ - private String quotJsqrZyOperateStatus; + private String quotJsqrZyOperateState; /** 中压操作时间 */ private String quotJsqrZyOperateTime; @@ -150,7 +150,7 @@ public class QuotJsqr extends BaseEntity private String quotJsqrQtOperateUserName; /** 其他操作状态 */ - private String quotJsqrQtOperateStatus; + private String quotJsqrQtOperateState; /** 其他操作时间 */ private String quotJsqrQtOperateTime; @@ -215,11 +215,11 @@ public class QuotJsqr extends BaseEntity { return quotJsqrTlOperateUserName; } - public void setQuotJsqrTlOperateStatus(String quotJsqrTlOperateStatus) { this.quotJsqrTlOperateStatus = quotJsqrTlOperateStatus; } + public void setQuotJsqrTlOperateState(String quotJsqrTlOperateState) { this.quotJsqrTlOperateState = quotJsqrTlOperateState; } - public String getQuotJsqrTlOperateStatus() + public String getQuotJsqrTlOperateState() { - return quotJsqrTlOperateStatus; + return quotJsqrTlOperateState; } public void setQuotJsqrTlOperateTime(String quotJsqrTlOperateTime) { this.quotJsqrTlOperateTime = quotJsqrTlOperateTime; } @@ -299,11 +299,11 @@ public class QuotJsqr extends BaseEntity { return quotJsqrDyOperateUserName; } - public void setQuotJsqrDyOperateStatus(String quotJsqrDyOperateStatus) { this.quotJsqrDyOperateStatus = quotJsqrDyOperateStatus; } + public void setQuotJsqrDyOperateState(String quotJsqrDyOperateState) { this.quotJsqrDyOperateState = quotJsqrDyOperateState; } - public String getQuotJsqrDyOperateStatus() + public String getQuotJsqrDyOperateState() { - return quotJsqrDyOperateStatus; + return quotJsqrDyOperateState; } public void setQuotJsqrDyOperateTime(String quotJsqrDyOperateTime) { this.quotJsqrDyOperateTime = quotJsqrDyOperateTime; } @@ -383,11 +383,11 @@ public class QuotJsqr extends BaseEntity { return quotJsqrZyOperateUserName; } - public void setQuotJsqrZyOperateStatus(String quotJsqrZyOperateStatus) { this.quotJsqrZyOperateStatus = quotJsqrZyOperateStatus; } + public void setQuotJsqrZyOperateState(String quotJsqrZyOperateState) { this.quotJsqrZyOperateState = quotJsqrZyOperateState; } - public String getQuotJsqrZyOperateStatus() + public String getQuotJsqrZyOperateState() { - return quotJsqrZyOperateStatus; + return quotJsqrZyOperateState; } public void setQuotJsqrZyOperateTime(String quotJsqrZyOperateTime) { this.quotJsqrZyOperateTime = quotJsqrZyOperateTime; } @@ -467,11 +467,11 @@ public class QuotJsqr extends BaseEntity { return quotJsqrQtOperateUserName; } - public void setQuotJsqrQtOperateStatus(String quotJsqrQtOperateStatus) { this.quotJsqrQtOperateStatus = quotJsqrQtOperateStatus; } + public void setQuotJsqrQtOperateState(String quotJsqrQtOperateState) { this.quotJsqrQtOperateState = quotJsqrQtOperateState; } - public String getQuotJsqrQtOperateStatus() + public String getQuotJsqrQtOperateState() { - return quotJsqrQtOperateStatus; + return quotJsqrQtOperateState; } public void setQuotJsqrQtOperateTime(String quotJsqrQtOperateTime) { this.quotJsqrQtOperateTime = quotJsqrQtOperateTime; } diff --git a/ruoyi-system/src/main/resources/mapper/technicalConfirm/QuotJsqrMapper.xml b/ruoyi-system/src/main/resources/mapper/technicalConfirm/QuotJsqrMapper.xml index 3a69de8..452921f 100644 --- a/ruoyi-system/src/main/resources/mapper/technicalConfirm/QuotJsqrMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/technicalConfirm/QuotJsqrMapper.xml @@ -9,7 +9,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + @@ -22,7 +22,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + @@ -35,7 +35,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + @@ -48,7 +48,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + @@ -85,16 +85,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select a.quot_jsqr_id, a.quot_jsqr_code, a.quot_jsqr_tl_approval_status, a.quot_jsqr_tl_operate_user_name, - a.quot_jsqr_tl_operate_status, a.quot_jsqr_tl_operate_time, a.quot_jsqr_tl_remark, a.quot_jsqr_tl_check_user_name, + a.quot_jsqr_tl_operate_state, a.quot_jsqr_tl_operate_time, a.quot_jsqr_tl_remark, a.quot_jsqr_tl_check_user_name, a.quot_jsqr_tl_check_state, a.quot_jsqr_tl_check_time, a.quot_jsqr_tl_check_remark, a.quot_jsqr_tl_leader_user_name, a.quot_jsqr_tl_leader_state, a.quot_jsqr_tl_leader_time, a.quot_jsqr_tl_leader_remark, a.quot_jsqr_dy_approval_status, - a.quot_jsqr_dy_operate_user_name, a.quot_jsqr_dy_operate_status, a.quot_jsqr_dy_operate_time, a.quot_jsqr_dy_remark, + a.quot_jsqr_dy_operate_user_name, a.quot_jsqr_dy_operate_state, a.quot_jsqr_dy_operate_time, a.quot_jsqr_dy_remark, a.quot_jsqr_dy_check_user_name, a.quot_jsqr_dy_check_state, a.quot_jsqr_dy_check_time, a.quot_jsqr_dy_check_remark, a.quot_jsqr_dy_leader_user_name, a.quot_jsqr_dy_leader_state, a.quot_jsqr_dy_leader_time, a.quot_jsqr_dy_leader_remark, - a.quot_jsqr_zy_approval_status, a.quot_jsqr_zy_operate_user_name, a.quot_jsqr_zy_operate_status, a.quot_jsqr_zy_operate_time, + a.quot_jsqr_zy_approval_status, a.quot_jsqr_zy_operate_user_name, a.quot_jsqr_zy_operate_state, a.quot_jsqr_zy_operate_time, a.quot_jsqr_zy_remark, a.quot_jsqr_zy_check_user_name, a.quot_jsqr_zy_check_state, a.quot_jsqr_zy_check_time, a.quot_jsqr_zy_check_remark, a.quot_jsqr_zy_leader_user_name, a.quot_jsqr_zy_leader_state, a.quot_jsqr_zy_leader_time, - a.quot_jsqr_zy_leader_remark, a.quot_jsqr_qt_approval_status, a.quot_jsqr_qt_operate_user_name, a.quot_jsqr_qt_operate_status, + a.quot_jsqr_zy_leader_remark, a.quot_jsqr_qt_approval_status, a.quot_jsqr_qt_operate_user_name, a.quot_jsqr_qt_operate_state, a.quot_jsqr_qt_operate_time, a.quot_jsqr_qt_remark, a.quot_jsqr_qt_check_user_name, a.quot_jsqr_qt_check_state, a.quot_jsqr_qt_check_time, a.quot_jsqr_qt_check_remark, a.quot_jsqr_qt_leader_user_name, a.quot_jsqr_qt_leader_state, a.quot_jsqr_qt_leader_time, a.quot_jsqr_qt_leader_remark, a.create_by, a.create_time, a.update_by, a.update_time, @@ -128,7 +128,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" quot_jsqr_code, quot_jsqr_tl_approval_status, quot_jsqr_tl_operate_user_name, - quot_jsqr_tl_operate_status, + quot_jsqr_tl_operate_state, quot_jsqr_tl_operate_time, quot_jsqr_tl_remark, quot_jsqr_tl_check_user_name, @@ -141,7 +141,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" quot_jsqr_tl_leader_remark, quot_jsqr_dy_approval_status, quot_jsqr_dy_operate_user_name, - quot_jsqr_dy_operate_status, + quot_jsqr_dy_operate_state, quot_jsqr_dy_operate_time, quot_jsqr_dy_remark, quot_jsqr_dy_check_user_name, @@ -154,7 +154,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" quot_jsqr_dy_leader_remark, quot_jsqr_zy_approval_status, quot_jsqr_zy_operate_user_name, - quot_jsqr_zy_operate_status, + quot_jsqr_zy_operate_state, quot_jsqr_zy_operate_time, quot_jsqr_zy_remark, quot_jsqr_zy_check_user_name, @@ -167,7 +167,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" quot_jsqr_zy_leader_remark, quot_jsqr_qt_approval_status, quot_jsqr_qt_operate_user_name, - quot_jsqr_qt_operate_status, + quot_jsqr_qt_operate_state, quot_jsqr_qt_operate_time, quot_jsqr_qt_remark, quot_jsqr_qt_check_user_name, @@ -188,7 +188,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{quotJsqrCode}, #{quotJsqrTlApprovalStatus}, #{quotJsqrTlOperateUserName}, - #{quotJsqrTlOperateStatus}, + #{quotJsqrTlOperateState}, #{quotJsqrTlOperateTime}, #{quotJsqrTlRemark}, #{quotJsqrTlCheckUserName}, @@ -201,7 +201,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{quotJsqrTlLeaderRemark}, #{quotJsqrDyApprovalStatus}, #{quotJsqrDyOperateUserName}, - #{quotJsqrDyOperateStatus}, + #{quotJsqrDyOperateState}, #{quotJsqrDyOperateTime}, #{quotJsqrDyRemark}, #{quotJsqrDyCheckUserName}, @@ -214,7 +214,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{quotJsqrDyLeaderRemark}, #{quotJsqrZyApprovalStatus}, #{quotJsqrZyOperateUserName}, - #{quotJsqrZyOperateStatus}, + #{quotJsqrZyOperateState}, #{quotJsqrZyOperateTime}, #{quotJsqrZyRemark}, #{quotJsqrZyCheckUserName}, @@ -227,7 +227,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{quotJsqrZyLeaderRemark}, #{quotJsqrQtApprovalStatus}, #{quotJsqrQtOperateUserName}, - #{quotJsqrQtOperateStatus}, + #{quotJsqrQtOperateState}, #{quotJsqrQtOperateTime}, #{quotJsqrQtRemark}, #{quotJsqrQtCheckUserName}, @@ -251,7 +251,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" quot_jsqr_code = #{quotJsqrCode}, quot_jsqr_tl_approval_status = #{quotJsqrTlApprovalStatus}, quot_jsqr_tl_operate_user_name = #{quotJsqrTlOperateUserName}, - quot_jsqr_tl_operate_status = #{quotJsqrTlOperateStatus}, + quot_jsqr_tl_operate_state = #{quotJsqrTlOperateState}, quot_jsqr_tl_operate_time = #{quotJsqrTlOperateTime}, quot_jsqr_tl_remark = #{quotJsqrTlRemark}, quot_jsqr_tl_check_user_name = #{quotJsqrTlCheckUserName}, @@ -264,7 +264,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" quot_jsqr_tl_leader_remark = #{quotJsqrTlLeaderRemark}, quot_jsqr_dy_approval_status = #{quotJsqrDyApprovalStatus}, quot_jsqr_dy_operate_user_name = #{quotJsqrDyOperateUserName}, - quot_jsqr_dy_operate_status = #{quotJsqrDyOperateStatus}, + quot_jsqr_dy_operate_state = #{quotJsqrDyOperateState}, quot_jsqr_dy_operate_time = #{quotJsqrDyOperateTime}, quot_jsqr_dy_remark = #{quotJsqrDyRemark}, quot_jsqr_dy_check_user_name = #{quotJsqrDyCheckUserName}, @@ -277,7 +277,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" quot_jsqr_dy_leader_remark = #{quotJsqrDyLeaderRemark}, quot_jsqr_zy_approval_status = #{quotJsqrZyApprovalStatus}, quot_jsqr_zy_operate_user_name = #{quotJsqrZyOperateUserName}, - quot_jsqr_zy_operate_status = #{quotJsqrZyOperateStatus}, + quot_jsqr_zy_operate_state = #{quotJsqrZyOperateState}, quot_jsqr_zy_operate_time = #{quotJsqrZyOperateTime}, quot_jsqr_zy_remark = #{quotJsqrZyRemark}, quot_jsqr_zy_check_user_name = #{quotJsqrZyCheckUserName}, @@ -290,7 +290,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" quot_jsqr_zy_leader_remark = #{quotJsqrZyLeaderRemark}, quot_jsqr_qt_approval_status = #{quotJsqrQtApprovalStatus}, quot_jsqr_qt_operate_user_name = #{quotJsqrQtOperateUserName}, - quot_jsqr_qt_operate_status = #{quotJsqrQtOperateStatus}, + quot_jsqr_qt_operate_state = #{quotJsqrQtOperateState}, quot_jsqr_qt_operate_time = #{quotJsqrQtOperateTime}, quot_jsqr_qt_remark = #{quotJsqrQtRemark}, quot_jsqr_qt_check_user_name = #{quotJsqrQtCheckUserName}, diff --git a/ruoyi-ui/src/api/technicalConfirm/technicalConfirm.js b/ruoyi-ui/src/api/technicalConfirm/technicalConfirm.js index 4881052..ac9e46c 100644 --- a/ruoyi-ui/src/api/technicalConfirm/technicalConfirm.js +++ b/ruoyi-ui/src/api/technicalConfirm/technicalConfirm.js @@ -42,3 +42,12 @@ export function delJsqr(quotJsqrId) { method: 'delete' }) } + +//操作人、审核人、组长 确认事件 +export function doOperate(quotJsxzGroup,type,state,quotJsqrId) { + return request({ + url: '/jsqr/jsqr/doOperate', + method: 'post', + params: {quotJsxzGroup:quotJsxzGroup,type:type,state:state,quotJsqrId:quotJsqrId} + }) +} diff --git a/ruoyi-ui/src/views/technicalConfirm/technicalConfirm/index.vue b/ruoyi-ui/src/views/technicalConfirm/technicalConfirm/index.vue index 130aa33..c07833a 100644 --- a/ruoyi-ui/src/views/technicalConfirm/technicalConfirm/index.vue +++ b/ruoyi-ui/src/views/technicalConfirm/technicalConfirm/index.vue @@ -173,12 +173,12 @@
特缆协助
- 操作人提交 - 操作人驳回 - 审核人提交 - 审核人驳回 - 组长提交 - 组长驳回 + 操作人通过 + 操作人驳回 + 审核人通过 + 审核人驳回 + 组长通过 + 组长驳回
@@ -219,8 +219,8 @@ - - + + - + + + @@ -291,12 +298,12 @@
低压协助
- 操作人提交 - 操作人驳回 - 审核人提交 - 审核人驳回 - 组长提交 - 组长驳回 + 操作人通过 + 操作人驳回 + 审核人通过 + 审核人驳回 + 组长通过 + 组长驳回
@@ -337,8 +344,8 @@ - - + + - + + + @@ -409,12 +423,12 @@
中压协助
- 操作人提交 - 操作人驳回 - 审核人提交 - 审核人驳回 - 组长提交 - 组长驳回 + 操作人通过 + 操作人驳回 + 审核人通过 + 审核人驳回 + 组长通过 + 组长驳回
@@ -455,8 +469,8 @@ - - + + - + + + @@ -527,12 +548,12 @@
其他协助
- 操作人提交 - 操作人驳回 - 审核人提交 - 审核人驳回 - 组长提交 - 组长驳回 + 操作人通过 + 操作人驳回 + 审核人通过 + 审核人驳回 + 组长通过 + 组长驳回
@@ -573,8 +594,8 @@ - - + + - + + + @@ -707,7 +735,7 @@ }