'111'

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();
+    }
 }

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)

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
+  })
+}

ruoyi-ui/src/views/bid/bid/index.vue

@@ -361,7 +361,7 @@
         <el-row :gutter="8">
           <el-col :span="24" v-if="this.form.bidApprovalStatus != '0' && this.form.bidApprovalStatus != null">
             <el-form-item label="反馈说明" prop="bidReturnRemark">
-              <el-input type="textarea" autosize v-model="form.bidReturnRemark" placeholder="投标办填写" :disabled="this.form.bidApprovalStatus == 2"/>
+              <el-input type="textarea" autosize v-model="form.bidReturnRemark" placeholder="投标办填写" :disabled="this.form.bidApprovalStatus == 2 || this.form.bidApprovalStatus == 3"/>
             </el-form-item>
           </el-col>
         </el-row>
@@ -849,6 +849,11 @@
           <!-- 投标提交技术、核价协助-->
           <span v-hasPermi="['bid:bid:assist']"><el-button type="primary" plain @click="commitJsForm" v-if="this.form.bidApprovalStatus == '1'&&(this.form.bidJsxzApprovalStatus == '0'||this.form.bidJsxzApprovalStatus == '0')">提交技术协助</el-button></span>
 
+          <!-- 投标提交反馈、驳回-->
+<!--
+          <span style="margin-left: 10px" v-hasPermi="['bid:bid:feedback']"><el-button type="primary" plain @click="feedbackQuotForm" v-if="this.form.quotApprovalStatus == '1'&&this.form.quotJsxzApprovalStatus != '1'&&this.form.quotHjApprovalStatus != '1'&&this.form.quotJswApprovalStatus != '1'&&this.form.quotOAApprovalStatus != '1'">提交反馈</el-button></span>
+-->
+          <span style="margin-left: 10px" v-hasPermi="['bid:bid:reject']"><el-button type="danger" plain @click="rejectBidForm" v-if="this.form.bidApprovalStatus == '1'&&this.form.bidJsxzApprovalStatus != '1'">驳回</el-button></span>
         </div>
       </div>
       <PeopleSelect v-if="checkRole(['BID'])" ref="peopleSelect" :type="'single'" :isCheck="true" :open="peopleOpenSelectYwy" @cancel="peopleOpenSelectYwy=false" @submit="submitPeopleSelectYwy"></PeopleSelect>
@@ -887,7 +892,7 @@
 <script>
 import { checkPermi,checkRole } from '@/utils/permission';// 权限判断函数
 import { getToken } from "@/utils/auth";
-import { bidAssign,listBid, getBid, delBid, addBid, updateBid, bidFileList,bidFileDelete, commitTbxx,commitJsBid } from "@/api/bid/bid";
+import { bidAssign,listBid, getBid, delBid, addBid, updateBid, bidFileList,bidFileDelete, commitTbxx,commitJsBid, rejectBid } from "@/api/bid/bid";
 /** 弹窗放大、拖拽 */
 import elDragDialog from "@/directive/dialog/dragDialog";
 /** 导入技术确认单详情组件*/
@@ -1242,6 +1247,15 @@ export default {
       });
     },
 
+    /** 投标驳回按钮 */
+    rejectBidForm() {
+      rejectBid(this.form).then(response => {
+        this.$modal.msgSuccess("驳回成功");
+        this.open = false;
+        this.getList();
+      });
+    },
+
 
     /** 删除按钮操作 */
     handleDelete(row) {

ruoyi-ui/src/views/quot/quot/index.vue

@@ -429,7 +429,7 @@
         <el-row :gutter="8" v-if="checkRole(['QUOT','PRICE_VERIFICATION','SALES_MAN','HTB_QUOT'])">
           <el-col :span="14" v-if="this.form.quotApprovalStatus != '0' && this.form.quotApprovalStatus != null">
             <el-form-item label="反馈说明" prop="quotFeedbackExplanation">
-              <el-input type="textarea" autosize v-model="form.quotFeedbackExplanation" placeholder="报价组填写" :disabled="this.form.quotApprovalStatus == 2"/>
+              <el-input type="textarea" autosize v-model="form.quotFeedbackExplanation" placeholder="报价组填写" :disabled="this.form.quotApprovalStatus == 2 || this.form.quotApprovalStatus == 3"/>
             </el-form-item>
           </el-col>
           <el-col :span="10" v-if="this.form.quotOAApprovalStatus == '2' || this.form.quotOAApprovalStatus == '3'">