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

廖井涛

2024-07-15 731ab1ab578873d0374823fe0ca6f6928b50bd32

 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,7 +94,12 @@
        <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">
@@ -260,11 +265,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;
}