From 44f9e74915e5dbdac912d81d95ba60284bec140c Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期六, 26 八月 2023 11:55:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/template_testReport/index.vue | 651 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
src/router/index.js | 5
src/views/inspectionManagement/commissionInspection/addCommision.vue | 14
3 files changed, 665 insertions(+), 5 deletions(-)
diff --git a/src/router/index.js b/src/router/index.js
index 62e441e..25cd92c 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -47,6 +47,11 @@
hidden:true
},
{
+ path: '/testReport',
+ component: () => import('@/views/template_testReport/index'),
+ hidden:true
+ },
+ {
path: '/',
component: Layout,
redirect: '/home',
diff --git a/src/views/inspectionManagement/commissionInspection/addCommision.vue b/src/views/inspectionManagement/commissionInspection/addCommision.vue
index 224952b..ce5d9d4 100644
--- a/src/views/inspectionManagement/commissionInspection/addCommision.vue
+++ b/src/views/inspectionManagement/commissionInspection/addCommision.vue
@@ -424,11 +424,15 @@
</script>
<style lang="scss" scoped>
- .content-main {
- padding: 20px 40px;
- background-color: #f0f2f5;
- width: 100%;
- height: 100vh;
+.content-main{
+ padding: 20px 40px;
+ background-color: #f0f2f5;
+ width: 100%;
+ height: 100vh;
+ display: flex;
+ flex-direction: column;
+ justify-content: space-between;
+ // align-items: center;
.firstBox {
.title {
diff --git a/src/views/template_testReport/index.vue b/src/views/template_testReport/index.vue
new file mode 100644
index 0000000..575e579
--- /dev/null
+++ b/src/views/template_testReport/index.vue
@@ -0,0 +1,651 @@
+<template>
+ <div class="content-wrapper">
+ <div class="content-main">
+ <div class="cover">
+ <div class="cover-top">
+ <div>
+ <div style="height: 30px; line-height: 30px;">鎶ュ憡缂栧彿:</div>
+ <div style="height: 30px; line-height: 30px;">Reference No:</div>
+ </div>
+ </div>
+ <div class="title">
+ <h1 style="text-align-last:justify ;">妫�楠屾姤鍛�</h1>
+ <h1>Test Report</h1>
+ </div>
+ <div class="cover-body">
+ <div class="name">
+ <div style="width:140px; text-align-last: justify;">
+ <div>璇曟牱鍚嶇О</div>
+ <span style="font-size: 14px;">Name of Product</span>
+ </div>
+ <div class="line"> 娴嬭瘯鍚嶇О</div>
+ </div>
+ <div class="name">
+ <div style="width:140px; text-align-last: justify;">
+ <div style="text-align-last: justify;">鍨嬪彿</div>
+ <span style="font-size: 14px;">Type and Size</span>
+ </div>
+ <div class="line"> 娴嬭瘯鍚嶇О</div>
+ </div>
+ <div class="name">
+ <div style="width:140px; text-align-last: justify;">
+ <div>濮旀墭鍗曚綅</div>
+ <span style="font-size: 14px;display: block;margin: 10px 50px 0px;">Client</span>
+ </div>
+ <div class="line"> 娴嬭瘯鍚嶇О</div>
+ </div>
+ <div class="name">
+ <div style="width:140px; text-align-last: justify;">
+ <div>妫�楠岀被鍒�</div>
+ <span style="font-size: 14px;">Kind of Test</span></div>
+ <div class="line"> 娴嬭瘯鍚嶇О</div>
+ </div>
+ </div>
+ <div class="cover-footer">
+ <span>姹熻嫃涓ぉ绉戞妧鑲′唤鏈夐檺鍏徃妫�娴嬩腑蹇�</span><br>
+ <span style="font-size: 14px;">TEST CENTER OF JIANGSU ZHONGTIAN TECHNOLOGY CO.,LTD</span>
+ </div>
+ </div>
+ <div class="pageOne">
+ <div class="statement">
+ <div><h2>澹版槑</h2></div>
+ <div style="text-align-last: center;"><h2 style="font-size: 14px;">Statement</h2></div>
+ </div>
+ <div class="statement-body">
+ <div>
+ <span>1. 鏈楠屾姤鍛婏紙鍖呮嫭澶嶅嵃浠讹級鏈姞妫�娴嬩笓鐢ㄧ珷涓�寰嬫棤鏁堛��</span><br>
+ <span>This test report (including any duplicates) shall become effective only with pecial chapter for testing on.</span>
+ </div>
+ <div>
+ <span>2. 鏈楠屾姤鍛婃棤缂栧啓銆佸鏍搞�佹壒鍑嗕汉绛剧珷鏃犳晥銆�</span><br>
+ <span>This test report shall become effective only with the signatures of compiler checker and approver.</span>
+ </div>
+ <div>
+ <span>3. 鏈楠屾姤鍛婃秱鏀规棤鏁堛��</span><br>
+ <span>This test report will be invalid if altered.</span>
+ </div>
+ <div>
+ <span>4. 鏈楠屾姤鍛婁笉寰楅儴鍒嗗鍗般��</span><br>
+ <span>This test report mustn鈥檛 copy partly.</span>
+ </div>
+ <div>
+ <span>5. 閫佹牱濮旀墭妫�楠岋紝浠呭鏉ユ牱璐熻矗銆�</span><br>
+ <span>For the sample submitted by clients, the test result is valid only for these samples.</span>
+ </div>
+ <div>
+ <span>6. 鏍峰搧鍙婂鎵樺崟浣嶄负濮旀墭鏂硅嚜鍛藉悕銆�</span><br>
+ <span>Samples and consignor name for the principal.</span>
+ </div>
+ <div>
+ <span>7. 鏈楠屾姤鍛婁腑鑻辨枃鎻忚堪鏈夊啿绐佹椂锛屼互涓枃瑙ｉ噴涓哄噯銆�</span><br>
+ <span>If the Chinese and English version of the test report have any conflict, the Chinese version should be the standard for arbitrament.</span>
+ </div>
+ <div>
+ <span>8. 濮旀墭鏂瑰鏈楠屾姤鍛婅嫢鏈夊紓璁紝搴斾簬鏍峰搧淇濆瓨鏈熷唴鍚戞湰涓績鎻愬嚭锛岃仈绯荤數璇濓細0513-84885657</span><br>
+ <span>Clients who have any different ideas about this test report, may contract with Test Central within the sample reservation time. Tel: 0513-84885657</span>
+ </div>
+ <div>
+ <span>9. 鏈腑蹇冩牱鍝佽嚜鎶ュ憡鍙戦�佹棩璧凤紝涓�鑸繚瀛樹竴涓湀锛屼互澶囧楠屻��</span><br>
+ <span>The sample shall be reserved for one month beginning from the data when this test report is submitted for examine or review.</span>
+ </div>
+ </div>
+ <div class="statement-footer">
+ <div class="depart">
+ <span>姹熻嫃涓ぉ绉戞妧鑲′唤鏈夐檺鍏徃妫�娴嬩腑蹇�</span><br>
+ <span>Test Center of Jiangsu Zhongtian Technology Co., LTD</span>
+ </div>
+ <div class="address">
+ <span>鍦� 鍧�锛氭睙鑻忕渷鍗楅�氬競缁忔祹鎶�鏈紑鍙戝尯鏂板紑鍗楄矾19鍙�</span><br>
+ <span>Address: No.19 Xinkai South Road, Nantong Economic and Technological Development Zone, Jiangsu Province</span>
+ </div>
+ <div class="zipcode">閭斂缂栫爜Zip Code锛�226010</div>
+ <div class="tel">鐢� 璇漈el锛�0513-89059043</div>
+ <div class="email">閭� 绠盓-mail:锛歾tttc@chinaztt.com </div>
+ </div>
+ </div>
+ <div class="pageTwo">
+ <div class="header" style="line-height: 10px;">
+ <div style="width: 350px;margin: 0 auto; text-align-last: justify;">
+ <h2 style="font-size: 18px;">姹熻嫃涓ぉ绉戞妧鑲′唤鏈夐檺鍏徃妫�娴嬩腑蹇�</h2>
+ </div>
+ <div style="width: 500px; margin: 0 auto;text-align-last: justify;">
+ <h2 style="font-size: 14px;">TEST CENTER OF JIANGSU ZHONGTIAN TECHNOLOGY CO.,LTD</h2>
+ </div>
+ <div style="width: 120px;margin: 0 auto;text-align-last: justify;">
+ <h2 style="font-size: 18px;">妫�娴嬫姤鍛�</h2>
+ </div>
+ <div style="width: 100px; margin: 0 auto;text-align-last: justify;">
+ <h2 style="font-size: 14px;">Test Report</h2>
+ </div>
+ </div>
+ <div class="table">
+ <div class="table-header">
+ <div>
+ <span>鎶ュ憡缂栧彿锛�</span><br>
+ <span>Reference No锛�</span>
+ </div>
+ <div>
+ <span>绗�1椤靛叡2椤�</span><br>
+ <span>Page 1 of 2</span>
+ </div>
+ </div>
+ <div class="table-body">
+ <table width="100%" border="1" cellspacing="0" style="text-align: center;">
+ <tr>
+ <td><span>璇曟牱鍚嶇О</span><br>
+ <span>Name of product</span></td>
+ <td colspan="2"></td>
+ <td>
+ <span>瑙勬牸鍨嬪彿</span><br>
+ <span>Type and size</span>
+ </td>
+ <td colspan="2"></td>
+ </tr>
+ <tr>
+ <td>
+ <span>鏍峰搧鏁伴噺</span><br>
+ <span>Test item</span>
+ </td>
+ <td colspan="2"></td>
+ <td>
+ <span>妫�楠岄」鐩�</span><br>
+ <span>Test item</span>
+ </td>
+ <td colspan="2"></td>
+ </tr>
+ <tr>
+ <td>
+ <span>鏉ユ牱鏂瑰紡</span><br>
+ <span>Delivering method</span>
+ </td>
+ <td colspan="2"></td>
+ <td>
+ <span>妫�楠岀被鍨�</span><br>
+ <span>Type of test</span>
+ </td>
+ <td colspan="2"></td>
+ </tr>
+ <tr>
+ <td>
+ <span>鏍峰搧鐘舵��</span><br>
+ <span>Sample discription</span>
+ </td>
+ <td colspan="2"></td>
+ <td>
+ <span>鐢熶骇鍗曚綅</span><br>
+ <span>Producer</span>
+ </td>
+ <td colspan="2"></td>
+ </tr>
+ <tr>
+ <td>
+ <span>鏀舵牱鏃堕棿</span><br>
+ <span>Received date</span>
+ </td>
+ <td colspan="2"></td>
+ <td>
+ <span>妫�楠屾棩鏈�</span><br>
+ <span>Test date</span>
+ </td>
+ <td colspan="2"></td>
+ </tr>
+ <tr>
+ <td>
+ <span>濮旀墭浜�</span><br>
+ <span>Consignor</span>
+ </td>
+ <td colspan="2"></td>
+ <td>
+ <span>鐢佃瘽</span><br>
+ <span>Tel</span>
+ </td>
+ <td colspan="2"></td>
+ </tr>
+ <tr>
+ <td>
+ <span>濮旀墭鍗曚綅</span><br>
+ <span>Client</span>
+ </td>
+ <td colspan="5"></td>
+ </tr>
+ <tr>
+ <td>
+ <span>濮旀墭鍗曚綅鍦板潃</span><br>
+ <span>Address</span>
+ </td>
+ <td colspan="5"></td>
+ </tr>
+ <tr>
+ <td>
+ <span>妫�楠岀幆澧�</span><br>
+ <span>Test environment</span>
+ </td>
+ <td colspan="5"></td>
+ </tr>
+ <tr>
+ <td>
+ <span>妫�楠屼緷鎹�</span><br>
+ <span>Test standard</span>
+ </td>
+ <td colspan="5"></td>
+ </tr>
+ <tr>
+ <td style="height: 180px;">
+ <span>缁撹</span><br>
+ <span>Conclusion </span>
+ </td>
+ <td colspan="5">
+ <div style="height: 120px;"></div>
+ <div style="height: 60px;margin-left: 250px;">
+ <span>锛堟娴嬫姤鍛婁笓鐢ㄧ珷锛�</span><br>
+ <span>( SPECIFIC STAMP FOR TEST RTORT) </span><br>
+ <span>绛惧彂鏃ユ湡锛� 骞� 鏈� 鏃�</span><br>
+ <span>Date of issue: August 23, 2023</span>
+ </div>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <span>澶囨敞</span><br>
+ <span>Remark </span>
+ </td>
+ <td colspan="5"></td>
+ </tr>
+ <tr>
+ <td>
+ <span>缂栧埗</span><br>
+ <span>Preparer</span>
+ </td>
+ <td colspan="2"></td>
+ <td>
+ <span>妫�楠�</span><br>
+ <span>Tester</span>
+ </td>
+ <td colspan="2"></td>
+ </tr>
+ <tr>
+ <td>
+ <span>瀹℃牳</span><br>
+ <span>Checker </span>
+ </td>
+ <td colspan="2"></td>
+ <td>
+ <span>鎵瑰噯</span><br>
+ <span>Approver</span>
+ </td>
+ <td colspan="2"></td>
+ </tr>
+ </table>
+ </div>
+ </div>
+ </div>
+ <div class="pageThree">
+ <div class="header" style="line-height: 10px;">
+ <div style="width: 350px;margin: 0 auto; text-align-last: justify;">
+ <h2 style="font-size: 18px;">姹熻嫃涓ぉ绉戞妧鑲′唤鏈夐檺鍏徃妫�娴嬩腑蹇�</h2>
+ </div>
+ <div style="width: 500px; margin: 0 auto;text-align-last: justify;">
+ <h2 style="font-size: 14px;">TEST CENTER OF JIANGSU ZHONGTIAN TECHNOLOGY CO.,LTD</h2>
+ </div>
+ <div style="width: 120px;margin: 0 auto;text-align-last: justify;">
+ <h2 style="font-size: 18px;">妫�娴嬫姤鍛�</h2>
+ </div>
+ <div style="width: 100px; margin: 0 auto;text-align-last: justify;">
+ <h2 style="font-size: 14px;">Test Report</h2>
+ </div>
+ </div>
+ <div class="table">
+ <div class="table-header">
+ <div>
+ <span>鎶ュ憡缂栧彿锛�</span><br>
+ <span>Reference No锛�</span>
+ </div>
+ <div>
+ <span>绗�2椤靛叡2椤�</span><br>
+ <span>Page 2 of 2</span>
+ </div>
+ </div>
+ <div class="table-body">
+ <table width="100%" border="1" cellspacing="0" style="text-align: center;">
+ <tr>
+ <td colspan="4">
+ <span>鏍峰搧缂栧彿</span><br>
+ <span>Sample No</span></td>
+ <td colspan="3"></td>
+ <td colspan="4">
+ <span>瑙勬牸鍨嬪彿</span><br>
+ <span>Type</span>
+ </td>
+ <td colspan="3"></td>
+ </tr>
+ <tr>
+ <td>
+ <span>搴忓彿</span><br>
+ <span>No</span>
+ </td>
+ <td colspan="3">
+ <span>妫�楠岄」鐩�</span><br>
+ <span>Test item</span>
+ </td>
+ <td>
+ <span>鍗曚綅</span><br>
+ <span>Unit</span>
+ </td>
+ <td colspan="3">
+ <span>鏍囧噯瑕佹眰</span><br>
+ <span>Requirement</span>
+ </td>
+ <td colspan="3">
+ <span>妫�楠岀粨鏋�</span><br>
+ <span>Test result</span>
+ </td>
+ <td>
+ <span>缁撹</span><br>
+ <span>Conclusion</span>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <span></span><br>
+ <span></span>
+ </td>
+ <td colspan="3">
+ <span>鏍峰搧鏍囪瘑</span><br>
+ <span>Sample labeling</span>
+ </td>
+ <td>
+ <span></span><br>
+ <span>I</span>
+ </td>
+ <td colspan="3">
+ <span></span><br>
+ <span></span>
+ </td>
+ <td colspan="3">
+ <span></span><br>
+ <span></span>
+ </td>
+ <td>
+ <span></span><br>
+ <span></span>
+ </td>
+ </tr>
+ <tr v-for="item in resultTable" :key="index">
+ <td>
+ <span>{{ item.id }}</span><br>
+ </td>
+ <td colspan="3">
+ <span>{{ item.testitem }}</span><br>
+ <span>{{ item.testitem_engName }}</span>
+ </td>
+ <td>
+ <span>{{ item.unit }}</span>
+ </td>
+ <td colspan="3">
+ <span>{{ item.requirement }}</span><br>
+ <span>{{ item.requirement_eng }}</span>
+ </td>
+ <td colspan="3">
+ <span>{{ item.testresult }}</span><br>
+ <span>{{ item.testresult_engName }}</span>
+ </td>
+ <td>
+ <span>{{ item.conclusion }}</span>
+ </td>
+ </tr>
+
+ </table>
+ </div>
+ </div>
+ </div>
+ <div class="pageFour">
+ <div class="page-header" style="display: flex;justify-content: space-between;font-size: 12px;">
+ <div>
+ <span>鎶ュ憡缂栧彿锛�</span><br>
+ <span>Reference No锛�</span>
+ </div>
+ <div>
+ <span>闄勯〉</span><br>
+ <span>Appenfix</span>
+ </div>
+ </div>
+ <hr>
+ <div class="table">
+ <div class="table-header">
+ <div style="width: 200px; margin: 0 auto;text-align-last: justify;"><h2>妫�楠岃澶囦竴瑙堣〃</h2></div>
+ <div style="text-align-last: center;"><h2 style="font-size: 14px;">Equipment List</h2></div>
+ </div>
+ <div class="table-body">
+ <table width="100%" border="1" cellspacing="0" style="text-align: center;">
+ <thead>
+ <tr>
+ <td>
+ <span>搴忓彿</span><br>
+ <span>No</span>
+ </td>
+ <td colspan="2">
+ <span>璁惧鍚嶇О</span><br>
+ <span>Equipment name</span>
+ </td>
+ <td>
+ <span>璁惧鍨嬪彿</span><br>
+ <span>type</span>
+ </td>
+ <td colspan="2">
+ <span>缂栧彿</span><br>
+ <span>Factory number</span>
+ </td>
+ <td colspan="2">
+ <span>鏍″噯鏈夋晥鏈�</span><br>
+ <span>Date of validity</span>
+ </td>
+ </tr>
+ </thead>
+ <tr v-for="item in table" :key="index">
+ <td>
+ <span>{{ item.id }}</span>
+ </td>
+ <td colspan="2">
+ <span>{{ item.equipment_name }}</span>
+ </td>
+ <td>
+ <span>{{ item.type }}</span><br>
+ </td>
+ <td colspan="2">
+ <span>{{ item.factory_number }}</span>
+ </td>
+ <td colspan="2">
+ <span>{{ item.validity }}</span>
+ </td>
+ </tr>
+
+ </table>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</template>
+
+<script>
+export default {
+ props:{
+
+ },
+ data(){
+ return {
+ resultTable:[
+ {
+ id: '1',
+ testitem: '鍘熷鎷変几',
+ testitem_engName: 'Primitive strength',
+ unit: 'MPa',
+ requirement: '鏈�灏�10.0',
+ requirement_eng: 'Minimun 10.0',
+ testresult: '',
+ testitem_engName: ''
+ }
+ ],
+ table:[{
+ id: 1,
+ equipment_name: '鎷栨媺鏈�',
+ type: 1,
+ factory_number: 'Akjgfewof',
+ validity:'2023.8.25~2023.8.27'
+ }]
+ }
+ }
+}
+</script>
+
+<style lang="scss" scoped>
+.content-wrapper{
+ background-color: #f0f2f5;
+ width: 100%;
+ height: 100vh;
+ overflow-y: auto;
+ .content-main{
+ margin: -50px auto;
+ width: 50%;
+ // background-color: #fff;
+ // background-color: #bfa;
+ .cover{
+ margin: 80px 0px;
+ padding:0px 50px;
+ height: 1200px;
+ background-color: #fff;
+ box-shadow: 0px 0px 4px rgba(0, 0, 0, 0.2);
+ .cover-top{
+ display: flex;
+ justify-content: end;
+ font-size: 20px;
+ margin-right: 50px;
+ padding-top: 50px;
+ // font-weight: bold;
+ }
+ .title{
+ margin-top: 100px;
+ padding: 0px 220px;
+ text-align: center;
+ font-size: 25px;
+ }
+ .cover-body{
+ font-size: 25px;
+ margin: 100px 80px;
+ .name{
+ // background-color: #bfa;
+ display: flex;
+ justify-content: space-between;
+ margin-bottom: 20px;
+ .line{
+ width: 500px;
+ border-bottom: solid 1px black;
+ text-align: center;
+ // height: 60px;
+ line-height: 60px;
+ }
+ }
+ }
+ .cover-footer{
+ text-align: center;
+ margin-top: 200px;
+ span{
+ font-size: 23px;
+ height: 40px;
+ line-height: 40px;
+ }
+ }
+ }
+ .pageOne{
+ margin-top: -50px;
+ background-color: #fff;
+ box-shadow: 0px 0px 4px rgba(0, 0, 0, 0.2);
+ padding:50px 100px;
+ height: 1200px;
+ .statement{
+ margin: 0 auto;
+ width: 100px;
+ text-align-last: justify;
+ }
+ .statement-body{
+ line-height: 32px;
+ text-align: justify;
+ margin: 30px 0px;
+ font-size: 12px;
+ }
+ .statement-footer{
+ line-height: 30px;
+ font-size: 12px;
+ }
+ }
+ .pageTwo{
+ margin-top: 30px;
+ background-color: #fff;
+ box-shadow: 0px 0px 4px rgba(0, 0, 0, 0.2);
+ padding:50px 60px;
+ height: 1200px;
+ .table{
+ margin-top: 20px;
+ .table-header{
+ display: flex;
+ justify-content: space-between;
+ font-size: 14px;
+ line-height: 20px;
+ }
+ .table-body{
+ font-size: 12px;
+ table td{
+ width: 150px;
+ height: 52px;
+ }
+ }
+ }
+ }
+ .pageThree{
+ margin-top: 30px;
+ background-color: #fff;
+ box-shadow: 0px 0px 4px rgba(0, 0, 0, 0.2);
+ padding:50px 60px;
+ height: 1200px;
+ .table{
+ margin-top: 20px;
+ .table-header{
+ display: flex;
+ justify-content: space-between;
+ font-size: 14px;
+ line-height: 20px;
+ }
+ .table-body{
+ font-size: 12px;
+ table td{
+ width: 8%;
+ height: 52px;
+ }
+ }
+ }
+ }
+ .pageFour{
+ margin-top: 30px;
+ background-color: #fff;
+ box-shadow: 0px 0px 4px rgba(0, 0, 0, 0.2);
+ padding:50px 60px;
+ height: 1200px;
+ .table{
+ margin-top: 50px;
+ .table-header{
+ line-height: 20px;
+ }
+ .table-body{
+ margin-top: 20px;
+ font-size: 12px;
+ table td{
+ width: 80px;
+ height: 52px;
+ }
+ }
+ }
+ }
+
+ }
+}
+</style>
\ No newline at end of file
--
Gitblit v1.9.3