Merge branch 'master' of http://bore.pub:10439/r/ERP_override

廖井涛

2024-06-19 a944fc9a5bfaac1e2367f6ce398f09eafbcb53a5

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

@@ -12,7 +12,7 @@
let router = useRouter()
let produceList = ref([])
let labelList = ref([])
let list = ref()
let list = ref([])


const data = ref({
@@ -29,13 +29,19 @@
        if (res.code == 200) {

          produceList.value = deepClone(res.data.data)

          console.log(produceList.value)
          for (let i = 0; i < produceList.value.length; i++) {
           let count= produceList.value[i].quantity
           let count= produceList.value[i].data.length
            for (let j = 0; j < count; j++) {
              labelList.value.push(produceList.value[i])
              for (let k = 0; k < produceList.value[i].data[j].quantity; k++){
                labelList.value.push(produceList.value[i].data[j])
              }


            }
          }
          console.log(labelList.value)
        } else {
          ElMessage.warning(res.msg)
          router.push("/login")
@@ -90,6 +96,24 @@
<template>
  <el-button id="printButton" @click="printFlowCard();">{{ $t('basicData.print') }}</el-button>
  <div id="printFlowCard" >
<!--    <div id="entirety" v-for="(items,id) in produceList" >
      <div v-for="(item,index) in items.data" :key="index">
        <div class="row1">{{ item.customer_name }}</div>
        <div  class="row2">
          <span>{{ item.order_id }}</span>
          <span>{{ item.type_name }}</span>
        </div>
        <div class="row3">{{item.child_width}}*{{item.child_height}}={{item.quantity}}</div>
        <div class="row5">
          <span>{{item.project}}</span>
          <span>{{ item.remarks }}</span>
        </div>
        <div class="row6">
          <span>{{item.glass_child}}</span>
          <span>{{item.processing_note}}</span>
        </div>
      </div>
    </div>-->
    <div id="entirety" v-for="(item,id) in labelList" >
      <div class="row1">{{ item.customer_name }}</div>
      <div  class="row2">
@@ -103,7 +127,8 @@
      </div>
      <div class="row6">
        <span>{{item.glass_child}}</span>
        <span>{{item.processing_note}}</span></div>
          <span>{{item.processing_note}}</span>
        </div>
    </div>
  </div>