Merge remote-tracking branch 'origin/master'

zhoushihao

2024-10-11 d5d0d1c7a84b996b9bbcebfaf2c2c95f1a5a3678

 UI-Project/src/views/UnLoadGlass/PrintCustomLabelSemi1.vue

@@ -102,12 +102,18 @@
<template>
  <!-- <el-button id="printButton" @click="printFlowCard();">打印</el-button> -->
  <div id="printFlowCard" >
    <template v-for="(item,id) in lastList">
    <template v-for="(item,index) in lastList">
    <div id="entirety" >
      <div style="position: absolute;font-weight: bold;margin-left: 5px;" v-if="item.tempering_layout_id!=null">{{ item.tempering_layout_id }}/{{ item.tempering_feed_sequence }}</div>
     
      <div class="row1">
        <div style="position: absolute;font-weight: bold;margin-left: 5px;" v-if="item.tempering_layout_id!=null">{{ item.tempering_layout_id }}/{{ item.tempering_feed_sequence }}</div>
        <span>{{ item.customer_name }}</span>&nbsp;
        <span>{{ item.order_id }}</span>
        <span v-if="item.process.includes('夹胶')">胶片</span>
        <span v-else-if="item.process.includes('中空')">中空</span>
<span v-else-if="item.process.includes('百叶')">百叶</span>
<span v-else></span>
        <div style="position: absolute;font-weight: bold;margin-left: 210px;margin-top: -26px;" >{{ index+1 }}</div>
      </div>
      <div  class="row2">
        <span>{{ item.project }}</span>&nbsp;
@@ -120,7 +126,8 @@
        <span>{{ item.processing_note }}</span>
      </div>
    </div>
    <div style="width: 20px" v-if="id%2===0"></div>
    <div style="width: 20px" v-if="index%2===0"></div>
    <div class="print-page" v-else></div>
    </template>
  </div>

@@ -146,10 +153,11 @@

#entirety{
  text-align: center;
  width: 48%;
  height: 160px;
  width: 46%;
  height: 170px;
  border: black 1px;
  word-wrap: break-word;
  margin-left: 10px;
}

.row1 {
@@ -186,7 +194,7 @@
  height: 50px;
  font-weight: bold;
  font-size: 12pt;
  margin-left: 20px;
  /* margin-left: 20px; */
}
.row5 span {
  font-size: 12pt;
@@ -203,6 +211,9 @@


@media print {
  .print-page {
    page-break-after: always; /* 添加分页符，在每个print-page div之后分页 */
  }
  div {
    page-break-inside: avoid;
  }