From 8ca477ecebf221b03a63017968e606beb6d5634e Mon Sep 17 00:00:00 2001 From: xd <844539747@qq.com> Date: Wed, 17 Jul 2024 16:55:24 +0800 Subject: [PATCH] '111' --- .../web/controller/bid/BidController.java | 21 ++++++++++++++++++- .../technicalConfirm/BidJsqrController.java | 2 +- ruoyi-ui/src/api/bid/bid.js | 9 ++++++++ ruoyi-ui/src/views/bid/bid/index.vue | 18 ++++++++++++++-- ruoyi-ui/src/views/quot/quot/index.vue | 2 +- 5 files changed, 47 insertions(+), 5 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/bid/BidController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/bid/BidController.java index d99d68a..be0c0db 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/bid/BidController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/bid/BidController.java @@ -11,6 +11,7 @@ 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.quot.domain.Quot; import com.ruoyi.system.service.ISysDeptService; import com.ruoyi.technicalConfirm.domain.BidJsqr; import com.ruoyi.technicalConfirm.service.IBidJsqrService; @@ -322,7 +323,7 @@ public class BidController extends BaseController * 删除投标信息 */ @PreAuthorize("@ss.hasPermi('bid:bid:remove')") - @Log(title = "投标信息", businessType = BusinessType.DELETE) + @Log(title = "投标删除", businessType = BusinessType.DELETE) @DeleteMapping("/{bidIds}") public AjaxResult remove(@PathVariable String[] bidIds) { @@ -392,4 +393,22 @@ public class BidController extends BaseController } return success(); } + + /** + * 投标驳回 + */ + @PreAuthorize("@ss.hasPermi('bid:bid:reject')") + @Log(title = "投标驳回", businessType = BusinessType.OTHER) + @PostMapping("/rejectBid") + public AjaxResult rejectBid(@RequestBody Bid bid) + { + + /* String bid_returnRemark = bid.getBidReturnRemark(); + if(StringUtils.isEmpty(bid_returnRemark)){ + return error("投标-反馈说明不能为空"); + }*/ + bid.setBidApprovalStatus("3"); + bidService.updateBid(bid); + return success(); + } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/technicalConfirm/BidJsqrController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/technicalConfirm/BidJsqrController.java index ce42aa3..0ed6c41 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/technicalConfirm/BidJsqrController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/technicalConfirm/BidJsqrController.java @@ -405,7 +405,7 @@ public class BidJsqrController extends BaseController } /** - * 投标-技术确认单 提交报价组 + * 投标-技术确认单 提交投标 */ @PreAuthorize("@ss.hasPermi('jsqrBid:jsqrBid:commit')") @Log(title = "投标-技术确认单 提交投标", businessType = BusinessType.UPDATE) diff --git a/ruoyi-ui/src/api/bid/bid.js b/ruoyi-ui/src/api/bid/bid.js index 2ff9b03..6eb4ac8 100644 --- a/ruoyi-ui/src/api/bid/bid.js +++ b/ruoyi-ui/src/api/bid/bid.js @@ -86,3 +86,12 @@ export function commitJsBid(data) { data: data }) } + +//驳回按钮 +export function rejectBid(data) { + return request({ + url: '/bid/bid/rejectBid', + method: 'post', + data: data + }) +} diff --git a/ruoyi-ui/src/views/bid/bid/index.vue b/ruoyi-ui/src/views/bid/bid/index.vue index f101e2c..946c2bb 100644 --- a/ruoyi-ui/src/views/bid/bid/index.vue +++ b/ruoyi-ui/src/views/bid/bid/index.vue @@ -361,7 +361,7 @@ - + @@ -849,6 +849,11 @@ 提交技术协助 + + + 驳回 @@ -887,7 +892,7 @@