From a88c24cf840a39b20fe0fd8af0c0c549d4d0034a Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期三, 22 十一月 2023 14:10:20 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before
---
src/views/quality/finishedProductInspection/finishedProducter-print.vue | 16 ++++++++++------
src/views/quality/finishedProductInspection/index.vue | 2 +-
src/views/quality/teststandard/index.vue | 26 +++++++++++++++++++++++---
3 files changed, 34 insertions(+), 10 deletions(-)
diff --git a/src/views/quality/finishedProductInspection/finishedProducter-print.vue b/src/views/quality/finishedProductInspection/finishedProducter-print.vue
index c54c5d1..34b49b9 100644
--- a/src/views/quality/finishedProductInspection/finishedProducter-print.vue
+++ b/src/views/quality/finishedProductInspection/finishedProducter-print.vue
@@ -304,21 +304,25 @@
</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>
+ <span style="font-size:12pt;font-family:瀹嬩綋;margin-right: 70pt;">ZHONGTIAN TECHNOLOGY MARINE SYSTEMS Co.,LTD.</span>
+ </div>
</div>
</div>
<div class="bodycss">
<div class="bodycs">
<p class=x1111111><span>妫� 娴� 鎶� 鍛�<br>
- <span class=x1111112 >Test Report</span><br>
+ <div style="display: flex;">
+ <span class=x1111112 style="margin-left: 40px;">鎶ュ憡缂栧彿:锛圢o锛�:ZTMS01-<br>Report No.锛�</span>
+ <span class=x1111112 style="margin-left: 335px;" >Test Report</span>
+ <span class=x1111112 style="margin-left: 335px">椤垫锛�3/8<br> Page</span>
+ </div>
</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>
+
+ <div style="margin-top: 70px;">
<p class="x1111113" ><span style="display: flex;margin-top: 40px;margin-left: 40px;">鎶ュ憡姝ｆ枃锛�</span></p>
</div>
<div class="bodycs" style="margin-top: 80px;">
diff --git a/src/views/quality/finishedProductInspection/index.vue b/src/views/quality/finishedProductInspection/index.vue
index 85b7514..c319403 100644
--- a/src/views/quality/finishedProductInspection/index.vue
+++ b/src/views/quality/finishedProductInspection/index.vue
@@ -218,10 +218,10 @@
PrintJS({
printable: "printRaw",
type: "html",
+ // scanStyles: false,
maxWidth: 1000,
// header: "浜у搧妫�娴嬫姤鍛�",
style:style,
- // scanStyles: false,
targetStyles: ["*"],
ignoreElements: ["no-ignore"],
orientation: 'portrait'
diff --git a/src/views/quality/teststandard/index.vue b/src/views/quality/teststandard/index.vue
index 709f3b4..56a20be 100644
--- a/src/views/quality/teststandard/index.vue
+++ b/src/views/quality/teststandard/index.vue
@@ -78,7 +78,7 @@
align="center"
width="50"
/>
- <el-table-column
+ <!-- <el-table-column
label="鏄惁寮曠敤宸ヨ壓鍙傛暟"
prop="isReference"
align="center"
@@ -125,7 +125,7 @@
<template slot-scope="scope">
<el-input v-model="scope.row.wireCore"></el-input>
</template>
- </el-table-column>
+ </el-table-column> -->
<el-table-column label="鍙傛暟缂栧彿" prop="code" align="center" />
<el-table-column
label="鍙傛暟椤�"
@@ -188,8 +188,28 @@
<template slot-scope="scope">
<el-input v-model="scope.row.parameterFormat"></el-input>
</template>
+ </el-table-column><el-table-column
+ label="娴嬭瘯鏂规硶"
+ prop="purpose"
+ align="center"
+ width="80"
+ >
+ <template slot-scope="scope">
+ <el-input v-model="scope.row.purpose"></el-input>
+ </template>
</el-table-column>
<el-table-column
+ label="娴嬭瘯鐩殑"
+ prop="method"
+ align="center"
+ width="80"
+ >
+ <template slot-scope="scope">
+ <el-input v-model="scope.row.method"></el-input>
+ </template>
+ </el-table-column>
+
+ <!-- <el-table-column
label="閫氶亾"
prop="aisle"
align="center"
@@ -208,7 +228,7 @@
<template slot-scope="scope">
<el-input v-model="scope.row.position"></el-input>
</template>
- </el-table-column>
+ </el-table-column> -->
<el-table-column label="鍗曚綅" prop="unit" align="center" />
<!--<el-table-column label="鍙傛暟绫诲瀷" prop="type" align="center" :formatter="getParam"/>-->
<el-table-column label="鎿嶄綔" align="center">
--
Gitblit v1.9.3