From 4fe1a741d807b55f7fc14aed85e232b9d7972425 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 23 九月 2024 13:28:44 +0800
Subject: [PATCH] #

---
 zy-acs-flow/src/page/bus/BusList.jsx |   25 ++++++++++++++++++-------
 1 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/zy-acs-flow/src/page/bus/BusList.jsx b/zy-acs-flow/src/page/bus/BusList.jsx
index c6b7c70..b84793c 100644
--- a/zy-acs-flow/src/page/bus/BusList.jsx
+++ b/zy-acs-flow/src/page/bus/BusList.jsx
@@ -50,7 +50,17 @@
     '& .RaDatagrid-row': {
         cursor: 'auto'
     },
-    '& .column-name': {
+    '& .column-busNo': {
+        minWidth: '18em',
+    },
+    '& .column-tasksNum': {
+        maxWidth: '6em',
+    },
+    '& .column-memo': {
+        maxWidth: '12em',
+        overflow: 'hidden',
+        textOverflow: 'ellipsis',
+        whiteSpace: 'nowrap',
     },
     '& .opt': {
         width: 200
@@ -62,11 +72,11 @@
     <DateInput label='common.time.after' source="timeStart" alwaysOn />,
     <DateInput label='common.time.before' source="timeEnd" alwaysOn />,
 
-    <TextInput source="uuid" label="table.field.bus.uuid" />,
-    <TextInput source="busNo" label="table.field.bus.busNo" />,
+    // <TextInput source="uuid" label="table.field.bus.uuid" />,
+    <TextInput source="busNo" label="table.field.bus.busNo" alwaysOn resettable />,
     <DateInput source="startTime" label="table.field.bus.startTime" />,
     <DateInput source="endTime" label="table.field.bus.endTime" />,
-    <ReferenceInput source="busSts" label="table.field.bus.busSts" reference="busSts">
+    <ReferenceInput source="busSts" label="table.field.bus.busSts" reference="busSts" alwaysOn>
         <AutocompleteInput label="table.field.bus.busSts" optionText="name" filterToQuery={(val) => ({ name: val })} />
     </ReferenceInput>,
     <TextInput source="phase" label="table.field.bus.phase" />,
@@ -119,16 +129,17 @@
                     rowClick={(id, resource, record) => false}
                     expand={() => <BusPanel />}
                     expandSingle={true}
-                    omit={['id', 'uuid', 'phase', 'updateBy', 'createTime', 'createBy']}
+                    omit={['id', 'uuid', 'phase', 'updateBy', 'updateTime', 'createTime', 'createBy']}
                 >
                     <NumberField source="id" />
                     <TextField source="uuid" label="table.field.bus.uuid" />
                     <TextField source="busNo" label="table.field.bus.busNo" />
-                    <DateField source="startTime" label="table.field.bus.startTime" showTime />
-                    <DateField source="endTime" label="table.field.bus.endTime" showTime />
                     <ReferenceField source="busSts" label="table.field.bus.busSts" reference="busSts" link={false} sortable={false}>
                         <TextField source="name" />
                     </ReferenceField>
+                    <NumberField source="tasksNum" label="table.field.bus.tasksNum" sortable={false} />
+                    <DateField source="startTime" label="table.field.bus.startTime" showTime />
+                    <DateField source="endTime" label="table.field.bus.endTime" showTime />
                     <TextField source="phase" label="table.field.bus.phase" sortable={false} />
 
                     <ReferenceField source="updateBy" label="common.field.updateBy" reference="user" link={false} sortable={false}>

--
Gitblit v1.9.1