From 6146ab970705d0233a12b9fe475f9756e3271aa1 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期三, 02 四月 2025 08:43:16 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue | 23 +++++++++++++++--------
1 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue b/north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue
index b630836..7eb9d2e 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue
@@ -23,6 +23,8 @@
const user=userInfo()
//瀹氫箟琛ㄥご鏁版嵁
const titleUploadData = ref({
+ //鏄惁鍚堢墖宸ュ簭
+ laminating:'',
reportingWorkId: null,
//娴佺▼鍗″彿
processId: null,
@@ -796,11 +798,11 @@
})
const maxQuantity = Math.max(...equalByOrderNum.map(item =>item.breakageQuantity || 0))
let process = titleUploadData.value.thisProcess
+ let laminating = titleUploadData.value.laminating
equalByOrderNum.forEach((row) =>{
- if (process=='澶硅兌' || process=='涓┖' || process=='鍖呰' ||process=='鎵撹兌鍜岀矘妗�'){
+ if (laminating == 'laminating'){
row.completedQuantity= brokenRow.value.quantity*1-maxQuantity
}
-
})
@@ -1117,6 +1119,7 @@
titleUploadData.value = res.data.data
titleUploadData.value.processId = processId
titleUploadData.value.teamsGroupsName = user.user.userName
+ titleUploadData.value.laminating = res.data.laminating
//璁惧涓嬫媺妗�
titleSelectJson.value.deviceType = res.data.device
//鐝粍涓嬫媺妗�
@@ -1237,9 +1240,10 @@
const editClosedEvent = ({ row, column }) => {
let process = titleUploadData.value.thisProcess
+ let laminating = titleUploadData.value.laminating
if (column.property==='completedQuantity') {
xGrid.value.getTableData().fullData.forEach((item, index) =>{
- if(item.order_number===row.order_number && (process=='澶硅兌' || process=='涓┖' || process=='鍖呰' ||process=='鎵撹兌鍜岀矘妗�')){
+ if(item.order_number===row.order_number && laminating == 'laminating'){
item.completedQuantity=row.completedQuantity
}
})
@@ -1249,12 +1253,15 @@
const getQuantity = () => {
titleUploadData.value.thisCompletedQuantity = 0
titleUploadData.value.thisWornQuantity = 0
+ let laminating = titleUploadData.value.laminating
const arr = xGrid.value.getTableData().fullData
- const returnArr = arr.filter((obj, index, self) =>
- self.findIndex((t) => t.order_number === obj.order_number) === index
- )
-
-
+ //鏍规嵁鏄惁鍚堢墖宸ュ簭杩囨护
+ const returnArr =
+ laminating === "laminating"
+ ? arr.filter((obj, index, self) =>
+ self.findIndex((t) => t.order_number === obj.order_number) === index
+ )
+ : arr;
let sumBreak = 0
let sumQuantity = 0
returnArr.forEach((item)=>{
--
Gitblit v1.8.0