From 52f2ef90c2ff24658f52f688ccd78a178f912043 Mon Sep 17 00:00:00 2001
From: xd <844539747@qq.com>
Date: Wed, 12 Jun 2024 09:21:45 +0800
Subject: [PATCH] '123'

---
 .../ruoyi/web/utils/rbExcel/excelUtil.java    |  4 +-
 .../src/main/resources/application.yml        |  2 +-
 ruoyi-ui/src/layout/components/Navbar.vue     |  4 +-
 ruoyi-ui/src/views/quot/quot/index.vue        | 77 +++++++++----------
 4 files changed, 43 insertions(+), 44 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/utils/rbExcel/excelUtil.java b/ruoyi-admin/src/main/java/com/ruoyi/web/utils/rbExcel/excelUtil.java
index c978c14..26d6dc9 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/utils/rbExcel/excelUtil.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/utils/rbExcel/excelUtil.java
@@ -358,8 +358,8 @@ public class excelUtil {
         response.setContentType("application/vnd.ms-excel");
         BigDecimal totalmoney = BigDecimal.ZERO;
 
-        File jnlogo_file = new File("logon/"+IdUtils.createNo("jnlogo_",3)+".png");
-        File wc_file = new File("logon/"+IdUtils.createNo("wc_",3)+".png");
+        File jnlogo_file = new File("logon/"+quot.getQuotCode()+".png");
+        File wc_file = new File("logon/"+quot.getQuotCode()+".png");
         try {
             OutputStream os = response.getOutputStream();
             WritableWorkbook wwb = Workbook.createWorkbook(os);
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index dce93e7..37ceb4f 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -104,7 +104,7 @@ spring:
 # token配置
 token:
     # 是否允许账户多终端同时登录（true允许 false不允许）
-    soloLogin: false
+    soloLogin: true
     # 令牌自定义标识
     header: Authorization
     # 令牌密钥
diff --git a/ruoyi-ui/src/layout/components/Navbar.vue b/ruoyi-ui/src/layout/components/Navbar.vue
index 3881a73..2ff1a43 100644
--- a/ruoyi-ui/src/layout/components/Navbar.vue
+++ b/ruoyi-ui/src/layout/components/Navbar.vue
@@ -7,6 +7,7 @@
 
     <div class="right-menu">
       <template v-if="device!=='mobile'">
+
         <search id="header-search" class="right-menu-item" />
 
         <!--<el-tooltip content="源码地址" effect="dark" placement="bottom">
@@ -41,6 +42,7 @@
       <el-dropdown class="avatar-container right-menu-item hover-effect" trigger="click">
         <div class="avatar-wrapper">
           <img :src="avatar" class="user-avatar">
+          {{this.$store.state.user.nickName}}
           <i class="el-icon-caret-bottom" />
         </div>
         <el-dropdown-menu slot="dropdown">
@@ -50,7 +52,7 @@
           <el-dropdown-item @click.native="setting = true">
             <span>布局设置</span>
           </el-dropdown-item>
-          <el-dropdown-item @click.native="switchAccount" v-if="checkRole(['CHANGE_ACCOUNT'])">
+          <el-dropdown-item @click.native="switchAccount" v-if="checkRole(['ITZX'])">
             <span>切换账号</span>
           </el-dropdown-item>
           <el-dropdown-item divided @click.native="logout">
diff --git a/ruoyi-ui/src/views/quot/quot/index.vue b/ruoyi-ui/src/views/quot/quot/index.vue
index 85a64d2..a69501b 100644
--- a/ruoyi-ui/src/views/quot/quot/index.vue
+++ b/ruoyi-ui/src/views/quot/quot/index.vue
@@ -313,45 +313,42 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <div v-if="checkRole(['QUOT'])">
-          <el-row :gutter="8" v-if="this.form.quotApprovalStatus != '0' && this.form.quotApprovalStatus != null">
-            <el-col :span="6">
-              <el-form-item label="总数量" prop="quotQuantity">
-                <el-input v-model="form.quotQuantity" :disabled="form.quotApprovalStatus == '2' || form.quotApprovalStatus == '3'"/>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="总价" prop="quotTotalPrice">
-                <el-input v-model="form.quotTotalPrice" :disabled="form.quotApprovalStatus == '2' || form.quotApprovalStatus == '3'"/>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="是否打印" prop="quotPrint">
-                <el-select v-model="form.quotPrint" :disabled="true">
-                  <el-option
-                    v-for="dict in dict.type.quot_print"
-                    :key="dict.value"
-                    :label="dict.label"
-                    :value="dict.value"
-                  />
-                </el-select>
-
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="打印人" prop="quotPrintUserName">
-                <el-input v-model="form.quotPrintUserName" :disabled="true"/>
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </div>
+        <el-row :gutter="8" v-if="this.form.quotApprovalStatus != '0' && this.form.quotApprovalStatus != null">
+          <el-col :span="6" v-if="checkRole(['QUOT','PRICE_VERIFICATION'])">
+            <el-form-item label="总数量" prop="quotQuantity">
+              <el-input v-model="form.quotQuantity" :disabled="form.quotApprovalStatus == '2' || form.quotApprovalStatus == '3'"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6" v-if="checkRole(['QUOT','PRICE_VERIFICATION'])">
+            <el-form-item label="总价" prop="quotTotalPrice">
+              <el-input v-model="form.quotTotalPrice" :disabled="form.quotApprovalStatus == '2' || form.quotApprovalStatus == '3'"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6" v-if="checkRole(['QUOT','PRICE_VERIFICATION'])">
+            <el-form-item label="是否打印" prop="quotPrint">
+              <el-select v-model="form.quotPrint" :disabled="true">
+                <el-option
+                  v-for="dict in dict.type.quot_print"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6" v-if="checkRole(['QUOT','PRICE_VERIFICATION'])">
+            <el-form-item label="打印人" prop="quotPrintUserName">
+              <el-input v-model="form.quotPrintUserName" :disabled="true"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
         <el-row :gutter="8">
-          <el-col :span="6" v-if="checkRole(['QUOT'])">
+          <el-col :span="6" v-if="checkRole(['QUOT','PRICE_VERIFICATION'])">
             <el-form-item label="铜价" prop="quotTongPrice">
               <el-input v-model="form.quotTongPrice" :disabled="true"/>
             </el-form-item>
           </el-col>
-          <el-col :span="6" v-if="checkRole(['QUOT'])">
+          <el-col :span="6" v-if="checkRole(['QUOT','PRICE_VERIFICATION'])">
             <el-form-item label="铝价" prop="quotLvPrice">
               <el-input v-model="form.quotLvPrice" :disabled="true"/>
             </el-form-item>
@@ -362,15 +359,15 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="8" v-if="this.form.quotApprovalStatus != '0' && this.form.quotApprovalStatus != null">
-          <el-col :span="24">
+        <el-row :gutter="8" v-if="checkRole(['QUOT','SALES_MAN'])">
+          <el-col :span="24" 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="报价组填写"/>
+              <el-input type="textarea" autosize v-model="form.quotFeedbackExplanation" placeholder="报价组填写" :disabled="this.form.quotApprovalStatus == 2"/>
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="8" v-if="this.form.quotOAApprovalStatus == '2' || this.form.quotOAApprovalStatus == '3'">
-          <el-col :span="24">
+        <el-row :gutter="8" v-if="checkRole(['QUOT'])">
+          <el-col :span="24" v-if="this.form.quotOAApprovalStatus == '2' || this.form.quotOAApprovalStatus == '3'">
             <el-form-item label="OA审批说明" prop="quotOAApprovalStatusRemark">
               <el-input type="textarea" autosize v-model="form.quotOAApprovalStatusRemark" :disabled="true"/>
             </el-form-item>
@@ -1547,7 +1544,7 @@ export default {
       }
     });
     this.form.quotQuantity = sums[6];
-    this.form.quotTotalPrice = sums[12];
+    this.form.quotTotalPrice = checkRole(['QUOT_MAT_PRICE_DIFF'])? sums[12] : sums[11];
     return sums;
   },