From 2f640b1038fa331954f78ed1f4317212cf5bb34d Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期五, 07 六月 2024 16:56:06 +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 | 29 +++++++++++++++++++----------
1 files changed, 19 insertions(+), 10 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 fcab099..5e2b1cb 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
@@ -569,7 +569,7 @@
orderDetails.forEach(item => {
item.otherColumns = JSON.parse(item.otherColumns)
})
- otherMoney.value =res.data.orderOtherMoneyList
+ otherMoney.value =res.data.orderOtherMoneyList.filter(item => item.column.indexOf('M')>-1)
//鍔犺浇鍓〃鏁版嵁
xGrid.value.reloadData(orderDetails)
gridOptions.loading = false
@@ -606,21 +606,30 @@
otherMoney.value.forEach(item => {
let column = {
field: `otherColumns.${item.column}`,
- width:50, title: item.alias,
+ width:100,
+ title: item.alias,
editRender: {
name: 'input',
}
}
- gridOptions.editRules[`otherColumns.${item.column}`] = [
- {
- validator ({ cellValue }) {
- const regex = /^(0|[1-9][0-9]{0,4}([.][0-9]{1,2})?)$/
- if (cellValue && !regex.test(cellValue)) {
- return new Error(t('basicData.msg.range99999Dec2'))
+ //鍒ゆ柇 鍏朵粬鍒楁槸鍚︽槸鏁板瓧
+ if(item.column.indexOf('M')>-1){
+ gridOptions.editRules[`otherColumns.${item.column}`] = [
+ {
+ validator ({ cellValue }) {
+ const regex = /^(0|[1-9][0-9]{0,4}([.][0-9]{1,2})?)$/
+ if (cellValue && !regex.test(cellValue)) {
+ return new Error(t('basicData.msg.range99999Dec2'))
+ }
}
}
- }
- ]
+ ]
+ }else{
+ gridOptions.editRules[`otherColumns.${item.column}`] = [
+ { required: false},
+ { min: 0, max: 255, message: t('basicData.msg.max255') }
+ ]
+ }
//columns.push(column)
gridOptions.columns.push(column)
--
Gitblit v1.8.0