From efe0972ca3e0f816bc274c4e579d61763ac2adcf Mon Sep 17 00:00:00 2001
From: chen.lin <1442464845@qq.com>
Date: 星期一, 09 二月 2026 16:34:58 +0800
Subject: [PATCH] 翻译修复
---
rsf-admin/src/page/orders/outStock/OutOrderList.jsx | 117 +++++++++++++++++++++++++++++++++++-----------------------
1 files changed, 70 insertions(+), 47 deletions(-)
diff --git a/rsf-admin/src/page/orders/outStock/OutOrderList.jsx b/rsf-admin/src/page/orders/outStock/OutOrderList.jsx
index 1181459..8934fe5 100644
--- a/rsf-admin/src/page/orders/outStock/OutOrderList.jsx
+++ b/rsf-admin/src/page/orders/outStock/OutOrderList.jsx
@@ -50,16 +50,17 @@
import ConfirmButton from '../../components/ConfirmButton';
import ImportButton from "../../components/ImportButton";
import DetailsIcon from '@mui/icons-material/Details';
+import OutStockWaveDialog from "./OutStockWaveDialog";
import AddTaskIcon from '@mui/icons-material/AddTask';
import PublicIcon from '@mui/icons-material/Public';
import SelectMatnrModal from "./SelectMatnrModal";
import EditIcon from '@mui/icons-material/Edit';
+import TaskIcon from '@mui/icons-material/Task';
import OutOrderPreview from "./OutOrderPreview";
import AddIcon from '@mui/icons-material/Add';
import OutStockPublic from "./OutStockPublic";
import OutOrderModal from "./OutOrderModal";
import request from '@/utils/request';
-import OutStockWaveDialog from "./OutStockWaveDialog";
const StyledDatagrid = styled(DatagridConfigurable)(({ theme }) => ({
'& .css-1vooibu-MuiSvgIcon-root': {
@@ -81,65 +82,63 @@
},
}));
-const filters = [
- <SearchInput source="condition" alwaysOn />,
- <TextInput source="code" label="table.field.outStock.code" alwaysOn />,
- <TextInput source="poCode" label="table.field.outStock.poCode" />,
- <NumberInput source="poId" label="table.field.outStock.poId" />,
- <ReferenceInput source="type" reference="dictData" filter={{ dictTypeCode: 'sys_order_type', group: '2' }} label="table.field.outStock.type" alwaysOn>
- <AutocompleteInput label="table.field.outStock.type" optionValue="value" />
- </ReferenceInput>,
- <ReferenceInput source="wkType" reference="dictData" filter={{ dictTypeCode: 'sys_business_type', group: '2' }} label="table.field.outStock.wkType" alwaysOn>
- <AutocompleteInput label="table.field.outStock.wkType" optionValue="value" />
- </ReferenceInput>,
- <NumberInput source="anfme" label="table.field.outStock.anfme" />,
- <NumberInput source="qty" label="table.field.outStock.qty" />,
- <TextInput source="logisNo" label="table.field.outStock.logisNo" />,
- <DateInput source="arrTime" label="table.field.outStock.arrTime" />,
- <SelectInput source="rleStatus" label="table.field.outStock.rleStatus"
- choices={[
- { id: 0, name: ' 姝ｅ父' },
- { id: 1, name: ' 宸查噴鏀�' },
- ]}
- />,
-
- <TextInput label="common.field.memo" source="memo" />,
- <DictionarySelect
- label='table.field.outStock.exceStatus'
- name="exceStatus"
- dictTypeCode="sys_asn_exce_status"
- alwaysOn
- />,
-]
-
const OutOrderList = (props) => {
- const translate = useTranslate();
- const refresh = useRefresh();
+ const dicts = JSON.parse(localStorage.getItem('sys_dicts'))?.filter(dict => (dict.dictTypeCode == 'sys_business_type')) || [];
const [createDialog, setCreateDialog] = useState(false);
const [manualDialog, setManualDialog] = useState(false);
+ const [drawerVal, setDrawerVal] = useState(false);
+ const [waveRule, setWaveRule] = useState(false);
const [selectIds, setSelectIds] = useState([]);
const [preview, setPreview] = useState(false);
- const [waveRule, setWaveRule] = useState(false);
- const [drawerVal, setDrawerVal] = useState(false);
const [modalType, setmodalType] = useState(0);
const [select, setSelect] = useState(0);
+ const translate = useTranslate();
+
+ const filters = [
+ <SearchInput source="condition" alwaysOn placeholder={translate('ra.action.search')} />,
+ <TextInput source="code" label="table.field.outStock.code" alwaysOn />,
+ <TextInput source="poCode" label="table.field.outStock.poCode" />,
+ <NumberInput source="poId" label="table.field.outStock.poId" />,
+ <ReferenceInput source="type" reference="dictData" filter={{ dictTypeCode: 'sys_order_type', group: '2' }} label="table.field.outStock.type" alwaysOn>
+ <AutocompleteInput label="table.field.outStock.type" optionValue="value" />
+ </ReferenceInput>,
+ <ReferenceInput source="wkType" reference="dictData" filter={{ dictTypeCode: 'sys_business_type', group: '2' }} label="table.field.outStock.wkType" alwaysOn>
+ <AutocompleteInput label="table.field.outStock.wkType" optionValue="value" />
+ </ReferenceInput>,
+ <NumberInput source="anfme" label="table.field.outStock.anfme" />,
+ <NumberInput source="qty" label="table.field.outStock.qty" />,
+ <TextInput source="logisNo" label="table.field.outStock.logisNo" />,
+ <DateInput source="arrTime" label="table.field.outStock.arrTime" />,
+ <SelectInput source="rleStatus" label="table.field.outStock.rleStatus"
+ choices={[
+ { id: 0, name: ' 姝ｅ父' },
+ { id: 1, name: ' 宸查噴鏀�' },
+ ]}
+ />,
+
+ <TextInput label="common.field.memo" source="memo" />,
+ <DictionarySelect
+ label='table.field.outStock.exceStatus'
+ name="exceStatus"
+ dictTypeCode="sys_asn_exce_status"
+ alwaysOn
+ />,
+ ];
+ const refresh = useRefresh();
+ const notify = useNotify();
const billReload = useRef();
- const dicts = JSON.parse(localStorage.getItem('sys_dicts'))?.filter(dict => (dict.dictTypeCode == 'sys_business_type')) || [];
//鑾峰彇娉㈡瑙勫垯
const closeDialog = async (value) => {
setWaveRule(false)
+ const res = await request.post(`/outStock/generate/wave`, { ids: selectIds, waveRuleId: value.id });
+ if (res?.data?.code === 200) {
+ notify(res.data.msg);
+ } else {
+ notify(res.data.msg);
+ }
refresh()
- console.log('=====>');
- console.log(value);
- console.log(selectIds);
- // const res = await request.post(`/outStock/generate/wave`, { ids: selectIds });
- // if (res?.data?.code === 200) {
- // notify(res.data.msg);
- // } else {
- // notify(res.data.msg);
- // }
}
return (
@@ -175,7 +174,7 @@
bulkActionButtons={<PublicTaskButton setWaveRule={setWaveRule} setSelectIds={setSelectIds} />}
rowClick={false}
expandSingle={true}
- omit={['id', 'createTime', 'createBy', 'memo', 'rleStatus$']}
+ omit={['id', 'createTime', 'createBy$', 'memo', 'rleStatus$']}
>
<NumberField source="id" />
<TextField source="code" label="table.field.outStock.code" />
@@ -197,6 +196,7 @@
<MyButton setCreateDialog={setManualDialog} setmodalType={setmodalType} />
<EditButton label="toolbar.detail" icon={(<DetailsIcon />)}></EditButton>
<CancelButton />
+ <CompleteButton />
<PublicButton setDrawerVal={setDrawerVal} drawerVal={drawerVal} setSelect={setSelect} />
</WrapperField>
</StyledDatagrid>
@@ -253,6 +253,29 @@
);
}
+//瀹屾垚鍗曟嵁
+const CompleteButton = () => {
+ const record = useRecordContext();
+ const notify = useNotify();
+ const refresh = useRefresh();
+ const requestComplete = async () => {
+ const { data: { code, data, msg } } = await request.get(`/outStock/complete/${record.id}`);
+ if (code === 200) {
+ notify(msg);
+ refresh()
+ } else {
+ notify(msg);
+ }
+ }
+
+ return (
+ // record.exceStatus === 1 && (record.anfme === record.qty ? <Button onClick={requestComplete} label={"toolbar.complete"} color="secondary">
+ // <TaskIcon />
+ // </Button> : )
+ record.exceStatus != 15 ? <ConfirmButton label={"toolbar.complete"} color="secondary" startIcon={<TaskIcon />} onConfirm={requestComplete} /> : <></>
+ )
+}
+
const MyButton = ({ setCreateDialog, setmodalType }) => {
const record = useRecordContext();
const handleEditClick = (btn) => {
--
Gitblit v1.9.1