From 5df5dba2a321098fd0fc7e18b71549f5c2312049 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期二, 27 八月 2024 17:19:13 +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 | 63 +++++++++++++++++++++++--------
1 files changed, 47 insertions(+), 16 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 af56bfc..8a27736 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
@@ -15,6 +15,7 @@
import downLoadFile from "@/hook/downLoadFile"
import footSum from "@/hook/footSum"
import {useI18n} from "vue-i18n"
+import {multiply} from '@/utils/decimal'
const { t } = useI18n()
let dialogTableVisible = ref(false)
@@ -22,7 +23,7 @@
let errorAreaVisible = ref(false)
let otherMoneyVisible = ref(false)
let sizeCheckVisible = ref(false)
-const maxTableLen =ref(200)
+const maxTableLen =ref(500)
let errorArea = ref(0.4)
const userStore = useUserInfoStore()
const company = companyInfo()
@@ -185,6 +186,16 @@
const regex = /^(0(\.\d{1,2})?|([1-9]\d{0,4})(\.\d{1,2})?|99999(\.9{1,2})?)$/
if ( !regex.test(cellValue) ) {
return new Error(t('basicData.msg.range99999Dec2') )
+ }
+ }
+ }
+ ],
+ quantity: [
+ {
+ validator ({ cellValue }) {
+ const regex = /^[1-9]\d*$/
+ if ( !regex.test(cellValue) ) {
+ return new Error(t('basicData.msg.greater0') )
}
}
}
@@ -384,6 +395,7 @@
item.computeArea = item.area
item.computeGrossArea = item.grossArea
})
+ computedMoney(null)
selectOrder(order)
}
@@ -609,7 +621,7 @@
let result = toolbarButtonClickEvent()
if(result){
const dataList = xGrid.value.getTableData().visibleData
- const val = getNestedProperty(dataList[result.start],result.cell)
+ const val = getNestedProperty(dataList[result.start],result.cell)+""
const numbersArr = []
const regex = /\d+/g
@@ -640,7 +652,7 @@
let result = toolbarButtonClickEvent()
if (result) {
const dataList = xGrid.value.getTableData().visibleData
- const val = getNestedProperty(dataList[result.start], result.cell)
+ const val = getNestedProperty(dataList[result.start], result.cell)+""
const numbersArr = []
const regex = /\d+/g
let match
@@ -725,7 +737,6 @@
request.post(`/order/getOrderById/${str}`).then((res) => {
if(res.code==200){
- console.log(res.data.order)
titleUploadData.value = res.data.order
if(history.state.orderId!=null){
titleUploadData.value.orderId=''
@@ -834,9 +845,9 @@
}
if(titleUploadData.value.calculateType===3){
- item.grossAmount=parseFloat((item.price * item.quantity).toFixed(2))
+ item.grossAmount=multiply(item.price,item.quantity)
}else{
- item.grossAmount=parseFloat((item.price * item.computeGrossArea).toFixed(2))
+ item.grossAmount=multiply(item.price,item.computeGrossArea)
}
})
@@ -895,7 +906,7 @@
titleUploadData.value.icon = titleSelectJson.value.icon[0].basicName
titleUploadData.value.packType = titleSelectJson.value.packType[0].basicName
titleUploadData.value.alType = titleSelectJson.value.alType[0].basicName
- titleUploadData.value.calculateType = 1
+ titleUploadData.value.calculateType = company.calculateType
const today = new Date
today.setTime(today.getTime() + (7 * 24 * 60 * 60 * 1000))
titleUploadData.value.deliveryDate = today.getFullYear() +
@@ -1038,7 +1049,7 @@
const countArea = (row) => {
const area = parseFloat((row.width * row.height/1000000).toFixed(company.decValue))
let areaSum = 0
- // 鑾峰彇淇濈暀闈㈢Н
+ // 鑾峰彇淇濈暀闈㈢Н,
const decValue = company.decValue
switch (titleUploadData.value.calculateType){
case 2:{
@@ -1103,9 +1114,9 @@
item.computeGrossArea = item.grossArea
}
if(titleUploadData.value.calculateType===3){
- item.grossAmount=parseFloat((item.price * item.quantity).toFixed(2))
+ item.grossAmount=multiply(item.price , item.quantity)
}else{
- item.grossAmount=parseFloat((item.price * 1 * item.computeGrossArea).toFixed(2))
+ item.grossAmount=multiply(item.price * 1 , item.computeGrossArea)
}
})
@@ -1165,9 +1176,9 @@
row.computeGrossArea = row.grossArea
}
if(titleUploadData.value.calculateType===3){
- row.grossAmount=parseFloat((row.price * row.quantity).toFixed(2))
+ row.grossAmount=multiply(row.price ,row.quantity)
}else{
- row.grossAmount=parseFloat((row.price * row.computeGrossArea).toFixed(2))
+ row.grossAmount=multiply(row.price , row.computeGrossArea)
}
}else if(column.property === 'computeArea'){
@@ -1175,7 +1186,7 @@
if(titleUploadData.value?.orderReview!==2){
row.computeGrossArea = row.computeArea * row.quantity
}
- row.grossAmount=parseFloat((row.price * row.computeGrossArea).toFixed(2))
+ row.grossAmount=multiply(row.price , row.computeGrossArea)
}
}
@@ -1199,10 +1210,30 @@
}
+const cellStyle = ({ row, column }) => {
+ if(company.longSide!=null){
+ if (column.field === 'width') {
+ if (row.width > parseInt(company.longSide)) {
+ return {
+ backgroundColor: '#ec6969'
+ }
+ }
+ }
+ if (column.field === 'height') {
+ if (row.height > parseInt(company.longSide)) {
+ return {
+ backgroundColor: '#ec6969'
+ }
+ }
+ }
+ }
+
+};
+
//璇樊闈㈢Н璁＄畻鏂规硶
const errorAreaComputed = () => {
const regex = /^(0(\.\d{1,2})?|([1-9]\d{0,4})(\.\d{1,2})?|99999(\.9{1,2})?)$/
- if (!regex.test(errorArea.value)) {
+ if (!regex.test(errorArea.value.toString())) {
ElMessage.warning(t('basicData.msg.range99999Dec2'))
return
}
@@ -1222,6 +1253,7 @@
titleUploadData.value.money=countMoney(xGrid.value.getTableData().fullData).toString()
errorAreaVisible.value= false
}
+
@@ -1281,8 +1313,6 @@
if(evnt.$event.keyCode === 38 ){
const { rowIndex,row,column } = xGrid.value.getSelectedCell() || xGrid.value.getEditRecord()
let nextRowIndex = xGrid.value.getRowIndex(row) - 1;
- console.log(xGrid.value.getTableData().fullData.length)
- console.log(nextRowIndex)
if (nextRowIndex < xGrid.value.getTableData().fullData.length && nextRowIndex>=0) {
xGrid.value.setCurrentRow(xGrid.value.getTableData().fullData[nextRowIndex]);
}
@@ -1444,6 +1474,7 @@
v-on="gridEvents"
@keydown="handleKeyDown"
@edit-closed="editClosedEvent"
+ :cell-style="cellStyle"
>
<template #num1_filter="{ column, $panel }">
<div>
--
Gitblit v1.8.0