From 41e0df8413624e6034c967f3afae30da59370879 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期一, 11 十二月 2023 16:20:15 +0800
Subject: [PATCH] modified: src/components/verifition/Verify/VerifyPoints.vue modified: src/const/crud/admin/sys-public-param.js modified: src/page/full-screen/fullScreenPlus.vue modified: src/page/index/logo.vue modified: src/page/index/sidebar/sidebarItem.vue modified: src/page/login/index.vue modified: src/page/login/thirdpartylogin.vue modified: src/util/elAttr.js modified: src/views/accounting/unitworkfactor/unitworkfactor-form.vue modified: src/views/accounting/unitworkfactor/updateQuota-form.vue modified: src/views/basic/discmaintenance/discmaintenance-form.vue modified: src/views/basic/log/index.vue modified: src/views/basic/part/part-form.vue modified: src/views/basic/part/print-label-form.vue modified: src/views/basic/poc/index.vue modified: src/views/basic/tabletest/index.vue modified: src/views/basic/template/index.vue modified: src/views/basic/template/template-form.vue modified: src/views/basic/workstation/workstation-form.vue modified: src/views/common/custom-table.vue modified: src/views/common/documentDetail.vue modified: src/views/common/operationParamTemplate.vue modified: src/views/common/rawMaterial-part.vue modified: src/views/common/search-select.vue modified: src/views/common/ztt-table.vue modified: src/views/huawei/code19bind/list.vue modified: src/views/huawei/code19gen/form.vue modified: src/views/huawei/grossweightcode/list.vue modified: src/views/huawei/grossweightcode/task-secret-form.vue modified: src/views/oa/JiegouModal.vue modified: src/views/oa/PeizhiModal.vue modified: src/views/oa/technology-document-new.vue modified: src/views/oa/technology-document.vue modified: src/views/plan/customer/index.vue modified: src/views/plan/customerorder/confirm-pull-customerorder.vue modified: src/views/plan/customerorder/customerorder-config-history.vue modified: src/views/plan/customerorder/customerorder-form.vue modified: src/views/plan/customerorder/customerorder-return.vue modified: src/views/plan/customerorder/customerorder-ztt-table.vue modified: src/views/plan/customerorder/index.vue modified: src/views/plan/customerorder/other-customer-order-line.vue modified: src/views/plan/customerorder/sample-customerorder-form.vue modified: src/views/plan/customerorder/schedule-table.vue modified: src/views/plan/manufacturingorder/auto-operationtask.vue modified: src/views/plan/manufacturingorder/customerorder.vue modified: src/views/plan/manufacturingorder/customize-param-template.vue modified: src/views/plan/manufacturingorder/order-operation-form.vue modified: src/views/plan/manufacturingorder/productorder-form.vue modified: src/views/plan/manufacturingorderapply/index.vue modified: src/views/plan/masterproductionschedule/auto-manufacturingorder.vue modified: src/views/plan/operationtask/gantt.vue modified: src/views/plan/operationtask/operationtask-form.vue modified: src/views/plan/operationtask/task-material.vue modified: src/views/plan/productionschedul/index.vue modified: src/views/plan/productionschedul/template-form.vue modified: src/views/plan/schedule/gantt.vue modified: src/views/plan/schedulelookover/ganttview.vue modified: src/views/plan/segmentmerge/index.vue modified: src/views/plan/segmentmerge/operate-dialog.vue modified: src/views/plan/segmentmerge/operation-technology-form.vue modified: src/views/product/dutyrecord/index.vue modified: src/views/product/producttraceability/index.vue modified: src/views/product/producttraceability/traceability-diagram.vue modified: src/views/product/workbench/batchproductout-form-new.vue modified: src/views/product/workbench/batchproductout-form.vue modified: src/views/product/workbench/feed-form.vue modified: src/views/product/workbench/feed-pane.vue modified: src/views/product/workbench/feed-tab.vue modified: src/views/product/workbench/handymantype.vue modified: src/views/product/workbench/index.vue modified: src/views/product/workbench/mould-pane.vue modified: src/views/product/workbench/operation-task-pane.vue modified: src/views/product/workbench/product-record-form.vue modified: src/views/product/workbench/productout-form-by-batch.vue modified: src/views/product/workbench/productout-form.vue modified: src/views/product/workbench/productrecord-tab.vue modified: src/views/product/workbench/producttracking-tab.vue modified: src/views/product/workbench/shift-productout-form.vue modified: src/views/product/workbench/splitTaskForm.vue modified: src/views/product/workbench/taskinfo-pane.vue modified: src/views/quality/Packaging_ledger/pack-from.vue modified: src/views/quality/apply/index.vue modified: src/views/quality/exception/exception.vue modified: src/views/quality/exception/index.vue modified: src/views/quality/finishedProductInspection/finishedProduct-form.vue modified: src/views/quality/finishedProductInspection/finishedProduct-print.vue modified: src/views/quality/finishedProductInspection/finishedProducter-print.vue modified: src/views/quality/finishedProductInspection/index.vue modified: src/views/quality/newReport/ReportForm.vue modified: src/views/quality/processInspect/index.vue modified: src/views/quality/processInspect/processInspect-form.vue modified: src/views/quality/processconfiguration/index.vue modified: src/views/quality/processconfiguration/table-form.vue modified: src/views/quality/rawMaterial/QrcodeReader.vue modified: src/views/quality/rawMaterial/index.vue modified: src/views/quality/rawMaterial/rawMaterial-form.vue modified: src/views/quality/report/index.vue modified: src/views/quality/standardbind/standardbind-form.vue modified: src/views/quality/statistics/rateChart.vue modified: src/views/quality/testitemlayout/index.vue modified: src/views/quality/testplan/testplan-form.vue modified: src/views/quality/unqualifiedprocess/examineApproveform.vue modified: src/views/quality/unqualifiedprocess/index.vue modified: src/views/quality/unqualifiedprocess/loaction-form.vue modified: src/views/quality/unqualifiedprocess/unqualifiedprocessform.vue modified: src/views/technology/completeproductstructure/completeproductstructure-form.vue modified: src/views/technology/document/checkStandardTable.vue modified: src/views/technology/document/document-form.vue modified: src/views/technology/document/extendsOperation.vue modified: src/views/technology/document/extendsTestStandard.vue modified: src/views/technology/document/extendsTestStandardParam.vue modified: src/views/technology/document/teststandard.vue modified: src/views/technology/structure/single-structure-form.vue modified: src/views/warehouse/changestock/index.vue modified: src/views/warehouse/check/check-detail.vue modified: src/views/warehouse/pallettransports/ifslocation-form.vue modified: src/views/warehouse/pallettransports/ifsstock-form.vue modified: src/views/warehouse/pallettransports/index.vue modified: src/views/warehouse/returnstock/ifslocation-form.vue modified: src/views/warehouse/returnstock/index.vue modified: src/views/warehouse/returnstock/returnstock-form.vue modified: src/views/warehouse/returnstock/stock-part.vue modified: src/views/warehouse/stock/print-label-form.vue modified: src/views/warehouse/stock/small-print-label-form.vue modified: src/views/warehouse/stock/small-warehousing-label-form.vue modified: src/views/warehouse/stock/stock-table.vue modified: src/views/warehouse/stock/warehousing-label-form.vue modified: src/views/zte/pkgidbind/index.vue
---
src/views/quality/finishedProductInspection/finishedProducter-print.vue | 510 +++++++++++++++++++++++++++++++++-----------------------
1 files changed, 298 insertions(+), 212 deletions(-)
diff --git a/src/views/quality/finishedProductInspection/finishedProducter-print.vue b/src/views/quality/finishedProductInspection/finishedProducter-print.vue
index 9fdd394..e4755d6 100644
--- a/src/views/quality/finishedProductInspection/finishedProducter-print.vue
+++ b/src/views/quality/finishedProductInspection/finishedProducter-print.vue
@@ -1,154 +1,158 @@
<template>
- <div id="20230721_24921" align=center x:publishsource="Excel" style="margin-top: 60pt;margin-left: 20pt;">
- <table border=0 cellpadding=0 cellspacing=0 width=1194 style='border-collapse:collapse;table-layout:fixed;width:629pt'>
- <tr class=xl6524921 height=20 style='mso-height-source:userset;height:30.0pt'>
- <td colspan=3 rowspan=2 height=40 width=122 style='width:150pt;border: 1pt solid windowtext'>
- <span style='mso-ignore:vglayout;margin-left:12px;margin-top:14px;width:104px;height:42px'>
- <img width=174 height=58 src="../../../../public/img/image001.jpg">
- </span>
+<div class="WordSection1" align=center style="word-wrap:break-word;text-justify-trim:punctuation">
+ <div align="center" >
+ <table style="border-collapse:collapse;table-layout:fixed;page-break-after: always;margin-top: 0px;" width="629">
+ <tr class="xl6524921" height=20 style='mso-height-source:userset;height:30.0pt'>
+ <td colspan=3 rowspan=2 style='width:160pt;height: 60pt;border: 1pt solid windowtext'>
+ <span style='mso-ignore:vglayout;margin-left:12px;margin-top:14px;width:104px;height:42px'>
+ <img width=174 height=58 src="../../../../public/img/image001.jpg">
+ </span>
+ </td>
+ <td colspan=6 class="xl6624921" style='border-right:.5pt solid black;border-left:none;width:380pt;height: 60pt'>璁板綍鍚嶇О:杩炴帴鍣ㄥ強鎴愬搧妫�楠岃褰曡〃</td>
+ <td colspan=3 class="xl6624921" style='border-left:none;width: 160pt;height: 60pt'>淇濆瓨鏈熼檺:25骞�</td>
+ <td rowspan=2 colspan=3 class="xl6824921" style='width:136pt;height: 60pt' >鐗堟湰鍙�: A/0</td>
+ </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'>
+ 璁板綍缂栧彿:{{ tableData.finInsNo }}
+ </td>
+ <td colspan=3 class=xl6624921 style='border-top:none;border-left:none'>
+ 褰掓。閮ㄩ棬:璐ㄩ噺淇濊瘉閮�
+ </td>
+ <td colspan=2 class=xl6824921 style='border-top:none'></td>
+ </tr>
+ <tr class="xl6524921" style='mso-height-source:userset;height:25.05pt'>
+ <td colspan=16 class=xl7424921 width=1194 style='height:25.05pt; width:897pt'>
+ 杩炴帴鍣ㄥ強鎴愬搧妫�楠岃褰曡〃
+ </td>
+ </tr>
+ <tr class="xl6524921" style='mso-height-source:userset;height:40.05pt'>
+ <td colspan=2 class="xl7624921" style='border-right:.5pt solid black; height:40.05pt'>
+ 椤圭洰鍚嶇О:
+ </td>
+ <td colspan=5 class="xl6624921" style='border-right:.5pt solid black; border-left:none'>銆�
+ <p class="MsoNormal" align="center" style="text-align:center">
+ <span lang="EN-US" style="font-family:"Arial",sans-serif" v-text="deviceStr"></span>
+ </p>
</td>
- <td colspan=6 class=xl6624921 width=399 style='border-right:.5pt solid black;border-left:none;width:250pt'>璁板綍鍚嶇О:杩炴帴鍣ㄥ強鎴愬搧妫�楠岃褰曡〃</td>
- <td colspan=3 class=xl6624921 width=226 style='border-left:none;width: 150pt'>淇濆瓨鏈熼檺:25骞�</td>
- <td rowspan=2 colspan=3 class=xl6824921 width=235 style='width:126pt' >鐗堟湰鍙�: A/0</td>
- </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锛圓/0)
- </td>
- <td colspan=3 class=xl6624921 style='border-top:none;border-left:none'>
- 褰掓。閮ㄩ棬:璐ㄩ噺淇濊瘉閮�
- </td>
- <td colspan=2 class=xl6824921 style='border-top:none'></td>
- </tr>
- <tr class=xl6524921 height=33 style='mso-height-source:userset;height:25.05pt'>
- <td colspan=16 height=33 class=xl7424921 width=1194 style='height:25.05pt; width:897pt'>
- 杩炴帴鍣ㄥ強鎴愬搧妫�楠岃褰曡〃
- </td>
- </tr>
- <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=5 class=xl6624921 style='border-right:.5pt solid black; border-left:none'>銆�
+ <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'>{{ tableData.dname }}
+ 銆� </td>
+ </tr>
+ <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=4 class="xl6624921" style='border-right:.5pt solid black; border-left:none'>
+ <p class="MsoNormal" align="center" style="text-align:center">
+ <span lang="EN-US" style="font-family:"Arial",sans-serif" v-text="product"></span>
+ </p>
+ </td>
+ <td colspan=2 class="xl6924921" style='border-top:none;border-left:none'>浜у搧鍨嬪彿:</td>
+ <td colspan=3 class="xl6624921" style='border-right:.5pt solid black; border-left:none'>
<p class="MsoNormal" align="center" style="text-align:center">
- <span lang="EN-US" style="font-family:"Arial",sans-serif" v-text="deviceStr"></span>
+ <span lang="EN-US" style="font-family:"Arial",sans-serif" v-text="typedata"></span>
</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>
- </tr>
- <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=4 class=xl6624921 style='border-right:.5pt solid black; border-left:none'>
+ <td colspan=2 class="xl6924921" style='border-top:none;border-left:none'>浜у搧鏁伴噺:</td>
+ <td colspan=3 class="xl6624921" style='border-right:.5pt solid black; border-left:none'>
<p class="MsoNormal" align="center" style="text-align:center">
- <span lang="EN-US" style="font-family:"Arial",sans-serif" v-text="product"></span>
+ <span lang="EN-US" style="font-family:"Arial",sans-serif" v-text="number"></span>
</p>
</td>
- <td colspan=2 class=xl6924921 style='border-top:none;border-left:none'>浜у搧鍨嬪彿:</td>
- <td colspan=3 class=xl6624921 style='border-right:.5pt solid black; border-left:none'>
- <p class="MsoNormal" align="center" style="text-align:center">
- <span lang="EN-US" style="font-family:"Arial",sans-serif" v-text="typedata"></span>
- </p>
- </td>
- <td colspan=2 class=xl6924921 style='border-top:none;border-left:none'>浜у搧鏁伴噺:</td>
- <td colspan=3 class=xl6624921 style='border-right:.5pt solid black; border-left:none'>
- <p class="MsoNormal" align="center" style="text-align:center">
- <span lang="EN-US" style="font-family:"Arial",sans-serif" v-text="number"></span>
- </p>
- </td>
- </tr>
+ </tr>
- <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=14 class=xl6624921 style='border-right:.5pt solid black; border-left:none'>
- 妫�楠岀粨鏋�
- </td>
- </tr>
+ <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=14 class=xl6624921 style='border-right:.5pt solid black; border-left:none'>
+ 妫�楠岀粨鏋�
+ </td>
+ </tr>
- <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'>
- <td colspan=3 height=53 class=xl7624921 style='border-right:.5pt solid black;height:40.05pt'>
- 妫�楠岃姹�
- </td>
- <td colspan=1 class=xl6624921 style='border-right:.5pt solid black;border-left:none'>
- 鏍囧噯鍊�
- </td>
- <td colspan=1 v-for="a in 9" class=xl6624921 style='border-right:.5pt solid black; border-left:none'>
- {{a>9?item:'0'+a}}
- </td>
- <td colspan=2 class=xl6624921 style='border-right:.5pt solid black;border-left:none'>
- 鍒ゅ畾
- </td>
- </tr>
+ <tr class="xl6524921" height=53 style='mso-height-source:userset;height:40.05pt'>
+ <td colspan=3 height=53 class=xl7624921 style='border-right:.5pt solid black;height:40.05pt'>
+ 妫�楠岃姹�
+ </td>
+ <td colspan=1 class=xl6624921 style='border-right:.5pt solid black;border-left:none'>
+ 鏍囧噯鍊�
+ </td>
+ <td colspan=1 v-for="a in columnLength" class=xl6624921 style='border-right:.5pt solid black; border-left:none'>
+ {{a>9?item:'0'+a}}
+ </td>
+ <td colspan=2 class=xl6624921 style='border-right:.5pt solid black;border-left:none'>
+ 鍒ゅ畾
+ </td>
+ </tr>
- <tbody v-for="(item,index) in prjdata" :key="index">
- <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'>
- <td rowspan=16 height=53 class=xl7624921 style='border-right:.5pt solid black; height:40.05pt'>
- <p class="MsoNormal" align="center" style="text-align:centerdisplay:flex ;">
- <span style="font-family:瀹嬩綋; writing-mode: vertical-rl;">{{item.father}}</span>
- </p>
- </td>
- <td colspan=2 class=xl6624921 style='border-right:.5pt solid black;border-left:none'>
- <span style="font-family:瀹嬩綋">{{item.children[0].iname}}</span>
- </td>
- <td colspan=1 class=xl6624921 style='border-right:.5pt solid black;border-left:none'>
- <span style="font-family:瀹嬩綋">{{item.children[0].required}}</span>
- </td>
- <td colspan=1 v-for="(val,index) in item.children[0].testValueList" class=xl6624921 style='border-right:.5pt solid black;border-left:none'>
- <span style="font-family:瀹嬩綋">{{val}}</span>
- </td>
+ <tbody v-for="(item,index) in prjdata" :key="index">
+ <tr class="xl6524921" height=53 style='mso-height-source:userset;height:40.05pt'>
+ <td :rowspan="item.children.length" height=53 class=xl7624921 style='border-right:.5pt solid black; height:40.05pt'>
+ <p >
+ <span style=" writing-mode: vertical-rl;font-size: 26pt;">{{item.father}}</span>
+ </p>
+ </td>
+ <td colspan=2 class=xl6624921 style='border-right:.5pt solid black;border-left:none'>
+ <span style="font-family:瀹嬩綋">{{item.children[0].iname}}</span>
+ </td>
+ <td colspan=1 class=xl6624921 style='border-right:.5pt solid black;border-left:none'>
+ <span style="font-family:瀹嬩綋">{{item.children[0].required}}</span>
+ </td>
+ <td colspan=1 v-for="(val,index) in item.children[0].testValueList" class=xl6624921 style='border-right:.5pt solid black;border-left:none'>
+ <span style="font-family:瀹嬩綋">{{val}}</span>
+ </td>
- <td colspan=2 class=xl6624921 style='border-right:.5pt solid black; border-left:none'>
- <p v-if="item.children[0].iresult ==1" class="MsoNormal" align="center" style="text-align:center">
- <span lang="EN-US" style="font-family:"Arial",sans-serif">鍚堟牸</span></p>
- <p v-if="item.children[0].iresult ==0" class="MsoNormal" align="center" style="text-align:center">
- <span lang="EN-US" style="font-family:"Arial",sans-serif">涓嶅悎鏍�</span></p>
- </td>
- </tr>
- <tr class=xl6524921 height=53 v-for="(el,index) in (item.children.slice(1))" :key="index" style='mso-height-source:userset;height:40.05pt'>
- <td colspan=2 class=xl6624921 style='border-right:.5pt solid black;border-left:none'>
- <span style="font-family:瀹嬩綋">{{el.iname}}</span>
- </td>
- <td colspan=1 class=xl6624921 style='border-right:.5pt solid black;border-left:none'>
- <span style="font-family:瀹嬩綋">{{el.required}}</span>
- </td>
- <td colspan=1 v-for="(testValue,index) in el.testValueList" class=xl6624921 style='border-right:.5pt solid black;border-left:none'>
- <span style="font-family:瀹嬩綋">{{testValue}}</span>
- </td>
- <td colspan=2 class=xl6624921 style='border-right:.5pt solid black; border-left:none'>
- <p class="MsoNormal" align="center" style="text-align:center">
- <span lang="EN-US" style="font-family:"Arial",sans-serif">{{ el.iresult | formatState}}</span></p>
+ <td colspan=2 class=xl6624921 style='border-right:.5pt solid black; border-left:none'>
+ <p v-if="item.children[0].iresult ==1" class="MsoNormal" align="center" style="text-align:center">
+ <span lang="EN-US" style="font-family:"Arial",sans-serif">鍚堟牸</span></p>
+ <p v-if="item.children[0].iresult ==0" class="MsoNormal" align="center" style="text-align:center">
+ <span lang="EN-US" style="font-family:"Arial",sans-serif">涓嶅悎鏍�</span></p>
+ </td>
+ </tr>
+ <tr class="xl6524921" height=53 v-for="(el,index) in (item.children.slice(1))" :key="index" style='mso-height-source:userset;height:40.05pt'>
+ <td colspan=2 class=xl6624921 style='border-right:.5pt solid black;border-left:none'>
+ <span style="font-family:瀹嬩綋">{{el.iname}}</span>
+ </td>
+ <td colspan=1 class=xl6624921 style='border-right:.5pt solid black;border-left:none'>
+ <span style="font-family:瀹嬩綋">{{el.required}}</span>
+ </td>
+ <td colspan=1 v-for="(testValue,index) in el.testValueList" class=xl6624921 style='border-right:.5pt solid black;border-left:none'>
+ <span style="font-family:瀹嬩綋">{{testValue}}</span>
+ </td>
+ <td colspan=2 class=xl6624921 style='border-right:.5pt solid black; border-left:none'>
+ <p class="MsoNormal" align="center" style="text-align:center">
+ <span lang="EN-US" style="font-family:"Arial",sans-serif">{{ el.iresult | formatState}}</span></p>
-
- </td>
- </tr>
- </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> 妫�楠�/鏃堕棿:</p></td>
- <td colspan=8 height=53 class=xl7624921 style='border-right:.5pt solid black;
- height:40.05pt;text-align: left;'><p> 瀹℃壒:</p></td>
- </tr>
+
+ </td>
+ </tr>
+ </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> 妫�楠�/鏃堕棿:<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> 瀹℃壒:<span>{{username}}</span></p></td>
+ </tr>
- <tr height=0 style='display:none'>
- <td width=64 style='width:48pt'></td>
- <td width=58 style='width:44pt'></td>
- <td width=137 style='width:103pt'></td>
- <td width=262 style='width:197pt'></td>
- <td width=212 style='width:159pt'></td>
- <td width=226 style='width:170pt'></td>
- <td width=235 style='width:176pt'></td>
- </tr>
- </table>
- <div>
+ <tr height=0 style='display:none'>
+ <td width=64 style='width:48pt'></td>
+ <td width=58 style='width:44pt'></td>
+ <td width=137 style='width:103pt'></td>
+ <td width=262 style='width:197pt'></td>
+ <td width=212 style='width:159pt'></td>
+ <td width=226 style='width:170pt'></td>
+ <td width=235 style='width:176pt'></td>
+ </tr>
+ </table>
+
+ </div>
+ <div v-for="pel in prjdata">
<template>
- <div style="margin-top: 100pt;width: 75%;">
+ <div align="center" style="page-break-after: always;border-collapse:collapse;table-layout:fixed;page-break-after: always;" width="629">
+ <div >
<div class="head">
<div class="head-1">
<img width=174 height=58 src="../../../../public/img/image002.png">
@@ -162,18 +166,19 @@
<div class="bodycs">
<p class=x1111111><span>妫� 娴� 鎶� 鍛�<br>
<span class=x1111112 >Test Report</span><br>
- <p style=" border-top: 1px solid black;width: 96%;margin-top: -1px;"></p>
+ <p style=" border-top: 1px solid black;width: 900pt;margin-top: -1px;"></p>
</span></p>
</div>
- <div class="bodycs-1">
- <p style="margin-left: 40px;"><span style="font-size:12pt;font-family:榛戜綋">鎶ュ憡缂栧彿:锛圢o锛�: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: 180px;"><span style="font-size:12pt;font-family:榛戜綋">椤垫锛�1/8<br> Page</span></p>
+ <div style="margin-left:40pt">
+ <div class="bodycs-1">
+ <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">
<p ><span class=x1111112 style='margin-left: 40px;'>妫�楠岄」鐩�:<br> Test Item</span></p>
- <p v-for="pel in prjdata"><span class="ziti">{{pel.father}}</span><br><span style="display: block;height: 2px; width: 500px; background: rgb(20, 20, 22);margin-left: 80px;"></span></span></p>
+ <p ><span class="ziti">{{pel.father}}</span><br><span style="display: block;height: 2px; width: 500px; background: rgb(20, 20, 22);margin-left: 80px;"></span></span></p>
</div>
<div class="bodycs-3">
<p ><span class=x1111112 style='margin-left: 36px;'>鏍峰搧鍚嶇О:<br>Description</span></p>
@@ -185,47 +190,62 @@
</div>
<div class="bodycs-3">
<p ><span class=x1111112 style='margin-left: 36px;'>鏍峰搧鏁伴噺:<br>Quantity</span></p>
- <p v-for="pel in prjdata"><span class="ziti">{{quantity}}</span><br><span style="display: block;height: 2px; width: 500px; background: rgb(20, 20, 22);margin-left: 75px;"></span></span></p>
+ <p ><span class="ziti">{{quantity}}</span><br><span style="display: block;height: 2px; width: 500px; background: rgb(20, 20, 22);margin-left: 75px;"></span></span></p>
</div>
<div class="bodycs-3">
<p ><span class=x1111112 style='margin-left: 36px;'>妫�楠岀被鍒�:<br>Type of Test</span></p>
- <p v-for="pel in prjdata"><span class="ziti">浜у搧妫�楠�</span><br><span style="display: block;height: 2px; width: 500px; background: rgb(20, 20, 22);margin-left: 75px;"></span></span></p>
+ <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'> </span>
+ </div>
<div>
<div class="chilen">
<p ><span class="x1111113">鎵� 鍑�:<br> Approved by</span></p>
- <p v-for="pel in prjdata"><span class="time"></span><br><span style="display: block;height: 2px; width: 300px; background: rgb(20, 20, 22);margin-left: 75px;"></span></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>
</div>
<div class="chilen">
<p ><span class="x1111113">鏍搁獙鍛�:<br> Inspected by</span></p>
- <p v-for="pel in prjdata"><span class="time"></span><br><span style="display: block;height: 2px; width: 300px; background: rgb(20, 20, 22);margin-left: 75px;"></span></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>
</div>
<div style="display: flex;margin-left: 280px;">
<p ><span class="x1111113">妫�楠屽憳锛�<br> Tested by</span></p>
<p ><span class="time">{{username}}</span><br><span style="display: block;height: 2px; width: 300px; background: rgb(20, 20, 22);margin-left: 75px;"></span></span></p>
</div>
+ <div>
+ <br>
+ <br>
+ <span
+ style='mso-spacerun:yes'> </span>
+ </div>
<div class="cldata">
<p ><span class="x1111113">閫佹牱鏃ユ湡:<br>Delivery Date</span></p>
- <p v-for="pel in prjdata"><span class="time">{{tableData.updateTime}}</span><br><span style="display: block;height: 2px; width: 300px; background: rgb(20, 20, 22);margin-left: 75px;"></span></span></p>
+ <p ><span class="time">{{tableData.updateTime}}</span><br><span style="display: block;height: 2px; width: 300px; background: rgb(20, 20, 22);margin-left: 75px;"></span></span></p>
</div>
<div class="cldata">
<p ><span class="x1111113">娴嬭瘯鏃ユ湡:<br>Testing Date</span></p>
- <p v-for="pel in prjdata"><span class="time">{{tableData.createTime}}</span><br><span style="display: block;height: 2px; width: 300px; background: rgb(20, 20, 22);margin-left: 75px;"></span></span></p>
+ <p ><span class="time">{{tableData.createTime}}</span><br><span style="display: block;height: 2px; width: 300px; background: rgb(20, 20, 22);margin-left: 75px;"></span></span></p>
</div>
+ </div>
</div>
</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>
</div>
</div>
+ </div>
</template>
<template>
- <div style="margin-top: 100pt;width: 75%;">
+ <div style="page-break-after: always;">
+ <div >
<div class="head">
<div class="head-1">
<img width=174 height=58 src="../../../../public/img/image002.png">
@@ -241,7 +261,7 @@
<span class=x1111112 >Test Report</span><br>
</span></p>
<div class="bodycs-1">
- <p style="margin-left: 40px;"><span style="font-size:12pt;font-family:榛戜綋">鎶ュ憡缂栧彿:锛圢o锛�: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>
@@ -262,16 +282,26 @@
</div>
</div>
</div>
+ <div>
+ <br>
+ <br>
+ <br>
+ <br><br><br>
+ <span
+ style='mso-spacerun:yes'> </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>
</div>
+ </div>
</template>
<template>
- <div style="margin-top: 100pt;width: 75%;">
+ <div style="page-break-after: always;" >
+ <div >
<div class="head">
<div class="head-1">
<img width=174 height=58 src="../../../../public/img/image002.png">
@@ -285,47 +315,64 @@
<div class="bodycs">
<p class=x1111111><span>妫� 娴� 鎶� 鍛�<br>
<span class=x1111112 >Test Report</span><br>
+ <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:榛戜綋">鎶ュ憡缂栧彿:锛圢o锛�: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=" border-top: 1px solid black;width: 96%;margin-top: -1px;"></p>
- <p class="x1111113" ><span style="display: flex;margin-top: 40px;margin-left: 40px;">鎶ュ憡姝ｆ枃锛�</span></p>
+
+
+ <div>
+ <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: 40px;font-size:12pt;font-family:榛戜綋">妫�楠岄」鐩細<span style="width: 60px;"> {{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:榛戜綋"> <br>璁惧鍨嬪彿:{{ ela.specifications }}<br> Model</span></p>
+ <p style="padding-left: 100px;"><span style="font-size:12pt;font-family:榛戜綋"> <br>璁惧缂栧彿:{{ ela.code}}<br>Serial No.</span></p>
+ <p style="margin-left: 110px;"><span style="font-size:12pt;font-family:榛戜綋"> <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 class="bodycs" style="margin-top: 30px;">
- <p class=x1111112><span>{{iname}}<br>
+
+
+
+ <div style="display: flex;margin-top: 60px;">
+ <p ><span><span class=x1111112 style="margin-left: 40px;">2.鍙傝�冩爣鍑哛eference standards</span>
+ <!--
+ <br>鏈妫�娴嬫墍渚濇嵁鐨勬妧鏈枃浠讹紙浠ｅ彿銆佸悕绉帮級锛�<br>Reference documents for this testing -->
</span></p>
- <div class="bodycs-1" style="margin-top: 10px;">
- <p style="margin-left: 40px;"><span style="font-size:12pt;font-family:榛戜綋">1.娴嬭瘯璁惧<br> 璁惧鍚嶇О<br>Name of Equipment</span></p>
- <p style="margin-left: 150px;"><span style="font-size:12pt;font-family:榛戜綋"> <br>璁惧鍨嬪彿<br> Model</span></p>
- <p style="margin-left: 150px;"><span style="font-size:12pt;font-family:榛戜綋"> <br>璁惧缂栧彿<br>Serial No.</span></p>
- <p style="margin-left: 150px;"><span style="font-size:12pt;font-family:榛戜綋"> <br>鏍″噯鏈夋晥鏈�<br>Calibration Due Date</span></p>
- </div>
- <div>
- <p style=" border-top: 1px solid black;width: 96%;margin-top: 20px;"></p>
- </div>
</div>
- <div style="margin-top: 50px;display: flex;">
- <p style="margin-left: 40px;"><span style="font-size:12pt;font-family:榛戜綋">2.鍙傝�冩爣鍑哛eference standards <br>鏈妫�娴嬫墍渚濇嵁鐨勬妧鏈枃浠讹紙浠ｅ彿銆佸悕绉帮級锛�<br>Reference documents for this testing </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: 50px;display: flex;">
- <p class=x1111112 style="margin-left: 40px;"><span style="font-size:12pt;font-family:榛戜綋">3.鐜鏉′欢Environmental conditions锛�</span></p>
+
+ <div style="margin-top: 80px;display: flex;">
+ <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 style="margin-top: 50px;display: flex;">
- <p class=x1111112 style="margin-left: 40px;"><span style="font-size:12pt;font-family:榛戜綋">5.娴嬭瘯鏂规硶Test method锛�</span></p>
+ <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>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>
@@ -337,15 +384,17 @@
</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>
</div>
+ </div>
</template>
<template>
- <div style="margin-top: 100pt;width: 75%;">
+ <div style="page-break-after: always;">
+ <div >
<div class="head">
<div class="head-1">
<img width=174 height=58 src="../../../../public/img/image002.png">
@@ -361,7 +410,7 @@
<span class=x1111112 >Test Report</span><br>
</span></p>
<div class="bodycs-1">
- <p style="margin-left: 40px;"><span style="font-size:12pt;font-family:榛戜綋">鎶ュ憡缂栧彿:锛圢o锛�: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>
@@ -370,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>
+ <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>
@@ -403,18 +452,27 @@
<span
style='mso-spacerun:yes'> </span>
</div>
+ <div>
+ <br>
+ <br>
+ <br>
+ <span
+ style='mso-spacerun:yes'> </span>
+ </div>
</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>
</div>
+ </div>
</template>
<template>
- <div style="margin-top: 100pt;width: 75%;">
+ <div style="page-break-after: always;">
+ <div >
<div class="head">
<div class="head-1">
<img width=174 height=58 src="../../../../public/img/image002.png">
@@ -430,7 +488,7 @@
<span class=x1111112 >Test Report</span><br>
</span></p>
<div class="bodycs-1">
- <p style="margin-left: 40px;"><span style="font-size:12pt;font-family:榛戜綋">鎶ュ憡缂栧彿:锛圢o锛�: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>
@@ -447,6 +505,13 @@
<br>
<br>
<span> </span>
+ </div>
+ <div>
+ <br>
+ <br>
+ <br>
+ <span
+ style='mso-spacerun:yes'> </span>
</div>
<div>
<p class="x1111113" ><span style="font-size 40pt;display: flex;margin-top: 40px;margin-left: 40px;;font-family:榛戜綋">9.娴嬭瘯鍚庢鏌osttest check锛�</span></p>
@@ -467,15 +532,23 @@
</div>
</div>
</div>
+ <div>
+ <br>
+ <br>
+ <br>
+ <span
+ style='mso-spacerun:yes'> </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>
</div>
+ </div>
</template>
- </div>
- </div>
+ </div>
+</div>
</template>
<script>
@@ -505,6 +578,7 @@
quantity:null,
username:null,
iname:null,
+ columnLength: 9,
}
},
filters:{
@@ -530,7 +604,6 @@
initData(){
let ii = []
let pp = []
- console.log("<-------------------->");
this.deviceStr = this.tableData.projectName
this.product = this.tableData.material
this.number = this.tableData.quantity
@@ -538,7 +611,6 @@
this.material = this.tableData.material
this.materialCode = this.tableData.materialCode
this.quantity = this.tableData.quantity
- console.log(this.tableData,"-----------11111");
this.tableData.children.forEach(el =>{
this.prjdata.push(el)
el.children.forEach(kl =>{
@@ -554,7 +626,6 @@
this.iname = Array.from(new Set(pp)).join(",")
},
initprjdata(list){
- console.log(list,"uuuuuuuuuuuuuuuuu");
const data = {
eId: '',
ename: '',
@@ -565,28 +636,30 @@
required: '',
iunit: '',
itype: '',
- testValueList: new Array(9)
+ testValueList: new Array(this.columnLength)
}
- if(list && list.length<10){
+ let rowNum = 20
+ let columnNum = this.columnLength
+ if(list && list.length<2){
list.forEach(item=>{
- if(item.children && item.children.length < 7){
- let size = 15 - item.children.length
+ if(item.children && item.children.length < rowNum){
+ rowNum = 20 - item.children.length
for(let j=0;j<item.children.length;j++){
let arr = []
if(item.children[j].inspectionValue){
arr = item.children[j].inspectionValue.split(",")
}
item.children[j].testValueList = arr
- if(item.children[0].testValueList.length<12){
- let num = 9 - item.children[j].testValueList.length
+ if(item.children[j].testValueList.length<columnNum){
+ let num = columnNum - item.children[j].testValueList.length
for(let i=0;i<num;i++){
item.children[j].testValueList.push("")
}
}
}
- for(let i=0;i< size;i++){
+ for(let i=0;i< rowNum;i++){
item.children.push(data)
- item.father
+ // item.father
}
}
})
@@ -595,22 +668,36 @@
list.forEach(item=>{
if(item.children){
size+=item.children.length
+ item.children.forEach(obj=>{
+ if(obj.inspectionValue){
+ let testValueList = obj.inspectionValue.split(",")
+ obj.testValueList = testValueList
+ if(testValueList.length < columnNum){
+ let len = columnNum-testValueList.length
+ for(var i=0;i<len;i++){
+ obj.testValueList.push("")
+ }
+ }
+ }else{
+ obj.testValueList = new Array(20)
+ }
+ })
}
})
- if(size<15){
- let num = 15 - size
+ if(size < rowNum){
+ let num = rowNum - size
for(let i=0;i<num;i++){
list[list.length-1].children.push(data)
}
}
}
+ this.prjdata = list
}
},
watch:{
formData(newVal){
if(newVal){
this.prjdata = []
- console.log("formData鍙樺寲--",newVal)
this.tableData = newVal
this.initData()
this.initprjdata(this.prjdata)
@@ -620,12 +707,9 @@
}
</script>
-<style lang="scss">
-table{
- mso-displayed-decimal-separator: "\.";
- mso-displayed-thousand-separator: "\,";
-}
+
+<style lang="scss" >
.xl6524921 {
padding: 0px;
mso-ignore: padding;
@@ -1733,6 +1817,7 @@
.head{
display: flex;
+ width: 900pt;
.head-1{
padding: 40px;
}
@@ -1744,7 +1829,7 @@
}
}
.bodycss{
- // margin-left: 85px;
+ margin-left: 85px;
}
.bodycs{
// margin-left: 135px;
@@ -1874,4 +1959,5 @@
mso-pattern: auto;
white-space: nowrap;
}
+
</style>
\ No newline at end of file
--
Gitblit v1.9.3