From 0696db2f8a83d32d8c00ba55967694ed1a76f4d0 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 05 五月 2025 16:07:35 +0800
Subject: [PATCH] 1. 往来企业问题修复 2. 组托问题修复 3. 库位信息问题修复

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

diff --git a/rsf-admin/src/page/task/TaskList.jsx b/rsf-admin/src/page/task/TaskList.jsx
index dc8eceb..0904353 100644
--- a/rsf-admin/src/page/task/TaskList.jsx
+++ b/rsf-admin/src/page/task/TaskList.jsx
@@ -8,33 +8,21 @@
     SearchInput,
     TopToolbar,
     SelectColumnsButton,
-    EditButton,
     FilterButton,
-    CreateButton,
-    ExportButton,
     BulkDeleteButton,
     WrapperField,
     useRecordContext,
     useTranslate,
     useNotify,
     useRefresh,
-    useDataProvider,
-    useListContext,
-    FunctionField,
     TextField,
     NumberField,
     DateField,
     BooleanField,
-    ReferenceField,
     TextInput,
-    DateTimeInput,
     DateInput,
     SelectInput,
     NumberInput,
-    ReferenceInput,
-    ReferenceArrayInput,
-    AutocompleteInput,
-    DeleteButton,
     Button,
 } from 'react-admin';
 import { Box, Typography, Card, Stack, Drawer } from '@mui/material';
@@ -98,11 +86,9 @@
     />,
 ]
 
-const TaskList = () => {
+const TaskList = (props) => {
     const translate = useTranslate();
-    const [createDialog, setCreateDialog] = useState(false);
     const [drawerVal, setDrawerVal] = useState(false);
-    const [data, setData] = useState([]);    
     return (
         <Box display="flex">
             <List
@@ -117,7 +103,7 @@
                 title={"menu.task"}
                 empty={false}
                 filters={filters}
-                sort={{ field: "sort", order: "desc" }}
+                sort={{ field: "create_time", order: "desc" }}
                 actions={(
                     <TopToolbar>
                         <FilterButton />
@@ -154,13 +140,13 @@
                     <TextField source="expDesc" label="table.field.task.expDesc" />
                     <NumberField source="sort" label="table.field.task.sort" />
                     <TextField source="expCode" label="table.field.task.expCode" />
-                    <TextField source="updateBy$" label="common.field.updateBy"/>
-                    <TextField source="createBy$" label="common.field.createBy"/>
+                    <TextField source="updateBy$" label="common.field.updateBy" />
+                    <TextField source="createBy$" label="common.field.createBy" />
                     <DateField source="updateTime" label="common.field.updateTime" showTime />
                     <DateField source="createTime" label="common.field.createTime" showTime />
                     {/* <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">
+                    <WrapperField cellClassName="opt" label="common.field.opt" onClick={(e) => e.stopPropagation()} >
                         <DoneButton sx={{ padding: '1px', fontSize: '.75rem' }} ></DoneButton>
                         <CancelButton sx={{ padding: '1px', fontSize: '.75rem' }} mutationMode={OPERATE_MODE} />
                         <SetTopButton sx={{ padding: '1px', fontSize: '.75rem' }} ></SetTopButton>
@@ -184,13 +170,25 @@
  * 瀹屾垚鎿嶄綔
  * @returns 
  */
-const DoneButton = () => {
+const DoneButton = (props) => {
     const record = useRecordContext();
-    const clickComplete = () => {
-        completeTask([record])
+    const notify = useNotify(); 
+    const refresh = useRefresh();
+    const clickComplete = (event) => {
+        event.stopPropagation();
+        completeTask(record)
     };
     //瀹屾垚浠诲姟
-    const completeTask = async (row) => { }
+    const completeTask = async (row) => {
+        console.log(row.id);
+        const { data: { code, data, msg } } = await request.post(`task/complete/` + row.id);
+        if (code === 200) {
+            notify(msg);
+            refresh();
+        } else {
+            notify(msg);
+        }
+    }
     return (
         <Button
             onClick={clickComplete}
@@ -208,11 +206,12 @@
     const record = useRecordContext();
     const notify = useNotify();
     const refresh = useRefresh();
-    const clickCancel = () => {
+    const clickCancel = (event) => {
+        event.stopPropagation();
         cancleTask(record)
     };
     //鍙栨秷浠诲姟
-    const cancleTask = async (row) => {
+    const cancleTask = async (row) => { 
         console.log(row);
         const { data: { code, data, msg } } = await request.post(`/task/remove/` + row.id);
         if (code === 200) {
@@ -238,7 +237,8 @@
     const record = useRecordContext();
     const notify = useNotify();
     const refresh = useRefresh();
-    const clickTop = () => {
+    const clickTop = (event) => {
+        event.stopPropagation();
         topTask(record)
     };
     //缃《浠诲姟
@@ -250,7 +250,7 @@
         } else {
             notify(msg);
         }
-     }
+    }
     return (
         <Button
             onClick={clickTop}

--
Gitblit v1.9.1