From 143216de73ba783a26d30ec40a03eb9b4fc1b862 Mon Sep 17 00:00:00 2001
From: xd <844539747@qq.com>
Date: Tue, 21 May 2024 17:01:09 +0800
Subject: [PATCH] '123'

---
 ABAP_AS_WITH_POOL.jcoDestination              |  4 ++--
 .../web/controller/quot/QuotController.java   | 24 +++++++++----------
 .../java/com/ruoyi/redBook/domain/OAQuot.java |  6 +++++
 .../mapper/redBook/OARedBookMapper.xml        |  2 +-
 ruoyi-ui/src/views/quot/quot/index.vue        |  4 ++--
 ruoyi-ui/src/views/redBook/quots.vue          | 17 ++++++++++++-
 6 files changed, 39 insertions(+), 18 deletions(-)

diff --git a/ABAP_AS_WITH_POOL.jcoDestination b/ABAP_AS_WITH_POOL.jcoDestination
index c7a3327..c0082bc 100644
--- a/ABAP_AS_WITH_POOL.jcoDestination
+++ b/ABAP_AS_WITH_POOL.jcoDestination
@@ -1,5 +1,5 @@
 #for tests only !
-#Mon May 20 13:09:39 CST 2024
+#Tue May 21 16:05:10 CST 2024
 jco.destination.pool_capacity=10
 jco.client.lang=ZH
 jco.client.ashost=172.19.0.120
@@ -7,5 +7,5 @@ jco.client.saprouter=
 jco.client.user=RFC
 jco.client.sysnr=00
 jco.destination.peak_limit=10
