Merge remote-tracking branch 'origin/master'

王震

2023-09-25 c0bc2331e9abb2ae003c8dc0ab4524d6101493a1

 src/components/view/processInspection.vue

@@ -249,12 +249,12 @@
     title="过程检验报告" :visible.sync="reportlook"  width="40%">
     <template>
    <div ref="print">
  

      <div style="margin:0 auto;">
          <!-- <div style="text-align:center;margin-top:10px;">过程检验报告</div> -->
    <table class="table table-striped table-bordered" align="center" border style="width: 100%;height: 700px;" valign="center">
      <tr>
        <td class="column" colspan="2" rowspan="2" > <img src="../view/report/logo-2.png" style="width:100%;" /></td>
        <td class="column" colspan="2" rowspan="2" > <img src="../../../static/img/logo 1.png" /></td>
        <td class="column" colspan="2" ><p>记录名称：检验记录表</p>Table: Inspection Record</td>
        <td class="column" colspan="2"><p>保存期限：25年</p> Storage Life: 25 years</td>
      </tr>
@@ -291,17 +291,17 @@
        <!-- <td class="daughter" >01</td> -->
      </tr>
      <tr>
        <td class="column"  rowspan="9" colspan="0.5">尺寸</td>
        <td class="column"  rowspan="9" >尺寸</td>
        <td class="value" ></td>
        <td class="column"></td>
        <td class="value" ></td>
  

      </tr>
      <tr>
        <td class="column"></td>
        <td class="value" colspan="3"></td>
        <td class="column"></td>
  

      </tr>
      <tr>
        <td class="value" colspan="2"></td>
@@ -313,7 +313,7 @@
        <td class="value" colspan="2"></td>
        <td class="value" colspan="2"></td>
      </tr>
  

      <tr>
        <td class="column" colspan="6"></td>
      </tr>
@@ -337,7 +337,7 @@
        <td class="value" colspan="2"></td>
        <td class="value" colspan="2"></td>
      </tr>
  

      <tr>
        <td class="column">材质</td>
        <td class="value" colspan="5"></td>
@@ -360,8 +360,8 @@
          <br>
        </td>
      </tr>
  
  


    </table>
      </div>
    </div>
@@ -485,7 +485,7 @@
      this.reportlook = true
      // this.$nextTick(() => {
      //          this.$print(this.$refs.print);
      //      })     
      //      })
    },
    handleClick(row) {
      this.rowInfp = row