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

廖井涛

2024-09-26 fd61a030af048f25ced5096e731dcbd2bdf6fdbb

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

@@ -79,7 +79,7 @@

<template>
  <div id="sheet">
    <table border="1">
    <table >
      <tr class="title-s">
        <th colspan="17">
          <img src="../../../assets/northGlass.ico" alt="" style="float: left;max-width: 60px;max-height: 60px">
@@ -94,11 +94,16 @@
        <th colspan="5">电话:{{ company.telephone }}</th>
        <th colspan="5">传真:{{ company.fax }}</th>
      </tr>

      <tr class="title-s" style="height:  30px">
        <th colspan="17" >
          <hr class=".hr-border"/>
          <hr class=".hr-border"/>
        </th>
      </tr>

      <tr class="title-s" >
        <th colspan="17">
          <h3>玻璃加工单</h3>
          <h3>玻璃加工单({{data.order.orderType}})</h3>
        </th>
      </tr>
      <tr>
@@ -109,13 +114,13 @@
      </tr>
      <tr>
        <th class="title-1">生产单号</th>
        <th colspan="3">{{data.order.orderId}}</th>
        <th colspan="3"> <el-text>{{data.order.orderId}}<el-text style="font-size: 12px;font-weight: bolder">（对应单号{{data.order.batch}})</el-text></el-text></th>
        <th class="title-1">下单日期</th>
        <th colspan="3">{{data.order.createTime}}</th>
        <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>
@@ -127,8 +132,6 @@
        <th>包装</th>
        <th colspan="3">{{data.order.packType}}</th>
      </tr>


        <tr>
          <th >序号</th>
          <th >{{company.columnName}}</th>
@@ -137,12 +140,11 @@
          <th>规格（宽W*高H）</th>
          <th>片数</th>
          <th>面积</th>
          <th>{{company.columnNamePerimeter}}</th>
          <th>延米</th>
          <th>半径</th>
          <th>楼号</th>
          <th>加工要求</th>
          <th>备注</th>
          <th>序号</th>
          <th colspan="2">备注</th>
          <th>备注1</th>
          <th>备注2</th>
          <th>备注3</th>
@@ -151,16 +153,16 @@
      <tbody v-for="(item,index) in data.orderDetail" :key="index">
      <tr>
        <td colspan="2" class="no-change-row">产品名称</td>
        <td colspan="10">{{item.productName}}</td>
        <td colspan="10" style="text-align: left">{{item.productName}}</td>
        <td class="no-change-row">产品描述</td>
        <td colspan="4"></td>
      </tr>
      <template v-for="(item1,index1) in item.productDetail" :key="index1">
        <tr  >
          <td>{{item1.orderNumber}}</td>
          <td>{{  item1.otherColumns?.S02}}</td>
          <td class="notChangeRow">{{  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>
@@ -168,8 +170,7 @@
          <td>{{item1.bendRadius}}</td>
          <td>{{item1.buildingNumber}}</td>
          <td>{{item1.processingNote}}</td>
          <td>{{item1.remarks}}</td>
          <td></td>
          <td colspan="2">{{item1.remarks}}</td>
          <td>{{((item1.otherColumns?.S04)?item1.otherColumns.S04:'')}}</td>
          <td>{{((item1.otherColumns?.S05)?item1.otherColumns.S05:'')}}</td>
          <td>{{((item1.otherColumns?.S06)?item1.otherColumns.S06:'')}}</td>
@@ -239,7 +240,7 @@

<style scoped>
#sheet{
  width: 100%;
  width: 98%;
  height: 100%;
  text-align: center;
}
@@ -262,11 +263,11 @@

table{
  border-collapse: collapse;
  border: 1px solid black;
  //border: 1px solid black;
  width: 100%;
  text-align: center;
}
table, th, td {
tr, th, td {
  border: 1px solid black;
  border-collapse: collapse;
}
@@ -288,5 +289,12 @@
  border:0
}


.notChangeRow{
  white-space: nowrap;
}
@media print {
  @page {
    margin: 5mm; /* 设置打印页面的边距 */
  }
}
</style>