From 85aa4497849d485aa2e7ae01976ddc572f7022cc Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 04 七月 2024 13:13:06 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/pp/processCard/AddProcessCard.vue | 62 ++++++++++++++++++++++++------
1 files changed, 49 insertions(+), 13 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/AddProcessCard.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/AddProcessCard.vue
index 6a06007..5d73b5a 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/AddProcessCard.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/AddProcessCard.vue
@@ -146,7 +146,7 @@
align: 'center',//鏂囧瓧灞呬腑
stripe: true,//鏂戦┈绾�
rowConfig: {isCurrent: true, isHover: true, height: 30, useKey: false},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
- id: 'CustomerList',
+ id: 'AddProcessCardRight',
showFooter: true,//鏄剧ず鑴�
printConfig: {},
importConfig: {},
@@ -222,20 +222,38 @@
},
data: [],//table body瀹為檯鏁版嵁
//鑴氶儴姹傚拰
+
+ weighAllAmount(data) {
+ let count = 0
+ data.forEach(row => {
+ count += row.weight
+ })
+ return count
+ },
footerMethod ({ columns, data }) {//椤佃剼鍑芥暟
+ let count = 0
+
return[
columns.map((column, columnIndex) => {
if (columnIndex === 0) {
return t('basicData.total')
}
- const List = ["baiscQuantity",'computeGrossArea','weight','perimeter']
+
+ const List = ["baiscQuantity",'computeGrossArea']
if (List.includes(column.field)) {
return footSum(data, column.field)
}
+ if (column.field === 'weight'){
+ data.forEach(row => {
+ count += weightSum(row)
+ })
+ return parseFloat(count.toFixed(2))
+ }
+
return ''
})
]
- }
+ },
})
@@ -247,7 +265,7 @@
align: 'center',//鏂囧瓧灞呬腑
stripe: true,//鏂戦┈绾�
rowConfig: {isCurrent: true, isHover: true, height: 30, useKey: false},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
- id: 'CustomerList',
+ id: 'AddProcessCardLeft',
showFooter: true,//鏄剧ず鑴�
printConfig: {},
importConfig: {},
@@ -289,7 +307,7 @@
},
{
field: 'landingSequence',
- title: '钀芥灦椤哄簭',
+ title: t('processCard.landingSequence'),
filters: [{data: ''}],
slots: {filter: 'num1_filter'},
filterMethod: filterChanged
@@ -325,7 +343,7 @@
if (columnIndex === 0) {
return t('basicData.total')
}
- const List = ["quantity",'goodsQuantity','area','perimeter']
+ const List = ["quantity",'goodsQuantity','area']
if (List.includes(column.field)) {
return footSum(data, column.field)
}
@@ -430,8 +448,11 @@
//瀵归�変腑鐨勫乏杈硅〃鏍兼暟鎹繘琛屽惊鐜�
checkedList.forEach((item) => {
//鍒ゆ柇鍙敤鏁伴噺鏄惁澶т簬绛変簬杈撳叆鐨勬暟閲�,涓嶆弧瓒冲垯鎶涘嚭寮傚父
- if (item.quantity < checkedNum.value) throw new Error(t('processCard.schedulingQuantity'));
- //宸﹁竟琛ㄦ牸鍙敤鏁伴噺鍑忓幓杈撳叆鐨勬暟閲�
+ // if (item.quantity < checkedNum.value*1) throw new Error(t('processCard.schedulingQuantity'));
+ if (item.quantity < checkedNum.value*1){
+ ElMessage.warning(t('processCard.schedulingQuantity'))
+ }
+ //宸﹁竟琛ㄦ牸鍙敤鏁伴噺鍑忓幓杈撳叆鐨勬暟閲�
item.quantity = item.quantity - checkedNum.value
//鍙宠竟琛ㄦ牸鏁版嵁
let rightData = $grid.getTableData().fullData
@@ -482,8 +503,8 @@
} else {
- item.baiscQuantity = item.baiscQuantity * 1 + leftData[leftfilterIndex].quantity * 1
- item.computeGrossArea=(item.width*item.height*item.baiscQuantity/1000000).toFixed(2)
+ // item.baiscQuantity = item.baiscQuantity * 1 + leftData[leftfilterIndex].quantity * 1
+ // item.computeGrossArea=(item.width*item.height*item.baiscQuantity/1000000).toFixed(2)
//item.computeGrossArea=(item.width*item.height*item.baiscQuantity/1000000).toFixed(2)
// for (let i = 0; i <checkedList.length ; i++) {
//
@@ -585,21 +606,24 @@
if (leftData[i].orderNumber === item.orderNumber && leftData[i].processId === item.processId) {
leftData[i].quantity = leftData[i].quantity * 1 + checkedNum.value * 1
leftData[i].computeGrossArea=(leftData[i].computeGrossArea-leftData[i].width*leftData[i].height*leftData[i].baiscQuantity/1000000).toFixed(2)
-
break
} else if (leftData[i].orderNumber === item.orderNumber && leftData[i].processId !== item.processId) {
-
delete item._X_ROW_KEY
$gridLeft.insert(item)
item._X_ROW_KEY = key
break
} else if (leftData[i].orderNumber !== item.orderNumber && leftData[i].processId !== item.processId) {
-
+ delete item._X_ROW_KEY
+ $gridLeft.insert(item)
+ item._X_ROW_KEY = key
+ break
+ }else if (leftData[i].orderNumber !== item.orderNumber && leftData[i].processId == item.processId) {
delete item._X_ROW_KEY
$gridLeft.insert(item)
item._X_ROW_KEY = key
break
}
+
}
}
@@ -685,6 +709,18 @@
return parseFloat((row.baiscQuantity*row.thickness*row.width*row.height*2.5/1000000).toFixed(2))
}
+//鍙宠竟琛ㄦ牸瀹氫箟
+// const $grid = xGrid.value
+// //鑾峰彇鍙宠竟琛ㄦ牸checkbox閫変腑鐨勬暟鎹�
+// const checkedList = $grid.getCheckboxRecords()
+
+// const checkedSum = (checkedList) =>{
+// let sum = 0
+// checkedList.forEach((item)=>{
+// sum += parseFloat(item.weightSum)
+// })
+// return sum
+// }
</script>
<template>
--
Gitblit v1.8.0