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

guoyujie

8 天以前 3d9e0ec1c1e457ed3fd2b334cf4c4dd66c10eead

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

@@ -179,38 +179,38 @@

<template>
  <div id="sheet" class="print-page-c">
    <table class="pages" v-for="(itme1, index) in groupedData" :key="index" >
    <table  class="pages" v-for="(itme1, index) in groupedData" :key="index" >
      <thead>
      <tr class="title-s">
        <th colspan="11">
          <h1>
        <th colspan="13">
          <h1 contenteditable="true">
            {{company.companyName}}
          </h1>
        </th>
      </tr>

      <tr  class="title-s">
        <th colspan="2" style="width: 20%"></th>
        <th colspan="7" style="width: 60%;">
      <tr class="title-s">
        <th colspan="2" style="width: 20%" ></th>
        <th colspan="9" style="width: 60%">
          <h4 v-if="!company.showDeliveryCreator" >金华市乐动智能科技有限公司</h4>
          <h3>销售发货单</h3>
        </th>
        <th colspan="2" style="width: 20%;text-align: left;">发货单号：<span>{{itme1.delivery.deliveryId}}</span></th>
        <th colspan="2" style="text-align: left;width:20%">发货单号：<span>{{itme1.delivery.deliveryId}}</span></th>
      </tr>
      <tr>
        <th style="text-align: left;border:none;" colspan="3">客户名称：<span>{{itme1.delivery.customerName}}</span></th>
        <th style="text-align: left;border:none;" colspan="6">项目名称：<span>{{itme1.delivery.project}}</span></th>
        <th style="text-align: left;border:none;" colspan="2">联系人：<span>{{itme1.delivery.contacts}}</span></th>
     <tr>
        <th style="text-align: left;border:none;width: 46.46%" colspan="6" >客户名称：<span contenteditable="true">{{itme1.delivery.customerName}}</span></th>
        <th style="text-align: left;border:none;width: 38.46%" colspan="5">项目名称：<span>{{itme1.delivery.project}}</span></th>
        <th style="text-align: left;border:none;width: 16%" colspan="2">联系人：<span>{{itme1.delivery.contacts}}</span></th>
      </tr>
      <tr>
        <th style="text-align: left;border:none;" colspan="9">送货地址：<span>{{itme1.delivery.deliveryAddress}}</span></th>
        <th style="text-align: left;border:none;" colspan="2">联系电话：<span>{{itme1.delivery.contactNumber}}</span></th>
      <tr >
        <th style="text-align: left;border:none;width: 84%" colspan="11">送货地址：<span>{{itme1.delivery.deliveryAddress}}</span></th>
        <th style="text-align: left;border:none;width: 16%" colspan="2">联系电话：<span>{{itme1.delivery.contactNumber}}</span></th>
      </tr>


      </thead>
      <tr style="border-style: none">
        <td colspan="11" style="border-style: none">
        <td colspan="13" style="border-style: none">
          <table style="border-style: none;width: 100%;height: 100%;">
            <template v-for="(item, index) in itme1.data" :key="index" >
              <thead>
@@ -221,20 +221,19 @@
                <th style="width: 6%;">面积</th>
                <th style="width: 6%;">单价</th>
                <th style="width: 6.5%;">金额</th>
                <th style="width: 1%;"></th>
                <th style="width: 1%;">&nbsp;</th>
                <th style="width: 9%;">楼层编号</th>
                <th style="width: 14%;" colspan="1">宽X高</th>
                <th style="width: 8%;">数量</th>
                <th style="width: 6%;">面积</th>
                <th style="width: 6%;">单价</th>
                <th style="width: 6.5%;">金额</th>
                <th style="width: 1%;"></th>
              </tr>


              </thead>
              <tr>
                <td style="font-size: 15px;text-align: left" colspan="6">产品名称:<span>{{item.DeliveryDetail.orderDetail.productName}}</span></td>
                <td style="font-size: 15px;text-align: left" colspan="6">产品名称:<span contenteditable="true">{{item.DeliveryDetail.orderDetail.productName}}</span></td>
                <td style="font-size: 15px;text-align: left" colspan="3">批次:<span>{{item.DeliveryDetail.order.batch}}</span></td>
                <td style="font-size: 15px;text-align: left" colspan="4">订单编号:<span>{{item.DeliveryDetail.orderDetail.orderId}}</span></td>
              </tr>
@@ -264,7 +263,7 @@
                <td v-if="group[1]">{{ group[1].money }}</td>

                <!-- 若组内只有一条数据，第二列留空 -->
                <td v-else colspan="5"></td>
                <td v-else colspan="6"></td>
              </tr>
              <tr class="day-in" >
                <td style="font-size: 15px;" colspan="9">小计:</td>
@@ -407,6 +406,9 @@
  .print-page-c .pages {
    page-break-after: always;
  }



}
h1,h3{
  left:0;