Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override

chenlu

2025-01-15 27b3352a6a7f514c98cce083eded6c3bb9e3f519

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

@@ -192,12 +192,15 @@
      <div class="row5">
        <span style="white-space: pre-wrap;font-size: 6pt">{{ item.building_number?item.building_number.replace(/\r|\n|\s/g,''):'' }}</span>
        <span v-if="item.bend_radius!=null">R={{item.bend_radius}}</span>
      </div>
      <div class="row6">
        <span>{{item.glass_child}}</span>&nbsp;
        <br>
        <span v-if="company.showDeliveryCreator" >{{item.processing_note}}</span>
        <span v-else style="font-size: 6pt">{{item.processing_note}}</span>
      </div>
      <div class="row6">
        <span>{{item.glass_child}}</span>&nbsp;

      </div>

      <div class="row5">
        <span>{{item.project}}</span>&nbsp;
      </div>
@@ -275,7 +278,7 @@
#entirety{
  text-align: center;
  width: 180px;
  height: 87px;
  height: 90px;
  margin-bottom: 10px;
  margin-right: 5px;
  overflow: hidden;
@@ -322,7 +325,7 @@

.row5 {
  margin-top: 5px;
  height: 15px;
  height: 18px;
  font-weight: bold;
  font-size: 6pt;
}