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

chenlu

2024-07-18 b864a88a6d34cbed2cfaad7f5e843ea1330c9c91

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

@@ -24,23 +24,21 @@
const {currentRoute} = useRouter()
const route = currentRoute.value
projectNo.value = route.query.projectNo
data.value.printList = JSON.parse(route.query.printList)
onMounted(() => {
  if(projectNo.value!=null){
    request.post(`/processCard/getSelectPrintLabel/${projectNo.value}`).then((res) => {
      if (res.code == 200) {
        labelList.value = deepClone(res.data.data)

        console.log(labelList.value)
      } else {
        ElMessage.warning(res.msg)
        router.push("/login")
      }
    })
  }else{
    console.log(JSON.stringify(route.query.printList))
    data.value.printList = JSON.parse(route.query.printList)
    request.post(`/processCard/getSelectPrintLabel1`,data.value).then((res) => {
      if (res.code == 200) {
        console.log(res.data.data)
        produceList.value = deepClone(res.data.data)
        for (let i = 0; i < produceList.value.length; i++) {
         let count= produceList.value[i].data.length
@@ -52,7 +50,6 @@

          }
        }
        console.log(labelList.value)
      } else {
        ElMessage.warning(res.msg)
        router.push("/login")
@@ -131,18 +128,19 @@
    <div id="entirety" v-for="(item,id) in labelList" >
        <div class="row1">
          <span>{{ item.customer_name }}</span>&nbsp;
          <span v-if="item.type_name.includes('中空')">中空</span>
          <span v-else-if="item.type_name.includes('夹层')">夹层</span>
          <span v-else-if="item.type_name.includes('夹胶')">夹胶</span>
          <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="row2">
          <span>{{ item.order_id }}</span>&nbsp;
        </div>
        <div class="row3">{{item.width}}*{{item.height}}={{item.quantity}}</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="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;
@@ -169,7 +167,6 @@
  justify-content: left;
  flex-wrap: wrap;
  margin-left: 5px;
  margin-top: 15px;
}

#entirety{
@@ -177,48 +174,68 @@
  width: 185px;
  height: 87px;
  margin-bottom: 10px;
  overflow: hidden;
}

.row1 {
  font-size: 8pt;
  font-weight: bold;
  height: 16px;
  height: 20px;
}
.row1 span {
  font-size: 8pt;
  font-weight: bold;
}

.row2 {
  font-size: 8pt;
  font-weight: bold;
  height: 16px;
  height: 20px;
}
span {
  font-size: 8pt;
  font-size: 10pt;
  font-weight: bold;
}








.row3 {
  margin-top: -5px;
  height: 19px;
  font-size: 12pt;
  height: 25px;
  font-size: 15pt;
  font-weight: bolder;
}

.row5 {
  height: 15px;
  height: 20px;
  font-weight: bold;
  font-size: 8pt;
}
.row5 span {
  font-size: 10pt;
  font-weight: bold;
}

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



@page {
  size: auto;  /* auto is the initial value */
  margin: 8mm 4mm 0mm 6mm  /* this affects the margin in the printer settings */
  margin: 13mm 4mm 0mm 4mm;  /* this affects the margin in the printer settings */

}