From 3512ff73239775ff866e73f3da2c5eac2f8e2494 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 03 四月 2024 08:50:04 +0800
Subject: [PATCH] Merge branch 'Four-Way-Rack' of http://47.97.1.152:5880/r/zy-asrs-master into Four-Way-Rack
---
zy-asrs-flow/src/pages/device/shuttle/index.jsx | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/zy-asrs-flow/src/pages/device/shuttle/index.jsx b/zy-asrs-flow/src/pages/device/shuttle/index.jsx
index eff130e..d44561e 100644
--- a/zy-asrs-flow/src/pages/device/shuttle/index.jsx
+++ b/zy-asrs-flow/src/pages/device/shuttle/index.jsx
@@ -170,7 +170,7 @@
{
key: '8',
label: '鍏呯數鐘舵��',
- children: 'N',
+ children: item.hasCharge ? 'Y' : 'N',
},
{
key: '9',
@@ -187,6 +187,11 @@
label: '杩愯鏂瑰悜',
children: item.runDirection,
},
+ {
+ key: '12',
+ label: '鏄惁鏈夋墭鐩�',
+ children: item.hasPallet ? 'Y' : 'N',
+ },
];
return <div key={item.id} style={{ width: '45%' }}>
<Descriptions size="small" title={tmpTitle} bordered items={tmpData} />
--
Gitblit v1.9.1