From d873cbc55704ed517607227d9d010204da3f1888 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期五, 12 七月 2024 13:43:05 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue b/north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue
index 43c946c..16c04c6 100644
--- a/north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue
+++ b/north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue
@@ -1103,8 +1103,11 @@
if (['width', 'height', 'quantity', 'price'].includes(column.property)) {
row.area = area(row)
row.grossArea = countArea(row)
- row.computeArea = row.area
- row.computeGrossArea = row.grossArea
+ if(![ 'quantity', 'price'].includes(column.property)){
+ row.computeArea = row.area
+ row.computeGrossArea = row.grossArea
+ }
+
if(titleUploadData.value.calculateType===3){
row.grossAmount=parseFloat((row.price * row.quantity).toFixed(2))
}else{
@@ -1181,6 +1184,7 @@
if( !isNaN(item.computeArea*1) && item.computeArea != null ){
if(titleUploadData.value.calculateType===3){
+ item.computeGrossArea = item.computeArea*item.quantity
item.grossAmount=parseFloat((item.price * item.quantity).toFixed(2))
}else{
item.grossArea = countArea(item)
--
Gitblit v1.8.0