From ba4a73717339424325a8f82d0f10ec22aec1aad3 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期六, 12 四月 2025 10:12:39 +0800
Subject: [PATCH] #新增 1. 修改不良品组拖功能 2. 新装车不良品获取

---
 rsf-admin/src/page/asnOrder/AsnOrderList.jsx |   20 ++++++--------------
 1 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/rsf-admin/src/page/asnOrder/AsnOrderList.jsx b/rsf-admin/src/page/asnOrder/AsnOrderList.jsx
index 561522a..26d7d70 100644
--- a/rsf-admin/src/page/asnOrder/AsnOrderList.jsx
+++ b/rsf-admin/src/page/asnOrder/AsnOrderList.jsx
@@ -92,9 +92,10 @@
 
   <TextInput label="common.field.memo" source="memo" />,
   <DictionarySelect
-    label='common.field.status'
+    label='table.field.asnOrder.exceStatus'
     name="exceStatus"
     dictTypeCode="sys_asn_exce_status"
+    alwaysOn
   />,
 
 ]
@@ -129,11 +130,9 @@
         sort={{ field: "create_time", order: "desc" }}
         actions={(
           <TopToolbar>
-
             <FilterButton />
             <MyCreateButton onClick={() => { setCreateDialog(true); setmodalType(0) }} />
             <SelectColumnsButton preferenceKey='asnOrder' />
-
             <MyExportButton />
           </TopToolbar>
         )}
@@ -158,16 +157,11 @@
           <TextField source="logisNo" label="table.field.asnOrder.logisNo" />
           <DateField source="arrTime" label="table.field.asnOrder.arrTime" showTime />
           <TextField source="rleStatus$" label="table.field.asnOrder.rleStatus" sortable={false} />
-
-          <ReferenceField source="updateBy" label="common.field.updateBy" reference="user" link={false} sortable={false}>
-            <TextField source="nickname" />
-          </ReferenceField>
+          <TextField source="updateBy$" label="common.field.updateBy"  />
           <DateField source="updateTime" label="common.field.updateTime" showTime />
-          <ReferenceField source="createBy" label="common.field.createBy" reference="user" link={false} sortable={false}>
-            <TextField source="nickname" />
-          </ReferenceField>
+          <TextField source="createBy$" label="common.field.createBy" />
           <DateField source="createTime" label="common.field.createTime" showTime />
-          <BillStatusField cellClassName="status" source="exceStatus" label="common.field.status" />
+          <BillStatusField cellClassName="status" source="exceStatus" label="table.field.asnOrder.exceStatus" />
           <TextField source="memo" label="common.field.memo" sortable={false} />
           <WrapperField cellClassName="opt" label="common.field.opt" width={300} >
             {/* <Button label="toolbar.print" onClick={print}>
@@ -329,8 +323,6 @@
   }
 
   return (
-    (<Button onClick={requestClose} label={"toolbar.close"} color="error">
-      <CloseIcon />
-    </Button>)
+    <ConfirmButton label={"toolbar.close"} color="error" data={'纭鏄惁鍏抽棴锛�'} startIcon={<CloseIcon />} onConfirm={requestClose} />
   )
 }

--
Gitblit v1.9.1