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

chenlu

2024-09-06 d809ecd16cbb23f5aad86a6844f51ffea0455fe8

 north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheet2.vue

@@ -30,13 +30,14 @@

  request.post(`/Delivery/getSelectDeliveryPrinting`,form.value).then((res) => {
    if(res.code==200){
      console.log(res.data.data)
      produceList.value = deepClone(res.data.data)
      delivery.value=deepClone(res.data.delivery)
      money.value=deepClone(res.data.money)
      otherMoney.value=deepClone(res.data.otherMoney)
      otherMoney.value.forEach(item => {
        otherMoneys+=item.DeliveryDetailOtherMoney.monery
        if(item.DeliveryDetailOtherMoney.monery!=null){
          otherMoneys+=item.DeliveryDetailOtherMoney.monery
        }
      })
    }else{
      ElMessage.warning(res.msg)
@@ -105,11 +106,11 @@
      </tr>

      <tr  class="title-s">
        <th colspan="2"></th>
        <th colspan="5">
        <th colspan="2" style="width: 30%"></th>
        <th colspan="5" style="width: 40%;">
          <h3>销售发货单</h3>
        </th>
        <th colspan="2" style="text-align: left;">发货单号：<span>{{delivery.deliveryId}}</span></th>
        <th colspan="2" style="width: 30%;text-align: left;">发货单号：<span>{{delivery.deliveryId}}</span></th>
      </tr>
      <tr>
        <th style="text-align: left;border:none;" colspan="4">客户名称：<span>{{delivery.customerName}}</span></th>
@@ -148,7 +149,8 @@
              <tr class="day-in" v-for="(items, index1) in item.DeliveryDetailList" :key="index1">
                <td>{{items.order_number}}</td>
                <td>{{items.buildingNumber}}</td>
                <td colspan="2" style="font-size: 15px;font-weight: bold;">{{items.width}}x{{items.height}}</td>
                <td colspan="2" style="font-size: 15px;font-weight: bold;" v-if="items.other_columns!=null&&(JSON.parse(items.other_columns).S02!=null)">{{JSON.parse(items.other_columns).S02}}</td>
                <td colspan="2" style="font-size: 15px;font-weight: bold;" v-else>{{items.width}}x{{items.height}}</td>
                <td>{{items.quantity}}</td>
                <td>{{items.area}}</td>
                <td colspan="3">{{items.processingNote}}</td>
@@ -236,6 +238,7 @@
}
h3{
  font-size: 1.2rem;
  font-weight: bolder;
}


@@ -274,11 +277,7 @@
  background-color: black;
  color: black;
}
@page {
  size: auto;
  margin: 8mm 16mm 16mm 16mm

}