From 1dd6f52bdea1fbc302732708f3ac4166de18a864 Mon Sep 17 00:00:00 2001
From: xd <844539747@qq.com>
Date: Wed, 3 Jul 2024 17:28:44 +0800
Subject: [PATCH] '123'

---
 .../technicalConfirm/QuotJsqrController.java  |  2 --
 ruoyi-ui/src/router/index.js                  |  4 +--
 ruoyi-ui/src/views/redBook/productSelect.vue  | 26 +++++++++-----
 ruoyi-ui/src/views/redBook/quots.vue          | 34 ++++++++++++++-----
 4 files changed, 44 insertions(+), 22 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/technicalConfirm/QuotJsqrController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/technicalConfirm/QuotJsqrController.java
index be8a07a..a1f2d5e 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/technicalConfirm/QuotJsqrController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/technicalConfirm/QuotJsqrController.java
@@ -512,8 +512,6 @@ public class QuotJsqrController extends BaseController
                     if(!currentUser.equals(hvalue)){
                         return error("当前有其他用户【"+hvalue+"】正在录入");
                     }
-                }else{
-                    return error("当前有其他用户【"+redisCache.getCacheMapValue("quotJsqrXzRemark",quotJsqrCode+"_"+type)+"】正在录入");
                 }
             }
         }else{// 清空 协助说明时清空redis对应的值
diff --git a/ruoyi-ui/src/router/index.js b/ruoyi-ui/src/router/index.js
index e019b3f..06d7d91 100644
--- a/ruoyi-ui/src/router/index.js
+++ b/ruoyi-ui/src/router/index.js
@@ -100,7 +100,7 @@ export const constantRoutes = [
       }
     ]
   },
-  {
+/*  {
     path: '/oaQuote',
     component: Layout,
     hidden: true,
@@ -112,7 +112,7 @@ export const constantRoutes = [
         meta: { title: '报价单转报价', activeMenu: '/oaQuote/oaQuoteEdit'}
       }
     ]
-  },
+  },*/
   {
     path: '/hainanOrder/index',
     component: Layout,
diff --git a/ruoyi-ui/src/views/redBook/productSelect.vue b/ruoyi-ui/src/views/redBook/productSelect.vue
index 5bac61a..3cefdeb 100644
--- a/ruoyi-ui/src/views/redBook/productSelect.vue
+++ b/ruoyi-ui/src/views/redBook/productSelect.vue
@@ -944,26 +944,34 @@
             this.selectedResultData.forEach((row, index) => {
               //数量
               let sl = row.count;
-              sl = String(sl).trim();
               if(sl){
-                if (!reg.test(sl)) {
-                  this.errSlIndex.push(index+1);
+                sl = String(sl).trim();
+                if(sl){
+                  if (!reg.test(sl)) {
+                    this.errSlIndex.push(index+1);
+                  }
                 }
               }
+
               //一次折扣
               let perc = row.per;
-              perc = String(perc).trim();
               if(perc){
-                if (!reg.test(perc)) {
-                  this.errPercIndex.push(index+1);
+                perc = String(perc).trim();
+                if(perc){
+                  if (!reg.test(perc)) {
+                    this.errPercIndex.push(index+1);
+                  }
                 }
               }
+
               //二次折扣
               let perc2 = row.per2;
-              perc2 = String(perc2).trim();
               if(perc2){
-                if (!reg.test(perc2)) {
-                  this.errPerc2Index.push(index+1);
+                perc2 = String(perc2).trim();
+                if(perc2){
+                  if (!reg.test(perc2)) {
+                    this.errPerc2Index.push(index+1);
+                  }
                 }
               }
             });
diff --git a/ruoyi-ui/src/views/redBook/quots.vue b/ruoyi-ui/src/views/redBook/quots.vue
index 3897726..573416b 100644
--- a/ruoyi-ui/src/views/redBook/quots.vue
+++ b/ruoyi-ui/src/views/redBook/quots.vue
@@ -298,7 +298,15 @@
         /** 转报价 */
         handleToOAQuotClick(row) {
           const info = {quotId : row.quot_id}
+
+          this.$router.push({
+            path:'/redBook/productSelect',
+            name: 'ProductSelect',
+            query: info
+          })
+/*
           this.$router.push({ path: '/oaQuote/oaQuoteEdit', query: info});
+*/
         },
 
         //一次折扣率变化时触发
@@ -524,26 +532,34 @@
           this.selectedResultData.forEach((row, index) => {
             //数量
             let sl = row.count;
-            sl = String(sl).trim();
             if(sl){
-              if (!reg.test(sl)) {
-                this.errSlIndex.push(index+1);
+              sl = String(sl).trim();
+              if(sl){
+                if (!reg.test(sl)) {
+                  this.errSlIndex.push(index+1);
+                }
               }
             }
+
             //一次折扣
             let perc = row.per;
-            perc = String(perc).trim();
             if(perc){
-              if (!reg.test(perc)) {
-                this.errPercIndex.push(index+1);
+              perc = String(perc).trim();
+              if(perc){
+                if (!reg.test(perc)) {
+                  this.errPercIndex.push(index+1);
+                }
               }
             }
+
             //二次折扣
             let perc2 = row.per2;
-            perc2 = String(perc2).trim();
             if(perc2){
-              if (!reg.test(perc2)) {
-                this.errPerc2Index.push(index+1);
+              perc2 = String(perc2).trim();
+              if(perc2){
+                if (!reg.test(perc2)) {
+                  this.errPerc2Index.push(index+1);
+                }
               }
             }
           });