From 5710f6d9a5ac5998d8368bec99b41c58fa3c4ab2 Mon Sep 17 00:00:00 2001
From: 86134 <aa>
Date: 星期四, 09 十一月 2023 09:21:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/quality/rawMaterial/rawMaterial-form.vue | 322 +++++--
public/img/image002.png | 0
vue.config.js | 3
src/views/quality/finishedProductInspection/index.vue | 44 +
src/api/quality/rawMaterial.js | 14
src/views/quality/finishedProductInspection/finishedProduct-form.vue | 41
src/views/quality/finishedProductInspection/finishedProduct-print.vue | 1383 ++++++++++++++++++++++++++++++++
src/views/quality/processInspect/index.vue | 2
src/views/quality/rawMaterial/index.vue | 2
src/views/quality/rawMaterial/rawMaterial-print.vue | 656 +++------------
src/views/quality/processInspect/processInspect-form.vue | 14
11 files changed, 1,846 insertions(+), 635 deletions(-)
diff --git a/public/img/image002.png b/public/img/image002.png
new file mode 100644
index 0000000..5117c1f
--- /dev/null
+++ b/public/img/image002.png
Binary files differ
diff --git a/src/api/quality/rawMaterial.js b/src/api/quality/rawMaterial.js
index 74c5001..27f46f1 100644
--- a/src/api/quality/rawMaterial.js
+++ b/src/api/quality/rawMaterial.js
@@ -69,13 +69,13 @@
})
}
-export function selectHisByCode(data) {
- return request({
- url: '/mes/rawInsProduct/seleHisByCode',
- method: 'get',
- params: data
- })
-}
+// export function selectHisByCode(data) {
+// return request({
+// url: '/mes/rawInsProduct/seleHisByCode',
+// method: 'get',
+// params: data
+// })
+// }
export function exportRawMaterial(data) {
return request({
diff --git a/src/views/quality/finishedProductInspection/finishedProduct-form.vue b/src/views/quality/finishedProductInspection/finishedProduct-form.vue
index 17c5246..03d109d 100644
--- a/src/views/quality/finishedProductInspection/finishedProduct-form.vue
+++ b/src/views/quality/finishedProductInspection/finishedProduct-form.vue
@@ -75,8 +75,13 @@
</div>
</el-form>
</div>
- <div class="finishedProduct-detail">
+
+
+
+
+ <div class="finishedProduct-detail" v-if="resultVal!=null && processInspectVo.id!=null" >
<el-row style="width:100%;z-index: 10;height:30px;">
+ <el-col :span="12" class="inspectionProject_span" @click="increase">娣诲姞</el-col>
<el-col :span="12" class="inspectionProject_span">妫�楠岄」鐩�</el-col>
<el-col v-if="resultVal==null" :span="12" class="inspectionProject_span" style="text-align: right;">
<el-button size="mini" @click="clickAddInspectionColumn()">娣诲姞妫�娴嬪�煎垪</el-button>
@@ -177,6 +182,40 @@
</el-col>
</el-row>
</div>
+ <div v-else>
+
+ </div>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
<div class="finishedProduct-result">
<el-row style="width:100%">
<el-col :span="24">妫�娴嬬粨鏋�</el-col>
diff --git a/src/views/quality/finishedProductInspection/finishedProduct-print.vue b/src/views/quality/finishedProductInspection/finishedProduct-print.vue
new file mode 100644
index 0000000..a3b53fc
--- /dev/null
+++ b/src/views/quality/finishedProductInspection/finishedProduct-print.vue
@@ -0,0 +1,1383 @@
+<template>
+ <div id="20230721_24921" align=center x:publishsource="Excel" style="margin-top: 20pt;">
+ <table border=0 cellpadding=0 cellspacing=0 width=1194 style='border-collapse:collapse;table-layout:fixed;width:607pt'>
+ <tr class=xl6524921 height=40 style='mso-height-source:userset;height:30.0pt'>
+ <td colspan=2 rowspan=2 height=73 width=122 style='width:92pt;border: 1pt solid windowtext'>
+ <span style='mso-ignore:vglayout;margin-left:12px;margin-top:14px;width:104px;height:42px'>
+ <img width=104 height=42 src="../../../../public/img/image002.png">
+ </span>
+ </td>
+ <td colspan=2 class=xl6624921 width=399 style='border-right:.5pt solid black;border-left:none;width:250pt'>璁板綍鍚嶇О</td>
+ <td class=xl6724921 width=212 style='border-left:none;width:159pt'>鎴愬搧妫�楠岃褰曡〃</td>
+ <td class=xl6624921 width=226 style='border-left:none;width:170pt'>淇濆瓨鏈熼檺</td>
+ <td class=xl6824921 width=235 style='width:126pt'>25骞�</td>
+ </tr>
+ <tr class=xl6524921 height=33 style='mso-height-source:userset;height:25.05pt'>
+ <td colspan=2 height=33 class=xl6624921 style='border-right:.5pt solid black;
+ height:25.05pt;border-left:none'>璁板綍缂栧彿</td>
+ <td class=xl6824921 style='border-top:none;border-left:none'>ZTT/QR-8.6-05锛圓/0)</td>
+ <td class=xl6624921 style='border-top:none;border-left:none'>褰掓。閮ㄩ棬</td>
+ <td class=xl6824921 style='border-top:none'>璐ㄩ噺淇濊瘉閮�</td>
+ </tr>
+ <tr class=xl6524921 height=33 style='mso-height-source:userset;height:25.05pt'>
+ <td colspan=7 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=2 class=xl6624921 style='border-right:.5pt solid black;
+ border-left:none'>銆�</td>
+ <td class=xl6924921 style='border-top:none;border-left:none'>浜у搧鍚嶇О</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=2 height=53 class=xl7624921 style='border-right:.5pt solid black;
+ height:40.05pt'>浜у搧鍨嬪彿鍙婃暟閲�</td>
+ <td colspan=2 class=xl6624921 style='border-right:.5pt solid black;
+ border-left:none'>銆�</td>
+ <td class=xl6924921 style='border-top:none;border-left:none'>浜у搧杩芥函鍙�</td>
+ <td colspan=2 class=xl6624921 style='border-right:.5pt solid black;
+ border-left:none'>銆�</td>
+ </tr>
+ <tr class=xl6524921 height=26 style='mso-height-source:userset;height:19.95pt'>
+ <td colspan=2 height=26 class=xl7624921 style='border-right:.5pt solid black;
+ height:19.95pt'>妫�楠屽唴瀹�</td>
+ <td colspan=3 class=xl6924921 style='border-left:none'>鍚堟牸鏍囧噯</td>
+ <td colspan=2 class=xl7624921 style='border-right:.5pt solid black;
+ border-left:none'>鍒ゅ畾缁撴灉</td>
+ </tr>
+ <tr class=xl6524921 height=45 style='mso-height-source:userset;height:34.05pt'>
+ <td colspan=2 height=45 class=xl6624921 style='border-right:.5pt solid black;
+ height:34.05pt'>澶栬锛堟补婕嗕欢锛�</td>
+ <td colspan=3 class=xl7824921 style='border-right:.5pt solid black;
+ border-left:none'>娌规紗闈㈡棤鏄庢樉鐮存崯銆佽剰姹＄瓑闂</td>
+ <td colspan=2 class=xl8124921 style='border-right:.5pt solid black'>鈻″悎鏍�<span
+ style='mso-spacerun:yes'> </span>鈻′笉鍚堟牸<span
+ style='mso-spacerun:yes'> </span>鈻′笉閫傜敤</td>
+ </tr>
+ <tr class=xl6524921 height=45 style='mso-height-source:userset;height:34.05pt'>
+ <td colspan=2 height=45 class=xl8324921 width=122 style='border-right:.5pt solid black;
+ height:34.05pt;width:92pt'>闆朵欢鍨嬪彿</td>
+ <td colspan=3 class=xl8524921 width=611 style='border-left:none;width:459pt'>鍚勭被闆朵欢鍨嬪彿婊¤冻瑁呯娓呭崟涓婅瀹氳姹�</td>
+ <td colspan=2 class=xl8124921 style='border-right:.5pt solid black'>鈻″悎鏍�<span
+ style='mso-spacerun:yes'> </span>鈻′笉鍚堟牸<span
+ style='mso-spacerun:yes'> </span>鈻′笉閫傜敤</td>
+ </tr>
+ <tr class=xl6524921 height=45 style='mso-height-source:userset;height:34.05pt'>
+ <td colspan=2 height=45 class=xl8324921 width=122 style='border-right:.5pt solid black;
+ height:34.05pt;width:92pt'>闆朵欢鏁伴噺</td>
+ <td colspan=3 class=xl8624921 width=611 style='border-right:.5pt solid black;
+ border-left:none;width:459pt'>鍚勯浂浠舵暟閲忔弧瓒宠绠辨竻鍗曚笂瑙勫畾鐨勮姹�</td>
+ <td colspan=2 class=xl8124921 style='border-right:.5pt solid black'>鈻″悎鏍�<span
+ style='mso-spacerun:yes'> </span>鈻′笉鍚堟牸<span
+ style='mso-spacerun:yes'> </span>鈻′笉閫傜敤</td>
+ </tr>
+ <tr class=xl6524921 height=45 style='mso-height-source:userset;height:34.05pt'>
+ <td colspan=2 height=45 class=xl8324921 width=122 style='border-right:.5pt solid black;
+ height:34.05pt;width:92pt'>鏈夋晥鏈�</td>
+ <td colspan=3 class=xl8624921 width=611 style='border-right:.5pt solid black;
+ border-left:none;width:459pt'>瀵逛簬鏈夋湁鏁堟湡鐨勪骇鍝侊紙鑳舵按銆佸彂娉″墏绛夛級锛屾湁鏁堟湡闇�鍓╀綑6涓湀鎴栬��1/2鎬绘湁鏁堟湡</td>
+ <td colspan=2 class=xl8124921 style='border-right:.5pt solid black'>鈻″悎鏍�<span
+ style='mso-spacerun:yes'> </span>鈻′笉鍚堟牸<span
+ style='mso-spacerun:yes'> </span>鈻′笉閫傜敤</td>
+ </tr>
+ <tr class=xl6524921 height=45 style='mso-height-source:userset;height:34.05pt'>
+ <td colspan=2 rowspan=6 height=270 class=xl10824921 width=122 style='border-right:.5pt solid black;border-bottom:.5pt solid black;
+ height:204.3pt;width:92pt'>浜у搧鍖呰</td>
+ <td colspan=3 class=xl8624921 width=611 style='border-right:.5pt solid black;
+ border-left:none;width:459pt'>鎵�鏈夐浂浠跺潎闇�杩涜鍗曠嫭鍖呰锛堢墰鐨焊銆佽嚜灏佽銆佸師瑁呰绛夛級</td>
+ <td colspan=2 class=xl8124921 style='border-right:.5pt solid black'>鈻″悎鏍�<span
+ style='mso-spacerun:yes'> </span>鈻′笉鍚堟牸<span
+ style='mso-spacerun:yes'> </span>鈻′笉閫傜敤</td>
+ </tr>
+ <tr class=xl6524921 height=45 style='mso-height-source:userset;height:34.05pt'>
+ <td colspan=3 height=45 class=xl8624921 width=611 style='border-right:.5pt solid black;
+ height:34.05pt;border-left:none;width:459pt'>鍖呰琚嬫棤瑜剁毐銆佺牬鎹熴�佷贡娑備贡鐢伙紝鍘熻琚嬮渶鍘婚櫎浜у搧淇℃伅</td>
+ <td colspan=2 class=xl8124921 style='border-right:.5pt solid black'>鈻″悎鏍�<span
+ style='mso-spacerun:yes'> </span>鈻′笉鍚堟牸<span
+ style='mso-spacerun:yes'> </span>鈻′笉閫傜敤</td>
+ </tr>
+ <tr class=xl6524921 height=45 style='mso-height-source:userset;height:34.05pt'>
+ <td colspan=3 height=45 class=xl8624921 width=611 style='border-right:.5pt solid black;
+ height:34.05pt;border-left:none;width:459pt'>娌圭姸銆佹恫浣撱�佽啅鐘剁墿闇�鏈夊鏂欑摱鎴栬�呴搧缃愯繘琛屽瘑灏佸寘瑁�</td>
+ <td colspan=2 class=xl8124921 style='border-right:.5pt solid black'>鈻″悎鏍�<span
+ style='mso-spacerun:yes'> </span>鈻′笉鍚堟牸<span
+ style='mso-spacerun:yes'> </span>鈻′笉閫傜敤</td>
+ </tr>
+ <tr class=xl6524921 height=45 style='mso-height-source:userset;height:34.05pt'>
+ <td colspan=3 height=45 class=xl8624921 width=611 style='border-right:.5pt solid black;
+ height:34.05pt;border-left:none;width:459pt'>鐢靛瓙鍏冨櫒浠跺寘瑁呴渶鏈夐槻闈欑數鍔熻兘锛屼笖澶栭儴鏈夐槻闇囪姹�</td>
+ <td colspan=2 class=xl8124921 style='border-right:.5pt solid black'>鈻″悎鏍�<span
+ style='mso-spacerun:yes'> </span>鈻′笉鍚堟牸<span
+ style='mso-spacerun:yes'> </span>鈻′笉閫傜敤</td>
+ </tr>
+ <tr class=xl6524921 height=45 style='mso-height-source:userset;height:34.05pt'>
+ <td colspan=3 height=45 class=xl8624921 width=611 style='border-right:.5pt solid black;
+ height:34.05pt;border-left:none;width:459pt'>鏈夐槻娼姹傜殑闆朵欢锛屽寘瑁呭唴搴旀坊缃共鐕ュ墏</td>
+ <td colspan=2 class=xl8124921 style='border-right:.5pt solid black'>鈻″悎鏍�<span
+ style='mso-spacerun:yes'> </span>鈻′笉鍚堟牸<span
+ style='mso-spacerun:yes'> </span>鈻′笉閫傜敤</td>
+ </tr>
+ <tr class=xl6524921 height=45 style='mso-height-source:userset;height:34.05pt'>
+ <td colspan=3 height=45 class=xl8924921 style='height:34.05pt;border-left:
+ none'>濡備负瀹氬埗鍖栧ぇ鐗╀欢锛岀敤鎷変几鑶滄垨鑰呯弽鐝犳杩涜鍏ㄨ鐩栧寘瑁�</td>
+ <td colspan=2 class=xl8124921 style='border-right:.5pt solid black'>鈻″悎鏍�<span
+ style='mso-spacerun:yes'> </span>鈻′笉鍚堟牸<span
+ style='mso-spacerun:yes'> </span>鈻′笉閫傜敤</td>
+ </tr>
+ <tr class=xl6524921 height=46 style='mso-height-source:userset;height:34.95pt'>
+ <td colspan=2 rowspan=3 height=138 class=xl11024921 width=122
+ style='border-right:.5pt solid black;height:104.85pt;width:92pt'>浜у搧瑁呯</td>
+ <td colspan=3 class=xl8624921 width=611 style='border-right:.5pt solid black;
+ border-left:none;width:459pt'>濡傜鍐呯墿鏂欏湪闀垮害銆佸搴︽垨楂樺害鏂瑰悜鍚焊绠�/鏈ㄧ鍐呮椿鍔ㄩ棿闅欌墺25mm鏃讹紝闇�澧炲姞閫傞噺濉厖鐗�</td>
+ <td colspan=2 class=xl8124921 style='border-right:.5pt solid black'>鈻″悎鏍�<span
+ style='mso-spacerun:yes'> </span>鈻′笉鍚堟牸<span
+ style='mso-spacerun:yes'> </span>鈻′笉閫傜敤</td>
+ </tr>
+ <tr class=xl6524921 height=46 style='mso-height-source:userset;height:34.95pt'>
+ <td colspan=3 height=46 class=xl8624921 width=611 style='border-right:.5pt solid black;
+ height:34.95pt;border-left:none;width:459pt'>濡備骇鍝佷负鍠锋秱浠堕渶鐢ㄦ场闈㈢弽鐝犳杩涜鍒嗛殧淇濇姢</td>
+ <td colspan=2 class=xl8124921 style='border-right:.5pt solid black'>鈻″悎鏍�<span
+ style='mso-spacerun:yes'> </span>鈻′笉鍚堟牸<span
+ style='mso-spacerun:yes'> </span>鈻′笉閫傜敤</td>
+ </tr>
+ <tr class=xl6524921 height=46 style='mso-height-source:userset;height:34.95pt'>
+ <td colspan=3 height=46 class=xl9024921 width=611 style='border-right:.5pt solid black;
+ height:34.95pt;border-left:none;width:459pt'>鑰愬帇銆佷繚鎶ゆ�т綆鐨勯浂浠跺湪涓嬮儴锛岄渶淇濇姢鐗╁搧鍦ㄤ笂閮�</td>
+ <td colspan=2 class=xl8124921 style='border-right:.5pt solid black'>鈻″悎鏍�<span
+ style='mso-spacerun:yes'> </span>鈻′笉鍚堟牸<span
+ style='mso-spacerun:yes'> </span>鈻′笉閫傜敤</td>
+ </tr>
+ <tr class=xl6524921 height=45 style='mso-height-source:userset;height:34.05pt'>
+ <td colspan=2 rowspan=3 height=135 class=xl10824921 width=122
+ style='border-right:.5pt solid black;height:102.15pt;width:92pt'>鏍囩鏍囪瘑</td>
+ <td colspan=3 class=xl8624921 width=611 style='border-right:.5pt solid black;
+ border-left:none;width:459pt'>鏍囩鍐呭姝ｇ‘锛屽寘鍚紙搴忓彿銆侀浂浠舵弿杩般�佹暟閲忋�佸瀷鍙枫�侀」鐩悕绉帮級</td>
+ <td colspan=2 class=xl8124921 style='border-right:.5pt solid black'>鈻″悎鏍�<span
+ style='mso-spacerun:yes'> </span>鈻′笉鍚堟牸<span
+ style='mso-spacerun:yes'> </span>鈻′笉閫傜敤</td>
+ </tr>
+ <tr height=45 style='mso-height-source:userset;height:34.05pt'>
+ <td colspan=3 height=45 class=xl7824921 style='border-right:.5pt solid black;
+ height:34.05pt;border-left:none'>鏍囩鍐呭瀛椾綋椤绘竻鏅般�佺粺涓�锛屼笉寰楁湁閲嶅奖銆佷汉涓烘秱鏀�</td>
+ <td colspan=2 class=xl8124921 style='border-right:.5pt solid black'>鈻″悎鏍�<span
+ style='mso-spacerun:yes'> </span>鈻′笉鍚堟牸<span
+ style='mso-spacerun:yes'> </span>鈻′笉閫傜敤</td>
+ </tr>
+ <tr class=xl6524921 height=45 style='mso-height-source:userset;height:34.05pt'>
+ <td colspan=3 height=45 class=xl8624921 width=611 style='border-right:.5pt solid black;
+ height:34.05pt;border-left:none;width:459pt'>涓嶅緱澶氳创鎴栧皯璐达紝鏈夊鍖呰鐨勪骇鍝侊紝鍚屼竴鎵规浜у搧鐨勬爣绛剧矘璐翠綅缃拰鏂瑰悜鍧囦竴鑷�</td>
+ <td colspan=2 class=xl8124921 style='border-right:.5pt solid black'>鈻″悎鏍�<span
+ style='mso-spacerun:yes'> </span>鈻′笉鍚堟牸<span
+ style='mso-spacerun:yes'> </span>鈻′笉閫傜敤</td>
+ </tr>
+ <tr class=xl6524921 height=49 style='mso-height-source:userset;height:37.05pt'>
+ <td colspan=2 rowspan=2 height=98 class=xl6724921 width=122 style='height:
+ 74.1pt;width:92pt'>鍏朵粬</td>
+ <td colspan=3 class=xl8624921 width=611 style='border-right:.5pt solid black;
+ border-left:none;width:459pt'>澶栧寘瑁呯焊绠卞皝鍙ｆ椂锛屽鍖呰绠遍暱搴︹墹700mm鏃讹紝椤堕潰銆佸簳闈㈤噰鐢ㄢ�滃伐鈥濆瓧鍨嬪皝鍙ｏ紱鍖呰绠遍暱搴︼紴700mm鏃讹紝椤堕潰銆佸簳闈㈤噰鐢ㄢ�滅帇鈥濆瓧鍨嬪皝鍙ｏ紙鎴栭噰鐢ㄢ�滃伐鈥濆瓧鍨嬪皝绠憋級</td>
+ <td colspan=2 class=xl8124921 style='border-right:.5pt solid black'>鈻″悎鏍�<span
+ style='mso-spacerun:yes'> </span>鈻′笉鍚堟牸<span
+ style='mso-spacerun:yes'> </span>鈻′笉閫傜敤</td>
+ </tr>
+ <tr class=xl6524921 height=49 style='mso-height-source:userset;height:37.05pt'>
+ <td colspan=3 height=49 class=xl8624921 width=611 style='border-right:.5pt solid black;
+ height:37.05pt;border-left:none;width:459pt'>鏈ㄧ涓�寰嬬敤閽㈠甫鎵撳寘锛屾墦鍖呮柟寮忓崟鎺掑眳涓垨鍙屾帓骞宠锛屾墦鍖呴挗甯﹀簲鍒嗗竷鍧囧寑銆佸钩琛屾帓鏀撅紝涓嶅緱姝枩</td>
+ <td colspan=2 class=xl8124921 style='border-right:.5pt solid black'>鈻″悎鏍�<span
+ style='mso-spacerun:yes'> </span>鈻′笉鍚堟牸<span
+ style='mso-spacerun:yes'> </span>鈻′笉閫傜敤</td>
+ </tr>
+ <tr class=xl6524921 height=38 style='mso-height-source:userset;height:28.95pt'>
+ <td colspan=7 height=38 class=xl7624921 style='border-right:.5pt solid black;
+ height:28.95pt'>闂澶勭悊</td>
+ </tr>
+ <tr class=xl6524921 height=56 style='mso-height-source:userset;height:42.0pt'>
+ <td height=56 class=xl7024921 width=64 style='height:42.0pt;border-top:none;
+ width:48pt'>搴忓彿</td>
+ <td colspan=4 class=xl9424921 width=669 style='border-right:.5pt solid black;
+ border-left:none;width:503pt'>闂鐜拌薄</td>
+ <td class=xl7024921 width=226 style='border-top:none;border-left:none;
+ width:170pt'>鏁存敼瀹屾垚鎯呭喌</td>
+ <td class=xl7024921 width=235 style='border-top:none;border-left:none;
+ width:176pt'>鏁存敼浜虹瀛�/鏃ユ湡</td>
+ </tr>
+ <tr class=xl6524921 height=46 style='mso-height-source:userset;height:34.95pt'>
+ <td height=46 class=xl7124921 width=64 style='height:34.95pt;border-top:none;
+ width:48pt'><br>
+ <br>
+ <br>
+ <br>
+ <br>
+ <br>
+ <span
+ style='mso-spacerun:yes'> </span>
+ </td>
+ <td colspan=4 class=xl9724921 width=669 style='border-right:.5pt solid black;
+ border-left:none;width:503pt'>銆�</td>
+ <td class=xl7224921 width=226 style='border-top:none;border-left:none;
+ width:170pt'>銆�</td>
+ <td class=xl7224921 width=235 style='border-top:none;border-left:none;
+ width:176pt'>銆�</td>
+ </tr>
+ <tr class=xl6524921 height=46 style='mso-height-source:userset;height:34.95pt'>
+ <td height=46 class=xl7124921 width=64 style='height:34.95pt;border-top:none;
+ width:48pt'>銆�</td>
+ <td colspan=4 class=xl9724921 width=669 style='border-right:.5pt solid black;
+ border-left:none;width:503pt'>銆�</td>
+ <td class=xl7224921 width=226 style='border-top:none;border-left:none;
+ width:170pt'>銆�</td>
+ <td class=xl7224921 width=235 style='border-top:none;border-left:none;
+ width:176pt'>銆�</td>
+ </tr>
+ <tr class=xl6524921 height=46 style='mso-height-source:userset;height:34.95pt'>
+ <td height=46 class=xl7124921 width=64 style='height:34.95pt;border-top:none;
+ width:48pt'>銆�</td>
+ <td colspan=4 class=xl9724921 width=669 style='border-right:.5pt solid black;
+ border-left:none;width:503pt'>銆�</td>
+ <td class=xl7224921 width=226 style='border-top:none;border-left:none;
+ width:170pt'>銆�</td>
+ <td class=xl7224921 width=235 style='border-top:none;border-left:none;
+ width:176pt'>銆�</td>
+ </tr>
+ <tr class=xl6524921 height=46 style='mso-height-source:userset;height:34.95pt'>
+ <td colspan=7 height=46 class=xl10024921 width=1194 style='border-right:.5pt solid black;
+ height:34.95pt;width:897pt'>妫�楠�/鏃堕棿锛�<span
+ style='mso-spacerun:yes'>
+ </span>瀹℃壒/鏃堕棿锛�</td>
+ </tr>
+ <tr class=xl6524921 height=33 style='mso-height-source:userset;height:24.6pt'>
+ <td colspan=7 height=33 class=xl10324921 style='height:24.6pt'><span
+ style='mso-spacerun:yes'> </span>娉細寮洸闄愬埗鍣ㄥ崐鎴愬搧鍏ュ簱涔熷彲浣跨敤姝よ〃鏍硷紱娑傛敼浣滃簾銆�</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>
+</template>
+
+<script>
+export default {
+
+}
+</script>
+
+<style scoped>
+table{
+ mso-displayed-decimal-separator: "\.";
+ mso-displayed-thousand-separator: "\,";
+}
+
+.xl6524921 {
+ padding: 0px;
+ mso-ignore: padding;
+ color: black;
+ font-size: 10.0pt;
+ font-weight: 400;
+ font-style: normal;
+ text-decoration: none;
+ font-family: 瀹嬩綋;
+ mso-generic-font-family: auto;
+ mso-font-charset: 134;
+ mso-number-format: General;
+ text-align: general;
+ vertical-align: middle;
+ mso-background-source: auto;
+ mso-pattern: auto;
+ white-space: nowrap;
+}
+
+.xl6624921 {
+ padding: 0px;
+ mso-ignore: padding;
+ color: black;
+ font-size: 12.0pt;
+ font-weight: 400;
+ font-style: normal;
+ text-decoration: none;
+ font-family: 瀹嬩綋;
+ mso-generic-font-family: auto;
+ mso-font-charset: 134;
+ mso-number-format: General;
+ text-align: center;
+ vertical-align: middle;
+ border-top: .5pt solid windowtext;
+ border-right: none;
+ border-bottom: .5pt solid windowtext;
+ border-left: .5pt solid windowtext;
+ mso-background-source: auto;
+ mso-pattern: auto;
+ white-space: nowrap;
+}
+
+.xl6724921 {
+ padding: 0px;
+ mso-ignore: padding;
+ color: black;
+ font-size: 12.0pt;
+ font-weight: 400;
+ font-style: normal;
+ text-decoration: none;
+ font-family: 瀹嬩綋;
+ mso-generic-font-family: auto;
+ mso-font-charset: 134;
+ mso-number-format: General;
+ text-align: center;
+ vertical-align: middle;
+ border: .5pt solid windowtext;
+ mso-background-source: auto;
+ mso-pattern: auto;
+ white-space: normal;
+}
+
+.xl6824921 {
+ padding: 0px;
+ mso-ignore: padding;
+ color: black;
+ font-size: 12.0pt;
+ font-weight: 400;
+ font-style: normal;
+ text-decoration: none;
+ font-family: 瀹嬩綋;
+ mso-generic-font-family: auto;
+ mso-font-charset: 134;
+ mso-number-format: General;
+ text-align: center;
+ vertical-align: middle;
+ border: .5pt solid windowtext;
+ mso-background-source: auto;
+ mso-pattern: auto;
+ white-space: nowrap;
+}
+
+.xl6924921 {
+ padding: 0px;
+ mso-ignore: padding;
+ color: black;
+ font-size: 12.0pt;
+ font-weight: 700;
+ font-style: normal;
+ text-decoration: none;
+ font-family: 瀹嬩綋;
+ mso-generic-font-family: auto;
+ mso-font-charset: 134;
+ mso-number-format: General;
+ text-align: center;
+ vertical-align: middle;
+ border: .5pt solid windowtext;
+ mso-background-source: auto;
+ mso-pattern: auto;
+ white-space: nowrap;
+}
+
+.xl7024921 {
+ padding: 0px;
+ mso-ignore: padding;
+ color: black;
+ font-size: 12.0pt;
+ font-weight: 700;
+ font-style: normal;
+ text-decoration: none;
+ font-family: 瀹嬩綋;
+ mso-generic-font-family: auto;
+ mso-font-charset: 134;
+ mso-number-format: General;
+ text-align: center;
+ vertical-align: middle;
+ border: .5pt solid windowtext;
+ mso-background-source: auto;
+ mso-pattern: auto;
+ white-space: normal;
+}
+
+.xl7124921 {
+ padding: 0px;
+ mso-ignore: padding;
+ color: black;
+ font-size: 12.0pt;
+ font-weight: 400;
+ font-style: normal;
+ text-decoration: none;
+ font-family: 瀹嬩綋;
+ mso-generic-font-family: auto;
+ mso-font-charset: 134;
+ mso-number-format: General;
+ text-align: general;
+ vertical-align: top;
+ border: .5pt solid windowtext;
+ mso-background-source: auto;
+ mso-pattern: auto;
+ white-space: normal;
+}
+
+.xl7224921 {
+ padding: 0px;
+ mso-ignore: padding;
+ color: black;
+ font-size: 12.0pt;
+ font-weight: 400;
+ font-style: normal;
+ text-decoration: none;
+ font-family: 瀹嬩綋;
+ mso-generic-font-family: auto;
+ mso-font-charset: 134;
+ mso-number-format: General;
+ text-align: center;
+ vertical-align: top;
+ border: .5pt solid windowtext;
+ mso-background-source: auto;
+ mso-pattern: auto;
+ white-space: normal;
+}
+
+.xl7324921 {
+ padding: 0px;
+ mso-ignore: padding;
+ color: black;
+ font-size: 12.0pt;
+ font-weight: 400;
+ font-style: normal;
+ text-decoration: none;
+ font-family: 瀹嬩綋;
+ mso-generic-font-family: auto;
+ mso-font-charset: 134;
+ mso-number-format: General;
+ text-align: center;
+ vertical-align: middle;
+ border-top: .5pt solid windowtext;
+ border-right: .5pt solid windowtext;
+ border-bottom: .5pt solid windowtext;
+ border-left: none;
+ mso-background-source: auto;
+ mso-pattern: auto;
+ white-space: nowrap;
+}
+
+.xl7424921 {
+ padding: 0px;
+ mso-ignore: padding;
+ color: black;
+ font-size: 14.0pt;
+ font-weight: 700;
+ font-style: normal;
+ text-decoration: none;
+ font-family: 瀹嬩綋;
+ mso-generic-font-family: auto;
+ mso-font-charset: 134;
+ mso-number-format: General;
+ text-align: center;
+ vertical-align: middle;
+ border: .5pt solid windowtext;
+ mso-background-source: auto;
+ mso-pattern: auto;
+ white-space: normal;
+}
+
+.xl7524921 {
+ padding: 0px;
+ mso-ignore: padding;
+ color: black;
+ font-size: 14.0pt;
+ font-weight: 700;
+ font-style: normal;
+ text-decoration: none;
+ font-family: 瀹嬩綋;
+ mso-generic-font-family: auto;
+ mso-font-charset: 134;
+ mso-number-format: General;
+ text-align: center;
+ vertical-align: middle;
+ border: .5pt solid windowtext;
+ mso-background-source: auto;
+ mso-pattern: auto;
+ white-space: nowrap;
+}
+
+.xl7624921 {
+ padding: 0px;
+ mso-ignore: padding;
+ color: black;
+ font-size: 12.0pt;
+ font-weight: 700;
+ font-style: normal;
+ text-decoration: none;
+ font-family: 瀹嬩綋;
+ mso-generic-font-family: auto;
+ mso-font-charset: 134;
+ mso-number-format: General;
+ text-align: center;
+ vertical-align: middle;
+ border-top: .5pt solid windowtext;
+ border-right: none;
+ border-bottom: .5pt solid windowtext;
+ border-left: .5pt solid windowtext;
+ mso-background-source: auto;
+ mso-pattern: auto;
+ white-space: nowrap;
+}
+
+.xl7724921 {
+ padding: 0px;
+ mso-ignore: padding;
+ color: black;
+ font-size: 12.0pt;
+ font-weight: 700;
+ font-style: normal;
+ text-decoration: none;
+ font-family: 瀹嬩綋;
+ mso-generic-font-family: auto;
+ mso-font-charset: 134;
+ mso-number-format: General;
+ text-align: center;
+ vertical-align: middle;
+ border-top: .5pt solid windowtext;
+ border-right: .5pt solid windowtext;
+ border-bottom: .5pt solid windowtext;
+ border-left: none;
+ mso-background-source: auto;
+ mso-pattern: auto;
+ white-space: nowrap;
+}
+
+.xl7824921 {
+ padding: 0px;
+ mso-ignore: padding;
+ color: black;
+ font-size: 12.0pt;
+ font-weight: 400;
+ font-style: normal;
+ text-decoration: none;
+ font-family: 瀹嬩綋;
+ mso-generic-font-family: auto;
+ mso-font-charset: 134;
+ mso-number-format: General;
+ text-align: left;
+ vertical-align: middle;
+ border-top: .5pt solid windowtext;
+ border-right: none;
+ border-bottom: .5pt solid windowtext;
+ border-left: .5pt solid windowtext;
+ mso-background-source: auto;
+ mso-pattern: auto;
+ white-space: nowrap;
+}
+
+.xl7924921 {
+ padding: 0px;
+ mso-ignore: padding;
+ color: black;
+ font-size: 12.0pt;
+ font-weight: 400;
+ font-style: normal;
+ text-decoration: none;
+ font-family: 瀹嬩綋;
+ mso-generic-font-family: auto;
+ mso-font-charset: 134;
+ mso-number-format: General;
+ text-align: left;
+ vertical-align: middle;
+ border-top: .5pt solid windowtext;
+ border-right: none;
+ border-bottom: .5pt solid windowtext;
+ border-left: none;
+ mso-background-source: auto;
+ mso-pattern: auto;
+ white-space: nowrap;
+}
+
+.xl8024921 {
+ padding: 0px;
+ mso-ignore: padding;
+ color: black;
+ font-size: 12.0pt;
+ font-weight: 400;
+ font-style: normal;
+ text-decoration: none;
+ font-family: 瀹嬩綋;
+ mso-generic-font-family: auto;
+ mso-font-charset: 134;
+ mso-number-format: General;
+ text-align: left;
+ vertical-align: middle;
+ border-top: .5pt solid windowtext;
+ border-right: .5pt solid windowtext;
+ border-bottom: .5pt solid windowtext;
+ border-left: none;
+ mso-background-source: auto;
+ mso-pattern: auto;
+ white-space: nowrap;
+}
+
+.xl8124921 {
+ padding: 0px;
+ mso-ignore: padding;
+ color: black;
+ font-size: 12.0pt;
+ font-weight: 400;
+ font-style: normal;
+ text-decoration: none;
+ font-family: 瀹嬩綋;
+ mso-generic-font-family: auto;
+ mso-font-charset: 134;
+ mso-number-format: General;
+ text-align: center;
+ vertical-align: middle;
+ border-top: .5pt solid windowtext;
+ border-right: none;
+ border-bottom: .5pt solid windowtext;
+ border-left: none;
+ mso-background-source: auto;
+ mso-pattern: auto;
+ white-space: nowrap;
+}
+
+.xl8224921 {
+ padding: 0px;
+ mso-ignore: padding;
+ color: black;
+ font-size: 12.0pt;
+ font-weight: 400;
+ font-style: normal;
+ text-decoration: none;
+ font-family: 瀹嬩綋;
+ mso-generic-font-family: auto;
+ mso-font-charset: 134;
+ mso-number-format: General;
+ text-align: general;
+ vertical-align: middle;
+ border-top: .5pt solid windowtext;
+ border-right: .5pt solid windowtext;
+ border-bottom: .5pt solid windowtext;
+ border-left: none;
+ mso-background-source: auto;
+ mso-pattern: auto;
+ white-space: nowrap;
+}
+
+.xl8324921 {
+ padding: 0px;
+ mso-ignore: padding;
+ color: black;
+ font-size: 12.0pt;
+ font-weight: 400;
+ font-style: normal;
+ text-decoration: none;
+ font-family: 瀹嬩綋;
+ mso-generic-font-family: auto;
+ mso-font-charset: 134;
+ mso-number-format: General;
+ text-align: center;
+ vertical-align: middle;
+ border-top: .5pt solid windowtext;
+ border-right: none;
+ border-bottom: .5pt solid windowtext;
+ border-left: .5pt solid windowtext;
+ mso-background-source: auto;
+ mso-pattern: auto;
+ white-space: normal;
+}
+
+.xl8424921 {
+ padding: 0px;
+ mso-ignore: padding;
+ color: black;
+ font-size: 12.0pt;
+ font-weight: 400;
+ font-style: normal;
+ text-decoration: none;
+ font-family: 瀹嬩綋;
+ mso-generic-font-family: auto;
+ mso-font-charset: 134;
+ mso-number-format: General;
+ text-align: center;
+ vertical-align: middle;
+ border-top: .5pt solid windowtext;
+ border-right: .5pt solid windowtext;
+ border-bottom: .5pt solid windowtext;
+ border-left: none;
+ mso-background-source: auto;
+ mso-pattern: auto;
+ white-space: normal;
+}
+
+.xl8524921 {
+ padding: 0px;
+ mso-ignore: padding;
+ color: black;
+ font-size: 12.0pt;
+ font-weight: 400;
+ font-style: normal;
+ text-decoration: none;
+ font-family: 瀹嬩綋;
+ mso-generic-font-family: auto;
+ mso-font-charset: 134;
+ mso-number-format: General;
+ text-align: left;
+ vertical-align: middle;
+ border: .5pt solid windowtext;
+ mso-background-source: auto;
+ mso-pattern: auto;
+ white-space: normal;
+}
+
+.xl8624921 {
+ padding: 0px;
+ mso-ignore: padding;
+ color: black;
+ font-size: 12.0pt;
+ font-weight: 400;
+ font-style: normal;
+ text-decoration: none;
+ font-family: 瀹嬩綋;
+ mso-generic-font-family: auto;
+ mso-font-charset: 134;
+ mso-number-format: General;
+ text-align: left;
+ vertical-align: middle;
+ border-top: .5pt solid windowtext;
+ border-right: none;
+ border-bottom: .5pt solid windowtext;
+ border-left: .5pt solid windowtext;
+ mso-background-source: auto;
+ mso-pattern: auto;
+ white-space: normal;
+}
+
+.xl8724921 {
+ padding: 0px;
+ mso-ignore: padding;
+ color: black;
+ font-size: 12.0pt;
+ font-weight: 400;
+ font-style: normal;
+ text-decoration: none;
+ font-family: 瀹嬩綋;
+ mso-generic-font-family: auto;
+ mso-font-charset: 134;
+ mso-number-format: General;
+ text-align: left;
+ vertical-align: middle;
+ border-top: .5pt solid windowtext;
+ border-right: none;
+ border-bottom: .5pt solid windowtext;
+ border-left: none;
+ mso-background-source: auto;
+ mso-pattern: auto;
+ white-space: normal;
+}
+
+.xl8824921 {
+ padding: 0px;
+ mso-ignore: padding;
+ color: black;
+ font-size: 12.0pt;
+ font-weight: 400;
+ font-style: normal;
+ text-decoration: none;
+ font-family: 瀹嬩綋;
+ mso-generic-font-family: auto;
+ mso-font-charset: 134;
+ mso-number-format: General;
+ text-align: left;
+ vertical-align: middle;
+ border-top: .5pt solid windowtext;
+ border-right: .5pt solid windowtext;
+ border-bottom: .5pt solid windowtext;
+ border-left: none;
+ mso-background-source: auto;
+ mso-pattern: auto;
+ white-space: normal;
+}
+
+.xl8924921 {
+ padding: 0px;
+ mso-ignore: padding;
+ color: black;
+ font-size: 12.0pt;
+ font-weight: 400;
+ font-style: normal;
+ text-decoration: none;
+ font-family: 瀹嬩綋;
+ mso-generic-font-family: auto;
+ mso-font-charset: 134;
+ mso-number-format: General;
+ text-align: left;
+ vertical-align: middle;
+ border: .5pt solid windowtext;
+ mso-background-source: auto;
+ mso-pattern: auto;
+ white-space: nowrap;
+}
+
+.xl9024921 {
+ padding: 0px;
+ mso-ignore: padding;
+ color: black;
+ font-size: 12.0pt;
+ font-weight: 400;
+ font-style: normal;
+ text-decoration: none;
+ font-family: 瀹嬩綋;
+ mso-generic-font-family: auto;
+ mso-font-charset: 134;
+ mso-number-format: General;
+ text-align: left;
+ vertical-align: middle;
+ border-top: .5pt solid windowtext;
+ border-right: none;
+ border-bottom: none;
+ border-left: .5pt solid windowtext;
+ mso-background-source: auto;
+ mso-pattern: auto;
+ white-space: normal;
+}
+
+.xl9124921 {
+ padding: 0px;
+ mso-ignore: padding;
+ color: black;
+ font-size: 12.0pt;
+ font-weight: 400;
+ font-style: normal;
+ text-decoration: none;
+ font-family: 瀹嬩綋;
+ mso-generic-font-family: auto;
+ mso-font-charset: 134;
+ mso-number-format: General;
+ text-align: left;
+ vertical-align: middle;
+ border-top: .5pt solid windowtext;
+ border-right: none;
+ border-bottom: none;
+ border-left: none;
+ mso-background-source: auto;
+ mso-pattern: auto;
+ white-space: normal;
+}
+
+.xl9224921 {
+ padding: 0px;
+ mso-ignore: padding;
+ color: black;
+ font-size: 12.0pt;
+ font-weight: 400;
+ font-style: normal;
+ text-decoration: none;
+ font-family: 瀹嬩綋;
+ mso-generic-font-family: auto;
+ mso-font-charset: 134;
+ mso-number-format: General;
+ text-align: left;
+ vertical-align: middle;
+ border-top: .5pt solid windowtext;
+ border-right: .5pt solid windowtext;
+ border-bottom: none;
+ border-left: none;
+ mso-background-source: auto;
+ mso-pattern: auto;
+ white-space: normal;
+}
+
+.xl9324921 {
+ padding: 0px;
+ mso-ignore: padding;
+ color: black;
+ font-size: 12.0pt;
+ font-weight: 700;
+ font-style: normal;
+ text-decoration: none;
+ font-family: 瀹嬩綋;
+ mso-generic-font-family: auto;
+ mso-font-charset: 134;
+ mso-number-format: General;
+ text-align: center;
+ vertical-align: middle;
+ border-top: .5pt solid windowtext;
+ border-right: none;
+ border-bottom: .5pt solid windowtext;
+ border-left: none;
+ mso-background-source: auto;
+ mso-pattern: auto;
+ white-space: nowrap;
+}
+
+.xl9424921 {
+ padding: 0px;
+ mso-ignore: padding;
+ color: black;
+ font-size: 12.0pt;
+ font-weight: 700;
+ font-style: normal;
+ text-decoration: none;
+ font-family: 瀹嬩綋;
+ mso-generic-font-family: auto;
+ mso-font-charset: 134;
+ mso-number-format: General;
+ text-align: center;
+ vertical-align: middle;
+ border-top: .5pt solid windowtext;
+ border-right: none;
+ border-bottom: .5pt solid windowtext;
+ border-left: .5pt solid windowtext;
+ mso-background-source: auto;
+ mso-pattern: auto;
+ white-space: normal;
+}
+
+.xl9524921 {
+ padding: 0px;
+ mso-ignore: padding;
+ color: black;
+ font-size: 12.0pt;
+ font-weight: 700;
+ font-style: normal;
+ text-decoration: none;
+ font-family: 瀹嬩綋;
+ mso-generic-font-family: auto;
+ mso-font-charset: 134;
+ mso-number-format: General;
+ text-align: center;
+ vertical-align: middle;
+ border-top: .5pt solid windowtext;
+ border-right: none;
+ border-bottom: .5pt solid windowtext;
+ border-left: none;
+ mso-background-source: auto;
+ mso-pattern: auto;
+ white-space: normal;
+}
+
+.xl9624921 {
+ padding: 0px;
+ mso-ignore: padding;
+ color: black;
+ font-size: 12.0pt;
+ font-weight: 700;
+ font-style: normal;
+ text-decoration: none;
+ font-family: 瀹嬩綋;
+ mso-generic-font-family: auto;
+ mso-font-charset: 134;
+ mso-number-format: General;
+ text-align: center;
+ vertical-align: middle;
+ border-top: .5pt solid windowtext;
+ border-right: .5pt solid windowtext;
+ border-bottom: .5pt solid windowtext;
+ border-left: none;
+ mso-background-source: auto;
+ mso-pattern: auto;
+ white-space: normal;
+}
+
+.xl9724921 {
+ padding: 0px;
+ mso-ignore: padding;
+ color: black;
+ font-size: 12.0pt;
+ font-weight: 400;
+ font-style: normal;
+ text-decoration: none;
+ font-family: 瀹嬩綋;
+ mso-generic-font-family: auto;
+ mso-font-charset: 134;
+ mso-number-format: General;
+ text-align: center;
+ vertical-align: top;
+ border-top: .5pt solid windowtext;
+ border-right: none;
+ border-bottom: .5pt solid windowtext;
+ border-left: .5pt solid windowtext;
+ mso-background-source: auto;
+ mso-pattern: auto;
+ white-space: normal;
+}
+
+.xl9824921 {
+ padding: 0px;
+ mso-ignore: padding;
+ color: black;
+ font-size: 12.0pt;
+ font-weight: 400;
+ font-style: normal;
+ text-decoration: none;
+ font-family: 瀹嬩綋;
+ mso-generic-font-family: auto;
+ mso-font-charset: 134;
+ mso-number-format: General;
+ text-align: center;
+ vertical-align: top;
+ border-top: .5pt solid windowtext;
+ border-right: none;
+ border-bottom: .5pt solid windowtext;
+ border-left: none;
+ mso-background-source: auto;
+ mso-pattern: auto;
+ white-space: normal;
+}
+
+.xl9924921 {
+ padding: 0px;
+ mso-ignore: padding;
+ color: black;
+ font-size: 12.0pt;
+ font-weight: 400;
+ font-style: normal;
+ text-decoration: none;
+ font-family: 瀹嬩綋;
+ mso-generic-font-family: auto;
+ mso-font-charset: 134;
+ mso-number-format: General;
+ text-align: center;
+ vertical-align: top;
+ border-top: .5pt solid windowtext;
+ border-right: .5pt solid windowtext;
+ border-bottom: .5pt solid windowtext;
+ border-left: none;
+ mso-background-source: auto;
+ mso-pattern: auto;
+ white-space: normal;
+}
+
+.xl10024921 {
+ padding: 0px;
+ mso-ignore: padding;
+ color: black;
+ font-size: 12.0pt;
+ font-weight: 400;
+ font-style: normal;
+ text-decoration: none;
+ font-family: 瀹嬩綋;
+ mso-generic-font-family: auto;
+ mso-font-charset: 134;
+ mso-number-format: General;
+ text-align: general;
+ vertical-align: middle;
+ border-top: .5pt solid windowtext;
+ border-right: none;
+ border-bottom: .5pt solid windowtext;
+ border-left: .5pt solid windowtext;
+ mso-background-source: auto;
+ mso-pattern: auto;
+ white-space: normal;
+}
+
+.xl10124921 {
+ padding: 0px;
+ mso-ignore: padding;
+ color: black;
+ font-size: 12.0pt;
+ font-weight: 400;
+ font-style: normal;
+ text-decoration: none;
+ font-family: 瀹嬩綋;
+ mso-generic-font-family: auto;
+ mso-font-charset: 134;
+ mso-number-format: General;
+ text-align: general;
+ vertical-align: middle;
+ border-top: .5pt solid windowtext;
+ border-right: none;
+ border-bottom: .5pt solid windowtext;
+ border-left: none;
+ mso-background-source: auto;
+ mso-pattern: auto;
+ white-space: normal;
+}
+
+.xl10224921 {
+ padding: 0px;
+ mso-ignore: padding;
+ color: black;
+ font-size: 12.0pt;
+ font-weight: 400;
+ font-style: normal;
+ text-decoration: none;
+ font-family: 瀹嬩綋;
+ mso-generic-font-family: auto;
+ mso-font-charset: 134;
+ mso-number-format: General;
+ text-align: general;
+ vertical-align: middle;
+ border-top: .5pt solid windowtext;
+ border-right: none;
+ border-bottom: .5pt solid windowtext;
+ border-left: none;
+ mso-background-source: auto;
+ mso-pattern: auto;
+ white-space: nowrap;
+}
+
+.xl10324921 {
+ padding: 0px;
+ mso-ignore: padding;
+ color: black;
+ font-size: 12.0pt;
+ font-weight: 700;
+ font-style: normal;
+ text-decoration: none;
+ font-family: 瀹嬩綋;
+ mso-generic-font-family: auto;
+ mso-font-charset: 134;
+ mso-number-format: General;
+ text-align: left;
+ vertical-align: middle;
+ mso-background-source: auto;
+ mso-pattern: auto;
+ white-space: nowrap;
+}
+
+.xl10424921 {
+ padding: 0px;
+ mso-ignore: padding;
+ color: black;
+ font-size: 12.0pt;
+ font-weight: 400;
+ font-style: normal;
+ text-decoration: none;
+ font-family: 瀹嬩綋;
+ mso-generic-font-family: auto;
+ mso-font-charset: 134;
+ mso-number-format: General;
+ text-align: center;
+ vertical-align: middle;
+ border-top: .5pt solid windowtext;
+ border-right: none;
+ border-bottom: none;
+ border-left: .5pt solid windowtext;
+ mso-background-source: auto;
+ mso-pattern: auto;
+ white-space: nowrap;
+}
+
+.xl10524921 {
+ padding: 0px;
+ mso-ignore: padding;
+ color: black;
+ font-size: 12.0pt;
+ font-weight: 400;
+ font-style: normal;
+ text-decoration: none;
+ font-family: 瀹嬩綋;
+ mso-generic-font-family: auto;
+ mso-font-charset: 134;
+ mso-number-format: General;
+ text-align: center;
+ vertical-align: middle;
+ border-top: .5pt solid windowtext;
+ border-right: .5pt solid windowtext;
+ border-bottom: none;
+ border-left: none;
+ mso-background-source: auto;
+ mso-pattern: auto;
+ white-space: nowrap;
+}
+
+.xl10624921 {
+ padding: 0px;
+ mso-ignore: padding;
+ color: black;
+ font-size: 12.0pt;
+ font-weight: 400;
+ font-style: normal;
+ text-decoration: none;
+ font-family: 瀹嬩綋;
+ mso-generic-font-family: auto;
+ mso-font-charset: 134;
+ mso-number-format: General;
+ text-align: center;
+ vertical-align: middle;
+ border-top: none;
+ border-right: none;
+ border-bottom: .5pt solid windowtext;
+ border-left: .5pt solid windowtext;
+ mso-background-source: auto;
+ mso-pattern: auto;
+ white-space: nowrap;
+}
+
+.xl10724921 {
+ padding: 0px;
+ mso-ignore: padding;
+ color: black;
+ font-size: 12.0pt;
+ font-weight: 400;
+ font-style: normal;
+ text-decoration: none;
+ font-family: 瀹嬩綋;
+ mso-generic-font-family: auto;
+ mso-font-charset: 134;
+ mso-number-format: General;
+ text-align: center;
+ vertical-align: middle;
+ border-top: none;
+ border-right: .5pt solid windowtext;
+ border-bottom: .5pt solid windowtext;
+ border-left: none;
+ mso-background-source: auto;
+ mso-pattern: auto;
+ white-space: nowrap;
+}
+
+.xl10824921 {
+ padding: 0px;
+ mso-ignore: padding;
+ color: black;
+ font-size: 12.0pt;
+ font-weight: 400;
+ font-style: normal;
+ text-decoration: none;
+ font-family: 瀹嬩綋;
+ mso-generic-font-family: auto;
+ mso-font-charset: 134;
+ mso-number-format: General;
+ text-align: center;
+ vertical-align: middle;
+ border-top: .5pt solid windowtext;
+ border-right: none;
+ border-bottom: none;
+ border-left: .5pt solid windowtext;
+ mso-background-source: auto;
+ mso-pattern: auto;
+ white-space: normal;
+}
+
+.xl10924921 {
+ padding: 0px;
+ mso-ignore: padding;
+ color: black;
+ font-size: 12.0pt;
+ font-weight: 400;
+ font-style: normal;
+ text-decoration: none;
+ font-family: 瀹嬩綋;
+ mso-generic-font-family: auto;
+ mso-font-charset: 134;
+ mso-number-format: General;
+ text-align: center;
+ vertical-align: middle;
+ border-top: .5pt solid windowtext;
+ border-right: .5pt solid windowtext;
+ border-bottom: none;
+ border-left: none;
+ mso-background-source: auto;
+ mso-pattern: auto;
+ white-space: normal;
+}
+
+.xl11024921 {
+ padding: 0px;
+ mso-ignore: padding;
+ color: black;
+ font-size: 12.0pt;
+ font-weight: 400;
+ font-style: normal;
+ text-decoration: none;
+ font-family: 瀹嬩綋;
+ mso-generic-font-family: auto;
+ mso-font-charset: 134;
+ mso-number-format: General;
+ text-align: center;
+ vertical-align: middle;
+ border-top: none;
+ border-right: none;
+ border-bottom: none;
+ border-left: .5pt solid windowtext;
+ mso-background-source: auto;
+ mso-pattern: auto;
+ white-space: normal;
+}
+
+.xl11124921 {
+ padding: 0px;
+ mso-ignore: padding;
+ color: black;
+ font-size: 12.0pt;
+ font-weight: 400;
+ font-style: normal;
+ text-decoration: none;
+ font-family: 瀹嬩綋;
+ mso-generic-font-family: auto;
+ mso-font-charset: 134;
+ mso-number-format: General;
+ text-align: center;
+ vertical-align: middle;
+ border-top: none;
+ border-right: .5pt solid windowtext;
+ border-bottom: none;
+ border-left: none;
+ mso-background-source: auto;
+ mso-pattern: auto;
+ white-space: normal;
+}
+
+.xl11224921 {
+ padding: 0px;
+ mso-ignore: padding;
+ color: black;
+ font-size: 12.0pt;
+ font-weight: 400;
+ font-style: normal;
+ text-decoration: none;
+ font-family: 瀹嬩綋;
+ mso-generic-font-family: auto;
+ mso-font-charset: 134;
+ mso-number-format: General;
+ text-align: center;
+ vertical-align: middle;
+ border-top: none;
+ border-right: none;
+ border-bottom: .5pt solid windowtext;
+ border-left: .5pt solid windowtext;
+ mso-background-source: auto;
+ mso-pattern: auto;
+ white-space: normal;
+}
+
+.xl11324921 {
+ padding: 0px;
+ mso-ignore: padding;
+ color: black;
+ font-size: 12.0pt;
+ font-weight: 400;
+ font-style: normal;
+ text-decoration: none;
+ font-family: 瀹嬩綋;
+ mso-generic-font-family: auto;
+ mso-font-charset: 134;
+ mso-number-format: General;
+ text-align: center;
+ vertical-align: middle;
+ border-top: none;
+ border-right: .5pt solid windowtext;
+ border-bottom: .5pt solid windowtext;
+ border-left: none;
+ mso-background-source: auto;
+ mso-pattern: auto;
+ white-space: normal;
+}
+
+ruby {
+ ruby-align: left;
+}
+
+rt {
+ color: windowtext;
+ font-size: 9.0pt;
+ font-weight: 400;
+ font-style: normal;
+ text-decoration: none;
+ font-family: 瀹嬩綋;
+ mso-generic-font-family: auto;
+ mso-font-charset: 134;
+ mso-char-type: none;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/quality/finishedProductInspection/index.vue b/src/views/quality/finishedProductInspection/index.vue
index 3647ffc..7465498 100644
--- a/src/views/quality/finishedProductInspection/index.vue
+++ b/src/views/quality/finishedProductInspection/index.vue
@@ -12,6 +12,19 @@
<template #toolbar></template>
</ttable>
</basic-container>
+ <el-dialog
+ top="10vh"
+ title="鎵撳嵃棰勮"
+ :visible.sync="printDialogVisible"
+ width="65%">
+ <div style="width:100%;height: 60vh;overflow-y: scroll;">
+ <printTemplate id="printRaw" :formData="printFormData"></printTemplate>
+ </div>
+ <span slot="footer" class="dialog-footer">
+ <el-button @click="()=>{printDialogVisible = false;this.printFormData=null}">鍙� 娑�</el-button>
+ <el-button type="primary" @click="printFun()">鎵� 鍗�</el-button>
+ </span>
+ </el-dialog>
</div>
</div>
</template>
@@ -20,15 +33,20 @@
import ttable from '@/views/common/ztt-table.vue'
import * as fecha from 'element-ui/lib/utils/date'
import finishedProductInspectionAdd from './finishedProduct-form'
- import { page,deletePro,exportExaminationProducts } from '@/api/quality/finishedProduct'
+ import { page,deletePro,exportExaminationProducts,queryById } from '@/api/quality/finishedProduct'
import { transform } from '@/util/fileTransform'
+ import printTemplate from './finishedProduct-print.vue'
+ import PrintJS from 'print-js'
export default {
components: {
finishedProductInspectionAdd,
- ttable
+ ttable,
+ printTemplate
},
data() {
return {
+ printFormData: null,
+ printDialogVisible: false,
result:[{label:'鍏ㄩ儴',value: ''},{label:'鍚堟牸',value: '1'},{label:'涓嶅悎鏍�',value: '0'}],
type: [1],
prelang: 'finishedProduct',
@@ -160,6 +178,7 @@
text: '鎵撳嵃',
type: 'text',
size: 'small',
+ fun: this.showPrint
},{
text: '浣滃簾',
type: 'text',
@@ -177,6 +196,27 @@
},
created() { },
methods: {
+ //鎵撳嵃鎸夐挳
+ printFun() {
+ this.printDialogVisible = false;
+ PrintJS({
+ printable: "printRaw",
+ type: "html",
+ maxWidth: 700,
+ style: '@page {margin: 0 5mm}',
+ targetStyles: ["*"],
+ ignoreElements: ["no-ignore"],
+ orientation: 'portrait'
+ });
+ },
+ showPrint(row){
+ queryById(row.id).then(res=>{
+ console.log(res);
+ this.printDialogVisible = true
+ }).catch(error=>{
+ console.log(error);
+ })
+ },
exportExcel(){
console.log("============");
let queryParam=this.$refs.finishedProduct.getQueryParam();
diff --git a/src/views/quality/processInspect/index.vue b/src/views/quality/processInspect/index.vue
index b1b35e5..2f8ca18 100644
--- a/src/views/quality/processInspect/index.vue
+++ b/src/views/quality/processInspect/index.vue
@@ -25,7 +25,7 @@
export default {
components: {
processInspectForm,
- ttable
+ ttable,
},
data() {
return {
diff --git a/src/views/quality/processInspect/processInspect-form.vue b/src/views/quality/processInspect/processInspect-form.vue
index f5ef7f3..2f5837d 100644
--- a/src/views/quality/processInspect/processInspect-form.vue
+++ b/src/views/quality/processInspect/processInspect-form.vue
@@ -86,10 +86,15 @@
</el-row>
<el-row style="width:100%;">
<el-col :span="24">
- <el-table border :data="inspectionItems" height="400"
+ <el-table border
+ :data="inspectionItems"
+ height="400"
:header-cell-style="{ textAlign: 'center', color: 'black', backgroundColor: '#fafafa' }"
- :cell-style="{ textAlign: 'center' }" row-key="iid" default-expand-all style="width: 100%"
- ref="table" :tree-props="{ children: 'children', hasChildren: 'hasChildren' }">
+ :cell-style="{ textAlign: 'center' }"
+ row-key="iid"
+ default-expand-all style="width: 100%"
+ ref="table"
+ :tree-props="{ children: 'children', hasChildren: 'hasChildren' }">
<el-table-column type="index" label="搴忓彿" width="60"></el-table-column>
<el-table-column label="椤圭洰" prop="father" width="240"></el-table-column>
<el-table-column prop="iname" label="鎸囨爣" width="240"></el-table-column>
@@ -278,7 +283,7 @@
methods: {
submitSave() {
let pro = 0
- console.log(this.inspectionItems);
+ console.log(this.inspectionItems);
this.inspectionItems.forEach(item => {
if (item.children) {
let arr = item.children.filter(obj => {
@@ -377,6 +382,7 @@
}
})
this.inspectionItems = result.children
+ console.log(this.inspectionItems);
this.inspectionResultForm = [{
materialCode: result.materialCode,
material: result.material,
diff --git a/src/views/quality/rawMaterial/index.vue b/src/views/quality/rawMaterial/index.vue
index 4765239..1234672 100644
--- a/src/views/quality/rawMaterial/index.vue
+++ b/src/views/quality/rawMaterial/index.vue
@@ -267,7 +267,7 @@
PrintJS({
printable: "printRaw",
type: "html",
- maxWidth: 1200,
+ maxWidth: 900,
// header: "鍘熸潗鏂欐娴嬫姤鍛�",
style: '@page {margin: 0 5mm}',
targetStyles: ["*"],
diff --git a/src/views/quality/rawMaterial/rawMaterial-form.vue b/src/views/quality/rawMaterial/rawMaterial-form.vue
index 400e09e..ec6ec28 100644
--- a/src/views/quality/rawMaterial/rawMaterial-form.vue
+++ b/src/views/quality/rawMaterial/rawMaterial-form.vue
@@ -96,12 +96,15 @@
</el-row>
</el-form>
</div>
+
+
+
<div class="rawMaterial-detail">
<el-row style="width:100%;z-index: 10;height:50px;">
- <el-col :span="19">妫�楠岄」鐩�</el-col>
- <el-col :span="5">
+ <el-col :span="18">妫�楠岄」鐩�</el-col>
+ <el-col :span="6">
<div style="width:100%;text-align: right;">
- <el-button v-if="dataForm.id==null" size="small" @click="clickAddLine">娣诲姞妫�楠岃</el-button>
+ <el-button v-if="dataForm.id==null" size="small" @click="clickAddLine()">娣诲姞妫�楠岄」鐩�</el-button>
<el-button v-if="resultVal==null || dataForm.id==null" size="small" @click="addTeatValueColumn()">娣诲姞妫�娴嬪�煎垪</el-button>
<el-button v-if="resultVal==null || dataForm.id==null" size="small" @click="delTeatValueColumn()">鍒犻櫎妫�娴嬪�煎垪</el-button>
</div>
@@ -109,77 +112,90 @@
</el-row>
<el-row style="width:100%;">
<el-col :span="24">
- <el-table :header-cell-style="{textAlign:'center',color:'black',backgroundColor:'#fafafa'}"
- :cell-style="{textAlign:'center'}" ref="table"
- :data="list" border style="width: 100%;" height="400">
+ <el-table
+ :header-cell-style="{textAlign:'center',color:'black',backgroundColor:'#fafafa'}"
+ :cell-style="{textAlign:'center'}"
+ ref="table"
+ :data="list"
+ border
+ style="width: 100%;"
+ height="400"
+ row-key="iid"
+ default-expand-all
+ :tree-props="{children: 'children', hasChildren: 'hasChildren'}">
<el-table-column type="index" label="搴忓彿" width="60">
</el-table-column>
<el-table-column prop="father" label="妫�楠岄」鐩�" width="260">
<template slot-scope="scope">
- <el-input :disabled="dataForm.id != null" v-model="scope.row.father" placeholder="璇疯緭鍏ユ楠岄」鐩�"></el-input>
- </template>
- </el-table-column>
- <el-table-column prop="note" label="妫�楠屾弿杩�" width="260">
- <template slot-scope="scope">
- <el-input :disabled="dataForm.id != null" v-model="scope.row.note" placeholder="妫�楠屾弿杩�"></el-input>
+ <el-input v-if="scope.row.children" style="width:120px" :disabled="dataForm.id!=null" v-model="scope.row.father" placeholder="璇疯緭鍏ユ楠岄」鐩�"></el-input>
</template>
</el-table-column>
<el-table-column prop="name" label="椤圭洰" width="260">
<template slot-scope="scope">
- <el-select v-if="projectList.length > 0" :disabled="dataForm.id != null" class="inline-input" v-model="scope.row.name"
- filterable allow-create placeholder="璇疯緭鍏ユ垨閫夋嫨椤圭洰鍚嶇О" style="width:100%" @change="changeName(scope.$index,scope.row)">
- <el-option v-for="(item,index) in projectList" :key="index" :label="item.name" :value="item.name"/>
- </el-select>
- <el-input v-else :disabled="dataForm.id != null" class="inline-input" v-model="scope.row.name"
+ <div v-if="!scope.row.children">
+ <el-input class="inline-input" :disabled="dataForm.id!=null" v-model="scope.row.name"
placeholder="璇疯緭鍏ラ」鐩悕绉�"></el-input>
- </template>
+ </div>
+ </template>
</el-table-column>
-
<el-table-column prop="unit" label="鍗曚綅" width="260">
<template slot-scope="scope">
+ <div v-if="!scope.row.children">
<el-input :disabled="dataForm.id != null" v-model="scope.row.unit" placeholder="璇疯緭鍏ュ崟浣�"></el-input>
+ </div>
</template>
+
</el-table-column>
<el-table-column prop="required" label="鏍囧噯鍊�" width="260">
<template slot-scope="scope">
+ <div v-if="!scope.row.children">
<el-input :disabled="dataForm.id != null" v-model="scope.row.required"
placeholder="璇疯緭鍏ユ爣鍑嗗��"></el-input>
+ </div>
</template>
</el-table-column>
-
- <el-table-column prop="testValue" label="妫�娴嬪��" min-width="260" v-for="(item, index) in empiricalValueAdd"
- :key="index">
+ <el-table-column prop="testValue" label="妫�娴嬪��" min-width="260" v-for="(item,index) in empiricalValueAdd" :key="index">
<template slot-scope="scope">
+ <div v-if="!scope.row.children">
<el-tooltip :disabled="scope.row.deviceId != null" class="item" effect="dark" content="璇峰厛閫夋嫨璁惧锛�"
placement="top-start">
-
- <!-- <el-input :disabled="scope.row.equipmentId == null || (dataForm.id!=null&&resultVal!=null)" v-model="scope.row.testValueList[index]"
- @blur="updateTestValue(scope.row,index)" placeholder="璇疯緭鍏ユ娴嬪��"></el-input> -->
-
- <el-autocomplete
- style="width:100%"
- :disabled="scope.row.deviceId == null || (dataForm.id!=null&&resultVal!=null)"
- class="inline-input"
- v-model="scope.row.testValueList[index]"
- :fetch-suggestions="querySearch"
- placeholder="璇疯緭鍏ユ娴嬪��"
- @select="handleSelect"
- ></el-autocomplete>
-
+ <el-col v-if="scope.row.itype === '1'">
+ <el-input :disabled="scope.row.deviceId == '' || (dataForm.id!=null&&resultVal!=null)"
+ v-model="scope.row.testValueList[index]"
+ placeholder="璇疯緭鍏ユ娴嬪��"></el-input>
+ </el-col>
+ <el-col v-else>
+ <el-select style="width: 100%;"
+ :disabled="scope.row.deviceId == null || (dataForm.id!=null&&resultVal!=null)"
+ v-model="scope.row.testValueList[index]" @change="aaa(scope.row)"
+ placeholder="璇烽�夋嫨">
+ <el-option v-for="item in dataVal" :key="item.value" :label="item.label"
+ :value="item.value">
+ </el-option>
+ </el-select>
+ </el-col>
</el-tooltip>
+ </div>
</template>
</el-table-column>
-
<el-table-column prop="deviceName" label="璇曢獙璁惧" min-width="260">
<template slot-scope="scope">
- <el-select :disabled="resultVal!=null && dataForm.id!=null" style="width:100%"
+ <div v-if="!scope.row.children">
+ <el-select :disabled="dataForm!=null && resultVal!=null" style="width:100%"
v-model="scope.row.deviceId" filterable @change="updateDevice(scope.row,scope.$index)">
<el-option v-for="(item,index) in deviceList"
:key="index" :value="item.id" :label="item.code +'-'+ item.name"></el-option>
</el-select>
+ </div>
</template>
</el-table-column>
-
+ <el-table-column prop="note" label="妫�楠屾弿杩�" width="260" >
+ <template slot-scope="scope">
+ <div v-if="!scope.row.children">
+ <el-input :disabled="scope.row.deviceId == null || (dataForm.id!=null&&resultVal!=null)" v-model="scope.row.note" placeholder="妫�楠屾弿杩�"></el-input>
+ </div>
+ </template>
+ </el-table-column>
<el-table-column fixed="right" v-if="dataForm.id != null" prop="testState" label="缁撹" min-width="150">
<template slot-scope="scope">
<span v-if="scope.row.testState == 0" style="color:#F56C6C">涓嶅悎鏍�</span>
@@ -189,13 +205,18 @@
</el-table-column>
<el-table-column fixed="right" style="background-color: white;" v-if="dataForm.id == null" label="鎿嶄綔" width="150">
<template slot-scope="scope">
- <el-button type="text" @click="clickDeleteline(scope)">鍙栨秷</el-button>
+ <div v-if="!scope.row.children">
+ <el-button type="text" @click="addwaydata(scope)">鏂板</el-button>
+ <el-button type="text" @click="clickDeleteline(scope)">鍙栨秷</el-button>
+ </div>
</template>
</el-table-column>
</el-table>
</el-col>
</el-row>
</div>
+
+
<div class="rawMaterial-result">
<el-row>
<el-col :span="24">妫�楠岀粨璁�</el-col>
@@ -260,6 +281,15 @@
},
data(){
return{
+ dataVal: [{
+ label: '鏄�',
+ value: '鏄�'
+ }, {
+ label: '鍚�',
+ value: '鍚�'
+ }],
+ // componentData:{},
+ userdata:[],
currentRow:[],
userlist:[],
unqualifiedNum: null,
@@ -287,6 +317,7 @@
supplier: '',
rawInsProducts: [{
deviceId: 0,
+ father:'',
name: '',
required: '',
testValue: '',
@@ -326,6 +357,7 @@
this.restaurants = this.loadAll();
console.log(this.dataForm);
+
},
watch:{
dialogVisible(newVal){
@@ -339,22 +371,21 @@
querySearch(queryString, cb) {
var restaurants = this.restaurants;
var results = queryString ? restaurants.filter(this.createFilter(queryString)) : restaurants;
-
cb(results);
},
- createFilter(queryString) {
- return (restaurant) => {
- return (restaurant.value.toLowerCase().indexOf(queryString.toLowerCase()) === 0);
- };
- },
- loadAll(){
- return [
- {"value":"鏄�"},
- {"value":"鍚�"}
- ];},
- handleSelect(item) {
- console.log(item);
- },
+ // createFilter(queryString) {
+ // return (restaurant) => {
+ // return (restaurant.value.toLowerCase().indexOf(queryString.toLowerCase()) === 0);
+ // };
+ // },
+ // loadAll(){
+ // return [
+ // {"value":"鏄�"},
+ // {"value":"鍚�"}
+ // ];},
+ // handleSelect(item) {
+ // console.log(item);
+ // },
changeName(index,row){
this.projectList.forEach(item=>{
if(row.name == item.name){
@@ -365,6 +396,7 @@
},
// 纭鍥炶皟
selectPart(param, nodePart, index) {
+ console.log(param)
if (typeof param !== 'undefined') {
this.dataForm.code = param.code
this.dataForm.name = param.name
@@ -376,10 +408,16 @@
this.dataForm.message = param.message
this.dataForm.projectName = param.projectName
this.projectList = param.rawInsProducts == null ? [] : param.rawInsProducts
+ console.log(param.rawInsProducts);
+ param.rawInsProducts.forEach(item =>{
+ item.iid = Math.random()
+ console.log(item);
+ })
param.rawInsProducts.forEach(o=>{
this.clickAddLine(o)
})
}
+
},
queryCode(){
this.paramObj = {
@@ -388,6 +426,8 @@
this.showPart = true
},
updateDevice(row,index){
+ console.log(row);
+ return
if(this.dataForm.id != null){
updateDeviceById({deviceId:row.deviceId,rpId:row.rpId}).then(res=>{
this.list[index].testValue = ''
@@ -410,6 +450,9 @@
this.resultVal = resultVal
this.conclusionTable[0].testState = resultVal
sessionStorage.setItem("raw-resultVal-"+this.dataForm.id,resultVal)
+ },
+ aaa(row){
+ console.log(row);
},
showDialog(){
let pro = this.list.filter(item => {
@@ -442,25 +485,49 @@
},
// 娣诲姞琛�
clickAddLine(row) {
- let obj = {
- deviceId: null,
- name: "",
- required: "",
- testValue: "",
- unit: "",
- testState: null,
- testValueList: [],
- };
- if(row!=undefined){
- obj.name = row.name
- obj.unit = row.unit
- obj.required = row.required
+ if(row){
+ let userNameList = []
+ row.children.forEach(item => {
+ console.log("item--",item);
+ item.iid = Math.random()
+ let arr = []
+ item.testValue = ''
+ item.testValueList= []
+ if (item.userName) {
+ userNameList.push(item.userName)
+ }
+ if (item.inspectionValue) {
+ arr = item.inspectionValue.split(",")
+ }
+ item.empiricalValueAddss = arr
+ if (arr.length > this.empiricalValueAdd) {
+ this.empiricalValueAdd = arr.length
+ }
+ console.log("aaaa----",row);
+ this.list.push(row)
+ })
+ }else{
+ let ele = {
+ father: '',
+ iid: Math.random(),
+ children:[{
+ deviceId: null,
+ deviceName: null,
+ iid: Math.random(),
+ required: null,
+ rpId: null,
+ name: null,
+ unit: null,
+ userName: null,
+ testValue: null,
+ testValueList: [],
+ note: null,
+ testState: null
+ }]
+ }
+ this.list.push(ele)
}
- this.list.push(obj);
- },
- // 鍒犻櫎琛�
- clickDeleteline(scope) {
- this.list.splice(scope.$index, 1);
+
},
delTeatValueColumn(){
if (this.empiricalValueAdd - 1 === 0) { } else {
@@ -495,6 +562,7 @@
init(){
if(this.dataForm.id){
getObj(this.dataForm.id).then(res=>{
+ console.log(res);
let data = res.data.data
this.dataForm.name = data.name
this.dataForm.formTime = data.formTime
@@ -508,27 +576,40 @@
this.dataForm.createUser = data.createUser
let userNameList = []
this.list = []
- data.children.forEach(item=>{
- userNameList.push(item.userName)
- let arr = []
- if(item.testValue != undefined ){
- arr = item.testValue.split(",")
- if(arr.length > this.empiricalValueAdd){
- this.empiricalValueAdd = arr.length
+ data.children.forEach(item => {
+ if (item.children) {
+ let ele = {
+ iid: null,
+ father: null,
+ children: []
+ }
+ ele.iid = Math.random()
+ ele.father = item.rpFather
+ item.children.forEach(obj => {
+ console.log(obj);
+ let arr= []
+ if(obj.testValue){
+ arr = obj.testValue.split(",")
+ }
+ let o = {
+ deviceId: obj.deviceId,
+ deviceName: obj.deviceName,
+ iid: Math.random(),
+ required: obj.required,
+ rpId: obj.rpId,
+ name: obj.rpName,
+ unit: obj.rpUnit,
+ userName: obj.userName,
+ testValue: obj.testValue?obj.testValue:'',
+ testValueList: arr,
+ note: obj.note?obj.note:'',
+ testState: obj.testState
+ }
+ ele.children.push(o)
+ })
+ this.list.push(ele)
}
- }
- this.list.push({
- deviceId: item.deviceId,
- deviceName: item.deviceName,
- name: item.rpName,
- required: item.required,
- testValue: item.testValue,
- unit: item.rpUnit,
- testState: item.testState,
- rpId: item.rpId,
- testValueList: arr
- })
- })
+ })
this.conclusionTable = [{
code: data.code,
name: data.name,
@@ -542,18 +623,59 @@
this.conclusionTable = []
}
},
- save(){
- let data = this.dataForm
- data.rawInsProducts = this.list
- data.rawInsProducts.forEach(item=>{
- let val = item.testValueList.join(",")
- item.testValue = val
+ // 鍒犻櫎琛�
+ clickDeleteline(scope) {
+ console.log(scope);
+ let index = this.list.findIndex(el =>{
+ return el.children.find(ele => ele.iid == scope.row.iid)
})
+
+ let childrenIndex = this.list[index].children.findIndex(el => {
+ return el.iid == scope.row.iid
+ })
+ // console.log(this.list);
+ console.log(index);
+ console.log(childrenIndex);
+
+ this.list[index].children.splice(childrenIndex , 1);
+ if(childrenIndex == 0){
+ this.list.splice(scope.row,1)
+ }
+ },
+ addwaydata(row){
+ console.log(row.row);
+ let index = this.list.findIndex(el =>{
+ return el.children.find(ele => ele.iid == row.row.iid)
+ })
+ console.log(index);
+ let obj = {
+ iid:Math.random(),
+ name:'',
+ required:'',
+ unit:''
+ }
+ this.list[index].children.push(obj)
+ },
+ save(){
+ console.log(this.dataForm);
+ let data = this.dataForm
+ console.log(data);
+ console.log(this.list);
+ data.rawInsProducts = this.list
+ // console.log(data.rawInsProducts);
+ // data.rawInsProducts.forEach(item=>{
+ // console.log(item);
+ // let val = item.testValueList.join(",")
+ // item.testValue = val
+ // console.log(item.testValue);
+ // })
+ // console.log(data);
+ console.log('=====>');
addRawInspects(data).then(res=>{
- this.$message.success("淇濆瓨鎴愬姛")
+ // this.$message.success("淇濆瓨鎴愬姛")
this.$router.go(-1)
}).catch(error=>{
- this.$message.error(error)
+ // this.$message.error(error||'error')
})
},
getDeviceList(){
diff --git a/src/views/quality/rawMaterial/rawMaterial-print.vue b/src/views/quality/rawMaterial/rawMaterial-print.vue
index 358f847..72a69d2 100644
--- a/src/views/quality/rawMaterial/rawMaterial-print.vue
+++ b/src/views/quality/rawMaterial/rawMaterial-print.vue
@@ -71,22 +71,19 @@
style="width:620pt;border-collapse:collapse;border:1pt solid windowtext">
<tbody>
<tr>
- <td width="101" colspan="2" style="width:75.8pt;border:solid windowtext 1.0pt;
- padding:0.2cm 2.4pt 0.2cm 2.4pt">
+ <td width="121" colspan="2" style="width:110pt;border:solid windowtext 1.0pt;padding:0.2cm 1.4pt 0.2cm 1.4pt">
<p class="MsoNormal" align="center" style="text-align:center"><span
style="font-size:9.0pt;font-family:瀹嬩綋">闆朵欢鍚嶇О</span></p>
<p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
style="font-size:9.0pt;font-family:"Arial",sans-serif">Part Description</span>
</p>
</td>
- <td width="127" colspan="3" style="width:95.5pt;border:solid windowtext 1.0pt;
- border-left:1pt solid windowtext;padding:0.2cm 5.4pt 0.2cm 5.4pt">
+ <td width="127" colspan="4" style="width:95.5pt;border:solid windowtext 1.0pt;border-left:1pt solid windowtext;padding:0.2cm 5.4pt 0.2cm 5.4pt">
<p class="MsoNormal" align="center" style="text-align:center">
<span lang="EN-US" style="font-family:"Arial",sans-serif" v-text="tableData.name"></span>
</p>
</td>
- <td width="113" colspan="5" style="width:84.95pt;border:solid windowtext 1.0pt;
- border-left:1pt solid windowtext;padding:0.2cm 5.4pt 0.2cm 5.4pt">
+ <td width="113" colspan="4" style="width:84.95pt;border:solid windowtext 1.0pt;border-left:1pt solid windowtext;padding:0.2cm 5.4pt 0.2cm 5.4pt">
<p class="MsoNormal" align="center" style="text-align:center"><span
style="font-size:9.0pt;font-family:瀹嬩綋">鍨�</span><span lang="EN-US"
style="font-size:9.0pt;font-family:"Arial",sans-serif">
@@ -94,90 +91,71 @@
<p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
style="font-size:9.0pt;font-family:"Arial",sans-serif">Model</span></p>
</td>
- <td width="86" colspan="4" style="width:64.65pt;border:solid windowtext 1.0pt;
- border-left:1pt solid windowtext;padding:0.2cm 5.4pt 0.2cm 5.4pt">
+ <td width="86" colspan="4" style="width:64.65pt;border:solid windowtext 1.0pt;border-left:1pt solid windowtext;padding:0.2cm 5.4pt 0.2cm 5.4pt">
<p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
style="font-family:"Arial",sans-serif" v-text="tableData.specs"></span></p>
</td>
- <td width="72" colspan="2" style="width:54.35pt;border:solid windowtext 1.0pt;
- border-left:1pt solid windowtext;padding:0.2cm 5.4pt 0.2cm 5.4pt">
+ <td width="72" colspan="2" style="width:54.35pt;border:solid windowtext 1.0pt;border-left:1pt solid windowtext;padding:0.2cm 5.4pt 0.2cm 5.4pt">
<p class="MsoNormal" align="center" style="text-align:center"><span
style="font-size:9.0pt;font-family:瀹嬩綋">鍔犲伐鍗曞彿</span></p>
<p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
style="font-size:9.0pt;font-family:"Arial",sans-serif">Order No.</span></p>
</td>
- <td width="128" colspan="3" style="width:96.0pt;border:solid windowtext 1.0pt;
- border-left:1pt solid windowtext;padding:0.2cm 5.4pt 0.2cm 5.4pt">
+ <td width="128" colspan="3" style="width:96.0pt;border:solid windowtext 1.0pt;border-left:1pt solid windowtext;padding:0.2cm 5.4pt 0.2cm 5.4pt">
<p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
style="font-family:"Arial",sans-serif" v-text="tableData.rmessage.split(',')[0]"></span></p>
</td>
</tr>
<tr>
- <td width="101" colspan="2" style="width:75.8pt;border:solid windowtext 1.0pt;
- border-top:1pt solid windowtext;padding:0.2cm 5.4pt 0.2cm 5.4pt">
+ <td width="101" colspan="2" style="width:110pt;border:solid windowtext 1.0pt;border-top:1pt solid windowtext;padding:0.2cm 1.4pt 0.2cm 1.4pt">
<p class="MsoNormal" align="center" style="text-align:center"><span
style="font-size:9.0pt;font-family:瀹嬩綋">妫�楠屼华鍣�</span></p>
<p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
style="font-size:9.0pt;font-family:"Arial",sans-serif">Inspection
instrument</span></p>
</td>
- <td width="127" colspan="3" style="width:95.5pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0.2cm 5.4pt 0.2cm 5.4pt">
+ <td width="127" colspan="4" style="width:95.5pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0.2cm 5.4pt 0.2cm 5.4pt">
<p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
- style="font-family:"Arial",sans-serif"> </span></p>
+ style="font-family:"Arial",sans-serif" v-text="deviceStr"></span></p>
</td>
- <td width="113" colspan="5" style="width:84.95pt;border-top:1pt solid windowtext;border-left:
- 1pt solid windowtext;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0.2cm 5.4pt 0.2cm 5.4pt">
+ <td width="113" colspan="4" style="width:84.95pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0.2cm 5.4pt 0.2cm 5.4pt">
<p class="MsoNormal" align="center" style="text-align:center"><span
style="font-size:9.0pt;font-family:瀹嬩綋">妫�楠屾暟閲�</span></p>
<p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
style="font-size:9.0pt;font-family:"Arial",sans-serif">Quantity to
check</span></p>
</td>
- <td width="86" colspan="4" style="width:64.65pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0.2cm 5.4pt 0.2cm 5.4pt">
+ <td width="86" colspan="4" style="width:64.65pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0.2cm 5.4pt 0.2cm 5.4pt">
<p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
style="font-family:"Arial",sans-serif" v-text="tableData.number"></span></p>
</td>
- <td width="72" colspan="2" style="width:54.35pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0.2cm 5.4pt 0.2cm 5.4pt">
+ <td width="72" colspan="2" style="width:54.35pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0.2cm 5.4pt 0.2cm 5.4pt">
<p class="MsoNormal" align="center" style="text-align:center"><span
style="font-size:9.0pt;font-family:瀹嬩綋">渚涜揣鍗曚綅</span></p>
<p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
style="font-size:9.0pt;font-family:"Arial",sans-serif">Supplier</span></p>
</td>
- <td width="128" colspan="3" style="width:96.0pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0.2cm 5.4pt 0.2cm 5.4pt">
+ <td width="128" colspan="3" style="width:96.0pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0.2cm 5.4pt 0.2cm 5.4pt">
<p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
style="font-family:"Arial",sans-serif" v-text="tableData.supplier"></span></p>
</td>
</tr>
<tr>
- <td width="145" colspan="3" style="width:109.1pt;border:solid windowtext 1.0pt;
- border-top:1pt solid windowtext;padding:0.2cm 5.4pt 0.2cm 5.4pt">
+ <td width="145" colspan="3" style="width:109.1pt;border:solid windowtext 1.0pt;border-top:1pt solid windowtext;padding:0.2cm 0.4pt 0.2cm 0.4pt">
<p class="MsoNormal" align="center" style="text-align:center"><span
style="font-size:9.0pt;font-family:瀹嬩綋">妫�楠岄」鐩�</span></p>
<p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
style="font-size:9.0pt;font-family:"Arial",sans-serif">Inspection Item</span>
</p>
</td>
- <td width="408" colspan="15" style="width:306.35pt;border-top:1pt solid windowtext;border-left:
- 1pt solid windowtext;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0.2cm 5.4pt 0.2cm 5.4pt">
+ <td width="408" colspan="15" style="width:306.35pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0.2cm 5.4pt 0.2cm 5.4pt">
<p class="MsoNormal" align="center" style="text-align:center"><span
style="font-size:9.0pt;font-family:瀹嬩綋">妫�楠岀粨鏋滐紙瀹炴祴鍊硷級</span></p>
<p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
style="font-size:9.0pt;font-family:"Arial",sans-serif">Test result (Measured
value)</span></p>
</td>
- <td width="74" rowspan="2" style="width:55.8pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0.2cm 3.4pt 0.2cm 3.4pt">
+ <td width="74" rowspan="2" style="width:55.8pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0.2cm 3.4pt 0.2cm 3.4pt">
<p class="MsoNormal" align="center" style="text-align:center"><span
style="font-size:9.0pt;font-family:瀹嬩綋">鍒ゅ畾</span></p>
<p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
@@ -185,507 +163,73 @@
</td>
</tr>
<tr>
- <td width="145" colspan="3" style="width:109.1pt;border:solid windowtext 1.0pt;
- border-top:1pt solid windowtext;padding:0.4cm 5.4pt 0.4cm 5.4pt">
+ <td width="145" colspan="3" style="width:109.1pt;border:solid windowtext 1.0pt;border-top:1pt solid windowtext;padding:0.4cm 5.4pt 0.4cm 5.4pt">
<p class="MsoNormal" align="center" style="text-align:center"><span
style="font-size:9.0pt;font-family:瀹嬩綋">鎶�鏈姹�</span></p>
<p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
style="font-size:9.0pt;font-family:"Arial",sans-serif">Technical
Requirement</span></p>
</td>
- <td width="59" style="width:44.4pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;border-bottom:
- solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0.2cm 4.4pt 0.2cm 4.4pt">
+ <td width="59" colspan="2" style="width:44.4pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0.2cm 4.4pt 0.2cm 4.4pt">
<p class="MsoNormal" align="center" style="text-align:center">
<span style="font-size:9.0pt;font-family:瀹嬩綋">鍏樊</span>
<span lang="EN-US" style="font-size:9.0pt;font-family:"Arial",sans-serif">TOL</span>
</p>
</td>
- <td width="43" v-for="(item,index) in 14" :key="index" colspan="1" style="width:32.2pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0.2cm 5.4pt 0.2cm 5.4pt">
+ <td width="43" v-for="(item,index) in 13" :key="index" colspan="1" style="width:32.2pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0.2cm 5.4pt 0.2cm 5.4pt">
<p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
style="font-size:9.0pt;font-family:"Arial",sans-serif">{{item>9?item:'0'+item}}</span></p>
</td>
</tr>
+ </tbody>
+ <tbody v-for="(item,index) in projectList" :key="index">
<tr style="height:19.85pt">
- <td width="85" rowspan="9" style="width:63.95pt;border:solid windowtext 1.0pt;border-top:1pt solid windowtext;padding:0.2cm 5.4pt 0.2cm 5.4pt;height:19.85pt">
+ <td width="85" rowspan="16" style="width:63.95pt;border:solid windowtext 1.0pt;border-top:1pt solid windowtext;padding:0.2cm 5.4pt 0.2cm 5.4pt;height:19.85pt">
<p class="MsoNormal" align="center" style="text-align:center"><span
- style="font-family:瀹嬩綋">灏哄</span></p>
+ style="font-family:瀹嬩綋" v-text="item.rpFather"></span></p>
<p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
- style="font-family:"Arial",sans-serif">Dimension</span></p>
+ style="font-family:"Arial",sans-serif"></span></p>
</td>
- <td width="60" colspan="2" style="width:45.15pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0.2cm 5.4pt 0.2cm 5.4pt;height:19.85pt">
+ <td width="60" colspan="2" style="width:65.15pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0.2cm 5.4pt 0.2cm 5.4pt;height:19.85pt">
<p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
- style="font-family:"Arial",sans-serif"> </span></p>
+ style="font-family:"Arial",sans-serif" v-text="item.children[0].rpName"></span></p>
</td>
- <td width="59" style="width:44.4pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;border-bottom:
- solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0.2cm 5.4pt 0.2cm 5.4pt;
- height:19.85pt">
+ <td width="59" colspan="2" style="width:44.4pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0.2cm 5.4pt 0.2cm 5.4pt;height:19.85pt">
<p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
- style="font-family:"Arial",sans-serif"> </span></p>
+ style="font-family:"Arial",sans-serif" v-text="item.children[0].required"></span></p>
</td>
- <td width="43" v-for="(item,index) in 14" :key="index" colspan="1" style="width:32.2pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0.2cm 5.4pt 0.2cm 5.4pt;height:19.85pt">
+ <td width="43" v-for="(val,index) in item.children[0].testValueList" :key="index" colspan="1" style="width:32.2pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0.2cm 5.4pt 0.2cm 5.4pt;height:19.85pt">
<p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
- style="font-family:"Arial",sans-serif">{{item}}</span></p>
+ style="font-family:"Arial",sans-serif">{{val}}</span></p>
</td>
- <td width="74" style="width:55.8pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;border-bottom:
- solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0.2cm 5.4pt 0.2cm 5.4pt;
- height:19.85pt">
- <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
- style="font-family:"Arial",sans-serif"> </span></p>
+ <td width="74" style="width:55.8pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0.2cm 5.4pt 0.2cm 5.4pt;height:19.85pt">
+ <p v-if="item.children[0].testState==1" class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
+ style="font-family:"Arial",sans-serif">鍚堟牸</span></p>
+ <p v-else class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
+ style="font-family:"Arial",sans-serif">涓嶅悎鏍�</span></p>
</td>
</tr>
- <tr style="height:19.85pt" v-for="(item,index) in 8" :key="index">
+ <tr style="height:19.85pt" v-for="(j,index) in (item.children.slice(1))" :key="index">
<td width="60" colspan="2" style="width:45.15pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;
border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0.2cm 5.4pt 0.2cm 5.4pt;height:19.85pt">
<p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
- style="font-family:"Arial",sans-serif"> </span></p>
+ style="font-family:"Arial",sans-serif">{{j.rpName}}</span></p>
</td>
- <td width="59" style="width:44.4pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;border-bottom:
- solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0.2cm 5.4pt 0.2cm 5.4pt;
- height:19.85pt">
+ <td width="59" colspan="2" style="width:44.4pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0.2cm 5.4pt 0.2cm 5.4pt;height:19.85pt">
<p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
- style="font-family:"Arial",sans-serif"> </span></p>
+ style="font-family:"Arial",sans-serif">{{j.required}}</span></p>
</td>
- <td width="59" v-for="(item,index) in 14" :key="index" style="width:44.4pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;border-bottom:
- solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0.2cm 5.4pt 0.2cm 5.4pt;
- height:19.85pt">
+ <td width="59" v-for="(testValue,index) in j.testValueList" :key="index" style="width:44.4pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0.2cm 5.4pt 0.2cm 5.4pt;height:19.85pt">
<p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
- style="font-family:"Arial",sans-serif"> </span></p>
+ style="font-family:"Arial",sans-serif">{{testValue}}</span></p>
</td>
- <td width="43" colspan="1" style="width:32.2pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0.2cm 5.4pt 0.2cm 5.4pt;height:19.85pt">
- <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
- style="font-family:"Arial",sans-serif"> </span></p>
- </td>
- <tr style="height:19.85pt">
- <td width="85" rowspan="3" style="width:63.95pt;border:solid windowtext 1.0pt;
- border-top:1pt solid windowtext;padding:0.2cm 5.4pt 0.2cm 5.4pt;height:19.85pt">
- <p class="MsoNormal" align="center" style="text-align:center"><span
- style="font-family:瀹嬩綋">铻虹汗</span></p>
- <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
- style="font-family:"Arial",sans-serif">Thread</span></p>
- </td>
- <td width="60" colspan="2" style="width:45.15pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0.2cm 5.4pt 0.2cm 5.4pt;height:19.85pt">
- <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
- style="font-family:"Arial",sans-serif"> </span></p>
- </td>
- <td width="59" style="width:44.4pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;border-bottom:
- solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0.2cm 5.4pt 0.2cm 5.4pt;
- height:19.85pt">
- <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
- style="font-family:"Arial",sans-serif"> </span></p>
- </td>
- <td width="43" colspan="2" style="width:32.2pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0.2cm 5.4pt 0.2cm 5.4pt;height:19.85pt">
- <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
- style="font-family:"Arial",sans-serif"> </span></p>
- </td>
- <td width="45" colspan="2" style="width:33.95pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0.2cm 5.4pt 0.2cm 5.4pt;height:19.85pt">
- <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
- style="font-family:"Arial",sans-serif"> </span></p>
- </td>
- <td width="43" style="width:32.2pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;border-bottom:
- solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0.2cm 5.4pt 0.2cm 5.4pt;
- height:19.85pt">
- <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
- style="font-family:"Arial",sans-serif"> </span></p>
- </td>
- <td width="43" colspan="3" style="width:32.2pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0.2cm 5.4pt 0.2cm 5.4pt;height:19.85pt">
- <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
- style="font-family:"Arial",sans-serif"> </span></p>
- </td>
- <td width="43" style="width:32.15pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0.2cm 5.4pt 0.2cm 5.4pt;height:19.85pt">
- <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
- style="font-family:"Arial",sans-serif"> </span></p>
- </td>
- <td width="46" colspan="2" style="width:34.55pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0.2cm 5.4pt 0.2cm 5.4pt;height:19.85pt">
- <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
- style="font-family:"Arial",sans-serif"> </span></p>
- </td>
- <td width="43" colspan="2" style="width:32.4pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0.2cm 5.4pt 0.2cm 5.4pt;height:19.85pt">
- <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
- style="font-family:"Arial",sans-serif"> </span></p>
- </td>
- <td width="43" style="width:32.3pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;border-bottom:
- solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0.2cm 5.4pt 0.2cm 5.4pt;
- height:19.85pt">
- <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
- style="font-family:"Arial",sans-serif"> </span></p>
- </td>
- <td width="74" style="width:55.8pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;border-bottom:
- solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0.2cm 5.4pt 0.2cm 5.4pt;
- height:19.85pt">
+ <td width="43" colspan="1" style="width:32.2pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0.2cm 5.4pt 0.2cm 5.4pt;height:19.85pt">
<p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
style="font-family:"Arial",sans-serif"> </span></p>
</td>
</tr>
- <tr style="height:19.85pt">
- <td width="60" colspan="2" style="width:45.15pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0.2cm 5.4pt 0.2cm 5.4pt;height:19.85pt">
- <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
- style="font-family:"Arial",sans-serif"> </span></p>
- </td>
- <td width="59" style="width:44.4pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;border-bottom:
- solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0.2cm 5.4pt 0.2cm 5.4pt;
- height:19.85pt">
- <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
- style="font-family:"Arial",sans-serif"> </span></p>
- </td>
- <td width="43" colspan="2" style="width:32.2pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0.2cm 5.4pt 0.2cm 5.4pt;height:19.85pt">
- <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
- style="font-family:"Arial",sans-serif"> </span></p>
- </td>
- <td width="45" colspan="2" style="width:33.95pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0.2cm 5.4pt 0.2cm 5.4pt;height:19.85pt">
- <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
- style="font-family:"Arial",sans-serif"> </span></p>
- </td>
- <td width="43" style="width:32.2pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;border-bottom:
- solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0.2cm 5.4pt 0.2cm 5.4pt;
- height:19.85pt">
- <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
- style="font-family:"Arial",sans-serif"> </span></p>
- </td>
- <td width="43" colspan="3" style="width:32.2pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0.2cm 5.4pt 0.2cm 5.4pt;height:19.85pt">
- <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
- style="font-family:"Arial",sans-serif"> </span></p>
- </td>
- <td width="43" style="width:32.15pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0.2cm 5.4pt 0.2cm 5.4pt;height:19.85pt">
- <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
- style="font-family:"Arial",sans-serif"> </span></p>
- </td>
- <td width="46" colspan="2" style="width:34.55pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0.2cm 5.4pt 0.2cm 5.4pt;height:19.85pt">
- <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
- style="font-family:"Arial",sans-serif"> </span></p>
- </td>
- <td width="43" colspan="2" style="width:32.4pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0.2cm 5.4pt 0.2cm 5.4pt;height:19.85pt">
- <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
- style="font-family:"Arial",sans-serif"> </span></p>
- </td>
- <td width="43" style="width:32.3pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;border-bottom:
- solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0.2cm 5.4pt 0.2cm 5.4pt;
- height:19.85pt">
- <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
- style="font-family:"Arial",sans-serif"> </span></p>
- </td>
- <td width="74" style="width:55.8pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;border-bottom:
- solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0.2cm 5.4pt 0.2cm 5.4pt;
- height:19.85pt">
- <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
- style="font-family:"Arial",sans-serif"> </span></p>
- </td>
- </tr>
- <tr style="height:19.85pt">
- <td width="60" colspan="2" style="width:45.15pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0.2cm 5.4pt 0.2cm 5.4pt;height:19.85pt">
- <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
- style="font-family:"Arial",sans-serif"> </span></p>
- </td>
- <td width="59" style="width:44.4pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;border-bottom:
- solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0.2cm 5.4pt 0.2cm 5.4pt;
- height:19.85pt">
- <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
- style="font-family:"Arial",sans-serif"> </span></p>
- </td>
- <td width="43" colspan="2" style="width:32.2pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0.2cm 5.4pt 0.2cm 5.4pt;height:19.85pt">
- <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
- style="font-family:"Arial",sans-serif"> </span></p>
- </td>
- <td width="45" colspan="2" style="width:33.95pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0.2cm 5.4pt 0.2cm 5.4pt;height:19.85pt">
- <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
- style="font-family:"Arial",sans-serif"> </span></p>
- </td>
- <td width="43" style="width:32.2pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;border-bottom:
- solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0.2cm 5.4pt 0.2cm 5.4pt;
- height:19.85pt">
- <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
- style="font-family:"Arial",sans-serif"> </span></p>
- </td>
- <td width="43" colspan="3" style="width:32.2pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0.2cm 5.4pt 0.2cm 5.4pt;height:19.85pt">
- <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
- style="font-family:"Arial",sans-serif"> </span></p>
- </td>
- <td width="43" style="width:32.15pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0.2cm 5.4pt 0.2cm 5.4pt;height:19.85pt">
- <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
- style="font-family:"Arial",sans-serif"> </span></p>
- </td>
- <td width="46" colspan="2" style="width:34.55pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0.2cm 5.4pt 0.2cm 5.4pt;height:19.85pt">
- <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
- style="font-family:"Arial",sans-serif"> </span></p>
- </td>
- <td width="43" colspan="2" style="width:32.4pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0.2cm 5.4pt 0.2cm 5.4pt;height:19.85pt">
- <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
- style="font-family:"Arial",sans-serif"> </span></p>
- </td>
- <td width="43" style="width:32.3pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;border-bottom:
- solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0.2cm 5.4pt 0.2cm 5.4pt;
- height:19.85pt">
- <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
- style="font-family:"Arial",sans-serif"> </span></p>
- </td>
- <td width="74" style="width:55.8pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;border-bottom:
- solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0.2cm 5.4pt 0.2cm 5.4pt;
- height:19.85pt">
- <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
- style="font-family:"Arial",sans-serif"> </span></p>
- </td>
- </tr>
- <tr style="height:19.85pt">
- <td width="85" rowspan="2" style="width:63.95pt;border:solid windowtext 1.0pt;
- border-top:1pt solid windowtext;padding:0.2cm 5.4pt 0.2cm 5.4pt;height:19.85pt">
- <p class="MsoNormal" align="center" style="text-align:center"><span
- style="font-family:瀹嬩綋">绮楃硻搴�</span></p>
- <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
- style="font-family:"Arial",sans-serif">Roughness</span></p>
- </td>
- <td width="60" colspan="2" style="width:45.15pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0.2cm 5.4pt 0.2cm 5.4pt;height:19.85pt">
- <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
- style="font-family:"Arial",sans-serif"> </span></p>
- </td>
- <td width="59" style="width:44.4pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;border-bottom:
- solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0.2cm 5.4pt 0.2cm 5.4pt;
- height:19.85pt">
- <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
- style="font-family:"Arial",sans-serif"> </span></p>
- </td>
- <td width="43" colspan="2" style="width:32.2pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0.2cm 5.4pt 0.2cm 5.4pt;height:19.85pt">
- <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
- style="font-family:"Arial",sans-serif"> </span></p>
- </td>
- <td width="45" colspan="2" style="width:33.95pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0.2cm 5.4pt 0.2cm 5.4pt;height:19.85pt">
- <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
- style="font-family:"Arial",sans-serif"> </span></p>
- </td>
- <td width="43" style="width:32.2pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;border-bottom:
- solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0.2cm 5.4pt 0.2cm 5.4pt;
- height:19.85pt">
- <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
- style="font-family:"Arial",sans-serif"> </span></p>
- </td>
- <td width="43" colspan="3" style="width:32.2pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0.2cm 5.4pt 0.2cm 5.4pt;height:19.85pt">
- <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
- style="font-family:"Arial",sans-serif"> </span></p>
- </td>
- <td width="43" style="width:32.15pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0.2cm 5.4pt 0.2cm 5.4pt;height:19.85pt">
- <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
- style="font-family:"Arial",sans-serif"> </span></p>
- </td>
- <td width="46" colspan="2" style="width:34.55pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0.2cm 5.4pt 0.2cm 5.4pt;height:19.85pt">
- <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
- style="font-family:"Arial",sans-serif"> </span></p>
- </td>
- <td width="43" colspan="2" style="width:32.4pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0.2cm 5.4pt 0.2cm 5.4pt;height:19.85pt">
- <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
- style="font-family:"Arial",sans-serif"> </span></p>
- </td>
- <td width="43" style="width:32.3pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;border-bottom:
- solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0.2cm 5.4pt 0.2cm 5.4pt;
- height:19.85pt">
- <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
- style="font-family:"Arial",sans-serif"> </span></p>
- </td>
- <td width="74" style="width:55.8pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;border-bottom:
- solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0.2cm 5.4pt 0.2cm 5.4pt;
- height:19.85pt">
- <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
- style="font-family:"Arial",sans-serif"> </span></p>
- </td>
- </tr>
- <tr style="height:19.85pt">
- <td width="60" colspan="2" style="width:45.15pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0.2cm 5.4pt 0.2cm 5.4pt;height:19.85pt">
- <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
- style="font-family:"Arial",sans-serif"> </span></p>
- </td>
- <td width="59" style="width:44.4pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;border-bottom:
- solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0.2cm 5.4pt 0.2cm 5.4pt;
- height:19.85pt">
- <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
- style="font-family:"Arial",sans-serif"> </span></p>
- </td>
- <td width="43" colspan="2" style="width:32.2pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0.2cm 5.4pt 0.2cm 5.4pt;height:19.85pt">
- <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
- style="font-family:"Arial",sans-serif"> </span></p>
- </td>
- <td width="45" colspan="2" style="width:33.95pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0.2cm 5.4pt 0.2cm 5.4pt;height:19.85pt">
- <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
- style="font-family:"Arial",sans-serif"> </span></p>
- </td>
- <td width="43" style="width:32.2pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;border-bottom:
- solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0.2cm 5.4pt 0.2cm 5.4pt;
- height:19.85pt">
- <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
- style="font-family:"Arial",sans-serif"> </span></p>
- </td>
- <td width="43" colspan="3" style="width:32.2pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0.2cm 5.4pt 0.2cm 5.4pt;height:19.85pt">
- <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
- style="font-family:"Arial",sans-serif"> </span></p>
- </td>
- <td width="43" style="width:32.15pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0.2cm 5.4pt 0.2cm 5.4pt;height:19.85pt">
- <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
- style="font-family:"Arial",sans-serif"> </span></p>
- </td>
- <td width="46" colspan="2" style="width:34.55pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0.2cm 5.4pt 0.2cm 5.4pt;height:19.85pt">
- <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
- style="font-family:"Arial",sans-serif"> </span></p>
- </td>
- <td width="43" colspan="2" style="width:32.4pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0.2cm 5.4pt 0.2cm 5.4pt;height:19.85pt">
- <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
- style="font-family:"Arial",sans-serif"> </span></p>
- </td>
- <td width="43" style="width:32.3pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;border-bottom:
- solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0.2cm 5.4pt 0.2cm 5.4pt;
- height:19.85pt">
- <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
- style="font-family:"Arial",sans-serif"> </span></p>
- </td>
- <td width="74" style="width:55.8pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;border-bottom:
- solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0.2cm 5.4pt 0.2cm 5.4pt;
- height:19.85pt">
- <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
- style="font-family:"Arial",sans-serif"> </span></p>
- </td>
- </tr>
- <tr style="height:34.0pt">
- <td width="85" style="width:63.95pt;border:solid windowtext 1.0pt;border-top:
- 1pt solid windowtext;padding:0.2cm 5.4pt 0.2cm 5.4pt;height:34.0pt">
- <p class="MsoNormal" align="center" style="text-align:center"><span
- style="font-family:瀹嬩綋">鏉愯川</span></p>
- <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
- style="font-family:"Arial",sans-serif">Material</span></p>
- </td>
- <td width="120" colspan="3" style="width:89.75pt;border-top:1pt solid windowtext;border-left:
- 1pt solid windowtext;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0.2cm 5.4pt 0.2cm 5.4pt;height:34.0pt">
- <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
- style="font-family:"Arial",sans-serif"> </span></p>
- </td>
- <td width="43" colspan="2" style="width:32.0pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0.2cm 5.4pt 0.2cm 5.4pt;height:34.0pt">
- <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
- style="font-family:"Arial",sans-serif"> </span></p>
- </td>
- <td width="45" colspan="2" style="width:33.95pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0.2cm 5.4pt 0.2cm 5.4pt;height:34.0pt">
- <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
- style="font-family:"Arial",sans-serif"> </span></p>
- </td>
- <td width="43" style="width:32.2pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;border-bottom:
- solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0.2cm 5.4pt 0.2cm 5.4pt;
- height:34.0pt">
- <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
- style="font-family:"Arial",sans-serif"> </span></p>
- </td>
- <td width="43" colspan="3" style="width:32.35pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0.2cm 5.4pt 0.2cm 5.4pt;height:34.0pt">
- <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
- style="font-family:"Arial",sans-serif"> </span></p>
- </td>
- <td width="43" style="width:32.0pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;border-bottom:
- solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0.2cm 5.4pt 0.2cm 5.4pt;
- height:34.0pt">
- <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
- style="font-family:"Arial",sans-serif"> </span></p>
- </td>
- <td width="46" colspan="2" style="width:34.55pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0.2cm 5.4pt 0.2cm 5.4pt;height:34.0pt">
- <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
- style="font-family:"Arial",sans-serif"> </span></p>
- </td>
- <td width="43" colspan="2" style="width:32.4pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;
- border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- padding:0.2cm 5.4pt 0.2cm 5.4pt;height:34.0pt">
- <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
- style="font-family:"Arial",sans-serif"> </span></p>
- </td>
- <td width="43" style="width:32.3pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;border-bottom:
- solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0.2cm 5.4pt 0.2cm 5.4pt;
- height:34.0pt">
- <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
- style="font-family:"Arial",sans-serif"> </span></p>
- </td>
- <td width="74" style="width:55.8pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;border-bottom:
- solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0.2cm 5.4pt 0.2cm 5.4pt;
- height:34.0pt">
- <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
- style="font-family:"Arial",sans-serif"> </span></p>
- </td>
- </tr>
+ </tbody>
+ <!-- bottom -->
<tr style="height:40.95pt">
<td width="145" colspan="3" style="width:109.1pt;border:solid windowtext 1.0pt;
border-top:1pt solid windowtext;padding:0cm 5.4pt 0cm 5.4pt;height:40.95pt">
@@ -733,21 +277,20 @@
<p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
style="font-family:"Arial",sans-serif" v-text="tableData.creatTime.split(' ')[0]"></span></p>
</td>
- <td width="83" colspan="3" style="width:62.25pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;
- border-bottom:none;border-right:solid windowtext 1.0pt;
- padding:0.2cm 5.4pt 0.2cm 5.4pt">
- <p class="MsoNormal" align="center" style="text-align:center"><span
- style="font-family:瀹嬩綋">瀹�</span><span lang="EN-US"
- style="font-family:"Arial",sans-serif">
- </span><span style="font-family:瀹嬩綋">鏍�</span></p>
- <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
- style="font-family:"Arial",sans-serif">Audit</span></p>
+ <td width="83" colspan="3" style="width:62.25pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;border-bottom:none;border-right:solid windowtext 1.0pt;padding:0.2cm 5.4pt 0.2cm 5.4pt">
+ <p class="MsoNormal" align="center" style="text-align:center">
+ <span style="font-family:瀹嬩綋">瀹�</span>
+ <span lang="EN-US" style="font-family:"Arial",sans-serif"> </span>
+ <span style="font-family:瀹嬩綋">鏍�</span>
+ </p>
+ <p class="MsoNormal" align="center" style="text-align:center">
+ <span lang="EN-US" style="font-family:"Arial",sans-serif">Audit</span>
+ </p>
</td>
- <td width="117" colspan="2" style="width:88.1pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;
- border-bottom:none;border-right:solid windowtext 1.0pt;
- padding:0.2cm 5.4pt 0.2cm 5.4pt">
- <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
- style="font-family:"Arial",sans-serif"> </span></p>
+ <td width="117" colspan="2" style="width:88.1pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;border-bottom:none;border-right:solid windowtext 1.0pt;padding:0.2cm 5.4pt 0.2cm 5.4pt">
+ <p class="MsoNormal" align="center" style="text-align:center">
+ <span lang="EN-US" style="font-family:"Arial",sans-serif"> </span>
+ </p>
</td>
</tr>
<tr height="0">
@@ -771,7 +314,6 @@
<td width="43" style="border:none"></td>
<td width="74" style="border:none"></td>
</tr>
- </tbody>
</table>
</div>
<p class="MsoNormal"><span lang="EN-US"> </span></p>
@@ -792,15 +334,93 @@
data(){
return{
tableData: null,
+ projectList: [],
+ deviceStr: null,
+ childrenData: [],
}
},
methods:{
-
+ initData(){
+ let deviceNameList = []
+ if(this.tableData.children){
+ this.tableData.children.forEach(e => {
+ this.projectList.push(e)
+ if(e.children){
+ e.children.forEach(o =>{
+ deviceNameList.push(o.deviceName)
+ })
+ }
+ });
+ }
+ this.deviceStr = Array.from(new Set(deviceNameList)).join(",")
+ },
+ initProjectList(list){
+ const data = {
+ deviceId: '',
+ deviceName: '',
+ required: '',
+ rpName: '',
+ rpUnit: '',
+ testState: '',
+ userName: '',
+ testValueList: new Array(13)
+ }
+ if(list && list.length<2){
+ list.forEach(item=>{
+ if(item.children && item.children.length < 15){
+ let size = 15 - item.children.length
+ for(let j=0;j<item.children.length;j++){
+ let arr = []
+ if(item.children[j].testValue){
+ arr = item.children[j].testValue.split(",")
+ }
+ item.children[j].testValueList = arr
+ if(item.children[0].testValueList.length<13){
+ let num = 13 - item.children[j].testValueList.length
+ for(let i=0;i<num;i++){
+ item.children[j].testValueList.push("")
+ }
+ }
+ }
+ for(let i=0;i< size;i++){
+ item.children.push(data)
+ }
+ }
+ })
+ }else{
+ let size = 0
+ list.forEach(item=>{
+ if(item.children){
+ size+=item.children.length
+ }
+ })
+ if(size<15){
+ let num = 15 - size
+ for(let i=0;i<num;i++){
+ list[list.length-1].children.push(data)
+ }
+ }
+ }
+ // this.projectList = list
+ console.log("list----",list)
+ }
},
created(){
- console.log("qq--",this.formData)
this.tableData = this.formData
- console.log("aa--",this.tableData)
+ this.initData()
+ this.initProjectList(this.projectList)
+ // console.log("aa--",this.tableData)
+ },
+ watch:{
+ formData(newVal){
+ if(newVal){
+ this.projectList = []
+ console.log(newVal)
+ this.tableData = newVal
+ this.initData()
+ this.initProjectList(this.projectList)
+ }
+ }
}
}
</script>
diff --git a/vue.config.js b/vue.config.js
index 115733f..a1d3246 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -2,7 +2,8 @@
* 閰嶇疆鍙傝��:
* https://cli.vuejs.org/zh/config/
*/
-const url = 'http://192.168.0.23:9999'
+// const url = 'http://192.168.0.23:9999'
+const url = 'http://192.168.0.51:9999'
// const url = 'http://ztt-gateway:9999'
const localUrl = 'http://localhost:8089'
//const localUrl = 'http://10.88.15.95:8089'
--
Gitblit v1.9.3