-jco.client.passwd=dZ:kRfA{dgU`sub#+3T]H6aOCHVj9d94]yQ__F^^y$n+#PX/
+jco.client.passwd=u]!Z{M|^ps7|OTDYVR9FX@#VvMHD7~y@=V7NzYJz?LvRTx~H
 jco.client.client=300
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 c293a54..5de8281 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
@@ -295,7 +295,7 @@ public class QuotController extends BaseController
         }
 
         if(StringUtils.isEmpty(quotJsxzGroup)){
-            return error("请先选择分组");
+            return error("技术协助-请先选择分组");
         }else{
             QuotJsqr quotJsqr = new QuotJsqr();
             String quotJsqrId = UUID.fastUUID().toString();
@@ -401,9 +401,9 @@ public class QuotController extends BaseController
     @PostMapping("/feedbackQuot")
     public AjaxResult feedbackQuot(@RequestBody Quot quot)
     {
-        String quot_id = quot.getQuotId();
+        //String quot_id = quot.getQuotId();
 
-        Quot info = quotService.selectQuotByQuotId(quot_id);
+        //Quot info = quotService.selectQuotByQuotId(quot_id);
         String quot_jsxz_approval_status = quot.getQuotJsxzApprovalStatus();
         String quot_hj_approval_status = quot.getQuotHjApprovalStatus();
         if("1".equals(quot_jsxz_approval_status)){
@@ -413,11 +413,11 @@ public class QuotController extends BaseController
             return error("核价还未完成");
         }
 
-        info.setQuotQuotationDate(DateUtils.getNowDate());//报价单-报价日期设置为 当前日期
-        info.setQuotApprovalStatus("2");
-        info.setQuotCheckUserName(getUsername());
+        quot.setQuotQuotationDate(DateUtils.getNowDate());//报价单-报价日期设置为 当前日期
+        quot.setQuotApprovalStatus("2");
+        quot.setQuotCheckUserName(getUsername());
 
-        quotService.updateQuot(info);
+        quotService.updateQuot(quot);
         return success();
     }
 
@@ -429,15 +429,15 @@ public class QuotController extends BaseController
     @PostMapping("/rejectQuot")
     public AjaxResult rejectQuot(@RequestBody Quot quot)
     {
-        String quot_id = quot.getQuotId();
+        //String quot_id = quot.getQuotId();
 
-        Quot info = quotService.selectQuotByQuotId(quot_id);
+        //Quot info = quotService.selectQuotByQuotId(quot_id);
         String quot_feedback_explanation = quot.getQuotFeedbackExplanation();
         if(StringUtils.isEmpty(quot_feedback_explanation)){
-            return error("反馈说明不能为空");
+            return error("报价信息-反馈说明不能为空");
         }
-        info.setQuotApprovalStatus("3");
-        quotService.updateQuot(info);
+        quot.setQuotApprovalStatus("3");
+        quotService.updateQuot(quot);
         return success();
     }
 }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/redBook/domain/OAQuot.java b/ruoyi-system/src/main/java/com/ruoyi/redBook/domain/OAQuot.java
index dacf244..7e3fdf4 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/redBook/domain/OAQuot.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/redBook/domain/OAQuot.java
@@ -16,6 +16,8 @@ public class OAQuot extends BaseEntity {
     private String rbDateUid;//调价版本
     private String quotApprovalStatus;//提交状态
 
+    private String createName;//创建人
+
     private List<OAQuotProduct> selectedResultData;
 
     public String getQuot_id() { return quot_id; }
@@ -74,6 +76,10 @@ public class OAQuot extends BaseEntity {
         return selectedResultData;
     }
 
+    public String getCreateName() { return createName; }
+
+    public void setCreateName(String createName) { this.createName = createName; }
+
     public void setSelectedResultData(List<OAQuotProduct> selectedResultData) {
         this.selectedResultData = selectedResultData;
     }
diff --git a/ruoyi-system/src/main/resources/mapper/redBook/OARedBookMapper.xml b/ruoyi-system/src/main/resources/mapper/redBook/OARedBookMapper.xml
index 25f845e..3ad9fa7 100644
--- a/ruoyi-system/src/main/resources/mapper/redBook/OARedBookMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/redBook/OARedBookMapper.xml
@@ -166,7 +166,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
     <select id="listQuots" parameterType="OAQuot" resultType="OAQuot">
         select a.quot_id,a.quotCode,a.quotCustomer,a.quotProject,a.quotLxr,a.quotLxrdh,a.totalPrice,a.quotApprovalStatus,
-               a.create_by,a.create_time createTime,
+               a.create_by,u.nick_name createName,a.create_time createTime,
                a.update_by,a.update_time updateTime
         from OAQuot a
         <include refid="quotsJoins"/>
diff --git a/ruoyi-ui/src/views/quot/quot/index.vue b/ruoyi-ui/src/views/quot/quot/index.vue
index a02d8ca..3bbb46a 100644
--- a/ruoyi-ui/src/views/quot/quot/index.vue
+++ b/ruoyi-ui/src/views/quot/quot/index.vue
@@ -146,7 +146,7 @@
     <!-- 添加或修改报价对话框 -->
     <el-dialog :visible.sync="open" width="1050px" append-to-body>
       <template slot="title">
-        报价单信息(<span style="color:red">注：此报价单数据，型号规格电压等如需下单或签订合同引用，请再次自行核对，责任自负</span>)
+        报价单信息<span style="color:red;margin-left:25px">(注：此报价单数据，型号规格电压等如需下单或签订合同引用，请再次自行核对，责任自负)</span>
       </template>
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-tabs v-model="activeName" tab-position="left" style="margin-left: 15px; margin-right: 15px;height: 480px;">
@@ -1063,7 +1063,7 @@ export default {
       this.productUpload.open = false;
       this.productUpload.isUploading = false;
       this.$refs.productUpload.clearFiles();
-      this.$message.warning("产品数据导入成功!");
+      this.$message.success("产品数据导入成功!");
       this.quotMaterialList = this.quotMaterialList.concat(response.data)
     },
     // 提交上传文件
diff --git a/ruoyi-ui/src/views/redBook/quots.vue b/ruoyi-ui/src/views/redBook/quots.vue
index 5901405..b953c59 100644
--- a/ruoyi-ui/src/views/redBook/quots.vue
+++ b/ruoyi-ui/src/views/redBook/quots.vue
@@ -27,6 +27,7 @@
             :key="dict.value"
             :label="dict.label"
             :value="dict.value"
+            v-if="!quotApprovalStatusHidden && (dict.value == '1' || dict.value == '2') "
           />
         </el-select>
       </el-form-item>
@@ -38,7 +39,7 @@
 
     <el-table width="100%"  v-loading="loading" :data="quotsList" :row-class-name="rowQuotsIndex">
       <el-table-column fixed="left" label="序号" align="center" prop="index" width="50"/>
-      <el-table-column fixed="left" label="操作" align="center" width="60" class-name="small-padding fixed-width">
+      <el-table-column fixed="left" label="操作" align="center" width="60" class-name="small-padding fixed-width" v-if="checkRole(['SALES_MAN'])">
         <template slot-scope="scope">
           <el-button type="text" @click="handleDeleteClick(scope.row)">删除</el-button>
         </template>
@@ -54,6 +55,7 @@
       <el-table-column label="总价" width="100" align="center" prop="totalPrice" />
       <el-table-column label="联系人" align="center" prop="quotLxr" />
       <el-table-column label="联系人电话" width="100" align="center" prop="quotLxrdh" />
+      <el-table-column label="创建人" width="180" align="center" prop="createName" />
       <el-table-column label="创建日期" width="180" align="center" prop="createTime" />
       <el-table-column label="更新日期" width="180" align="center" prop="updateTime" />
       <el-table-column label="提交状态" align="center" prop="quotApprovalStatus" width="150px">
@@ -165,6 +167,8 @@
   }
 </style>
 <script>
+  import { checkPermi, checkRole } from "@/utils/permission"; // 权限判断函数
+
   import {toDecimal, versionList,listQuots,getQuotDetail,deleteQuots,updateSelectedResultData,madeQuot,saveQuot,commitQuot } from "@/api/redBook/redBook";
 
   export default {
@@ -172,6 +176,9 @@
       dicts:['rb_quot_approval_status'],
       data() {
         return {
+          //提交状态下拉框数据设置
+          quotApprovalStatusHidden: true,
+
           // 遮罩层
           loading: true,
           // 显示搜索条件
@@ -221,10 +228,18 @@
         }
       },
       created() {
+        const roles = this.$store.state.user.roles;
+        if(roles && roles.indexOf('QUOT') !== -1 && roles.indexOf('admin') == -1 ){//报价组默认查看待审核 单据
+          this.quotApprovalStatusHidden = false;
+          this.queryParams.quotApprovalStatus = '1';
+        }
+
         this.getList();
         this.getVersionList();
       },
       methods: {
+        checkPermi,
+        checkRole,
         /** 查询报价单列表 */
         getList() {
           this.loading = true;