Merge remote-tracking branch 'origin/master'

86134

2023-11-15 0007127ac6b22ab2669f55702f7c81f71dae683b

 src/views/quality/finishedProductInspection/finishedProducter-print.vue

@@ -65,18 +65,42 @@

            <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'>
                <td colspan=2 height=53 class=xl7624921 style='border-right:.5pt solid black;
  height:40.05pt'>通断/线序</td>
                <td  colspan=7 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'>通断:  &nbsp;&nbsp;□合格 &nbsp;&nbsp; □不合格</td>
            <td  colspan=7 class=xl6624921 style='border-right:.5pt solid black;
border-left:none'>线序:  &nbsp;&nbsp;□合格 &nbsp;&nbsp; □不合格</td>
  height:40.05pt'>检验要求</td>
               <td  colspan=2 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'>标准值</td>
                <td  colspan=1 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'>01</td>
                <td  colspan=1 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'>02</td><td  colspan=1 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'>03</td><td  colspan=1 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'>04</td><td  colspan=1 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'>05</td><td  colspan=1 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'>06</td><td  colspan=1 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'>07</td><td  colspan=1 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'>08</td><td  colspan=1 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'>09</td>
                <td  colspan=2 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'>判定</td>
            </tr>









            <tbody v-for="(item,index) in father" :key="index">
            <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'>
                <td colspan=2 rowspan=3 height=53 class=xl7624921 style='border-right:.5pt solid black;
  height:40.05pt'><p>绝缘电阻≥</p><p>______00MΩ</p><p>_____00VDC</p></td>
                <td  colspan=2 rowspan=3 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'><p>测试结</p><p>果最小</p><p>值</p></td>
        height:40.05pt'>
        <p class="MsoNormal" align="center" style="text-align:center"><span
        style="font-family:宋体" v-text="item.rpFather"></span></p>
            </td>

                <td  colspan=1 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'></td>
            <td  colspan=1 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'>产品</td>
            <td  colspan=1 class=xl6624921 style='border-right:.5pt solid black;
@@ -91,6 +115,10 @@
                <td  colspan=3 rowspan="3" class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'><p>□合格</p><p>□不合格</p></td>
            </tr>
            
            </tbody>


            <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'>
                <td  colspan=1 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'></td>
@@ -109,7 +137,7 @@
  border-left:none'></td>
            </tr>

            <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'>
            <!-- <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'>
                <td colspan=2 rowspan=2 height=53 class=xl7624921 style='border-right:.5pt solid black;
  height:40.05pt'>通断/线序</td>
                <td  colspan=7 class=xl6624921 style='border-right:.5pt solid black;
@@ -482,8 +510,8 @@
            <td colspan=10  height=53 class=xl7624921 style='border-right:.5pt solid black;
  height:40.05pt'><p>发出产品不得出现任何形式的供应商信息，包括缆盘上的标签、电缆</p><p>上供应商名称等</p></td>
            <td  colspan=3 class=xl6624921 style='border-right:.5pt solid black;
  border-left:none'>  &nbsp; □合格 &nbsp;□不合格</td>
            </tr>
  border-left:none'>  &nbsp; □合格 &nbsp;□不合格</td> -->
            <!-- </tr> -->
            <tr  class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'>
            <td colspan=8  height=53 class=xl7624921 style='border-right:.5pt solid black;
  height:40.05pt;text-align: left;'><p>&nbsp;检验/时间:</p></td>
@@ -525,6 +553,7 @@
            childrenData: [],
            typedata:null,
            num:null,
            father:[],
        }
    },
    created(){
@@ -539,6 +568,11 @@
            this.product = this.tableData.material
            this.number = this.tableData.quantity
            this.typedata = this.tableData.specs
            this.tableData.children.forEach(el =>{
                this.father.push(el.father)
                console.log("-----",this.father);
             })
            
        },
    },
    watch:{