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

chenlu

2024-09-20 8a08e873cee434e1184298dd1bd5dd5851c790ed

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

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

@@ -49,31 +49,31 @@
let switchType = props.switch
data.value.printList = JSON.parse(props.list)
onMounted(() => {
      request.post(`/processCard/getSelectPrintCustomLabelDetails/${type}/${lableType}`, data.value).then((res) => {
        if (res.code == 200) {
          produceList.value = deepClone(res.data.title)
          list.value = deepClone(res.data.data)
          const data = produceList.value[0].value
          dataList = JSON.parse(`[${data}]`);
          if (switchType===true){
            labelList = props.titleList
          }else {
            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])
              }
    request.post(`/processCard/getSelectPrintCustomLabelDetails/${type}/${lableType}`, data.value).then((res) => {
      if (res.code == 200) {
        produceList.value = deepClone(res.data.title)
        list.value = deepClone(res.data.data)
        const data = produceList.value[0].value
        dataList = JSON.parse(`[${data}]`);
        if (switchType===true){
          labelList = props.titleList
        }else {
          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])
            }
          }
        } else {
          ElMessage.warning(res.msg)
        }
      })

    }
      } else {
        ElMessage.warning(res.msg)
      }
      console.log(props.lastList)
    })
  }
)



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

@@ -556,6 +556,7 @@
  labelRow.value.type = type
  labelRow.value.lableType = lableType.value
  labelRow.value.switch=true
  lastList.value = []
  if (lableTypes == 1) {

    if (company.label === 1) {
@@ -696,6 +697,7 @@
      <el-button @click="printOrder" :icon="Printer" circle/>
    </template>
    <print-custom-label id="childLabel"
                        destroy-on-close
                        :lastList = 'lastList'
                        :faceOrientation="labelRow.faceOrientation"
                        :lableType="labelRow.lableType"
@@ -717,6 +719,7 @@
      <el-button v-print="printContentLabelSemi" :icon="Printer" circle/>
    </template>
    <print-custom-label-semi id="childLabelSemi"
                             destroy-on-close
                             :faceOrientation="labelRow.faceOrientation"
                             :lableType="labelRow.lableType"
                             :list="labelRow.list"