From d08dfe986afb4c310a7a17b23985d92b4afb6fd5 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期一, 20 十一月 2023 10:48:59 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before
---
src/views/quality/finishedProductInspection/finishedProducter-print.vue | 116 +++++++++++++++++++---------
vue.config.js | 2
src/views/quality/finishedProductInspection/index.vue | 16 ++--
src/api/product/personboard.js | 61 ++++++++++++--
src/views/product/workbench/workReportCard.vue | 8 +
src/api/product/handymantype.js | 15 +++
6 files changed, 158 insertions(+), 60 deletions(-)
diff --git a/src/api/product/handymantype.js b/src/api/product/handymantype.js
index 6f71d44..09b43ea 100644
--- a/src/api/product/handymantype.js
+++ b/src/api/product/handymantype.js
@@ -119,3 +119,18 @@
params: query
})
}
+
+export function isProductionCounting(query) {
+ return request({
+ url: '/mes/product/isProductionCounting',
+ method: 'get',
+ params: query
+ })
+}
+
+export function qualifiedLocation(id) {
+ return request({
+ url: '/mes/product/qualifiedLocation/' + id,
+ method: 'get'
+ })
+}
diff --git a/src/api/product/personboard.js b/src/api/product/personboard.js
index f20b0c6..39dbfe5 100644
--- a/src/api/product/personboard.js
+++ b/src/api/product/personboard.js
@@ -134,6 +134,14 @@
})
}
+export function getOperationTaskCopy(query) {
+ return request({
+ url: '/mes/operationTask/getOperationTaskCopy',
+ method: 'get',
+ params: query
+ })
+}
+
export function changeOperationTaskState(ids, event) {
return request({
url: '/mes/operationTask/product/changeState/' + event,
@@ -260,14 +268,6 @@
})
}
-export function submitProductMain(obj) {
- return request({
- url: '/mes/product/submitProductMain',
- method: 'post',
- data: obj
- })
-}
-
export function batchSaveProductOutput(obj) {
return request({
url: '/mes/product/batchSaveProductOutput',
@@ -339,6 +339,15 @@
url: '/mes/product/state/batchChange/' + event,
method: 'post',
data: ids
+ })
+}
+
+// 鎵归噺鎻愪氦
+export function batchChangeCopy(qury, event) {
+ return request({
+ url: '/mes/product/state/batchChangeCopy/' + event,
+ method: 'post',
+ data: qury
})
}
@@ -518,9 +527,41 @@
})
}
-export function getOperationTaskCopy(query) {
+export function submitInsPart(obj) {
return request({
- url: '/mes/operationTask/getOperationTaskCopy',
+ url: '/mes/applyPart/submitIns',
+ method: 'post',
+ data: obj
+ })
+}
+
+export function submitProductMain(obj) {
+ return request({
+ url: '/mes/product/submitProductMain',
+ method: 'post',
+ data: obj
+ })
+}
+
+export function inputHandle(obj) {
+ return request({
+ url: '/mes/feeding/inputHandle',
+ method: 'post',
+ data: obj
+ })
+}
+
+export function cancellationOfWorkApplication(query) {
+ return request({
+ url: '/mes/product/cancellationOfWorkApplication',
+ method: 'get',
+ params: query
+ })
+}
+
+export function generateBackflush(query) {
+ return request({
+ url: '/mes/product/generateBackFlush',
method: 'get',
params: query
})
diff --git a/src/views/product/workbench/workReportCard.vue b/src/views/product/workbench/workReportCard.vue
index c423b47..7f40381 100644
--- a/src/views/product/workbench/workReportCard.vue
+++ b/src/views/product/workbench/workReportCard.vue
@@ -126,7 +126,7 @@
<!-- <el-button class="tracking-out-revoke-btn" type="primary" icon="tracking-btn-out"
:disabled="currProductMainDisable || currentDutyRecord.isConfirm" v-if="!editShow" >浜ょ彮
</el-button> -->
- <el-button class="submit-out-btn" type="primary"
+ <el-button class="submit-out-btn" type="primary"
:disabled="currProductMainDisable || currentDutyRecord.isConfirm" v-if="!editShow" @click="submitList()"
:loading="submitLoading">鎻愪氦
</el-button>
@@ -3246,7 +3246,7 @@
// 鍒锋柊浜у嚭璁板綍
// this.$emit('refreshProductOutput')
} else if (refreshType === 5) {
- // 鎻愪氦鎶ュ憡鍚庯紝鍒锋柊
+ // 鎻愪氦鎶ュ憡鍚庯紝鍒�
// 鍒锋柊宸ュ崟鍒楄〃
this.$emit('refreshOperateTasks')
// 鍒锋柊浜у嚭璁板綍
@@ -3270,7 +3270,9 @@
this.options = res.data.data
if (this.options.length > 1) {
this.dialogVisible = true
- } else {
+ } else if(this.options.length == 0){
+ this.$message.error('宸ヤ綔绔欐湭缁戝畾鍚堟牸搴撲綅')
+ } else {
this.locationIdValue = this.options[0].id
this.submitListApi()
}
diff --git a/src/views/quality/finishedProductInspection/finishedProducter-print.vue b/src/views/quality/finishedProductInspection/finishedProducter-print.vue
index 266bcc3..d0994b0 100644
--- a/src/views/quality/finishedProductInspection/finishedProducter-print.vue
+++ b/src/views/quality/finishedProductInspection/finishedProducter-print.vue
@@ -1,18 +1,18 @@
-<template class="WordSection1">
-<div align=center style="word-wrap:break-word;text-justify-trim:punctuation">
+<template>
+<div class="WordSection1" align=center style="word-wrap:break-word;text-justify-trim:punctuation">
<div align="center" >
- <table style='border-collapse:collapse;table-layout:fixed;width:629pt;page-break-after: always;margin-left: 25pt;margin-top: 80px;'>
- <tr class=xl6524921 height=20 style='mso-height-source:userset;height:30.0pt'>
+ <table style="border-collapse:collapse;table-layout:fixed;page-break-after: always;" width="629">
+ <tr class="xl6524921" height=20 style='mso-height-source:userset;height:30.0pt'>
<td colspan=3 rowspan=2 style='width:160pt;height: 60pt;border: 1pt solid windowtext'>
<span style='mso-ignore:vglayout;margin-left:12px;margin-top:14px;width:104px;height:42px'>
<img width=174 height=58 src="../../../../public/img/image001.jpg">
</span>
</td>
- <td colspan=6 class=xl6624921 style='border-right:.5pt solid black;border-left:none;width:260pt;height: 60pt'>璁板綍鍚嶇О:杩炴帴鍣ㄥ強鎴愬搧妫�楠岃褰曡〃</td>
- <td colspan=3 class=xl6624921 style='border-left:none;width: 160pt;height: 60pt'>淇濆瓨鏈熼檺:25骞�</td>
- <td rowspan=2 colspan=3 class=xl6824921 width=235 style='width:136pt;height: 60pt' >鐗堟湰鍙�: A/0</td>
+ <td colspan=6 class="xl6624921" style='border-right:.5pt solid black;border-left:none;width:380pt;height: 60pt'>璁板綍鍚嶇О:杩炴帴鍣ㄥ強鎴愬搧妫�楠岃褰曡〃</td>
+ <td colspan=3 class="xl6624921" style='border-left:none;width: 160pt;height: 60pt'>淇濆瓨鏈熼檺:25骞�</td>
+ <td rowspan=2 colspan=3 class="xl6824921" style='width:136pt;height: 60pt' >鐗堟湰鍙�: A/0</td>
</tr>
- <tr class=xl6524921 height=33 style='mso-height-source:userset;height:25.05pt'>
+ <tr class="xl6524921" height=33 style='mso-height-source:userset;height:25.05pt'>
<td colspan=6 height=33 class=xl6624921 style='border-right:.5pt solid black;height:25.05pt;border-left:none'>
璁板綍缂栧彿:ZTT/QR-8.6-05锛圓/0)
</td>
@@ -21,48 +21,48 @@
</td>
<td colspan=2 class=xl6824921 style='border-top:none'></td>
</tr>
- <tr class=xl6524921 style='mso-height-source:userset;height:25.05pt'>
+ <tr class="xl6524921" style='mso-height-source:userset;height:25.05pt'>
<td colspan=16 class=xl7424921 width=1194 style='height:25.05pt; width:897pt'>
杩炴帴鍣ㄥ強鎴愬搧妫�楠岃褰曡〃
</td>
</tr>
- <tr class=xl6524921 style='mso-height-source:userset;height:40.05pt'>
- <td colspan=2 class=xl7624921 style='border-right:.5pt solid black; height:40.05pt'>
+ <tr class="xl6524921" style='mso-height-source:userset;height:40.05pt'>
+ <td colspan=2 class="xl7624921" style='border-right:.5pt solid black; height:40.05pt'>
椤圭洰鍚嶇О:
</td>
- <td colspan=5 class=xl6624921 style='border-right:.5pt solid black; border-left:none'>銆�
+ <td colspan=5 class="xl6624921" style='border-right:.5pt solid black; border-left:none'>銆�
<p class="MsoNormal" align="center" style="text-align:center">
<span lang="EN-US" style="font-family:"Arial",sans-serif" v-text="deviceStr"></span>
</p>
</td>
- <td colspan=2 class=xl6924921 style='border-top:none;border-left:none'>妫�楠屼緷鎹�:</td>
- <td colspan=7 class=xl6624921 style='border-right:.5pt solid black; border-left:none'>
+ <td colspan=2 class="xl6924921" style='border-top:none;border-left:none'>妫�楠屼緷鎹�:</td>
+ <td colspan=7 class="xl6624921" style='border-right:.5pt solid black; border-left:none'>
銆� </td>
</tr>
- <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'>
+ <tr class="xl6524921" height=53 style='mso-height-source:userset;height:40.05pt'>
<td colspan=2 height=53 class=xl7624921 style='border-right:.5pt solid black; height:40.05pt'>
浜у搧鍚嶇О:
</td>
- <td colspan=4 class=xl6624921 style='border-right:.5pt solid black; border-left:none'>
+ <td colspan=4 class="xl6624921" style='border-right:.5pt solid black; border-left:none'>
<p class="MsoNormal" align="center" style="text-align:center">
<span lang="EN-US" style="font-family:"Arial",sans-serif" v-text="product"></span>
</p>
</td>
- <td colspan=2 class=xl6924921 style='border-top:none;border-left:none'>浜у搧鍨嬪彿:</td>
- <td colspan=3 class=xl6624921 style='border-right:.5pt solid black; border-left:none'>
+ <td colspan=2 class="xl6924921" style='border-top:none;border-left:none'>浜у搧鍨嬪彿:</td>
+ <td colspan=3 class="xl6624921" style='border-right:.5pt solid black; border-left:none'>
<p class="MsoNormal" align="center" style="text-align:center">
<span lang="EN-US" style="font-family:"Arial",sans-serif" v-text="typedata"></span>
</p>
</td>
- <td colspan=2 class=xl6924921 style='border-top:none;border-left:none'>浜у搧鏁伴噺:</td>
- <td colspan=3 class=xl6624921 style='border-right:.5pt solid black; border-left:none'>
+ <td colspan=2 class="xl6924921" style='border-top:none;border-left:none'>浜у搧鏁伴噺:</td>
+ <td colspan=3 class="xl6624921" style='border-right:.5pt solid black; border-left:none'>
<p class="MsoNormal" align="center" style="text-align:center">
<span lang="EN-US" style="font-family:"Arial",sans-serif" v-text="number"></span>
</p>
</td>
</tr>
- <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'>
+ <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>
@@ -71,7 +71,7 @@
</td>
</tr>
- <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'>
+ <tr class="xl6524921" height=53 style='mso-height-source:userset;height:40.05pt'>
<td colspan=3 height=53 class=xl7624921 style='border-right:.5pt solid black;height:40.05pt'>
妫�楠岃姹�
</td>
@@ -89,7 +89,7 @@
<tbody v-for="(item,index) in prjdata" :key="index">
- <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'>
+ <tr class="xl6524921" height=53 style='mso-height-source:userset;height:40.05pt'>
<td :rowspan="item.children.length" height=53 class=xl7624921 style='border-right:.5pt solid black; height:40.05pt'>
<p >
<span style=" writing-mode: vertical-rl;font-size: 26pt;">{{item.father}}</span>
@@ -112,7 +112,7 @@
<span lang="EN-US" style="font-family:"Arial",sans-serif">涓嶅悎鏍�</span></p>
</td>
</tr>
- <tr class=xl6524921 height=53 v-for="(el,index) in (item.children.slice(1))" :key="index" style='mso-height-source:userset;height:40.05pt'>
+ <tr class="xl6524921" height=53 v-for="(el,index) in (item.children.slice(1))" :key="index" style='mso-height-source:userset;height:40.05pt'>
<td colspan=2 class=xl6624921 style='border-right:.5pt solid black;border-left:none'>
<span style="font-family:瀹嬩綋">{{el.iname}}</span>
</td>
@@ -130,7 +130,7 @@
</td>
</tr>
</tbody>
- <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'>
+ <tr class="xl6524921" height=53 style='mso-height-source:userset;height:40.05pt'>
<td colspan=8 height=53 class=xl7624921 style='border-right:.5pt solid black;height:40.05pt;text-align: left;'>
<p> 妫�楠�/鏃堕棿:<span>{{tableData.createTime}}</span></p></td>
<td colspan=8 height=53 class=xl7624921 style='border-right:.5pt solid black; height:40.05pt;text-align: left;'>
@@ -151,9 +151,9 @@
</div>
<div v-for="pel in prjdata">
<template>
- <div style="page-break-after: always;">
+ <div align="center" style="page-break-after: always;border-collapse:collapse;table-layout:fixed;page-break-after: always;" width="629">
<div >
- <div class="head" id="head">
+ <div class="head">
<div class="head-1">
<img width=174 height=58 src="../../../../public/img/image002.png">
</div>
@@ -166,13 +166,14 @@
<div class="bodycs">
<p class=x1111111><span>妫� 娴� 鎶� 鍛�<br>
<span class=x1111112 >Test Report</span><br>
- <p style=" border-top: 1px solid black;width: 96%;margin-top: -1px;"></p>
+ <p style=" border-top: 1px solid black;width: 900pt;margin-top: -1px;"></p>
</span></p>
</div>
- <div class="bodycs-1">
- <p style="margin-left: 40px;"><span style="font-size:12pt;font-family:榛戜綋">鎶ュ憡缂栧彿:锛圢o锛�:ZTMS01-<br>Report No.锛�</span></p>
+ <div style="margin-left:40pt">
+ <div class="bodycs-1">
+ <p ><span style="font-size:12pt;font-family:榛戜綋">鎶ュ憡缂栧彿:锛圢o锛�:ZTMS01-<br>Report No.锛�</span></p>
<p style="margin-left: 350px;"><span style="font-size:12pt;font-family:榛戜綋">鎶ュ憡鏃ユ湡<br> Report Date</span></p>
- <p style="margin-left: 180px;"><span style="font-size:12pt;font-family:榛戜綋">椤垫锛�1/8<br> Page</span></p>
+ <p style="margin-left: 190px;"><span style="font-size:12pt;font-family:榛戜綋">椤垫锛�1/8<br> Page</span></p>
</div>
<div>
<div class="bodycs-2">
@@ -208,6 +209,14 @@
<p ><span class="x1111113">妫�楠屽憳锛�<br> Tested by</span></p>
<p ><span class="time">{{username}}</span><br><span style="display: block;height: 2px; width: 300px; background: rgb(20, 20, 22);margin-left: 75px;"></span></span></p>
</div>
+ <div>
+ <br>
+ <br>
+ <br>
+ <br><br><br>
+ <span
+ style='mso-spacerun:yes'> </span>
+ </div>
<div class="cldata">
<p ><span class="x1111113">閫佹牱鏃ユ湡:<br>Delivery Date</span></p>
<p ><span class="time">{{tableData.updateTime}}</span><br><span style="display: block;height: 2px; width: 300px; background: rgb(20, 20, 22);margin-left: 75px;"></span></span></p>
@@ -216,11 +225,12 @@
<p ><span class="x1111113">娴嬭瘯鏃ユ湡:<br>Testing Date</span></p>
<p ><span class="time">{{tableData.createTime}}</span><br><span style="display: block;height: 2px; width: 300px; background: rgb(20, 20, 22);margin-left: 75px;"></span></span></p>
</div>
+ </div>
</div>
</div>
</div>
<div class="pagefooting">
- <p><span style="font-size:8pt;font-family:瀹嬩綋;color: cornflowerblue;">
+ <p><span style="font-size:8pt;font-family:瀹嬩綋;color: cornflowerblue;margin-left: 40pt;">
鍦板潃:姹熻嫃鐪佸崡閫氬競缁忔祹鎶�鏈紑鍙戝尯鏂板紑鍗楄矾1鍙�(226010) 鐢佃瘽:051389191125 浼犵湡:051389191123
<br>Add: No 1 Xinkainan Road, NETDZ Nantong, Jiangsu, China (226010); TEL: 051389191125 ; Fax:051389191123
</span></p>
@@ -268,6 +278,14 @@
</div>
</div>
</div>
+ <div>
+ <br>
+ <br>
+ <br>
+ <br><br><br>
+ <span
+ style='mso-spacerun:yes'> </span>
+ </div>
<div class="pagefooting">
<p><span style="font-size:8pt;font-family:瀹嬩綋;color: cornflowerblue;">
鍦板潃:姹熻嫃鐪佸崡閫氬競缁忔祹鎶�鏈紑鍙戝尯鏂板紑鍗楄矾1鍙�(226010) 鐢佃瘽:051389191125 浼犵湡:051389191123
@@ -303,7 +321,7 @@
<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;">
+ <div class="bodycs" style="margin-top: 80px;">
<p class=x1111112><span>{{iname}}<br>
</span></p>
<div class="bodycs-1" style="margin-top: 10px;">
@@ -316,13 +334,13 @@
<p style=" border-top: 1px solid black;width: 96%;margin-top: 20px;"></p>
</div>
</div>
- <div style="margin-top: 50px;display: flex;">
+ <div style="margin-top: 100px;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;">
+ <div style="margin-top: 80px;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;">
@@ -332,7 +350,7 @@
<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;">
+ <div style="margin-top: 80px;display: flex;">
<p class=x1111112 style="margin-left: 40px;"><span style="font-size:12pt;font-family:榛戜綋">5.娴嬭瘯鏂规硶Test method锛�</span></p>
</div>
<div>
@@ -413,6 +431,13 @@
<span
style='mso-spacerun:yes'> </span>
</div>
+ <div>
+ <br>
+ <br>
+ <br>
+ <span
+ style='mso-spacerun:yes'> </span>
+ </div>
</div>
</div>
<div class="pagefooting">
@@ -460,6 +485,13 @@
<br>
<span> </span>
</div>
+ <div>
+ <br>
+ <br>
+ <br>
+ <span
+ style='mso-spacerun:yes'> </span>
+ </div>
<div>
<p class="x1111113" ><span style="font-size 40pt;display: flex;margin-top: 40px;margin-left: 40px;;font-family:榛戜綋">9.娴嬭瘯鍚庢鏌osttest check锛�</span></p>
</div>
@@ -479,6 +511,13 @@
</div>
</div>
</div>
+ <div>
+ <br>
+ <br>
+ <br>
+ <span
+ style='mso-spacerun:yes'> </span>
+ </div>
<div class="pagefooting">
<p><span style="font-size:8pt;font-family:瀹嬩綋;color: cornflowerblue;">
鍦板潃:姹熻嫃鐪佸崡閫氬競缁忔祹鎶�鏈紑鍙戝尯鏂板紑鍗楄矾1鍙�(226010) 鐢佃瘽:051389191125 浼犵湡:051389191123
@@ -581,7 +620,7 @@
itype: '',
testValueList: new Array(this.columnLength)
}
- let rowNum = 15
+ let rowNum = 20
let columnNum = this.columnLength
if(list && list.length<2){
list.forEach(item=>{
@@ -1760,6 +1799,7 @@
.head{
display: flex;
+ width: 900pt;
.head-1{
padding: 40px;
}
@@ -1771,7 +1811,7 @@
}
}
.bodycss{
- // margin-left: 85px;
+ margin-left: 85px;
}
.bodycs{
// margin-left: 135px;
diff --git a/src/views/quality/finishedProductInspection/index.vue b/src/views/quality/finishedProductInspection/index.vue
index 4eb4799..808f453 100644
--- a/src/views/quality/finishedProductInspection/index.vue
+++ b/src/views/quality/finishedProductInspection/index.vue
@@ -217,19 +217,19 @@
},
//鎵撳嵃鎸夐挳
printFun() {
- const printSettings = {
- paper: {
- width: 827, // A4绾哥殑瀹藉害锛堝崟浣嶏細鍍忕礌锛�
- height: 595, // A4绾哥殑楂樺害锛堝崟浣嶏細鍍忕礌锛�
- orientation: 'portrait', // 绔栧悜鎵撳嵃
- }}
+ // const printSettings = {
+ // paper: {
+ // width: 827, // A4绾哥殑瀹藉害锛堝崟浣嶏細鍍忕礌锛�
+ // height: 595, // A4绾哥殑楂樺害锛堝崟浣嶏細鍍忕礌锛�
+ // orientation: 'portrait', // 绔栧悜鎵撳嵃
+ // }}
PrintJS({
printable: "printRaw",
type: "html",
maxWidth: 1000,
- printSettings,
- style: '@page {margin: 2.0mm 2.0mm;size:A4;}',
+ // printSettings,
+ style: '@page {margin: 10mm 5mm;size:A4;}',
targetStyles: ["*"],
ignoreElements: ["no-ignore"],
orientation: 'portrait'
diff --git a/vue.config.js b/vue.config.js
index 94a4809..8b62c9b 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -2,7 +2,7 @@
* 閰嶇疆鍙傝��:
* 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.60:9999'
const url = 'http://localhost:9999'
--
Gitblit v1.9.3