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

guoyuji

2025-02-17 946f0711b0b15a3da1b84edbb5d8aadd6f63dff1

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

@@ -153,7 +153,7 @@
        <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-if="item.process.includes('夹胶')||item.process.includes('夹层')">胶片</span>
        <span v-else-if="item.process.includes('中空')">中空</span>
        <span v-else-if="item.process.includes('百叶')">百叶</span>
        <span v-else></span>
@@ -163,7 +163,7 @@
        <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-if="item.process.includes('夹胶')||item.process.includes('夹层')">胶片</span>
        <span v-else-if="item.process.includes('中空')">中空</span>
        <span v-else-if="item.process.includes('百叶')">百叶</span>
        <span v-else></span>
@@ -258,7 +258,7 @@
}

.row6 {
  height: 20px;
  height: 25px;
  font-weight: bold;
  font-size: 10pt;
}