Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

guoyujie

8 天以前 76746dcdb6f0572c4b3349056421369aa7a34b09

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

@@ -76,17 +76,7 @@
          for (let i = 0; i < list.value.length; i++) {
            let count = list.value[i].data.length
            for (let j = 0; j < count; j++) {
              if (detailType==0){
                for (let k = 0; k < list.value[i].data[j].quantity; k++) {
                  props.lastList.push(list.value[i].data[j])
                }

              }
              else {
                //for (let k = 0; k < list.value[i].data[j].quantity; k++) {
                  props.lastList.push(list.value[i].data[j])
                //}
              }
            }
          }
        } else {