From d7c8e07d5e7dca7582f019fd4a8283a28f8fe027 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期二, 10 九月 2024 10:26:38 +0800
Subject: [PATCH] 报工新增流程卡查询语句修改，一行两列打印标签修改
---
north-glass-erp/northglass-erp/src/components/pp/PrintProcess.vue | 332 +++++++++++++++++++++++++++++++++---------------------
1 files changed, 202 insertions(+), 130 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/components/pp/PrintProcess.vue b/north-glass-erp/northglass-erp/src/components/pp/PrintProcess.vue
index a1473b0..1beef24 100644
--- a/north-glass-erp/northglass-erp/src/components/pp/PrintProcess.vue
+++ b/north-glass-erp/northglass-erp/src/components/pp/PrintProcess.vue
@@ -23,23 +23,49 @@
})
let props = defineProps({
- printList:null,
- printMerge:null
+ printList: null,
+ printMerge: null,
+ printLike: null
})
const {currentRoute} = useRouter()
const route = currentRoute.value
const printMerge = props.printMerge
+let merge = props.printMerge
+if (merge == '') {
+ merge = null
+}
+let like = props.printLike
+if (like == '') {
+ like = null
+}
data.value.printList = JSON.parse(props.printList)
-let flowCardCount = data.value.printList.length
+let flowCardCount = ''
onMounted(() => {
- // if (id === null || id === undefined || id === '') {
- // return
- // }
-
- request.post(`/processCard/getSelectPrinting`, data.value).then((res) => {
+ request.post(`/processCard/getSelectPrinting/${merge}/${like}`, data.value).then((res) => {
if (res.code == 200) {
produceList.value = deepClone(res.data.data)
+ //澶勭悊鍗曠墖鍘氬害
+
+ for (let j = 0; j < produceList.value.length; j++) {
+ let sumWeight = 0
+ produceList.value[j].detailList.forEach((item, index) => {
+ // 瑙ｆ瀽 separation 瀛楁鐨� JSON 瀛楃涓�
+ let separationObj = JSON.parse(item.separation);
+
+ // 鑾峰彇 thickness 鐨勫師濮嬪��
+ let thicknessValue = separationObj.thickness;
+
+ // 鍘婚櫎 'mm' 鍗曚綅
+ let thicknessWithoutUnit = thicknessValue.replace('mm', '');
+
+ item.separation = thicknessWithoutUnit
+
+ sumWeight += item.width * item.height * item.quantity / 1000000 * item.separation * 2.5 * 1;
+
+ });
+ produceList.value[j].detail[0].weight = sumWeight
+ }
//澶勭悊鍚堝苟鎵撳嵃
if (printMerge !== null && printMerge !== undefined && printMerge !== "") {
@@ -48,26 +74,29 @@
});
//鍚堝苟鎵撳嵃宸ヨ壓娴佺▼澶勭悊
- let process = produceList.value[0].detail[0].process
- let indexOfJiaJiao = process.indexOf('澶硅兌');
- if (indexOfJiaJiao !== -1) {
- // 浣跨敤 substring 鎴彇 "澶硅兌" 鍚庨潰鐨勯儴鍒嗭紝鍖呮嫭 "澶硅兌" 鏈韩
- let afterJiaJiao = process.substring(indexOfJiaJiao).trim();
- produceList.value.forEach(item =>{
- item.detail[0].process = afterJiaJiao
- })
+ if (like == null) {
+ let process = produceList.value[0].detail[0].process
+ let indexOfJiaJiao = process.indexOf('澶硅兌');
+ if (indexOfJiaJiao !== -1) {
+ // 浣跨敤 substring 鎴彇 "澶硅兌" 鍚庨潰鐨勯儴鍒嗭紝鍖呮嫭 "澶硅兌" 鏈韩
+ let afterJiaJiao = process.substring(indexOfJiaJiao).trim();
+ produceList.value.forEach(item => {
+ item.detail[0].process = afterJiaJiao
+ })
+ }
+
+ let indexOfProceList = produceList.value[0].processList
+ let getProceList = indexOfProceList.findIndex(item => item.process === '澶硅兌');
+
+ if (getProceList !== -1) {
+ // 浣跨敤 filter 鏂规硶杩囨护鍑� "澶硅兌" 鍙婂叾涔嬪悗鐨勫璞�
+ produceList.value[0].processList = indexOfProceList.filter((item, index) => index >= getProceList);
+ }
+ }
}
- let indexOfProceList=produceList.value[0].processList
- let getProceList = indexOfProceList.findIndex(item => item.process === '澶硅兌');
- if (getProceList !== -1) {
- // 浣跨敤 filter 鏂规硶杩囨护鍑� "澶硅兌" 鍙婂叾涔嬪悗鐨勫璞�
- produceList.value[0].processList = indexOfProceList.filter((item, index) => index >= getProceList);
- }
- }
-
- produceList.value.forEach(item =>{
+ produceList.value.forEach(item => {
let technologyNumberMerge = printMerge.split('').join(',');
item.detail[0].technologyNumberMerge = technologyNumberMerge
})
@@ -77,8 +106,8 @@
for (let i = 0; i < produceList.value.length; i++) {
const s01Values = [];
// 閬嶅巻 detailList 鏁扮粍锛屾彁鍙� S01 鍊煎埌 s01Values 鏁扮粍
- if (produceList.value[i].detailList[0].other_columns!=null
- || produceList.value[i].detailList[0].other_columns!=undefined){
+ if (produceList.value[i].detailList[0].other_columns != null
+ || produceList.value[i].detailList[0].other_columns != undefined) {
produceList.value[i].detailList.forEach(element => {
const otherColumnsObject = JSON.parse(element.other_columns);
const s01Value = otherColumnsObject.S01;
@@ -92,9 +121,9 @@
}
}
-
-
+ //澶勭悊鍚岄厤缃墦鍗�
handleGetQRCode()
+ handleSummary()
} else {
ElMessage.warning(res.msg)
router.push("/login")
@@ -106,29 +135,41 @@
const handleGetQRCode = async () => {
+ let technologyNumber=''
for (let i = 0; i < produceList.value.length; i++) {
- const technologyNumber = produceList.value[i].detail[0].technologyNumber.toString(); // 杞崲涓哄瓧绗︿覆浠ヤ究澶勭悊姣忎釜瀛楃
+ if (produceList.value[i].detail[0].qrcode!="" && produceList.value[i].detail[0].qrcode!=null){
+ technologyNumber = produceList.value[i].detail[0].qrcode.toString(); // 杞崲涓哄瓧绗︿覆浠ヤ究澶勭悊姣忎釜瀛楃,鍚堝苟鏍囩
+ }else {
+ technologyNumber = produceList.value[i].detail[0].technologyNumber.toString(); // 杞崲涓哄瓧绗︿覆浠ヤ究澶勭悊姣忎釜瀛楃
+ }
produceList.value[i].detail[0]["qrcodeList"] = []; // 鍒濆鍖栦竴涓┖鏁扮粍鐢ㄦ潵瀛樺偍 QR Code
- for (let j = 0; j < technologyNumber.length; j++) {
- const processId = produceList.value[i].detail[0].process_id;
- const url = `${processId}/${technologyNumber[j]}`;
+ const processId = produceList.value[i].detail[0].process_id;
+ const url = `${processId}/${technologyNumber}`;
+ // 鐢熸垚 QR Code 骞跺瓨鍌ㄥ埌鏁扮粍涓�
+ const qrcodeData = await QRCode.toDataURL(url);
+ produceList.value[i].detail[0]["qrcodeList"].push({
+ qrcode: qrcodeData,
+ technologyNumber: technologyNumber
+ });
- // 鐢熸垚 QR Code 骞跺瓨鍌ㄥ埌鏁扮粍涓�
- const qrcodeData = await QRCode.toDataURL(url);
- produceList.value[i].detail[0]["qrcodeList"].push({
- qrcode: qrcodeData,
- technologyNumber: technologyNumber[j]
- });
-
- }
+ // for (let j = 0; j < technologyNumber.length; j++) {
+ // const processId = produceList.value[i].detail[0].process_id;
+ // const url = `${processId}/${technologyNumber[j]}`;
+ // // 鐢熸垚 QR Code 骞跺瓨鍌ㄥ埌鏁扮粍涓�
+ // const qrcodeData = await QRCode.toDataURL(url);
+ // produceList.value[i].detail[0]["qrcodeList"].push({
+ // qrcode: qrcodeData,
+ // technologyNumber: technologyNumber[j]
+ // });
+ //
+ // }
}
};
//鏍规嵁杈撳叆鐨勬暟閲忛噸鏂版眹鎬�
const handleSummary = () => {
- console.log(produceList.value)
for (let i = 0; i < produceList.value.length; i++) {
//鏁伴噺
let totalQuantity = 0;
@@ -138,47 +179,45 @@
let totalWeight = 0;
// 瀵规瘡涓泦鍚堜腑鐨� detailList 杩涜璁＄畻
produceList.value[i].detailList.forEach(collection => {
- // 浣跨敤 reduce 鏂规硶璁＄畻姣忎釜 detailList 涓殑鎬绘暟閲�
- totalQuantity += collection.quantity*1;
- totalArea += collection.area*1;
+ totalQuantity += collection.quantity * 1;
+ //姣忎釜搴忓彿闈㈢Н
+ collection.total_area = parseFloat((collection.width * collection.height * collection.quantity / 1000000).toFixed(2))
+ totalArea += collection.total_area * 1;
+ totalWeight += collection.width * collection.height * collection.quantity / 1000000 * collection.separation * 2.5 * 1;
+ //姣忎釜搴忓彿鍛ㄩ暱
+ collection.perimeter = parseFloat(((collection.width * 2 + collection.height * 2) * collection.quantity / 1000).toFixed(3))
});
// 杈撳嚭姣忎釜闆嗗悎涓殑鎬绘暟閲�
- console.log(`produceList.value[${i}] 涓殑鎬绘暟閲�:`, totalQuantity);
+ produceList.value[i].detail[0].quantity = totalQuantity
+ produceList.value[i].detail[0].gross_area = totalArea
+ produceList.value[i].detail[0].weight = totalWeight
}
}
-// 鐩戝惉鎵撳嵃瀹屾垚浜嬩欢
-window.addEventListener('afterprint', function() {
- //淇敼鎵撳嵃
- let printState=1
- request.post(`/processCard/updatePrintState/${printState}`, data.value).then((res) => {
- if (res.code == 200 && res.data === true) {
- } else {
-
- ElMessage.warning(t('basicData.msg.saveFail'))
-
- }
- })
-});
</script>
<template>
-<!-- <el-button id="printButton" @click="printFlowCard();">{{ $t('basicData.print') }}</el-button>-->
+ <!-- <el-button id="printButton" @click="printFlowCard();">{{ $t('basicData.print') }}</el-button>-->
<div id="printFlowCard">
- <table v-for="(item,id) in produceList" id="contentTable" :key="id">
+ <table v-for="(item,id) in produceList" id="contentTable" :key="id" style="border-bottom: none">
<thead>
<tr v-for="(itemFlow,index) in item.detail" :key="index">
- <td colspan="24">
+ <td colspan="29">
+ <div style="float: left;"><input style="border: none;font-size: 28px;width: 70px;margin: 5px "/></div>
<div id="bj" style="float: right;font-size: 28px">{{ id + 1 }}</div>
- <div>{{company.companyName}}</div>
+ <div>{{ company.companyName }}</div>
<div>鐢熶骇娴佺▼鍗�</div>
- <div v-if="itemFlow.technologyNumberMerge!=''" style="text-align: right;font-weight: bolder">娴佺▼鍗″彿锛� {{
+ <div v-if="itemFlow.technologyNumberMerge!=''" style="text-align: right;font-weight: bolder">
+ {{itemFlow.otherRemarks}}
+ 娴佺▼鍗″彿锛� {{
itemFlow.process_id
- }}/{{ itemFlow.technologyNumberMerge }} 鍏� {{ flowCardCount }} 鏋�
+ }}/{{ itemFlow.technologyNumberMerge }} 鍏� {{ item.count }} 鏋�
</div>
- <div v-else style="text-align: right;font-weight: bolder">娴佺▼鍗″彿锛� {{
+ <div v-else style="text-align: right;font-weight: bolder">
+ {{itemFlow.otherRemarks}}
+ 娴佺▼鍗″彿锛� {{
itemFlow.process_id
- }}/{{ itemFlow.technologyNumber }} 鍏� {{ flowCardCount }} 鏋�
+ }}/{{ itemFlow.technologyNumber }} 鍏� {{ item.count }} 鏋�
</div>
</td>
</tr>
@@ -188,7 +227,7 @@
<td class="tdNowrap">椤圭洰鍚嶇О锛�</td>
<td colspan="2">{{ items.project }}</td>
<td class="tdNowrap">宸ヨ壓娴佺▼锛�</td>
- <td colspan="17" style="width: 500px">{{ items.process }}</td>
+ <td colspan="22" style="width: 500px">{{ items.process }}</td>
</tr>
<tr v-for="(itemTr,index) in item.detail" :key="index">
<td class="tdNowrap">纾ㄨ竟绫诲瀷锛�</td>
@@ -196,12 +235,13 @@
<td class="tdNowrap">鍗曠墖鍚嶇О锛�</td>
<td colspan="2">{{ itemTr.glass_child }}</td>
<td class="tdNowrap">浜у搧鍚嶇О锛�</td>
- <td colspan="17">{{ itemTr.product_name }}</td>
+ <td colspan="22">{{ itemTr.product_name }}</td>
</tr>
<tr>
<td rowspan='2'>搴忓彿</td>
<td rowspan='2'>缂栧彿</td>
- <td rowspan='2'>瀹�*楂�</td>
+ <td rowspan="2">灏忕墖椤哄簭</td>
+ <td rowspan='2' style="width: 90px">瀹�*楂�</td>
<td rowspan='2'>鏁伴噺</td>
<td rowspan='2'>闈㈢Н</td>
<td rowspan='2'>鍛ㄩ暱</td>
@@ -210,32 +250,39 @@
<td v-for="(itemPr,index) in item.processList" :key="index" colspan="2">{{ itemPr.process }}</td>
</tr>
<tr>
-
- <td>{{company.printLabel.printFlowCard.patch}}</td>
- <td>{{company.printLabel.printFlowCard.lackOf}}</td>
- <td>{{company.printLabel.printFlowCard.patch}}</td>
- <td>{{company.printLabel.printFlowCard.lackOf}}</td>
- <td>{{company.printLabel.printFlowCard.patch}}</td>
- <td>{{company.printLabel.printFlowCard.lackOf}}</td>
- <td>{{company.printLabel.printFlowCard.patch}}</td>
- <td>{{company.printLabel.printFlowCard.lackOf}}</td>
- <td>{{company.printLabel.printFlowCard.patch}}</td>
- <td>{{company.printLabel.printFlowCard.lackOf}}</td>
- <td>{{company.printLabel.printFlowCard.patch}}</td>
- <td>{{company.printLabel.printFlowCard.lackOf}}</td>
- <td>{{company.printLabel.printFlowCard.patch}}</td>
- <td>{{company.printLabel.printFlowCard.lackOf}}</td>
- <td>{{company.printLabel.printFlowCard.patch}}</td>
- <td>{{company.printLabel.printFlowCard.lackOf}}</td>
+
+ <td>{{ company.printLabel.printFlowCard.patch }}</td>
+ <td>{{ company.printLabel.printFlowCard.lackOf }}</td>
+ <td>{{ company.printLabel.printFlowCard.patch }}</td>
+ <td>{{ company.printLabel.printFlowCard.lackOf }}</td>
+ <td>{{ company.printLabel.printFlowCard.patch }}</td>
+ <td>{{ company.printLabel.printFlowCard.lackOf }}</td>
+ <td>{{ company.printLabel.printFlowCard.patch }}</td>
+ <td>{{ company.printLabel.printFlowCard.lackOf }}</td>
+ <td>{{ company.printLabel.printFlowCard.patch }}</td>
+ <td>{{ company.printLabel.printFlowCard.lackOf }}</td>
+ <td>{{ company.printLabel.printFlowCard.patch }}</td>
+ <td>{{ company.printLabel.printFlowCard.lackOf }}</td>
+ <td>{{ company.printLabel.printFlowCard.patch }}</td>
+ <td>{{ company.printLabel.printFlowCard.lackOf }}</td>
+ <td>{{ company.printLabel.printFlowCard.patch }}</td>
+ <td>{{ company.printLabel.printFlowCard.lackOf }}</td>
+ <td>{{ company.printLabel.printFlowCard.patch }}</td>
+ <td>{{ company.printLabel.printFlowCard.lackOf }}</td>
+ <td>{{ company.printLabel.printFlowCard.patch }}</td>
+ <td>{{ company.printLabel.printFlowCard.lackOf }}</td>
</tr>
</thead>
<tbody>
<tr v-for="(itemDatile,index) in item.detailList" :key="index">
<td>{{ itemDatile.order_number }}</td>
- <td>{{itemDatile.s01Value}}</td>
+ <td>{{ itemDatile.s01Value }}</td>
+ <td>{{ itemDatile.technology_number }}</td>
<td>{{ itemDatile.child_width }}</td>
- <td class="item" style="width: 5%;height: 100%;"><el-input @keyup="handleSummary()" style="border: none" v-model="itemDatile.quantity"></el-input></td>
+ <td class="item" style="width: 5%;height: 100%;">
+ <input v-model="itemDatile.quantity" style="width: 100%;height: 100%" @keyup="handleSummary()"/>
+ </td>
<td>{{ itemDatile.total_area }}</td>
<td>{{ itemDatile.perimeter }}</td>
<td>{{ itemDatile.bend_radius }}</td>
@@ -256,11 +303,15 @@
<td></td>
<td></td>
<td></td>
+ <td></td>
+ <td></td>
+ <td></td>
+ <td></td>
</tr>
</tbody>
<tfoot>
<tr style="height: 14px">
- <td v-for="(itemsum,index) in item.detail" :key="index" colspan="24">
+ <td v-for="(itemsum,index) in item.detail" :key="index" colspan="29">
鏁伴噺锛�
<label>{{ itemsum.quantity }}</label>
闈㈢Н锛�
@@ -270,15 +321,14 @@
</td>
</tr>
<tr v-for="(itemtextarea,index) in item.detail" :key="index">
- <td colspan="6" rowspan="6" style="width: 480px;height: 100px ">
-<!-- <div style="width: 100%;height: 100%"><textarea style="height: 99%;width: 99%;font-size: 11px">{{ itemtextarea.processing_note }}</textarea>-->
-<!-- </div>-->
- <div style="width: 100%;height: 100%;"><textarea style="height: 99%;width: 99%;border: none;;font-size: 11px">{{company.printLabel.printFlowCard.processingNote(itemtextarea)}}</textarea>
- </div>
- </td>
- <td>瀹屽伐绛惧悕</td>
- <td></td>
+ <td>瀹屽伐绛惧悕</td>
+ <td colspan="2"></td>
+ <td colspan="2"></td>
+ <td colspan="2"></td>
+ <td colspan="2"></td>
+ <td colspan="2"></td>
+ <td colspan="2"></td>
<td colspan="2"></td>
<td colspan="2"></td>
<td colspan="2"></td>
@@ -290,8 +340,12 @@
</tr>
<tr>
<td>鐢熶骇鏃ユ湡</td>
- <td></td>
-
+ <td colspan="2"></td>
+ <td colspan="2"></td>
+ <td colspan="2"></td>
+ <td colspan="2"></td>
+ <td colspan="2"></td>
+ <td colspan="2"></td>
<td colspan="2"></td>
<td colspan="2"></td>
<td colspan="2"></td>
@@ -301,21 +355,13 @@
<td colspan="2"></td>
<td colspan="2"></td>
</tr>
- <tr>
- <td>璐ㄦ绛惧悕</td>
- <td></td>
- <td colspan="2"></td>
- <td colspan="2"></td>
- <td colspan="2"></td>
- <td colspan="2"></td>
- <td colspan="2"></td>
- <td colspan="2"></td>
- <td colspan="2"></td>
- <td colspan="2"></td>
+ <tr>
+ <td>鍘熺墖绠卞彿</td>
+ <td colspan="28"></td>
</tr>
<tr v-for="(qrCodeItem,index) in item.detail" :key="index">
- <td colspan="19">
+ <td colspan="29">
<span style="display: flex;">
<span v-for="(qrCodeItems,index) in qrCodeItem.qrcodeList" :key="index" style="display: flex;width: 35%">
<div class='qrCode' style="width: 80px;height: 80px;">
@@ -329,8 +375,38 @@
</td>
</tr>
+ <tr v-if="company.remarkSwitch=='1'">
+ <td colspan="29">
+ <div style="display: flex;flex-wrap: wrap;">
+ <div v-for="(itemremark,index) in item.remarkList" :key="index">
+ <span v-if="!(itemremark.S02==null&&itemremark.S03==null&&itemremark.S04==null&&itemremark.S05==null)">
+ 缂栧彿锛歿{itemremark.S01}}
+ </span>
+ <span v-if="itemremark.S02!=null">澶囨敞1锛歿{itemremark.S02}}</span>
+ <span v-if="itemremark.S03!=null">澶囨敞2锛歿{itemremark.S03}}</span>
+ <span v-if="itemremark.S04!=null">澶囨敞3锛歿{itemremark.S04}}</span>
+ <span v-if="itemremark.S05!=null">澶囨敞4锛歿{itemremark.S05}}</span>
+ </div>
+ </div>
+ </td>
+ </tr>
+ <tr v-for="(itemtextareas,index) in item.detail" :key="index">
+ <td colspan="29" style="width: 480px;height: 150px ">
+ <div style="width: 100%;height: 100%;text-align: left"><textarea style="height: 99%;width: 99%;border: none;;font-size: 12px;overflow: hidden;text-align: left;vertical-align: middle">{{itemtextareas.processing_note}}</textarea>
+ </div>
+ </td>
+ </tr>
+ <tr style="border-bottom: none">
+ <td colspan="29" style="text-align: left;border-bottom: none;">
+ <div>
+ <span>璐ㄦ绛惧悕锛�</span>
+ <span style="margin-left: 300px">鐢熶骇绛惧悕锛�</span>
+ </div>
+ </td>
+ </tr>
</tfoot>
</table>
+
</div>
</template>
@@ -339,12 +415,10 @@
* {
margin: 0;
padding: 0;
- text-align: center;
}
-#printButton {
- margin-top: -40px;
- width: 100px;
+td,input{
+ text-align: center;
}
#printFlowCard {
@@ -356,7 +430,6 @@
border-collapse: collapse;
border: 1px solid black;
width: 100%;
-
}
#contentTable thead {
@@ -376,13 +449,11 @@
}
#contentTable tbody {
- white-space: nowrap;
-
+white-space: nowrap;
}
.tdNowrap {
white-space: nowrap;
-
}
#contentTable tfoot {
@@ -390,28 +461,29 @@
font-weight: bolder;
}
-@page {
- size: auto; /* auto is the initial value */
- margin: 2mm 0mm 0mm 1mm /* this affects the margin in the printer settings */
-
+input{
+ border: none;
+ background: none;
}
-@media print {
- tbody {
- display: table-row-group;
+
+
+@media print {
+ @page {
+ size: auto; /* auto is the initial value */
+ margin: 4mm 5mm 5mm 5mm /* this affects the margin in the printer settings */
+
}
table {
page-break-before: always;
- }
-
- table {
page-break-inside: auto;
}
thead {
display: table-header-group;
+ page-break-inside: avoid;
}
tfoot {
--
Gitblit v1.8.0