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

guoyuji

2024-10-14 e6bf567a863fb8a6bc7b776ac938825111c9ab52

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

@@ -28,6 +28,8 @@
projectNo.value = route.query.projectNo
type.value = route.query.type



onMounted(() => {
  if(projectNo.value!=null){
    request.post(`/processCard/getSelectPrintLabel/${projectNo.value}/${type.value}`).then((res) => {
@@ -155,30 +157,38 @@
      </div>
    </div>-->
    <div id="entirety" v-for="(item,id) in labelList" >
        <div class="row1">
      <div class="row1" v-if="item.heat_layout_id!=null">

          <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 class="cell1" v-if="item.stock_id!=null">{{ item.stock_id }}</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>
        <span v-else-if="item.process.includes('中空')">中空</span>
        <span v-else-if="item.process.includes('百叶')">百叶</span>
        <span v-else></span>
        <div class="cell1" v-if="item.stock_id!=null">{{ item.stock_id }}</div>

        </div>
      </div>
      <div class="row2" v-else>
        <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>
        <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>
          <span v-if="item.bend_radius!=null">R={{item.bend_radius}}</span>
        </div>
        <div class="row6">
          <span>{{item.glass_child}}</span>&nbsp;
          <span>{{item.processing_note}}</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>
      <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>
        <span v-if="item.bend_radius!=null">R={{item.bend_radius}}</span>
      </div>
      <div class="row6">
        <span>{{item.glass_child}}</span>&nbsp;
        <span>{{item.processing_note}}</span>
      </div>
    </div>
  </div>

@@ -221,6 +231,10 @@
  font-size: 10pt;
  font-weight: bold;
}
.row2 span {
  font-size: 12pt;
  font-weight: bold;
}

.row2 {
  font-size: 8pt;
@@ -242,7 +256,7 @@
.row3 {
  margin-top: -5px;
  height: 25px;
  font-size: 15pt;
  font-size: 17pt;
  font-weight: bolder;
}

@@ -252,7 +266,7 @@
  font-size: 8pt;
}
.row5 span {
  font-size: 10pt;
  font-size: 12pt;
  font-weight: bold;
}

@@ -262,7 +276,7 @@
  font-size: 8pt;
}
.row6 span {
  font-size: 10pt;
  font-size: 12pt;
  font-weight: bold;
}
.cell{