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

guoyuji

2024-06-25 f94dec7ddbd0aa96f642f04d41d0f74ca0edfdc7

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

@@ -13,25 +13,22 @@
let produceList = ref([])
let labelList = ref([])
let list = ref([])
let projectNo = ref([])


const data = ref({
  printList: []
})


const {currentRoute} = useRouter()
const route = currentRoute.value
data.value.printList = JSON.parse(route.query.printList)
projectNo.value = route.query.projectNo
onMounted(() => {

      request.post(`/processCard/getSelectPrintLabel`, data.value).then((res) => {
      request.post(`/processCard/getSelectPrintLabel/${projectNo.value}`).then((res) => {
        if (res.code == 200) {

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

          console.log(produceList.value)
          for (let i = 0; i < produceList.value.length; i++) {
          /*for (let i = 0; i < produceList.value.length; i++) {
           let count= produceList.value[i].data.length
            for (let j = 0; j < count; j++) {
              for (let k = 0; k < produceList.value[i].data[j].quantity; k++){
@@ -41,7 +38,7 @@

            }
          }
          console.log(labelList.value)
          console.log(labelList.value)*/
        } else {
          ElMessage.warning(res.msg)
          router.push("/login")
@@ -114,19 +111,19 @@
        </div>
      </div>
    </div>-->
    <div id="entirety" v-for="(item,id) in labelList" >
    <div id="entirety" v-for="(item,id) in produceList" >
        <div class="row1">{{ item.customer_name }}</div>
        <div  class="row2">
          <span>{{ item.order_id }}</span>
          <span>{{ item.order_id }}</span>&nbsp;
          <span>{{ item.type_name }}</span>
        </div>
        <div class="row3">{{item.child_width}}*{{item.child_height}}={{item.quantity}}</div>
        <div class="row3">{{item.width}}*{{item.height}}={{item.quantity}}</div>
        <div class="row5">
          <span>{{item.project}}</span>
          <span>{{ item.remarks }}</span>
          <span>{{item.project}}</span>&nbsp;
          <span>{{ item.building_number }}</span>
        </div>
        <div class="row6">
          <span>{{item.glass_child}}</span>
          <span>{{item.glass_child}}</span>&nbsp;
          <span>{{item.processing_note}}</span>
        </div>
    </div>