From e4cb8bad7c55f817ead3e419a33f96f5d3492ee4 Mon Sep 17 00:00:00 2001
From: xd <844539747@qq.com>
Date: Thu, 20 Jun 2024 13:52:29 +0800
Subject: [PATCH] '123'

---
 .../web/controller/quot/QuotController.java   |  1 +
 .../ruoyi/quot/domain/jsw/QuotJswInfo.java    | 19 ++++++++++++-------
 ruoyi-ui/src/views/quot/quot/index.vue        | 15 ++++++++++++---
 3 files changed, 25 insertions(+), 10 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 f78c391..d233a95 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
@@ -637,6 +637,7 @@ public class QuotController extends BaseController
             quotJswInfo.setKh(quot.getQuotCustomerName());
             quotJswInfo.setKhid(quot.getQuotCustomerBm());
             quotJswInfo.setBz(quot.getQuotQuotationRequire());
+            quotJswInfo.setQuotUserId(getUsername());
 
             List<QuotJswMaterial> quotJswMaterials = new ArrayList<>();
             QuotJswMaterial quotJswMaterial = null;
diff --git a/ruoyi-system/src/main/java/com/ruoyi/quot/domain/jsw/QuotJswInfo.java b/ruoyi-system/src/main/java/com/ruoyi/quot/domain/jsw/QuotJswInfo.java
index a87c5f8..e0e7043 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/quot/domain/jsw/QuotJswInfo.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/quot/domain/jsw/QuotJswInfo.java
@@ -6,13 +6,14 @@ import java.util.List;
  * 金思维 上传报价单主体信息
  */
 public class QuotJswInfo {
-    private String quotCode;
-    private String xsy;
-    private String xsyid;
-    private String kh;
-    private String khid;
-    private String xm;
-    private String bz;
+    private String quotCode;//客户报价单号
+    private String xsy;//业务员名称
+    private String xsyid;//业务员编码
+    private String kh;//客户名称
+    private String khid;//客户编码
+    private String xm;//项目名称
+    private String bz;//报价要求
+    private String quotUserId;//报价员账户
 
     private List<QuotJswMaterial> quotMaterial;
 
@@ -72,6 +73,10 @@ public class QuotJswInfo {
         this.bz = bz;
     }
 
+    public String getQuotUserId() { return quotUserId; }
+
+    public void setQuotUserId(String quotUserId) { this.quotUserId = quotUserId; }
+
     public List<QuotJswMaterial> getQuotMaterial() {
         return quotMaterial;
     }
diff --git a/ruoyi-ui/src/views/quot/quot/index.vue b/ruoyi-ui/src/views/quot/quot/index.vue
index e8b1e1a..fbad762 100644
--- a/ruoyi-ui/src/views/quot/quot/index.vue
+++ b/ruoyi-ui/src/views/quot/quot/index.vue
@@ -53,7 +53,7 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="OA提交状态" prop="quotOAApprovalStatus">
+      <el-form-item label="OA提交状态" prop="quotOAApprovalStatus" v-if="checkRole(['QUOT','PRICE_VERIFICATION'])">
         <el-select v-model="queryParams.quotOAApprovalStatus" placeholder="请选择提交状态" clearable>
           <el-option
             v-for="dict in dict.type.quot_oa_approval_status"
@@ -1400,7 +1400,16 @@ export default {
     setInfo(response){
       this.form = response.data;
       this.$set(this.form, "quotJsxzGroup", (this.form.quotJsxzGroupValues==''||this.form.quotJsxzGroupValues==null)?[]:this.form.quotJsxzGroupValues.split(','));
-      this.quotMaterialList = response.data.quotMaterialList;
+
+      //协助中状态不显示产品信息
+      if(checkRole(['SALES_MAN']) && !checkRole(['admin'])){
+        if(this.form.quotApprovalStatus!='1'){
+          this.quotMaterialList = response.data.quotMaterialList;
+        }
+      }else{
+        this.quotMaterialList = response.data.quotMaterialList;
+      }
+
       this.open = true;
       this.activeName = "quotInfo";
 
@@ -1705,7 +1714,7 @@ export default {
       const param = {relationId:this.form.quotId,fileType:'quotFkFile'}
 
       //协助中状态不显示反馈附件
-      if(checkRole(['SALES_MAN'])){
+      if(checkRole(['SALES_MAN']) && !checkRole(['admin'])){
         if(this.form.quotApprovalStatus!='1'){
           quotFileList(param).then(response => {
             this.quotFkFileList = response.rows;