From f532c3f25335deb1bc5ff9cd6fa712cf9b222343 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 24 九月 2024 15:09:01 +0800
Subject: [PATCH] #
---
zy-acs-flow/src/page/bus/BusList.jsx | 5 ++++-
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/TaskController.java | 3 +--
zy-acs-flow/src/page/loc/LocList.jsx | 11 +++++------
zy-acs-flow/src/page/task/TaskList.jsx | 4 ++++
4 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/zy-acs-flow/src/page/bus/BusList.jsx b/zy-acs-flow/src/page/bus/BusList.jsx
index da2a17a..0cc67d2 100644
--- a/zy-acs-flow/src/page/bus/BusList.jsx
+++ b/zy-acs-flow/src/page/bus/BusList.jsx
@@ -33,6 +33,7 @@
FunctionField,
Pagination,
useNotify,
+ useRefresh,
} from 'react-admin';
import { Box, Typography, Button, Chip } from '@mui/material';
import { styled } from '@mui/material/styles';
@@ -99,6 +100,7 @@
const BusList = () => {
const translate = useTranslate();
const notify = useNotify();
+ const refresh = useRefresh();
const [createDialog, setCreateDialog] = useState(false);
const [drawerVal, setDrawerVal] = useState(false);
@@ -107,6 +109,7 @@
const { code, msg, data } = res.data;
if (code === 200) {
notify(msg || 'common.response.success', { type: 'success', messageArgs: { _: msg } });
+ refresh();
} else {
notify(msg || 'common.response.fail', { type: 'error', messageArgs: { _: msg } });
}
@@ -179,7 +182,7 @@
{/* <BooleanField source="statusBool" label="common.field.status" sortable={false} /> */}
<TextField source="memo" label="common.field.memo" sortable={false} emptyText="-" />
<FunctionField label="common.field.opt" cellClassName="opt" render={record => (
- (record.busSts === 15 || true) && (
+ (record.busSts === 15) && (
<ConfirmButton
label="ra.action.cancel"
size="small"
diff --git a/zy-acs-flow/src/page/loc/LocList.jsx b/zy-acs-flow/src/page/loc/LocList.jsx
index 7e55196..30c4a43 100644
--- a/zy-acs-flow/src/page/loc/LocList.jsx
+++ b/zy-acs-flow/src/page/loc/LocList.jsx
@@ -63,22 +63,21 @@
}));
const filters = [
- <SearchInput source="condition" alwaysOn />,
+ <TextInput source="locNo" label="table.field.loc.locNo" alwaysOn />,
+ <ReferenceInput source="locSts" label="table.field.loc.locSts" reference="locSts" alwaysOn>
+ <AutocompleteInput label="table.field.loc.locSts" optionText="name" filterToQuery={(val) => ({ name: val })} />
+ </ReferenceInput>,
<DateInput label='common.time.after' source="timeStart" alwaysOn />,
<DateInput label='common.time.before' source="timeEnd" alwaysOn />,
-
<TextInput source="uuid" label="table.field.loc.uuid" />,
<ReferenceInput source="zoneId" label="table.field.loc.zoneId" reference="zone">
<AutocompleteInput label="table.field.loc.zoneId" optionText="name" filterToQuery={(val) => ({ name: val })} />
</ReferenceInput>,
- <TextInput source="locNo" label="table.field.loc.locNo" alwaysOn />,
<TextInput source="name" label="table.field.loc.name" />,
<ReferenceInput source="code" label="table.field.loc.code" reference="code" alwaysOn>
<AutocompleteInput label="table.field.loc.code" optionText="data" filterToQuery={(val) => ({ data: val })} />
</ReferenceInput>,
- <ReferenceInput source="locSts" label="table.field.loc.locSts" reference="locSts" alwaysOn>
- <AutocompleteInput label="table.field.loc.locSts" optionText="name" filterToQuery={(val) => ({ name: val })} />
- </ReferenceInput>,
+ <SearchInput source="condition" alwaysOn />,
<NumberInput source="offset" label="table.field.loc.offset" />,
<NumberInput source="row" label="table.field.loc.row" alwaysOn />,
<NumberInput source="bay" label="table.field.loc.bay" alwaysOn />,
diff --git a/zy-acs-flow/src/page/task/TaskList.jsx b/zy-acs-flow/src/page/task/TaskList.jsx
index 2acc2b1..01b1206 100644
--- a/zy-acs-flow/src/page/task/TaskList.jsx
+++ b/zy-acs-flow/src/page/task/TaskList.jsx
@@ -33,6 +33,7 @@
FunctionField,
Pagination,
useNotify,
+ useRefresh,
} from 'react-admin';
import { Box, Chip, Card, Stack } from '@mui/material';
import { styled } from '@mui/material/styles';
@@ -132,6 +133,7 @@
const TaskList = () => {
const translate = useTranslate();
const notify = useNotify();
+ const refresh = useRefresh();
const [createDialog, setCreateDialog] = useState(false);
const [drawerVal, setDrawerVal] = useState(false);
@@ -140,6 +142,7 @@
const { code, msg, data } = res.data;
if (code === 200) {
notify(msg || 'common.response.success', { type: 'success', messageArgs: { _: msg } });
+ refresh();
} else {
notify(msg || 'common.response.fail', { type: 'error', messageArgs: { _: msg } });
}
@@ -151,6 +154,7 @@
const { code, msg, data } = res.data;
if (code === 200) {
notify(msg || 'common.response.success', { type: 'success', messageArgs: { _: msg } });
+ refresh();
} else {
notify(msg || 'common.response.fail', { type: 'error', messageArgs: { _: msg } });
}
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/TaskController.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/TaskController.java
index 84a8161..8d47bbe 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/TaskController.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/TaskController.java
@@ -12,7 +12,6 @@
import com.zy.acs.manager.common.utils.BusinessSortService;
import com.zy.acs.manager.common.utils.ExcelUtil;
import com.zy.acs.manager.manager.entity.Task;
-import com.zy.acs.manager.manager.enums.TaskStsType;
import com.zy.acs.manager.manager.service.TaskService;
import com.zy.acs.manager.system.controller.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
@@ -38,7 +37,7 @@
PageParam<Task, BaseParam> pageParam = new PageParam<>(baseParam, Task.class);
QueryWrapper<Task> wrapper = pageParam.buildWrapper(true, "io_time");
if (hasCreateTimeDesc(pageParam.getOrders())) {
- wrapper.last(businessSortService.getOrderBySql(TaskStsType.class, "task_sts"));
+// wrapper.last(businessSortService.getOrderBySql(TaskStsType.class, "task_sts"));
}
return R.ok().add(taskService.page(pageParam, wrapper));
}
--
Gitblit v1.9.1