From 466689e5e7db6520d719fe0cf9aee7c4eda9d457 Mon Sep 17 00:00:00 2001
From: verou <857149855@qq.com>
Date: 星期一, 31 三月 2025 09:37:11 +0800
Subject: [PATCH] fix:收货单选单字段
---
rsf-admin/src/page/qlyInspect/QlyInspectPanel.jsx | 6 ++
rsf-admin/src/page/qlyInspect/QlyInspectCreate.jsx | 8 ++
rsf-admin/src/page/qlyInspect/QlyInspectList.jsx | 8 +-
rsf-admin/src/i18n/zh.js | 34 ++++++-----
rsf-admin/src/page/qlyIsptItem/QlyIsptItemList.jsx | 2
rsf-admin/src/i18n/en.js | 2
rsf-admin/src/page/qlyInspect/QlyInspectEdit.jsx | 8 ++
rsf-admin/src/page/asnOrder/AsnOrderModal.jsx | 83 ++++++++++++---------------
8 files changed, 82 insertions(+), 69 deletions(-)
diff --git a/rsf-admin/src/i18n/en.js b/rsf-admin/src/i18n/en.js
index 8f45034..dd973ab 100644
--- a/rsf-admin/src/i18n/en.js
+++ b/rsf-admin/src/i18n/en.js
@@ -134,6 +134,7 @@
container: 'Container',
contract: 'Contract',
qlyInspect: 'QlyInspect',
+ qlyIsptItem: '璐ㄦ淇℃伅鏄庣粏',
dictType: 'DictType',
dictData: 'DictData',
companys: 'Companys',
@@ -409,6 +410,7 @@
projectName: "ProjectName",
},
qlyInspect: {
+ asnItemId: "asnItemId",
code: "code",
wkType: "wkType",
safeQty: "safeQty",
diff --git a/rsf-admin/src/i18n/zh.js b/rsf-admin/src/i18n/zh.js
index ea8aac8..b33bf85 100644
--- a/rsf-admin/src/i18n/zh.js
+++ b/rsf-admin/src/i18n/zh.js
@@ -134,6 +134,7 @@
container: '瀹瑰櫒绠＄悊',
contract: '鍚堝悓淇℃伅',
qlyInspect: '璐ㄦ淇℃伅',
+ qlyIsptItem: '璐ㄦ淇℃伅鏄庣粏',
dictType: '鏁版嵁瀛楀吀',
dictData: '瀛楀吀鏁版嵁闆�',
companys: '寰�鏉ヤ紒涓�',
@@ -417,26 +418,27 @@
projectName: "椤圭洰鍚嶇О",
},
qlyInspect: {
+ asnItemId: "閫氱煡鍗曟槑缁咺D",
code: "缂栫爜",
- wkType: "wkType",
+ wkType: "涓氬姟绫诲瀷",
safeQty: "鍚堟牸鏁伴噺",
- dlyQty: "dlyQty",
- rcptQty: "rcptQty",
- isptQty: "isptQty",
+ dlyQty: "閫佽揣鏁伴噺",
+ rcptQty: "鏀惰揣鏁伴噺 ",
+ isptQty: "璐ㄦ鏁伴噺",
},
qlyIsptItem: {
- ispectId: "ispectId",
- matnrCode: "matnrCode",
- maktx: "maktx",
- label: "label",
- splrName: "splrName",
- splrBatch: "splrBatch",
- stockBatch: "stockBatch",
- rcptQty: "rcptQty",
- dlyQty: "dlyQty",
- disQty: "disQty",
- safeQty: "safeQty",
- picPath: "picPath",
+ ispectId: "涓诲崟ID",
+ matnrCode: "缂栧彿",
+ maktx: "鐗╂枡鍚嶇О",
+ label: "鏍囩",
+ splrName: "渚涘簲鍟嗗悕绉�",
+ splrBatch: "渚涘簲鍟嗘壒娆�",
+ stockBatch: "搴撳瓨鎵规",
+ rcptQty: "鏀惰揣鏁伴噺",
+ dlyQty: "閫佽揣鏁伴噺",
+ disQty: "涓嶅悎鏁伴噺",
+ safeQty: "鍚堟牸鏁伴噺",
+ picPath: "鍥剧墖璺緞",
},
dictType: {
code: "瀛楀吀缂栫爜",
diff --git a/rsf-admin/src/page/asnOrder/AsnOrderModal.jsx b/rsf-admin/src/page/asnOrder/AsnOrderModal.jsx
index e75c230..4b48363 100644
--- a/rsf-admin/src/page/asnOrder/AsnOrderModal.jsx
+++ b/rsf-admin/src/page/asnOrder/AsnOrderModal.jsx
@@ -256,37 +256,18 @@
const [columns, setColumns] = useState([
{
- field: 'matnrId',
- headerName: translate('table.field.asnOrderItem.matnrId'),
- minWidth: 100,
- flex: 1,
- editable: false,
- },
- {
field: 'maktx',
headerName: translate('table.field.asnOrderItem.maktx'),
minWidth: 100,
flex: 1,
- editable: true,
+ editable: false,
},
{
field: 'maktxCode',
headerName: translate('table.field.asnOrderItem.maktxCode'),
minWidth: 100,
flex: 1,
- editable: true,
- },
- {
- field: 'poDetlId',
- headerName: translate('table.field.asnOrderItem.poDetlId'),
- minWidth: 100,
- flex: 1,
- },
- {
- field: 'poDetlCode',
- headerName: translate('table.field.asnOrderItem.poDetlCode'),
- minWidth: 100,
- flex: 1,
+ editable: false,
},
{
field: 'anfme',
@@ -294,27 +275,6 @@
minWidth: 100,
flex: 1,
editable: true,
- },
- {
- field: 'stockUnit',
- headerName: translate('table.field.asnOrderItem.stockUnit'),
- minWidth: 100,
- flex: 1,
- editable: false,
- },
- // {
- // field: 'purQty',
- // headerName: translate('table.field.asnOrderItem.purQty'),
- // minWidth: 100,
- // flex: 1,
- // editable: true,
- // },
- {
- field: 'purUnit',
- headerName: translate('table.field.asnOrderItem.purUnit'),
- minWidth: 100,
- flex: 1,
- editable: false,
},
{
field: 'splrCode',
@@ -337,6 +297,41 @@
flex: 1,
editable: true,
},
+ {
+ field: 'poDetlId',
+ headerName: translate('table.field.asnOrderItem.poDetlId'),
+ minWidth: 100,
+ flex: 1,
+ },
+ {
+ field: 'poDetlCode',
+ headerName: translate('table.field.asnOrderItem.poDetlCode'),
+ minWidth: 100,
+ flex: 1,
+ },
+
+ {
+ field: 'stockUnit',
+ headerName: translate('table.field.asnOrderItem.stockUnit'),
+ minWidth: 100,
+ flex: 1,
+ editable: false,
+ },
+ // {
+ // field: 'purQty',
+ // headerName: translate('table.field.asnOrderItem.purQty'),
+ // minWidth: 100,
+ // flex: 1,
+ // editable: true,
+ // },
+ {
+ field: 'purUnit',
+ headerName: translate('table.field.asnOrderItem.purUnit'),
+ minWidth: 100,
+ flex: 1,
+ editable: false,
+ },
+
])
@@ -378,7 +373,7 @@
headerName: el.fieldsAlise,
minWidth: 100,
flex: 1,
- editable: true
+ editable: false
}))
setColumns([...columns, ...cols, action])
} else {
@@ -410,8 +405,6 @@
setSelectedRows(ids)
};
-
-
return (
<div style={{ height: 400, width: '100%' }}>
diff --git a/rsf-admin/src/page/qlyInspect/QlyInspectCreate.jsx b/rsf-admin/src/page/qlyInspect/QlyInspectCreate.jsx
index dca01a0..06cffe7 100644
--- a/rsf-admin/src/page/qlyInspect/QlyInspectCreate.jsx
+++ b/rsf-admin/src/page/qlyInspect/QlyInspectCreate.jsx
@@ -85,11 +85,17 @@
<DialogContent sx={{ mt: 2 }}>
<Grid container rowSpacing={2} columnSpacing={2}>
<Grid item xs={6} display="flex" gap={1}>
+ <NumberInput
+ label="table.field.qlyInspect.asnItemId"
+ source="asnItemId"
+ autoFocus
+ />
+ </Grid>
+ <Grid item xs={6} display="flex" gap={1}>
<TextInput
label="table.field.qlyInspect.code"
source="code"
parse={v => v}
- autoFocus
validate={required()}
/>
</Grid>
diff --git a/rsf-admin/src/page/qlyInspect/QlyInspectEdit.jsx b/rsf-admin/src/page/qlyInspect/QlyInspectEdit.jsx
index 2b4e951..895ebc6 100644
--- a/rsf-admin/src/page/qlyInspect/QlyInspectEdit.jsx
+++ b/rsf-admin/src/page/qlyInspect/QlyInspectEdit.jsx
@@ -64,11 +64,17 @@
{translate('common.edit.title.main')}
</Typography>
<Stack direction='row' gap={2}>
+ <NumberInput
+ label="table.field.qlyInspect.asnItemId"
+ source="asnItemId"
+ autoFocus
+ />
+ </Stack>
+ <Stack direction='row' gap={2}>
<TextInput
label="table.field.qlyInspect.code"
source="code"
parse={v => v}
- autoFocus
validate={required()}
/>
</Stack>
diff --git a/rsf-admin/src/page/qlyInspect/QlyInspectList.jsx b/rsf-admin/src/page/qlyInspect/QlyInspectList.jsx
index a23f223..7da510e 100644
--- a/rsf-admin/src/page/qlyInspect/QlyInspectList.jsx
+++ b/rsf-admin/src/page/qlyInspect/QlyInspectList.jsx
@@ -60,9 +60,8 @@
const filters = [
<SearchInput source="condition" alwaysOn />,
- <DateInput label='common.time.after' source="timeStart" alwaysOn />,
- <DateInput label='common.time.before' source="timeEnd" alwaysOn />,
+ <NumberInput source="asnItemId" label="table.field.qlyInspect.asnItemId" />,
<TextInput source="code" label="table.field.qlyInspect.code" />,
<TextInput source="wkType" label="table.field.qlyInspect.wkType" />,
<NumberInput source="safeQty" label="table.field.qlyInspect.safeQty" />,
@@ -106,7 +105,6 @@
actions={(
<TopToolbar>
<FilterButton />
- <MyCreateButton onClick={() => { setCreateDialog(true) }} />
<SelectColumnsButton preferenceKey='qlyInspect' />
<MyExportButton />
</TopToolbar>
@@ -117,9 +115,12 @@
preferenceKey='qlyInspect'
bulkActionButtons={() => <BulkDeleteButton mutationMode={OPERATE_MODE} />}
rowClick={(id, resource, record) => false}
+ expand={() => <QlyInspectPanel />}
+ expandSingle={true}
omit={['id', 'createTime', 'createBy', 'memo']}
>
<NumberField source="id" />
+ <NumberField source="asnItemId$" label="table.field.qlyInspect.asnItemId" />
<TextField source="code" label="table.field.qlyInspect.code" />
<TextField source="wkType" label="table.field.qlyInspect.wkType" />
<NumberField source="safeQty" label="table.field.qlyInspect.safeQty" />
@@ -138,7 +139,6 @@
<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">
- <EditButton sx={{ padding: '1px', fontSize: '.75rem' }} />
<DeleteButton sx={{ padding: '1px', fontSize: '.75rem' }} mutationMode={OPERATE_MODE} />
</WrapperField>
</StyledDatagrid>
diff --git a/rsf-admin/src/page/qlyInspect/QlyInspectPanel.jsx b/rsf-admin/src/page/qlyInspect/QlyInspectPanel.jsx
index a66c697..6d78dcc 100644
--- a/rsf-admin/src/page/qlyInspect/QlyInspectPanel.jsx
+++ b/rsf-admin/src/page/qlyInspect/QlyInspectPanel.jsx
@@ -42,6 +42,12 @@
<Grid container spacing={2}>
<Grid item xs={6}>
<PanelTypography
+ title="table.field.qlyInspect.asnItemId"
+ property={record.asnItemId}
+ />
+ </Grid>
+ <Grid item xs={6}>
+ <PanelTypography
title="table.field.qlyInspect.code"
property={record.code}
/>
diff --git a/rsf-admin/src/page/qlyIsptItem/QlyIsptItemList.jsx b/rsf-admin/src/page/qlyIsptItem/QlyIsptItemList.jsx
index b53c5c3..daf901c 100644
--- a/rsf-admin/src/page/qlyIsptItem/QlyIsptItemList.jsx
+++ b/rsf-admin/src/page/qlyIsptItem/QlyIsptItemList.jsx
@@ -60,8 +60,6 @@
const filters = [
<SearchInput source="condition" alwaysOn />,
- <DateInput label='common.time.after' source="timeStart" alwaysOn />,
- <DateInput label='common.time.before' source="timeEnd" alwaysOn />,
<NumberInput source="ispectId" label="table.field.qlyIsptItem.ispectId" />,
<TextInput source="matnrCode" label="table.field.qlyIsptItem.matnrCode" />,
--
Gitblit v1.9.1