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

chenlu

2024-09-10 ed3ce5c8f6e1f7ac1aad3218ab5e518fc95cdb0f

 north-glass-erp/northglass-erp/src/components/sd/order/PrintSheet4.vue

@@ -39,7 +39,6 @@
    data.value= res.data
    productIdData.value=data.value.orderProductDetail
    data.value.orderProductDetail.forEach(item => {

      grossNum.value.quantity += getQuantity(item.productDetail)
      grossNum.value.grossArea += getArea(item.productDetail)
      grossNum.value.perimeter += getPerimeter(item.productDetail)
@@ -141,11 +140,11 @@
      </tr>

      <tr class="title-s">
        <th colspan="2"></th>
        <th colspan="5" >
          <h3 style="margin-left: 25%">生成任务单(成品)</h3>
        <th colspan="2" style="width: 30%"></th>
        <th colspan="5" style="width: 40%;">
          <h3 >生成任务单(成品)</h3>
        </th>
        <th colspan="2" style="text-align: center;font-weight: bold;">订单编号：<span>{{ data.order.orderId }}</span></th>
        <th colspan="2" style="width: 30%;">订单编号：<span>{{ data.order.orderId }}</span></th>
      </tr>
      <tr>
        <th style="text-align: left;border:none;font-weight: bold;font-size: 17px;" colspan="4">
@@ -188,24 +187,24 @@
              <tr class="day-in" v-for="(items, index1) in item.productDetail" :key="index1">
                <td>{{items.orderNumber}}</td>
                <td>{{items.buildingNumber}}</td>
                <td colspan="3" style="font-size: 15px;font-weight: bold;" v-if="items.otherColumns?.S02">{{items.otherColumns?.S02}}</td>
                <td colspan="3" style="font-size: 15px;font-weight: bold;" v-else>{{items.width}}x{{items.height}}</td>
                <td>{{items.quantity}}</td>
                <td>{{items.grossArea.toFixed(2)}}</td>
                <td colspan="3" style="font-size: 20px;font-weight: bold;" v-if="items.otherColumns?.S02">{{items.otherColumns?.S02}}</td>
                <td colspan="3" style="font-size: 20px;font-weight: bold;" v-else>{{items.width}}x{{items.height}}</td>
                <td style="font-size: 20px;font-weight: bold;">{{items.quantity}}</td>
                <td style="font-size: 20px;font-weight: bold;">{{items.grossArea.toFixed(2)}}</td>
                <td colspan="2">{{items.processingNote}}</td>
              </tr>
              <tr class="day-in" >
                <td style="font-size: 15px;font-weight: bold;" colspan="5">小计:</td>
                <td>{{getQuantity(item.productDetail)}}</td>
                <td>{{getArea(item.productDetail)}}</td>
                <td style="font-size: 20px;font-weight: bold;">{{getQuantity(item.productDetail)}}</td>
                <td style="font-size: 20px;font-weight: bold;">{{getArea(item.productDetail)}}</td>
                <td colspan="2"></td>
              </tr>

            </template>
            <tr class="day-in">
              <td style="font-size: 15px;font-weight: bold;" colspan="5">合计:</td>
              <td>{{grossNum.quantity}}</td>
              <td>{{grossNum.grossArea}}</td>
              <td style="font-size: 20px;font-weight: bold;">{{grossNum.quantity}}</td>
              <td style="font-size: 20px;font-weight: bold;">{{grossNum.grossArea}}</td>
              <td colspan="2"></td>
            </tr>
            <tr class="day-in">
@@ -319,6 +318,15 @@
  margin: 0;
  padding: 0;
}
.day-in{
  height: 30px;
}

@media print {
  @page {
    margin: 5mm 5mm 10mm 5mm;
  }
}