From dc1a8783473d2a93344082013ec8014af1e75731 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期二, 03 十二月 2024 15:44:41 +0800
Subject: [PATCH] 修改阿拉伯语切换
---
north-glass-erp/northglass-erp/src/components/pp/PrintProcess.vue | 196 +++++++++++++++++++++++-------------------------
1 files changed, 95 insertions(+), 101 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 1160db8..52a9b0d 100644
--- a/north-glass-erp/northglass-erp/src/components/pp/PrintProcess.vue
+++ b/north-glass-erp/northglass-erp/src/components/pp/PrintProcess.vue
@@ -9,6 +9,8 @@
import deepClone from "@/utils/deepClone";
import QRCode from "qrcode";
import companyInfo from "@/stores/sd/companyInfo";
+import userInfo from "@/stores/userInfo"
+import {add} from '@/utils/decimal'
//璇█鑾峰彇
const company = companyInfo()
const {t} = useI18n()
@@ -16,7 +18,10 @@
let produceList = ref([])
let list = ref()
const details = ref([])
+const user=userInfo()
+let totalQuantity = 0; // 鐢ㄤ簬璁板綍鎬绘暟閲�
+let totalArea = 0; // 鐢ㄤ簬璁板綍鎬婚潰绉�
const data = ref({
printList: []
@@ -31,6 +36,14 @@
const {currentRoute} = useRouter()
const route = currentRoute.value
const printMerge = props.printMerge
+
+//鎵撳嵃鏃堕棿
+const currentTime = new Date();
+const formattedTime = currentTime.getFullYear()
+ + '-' + (currentTime.getMonth() + 1) + '-'
+ + currentTime.getDate() + ' ' + currentTime.getHours() + ':'
+ + currentTime.getMinutes();formattedTime
+
let merge = props.printMerge
if (merge == '') {
merge = null
@@ -39,6 +52,7 @@
if (like == '') {
like = null
}
+let name=company.companyName
data.value.printList = JSON.parse(props.printList)
let flowCardCount = ''
onMounted(() => {
@@ -124,6 +138,7 @@
//澶勭悊鍚岄厤缃墦鍗�
handleGetQRCode()
handleSummary()
+ AreaQuantitySummary()
} else {
ElMessage.warning(res.msg)
router.push("/login")
@@ -141,7 +156,6 @@
technologyNumber = produceList.value[i].detail[0].qrcode.toString(); // 杞崲涓哄瓧绗︿覆浠ヤ究澶勭悊姣忎釜瀛楃,鍚堝苟鏍囩
}else {
technologyNumber = produceList.value[i].detail[0].technologyNumber.toString(); // 杞崲涓哄瓧绗︿覆浠ヤ究澶勭悊姣忎釜瀛楃
- console.log(produceList.value[i].detail[0])
}
produceList.value[i].detail[0]["qrcodeList"] = []; // 鍒濆鍖栦竴涓┖鏁扮粍鐢ㄦ潵瀛樺偍 QR Code
@@ -183,7 +197,7 @@
totalQuantity += collection.quantity * 1;
//姣忎釜搴忓彿闈㈢Н
collection.total_area = parseFloat((collection.width * collection.height * collection.quantity / 1000000).toFixed(2))
- totalArea += collection.total_area * 1;
+ totalArea = add(totalArea, collection.total_area)
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))
@@ -195,6 +209,20 @@
}
}
+const AreaQuantitySummary = () => {
+
+ console.log(produceList.value)
+ for (let i = 0; i < produceList.value.length; i++) {
+ // 閬嶅巻褰撳墠椤圭洰鐨� detail 鏁扮粍
+ for (let j = 0; j < produceList.value[i].detail.length; j++) {
+ // 绱姞鏁伴噺
+ totalQuantity = add(totalQuantity,produceList.value[i].detail[j].quantity)
+ // 绱姞闈㈢Н
+ totalArea = add(totalArea,produceList.value[i].detail[j].gross_area)
+ }
+ }
+
+}
</script>
<template>
@@ -203,22 +231,27 @@
<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="29">
+ <td colspan="31">
<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>鐢熶骇娴佺▼鍗�</div>
- <div v-if="itemFlow.technologyNumberMerge!=''" style="text-align: right;font-weight: bolder">
- {{itemFlow.otherRemarks}}
- 娴佺▼鍗″彿锛� {{
- itemFlow.process_id
- }}/{{ itemFlow.technologyNumberMerge }} 鍏� {{ item.count }} 鏋�
- </div>
- <div v-else style="text-align: right;font-weight: bolder">
- {{itemFlow.otherRemarks}}
- 娴佺▼鍗″彿锛� {{
- itemFlow.process_id
- }}/{{ itemFlow.technologyNumber }} 鍏� {{ item.count }} 鏋�
+ <div style="font-weight: bolder;display: flex;justify-content:space-between">
+ <div>
+ 鎵撳嵃浜猴細{{user.user.userName}}
+ 鏃堕棿锛歿{formattedTime}}
+
+ <span style="font-weight: bolder;" v-if="name=='閲戝崕绂忓枩澶╂垚鐜荤拑鏈夐檺鍏徃'">
+ 鎵撳嵃鎬绘暟閲忥細{{totalQuantity}}
+ 鎵撳嵃鎬婚潰绉細{{totalArea}}
+ </span>
+ </div>
+ <div>
+ <span v-if="name!='閲戝崕绂忓枩澶╂垚鐜荤拑鏈夐檺鍏徃'" style="font-size: 10px">{{itemFlow.otherRemarks}}</span>
+ 娴佺▼鍗″彿锛� {{
+ itemFlow.process_id
+ }}/{{ itemFlow.technologyNumber }} 鍏� {{ item.count }} 鏋�
+ </div>
</div>
</td>
</tr>
@@ -226,97 +259,65 @@
<td class="tdNowrap">瀹㈡埛鍚嶇О锛�</td>
<td colspan="2">{{ items.customer_name }}</td>
<td class="tdNowrap">椤圭洰鍚嶇О锛�</td>
- <td colspan="2">{{ items.project }}</td>
+ <td colspan="4" style="min-width: 250px;">{{ items.project }}</td>
<td class="tdNowrap">宸ヨ壓娴佺▼锛�</td>
- <td colspan="22" style="width: 500px">{{ items.process }}</td>
+ <td :colspan="2+item.processList.length*2" style="width: 500px">{{ items.process }}</td>
</tr>
<tr v-for="(itemTr,index) in item.detail" :key="index">
<td class="tdNowrap">纾ㄨ竟绫诲瀷锛�</td>
<td colspan="2">{{ itemTr.edging_type }}</td>
<td class="tdNowrap">鍗曠墖鍚嶇О锛�</td>
- <td colspan="2">{{ itemTr.glass_child }}</td>
+ <td colspan="4">{{ itemTr.glass_child }}</td>
<td class="tdNowrap">浜у搧鍚嶇О锛�</td>
- <td colspan="22">{{ itemTr.product_name }}</td>
+ <td :colspan="2+item.processList.length*2">{{ 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>
<td rowspan='2'>鍛ㄩ暱</td>
- <td rowspan='2'>鍗婂緞</td>
+ <td rowspan='2'>鍗婂緞/澶囨敞</td>
<td rowspan='2'>澶囨敞</td>
<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>
+ <template v-for=" n in item.processList.length">
+ <td>{{ company.printLabel.printFlowCard.patch }}</td>
+ <td>{{ company.printLabel.printFlowCard.lackOf }}</td>
+ </template>
</tr>
</thead>
<tbody>
<tr v-for="(itemDatile,index) in item.detailList" :key="index">
<td>{{ itemDatile.order_number }}</td>
- <td>{{ itemDatile.s01Value }}</td>
+ <td>{{ itemDatile.mapNumber }}</td>
+ <td v-if="name=='閲戝崕绂忓枩澶╂垚鐜荤拑鏈夐檺鍏徃'">{{ itemDatile.building_number }}</td>
+ <td v-else>{{ itemDatile.s01Value }}</td>
<td>{{ itemDatile.technology_number }}</td>
<td>{{ itemDatile.child_width }}</td>
- <td class="item" style="width: 5%;height: 100%;">
+ <td class="item" style="width: 60px;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>
<td>{{ itemDatile.remarks }}</td>
- <td></td>
- <td></td>
- <td></td>
- <td></td>
- <td></td>
- <td></td>
- <td></td>
- <td></td>
- <td></td>
- <td></td>
- <td></td>
- <td></td>
- <td></td>
- <td></td>
- <td></td>
- <td></td>
- <td></td>
- <td></td>
- <td></td>
- <td></td>
+ <template v-for=" n in item.processList.length">
+ <td></td>
+ <td></td>
+ </template>
</tr>
- </tbody>
- <tfoot>
<tr style="height: 14px">
- <td v-for="(itemsum,index) in item.detail" :key="index" colspan="29">
+ <td v-for="(itemsum,index) in item.detail" :key="index" colspan="31">
鏁伴噺锛�
<label>{{ itemsum.quantity }}</label>
闈㈢Н锛�
- <label>{{ parseFloat(itemsum.gross_area.toFixed(2)) }}</label>
+ <label>{{ itemsum.gross_area }}</label>
閲嶉噺锛�
<label>{{ parseFloat(itemsum.weight.toFixed(2)) }}</label>
</td>
@@ -329,15 +330,9 @@
<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>
- <td colspan="2"></td>
- <td colspan="2"></td>
- <td colspan="2"></td>
+ <template v-for=" n in item.processList.length">
+ <td colspan="2"></td>
+ </template>
</tr>
<tr>
<td>鐢熶骇鏃ユ湡</td>
@@ -346,23 +341,17 @@
<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>
- <td colspan="2"></td>
- <td colspan="2"></td>
- <td colspan="2"></td>
+ <template v-for=" n in item.processList.length">
+ <td colspan="2"></td>
+ </template>
</tr>
<tr>
<td>鍘熺墖绠卞彿</td>
- <td colspan="28"></td>
+ <td colspan="31"></td>
</tr>
<tr v-for="(qrCodeItem,index) in item.detail" :key="index">
- <td colspan="29">
+ <td colspan="31">
<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;">
@@ -377,28 +366,31 @@
</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">
+ <td colspan="31">
+ <div style="display: flex;flex-wrap: wrap;">
+ <div class="nuber_xx" 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>
+ <span v-if="itemremark.S02!=null&&itemremark.S02!=''">澶囨敞1锛歿{itemremark.S02}}</span>
+ <span v-if="itemremark.S03!=null&&itemremark.S03!=''">澶囨敞2锛歿{itemremark.S03}}</span>
+ <span v-if="itemremark.S04!=null&&itemremark.S04!=''">澶囨敞3锛歿{itemremark.S04}}</span>
+ <span v-if="itemremark.S05!=null&&itemremark.S05!=''">澶囨敞4锛歿{itemremark.S05}}</span>
+ </div>
+ </div>
</td>
</tr>
+ </tbody>
+ <tfoot>
+
<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>
+ <td colspan="31" style="width: 480px;height: 150px ">
+ <div style="width: 100%;height: 100%;text-align: left"><textarea style="height: 99%;width: 99%;border: none;;font-size: 14px;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;">
+ <td colspan="31" style="text-align: left;border-bottom: none;">
<div>
<span>璐ㄦ绛惧悕锛�</span>
<span style="margin-left: 300px">鐢熶骇绛惧悕锛�</span>
@@ -467,13 +459,15 @@
background: none;
}
-
+.nuber_xx span{
+ font-size: 12px;
+}
@media print {
@page {
size: auto; /* auto is the initial value */
- margin: 4mm 5mm 5mm 5mm /* this affects the margin in the printer settings */
+ margin: 4mm 5mm 10mm 5mm /* this affects the margin in the printer settings */
}
--
Gitblit v1.8.0