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

廖井涛

2025-03-21 b8982b86a15d186c4cf6144fface700d9769fa95

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

@@ -156,8 +156,8 @@
  <el-input v-if="!company.showDeliveryCreator" v-model="remarks" style="background-color: transparent;border: none;margin-top: -20px;width: 100px"/>
  <div id="printFlowCard" >
<!--     半成品标签-->
    <div v-if="type!=='3'" id="entirety" v-for="(item,id) in labelList" >

    <template v-for="(item,id) in labelList">
    <div v-if="type!=='3'" id="entirety" >
      <div class="row1" >
<!--钢化版图序号，钢化版图里的顺序-->
<!--        <div class="cell" v-if="item.heat_layout_id!==undefined">{{ item.heat_layout_id }}/{{ item.heat_layout_sort }}</div>-->
@@ -173,19 +173,19 @@
      </div>

      <div class="row3" v-if="item.other_columns!=null&&(JSON.parse(item.other_columns).S02!=null)">
        <span v-if="item.heat_layout_id!==null && company.showDeliveryCreator"  style="font-size: 7pt;">
        <span v-if="item.heat_layout_id!==undefined && company.showDeliveryCreator"  style="font-size: 7pt;">
          ({{ item.stock_id }}) {{ item.heat_layout_id }}/{{ item.heat_layout_sort }}
        </span>
        <span v-if="item.stock_id!==null && !company.showDeliveryCreator"  style="font-size: 7pt">
        <span v-if="item.stock_id!==undefined && !company.showDeliveryCreator"  style="font-size: 7pt">
              {{ item.stock_id }}/{{ item.polys_id }}
        </span>
        {{JSON.parse(item.other_columns).S02}}={{item.quantity}}
      </div>
      <div class="row3" v-else>
        <span v-if="item.heat_layout_id!==null && company.showDeliveryCreator"  style="font-size: 7pt;">
        <span v-if="item.heat_layout_id!==undefined && company.showDeliveryCreator"  style="font-size: 7pt;">
          ({{ item.stock_id }}) {{ item.heat_layout_id }}/{{ item.heat_layout_sort }}
        </span>
        <span v-if="item.stock_id!==null && !company.showDeliveryCreator"  style="font-size: 7pt">
        <span v-if="item.stock_id!==undefined && !company.showDeliveryCreator"  style="font-size: 7pt">
              {{ item.stock_id }}/{{ item.polys_id }}
        </span>
        {{Math.round(item.width)}}x{{Math.round(item.height)}}={{item.quantity}}
@@ -199,8 +199,14 @@
        <span>{{item.glass_child}}</span>&nbsp;
        <span v-if="company.showDeliveryCreator" style="font-size: 10pt" >{{item.processing_note}}</span>
        <span v-else style="font-size: 6pt">{{item.processing_note}}</span>

        <br v-if="!company.showDeliveryCreator" />
        <span v-if="!company.showDeliveryCreator" style="font-size: 6pt;margin-top: -10px">{{item.product_name}}</span>
      </div>

    </div>
    <div class="element-to-break-after" v-if="(id+1)%44==0"></div>
    </template>



@@ -247,6 +253,7 @@
          <span style="font-size: 10pt">{{item.glass_child}}</span>&nbsp;
        </div>
      </div>
      <div class="element-to-break-after" v-if="(id+1)%44==0"></div>
    </template>

  </div>
@@ -274,8 +281,8 @@
#entirety{
  text-align: center;
  width: 180px;
  height: 87px;
  margin-bottom: 10px;
  height: 90px;
  margin-bottom: 7px;
  margin-right: 5px;
  overflow: hidden;
  white-space: nowrap;
@@ -284,7 +291,7 @@
.row1 {
  font-size: 8pt;
  font-weight: bold;
  height: 15px;
  height: 20px;
}
.row1 span {
  font-size: 10pt;
@@ -314,13 +321,12 @@

.row3 {
  margin-top: -5px;
  height: 20px;
  height: 25px;
  font-size: 15pt;
  font-weight: bolder;
}

.row5 {
  margin-top: 5px;
  height: 15px;
  font-weight: bold;
  font-size: 6pt;
@@ -331,7 +337,7 @@
}

.row6 {
  height: 15px;
  height: 25px;
  font-weight: bold;
  font-size: 4pt;
}
@@ -357,6 +363,10 @@
  font-size: 6pt;
}

.element-to-break-after {
  page-break-after: always;
}