From 9b9fdcb4711279a303cf8da9ce9e3ff30b1bf6e0 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 20 三月 2025 16:45:06 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue | 17 ++++++++++++++++-
1 files changed, 16 insertions(+), 1 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 bce39a0..0f3d636 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
@@ -934,6 +934,8 @@
if(titleUploadData.value.calculateType===3){
item.grossAmount=multiply(item.price,item.quantity)
+ }else if(titleUploadData.value.calculateType===4){
+ item.grossAmount=parseFloat(divideAuto(item.width * item.height* item.quantity*item.price,1000000,company.decValue))
}else{
item.grossAmount=multiply(item.price,item.computeGrossArea)
}
@@ -1220,7 +1222,11 @@
// 鑾峰彇淇濈暀闈㈢Н,
const decValue = company.decValue
switch (titleUploadData.value.calculateType){
- case 2:{
+ case 2 :{
+ areaSum = parseFloat(divideAuto(row.width * row.height* row.quantity,1000000,company.decValue))
+ break
+ }
+ case 4:{
areaSum = parseFloat(divideAuto(row.width * row.height* row.quantity,1000000,company.decValue))
break
}
@@ -1283,6 +1289,8 @@
}
if(titleUploadData.value.calculateType===3){
item.grossAmount=multiply(item.price , item.quantity)
+ }else if(titleUploadData.value.calculateType===4){
+ item.grossAmount=parseFloat(divideAuto(item.width * item.height* item.quantity*item.price,1000000,company.decValue))
}else{
item.grossAmount=multiply(item.price * 1 , item.computeGrossArea)
}
@@ -1344,6 +1352,8 @@
}
if(titleUploadData.value.calculateType===3){
row.grossAmount=multiply(row.price ,row.quantity)
+ }else if(titleUploadData.value.calculateType===4){
+ row.grossAmount=parseFloat(divideAuto(row.width * row.height* row.quantity*row.price,1000000,company.decValue))
}else{
row.grossAmount=multiply(row.price , row.computeGrossArea)
}
@@ -1443,6 +1453,10 @@
if( !isNaN(item.computeArea*1) && item.computeArea != null ){
if(titleUploadData.value.calculateType===3){
item.grossAmount=parseFloat(multiply(item.price , item.quantity))
+ }else if(titleUploadData.value.calculateType===4){
+ item.grossArea = countArea(item)
+ item.computeGrossArea = item.grossArea
+ item.grossAmount=parseFloat(divideAuto(item.width * item.height* item.quantity*item.price,1000000,company.decValue))
}else{
item.grossArea = countArea(item)
item.computeGrossArea = item.grossArea
@@ -1657,6 +1671,7 @@
<el-option :value="1" :label="t('order.areaAmountPerPiece')"/>
<el-option :value="2" :label="t('order.areaAmountAge')"/>
<el-option :value="3" :label="t('order.quantityMount')"/>
+ <el-option :value="4" :label="t('order.allAmount')"/>
</el-select>
</el-col>
<el-col :span="2"><el-text>*{{$t('order.salesman')}}锛�</el-text></el-col>
--
Gitblit v1.8.0