Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before

zss

2023-11-24 9d1aa995c4802643be2b3cd936ad88ee108d2816

Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before

 public/title.css

@@ -1,4 +1,8 @@
@page {margin: 10mm 5mm; margin-bottom: 0;margin-top:0;} 
@page {
    margin: 10mm 5mm; 
    margin-bottom: 0;
    margin-top:0;
} 
.xl6524921 {
    padding: 0px;
    mso-ignore: padding;
@@ -1120,7 +1124,6 @@
        margin-left: 85px;
}
.bodycs{
    // margin-left: 135px;
   margin-top: -30px;
}
.bodycs-1{
@@ -1129,6 +1132,7 @@
        height: 60px;
        width: auto;
        margin-top: -80px;
        
    }
.bodycs-2{
    display: flex;
@@ -1191,7 +1195,10 @@
    margin-left: 130px;
}
.pagefooting{
    
    font-size:8pt;
    font-family:宋体;
    margin-right: 15pt;
    color: deepskyblue;
}
.x1111111{
    padding: 0px;

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

@@ -14,7 +14,7 @@
                </tr>
                <tr class="xl6524921" height=33 style='mso-height-source:userset;height:25.05pt'>
                    <td colspan=6 height=33 class=xl6624921 style='border-right:.5pt solid black;height:25.05pt;border-left:none'>
                        记录编号:ZTT/QR-8.6-05（A/0)
                        记录编号:{{ tableData.finInsNo }}
                    </td>
                    <td colspan=3  class=xl6624921 style='border-top:none;border-left:none'>
                        归档部门:质量保证部
@@ -36,7 +36,7 @@
                        </p>
                </td>
                    <td   colspan=2  class="xl6924921" style='border-top:none;border-left:none'>检验依据:</td>
                    <td colspan=7 class="xl6624921" style='border-right:.5pt solid black;  border-left:none'>
                    <td colspan=7 class="xl6624921" style='border-right:.5pt solid black;  border-left:none'>{{ tableData.dname }}
    　             </td>
                </tr>
                <tr class="xl6524921" height=53 style='mso-height-source:userset;height:40.05pt'>
@@ -132,7 +132,7 @@
                </tbody>
                <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;检验/时间:<span>{{tableData.createTime}}</span></p></td>
                    <p>&nbsp;检验/时间:<span>{{tableData.updateTime}}</span></p></td>
                <td colspan=8  height=53 class=xl7624921 style='border-right:.5pt solid black; height:40.05pt;text-align: left;'>
                    <p> &nbsp;审批:<span>{{username}}</span></p></td>
                </tr>
@@ -171,9 +171,9 @@
                    </div>
                            <div style="margin-left:40pt">
                                <div class="bodycs-1">
                        <p  ><span style="font-size:12pt;font-family:黑体">报告编号:（No）:ZTMS01-<br>Report No.：</span></p>
                        <p style="margin-left: 350px;"><span style="font-size:12pt;font-family:黑体">报告日期<br> Report Date</span></p>
                        <p style="margin-left: 190px;"><span style="font-size:12pt;font-family:黑体">页次：1/8<br> Page</span></p>
                        <p  ><span style="font-size:12pt;font-family:黑体">报告编号:{{ tableData.finInsNo }}<br>Report No.：</span></p>
                        <p style="margin-left: 200px;"><span style="font-size:12pt;font-family:黑体">报告日期:{{ tableData.updateTime }}<br> Report Date</span></p>
                        <p style="margin-left: 200px;"><span style="font-size:12pt;font-family:黑体">页次：1/8<br> Page</span></p>
                    </div>
                    <div>
                    <div class="bodycs-2">
@@ -197,6 +197,12 @@
                        <p ><span class="ziti">产品检验</span><br><span style="display: block;height: 2px; width: 500px; background: rgb(20, 20, 22);margin-left: 75px;"></span></span></p> 
                    </div>
                    <div>
                        <br>
                        <br>
                        <span
                            style='mso-spacerun:yes'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
                        </div>
                    <div>
                        <div class="chilen">
                        <p ><span class="x1111113">批  准:<br>&nbsp;&nbsp;Approved by</span></p> 
                        <p ><span class="time"></span><br><span style="display: block;height: 2px; width: 300px; background: rgb(20, 20, 22);margin-left: 75px;"></span></span></p> 
@@ -212,8 +218,6 @@
                        <div>
                        <br>
                        <br>
                        <br>
                        <br><br><br>
                        <span
                            style='mso-spacerun:yes'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
                        </div>
