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/AsnOrderEdit.jsx |   62 +++++++++++++++++++++++--------
 1 files changed, 46 insertions(+), 16 deletions(-)

diff --git a/rsf-admin/src/page/orders/asnOrder/AsnOrderEdit.jsx b/rsf-admin/src/page/orders/asnOrder/AsnOrderEdit.jsx
index 9a86482..7bd2671 100644
--- a/rsf-admin/src/page/orders/asnOrder/AsnOrderEdit.jsx
+++ b/rsf-admin/src/page/orders/asnOrder/AsnOrderEdit.jsx
@@ -72,19 +72,19 @@
                                 {translate('common.edit.title.main')}
                             </Typography>
                             <Stack direction='row' gap={2}>
-                                <TextInput
+                                {/* <TextInput
                                     label="table.field.asnOrder.code"
                                     source="code"
                                     readOnly
                                     parse={v => v}
-                                />
+                                /> */}
                                 <TextInput
                                     label="table.field.asnOrder.poCode"
                                     source="poCode"
                                     readOnly
                                     parse={v => v}
                                 />
-                                <AutocompleteInput
+                                {/* <AutocompleteInput
                                     choices={dicts}
                                     optionText="label"
                                     label="table.field.asnOrder.type"
@@ -92,7 +92,7 @@
                                     optionValue="value"
                                     parse={v => v}
                                     readOnly
-                                />
+                                /> */}
                                 <AutocompleteInput
                                     choices={business}
                                     optionText="label"
@@ -101,14 +101,6 @@
                                     optionValue="value"
                                     parse={v => v}
                                     readOnly
-                                />
-                            </Stack>
-                            <Stack direction='row' gap={2}>
-                                <TextInput
-                                    label="table.field.asnOrder.logisNo"
-                                    source="logisNo"
-                                    readOnly
-                                    parse={v => v}
                                 />
                                 <TextInput
                                     label="table.field.asnOrder.anfme"
@@ -122,12 +114,50 @@
                                     readOnly
                                     parse={v => v}
                                 />
-                                <DateInput
+                            </Stack>
+                            <Stack direction='row' gap={2}>
+                                <TextInput
+                                    label="閲囪喘缁勭粐"    //table.field.asnOrder.purchaseOrgName
+                                    source="purchaseOrgName"
+                                    readOnly
+                                    parse={v => v}
+                                />
+                                <TextInput
+                                    label="閲囪喘鍛�"    //table.field.asnOrder.purchaseOrgName
+                                    source="purchaseUserName"
+                                    readOnly
+                                    parse={v => v}
+                                />
+                                <TextInput
+                                    label="閲囪喘鏃ユ湡"    //table.field.asnOrder.purchaseOrgName
+                                    source="purchaseDate"
+                                    readOnly
+                                    parse={v => v}
+                                />
+                                <TextInput
+                                    label="渚涘簲鍟嗙紪鐮�"    //table.field.asnOrder.purchaseOrgName
+                                    source="supplierId"
+                                    readOnly
+                                    parse={v => v}
+                                />
+                                <TextInput
+                                    label="渚涘簲鍟�"    //table.field.asnOrder.purchaseOrgName
+                                    source="supplierName"
+                                    readOnly
+                                    parse={v => v}
+                                />
+                                {/* <TextInput
+                                    label="table.field.asnOrder.logisNo"
+                                    source="logisNo"
+                                    readOnly
+                                    parse={v => v}
+                                /> */}
+                                {/* <DateInput
                                     label="table.field.asnOrder.arrTime"
                                     source="arrTime"
                                     readOnly
-                                />
-                                <SelectInput
+                                /> */}
+                                {/* <SelectInput
                                     label="table.field.asnOrder.rleStatus"
                                     source="rleStatus"
                                     readOnly
@@ -136,7 +166,7 @@
                                         { id: 1, name: ' 宸查噴鏀�' },
                                     ]}
                                     validate={required()}
-                                />
+                                /> */}
                             </Stack>
                         </Grid>
                     </Grid>

--
Gitblit v1.9.1