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

guoyuji

2024-09-23 31f58ca7b251d50f10965b9b6db894bada78a9c6

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

@@ -55,6 +55,7 @@
        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 {
@@ -71,7 +72,6 @@
      } else {
        ElMessage.warning(res.msg)
      }
      console.log(props.lastList)
    })
  }
)