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

chenlu

2024-09-25 430ab98c6225a276bab44c5eebb304fc6206cb73

 north-glass-erp/northglass-erp/src/views/pp/processCard/PrintCustomLabelSemi1.vue

@@ -65,17 +65,14 @@
        list.value = deepClone(res.data.data)
        const data = produceList.value[0].value
        dataList = JSON.parse(`[${data}]`);
        console.log(switchType)
        if (switchType===true){
          labelList = props.titleList
        }else {
          labelList = dataList[0]
        }

        labelList = dataList[0]

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