From 4724fca48724a39c12e4d006376b832363bcaec5 Mon Sep 17 00:00:00 2001
From: xd <844539747@qq.com>
Date: Wed, 10 Jul 2024 14:41:17 +0800
Subject: [PATCH] '123'

---
 .../java/com/ruoyi/web/controller/quot/QuotController.java  | 6 +++---
 ruoyi-ui/src/views/quot/quot/index.vue                      | 2 +-
 2 files changed, 4 insertions(+), 4 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 340ddd6..b6e6322 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
@@ -732,10 +732,10 @@ public class QuotController extends BaseController
     @PostMapping("/commitOAQuot")
     public AjaxResult commitOAQuot(@RequestBody Quot quot)
     {
-        //金思维协助中不允许提交OA
+        //金思维协助状态不是已完成不允许提交OA
         String quot_jsw_approval_status = quot.getQuotJswApprovalStatus();
-        if("1".equals(quot_jsw_approval_status)){
-            return error("金思维协助还未完成");
+        if(!"2".equals(quot_jsw_approval_status)){
+            return error("金思维未协助完成,不能提交OA");
         }
 
         // 报价单提交OA,插入中间表 sys_oa_quot sys_oa_quot_material
diff --git a/ruoyi-ui/src/views/quot/quot/index.vue b/ruoyi-ui/src/views/quot/quot/index.vue
index b777a89..f8e96b1 100644
--- a/ruoyi-ui/src/views/quot/quot/index.vue
+++ b/ruoyi-ui/src/views/quot/quot/index.vue
@@ -987,7 +987,7 @@
 
           <!-- 报价组提交金思维、OA-->
           <span style="margin-left: 10px;float:left" v-hasPermi="['quot:quot:assistJsw']"><el-button type="warning" plain @click="commitJswForm" v-if="this.form.quotApprovalStatus == '1'&&(this.form.quotJswApprovalStatus == '0'||this.form.quotJswApprovalStatus == '2')">提交金思维</el-button></span>
-          <span style="margin-left: 10px;float:left" v-hasPermi="['quot:quot:assistOA']"><el-button type="warning" plain @click="commitOAForm" v-if="this.form.quotApprovalStatus == '1'&&this.form.quotOAApprovalStatus == '0'">提交OA</el-button></span>
+          <span style="margin-left: 10px;float:left" v-hasPermi="['quot:quot:assistOA']"><el-button type="warning" plain @click="commitOAForm" v-if="this.form.quotApprovalStatus == '1'&&(this.form.quotOAApprovalStatus == '0'||this.form.quotOAApprovalStatus == '3')">提交OA</el-button></span>
 
           <!-- 报价组提交反馈、驳回报价单-->
           <span style="margin-left: 10px" v-hasPermi="['quot:quot: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>