暂存

src/DRP/SDrpManagement/productGroup/detail/index.vue

@@ -319,16 +319,26 @@
     // 使用该函数来检查长度和宽度  
     let lengthValidData = { min: lengthscheme.value.min, max: lengthscheme.value.max, type: lengthscheme.value.type };  
     let widthValData = { min: widthscheme.value.min, max: widthscheme.value.max, type: widthscheme.value.type };
-    if (type == 'width') {
-      if (!pd.checkDimension(widthValData, schemeData.value, 'width', '自定义宽度超出可选范围!')) {  
-        return false;  
-      }
-    } else {
-      if (!pd.checkDimension(lengthValidData, schemeData.value, 'length', '自定义长度超出可选范围!')) {  
-        return false;  
-      }
+    switch (type) {
+      case 'width':
+        if (!pd.checkDimension(widthValData, schemeData.value, 'width', '自定义宽度超出可选范围!')) {  
+          return false;  
+        }
+        break;
+      case 'length':
+        if (!pd.checkDimension(lengthValidData, schemeData.value, 'length', '自定义长度超出可选范围!')) {  
+          return false;  
+        }
+        break;
+      default:
+        if (!pd.checkDimension(widthValData, schemeData.value, 'width', '自定义宽度超出可选范围!')) {  
+          return false;  
+        }
+        if (!pd.checkDimension(lengthValidData, schemeData.value, 'length', '自定义长度超出可选范围!')) {  
+          return false;  
+        }
+        break;
     }
-    
     return true;
   }
     

src/class/product.js

@@ -27,11 +27,14 @@ class Product {
   checkDimension (dimensionData, schemeData, dimensionName, messageContent) {  
     const { min, max, type } = dimensionData;  
     const dimensionValue = schemeData[dimensionName];  
-
+    
     console.log(dimensionData, schemeData, dimensionName, messageContent)
     
-    if (type === '自定义' && (dimensionValue < min || dimensionValue > max)) {  
-      message.error({ content: messageContent, key: 1 }); 
+    if (this.hasDecimal(schemeData[dimensionName])) {
+      message.warning(`${dimensionName == 'length'?'长度':'宽度'}请输入整数`)
+      return false
+    } else if (type === '自定义' && (dimensionValue < min || dimensionValue > max)) {  
+      message.error({ content: messageContent, key: 1 });  
       return false;  
     } else if (!dimensionValue) {  
       message.error({ content: '定制选项不能为空!', key: 1 });