From f9ae4dd16bc60281d7c2f7489e45d4f17896b659 Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期一, 26 一月 2026 13:14:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop-phyz' into devlop-phyz

---
 rsf-admin/src/page/histories/taskLog/TaskLogEdit.jsx |   26 +++++++++++++-------------
 1 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/rsf-admin/src/page/histories/taskLog/TaskLogEdit.jsx b/rsf-admin/src/page/histories/taskLog/TaskLogEdit.jsx
index 46226d0..aacaff6 100644
--- a/rsf-admin/src/page/histories/taskLog/TaskLogEdit.jsx
+++ b/rsf-admin/src/page/histories/taskLog/TaskLogEdit.jsx
@@ -79,6 +79,19 @@
                                     readOnly
                                 />
                                 <TextInput
+                                    label="table.field.task.barcode"
+                                    source="barcode"
+                                    readOnly
+                                    parse={v => v}
+                                /> 
+                                <NumberInput
+                                    label="table.field.task.sort"
+                                    readOnly
+                                    source="sort"
+                                />                               
+                            </Stack>
+                            <Stack direction='row' gap={2}>
+                                <TextInput
                                     label="table.field.task.orgLoc"
                                     source="orgLoc"
                                     readOnly
@@ -96,24 +109,11 @@
                                     readOnly
                                     parse={v => v}
                                 />
-                            </Stack>
-                            <Stack direction='row' gap={2}>
                                 <TextInput
                                     label="table.field.task.targSite"
                                     source="targSite"
                                     readOnly
                                     parse={v => v}
-                                />
-                                <TextInput
-                                    label="table.field.task.barcode"
-                                    source="barcode"
-                                    readOnly
-                                    parse={v => v}
-                                />
-                                <NumberInput
-                                    label="table.field.task.sort"
-                                    readOnly
-                                    source="sort"
                                 />
                             </Stack>
                         </Grid>

--
Gitblit v1.9.1