From 51727bb8477508d67e8f6a346d49e5b2a6b31a62 Mon Sep 17 00:00:00 2001
From: verou <857149855@qq.com>
Date: 星期四, 03 四月 2025 09:14:30 +0800
Subject: [PATCH] feat:0403修改
---
rsf-admin/src/page/basicInfo/loc/InitModal.jsx | 7 +++++--
rsf-admin/src/page/warehouseAreas/WarehouseAreasList.jsx | 14 ++++++++++++--
rsf-admin/src/page/asnOrder/AsnOrderPanel.jsx | 6 ++++--
rsf-admin/src/i18n/zh.js | 6 +++---
rsf-admin/src/page/basicInfo/loc/LocList.jsx | 1 -
5 files changed, 24 insertions(+), 10 deletions(-)
diff --git a/rsf-admin/src/i18n/zh.js b/rsf-admin/src/i18n/zh.js
index 52264fc..a6268e0 100644
--- a/rsf-admin/src/i18n/zh.js
+++ b/rsf-admin/src/i18n/zh.js
@@ -311,9 +311,9 @@
},
warehouseAreas: {
uuid: "鍞竴缂栫爜",
- name: "鍚嶇О",
+ name: "搴撳尯鍚嶇О",
wareId: "鎵�灞炰粨搴�",
- code: "缂栫爜",
+ code: "搴撳尯缂栫爜",
shipperId: "璐т富",
supplierId: "渚涘簲鍟�",
flagMinus: "鍏佽璐熷簱瀛�",
@@ -342,7 +342,7 @@
loc: {
warehouseId: "鎵�灞炰粨搴�",
areaId: "鎵�灞炲簱鍖�",
- code: "缂栫爜",
+ code: "搴撲綅缂栫爜",
type: "搴撲綅绫诲瀷",
name: "鍚嶇О",
flagLogic: "铏氭嫙搴撲綅",
diff --git a/rsf-admin/src/page/asnOrder/AsnOrderPanel.jsx b/rsf-admin/src/page/asnOrder/AsnOrderPanel.jsx
index 031f9f8..1880e12 100644
--- a/rsf-admin/src/page/asnOrder/AsnOrderPanel.jsx
+++ b/rsf-admin/src/page/asnOrder/AsnOrderPanel.jsx
@@ -49,7 +49,8 @@
},
{
field: 'asnCode',
- headerName: translate('table.field.asnOrderItem.asnCode')
+ headerName: translate('table.field.asnOrderItem.asnCode'),
+ width: 150,
},
{
field: 'poDetlId',
@@ -61,7 +62,8 @@
},
{
field: 'matnrCode',
- headerName: translate('table.field.asnOrderItem.matnrCode')
+ headerName: translate('table.field.asnOrderItem.matnrCode'),
+ width: 150,
},
{
field: 'maktx',
diff --git a/rsf-admin/src/page/basicInfo/loc/InitModal.jsx b/rsf-admin/src/page/basicInfo/loc/InitModal.jsx
index c3c685a..7d7ee4b 100644
--- a/rsf-admin/src/page/basicInfo/loc/InitModal.jsx
+++ b/rsf-admin/src/page/basicInfo/loc/InitModal.jsx
@@ -152,9 +152,12 @@
<Grid item xs={4}>
- <ReferenceArrayInput source="typeIds" reference="dictData" filter={{}}>
- <SelectArrayInput label="table.field.loc.type" onChange={(e) => handleChange(e.target.value, 'typeIds')} validate={[required()]} />
+ <ReferenceArrayInput source="typeIds" reference="locType" >
+ <SelectArrayInput label="table.field.loc.type" validate={[required()]} onChange={(e) => handleChange(e.target.value, 'typeIds')} />
</ReferenceArrayInput>
+ {/* <ReferenceArrayInput source="typeIds" reference="dictData" filter={{}}>
+ <SelectArrayInput label="table.field.loc.type" onChange={(e) => handleChange(e.target.value, 'typeIds')} validate={[required()]} />
+ </ReferenceArrayInput> */}
</Grid>
<Grid item xs={4}>
diff --git a/rsf-admin/src/page/basicInfo/loc/LocList.jsx b/rsf-admin/src/page/basicInfo/loc/LocList.jsx
index c6a9228..bac9056 100644
--- a/rsf-admin/src/page/basicInfo/loc/LocList.jsx
+++ b/rsf-admin/src/page/basicInfo/loc/LocList.jsx
@@ -87,7 +87,6 @@
const filters = [
<SearchInput source="condition" alwaysOn />,
-
<ReferenceInput
source="warehouseId"
label="table.field.loc.warehouseId"
diff --git a/rsf-admin/src/page/warehouseAreas/WarehouseAreasList.jsx b/rsf-admin/src/page/warehouseAreas/WarehouseAreasList.jsx
index 180bcf2..c90866a 100644
--- a/rsf-admin/src/page/warehouseAreas/WarehouseAreasList.jsx
+++ b/rsf-admin/src/page/warehouseAreas/WarehouseAreasList.jsx
@@ -63,7 +63,17 @@
const filters = [
<SearchInput source="condition" alwaysOn />,
- <TextField source="warehouseId" label="table.field.warehouseAreas.wareId" />,
+ <ReferenceInput
+ source="warehouseId"
+ label="table.field.loc.warehouseId"
+ reference="warehouse"
+ >
+ <AutocompleteInput
+ label="table.field.loc.warehouseId"
+ optionText="name"
+ filterToQuery={(val) => ({ name: val })}
+ />
+ </ReferenceInput>,
<TextInput source="uuid" label="table.field.warehouseAreas.uuid" />,
<TextInput source="name" label="table.field.warehouseAreas.name" />,
<TextInput source="code" label="table.field.warehouseAreas.code" />,
@@ -122,7 +132,7 @@
title={"menu.warehouseAreas"}
empty={<EmptyData onClick={() => { setCreateDialog(true) }} />}
filters={filters}
- sort={{ field: "create_time", order: "desc" }}
+ sort={{ field: "warehouseId", order: "desc" }}
actions={(
<TopToolbar>
<FilterButton />
--
Gitblit v1.9.1