From be168b245437a75948138927a2f1f4d1830513e0 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 21 五月 2025 14:03:12 +0800
Subject: [PATCH] #出库作业

---
 rsf-admin/src/page/task/TaskList.jsx |   24 ++++++++++++++++++------
 1 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/rsf-admin/src/page/task/TaskList.jsx b/rsf-admin/src/page/task/TaskList.jsx
index 8c5573c..05d5d2a 100644
--- a/rsf-admin/src/page/task/TaskList.jsx
+++ b/rsf-admin/src/page/task/TaskList.jsx
@@ -25,6 +25,7 @@
     SelectInput,
     NumberInput,
     Button,
+    EditButton,
 } from 'react-admin';
 import { Box, Typography, Card, Stack, Drawer } from '@mui/material';
 import { styled } from '@mui/material/styles';
@@ -129,7 +130,7 @@
                             <BulkDeleteButton mutationMode={OPERATE_MODE} />
                         </>
                     }
-                    rowClick={'edit'}
+                    rowClick={false}
                     expand={false}
                     expandSingle={true}
                     omit={['id', 'createTime', 'createBy', 'memo', 'robotCode', 'exceStatus', 'expDesc', 'expCode', 'status', 'sort']}
@@ -138,7 +139,7 @@
                     <TextField source="taskCode" label="table.field.task.taskCode" />
                     <NumberField source="taskStatus$" label="table.field.task.taskStatus" />
                     <NumberField source="taskType$" label="table.field.task.taskType" />
-                    <NumberField source="warehType$" label="table.field.task.taskType" />
+                    <NumberField source="warehType$" label="table.field.task.warehType" />
                     <TextField source="orgLoc" label="table.field.task.orgLoc" />
                     <TextField source="orgSite" label="table.field.task.orgSite" />
                     <TextField source="targLoc" label="table.field.task.targLoc" />
@@ -156,9 +157,10 @@
                     {/* <BooleanField source="statusBool" label="common.field.status" sortable={false} /> */}
                     <TextField source="memo" label="common.field.memo" sortable={false} />
                     <WrapperField cellClassName="opt" label="common.field.opt" onClick={(e) => e.stopPropagation()} >
+                        <EditButton label="toolbar.detail" />
                         <DoneButton sx={{ padding: '1px', fontSize: '.75rem' }} ></DoneButton>
                         <CancelButton sx={{ padding: '1px', fontSize: '.75rem' }} mutationMode={OPERATE_MODE} />
-                        <SetTopButton sx={{ padding: '1px', fontSize: '.75rem' }} ></SetTopButton>
+                        {/* <SetTopButton sx={{ padding: '1px', fontSize: '.75rem' }} ></SetTopButton> */}
                     </WrapperField>
                 </StyledDatagrid>
             </List>
@@ -175,6 +177,17 @@
 export default TaskList;
 
 
+const PickButton = () => {
+    const record = useRecordContext();
+    const notify = useNotify();
+    const refresh = useRefresh();
+
+    return (
+        record?.taskStatus == 103 ? <ConfirmButton label={""} />
+    )
+}
+
+
 /**
  * 瀹屾垚鎿嶄綔
  * @returns 
@@ -183,8 +196,7 @@
     const record = useRecordContext();
     const notify = useNotify();
     const refresh = useRefresh();
-    const clickComplete = (event) => {
-        event.stopPropagation();
+    const clickComplete = () => {
         completeTask(record)
     };
     //瀹屾垚浠诲姟
@@ -198,7 +210,7 @@
         }
     }
     return (
-        <ConfirmButton label={"toolbar.complete"} color="secondary" startIcon={<TaskAltIcon />} onConfirm={clickComplete} />
+        record?.taskStatus < 98 ? (<ConfirmButton label={"toolbar.complete"} color="secondary" startIcon={<TaskAltIcon />} onConfirm={clickComplete} />) : (<></>)
     )
 }
 

--
Gitblit v1.9.1