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 |   44 +++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 39 insertions(+), 5 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 2eea661..52a9b0d 100644
--- a/north-glass-erp/northglass-erp/src/components/pp/PrintProcess.vue
+++ b/north-glass-erp/northglass-erp/src/components/pp/PrintProcess.vue
@@ -10,6 +10,7 @@
 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()
@@ -19,6 +20,8 @@
 const details = ref([])
 const user=userInfo()
 
+let totalQuantity = 0;  // 鐢ㄤ簬璁板綍鎬绘暟閲�
+let totalArea = 0;      // 鐢ㄤ簬璁板綍鎬婚潰绉�
 
 const data = ref({
   printList: []
@@ -33,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
@@ -127,6 +138,7 @@
           //澶勭悊鍚岄厤缃墦鍗�
           handleGetQRCode()
           handleSummary()
+          AreaQuantitySummary()
         } else {
           ElMessage.warning(res.msg)
           router.push("/login")
@@ -185,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))
@@ -197,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>
@@ -211,7 +237,15 @@
           <div>{{ company.companyName }}</div>
           <div>鐢熶骇娴佺▼鍗�</div>
           <div  style="font-weight: bolder;display: flex;justify-content:space-between">
-            <div>鎵撳嵃浜猴細{{user.user.userName}}</div>
+            <div>
+              鎵撳嵃浜猴細{{user.user.userName}} &nbsp;&nbsp;
+              鏃堕棿锛歿{formattedTime}}
+              &nbsp;&nbsp;
+              <span style="font-weight: bolder;" v-if="name=='閲戝崕绂忓枩澶╂垚鐜荤拑鏈夐檺鍏徃'">
+                鎵撳嵃鎬绘暟閲忥細{{totalQuantity}}
+              鎵撳嵃鎬婚潰绉細{{totalArea}}
+              </span>
+            </div>
             <div>
               <span v-if="name!='閲戝崕绂忓枩澶╂垚鐜荤拑鏈夐檺鍏徃'" style="font-size: 10px">{{itemFlow.otherRemarks}}</span>&nbsp;&nbsp;
               娴佺▼鍗″彿锛� {{
@@ -243,7 +277,7 @@
         <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>
@@ -266,7 +300,7 @@
         <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>
@@ -283,7 +317,7 @@
           鏁伴噺锛�
           <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>

--
Gitblit v1.8.0