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

chenlu

2024-09-24 edc227277159601c5cb86829f1c5ce14cf7903a4

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

@@ -133,7 +133,7 @@
    <div id="entirety" v-for="(item,id) in labelList" >
        <div class="row1">

          <div style="position: absolute;font-weight: bold;margin-left: 5px;" v-if="item.heat_layout_id!=null">{{ item.heat_layout_id }}/{{ item.heat_layout_sort }}</div>
          <div class="cell" v-if="item.heat_layout_id!=null">{{ item.heat_layout_id }}/{{ item.heat_layout_sort }}</div>
          <span>{{ item.customer_name }}</span>&nbsp;
          <span>{{ item.order_id }}</span>&nbsp;
          <span v-if="item.process.includes('夹胶')">胶片</span>
@@ -193,7 +193,7 @@
  height: 20px;
}
.row1 span {
  font-size: 8pt;
  font-size: 10pt;
  font-weight: bold;
}

@@ -240,6 +240,12 @@
  font-size: 10pt;
  font-weight: bold;
}
.cell{
  position: absolute;
  font-weight: bold;
  margin-left: 5px;
  margin-top: 0px;
}