From 1dbfb930e943fede7adfffea8fd9977d894a903b Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期五, 23 一月 2026 08:57:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop-phyz' into devlop-phyz

---
 rsf-admin/src/page/orders/asnOrder/AsnOrderModal.jsx |   26 +++++++++++++-------------
 1 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/rsf-admin/src/page/orders/asnOrder/AsnOrderModal.jsx b/rsf-admin/src/page/orders/asnOrder/AsnOrderModal.jsx
index abe737c..b801437 100644
--- a/rsf-admin/src/page/orders/asnOrder/AsnOrderModal.jsx
+++ b/rsf-admin/src/page/orders/asnOrder/AsnOrderModal.jsx
@@ -263,7 +263,7 @@
                                         onChange={(e) => handleChange(e.target.value, 'poCode')}
                                     />
                                 </Grid>
-                                <Grid item md={2}>
+                                {/* <Grid item md={2}>
                                     <TextField
                                         label={translate("table.field.asnOrder.logisNo")}
                                         value={formData.logisNo}
@@ -278,7 +278,7 @@
                                         value={formData.arrTime}
                                         onChange={(e) => handleChange(e.target.value, 'arrTime')}
                                     />
-                                </Grid>
+                                </Grid> */}
                             </Grid>
                         </Form>
                     </Box>
@@ -532,17 +532,17 @@
         //     ),
         //     headerClassName: "custom",
         // },
-        {
-            field: 'splrName',
-            headerName: translate('table.field.asnOrderItem.splrName') + "*",
-            minWidth: 100,
-            flex: 1,
-            editable: true,
-            renderEditCell: (params) => (
-                <SelectInputSplrNameEditCell {...params} />
-            ),
-            headerClassName: "custom",
-        },
+        // {
+        //     field: 'splrName',
+        //     headerName: translate('table.field.asnOrderItem.splrName') + "*",
+        //     minWidth: 100,
+        //     flex: 1,
+        //     editable: true,
+        //     renderEditCell: (params) => (
+        //         <SelectInputSplrNameEditCell {...params} />
+        //     ),
+        //     headerClassName: "custom",
+        // },
         {
             field: 'platItemId',
             headerName: translate('table.field.asnOrderItem.platItemId') + "*",

--
Gitblit v1.9.1