@@ -230,7 +234,7 @@
                </div>
                </div>
                <div class="pagefooting">
                    <p><span style="font-size:8pt;font-family:宋体;color: cornflowerblue;margin-left: 40pt;">
                    <p><span style="font-size:14pt;font-family:宋体;color: cornflowerblue;">
                        地址:江苏省南通市经济技术开发区新开南路1号(226010)  电话:051389191125  传真:051389191123
                    <br>Add: No 1 Xinkainan Road, NETDZ Nantong, Jiangsu, China (226010); TEL: 051389191125 ; Fax:051389191123
                    </span></p>      
@@ -257,7 +261,7 @@
                            <span class=x1111112 >Test  &nbsp; Report</span><br>
                        </span></p>
                        <div  class="bodycs-1">
                            <p  style="margin-left: 40px;"><span style="font-size:12pt;font-family:黑体">报告编号:（No）:ZTMS01-<br>Report No.：</span></p>
                            <p  style="margin-left: 40px;"><span style="font-size:12pt;font-family:黑体">报告编号:{{ tableData.finInsNo }}<br>Report No.：</span></p>
                            <p style="margin-left: 620px;"><span style="font-size:12pt;font-family:黑体">页次：2/8<br> Page</span></p>
                        </div>
                    </div>
@@ -287,7 +291,7 @@
                            style='mso-spacerun:yes'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
                        </div>
                <div class="pagefooting">
                    <p><span style="font-size:8pt;font-family:宋体;color: cornflowerblue;">
                    <p><span style="font-size:14pt;font-family:宋体;color: cornflowerblue;">
                        地址:江苏省南通市经济技术开发区新开南路1号(226010)  电话:051389191125  传真:051389191123
                    <br>Add: No 1 Xinkainan Road, NETDZ Nantong, Jiangsu, China (226010); TEL: 051389191125 ; Fax:051389191123
                    </span></p>            
