From 0df7d2cc1ef75c9aa1b3483dc7067a728af7ceb3 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期一, 22 四月 2024 15:44:20 +0800
Subject: [PATCH] 计算金额从后端获取，创建时不改变数值
---
north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue | 43 ++++++++++++++++++++++---------------------
1 files changed, 22 insertions(+), 21 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 119553f..33ac509 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
@@ -24,7 +24,9 @@
const route = useRoute()
const xGrid = ref()
let cellArea = ref()
-const shapeList = ref(['鏅舰','寮傚舰'])
+const shapeList = ref([
+ {name:'鏅舰',value:1}, {name:'寮傚舰',value: 2}
+])
// 瀹氫箟琛ㄥご涓婁紶鏁版嵁
const titleUploadData = ref({
@@ -445,7 +447,6 @@
if (typeof str === 'undefined' || str === null || str === '' || str === '\n' || str === '\r'){
return
}
- gridOptions.loading=true
request.post(`/order/getOrderById/${str}`).then((res) => {
if(res.code==200){
titleUploadData.value = res.data.order
@@ -503,7 +504,6 @@
otherMoney.value =res.data.orderOtherMoneyList
//鍔犺浇鍓〃鏁版嵁
xGrid.value.reloadData(orderDetails)
- gridOptions.loading=false
}else{
ElMessage.error(res.msg)
}
@@ -633,9 +633,9 @@
list.forEach((item)=>{
countMoney += parseFloat(item.grossAmount)
})
- otherMoney.value.forEach(item => {
- countMoney+=item.quantity*item.price
- })
+ // otherMoney.value.forEach(item => {
+ // countMoney+=item.quantity*item.price
+ // })
return parseFloat((countMoney).toFixed(2))
}
//瀵煎叆鍔熻兘
@@ -699,21 +699,22 @@
}else if(column.property === 'computeArea'){
row.computeGrossArea=parseFloat((row.computeArea*row.quantity).toFixed(2))
row.grossAmount=parseFloat((row.price * row.computeGrossArea).toFixed(2))
- }else if(column.property.indexOf('otherColumns.M')>-1){
- let quantity = 0
- xGrid.value.getTableData().fullData.forEach(item => {
- let orderQuantity = isNaN(item.quantity) ? 0 : item.quantity
- let value = isNaN((getNestedProperty(item,column.property)*1)) ? 0 : (getNestedProperty(item,column.property)*1)
- quantity += orderQuantity*value
- })
- if(!isNaN(quantity)){
- otherMoney.value.forEach(item => {
- if(item.column===column.property.split('.')[1]){
- item.quantity = quantity
- }
- })
- }
}
+ // else if(column.property.indexOf('otherColumns.M')>-1){
+ // let quantity = 0
+ // xGrid.value.getTableData().fullData.forEach(item => {
+ // let orderQuantity = isNaN(item.quantity) ? 0 : item.quantity
+ // let value = isNaN((getNestedProperty(item,column.property)*1)) ? 0 : (getNestedProperty(item,column.property)*1)
+ // quantity += orderQuantity*value
+ // })
+ // if(!isNaN(quantity)){
+ // otherMoney.value.forEach(item => {
+ // if(item.column===column.property.split('.')[1]){
+ // item.quantity = quantity
+ // }
+ // })
+ // }
+ // }
titleUploadData.value.money=countMoney(xGrid.value.getTableData().fullData).toString()
@@ -907,7 +908,7 @@
</template>
<template #shape_edit="{ row }">
<vxe-select v-model="row.shape" transfer>
- <vxe-option v-for="item in shapeList" :key="item" :value="item" :label="item" />
+ <vxe-option v-for="item in shapeList" :key="item" :value="item.value" :label="item.name" />
</vxe-select>
</template>
--
Gitblit v1.8.0