Merge branch 'master' of http://bore.pub:10439/r/ERP_override

廖井涛

2024-11-05 f366940938f2d971c8db228aa51a22f25963c945

 north-glass-erp/northglass-erp/src/components/pp/PrintCustomLabelDetails.vue

@@ -68,6 +68,7 @@
            }
          }
        }
        console.log(props.lastList)
      } else {
        ElMessage.warning(res.msg)
      }
@@ -126,6 +127,12 @@
    if (propertyName === 'glassNumber' && glassNumber === obj.glassNumber){
      obj.glassNumber = result;
    }
    if (propertyName === 'width' && glassNumber === obj.glassNumber){
      obj.width = result;
    }
    if (propertyName === 'height' && glassNumber === obj.glassNumber){
      obj.height = result;
    }
    if (propertyName === 'custom1' && orderId === obj.orderId){
      obj.custom1 = result;
    }