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

chenlu

2024-07-19 670a2a2179c7c6f70316826ded2a76572eee760a

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

@@ -110,7 +110,7 @@
        <span>{{ item.project }}</span>&nbsp;
        <span>{{ item.buildingNumber }}</span>
      </div>
      <div class="row3" v-if="item.other_columns==null||JSON.parse(item.other_columns).S02==null">{{item.width}}*{{item.height}}={{item.quantity}}</div>
      <div class="row3" v-if="item.other_columns==null||JSON.parse(item.other_columns).S02==null">{{item.width}}x{{item.height}}={{item.quantity}}</div>
      <div class="row3" v-else>{{JSON.parse(item.other_columns).S02}}={{item.quantity}}</div>
      <div class="row5">
        <span>{{item.remarks}}</span>&nbsp;