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

@@ -71,8 +71,8 @@
        } 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"