From 7c4b02892b24bc2d219217b5f9e352d0eb531c4e Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期六, 18 十一月 2023 10:22:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/plan/masterproductionschedule/index.vue | 4
src/views/quality/finishedProductInspection/finishedProducter-print.vue | 712 +++++++++++++++++++---------------------------
src/views/plan/manufacturingorder/index.vue | 12
src/views/product/workbench/feed-pane.vue | 8
src/views/basic/location/index.vue | 2
src/views/basic/workstation/workstation-form.vue | 4
src/views/quality/finishedProductInspection/index.vue | 18
src/views/technology/operation/operation-form.vue | 4
src/views/basic/location/location-form.vue | 60 +++-
src/api/warehouse/location.js | 16 +
src/views/quality/rawMaterial/rawMaterial-print.vue | 6
11 files changed, 392 insertions(+), 454 deletions(-)
diff --git a/src/api/warehouse/location.js b/src/api/warehouse/location.js
index 7f1a72f..8afd1f5 100644
--- a/src/api/warehouse/location.js
+++ b/src/api/warehouse/location.js
@@ -106,3 +106,19 @@
params: query
})
}
+
+export function getIfsLocationByGroupCopy(query) {
+ return request({
+ url: '/mes/location/getIfsLocation/copy',
+ method: 'get',
+ params: query
+ })
+}
+
+export function getIfsLocationByGroupCopyAll(query) {
+ return request({
+ url: '/mes/location/getIfsLocationByGroupCopyAll',
+ method: 'get',
+ params: query
+ })
+}
\ No newline at end of file
diff --git a/src/views/basic/location/index.vue b/src/views/basic/location/index.vue
index f0474fe..d1c959d 100644
--- a/src/views/basic/location/index.vue
+++ b/src/views/basic/location/index.vue
@@ -198,7 +198,7 @@
{
minWidth: '200',
prop: 'ifsLocation',
- label: 'ERP搴撲綅',
+ label: 'IFS搴撲綅',
sort: true,
isTrue: false,
isSearch: true,
diff --git a/src/views/basic/location/location-form.vue b/src/views/basic/location/location-form.vue
index c2591bf..8871e84 100644
--- a/src/views/basic/location/location-form.vue
+++ b/src/views/basic/location/location-form.vue
@@ -135,11 +135,10 @@
<el-row>
<el-col :span="12">
<el-form-item
- v-if="permissions.basic_has_ifs"
label="IFS搴撲綅"
prop="ifsLocationDesc"
>
- <!--<el-select
+ <!-- <el-select
v-model="dataForm.ifsLocation"
filterable
placeholder="璇烽�夋嫨IFS搴撲綅"
@@ -152,11 +151,11 @@
:key="index"
>
</el-option>
- </el-select>-->
+ </el-select> -->
<el-cascader
v-model="dataForm.ifsLocationDesc"
:props="locationProps"
- style="width:100%"
+ style="width:100%" filterable
></el-cascader>
</el-form-item>
</el-col>
@@ -219,6 +218,7 @@
warehouseOptions: [],
factoryOptions: [],
ifsLocationOptions: [],
+ locationTree: [],
visible: false,
dataForm: {
id: 0,
@@ -262,34 +262,39 @@
locationProps: {
lazy: true,
lazyLoad(node, resolve) {
- console.log('node', node)
const { level } = node
if (level === 0) {
getIfsLocationGroup().then((response) => {
if (response.data.code === 0) {
const _data = response.data.data
-
- const nodes = _data.map((item) => {
+ const nodes = JSON.parse(_data)["LIST_INFO"].map((item) => {
return {
- value: item.LOCATION_GROUP,
- label: item.LOCATION_GROUP,
+ value: item.LOCATION_GROUP_DESC +'-'+ item.LOCATION_GROUP,
+ label: item.LOCATION_GROUP_DESC +'-'+ item.LOCATION_GROUP,
leaf: false
}
})
+ var set = new Set()
+ nodes.forEach(a=>{
+ set.add(JSON.stringify(a))
+ })
+ var list = []
+ set.forEach(a=>{
+ list.push(JSON.parse(a))
+ })
// 閫氳繃璋冪敤resolve灏嗗瓙鑺傜偣鏁版嵁杩斿洖锛岄�氱煡缁勪欢鏁版嵁鍔犺浇瀹屾垚
- resolve(nodes)
+ resolve(list)
}
})
} else {
- getIfsLocationByGroup({ locationGroup: node.value }).then(
+ getIfsLocationByGroup({ locationNo: node.value.split('-')[1] }).then(
(response) => {
if (response.data.code === 0) {
const _data = response.data.data
-
- const nodes = _data.map((item) => {
+ const nodes = JSON.parse(_data)["LIST_INFO"].map((item) => {
return {
value: item.LOCATION_NO,
- label: item.LOCATION_NO,
+ label: item.LOCATION_DESC +' | '+ item.LOCATION_NO,
leaf: true
}
})
@@ -404,7 +409,32 @@
this.isSubmit = false
}
})
- }
+ },
+ getLocationTree(){
+ getIfsLocationGroup().then((res) => {
+ if (res.data.code === 0) {
+ var strs = JSON.parse(res.data.data)['LIST_INFO']
+ var set3 = new Set()
+ var set2 = new Set()
+ var set = []
+ strs.forEach(a=>{
+ set2.add(a['LOCATION_GROUP_DESC'] + '-' + a['LOCATION_GROUP'])
+ })
+ strs.forEach(a=>{
+ set2.forEach(b=>{
+ if((a['LOCATION_GROUP_DESC'] + '-' + a['LOCATION_GROUP'])==b){
+ set3.add(a['LOCATION_DESC'] + '-' + a['LOCATION_NO'])
+ }
+ set.push({
+ value: b,
+ label: b,
+ children: []
+ })
+ })
+ })
+ }
+ })
+ }
}
}
</script>
diff --git a/src/views/basic/workstation/workstation-form.vue b/src/views/basic/workstation/workstation-form.vue
index 3b09630..9947e12 100644
--- a/src/views/basic/workstation/workstation-form.vue
+++ b/src/views/basic/workstation/workstation-form.vue
@@ -138,7 +138,7 @@
>
</el-transfer>
</el-tab-pane>
- <el-tab-pane label="浜у嚭涓嶅悎鏍煎簱浣�" name="disqualified">
+ <!-- <el-tab-pane label="浜у嚭涓嶅悎鏍煎簱浣�" name="disqualified">
<el-transfer
filterable
v-model="disqualifiedLocationIds"
@@ -159,7 +159,7 @@
@change="handleChangeQualifiedLocation"
>
</el-transfer>
- </el-tab-pane>
+ </el-tab-pane> -->
<el-tab-pane label="妫�楠屽緟澶勭悊搴撲綅" name="pending">
<el-transfer
filterable
diff --git a/src/views/plan/manufacturingorder/index.vue b/src/views/plan/manufacturingorder/index.vue
index 7d24f78..d1e2b8b 100644
--- a/src/views/plan/manufacturingorder/index.vue
+++ b/src/views/plan/manufacturingorder/index.vue
@@ -824,12 +824,12 @@
],
toolbar: [],
operator: [
- {
- text: '鏌ョ湅搴撳瓨',
- type: 'text',
- size: 'small',
- fun: this.searchStock
- }
+ // {
+ // text: '鏌ョ湅搴撳瓨',
+ // type: 'text',
+ // size: 'small',
+ // fun: this.searchStock
+ // }
],
operatorConfig: {
fixed: 'right',
diff --git a/src/views/plan/masterproductionschedule/index.vue b/src/views/plan/masterproductionschedule/index.vue
index aeb9cf5..927b1ff 100644
--- a/src/views/plan/masterproductionschedule/index.vue
+++ b/src/views/plan/masterproductionschedule/index.vue
@@ -771,8 +771,8 @@
return ''
},
// 鍒犻櫎
- deleteHandle(row) {
- this.$confirm('鏄惁纭鍒犻櫎ID涓�' + row.id, '鎻愮ず', {
+ deleteMainPlan(row) {
+ this.$confirm('鏄惁纭浣滃簾ID涓�' + row.id, '鎻愮ず', {
confirmButtonText: '纭畾',
cancelButtonText: '鍙栨秷',
closeOnClickModal: false,
diff --git a/src/views/product/workbench/feed-pane.vue b/src/views/product/workbench/feed-pane.vue
index 3dd5b5f..7b41bbb 100644
--- a/src/views/product/workbench/feed-pane.vue
+++ b/src/views/product/workbench/feed-pane.vue
@@ -144,14 +144,14 @@
><span style="font-size:14px;font-weight:bold">绾胯竟浠撳悎鏍肩墿鏂�</span>
</div>
<div>
- <el-button
+ <!-- <el-button
v-if="permissions.product_feed_scan"
class="feeding-btn"
type="primary"
icon="feed-btn-feeding"
@click="scanAddFeed()"
>鎵爜鎶曟枡</el-button
- >
+ > -->
<el-button
class="feeding-btn"
type="primary"
@@ -1130,7 +1130,7 @@
><span style="font-size:14px;font-weight:bold">宸叉姇鍏ユ湭娑堣�楃墿鏂�</span>
</div>
<div>
- <el-button
+ <!-- <el-button
class="return-btn"
type="primary"
@click="submitIns()"
@@ -1141,7 +1141,7 @@
type="primary"
@click="inputHandle()"
>灏炬枡澶勭悊</el-button
- >
+ > -->
<el-button
class="return-btn"
type="primary"
diff --git a/src/views/quality/finishedProductInspection/finishedProducter-print.vue b/src/views/quality/finishedProductInspection/finishedProducter-print.vue
index 72ca3b6..9690378 100644
--- a/src/views/quality/finishedProductInspection/finishedProducter-print.vue
+++ b/src/views/quality/finishedProductInspection/finishedProducter-print.vue
@@ -1,5 +1,5 @@
<template>
- <div id="20230721_24921" align=center x:publishsource="Excel" style="margin-top: 60pt;margin-left: 20pt;">
+ <div id="20230721_24921" align=center x:publishsource="Excel" style="margin-top: 65pt;margin-left: 10pt;">
<table border=0 cellpadding=0 cellspacing=0 width=1194 style='border-collapse:collapse;table-layout:fixed;width:629pt'>
<tr class=xl6524921 height=20 style='mso-height-source:userset;height:30.0pt'>
<td colspan=3 rowspan=2 height=40 width=122 style='width:150pt;border: 1pt solid windowtext'>
@@ -77,7 +77,7 @@
<td colspan=1 class=xl6624921 style='border-right:.5pt solid black;border-left:none'>
鏍囧噯鍊�
</td>
- <td colspan=1 v-for="a in 9" class=xl6624921 style='border-right:.5pt solid black; border-left:none'>
+ <td colspan=1 v-for="a in columnLength" class=xl6624921 style='border-right:.5pt solid black; border-left:none'>
{{a>9?item:'0'+a}}
</td>
<td colspan=2 class=xl6624921 style='border-right:.5pt solid black;border-left:none'>
@@ -89,9 +89,9 @@
<tbody v-for="(item,index) in prjdata" :key="index">
<tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'>
- <td rowspan=16 height=53 class=xl7624921 style='border-right:.5pt solid black; height:40.05pt'>
- <p class="MsoNormal" align="center" style="text-align:center">
- <span style="font-family:瀹嬩綋">{{item.father}}</span>
+ <td :rowspan="item.children.length" height=53 class=xl7624921 style='border-right:.5pt solid black; height:40.05pt'>
+ <p >
+ <span style=" writing-mode: vertical-rl;font-size: 26pt;">{{item.father}}</span>
</p>
</td>
<td colspan=2 class=xl6624921 style='border-right:.5pt solid black;border-left:none'>
@@ -129,401 +129,6 @@
</td>
</tr>
</tbody>
-
-
- <!-- <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'>
- <td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td>
- <td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 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=9 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 rowspan=2 height=53 class=xl7624921 style='border-right:.5pt solid black;
- height:40.05pt'>閫氭柇/绾垮簭</td>
- <td colspan=7 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'>1600VCD, lmin: 鈻″悎鏍� 鈻′笉鍚堟牸</td>
- <td colspan=7 class=xl6624921 style='border-right:.5pt solid black;
-border-left:none'>2200VCD, lmin: 鈻″悎鏍� 鈻′笉鍚堟牸</td>
- </tr>
- <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'>
- <td colspan=7 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'>4500VCD, lmin: 鈻″悎鏍� 鈻′笉鍚堟牸</td>
- <td colspan=7 class=xl6624921 style='border-right:.5pt solid black;
-border-left:none'>00VCD, min: 鈻″悎鏍� 鈻′笉鍚堟牸</td>
- </tr>
- <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'>
- <td colspan=2 rowspan=4 height=53 class=xl7624921 style='border-right:.5pt solid black;
- height:40.05pt'><p>閫氫俊</p><p>( 1 鎴� 2)</p></td>
- <td colspan=2 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'>1</td>
- <td colspan=9 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'>绗﹀悎TIA Cat 5e Channel鏍囧噯锛� 鈻″悎鏍� 鈻′笉鍚堟牸</td>
- <td colspan=3 rowspan="4" class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'><p>鈻″悎鏍�</p><p>鈻′笉鍚堟牸</p></td>
- </tr>
- <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'>
- <td colspan=2 rowspan=3 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'>2</td>
- <td colspan=9 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'>鍗冨厗缃戦�氫俊娴嬭瘯閫熺巼鈮�800Mbps/鐧惧厗缃戦�氫俊娴嬭瘯閫熺巼鈮�80Mbps</td>
- </tr>
- <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'>
- <td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'>浜у搧</td>
- <td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'>浜у搧</td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'>浜у搧</td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'>浜у搧</td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'>浜у搧</td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'>浜у搧</td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'>浜у搧</td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'>浜у搧</td><td colspan=1 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=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td>
- <td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td>
- </tr>
- <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'>
- <td colspan=2 rowspan=3 height=53 class=xl7624921 style='border-right:.5pt solid black;
- height:40.05pt'><p>鎻掑叆鎹熻�椻墹</p> <p> _________dB</p><p>鈻�1310,鈻�1550</p></td>
- <td colspan=2 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'>浜у搧_</td>
- <td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td>
- <td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td>
- <td colspan=3 rowspan=3 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'><p>鈻″悎鏍�</p><p>鈻′笉鍚堟牸</p></td>
- </tr>
- <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'>
- <td colspan=2 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'>浜у搧_</td>
- <td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td>
- </tr>
- <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'>
- <td colspan=2 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'>浜у搧_</td>
- <td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td>
- </tr>
- <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'>
- <td colspan=2 rowspan=3 height=53 class=xl7624921 style='border-right:.5pt solid black;
- height:40.05pt'><p>鍥炴尝鎹熻�椻墹</p> <p> _________dB</p><p>鈻�1310,鈻�1550</p></td>
- <td colspan=2 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'>浜у搧_</td>
- <td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td>
- <td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td>
- <td colspan=3 rowspan=3 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'><p>鈻″悎鏍�</p><p>鈻′笉鍚堟牸</p></td>
- </tr>
- <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'>
- <td colspan=2 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'>浜у搧_</td>
- <td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td>
- </tr>
- <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'>
- <td colspan=2 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'>浜у搧_</td>
- <td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td>
- </tr>
- <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'>
- <td colspan=2 height=53 class=xl7624921 style='border-right:.5pt solid black;
- height:40.05pt'>姘斿瘑鎬�</td>
- <td colspan=14 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'>鎻掑骇锛�0.3MPa@60s锛夛細 鈻″悎鏍� 鈻′笉鍚堟牸</td>
- </tr>
- <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'>
- <td colspan=2 rowspan=3 height=53 class=xl7624921 style='border-right:.5pt solid black;
- height:40.05pt'>姘村瘑鎬�</td>
- <td colspan=7 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'>15MPa淇濆帇10min, 2娆� 鈻″悎鏍� 鈻′笉鍚堟牸</td>
- <td colspan=7 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'> 36MPa淇濆帇2h, 2娆� 鈻″悎鏍� 鈻′笉鍚堟牸</td>
- </tr>
- <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'>
- <td colspan=7 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'>36MPa淇濆帇10min, 2娆� 鈻″悎鏍� 鈻′笉鍚堟牸</td>
- <td colspan=7 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'> 75MPa淇濆帇2h, 2娆� 鈻″悎鏍� 鈻′笉鍚堟牸</td>
- </tr>
- <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'>
- <td colspan=7 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'>MPa淇濆帇 min, 2娆� 鈻″悎鏍� 鈻′笉鍚堟牸</td>
- <td colspan=7 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'> MPa淇濆帇 h, 2娆� 鈻″悎鏍� 鈻′笉鍚堟牸</td>
- </tr>
- <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'>
- <td colspan=2 height=53 class=xl7624921 style='border-right:.5pt solid black;
- height:40.05pt'>姘村帇鍚庨�氭柇</td>
- <td colspan=14 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'> 鈻″悎鏍� 鈻′笉鍚堟牸</td>
- </tr>
- <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'>
- <td colspan=2 rowspan=3 height=53 class=xl7624921 style='border-right:.5pt solid black;
- height:40.05pt'><p>姘村帇鍚庣粷缂樼數闃�</p><p>(瑕佹眰鍚屼笂)</p></td>
- <td colspan=2 rowspan=3 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'><p>娴嬭瘯鍊�</p><p>缁撴灉鏈�灏忓��</p></td>
- <td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'>浜у搧_</td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'>浜у搧_</td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'>浜у搧_</td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'>浜у搧_</td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'>浜у搧_</td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'>浜у搧_</td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'>浜у搧_</td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'>浜у搧_</td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'>浜у搧_</td>
- <td colspan=2 rowspan=3 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'><p>鈻″悎鏍�</p><p>鈻′笉鍚堟牸</p></td>
- </tr>
- <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'>
- <td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 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=9 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td>
- </tr>
- <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'>
- <td colspan=2 height=53 class=xl7624921 style='border-right:.5pt solid black;
- height:40.05pt'>澶栬妫�鏌�</td>
- <td colspan=14 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'> 鈻″悎鏍� 鈻′笉鍚堟牸</td>
- </tr>
-
- <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'>
- <td colspan=2 rowspan=3 height=53 class=xl7624921 style='border-right:.5pt solid black;
- height:40.05pt'><p>鐢电紗闀垮害(m)</p><p>鎴栧绾块暱搴�(cm)</p></td>
- <td colspan=2 rowspan=3 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'><p>娴嬭瘯缁撴灉</p><p>鍋忓樊鏈�澶у��</p></td>
- <td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'>浜у搧_</td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'>浜у搧_</td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'>浜у搧_</td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'>浜у搧_</td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'>浜у搧_</td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'>浜у搧_</td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'>浜у搧_</td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'>浜у搧_</td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'>浜у搧_</td>
- <td colspan=2 rowspan=3 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'><p>鈻″悎鏍�</p><p>鈻′笉鍚堟牸</p></td>
- </tr>
- <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'>
- <td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 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=9 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 rowspan=3 height=53 class=xl7624921 style='border-right:.5pt solid black;
- height:40.05pt'><p>鎻掗拡楂樹綆钀藉樊</p><p>鈮�0.6mm</p></td>
- <td colspan=2 rowspan=3 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'><p>娴嬭瘯缁撴灉</p><p>鍋忓樊鏈�澶у��</p></td>
- <td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'>浜у搧_</td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'>浜у搧_</td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'>浜у搧_</td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'>浜у搧_</td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'>浜у搧_</td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'>浜у搧_</td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'>浜у搧_</td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'>浜у搧_</td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'>浜у搧_</td>
- <td colspan=2 rowspan=3 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'><p>鈻″悎鏍�</p><p>鈻′笉鍚堟牸</p></td>
- </tr>
- <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'>
- <td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 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=9 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 colspan=3 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td>
- <td colspan=2 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'> 瀹炴祴</td>
- <td colspan=3 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td>
- <td colspan=3 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=16 height=53 class=xl7624921 style='border-right:.5pt solid black;
- height:40.05pt'>鍙戣揣</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=10 height=53 class=xl7624921 style='border-right:.5pt solid black;
- height:40.05pt'>涓庤绠辨竻鍗曞瀷鍙蜂竴鑷�:</td>
- <td colspan=3 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=10 height=53 class=xl7624921 style='border-right:.5pt solid black;
- height:40.05pt'>涓庤绠辨竻鍗曟暟閲忎竴鑷�:</td>
- <td colspan=3 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=10 height=53 class=xl7624921 style='border-right:.5pt solid black;
- height:40.05pt'>涓庤绠辨竻鍗曞唴瀹逛竴鑷�,绮樿创涓庢樉鐪间綅缃�,娌℃湁鎹熷潖:</td>
- <td colspan=3 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 rowspan=6 height=53 class=xl7624921 style='border-right:.5pt solid black;
- height:40.05pt'>浜у搧鍖呰妫�鏌�</td>
- <td colspan=10 height=53 class=xl7624921 style='border-right:.5pt solid black;
- height:40.05pt'>鍚屼竴鍨嬪彿浜у搧鍗曠嫭鍖呰:</td>
- <td colspan=3 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=10 height=53 class=xl7624921 style='border-right:.5pt solid black;
- height:40.05pt'>杩炲附棰滆壊涓庢枃浠惰姹備竴鑷�</td>
- <td colspan=3 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=10 height=53 class=xl7624921 style='border-right:.5pt solid black;
- height:40.05pt'>绾哥浣跨敤閫忔槑鑳跺甫鎴栨媺浼歌啘瑁圭揣</td>
- <td colspan=3 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=10 height=53 class=xl7624921 style='border-right:.5pt solid black;
- height:40.05pt'>鏈ㄧ鍐呴儴蹇呴』鍨ソ娉℃搏绾�,閽夌揣鏈ㄧ,閽㈠甫鎵庣揣</td>
- <td colspan=3 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=10 height=53 class=xl7624921 style='border-right:.5pt solid black;
- height:40.05pt'><p>浣跨敤鐝嶇彔妫夋澘鍥哄畾鎻掑ご銆佹彃搴т綅缃紝鍥哄畾鎻掑骇灏剧嚎浣嶇疆</p> <p>鐢ㄦ媺绁炶啘灏嗕骇鍝佸浐瀹氬湪鐝嶇彔闈㈡澘鍐�</p></td>
- <td colspan=3 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'> 鈻″悎鏍� 鈻′笉鍚堟牸</td>
- </tr>
- <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'>
- <td colspan=10 height=53 class=xl7624921 style='border-right:.5pt solid black;
- height:40.05pt'><p>鍙戝嚭浜у搧涓嶅緱鍑虹幇浠讳綍褰㈠紡鐨勪緵搴斿晢淇℃伅锛屽寘鎷紗鐩樹笂鐨勬爣绛俱�佺數缂�</p><p>涓婁緵搴斿晢鍚嶇О绛�</p></td>
- <td colspan=3 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'> 鈻″悎鏍� 鈻′笉鍚堟牸</td> -->
- <!-- </tr> -->
<tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'>
<td colspan=8 height=53 class=xl7624921 style='border-right:.5pt solid black;
height:40.05pt;text-align: left;'><p> 妫�楠�/鏃堕棿:</p></td>
@@ -541,10 +146,11 @@
<td width=235 style='width:176pt'></td>
</tr>
</table>
-
+ <!-- <div v-for="items in prjdata">
+ <div v-for="aa in items.length"> -->
<template>
<div style="margin-top: 100pt;width: 75%;">
- <div class="head">
+ <div class="head" id="head">
<div class="head-1">
<img width=174 height=58 src="../../../../public/img/image002.png">
</div>
@@ -618,7 +224,260 @@
</div>
</div>
</template>
- </div>
+
+ <template>
+ <div style="margin-top: 100pt;width: 75%;">
+ <div class="head">
+ <div class="head-1">
+ <img width=174 height=58 src="../../../../public/img/image002.png">
+ </div>
+ <div class="head-2">
+ <p><span style="font-size:18pt;font-family:瀹嬩綋;margin-right: 70pt;">涓ぉ娴锋磱绯荤粺鏈夐檺鍏徃</span></p>
+ <span style="font-size:12pt;font-family:瀹嬩綋;margin-right: 70pt;">ZHONGTIAN TECHNOLOGY MARINE SYSTEMS Co.,LTD.</span>
+ </div>
+ </div>
+ <div class="bodycss">
+ <div class="bodycs">
+ <p class=x1111111><span>妫� 娴� 鎶� 鍛�<br>
+ <span class=x1111112 >Test Report</span><br>
+ </span></p>
+ <div class="bodycs-1">
+ <p style="margin-left: 40px;"><span style="font-size:12pt;font-family:榛戜綋">鎶ュ憡缂栧彿:锛圢o锛�:ZTMS01-<br>Report No.锛�</span></p>
+ <p style="margin-left: 620px;"><span style="font-size:12pt;font-family:榛戜綋">椤垫锛�2/8<br> Page</span></p>
+ </div>
+ </div>
+ <div>
+ <p style=" border-top: 1px solid black;width: 96%;margin-top: -1px;"></p>
+ <p class="x1111113" ><span style="font-size 40pt;display: flex;margin-top: 40px;margin-left: 40px;;font-family:榛戜綋">鏍峰搧鐓х墖:<br>Sample锛�</span></p>
+ </div>
+ <div>
+ <table border="2px" style="width: 500px;height: 500px;margin-top: 100px;">
+ <tr style="height: 50px;">
+ <td class="x1111113"><span style="font-size 40pt;margin-left: 200px;font-family:榛戜綋">娴嬭瘯鍓嶇収鐗�</span></td>
+ </tr><tr></tr>
+ </table>
+ </div>
+ <div style="display: flex;margin-top: 130px;margin-left: 40px;">
+ <p ><span style="font-size:12pt;font-family:榛戜綋">鏍峰搧淇℃伅鎻忚堪Sample information description锛�<br>娴嬭瘯鍓嶆牱鍝佺姸鎬侊細Sample state of pretest <br>澶栬妫�鏌ワ細鏍峰搧澶栬鍧囨甯搞�� </span></p>
+
+ </div>
+ </div>
+ </div>
+ <div class="pagefooting">
+ <p><span style="font-size:8pt;font-family:瀹嬩綋;color: cornflowerblue;">
+ 鍦板潃:姹熻嫃鐪佸崡閫氬競缁忔祹鎶�鏈紑鍙戝尯鏂板紑鍗楄矾1鍙�(226010) 鐢佃瘽:051389191125 浼犵湡:051389191123
+ <br>Add: No 1 Xinkainan Road, NETDZ Nantong, Jiangsu, China (226010); TEL: 051389191125 ; Fax:051389191123
+ </span></p>
+ </div>
+ </template>
+
+ <template>
+ <div style="margin-top: 100pt;width: 75%;">
+ <div class="head">
+ <div class="head-1">
+ <img width=174 height=58 src="../../../../public/img/image002.png">
+ </div>
+ <div class="head-2">
+ <p><span style="font-size:18pt;font-family:瀹嬩綋;margin-right: 70pt;">涓ぉ娴锋磱绯荤粺鏈夐檺鍏徃</span></p>
+ <span style="font-size:12pt;font-family:瀹嬩綋;margin-right: 70pt;">ZHONGTIAN TECHNOLOGY MARINE SYSTEMS Co.,LTD.</span>
+ </div>
+ </div>
+ <div class="bodycss">
+ <div class="bodycs">
+ <p class=x1111111><span>妫� 娴� 鎶� 鍛�<br>
+ <span class=x1111112 >Test Report</span><br>
+ </span></p>
+ <div class="bodycs-1">
+ <p style="margin-left: 40px;"><span style="font-size:12pt;font-family:榛戜綋">鎶ュ憡缂栧彿:锛圢o锛�:ZTMS01-<br>Report No.锛�</span></p>
+ <p style="margin-left: 620px;"><span style="font-size:12pt;font-family:榛戜綋">椤垫锛�3/8<br> Page</span></p>
+ </div>
+ </div>
+ <div>
+ <p style=" border-top: 1px solid black;width: 96%;margin-top: -1px;"></p>
+ <p class="x1111113" ><span style="display: flex;margin-top: 40px;margin-left: 40px;">鎶ュ憡姝ｆ枃锛�</span></p>
+ </div>
+ <div class="bodycs" style="margin-top: 30px;">
+ <p class=x1111112><span>{{iname}}<br>
+ </span></p>
+ <div class="bodycs-1" style="margin-top: 10px;">
+ <p style="margin-left: 40px;"><span style="font-size:12pt;font-family:榛戜綋">1.娴嬭瘯璁惧<br> 璁惧鍚嶇О<br>Name of Equipment</span></p>
+ <p style="margin-left: 150px;"><span style="font-size:12pt;font-family:榛戜綋"> <br>璁惧鍨嬪彿<br> Model</span></p>
+ <p style="margin-left: 150px;"><span style="font-size:12pt;font-family:榛戜綋"> <br>璁惧缂栧彿<br>Serial No.</span></p>
+ <p style="margin-left: 150px;"><span style="font-size:12pt;font-family:榛戜綋"> <br>鏍″噯鏈夋晥鏈�<br>Calibration Due Date</span></p>
+ </div>
+ <div>
+ <p style=" border-top: 1px solid black;width: 96%;margin-top: 20px;"></p>
+ </div>
+ </div>
+ <div style="margin-top: 50px;display: flex;">
+ <p style="margin-left: 40px;"><span style="font-size:12pt;font-family:榛戜綋">2.鍙傝�冩爣鍑哛eference standards <br>鏈妫�娴嬫墍渚濇嵁鐨勬妧鏈枃浠讹紙浠ｅ彿銆佸悕绉帮級锛�<br>Reference documents for this testing </span></p>
+ </div>
+ <div>
+ <p style=" border-top: 1px solid black;width: 96%;margin-top: 1px;"></p>
+ </div>
+ <div style="margin-top: 50px;display: flex;">
+ <p class=x1111112 style="margin-left: 40px;"><span style="font-size:12pt;font-family:榛戜綋">3.鐜鏉′欢Environmental conditions锛�</span></p>
+ </div>
+ <div style="display: flex;">
+ <p style="margin-left: 50px;"><span >娓╁害(Temperature)锛氣剝 </span></p>
+ <p style="margin-left: 450px;"><span >鐩稿婀垮害(R.H.)锛�%</span></p>
+ </div>
+ <div style="margin-top: 50px;display: flex;">
+ <p class=x1111112 style="margin-left: 40px;"><span style="font-size:12pt;font-family:榛戜綋">4.娴嬭瘯鐩殑Test purpose锛�</span></p>
+ </div>
+ <div style="margin-top: 50px;display: flex;">
+ <p class=x1111112 style="margin-left: 40px;"><span style="font-size:12pt;font-family:榛戜綋">5.娴嬭瘯鏂规硶Test method锛�</span></p>
+ </div>
+ <div>
+ <br>
+ <br>
+ <br>
+ <span
+ style='mso-spacerun:yes'> </span>
+ </div>
+ </div>
+ </div>
+ <div class="pagefooting">
+ <p><span style="font-size:8pt;font-family:瀹嬩綋;color: cornflowerblue;">
+ 鍦板潃:姹熻嫃鐪佸崡閫氬競缁忔祹鎶�鏈紑鍙戝尯鏂板紑鍗楄矾1鍙�(226010) 鐢佃瘽:051389191125 浼犵湡:051389191123
+ <br>Add: No 1 Xinkainan Road, NETDZ Nantong, Jiangsu, China (226010); TEL: 051389191125 ; Fax:051389191123
+ </span></p>
+ </div>
+ </template>
+
+ <template>
+ <div style="margin-top: 100pt;width: 75%;">
+ <div class="head">
+ <div class="head-1">
+ <img width=174 height=58 src="../../../../public/img/image002.png">
+ </div>
+ <div class="head-2">
+ <p><span style="font-size:18pt;font-family:瀹嬩綋;margin-right: 70pt;">涓ぉ娴锋磱绯荤粺鏈夐檺鍏徃</span></p>
+ <span style="font-size:12pt;font-family:瀹嬩綋;margin-right: 70pt;">ZHONGTIAN TECHNOLOGY MARINE SYSTEMS Co.,LTD.</span>
+ </div>
+ </div>
+ <div class="bodycss">
+ <div class="bodycs">
+ <p class=x1111111><span>妫� 娴� 鎶� 鍛�<br>
+ <span class=x1111112 >Test Report</span><br>
+ </span></p>
+ <div class="bodycs-1">
+ <p style="margin-left: 40px;"><span style="font-size:12pt;font-family:榛戜綋">鎶ュ憡缂栧彿:锛圢o锛�:ZTMS01-<br>Report No.锛�</span></p>
+ <p style="margin-left: 620px;"><span style="font-size:12pt;font-family:榛戜綋">椤垫锛�4/8<br> Page</span></p>
+ </div>
+ </div>
+ <div>
+ <p style=" border-top: 1px solid black;width: 96%;margin-top: -1px;"></p>
+ <p class="x1111113" ><span style="font-size 40pt;display: flex;margin-top: 40px;margin-left: 40px;;font-family:榛戜綋">6.娴嬭瘯缁撴灉Test result锛�</span></p>
+ </div>
+ <div>
+ <table border="2px" style="width: 800px;height: 100px;margin-top: 10px;">
+ <tr style="height: 80px;">
+ <td class="x1111113"><span style="font-size 40pt;margin-left: 80px;font-family:榛戜綋">娴嬭瘯椤圭洰</span></td>
+ <td class="x1111113"><span style="font-size 40pt;margin-left: 80px;font-family:榛戜綋">鏍峰搧鏁伴噺</span></td>
+ <td class="x1111113"><span style="font-size 40pt;margin-left: 80px;font-family:榛戜綋">娴嬭瘯缁撴灉</span></td>
+ </tr>
+ <tr style="height: 100px;">
+ <td></td>
+ <td></td>
+ <td></td>
+ </tr>
+ <tr style="height: 80px;">
+ <td colspan=3></td>
+ </tr>
+ </table>
+ </div>
+ <div>
+ <p class="x1111113" ><span style="font-size 40pt;display: flex;margin-top: 40px;margin-left: 40px;;font-family:榛戜綋">7.娴嬭瘯璧勬枡Test data锛�</span></p>
+ </div>
+ <div>
+ <table border="2px" style="width: 500px;height: 400px;margin-top: 10px;">
+ <tr style="height: 50px;">
+ <td class="x1111113"><span style="font-size 40pt;margin-left: 200px;font-family:榛戜綋">娴嬭瘯鍓嶇収鐗�</span></td>
+ </tr><tr></tr>
+ </table>
+ </div>
+ <div>
+ <br>
+ <br>
+ <br>
+ <span
+ style='mso-spacerun:yes'> </span>
+ </div>
+ </div>
+ </div>
+ <div class="pagefooting">
+ <p><span style="font-size:8pt;font-family:瀹嬩綋;color: cornflowerblue;">
+ 鍦板潃:姹熻嫃鐪佸崡閫氬競缁忔祹鎶�鏈紑鍙戝尯鏂板紑鍗楄矾1鍙�(226010) 鐢佃瘽:051389191125 浼犵湡:051389191123
+ <br>Add: No 1 Xinkainan Road, NETDZ Nantong, Jiangsu, China (226010); TEL: 051389191125 ; Fax:051389191123
+ </span></p>
+ </div>
+ </template>
+
+ <template>
+ <div style="margin-top: 100pt;width: 75%;">
+ <div class="head">
+ <div class="head-1">
+ <img width=174 height=58 src="../../../../public/img/image002.png">
+ </div>
+ <div class="head-2">
+ <p><span style="font-size:18pt;font-family:瀹嬩綋;margin-right: 70pt;">涓ぉ娴锋磱绯荤粺鏈夐檺鍏徃</span></p>
+ <span style="font-size:12pt;font-family:瀹嬩綋;margin-right: 70pt;">ZHONGTIAN TECHNOLOGY MARINE SYSTEMS Co.,LTD.</span>
+ </div>
+ </div>
+ <div class="bodycss">
+ <div class="bodycs">
+ <p class=x1111111><span>妫� 娴� 鎶� 鍛�<br>
+ <span class=x1111112 >Test Report</span><br>
+ </span></p>
+ <div class="bodycs-1">
+ <p style="margin-left: 40px;"><span style="font-size:12pt;font-family:榛戜綋">鎶ュ憡缂栧彿:锛圢o锛�:ZTMS01-<br>Report No.锛�</span></p>
+ <p style="margin-left: 620px;"><span style="font-size:12pt;font-family:榛戜綋">椤垫锛�5/8<br> Page</span></p>
+ </div>
+ </div>
+ <div>
+ <p style=" border-top: 1px solid black;width: 96%;margin-top: -1px;"></p>
+ <p class="x1111113" ><span style="font-size 40pt;display: flex;margin-top: 40px;margin-left: 40px;;font-family:榛戜綋">8.娴嬭瘯鏇茬嚎Test curve锛�</span></p>
+ </div>
+ <div>
+ <br>
+ <br>
+ <br>
+ <br>
+ <br>
+ <br>
+ <br>
+ <span> </span>
+ </div>
+ <div>
+ <p class="x1111113" ><span style="font-size 40pt;display: flex;margin-top: 40px;margin-left: 40px;;font-family:榛戜綋">9.娴嬭瘯鍚庢鏌osttest check锛�</span></p>
+ </div>
+ <div>
+ <table border="2px" style="width: 900px;height: 500px;margin-top: 30px;">
+ <tr style="height: 50px;">
+ <td colspan=2 class="x1111113"><span style="font-size 40pt;margin-left: 380px;font-family:榛戜綋">娴嬭瘯鍚庣収鐗�</span></td>
+ </tr>
+ <tr>
+ <td></td>
+ <td></td>
+ </tr>
+ </table>
+ </div>
+ <div>
+ <p class="x1111113"><span >*****鎶ュ憡缁撴潫*****</span></p>
+ </div>
+ </div>
+ </div>
+ <div class="pagefooting">
+ <p><span style="font-size:8pt;font-family:瀹嬩綋;color: cornflowerblue;">
+ 鍦板潃:姹熻嫃鐪佸崡閫氬競缁忔祹鎶�鏈紑鍙戝尯鏂板紑鍗楄矾1鍙�(226010) 鐢佃瘽:051389191125 浼犵湡:051389191123
+ <br>Add: No 1 Xinkainan Road, NETDZ Nantong, Jiangsu, China (226010); TEL: 051389191125 ; Fax:051389191123
+ </span></p>
+ </div>
+ </template>
+ <!-- </div>
+ </div> -->
+</div>
</template>
<script>
@@ -647,6 +506,8 @@
materialCode:null,
quantity:null,
username:null,
+ iname:null,
+ columnLength: 9,
}
},
filters:{
@@ -665,14 +526,14 @@
},
created(){
this.tableData = this.formData
- console.log(this.tableData,"=======================77777777");
this.initData()
this.initprjdata(this.prjdata)
},
methods:{
initData(){
let ii = []
- console.log("<------------------------------->");
+ let pp = []
+ console.log("<-------------------->");
this.deviceStr = this.tableData.projectName
this.product = this.tableData.material
this.number = this.tableData.quantity
@@ -680,16 +541,20 @@
this.material = this.tableData.material
this.materialCode = this.tableData.materialCode
this.quantity = this.tableData.quantity
- console.log(this.tableData,"--------------------11111");
+ console.log(this.tableData,"-----------11111");
this.tableData.children.forEach(el =>{
this.prjdata.push(el)
el.children.forEach(kl =>{
if(kl.userName){
ii.push(kl.userName)
}
+ if(kl.iname){
+ pp.push(kl.iname)
+ }
})
})
this.username = Array.from(new Set(ii)).join(",")
+ this.iname = Array.from(new Set(pp)).join(",")
},
initprjdata(list){
console.log(list,"uuuuuuuuuuuuuuuuu");
@@ -703,28 +568,30 @@
required: '',
iunit: '',
itype: '',
- testValueList: new Array(9)
+ testValueList: new Array(this.columnLength)
}
+ let rowNum = 15
+ let columnNum = this.columnLength
if(list && list.length<2){
list.forEach(item=>{
- if(item.children && item.children.length < 7){
- let size = 15 - item.children.length
+ if(item.children && item.children.length < rowNum){
+ rowNum = 15 - item.children.length
for(let j=0;j<item.children.length;j++){
let arr = []
if(item.children[j].inspectionValue){
arr = item.children[j].inspectionValue.split(",")
}
item.children[j].testValueList = arr
- if(item.children[0].testValueList.length<12){
- let num = 9 - item.children[j].testValueList.length
+ if(item.children[j].testValueList.length<columnNum){
+ let num = columnNum - item.children[j].testValueList.length
for(let i=0;i<num;i++){
item.children[j].testValueList.push("")
}
}
}
- for(let i=0;i< size;i++){
+ for(let i=0;i< rowNum;i++){
item.children.push(data)
- item.father
+ // item.father
}
}
})
@@ -733,15 +600,30 @@
list.forEach(item=>{
if(item.children){
size+=item.children.length
+ item.children.forEach(obj=>{
+ if(obj.inspectionValue){
+ let testValueList = obj.inspectionValue.split(",")
+ obj.testValueList = testValueList
+ if(testValueList.length < columnNum){
+ let len = columnNum-testValueList.length
+ for(var i=0;i<len;i++){
+ obj.testValueList.push("")
+ }
+ }
+ }else{
+ obj.testValueList = new Array(12)
+ }
+ })
}
})
- if(size<15){
- let num = 15 - size
+ if(size < rowNum){
+ let num = rowNum - size
for(let i=0;i<num;i++){
list[list.length-1].children.push(data)
}
}
}
+ this.prjdata = list
}
},
watch:{
diff --git a/src/views/quality/finishedProductInspection/index.vue b/src/views/quality/finishedProductInspection/index.vue
index c354f84..22736a6 100644
--- a/src/views/quality/finishedProductInspection/index.vue
+++ b/src/views/quality/finishedProductInspection/index.vue
@@ -205,7 +205,7 @@
watch:{
printFormData(newVal){
if(newVal){
- console.log("pData鍙樺寲--",newVal);
+ // console.log("pData鍙樺寲--",newVal);
this.printFormData = newVal
}
}
@@ -217,11 +217,19 @@
},
//鎵撳嵃鎸夐挳
printFun() {
- this.printDialogVisible = false;
+ const printSettings = {
+ paper: {
+ width: 827, // A4绾哥殑瀹藉害锛堝崟浣嶏細鍍忕礌锛�
+ height: 595, // A4绾哥殑楂樺害锛堝崟浣嶏細鍍忕礌锛�
+ orientation: 'portrait', // 绔栧悜鎵撳嵃
+ }}
+
PrintJS({
printable: "printRaw",
type: "html",
+ header:"",
maxWidth: 950,
+ printSettings,
style: '@page {margin: 2.0mm 2.0mm}',
targetStyles: ["*"],
// importCSS: true,
@@ -236,22 +244,20 @@
this.printFormData = res.data.data
this.printFormData.createTime = row.createTime
this.printFormData.updateTime = row.updateTime
- console.log(this.printFormData,"7777777777=====");
this.printDialogVisible = true
}).catch(error=>{
- console.log(error);
})
},
exportExcel(){
let queryParam=this.$refs.finishedProduct.getQueryParam();
delete queryParam.criteria
- console.log(queryParam);
+ // console.log(queryParam);
exportExaminationProducts(queryParam).then((res)=>{
transform(res)
})
},
deleteHandle(row){
- console.log(row.id)
+ // console.log(row.id)
this.$confirm('纭鍒犻櫎璇ユ暟鎹悧锛�', '鎻愮ず', {
confirmButtonText: '纭畾',
cancelButtonText: '鍙栨秷',
diff --git a/src/views/quality/rawMaterial/rawMaterial-print.vue b/src/views/quality/rawMaterial/rawMaterial-print.vue
index c61f311..e246703 100644
--- a/src/views/quality/rawMaterial/rawMaterial-print.vue
+++ b/src/views/quality/rawMaterial/rawMaterial-print.vue
@@ -367,7 +367,9 @@
this.projectList.push(e)
if(e.children){
e.children.forEach(o =>{
- deviceNameList.push(o.deviceName)
+ if(o.deviceName){
+ deviceNameList.push(o.deviceName)
+ }
})
}
});
@@ -424,6 +426,8 @@
obj.testValueList.push("")
}
}
+ }else{
+ obj.testValueList = new Array(12)
}
})
}
diff --git a/src/views/technology/operation/operation-form.vue b/src/views/technology/operation/operation-form.vue
index 6f21354..282dcc6 100644
--- a/src/views/technology/operation/operation-form.vue
+++ b/src/views/technology/operation/operation-form.vue
@@ -592,8 +592,8 @@
// }
},
init() {
- this.operationId = this.dataForm.id
- this.fetchCapabilityForOperation()
+ // this.operationId = this.dataForm.id
+ // this.fetchCapabilityForOperation()
if (this.dataForm.id) {
getObj(this.dataForm.id).then((response) => {
this.dataForm = response.data.data
--
Gitblit v1.9.3