暂存

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

@@ -313,21 +313,23 @@
           schemeData.value.length = lengthscheme.value.rowsdetail[0].num
         }
       }
-  }
-  const validCustomSize = ()=>{
+  } 
+  const validCustomSize = (type)=>{
     const pd = new Product(group.value.item[0])
     // 使用该函数来检查长度和宽度  
     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 (!pd.checkDimension(widthValData, schemeData.value, 'width', '自定义宽度超出可选范围!')) {  
-      return false;  
-    } else if (!pd.checkDimension(lengthValidData, schemeData.value, 'length', '自定义长度超出可选范围!')) {  
-      return false;  
+    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 {
-      // 如果所有检查都通过  
-      return true;
-    } 
+      if (!pd.checkDimension(lengthValidData, schemeData.value, 'length', '自定义长度超出可选范围!')) {  
+        return false;  
+      }
+    }
+    
+    return true;
   }
     
   const onCollection = (data)=>{

src/class/product.js

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