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

廖井涛

78 分钟以前 f7a2fcdda7f1120498c5c5f75c5a99955fc54b43

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

@@ -45,6 +45,7 @@
  }else{
    localStorage.setItem('hasRefreshed', 'false');
  }
  //工程打印成品标签
  if(projectNo.value!=null){
    request.post(`/processCard/getSelectPrintLabel/${projectNo.value}/${type.value}`).then((res) => {
      if (res.code == 200) {
@@ -57,6 +58,7 @@

  }else{
    data.value.printList = JSON.parse(route.query.printList)
    //流程卡编辑打印标签 常州
    if (printType == 1) {
      request.post(`/processCard/getSelectPrintLabel1`, data.value).then((res) => {
        if (res.code == 200) {
@@ -76,7 +78,9 @@
        }
      })

    }else if(printType==2){
    }
    //明细分架打印标签 常州
    else if(printType==2){
      request.post(`/processCard/getSelectPrintLabelDetails`, data.value).then((res) => {
        if (res.code == 200) {
          produceList.value = deepClone(res.data.data)
@@ -149,36 +153,42 @@
    <template v-for="(item,id) in labelList">
    <div id="entirety" >

      <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>
      <div class="row1" v-if="item.customer_name!==undefined">
        <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>
        <div class="cell1" v-if="item.stock_id!=null">{{ item.stock_id }}</div>
      </div>
      <div class="row6" v-else>
        <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 class="row2">

      <div class="row2" v-if="item.customer_name!==undefined">
        <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="row3" v-if="item.other_columns!=null&&(JSON.parse(item.other_columns).S02!=null)"> <span>{{JSON.parse(item.other_columns).S02}}={{item.quantity}}</span>&nbsp;</div>
      <div class="row3" v-else><span>{{Math.round(item.width)}}x{{Math.round(item.height)}}={{item.quantity}}</span></div>
      <div class="row5">
      <div class="row3" v-if="item.other_columns!=null&&(JSON.parse(item.other_columns).S02!=null)">
        <span v-if="item.heat_layout_id!==undefined && company.showDeliveryCreator"  style="font-size: 7pt;">
          ({{ item.stock_id }}) {{ item.heat_layout_id }}/{{ item.heat_layout_sort }}
        </span>
        <span v-if="item.stock_id!==undefined && !company.showDeliveryCreator"  style="font-size: 7pt">
              {{ item.stock_id }}/{{ item.polys_id }}
        </span>
        {{JSON.parse(item.other_columns).S02}}={{item.quantity}}

      </div>
      <div class="row3" v-else>
         <span v-if="item.heat_layout_id!==undefined && company.showDeliveryCreator"  style="font-size: 7pt;">
          ({{ item.stock_id }}) {{ item.heat_layout_id }}/{{ item.heat_layout_sort }}
        </span>
        <span v-if="item.stock_id!==undefined && !company.showDeliveryCreator"  style="font-size: 7pt">
              {{ item.stock_id }}/{{ item.polys_id }}
        </span>
        {{Math.round(item.width)}}x{{Math.round(item.height)}}={{item.quantity}}
      </div>
      <div class="row5" v-if="item.customer_name!==undefined">
        <span>{{item.glass_child}}</span>&nbsp;
        <span>{{item.processing_note}}</span>
      </div>
@@ -240,7 +250,7 @@
.row3 {
  margin-top: -5px;
  height: 35px;
  font-size: 22pt;
  font-size: 20pt;
  font-weight: bolder;
  line-height: 35px;
}
@@ -258,7 +268,7 @@
}

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