From 0fc1451bd4129e04a8950190f473c9ef0fd82a3f Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期四, 20 三月 2025 10:06:08 +0800
Subject: [PATCH] 添加计算方式 使用总金额保留两位小数
---
north-glass-erp/northglass-erp/src/router/index.js | 4 ++--
north-glass-erp/northglass-erp/src/lang/en.js | 1 +
north-glass-erp/northglass-erp/src/lang/ar.js | 1 +
north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue | 7 +++++++
north-glass-erp/northglass-erp/src/lang/ru.js | 1 +
north-glass-erp/northglass-erp/src/lang/zh.js | 1 +
6 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/lang/ar.js b/north-glass-erp/northglass-erp/src/lang/ar.js
index fa0b146..de2804b 100644
--- a/north-glass-erp/northglass-erp/src/lang/ar.js
+++ b/north-glass-erp/northglass-erp/src/lang/ar.js
@@ -248,6 +248,7 @@
oneClickReturn:'涓�閿��鍥�',
quantityMount:'鏁伴噺閲戦',
+ allAmount:'闈㈢Н閲戦锛堟�婚噾棰濓級',
msg:{
productCheck:'丕賱乇噩丕亍 丕禺鬲賷丕乇 賲賳鬲噩',
diff --git a/north-glass-erp/northglass-erp/src/lang/en.js b/north-glass-erp/northglass-erp/src/lang/en.js
index 3db8dcf..8c4e6d4 100644
--- a/north-glass-erp/northglass-erp/src/lang/en.js
+++ b/north-glass-erp/northglass-erp/src/lang/en.js
@@ -248,6 +248,7 @@
oneClickReturn:'涓�閿��鍥�',
quantityMount:'Quantity and Amount',
+ allAmount:'闈㈢Н閲戦锛堟�婚噾棰濓級',
msg:{
productCheck:'Please select a product',
diff --git a/north-glass-erp/northglass-erp/src/lang/ru.js b/north-glass-erp/northglass-erp/src/lang/ru.js
index 6e136d7..4fee41d 100644
--- a/north-glass-erp/northglass-erp/src/lang/ru.js
+++ b/north-glass-erp/northglass-erp/src/lang/ru.js
@@ -248,6 +248,7 @@
oneClickReturn:'涓�閿��鍥�',
quantityMount:'鏁伴噺閲戦',
+ allAmount:'闈㈢Н閲戦锛堟�婚噾棰濓級',
msg:{
productCheck:'袩芯卸邪谢褍泄褋褌邪, 胁褘斜械褉懈褌械 锌褉芯写褍泻褌',
diff --git a/north-glass-erp/northglass-erp/src/lang/zh.js b/north-glass-erp/northglass-erp/src/lang/zh.js
index 77a8477..14f1be0 100644
--- a/north-glass-erp/northglass-erp/src/lang/zh.js
+++ b/north-glass-erp/northglass-erp/src/lang/zh.js
@@ -248,6 +248,7 @@
oneClickReturn:'涓�閿��鍥�',
quantityMount:'鏁伴噺閲戦',
+ allAmount:'闈㈢Н閲戦锛堟�婚噾棰濓級',
msg:{
productCheck:'璇烽�夋嫨浜у搧',
diff --git a/north-glass-erp/northglass-erp/src/router/index.js b/north-glass-erp/northglass-erp/src/router/index.js
index c873d06..05d332c 100644
--- a/north-glass-erp/northglass-erp/src/router/index.js
+++ b/north-glass-erp/northglass-erp/src/router/index.js
@@ -1217,8 +1217,8 @@
component: () => import('../views/RegisterView.vue')
},
{
- path: '/appDownLoad',
- name: 'appDownLoad',
+ path: '/app',
+ name: 'app',
component: () => import('../views/system/app/appDownload.vue')
}
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..832453e 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
@@ -1344,6 +1344,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 +1445,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 +1663,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