From 82a5de6d2ec80b45660149c84be28734032562f6 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期五, 11 十月 2024 15:21:53 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue | 186 +++++++++++++++++++++++++++++++++++++---------
1 files changed, 148 insertions(+), 38 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 2fc8cb8..ff0c9da 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,multiplyAuto,divideAuto} from '@/utils/decimal'
const { t } = useI18n()
let dialogTableVisible = ref(false)
@@ -22,7 +23,8 @@
let errorAreaVisible = ref(false)
let otherMoneyVisible = ref(false)
let sizeCheckVisible = ref(false)
-const maxTableLen =ref(150)
+let orderIdVisible = ref(false)
+const maxTableLen =ref(500)
let errorArea = ref(0.4)
const userStore = useUserInfoStore()
const company = companyInfo()
@@ -33,6 +35,7 @@
const shapeList = ref([
{label:t('order.universalShape'),value:'1'}, {label:t('order.alien'),value:'2'}
])
+const newOrderId = ref([])
// 瀹氫箟琛ㄥご涓婁紶鏁版嵁
const titleUploadData = ref({
@@ -111,7 +114,8 @@
{ code: 'incrementalChecked', name: t('basicData.incrementalChecked'), prefixIcon: 'vxe-icon-copy', visible: true, disabled: false },
{ code: 'errorArea', name: t('basicData.errorSettlementArea'), prefixIcon: 'vxe-icon-chart-bar-x', visible: true, disabled: false },
{ code: 'otherMoney', name: t('basicData.otherAmounts'), prefixIcon: 'vxe-icon-chart-bar-x', visible: true, disabled: false },
- { code: 'sizeCheck', name: t('basicData.sizeReview'), prefixIcon: 'vxe-icon-eye-fill', visible: true, disabled: false }
+ { code: 'sizeCheck', name: t('basicData.sizeReview'), prefixIcon: 'vxe-icon-eye-fill', visible: true, disabled: false },
+ { code: 'updateOrderId', name: '淇敼璁㈠崟鍙�', prefixIcon: 'vxe-icon-eye-fill', visible: true, disabled: false }
]
]
}
@@ -185,6 +189,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') )
}
}
}
@@ -347,13 +361,14 @@
otherMoney:otherMoney.value,
orderIdType:company.orderIdType,
creator:userStore.user.userName,
- creatorId:userStore.user.userId
+ creatorId:userStore.user.userId,
+ newOrderId:newOrderId.value
}
const grossAreaList = $grid.getTableData().fullData.filter(
item=>item.grossArea === 0
)
const errorAreaList = $grid.getTableData().fullData.filter(
- item=>item.width*item.height/1000000 < errorArea.value*1
+ item=>(item.width*item.height/1000000 < errorArea.value*1)
)
if(grossAreaList.length>0){
alert(t('order.msg.grossAreaIsNot0'))
@@ -378,6 +393,13 @@
selectOrder(order)
}).catch((action)=>{
if(action === 'cancel'){
+ //閲嶇疆缁撶畻闈㈢Н
+ const dataList = xGrid.value.getTableData().fullData
+ dataList.forEach((item,index) =>{
+ item.computeArea = item.area
+ item.computeGrossArea = item.grossArea
+ })
+ computedMoney(null)
selectOrder(order)
}
@@ -427,7 +449,8 @@
ElMessage.error(t('basicData.msg.checkoutLose'))
return
}
-
+ titleUploadData.value.creatorId=userStore.user.userId
+ titleUploadData.value.creator=userStore.user.userName
let order ={
title:titleUploadData.value,
}
@@ -599,11 +622,15 @@
sizeCheckVisible.value=true
break
}
+ case 'updateOrderId' :{
+ orderIdVisible.value=true
+ break
+ }
case 'incrementalAll' :{
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
@@ -614,11 +641,14 @@
let numbers=numbersArr[numbersArr.length-1]
var subStr1 = val.substring(numbers.index);
var subStr2 = val.substring(0, numbers.index);
- let number = parseInt(subStr1.match(/\d/))
+ let number = parseInt(subStr1)
var reg =new RegExp(number,"g")
dataList.forEach((item,index) =>{
if(index>=result.start ){
let newStr = subStr1.replace(reg, number);
+ if(parseInt(newStr)>9){
+ newStr=parseInt(newStr)
+ }
setNestedValue(item,result.cell,subStr2+newStr)
number=number+1
}
@@ -634,7 +664,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
@@ -644,11 +674,14 @@
let numbers=numbersArr[numbersArr.length-1]
var subStr1 = val.substring(numbers.index);
var subStr2 = val.substring(0, numbers.index);
- let number = parseInt(subStr1.match(/\d/))
+ let number = parseInt(subStr1)
var reg =new RegExp(number,"g")
dataList.forEach((item,index) =>{
if(index >= result.start && index <= result.end){
let newStr = subStr1.replace(reg, number);
+ if(parseInt(newStr)>9){
+ newStr=parseInt(newStr)
+ }
setNestedValue(item,result.cell,subStr2+newStr)
number=number+1
}
@@ -712,7 +745,7 @@
addListener(xGrid.value,gridOptions)
const str = route.query.orderId || history.state.orderId
if (typeof str === 'undefined' || str === null || str === '' || str === '\n' || str === '\r'){
-
+ gridOptions.menuConfig.body.options[0][11].disabled = true
gridOptions.loading = false
return
}
@@ -720,6 +753,7 @@
request.post(`/order/getOrderById/${str}`).then((res) => {
if(res.code==200){
titleUploadData.value = res.data.order
+ newOrderId.value=titleUploadData.value.orderId
if(history.state.orderId!=null){
titleUploadData.value.orderId=''
titleUploadData.value.id=null
@@ -738,16 +772,25 @@
if(history.state.type=='copy'){
xGrid.value.reloadData(orderDetails)
+ gridOptions.menuConfig.body.options[0][11].disabled = true
+ }
+ if(history.state.type=='copyTitle'){
+ gridOptions.menuConfig.body.options[0][11].disabled = true
}
gridOptions.loading = false
return
}
+ const buttonTitle = {'code': 'saveOrderTitle',
+ status: 'primary',
+ 'name': t('order.saveHeader')}
+ gridOptions.toolbarConfig.buttons.push(buttonTitle)
//鍙栨秷宸ヨ壓鎸夐挳绂佺敤
gridOptions.toolbarConfig.buttons[1].disabled = false
//宸ヨ壓瀹℃牳鍚庝繚瀛樻寜閽鐢�
if(res.data.order.processReview === 2){
gridOptions.toolbarConfig.buttons[4].disabled = true
+ gridOptions.menuConfig.body.options[0][11].disabled = true
}
@@ -763,22 +806,26 @@
gridOptions.toolbarConfig.buttons[2].code='reviews'
gridOptions.toolbarConfig.buttons[2].name=t('basicData.cancelReview')
gridOptions.toolbarConfig.buttons[3].disabled = false
+ gridOptions.menuConfig.body.options[0][11].disabled = true
const button = {'code': 'cancelOrder',
status: 'primary',
'name': (res.data.order.orderReview>0?t('basicData.cancel'):t('basicData.restore'))}
gridOptions.toolbarConfig.buttons.push(button)
- const buttonTitle = {'code': 'saveOrderTitle',
- status: 'primary',
- 'name': t('order.saveHeader')}
- gridOptions.toolbarConfig.buttons.push(buttonTitle)
+
if(res.data.order.orderReview===-2){
gridOptions.toolbarConfig.buttons[2].disabled = true
gridOptions.toolbarConfig.buttons[3].disabled = true
gridOptions.toolbarConfig.buttons[4].disabled = true
+
+
}
}
+
if(res.data.order.productionOrder !==0 ){
+ gridOptions.toolbarConfig.buttons[2].disabled = true
+ }
+ if(res.data.order.warehousing !==0 ){
gridOptions.toolbarConfig.buttons[2].disabled = true
}
const orderDetails = res.data.orderDetails
@@ -823,9 +870,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)
}
})
@@ -859,9 +906,9 @@
gridOptions.editRules[`otherColumns.${item.column}`] = [
{
validator ({ cellValue }) {
- const regex = /^(0(\.\d{1,2})?|([1-9]\d{0,4})(\.\d{1,2})?|99999(\.9{1,2})?)$/
+ const regex = /^(0(\.\d{1,3})?|([1-9]\d{0,4})(\.\d{1,3})?|99999(\.9{1,3})?)$/
if (cellValue && !regex.test(cellValue)) {
- return new Error(t('basicData.msg.range99999Dec2'))
+ return new Error(t('basicData.msg.range99999Dec3'))
}
}
}
@@ -884,7 +931,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() +
@@ -959,8 +1006,40 @@
})
}
+//淇敼璁㈠崟鍙锋柟娉�
+const updateOrderId = () => {
+ let orderId ={
+ oldOrderId:titleUploadData.value.orderId,
+ newOrderId:newOrderId.value,
+ orderIdType:company.orderIdType,
+ creator:userStore.user.userName,
+ }
+ request.post(`/order/updateOrderId`,orderId).then((res) => {
+ if(res.code==200 && res.data==="true"){
+ ElMessage.success(t('basicData.msg.saveSuccess'))
+ router.push({path:'/main/order/createOrder',query:{
+ orderId:newOrderId.value,
+ random:Math.random()}})
+ }else if(res.data==="false1"){
+ ElMessage.warning("杈撳叆璁㈠崟鍙蜂笉鑳藉ぇ浜庢渶澶ц鍗曞彿")
+ }else if(res.data==="false2"){
+ ElMessage.warning("杈撳叆璁㈠崟鍙峰凡瀛樺湪")
+ }else if(res.data==="false3"){
+ ElMessage.warning("杈撳叆璁㈠崟鍙风浉鍚�")
+ }else if(res.data==="false4"){
+ ElMessage.warning("杈撳叆璁㈠崟鍙烽暱搴︿笉绗�")
+ }else if(res.data==="false5"){
+ ElMessage.warning("璇疯緭鍏ユ暟瀛�")
+ }else if(res.data==="false6"){
+ ElMessage.warning("涓嶈兘淇敼绗竴涓崟瀛�")
+ }
+ })
+}
+
//鏇存柊閲戦閲嶇疆
const updateMoney = () => {
+ titleUploadData.value.creatorId=userStore.user.userId
+ titleUploadData.value.creator=userStore.user.userName
const updateData = {
order: titleUploadData.value,
detail: xGrid.value.getTableData().fullData,
@@ -1022,20 +1101,20 @@
}
const area = (row) => {
- return parseFloat((row.width * row.height/1000000).toFixed(company.decValue))
+ return parseFloat(divideAuto(row.width * row.height,1000000,company.decValue))
}
const countArea = (row) => {
- const area = parseFloat((row.width * row.height/1000000).toFixed(company.decValue))
+ const area = parseFloat(divideAuto(row.width * row.height,1000000,company.decValue))
let areaSum = 0
- // 鑾峰彇淇濈暀闈㈢Н
+ // 鑾峰彇淇濈暀闈㈢Н,
const decValue = company.decValue
switch (titleUploadData.value.calculateType){
case 2:{
- areaSum = parseFloat((row.width * row.height * row.quantity/1000000).toFixed(decValue))
+ areaSum = parseFloat(divideAuto(row.width * row.height* row.quantity,1000000,company.decValue))
break
}
default :{
- areaSum = parseFloat((row.computeArea * row.quantity).toFixed(decValue))
+ areaSum = parseFloat(multiplyAuto(area ,row.quantity,company.decValue))
break
}
}
@@ -1087,14 +1166,14 @@
const decValue = company.decValue
if(titleUploadData.value.calculateType===1){
- item.computeGrossArea = parseFloat((item.computeArea*item.quantity).toFixed(decValue))
+ item.computeGrossArea = parseFloat(multiplyAuto(item.computeArea,item.quantity,decValue))
}else if(titleUploadData.value.calculateType===2){
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)
}
})
@@ -1154,9 +1233,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'){
@@ -1164,7 +1243,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)
}
}
@@ -1188,10 +1267,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
}
@@ -1202,14 +1301,16 @@
fullData.forEach((item,index) => {
let trueArea = item.width*item.height/1000000
if( !isNaN(item.computeArea*1) && item.computeArea != null && trueArea < errorArea.value){
+
item.computeArea = errorArea.value
- item.computeGrossArea = parseFloat((item.computeArea*item.quantity).toFixed(2))
- item.grossAmount=parseFloat((item.price * item.computeGrossArea).toFixed(2))
+ item.computeGrossArea = parseFloat(multiply(item.computeArea,item.quantity))
+ item.grossAmount=parseFloat(multiply(item.price , item.computeGrossArea))
}
})
titleUploadData.value.money=countMoney(xGrid.value.getTableData().fullData).toString()
errorAreaVisible.value= false
}
+
@@ -1232,11 +1333,11 @@
if( !isNaN(item.computeArea*1) && item.computeArea != null ){
if(titleUploadData.value.calculateType===3){
- item.grossAmount=parseFloat((item.price * item.quantity).toFixed(2))
+ item.grossAmount=parseFloat(multiply(item.price , item.quantity))
}else{
item.grossArea = countArea(item)
item.computeGrossArea = item.grossArea
- item.grossAmount=parseFloat((item.price * item.computeGrossArea).toFixed(2))
+ item.grossAmount=parseFloat(multiply(item.price , item.computeGrossArea))
}
}
})
@@ -1269,8 +1370,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]);
}
@@ -1374,7 +1473,7 @@
<el-select @change="changeCalculateType" v-model="titleUploadData.calculateType" placeholder=" " >
<el-option :value="1" :label="t('order.areaAmountPerPiece')"/>
<el-option :value="2" :label="t('order.areaAmountAge')"/>
- <el-option :value="3" :label="'鏁伴噺閲戦'"/>
+ <el-option :value="3" :label="t('order.quantityMount')"/>
</el-select>
</el-col>
<el-col :span="2"><el-text>*{{$t('order.salesman')}}锛�</el-text></el-col>
@@ -1432,6 +1531,7 @@
v-on="gridEvents"
@keydown="handleKeyDown"
@edit-closed="editClosedEvent"
+ :cell-style="cellStyle"
>
<template #num1_filter="{ column, $panel }">
<div>
@@ -1481,6 +1581,16 @@
</el-col>
</el-row>
</el-dialog>
+ <el-dialog v-model="orderIdVisible" style="width: 300px;height:150px ">
+ <el-row>
+ <el-col :span="12">
+ <el-input v-model="newOrderId"/>
+ </el-col>
+ <el-col :span="6">
+ <el-button @click="updateOrderId">{{$t('basicData.confirmButtonText')}}</el-button>
+ </el-col>
+ </el-row>
+ </el-dialog>
<el-dialog v-model="otherMoneyVisible"
:title="$t('basicData.otherAmounts')"
:close-on-click-modal="false"
--
Gitblit v1.8.0