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

@@ -132,12 +132,15 @@
    </div>-->
    <div id="entirety" v-for="(item,id) in labelList" >
        <div class="row1">

          <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>
          <span v-else-if="item.process.includes('中空')">中空</span>
          <span v-else-if="item.process.includes('百叶')">百叶</span>
          <span v-else></span>

        </div>

        <div class="row3" v-if="item.other_columns!=null&&(JSON.parse(item.other_columns).S02!=null)">{{JSON.parse(item.other_columns).S02}}={{item.quantity}}</div>
@@ -176,10 +179,12 @@

#entirety{
  text-align: center;
  width: 185px;
  width: 180px;
  height: 87px;
  margin-bottom: 10px;
  margin-right: 5px;
  overflow: hidden;
  white-space: nowrap;
}

.row1 {
@@ -188,7 +193,7 @@
  height: 20px;
}
.row1 span {
  font-size: 8pt;
  font-size: 10pt;
  font-weight: bold;
}

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