'123'

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对应的值

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,

ruoyi-ui/src/views/redBook/productSelect.vue

@@ -944,28 +944,36 @@
             this.selectedResultData.forEach((row, index) => {
               //数量
               let sl = row.count;
+              if(sl){
                 sl = String(sl).trim();
                 if(sl){
                   if (!reg.test(sl)) {
                     this.errSlIndex.push(index+1);
                   }
                 }
+              }
+
               //一次折扣
               let perc = row.per;
+              if(perc){
                 perc = String(perc).trim();
                 if(perc){
                   if (!reg.test(perc)) {
                     this.errPercIndex.push(index+1);
                   }
                 }
+              }
+
               //二次折扣
               let perc2 = row.per2;
+              if(perc2){
                 perc2 = String(perc2).trim();
                 if(perc2){
                   if (!reg.test(perc2)) {
                     this.errPerc2Index.push(index+1);
                   }
                 }
+              }
             });
 
             if(this.errPercIndex.length!=0){

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,28 +532,36 @@
           this.selectedResultData.forEach((row, index) => {
             //数量
             let sl = row.count;
+            if(sl){
               sl = String(sl).trim();
               if(sl){
                 if (!reg.test(sl)) {
                   this.errSlIndex.push(index+1);
                 }
               }
+            }
+
             //一次折扣
             let perc = row.per;
+            if(perc){
               perc = String(perc).trim();
               if(perc){
                 if (!reg.test(perc)) {
                   this.errPercIndex.push(index+1);
                 }
               }
+            }
+
             //二次折扣
             let perc2 = row.per2;
+            if(perc2){
               perc2 = String(perc2).trim();
               if(perc2){
                 if (!reg.test(perc2)) {
                   this.errPerc2Index.push(index+1);
                 }
               }
+            }
           });
 
           if(this.errPercIndex.length!=0){