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 | 25 ++++++++++++++-----------
1 files changed, 14 insertions(+), 11 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 75fc548..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
@@ -1211,20 +1211,23 @@
}
const cellStyle = ({ row, column }) => {
- if (column.field === 'width') {
- if (row.width > parseInt(company.longSide)) {
- return {
- backgroundColor: '#ec6969'
+ 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'
+ }
}
}
}
- if (column.field === 'height') {
- if (row.height > parseInt(company.longSide)) {
- return {
- backgroundColor: '#ec6969'
- }
- }
- }
+
};
//璇樊闈㈢Н璁＄畻鏂规硶
--
Gitblit v1.8.0