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

廖井涛

12 小时以前 f7a2fcdda7f1120498c5c5f75c5a99955fc54b43

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

@@ -88,7 +88,7 @@

<template>
  <div id="sheet">
    <table border="1" >
    <table  >
      <tr class="title-s">
        <th colspan="15">
          <img src="../../../assets/northGlass.ico" alt="" style="float: left;max-width: 60px;max-height: 60px">
@@ -131,11 +131,11 @@
        <th class="title-1">订单类型</th>
        <th  colspan="4">{{data.order.orderType}}</th>
        <th class="title-1">跟单员</th>
        <th  colspan="3">{{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>
@@ -148,6 +148,7 @@


        <tr>
          <th>序号</th>
          <th class="title-1">{{company.columnName}}</th>
          <th>彩釉图号</th>
          <th>编号</th>
@@ -157,8 +158,7 @@
          <th>延米</th>
          <th>楼号</th>
          <th>加工要求</th>
          <th>交货日期</th>
          <th>序号</th>
          <th>备注</th>
          <th>备注1</th>
          <th>备注2</th>
          <th>备注3</th>
@@ -172,17 +172,17 @@
          <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>{{item1.remarks}}</td>

          <td>
            {{ ((item1.otherColumns?.S04)?item1.otherColumns.S04:'')}}
@@ -193,21 +193,21 @@
        </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="8"></td>
          <td colspan="7"></td>
        </tr>
        <tr>
          <td colspan="15" style="white-space: pre-wrap;text-align:left ">
@@ -278,6 +278,9 @@
  background-color: black;
  color: black;
}
.notChangeRow{
  white-space: nowrap;
}


</style>