@@ -314,51 +318,61 @@
                            <p style=" border-top: 1px solid black;width: 900pt;margin-top: -1px;"></p>
                        </span></p>
                        <div  class="bodycs-1">
                            <p  style="margin-left: 40px;"><span style="font-size:12pt;font-family:黑体">报告编号:（No）:ZTMS01-<br>Report No.：</span></p>
                            <p  style="margin-left: 40px;"><span style="font-size:12pt;font-family:黑体">报告编号:{{ tableData.finInsNo }}<br>Report No.：</span></p>
                            <p style="margin-left: 620px;"><span style="font-size:12pt;font-family:黑体">页次：3/8<br> Page</span></p>
                        </div>
                    </div>


                    <div>
                        <p style="display: flex;margin-left: 40px;">1.测试设备</p>
                        <div class="bodycs" style="margin-top: 80px;" v-for="ela in pel.children">
                        <p class=x1111112 style="display: flex;margin-left: 40px;">1.测试设备</p>
                        <div class="bodycs" style="margin-top: 80px;" v-if='ela.iname !== "" ' v-for="ela in pel.children">
                                <div  class="bodycs-1" style="margin-top: 10px;">
                                    <p style="margin-left: 35px;font-size:12pt;font-family:黑体">检验项目：<span style="width: 60px;">&nbsp;{{ela.iname}}<br><span>设备名称：{{ ela.ename }}</span><br>Name of Equipment</span></p>
                                    <p style="margin-left: 150px;"><span style="font-size:12pt;font-family:黑体">&nbsp;<br>设备型号:{{ ela.specifications }}<br>&nbsp;Model</span></p>
                                    <p style="margin-left: 150px;"><span style="font-size:12pt;font-family:黑体">&nbsp;<br>设备编号:{{ ela.code}}<br>Serial No.</span></p>
                                    <p style="margin-left: 150px;"><span style="font-size:12pt;font-family:黑体">&nbsp;<br>校准有效期:{{ ela.date }}<br>Calibration Due Date</span></p>
                                </div>
                                <div>
                                    <p style=" border-top: 1px solid black;width: 96%;margin-top: 20px;"></p>
                                    <p style="margin-left: 40px;font-size:12pt;font-family:黑体">检验项目：<span style="width: 60px;">&nbsp;{{ela.iname}}<br><span>设备名称：{{ ela.ename }}</span><br>Name of Equipment</span></p>
                                    <p style="padding-left: 100px;"><span style="font-size:12pt;font-family:黑体">&nbsp;<br>设备型号:{{ ela.specifications }}<br>&nbsp;Model</span></p>
                                    <p style="padding-left: 100px;"><span style="font-size:12pt;font-family:黑体">&nbsp;<br>设备编号:{{ ela.code}}<br>Serial No.</span></p>
                                    <p style="margin-left: 110px;"><span style="font-size:12pt;font-family:黑体">&nbsp;<br>校准有效期:{{ ela.date }}<br>Calibration Due Date</span></p>
                                </div>
                        </div>
                        <!-- <div>
                            <p style=" border-top: 1px solid black;width: 96%;margin-top: 20px;"></p>
                        </div> -->
                    </div>







                    <div style="margin-top: 100px;display: flex;">
                        <p  style="margin-left: 40px;"><span style="font-size:12pt;font-family:黑体">2.参考标准Reference standards&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<br>本次检测所依据的技术文件（代号、名称）：<br>Reference documents for this testing&nbsp;&nbsp;&nbsp;&nbsp;</span></p>
                    <div style="display: flex;margin-top: 60px;">
                        <p ><span><span class=x1111112 style="margin-left: 40px;">2.参考标准Reference standards</span>
                            <!-- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
                            <br>本次检测所依据的技术文件（代号、名称）：<br>Reference documents for this testing&nbsp;&nbsp;&nbsp;&nbsp; -->
                        </span></p>
                    </div>
                            <br>
                            <br>

                    <p style="font-size:18pt;font-family:宋体">本次检验参考的技术文件是:<span>{{tableData.dname}}，编号:{{tableData.dnumber }}</span></p>
                    <div>   
                            <p style=" border-top: 1px solid black;width: 96%;margin-top: 1px;"></p>
                    </div>

                    <div style="margin-top: 80px;display: flex;">
                        <p  class=x1111112 style="margin-left: 40px;"><span style="font-size:12pt;font-family:黑体">3.环境条件Environmental conditions：</span></p>
                        <p  class=x1111112 style="margin-left: 40px;"><span >3.环境条件Environmental conditions：</span></p>
                    </div>
                    <div style="display: flex;">
                        <p style="margin-left: 50px;"><span >温度(Temperature)：℃ </span></p>
                        <p style="margin-left: 450px;"><span >相对湿度(R.H.)：%</span></p>
                    </div>
                    <div style="margin-top: 50px;display: flex;">
                        <p  class=x1111112 style="margin-left: 40px;"><span style="font-size:12pt;font-family:黑体">4.测试目的Test purpose：</span></p>
                        <p  class=x1111112 style="margin-left: 40px;"><span>4.测试目的Test purpose：</span></p>
                    </div>
                    <div v-for="ela in pel.children" v-if='ela.iname !== "" ' style="display: flex;margin-left: 40px;">
                        <p>检验项目：{{ ela.iname }},测试目的是：{{ ela.method }}</p>
                    </div>
                    <div style="margin-top: 80px;display: flex;">
                        <p  class=x1111112 style="margin-left: 40px;"><span style="font-size:12pt;font-family:黑体">5.测试方法Test method：</span></p>
                        <p  class=x1111112 style="margin-left: 40px;"><span>5.测试方法Test method：</span></p>
                    </div>
                    <div v-for="ela in pel.children" v-if='ela.iname !== "" ' style="display: flex;margin-left: 40px;">
                        <p>检验项目：{{ ela.iname }},测试目的是：{{ ela.purpose }}</p>
                    </div>
                    <div>
                        <br>
@@ -370,7 +384,7 @@
                </div>
                </div>
                <div class="pagefooting">
                    <p><span style="font-size:8pt;font-family:宋体;color: cornflowerblue;">
                    <p><span style="font-size:14pt;font-family:宋体;color: cornflowerblue;">
                        地址:江苏省南通市经济技术开发区新开南路1号(226010)  电话:051389191125  传真:051389191123
                    <br>Add: No 1 Xinkainan Road, NETDZ Nantong, Jiangsu, China (226010); TEL: 051389191125 ; Fax:051389191123
                    </span></p>            
@@ -396,7 +410,7 @@
                            <span class=x1111112 >Test  &nbsp; Report</span><br>
                        </span></p>
                        <div  class="bodycs-1">
                            <p  style="margin-left: 40px;"><span style="font-size:12pt;font-family:黑体">报告编号:（No）:ZTMS01-<br>Report No.：</span></p>
                            <p  style="margin-left: 40px;"><span style="font-size:12pt;font-family:黑体">报告编号:{{ tableData.finInsNo }}<br>Report No.：</span></p>
                            <p style="margin-left: 620px;"><span style="font-size:12pt;font-family:黑体">页次：4/8<br> Page</span></p>
                        </div>
                    </div>
