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

廖井涛

7 小时以前 f7a2fcdda7f1120498c5c5f75c5a99955fc54b43

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

@@ -88,9 +88,9 @@

<template>
  <div id="sheet">
    <table border="1" >
    <table  >
      <tr class="title-s">
        <th colspan="13">
        <th colspan="15">
          <img src="../../../assets/northGlass.ico" alt="" style="float: left;max-width: 60px;max-height: 60px">
          <h1>
            {{company.companyName}}
@@ -100,8 +100,8 @@

      <tr class="title-s">
        <th colspan="5">地址:{{company.address}}</th>
        <th colspan="4">电话:{{ company.telephone }}</th>
        <th colspan="4">传真:{{ company.fax }}</th>
        <th colspan="5">电话:{{ company.telephone }}</th>
        <th colspan="5">传真:{{ company.fax }}</th>
      </tr>
<!--      <tr class="title-s">-->
<!--        <th colspan="13">-->
@@ -111,7 +111,7 @@
<!--      </tr>-->

      <tr  class="title-s">
        <th colspan="13">
        <th colspan="15">
          <h3>玻璃加工单</h3>
        </th>

@@ -119,9 +119,9 @@

      <tr>
        <th class="title-1">客户名称</th>
        <th colspan="6">{{data.order.customerName}}</th>
        <th colspan="7">{{data.order.customerName}}</th>
        <th class="title-1">工程名称</th>
        <th colspan="5">{{data.order.project}}</th>
        <th colspan="6">{{data.order.project}}</th>
      </tr>
      <tr>
        <th class="title-1">生产单号</th>
@@ -129,25 +129,26 @@
        <th class="title-1">下单日期</th>
        <th  colspan="2">{{data.order.createTime}}</th>
        <th class="title-1">订单类型</th>
        <th  colspan="3">{{data.order.orderType}}</th>
        <th  colspan="4">{{data.order.orderType}}</th>
        <th class="title-1">跟单员</th>
        <th  colspan="2">{{data.order.creator}}</th>
        <th  colspan="3">{{data.order.salesman}}</th>
      </tr>
      <tr>
        <th>磨边</th>
        <th  colspan="2"></th>
        <th  colspan="2">{{data.order.otherRemarks}}</th>
        <th>完工日期</th>
        <th  colspan="2">{{data.order.deliveryDate}}</th>
        <th>商标</th>
        <th  colspan="3">{{data.order.icon}}</th>
        <th  colspan="4">{{data.order.icon}}</th>
        <th>包装</th>
        <th  colspan="2">{{data.order.packType}}</th>
        <th  colspan="5">{{data.order.packType}}</th>
      </tr>




        <tr>
          <th>序号</th>
          <th class="title-1">{{company.columnName}}</th>
          <th>彩釉图号</th>
          <th>编号</th>
@@ -157,61 +158,59 @@
          <th>延米</th>
          <th>楼号</th>
          <th>加工要求</th>
          <th>交货日期</th>
          <th>序号</th>
          <th>箱架号</th>
          <th>备注1/备注2/备注3/备注4</th>
          <th>备注</th>
          <th>备注1</th>
          <th>备注2</th>
          <th>备注3</th>
          <th>备注4</th>
        </tr>
      <tbody v-for="(item,index) in data.orderProductDetail" :key="index">
        <tr>
          <td class="no-change-row">品&nbsp;&nbsp;种</td>
          <td colspan="9">{{item.productName}}</td>
          <td colspan="10">{{item.productName}}</td>
          <td class="no-change-row">产品描述</td>
          <td colspan="2"></td>
          <td colspan="3"></td>
        </tr>
        <tr v-for="(item1,index1) in item.productDetail" :key="index1">
          <td>{{item1.orderNumber}}</td>
          <td>{{  item1.otherColumns?.S02}}</td>
          <td>{{  item1.otherColumns?.S03}}</td>
          <td>{{  item1.otherColumns?.S01}}</td>
          <td class="notChangeRow">{{  item1.otherColumns?.S01}}</td>
          <td>{{item1.width +'*'+item1.height}}</td>
          <td>{{item1.quantity}}</td>
          <td>{{item1.grossArea}}</td>
          <td>{{item1.perimeter}}</td>
          <td>{{item1.buildingNumber}}</td>
          <td>{{item1.processingNote}}</td>
          <td></td>
          <td>{{item1.orderNumber}}</td>
          <td></td>
          <td>{{item1.remarks}}</td>

          <td>
            {{
              ((item1.otherColumns?.S04)?item1.otherColumns.S04:'')+'/'+
              ((item1.otherColumns?.S05)?item1.otherColumns.S05:'')+'/'+
              ((item1.otherColumns?.S06)?item1.otherColumns.S06:'')+'/'+
              ((item1.otherColumns?.S07)?item1.otherColumns.S07:'')
            }}
            {{ ((item1.otherColumns?.S04)?item1.otherColumns.S04:'')}}
          </td>
          <td>{{((item1.otherColumns?.S05)?item1.otherColumns.S05:'')}}</td>
          <td>{{((item1.otherColumns?.S06)?item1.otherColumns.S06:'')}}</td>
          <td>{{((item1.otherColumns?.S07)?item1.otherColumns.S07:'')}}</td>
        </tr>

        <tr>
          <td colspan="4">小计</td>
          <td colspan="5">小计</td>
          <td>{{getQuantity(item.productDetail)}}</td>
          <td>{{getArea(item.productDetail)}}</td>
          <td>{{getPerimeter(item.productDetail)}}</td>
          <td colspan="6"></td>
          <td colspan="7"></td>
        </tr>


      </tbody>
        <tr>
          <td colspan="4">总计</td>
          <td colspan="5">总计</td>
          <td>{{grossNum.quantity}}</td>
          <td>{{grossNum.grossArea}}</td>
          <td>{{grossNum.perimeter}}</td>
          <td colspan="6"></td>
          <td colspan="7"></td>
        </tr>
        <tr>
          <td colspan="13" style="white-space: pre-wrap;text-align:left ">
          <td colspan="15" style="white-space: pre-wrap;text-align:left ">
            <template v-for="(item,index) in data.order.processingNote.split('\n')">
              {{item}}
              <br>
@@ -279,6 +278,9 @@
  background-color: black;
  color: black;
}
.notChangeRow{
  white-space: nowrap;
}


</style>