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 432a6d1..58516de 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 @@ -116,18 +116,24 @@ public class QuotJsqrController extends BaseController String quotJsxzGroup = info.getQuotJsxzGroup();//组名 String type = info.getType();//操作人、审核人、组长 String state = info.getState();//通过/驳回 + String fileNum = info.getFileNum();//操作人反馈附件数 if("TL".equals(quotJsxzGroup)){//特缆组 操作人、审核人、组长 对应按钮事件 if("operater".equals(type)){//操作人通过、驳回 quotJsqr.setQuotJsqrTlOperateUserName(getLoginUser().getUser().getNickName()); quotJsqr.setQuotJsqrTlOperateTime(DateUtils.getTime()); quotJsqr.setQuotJsqrTlOperateState(state); + + String quotJsqrTlRemark = info.getQuotJsqrTlRemark(); if("3".equals(state)){//驳回 - String quotJsqrTlRemark = info.getQuotJsqrTlRemark(); if(StringUtils.isEmpty(quotJsqrTlRemark)){ return error("特缆协助说明不能为空"); } quotJsqr.setQuotJsqrTlApprovalStatus("3");//特缆协助状态 设置为 驳回 + }else if("2".equals(state)){ + if("0".equals(fileNum)&&"".equals(quotJsqrTlRemark)){ + return error("特缆反馈附件 或 特缆协助说明 至少填写一项"); + } } } if("checker".equals(type)){//审核人通过、驳回 @@ -162,12 +168,17 @@ public class QuotJsqrController extends BaseController quotJsqr.setQuotJsqrDyOperateUserName(getLoginUser().getUser().getNickName()); quotJsqr.setQuotJsqrDyOperateTime(DateUtils.getTime()); quotJsqr.setQuotJsqrDyOperateState(state); + + String quotJsqrDyRemark = info.getQuotJsqrDyRemark(); if("3".equals(state)){//驳回 - String quotJsqrDyRemark = info.getQuotJsqrDyRemark(); if(StringUtils.isEmpty(quotJsqrDyRemark)){ return error("低压协助说明不能为空"); } quotJsqr.setQuotJsqrDyApprovalStatus("3");//低压协助状态 设置为 驳回 + }else if("2".equals(state)){ + if("0".equals(fileNum)&&"".equals(quotJsqrDyRemark)){ + return error("低压反馈附件 或 低压协助说明 至少填写一项"); + } } } if("checker".equals(type)){//审核人通过、驳回 @@ -202,12 +213,17 @@ public class QuotJsqrController extends BaseController quotJsqr.setQuotJsqrZyOperateUserName(getLoginUser().getUser().getNickName()); quotJsqr.setQuotJsqrZyOperateTime(DateUtils.getTime()); quotJsqr.setQuotJsqrZyOperateState(state); + + String quotJsqrZyRemark = info.getQuotJsqrZyRemark(); if("3".equals(state)){//驳回 - String quotJsqrZyRemark = info.getQuotJsqrZyRemark(); if(StringUtils.isEmpty(quotJsqrZyRemark)){ return error("中压协助说明不能为空"); } quotJsqr.setQuotJsqrZyApprovalStatus("3");//中压协助状态 设置为 驳回 + }else if("2".equals(state)){ + if("0".equals(fileNum)&&"".equals(quotJsqrZyRemark)){ + return error("中压反馈附件 或 低压协助说明 至少填写一项"); + } } } if("checker".equals(type)){//审核人通过、驳回 @@ -242,12 +258,17 @@ public class QuotJsqrController extends BaseController quotJsqr.setQuotJsqrQtOperateUserName(getLoginUser().getUser().getNickName()); quotJsqr.setQuotJsqrQtOperateTime(DateUtils.getTime()); quotJsqr.setQuotJsqrQtOperateState(state); + + String quotJsqrQtRemark = info.getQuotJsqrQtRemark(); if("3".equals(state)){//驳回 - String quotJsqrQtRemark = info.getQuotJsqrQtRemark(); if(StringUtils.isEmpty(quotJsqrQtRemark)){ return error("其他协助说明不能为空"); } quotJsqr.setQuotJsqrQtApprovalStatus("3");//其他协助状态 设置为 驳回 + }else if("2".equals(state)){ + if("0".equals(fileNum)&&"".equals(quotJsqrQtRemark)){ + return error("其他反馈附件 或 其他协助说明 至少填写一项"); + } } } if("checker".equals(type)){//审核人通过、驳回 diff --git a/ruoyi-system/src/main/java/com/ruoyi/technicalConfirm/domain/QuotJsqrXzDetail.java b/ruoyi-system/src/main/java/com/ruoyi/technicalConfirm/domain/QuotJsqrXzDetail.java index 629de39..a5cf09f 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/technicalConfirm/domain/QuotJsqrXzDetail.java +++ b/ruoyi-system/src/main/java/com/ruoyi/technicalConfirm/domain/QuotJsqrXzDetail.java @@ -5,6 +5,7 @@ public class QuotJsqrXzDetail { private String quotJsxzGroup; private String type; private String state; + private String fileNum; private String quotJsqrTlRemark; private String quotJsqrTlCheckRemark; @@ -54,6 +55,10 @@ public class QuotJsqrXzDetail { this.type = type; } + public String getFileNum() { return fileNum; } + + public void setFileNum(String fileNum) { this.fileNum = fileNum; } + public String getQuotJsqrTlRemark() { return quotJsqrTlRemark; } diff --git a/ruoyi-system/src/main/resources/mapper/quot/QuotMapper.xml b/ruoyi-system/src/main/resources/mapper/quot/QuotMapper.xml index 9813c0e..340507e 100644 --- a/ruoyi-system/src/main/resources/mapper/quot/QuotMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/quot/QuotMapper.xml @@ -40,6 +40,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + + + + + + @@ -71,7 +80,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" a.create_by, a.create_time, a.update_by, a.update_time, u.nick_name create_name, a.quot_jsxz_standard,a.quot_jsxz_approval_status,a.quot_jsxz_chapter, - a.quot_jsxz_technical_requirement,a.quot_jsxz_group_values,a.quot_jsxz_confirm_id,q.quot_jsqr_code quot_jsxz_confirm_code + a.quot_jsxz_technical_requirement,a.quot_jsxz_group_values,a.quot_jsxz_confirm_id, + q.quot_jsqr_code quot_jsxz_confirm_code, + q.quot_jsqr_tl_approval_status,q.quot_jsqr_tl_remark, + q.quot_jsqr_dy_approval_status,q.quot_jsqr_dy_remark, + q.quot_jsqr_zy_approval_status,q.quot_jsqr_zy_remark, + q.quot_jsqr_qt_approval_status,q.quot_jsqr_qt_remark from quot a @@ -96,8 +110,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" a.quot_quantity, a.quot_total_price, a.quot_check_user_name, a.quot_check_user_nickname, a.quot_approval_status, a.create_by, a.create_time, a.update_by, a.update_time, a.quot_jsxz_standard,a.quot_jsxz_approval_status,a.quot_jsxz_chapter, - a.quot_jsxz_technical_requirement,a.quot_jsxz_group_values,a.quot_jsxz_confirm_id,q.quot_jsqr_code quot_jsxz_confirm_code, - + a.quot_jsxz_technical_requirement,a.quot_jsxz_group_values,a.quot_jsxz_confirm_id, + q.quot_jsqr_code quot_jsxz_confirm_code, + q.quot_jsqr_tl_approval_status,q.quot_jsqr_tl_remark, + q.quot_jsqr_dy_approval_status,q.quot_jsqr_dy_remark, + q.quot_jsqr_zy_approval_status,q.quot_jsqr_zy_remark, + q.quot_jsqr_qt_approval_status,q.quot_jsqr_qt_remark, b.mat_id as sub_mat_id, b.mat_xingh as sub_mat_xingh, b.mat_guig as sub_mat_guig, b.mat_diany as sub_mat_diany, b.mat_danw as sub_mat_danw, b.mat_sl as sub_mat_sl, b.quot_id as sub_quot_id diff --git a/ruoyi-ui/src/views/quot/quot/index.vue b/ruoyi-ui/src/views/quot/quot/index.vue index a3b1ee9..7d06d7a 100644 --- a/ruoyi-ui/src/views/quot/quot/index.vue +++ b/ruoyi-ui/src/views/quot/quot/index.vue @@ -382,114 +382,122 @@ - 特缆协助 - - - - - - - - - - +
+ 特缆协助 + + + + + + + + + + - - - - - - - - - - - 低压协助 - - - - - - - - - - + + + + + + + + + + +
+
+ 低压协助 + + + + + + + + + + - - - - - - - - - - - 中压协助 - - - - - - - - - - + + + + + + + + + + +
+
+ 中压协助 + + + + + + + + + + - - - - - - - - - - - 其他协助 - - - - - - - - - - + + + + + + + + + + +
+
+ 其他协助 + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + +
特缆协助
- 操作人通过 + 操作人通过 操作人驳回
@@ -309,7 +309,7 @@ 低压协助
- 操作人通过 + 操作人通过 操作人驳回
@@ -440,7 +440,7 @@ 中压协助
- 操作人通过 + 操作人通过 操作人驳回
@@ -571,7 +571,7 @@ 其他协助
- 操作人通过 + 操作人通过 操作人驳回
@@ -901,7 +901,7 @@ export default { } if(quotJsxzGroup.indexOf("ZY")!==-1){ this.showZy = true; - //this.getQuotJsqrFileList('quotJsqrZyFkFile'); + this.getQuotJsqrFileList('quotJsqrZyFkFile'); } if(quotJsxzGroup.indexOf("QT")!==-1){ this.showQt = true; @@ -1012,12 +1012,13 @@ export default { }, //操作人、审核人、组长 确认事件 - doOperate(quotJsxzGroup,type,state){ + doOperate(quotJsxzGroup,type,state,fileNum){ let param = {} param.quotJsqrId = this.form.quotJsqrId; param.quotJsxzGroup = quotJsxzGroup;//组名 param.type = type;//操作人、审核人、组长 param.state = state;//通过/驳回 + param.fileNum = fileNum;//反馈附件数 param.quotJsqrTlRemark = this.form.quotJsqrTlRemark; param.quotJsqrTlCheckRemark = this.form.quotJsqrTlCheckRemark;