@@ -405,20 +419,20 @@
                        <p class="x1111113" ><span style="font-size 40pt;display: flex;margin-top: 40px;margin-left: 40px;;font-family:黑体">6.测试结果Test result：</span></p>
                    </div>
                    <div>
                        <table border="2px" style="width: 800px;height: 100px;margin-top: 10px;">
                        <table border="2px" style="width: 800px;height: 100px;margin-top: 10px;" >
                            <tr style="height: 80px;">
                                <td class="x1111113"><span style="font-size 40pt;margin-left: 80px;font-family:黑体">测试项目</span></td>
                                <td class="x1111113"><span style="font-size 40pt;margin-left: 80px;font-family:黑体">样品数量</span></td>
                                <td class="x1111113"><span style="font-size 40pt;margin-left: 80px;font-family:黑体">测试结果</span></td>
                            </tr>
                            <tr style="height: 100px;">
                                <td></td>
                                <td></td>
                            <tr style="height: 100px;" v-if='ela.iname !== "" ' v-for="ela in pel.children">
                                <td class="x1111113"  style="text-align: center;">{{ ela.iname }}</td>
                                <td class="x1111113" style="text-align: center;">{{ tableData.quantity }}</td>
                                <td></td>
                            </tr>
                            <tr style="height: 80px;">
                            <!-- <tr style="height: 80px;">
                                <td colspan=3></td>
                            </tr>
                            </tr> -->
                        </table>
                    </div>
                    <div>   
@@ -448,7 +462,7 @@
                </div>
                </div>
                <div class="pagefooting">
                    <p><span style="font-size:8pt;font-family:宋体;color: cornflowerblue;">
                    <p><span style="font-size:14pt;font-family:宋体;color: cornflowerblue;">
                        地址:江苏省南通市经济技术开发区新开南路1号(226010)  电话:051389191125  传真:051389191123
                    <br>Add: No 1 Xinkainan Road, NETDZ Nantong, Jiangsu, China (226010); TEL: 051389191125 ; Fax:051389191123
                    </span></p>            
@@ -474,7 +488,7 @@
                            <span class=x1111112 >Test  &nbsp; Report</span><br>
                        </span></p>
                        <div  class="bodycs-1">
                            <p  style="margin-left: 40px;"><span style="font-size:12pt;font-family:黑体">报告编号:（No）:ZTMS01-<br>Report No.：</span></p>
                            <p  style="margin-left: 40px;"><span style="font-size:12pt;font-family:黑体">报告编号:{{ tableData.finInsNo }}<br>Report No.：</span></p>
                            <p style="margin-left: 620px;"><span style="font-size:12pt;font-family:黑体">页次：5/8<br> Page</span></p>
                        </div>
                    </div>
@@ -526,7 +540,7 @@
                        style='mso-spacerun:yes'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
                    </div>
                <div class="pagefooting">
                    <p><span style="font-size:8pt;font-family:宋体;color: cornflowerblue;">
                    <p><span style="font-size:14pt;font-family:宋体;color: cornflowerblue;">
                        地址:江苏省南通市经济技术开发区新开南路1号(226010)  电话:051389191125  传真:051389191123
                    <br>Add: No 1 Xinkainan Road, NETDZ Nantong, Jiangsu, China (226010); TEL: 051389191125 ; Fax:051389191123
                    </span></p>            

 src/views/quality/finishedProductInspection/index.vue

@@ -226,10 +226,11 @@
                PrintJS({
                    printable: "printRaw",
                    type: "html",
                    // scanStyles: false,
                    maxWidth: 1000,
                    // header: "产品检测报告",
                    scanStyles: false,
                    maxWidth: 1200,
                    header: "产品检测报告",
                    style:style,
                    css:'./title.css',
                    targetStyles: ["*"],
                    ignoreElements: ["no-ignore"],
                    orientation: 'portrait'

 vue.config.js

@@ -5,6 +5,7 @@
// const url = 'http://192.168.0.23:9999'

  // const url = 'http://192.168.0.60:9999'
  // const url = 'http://localhost:9999'
const url = 'http://localhost:9999'

// const url = 'http://ztt-gateway:9999'