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

guoyuji

2024-07-19 1f30bc3fcda7667c52733474e4dc6a76fdbc11a8

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

@@ -135,7 +135,7 @@
        </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>
        <div class="row3" v-else>{{Math.round(item.width)}}*{{Math.round(item.height)}}={{item.quantity}}</div>
        <div class="row3" v-else>{{Math.round(item.width)}}x{{Math.round(item.height)}}={{item.quantity}}</div>
        <div class="row5">
          <span>{{item.project}}</span>&nbsp;
          <span>{{ item.building_number }}</span>