Commit 4d8abce0 authored by krysent's avatar krysent

集成

parent 1de335aa
......@@ -828,47 +828,47 @@ const one = {
search: false,
},
],
expandable: {
defaultExpandAllRows: true,
expandedRowRender: (record) => (
<Table
style={{ marginLeft: 48 }}
columns={[
{
title: "库位名称",
dataIndex: "storePositionName",
key: "storePositionName",
search: false,
formItemProps: () => {
return {
rules: [{ required: true, message: "此项为必填项" }],
};
},
},
{
title: "上架数量",
dataIndex: "instroeNum",
key: "instroeNum",
search: false,
formItemProps: () => {
return {
rules: [{ required: true, message: "此项为必填项" }],
};
},
},
]}
dataSource={record.uploadList}
pagination={false}
/>
),
},
pagination: "false",
rowKey: "id",
rowSelection: {
onChange: (selectedRowKeys, selectedRows) => {
setselected(selectedRows);
},
},
// expandable: {
// defaultExpandAllRows: true,
// expandedRowRender: (record) => (
// <Table
// style={{ marginLeft: 48 }}
// columns={[
// {
// title: "库位名称",
// dataIndex: "storePositionName",
// key: "storePositionName",
// search: false,
// formItemProps: () => {
// return {
// rules: [{ required: true, message: "此项为必填项" }],
// };
// },
// },
// {
// title: "上架数量",
// dataIndex: "instroeNum",
// key: "instroeNum",
// search: false,
// formItemProps: () => {
// return {
// rules: [{ required: true, message: "此项为必填项" }],
// };
// },
// },
// ]}
// dataSource={record.uploadList}
// pagination={false}
// />
// ),
// },
// pagination: "false",
// rowKey: "id",
// rowSelection: {
// onChange: (selectedRowKeys, selectedRows) => {
// setselected(selectedRows);
// },
// },
},
],
},
......
......@@ -554,51 +554,51 @@ function Instore(props) {
search: false,
},
],
expandable: {
defaultExpandAllRows: true,
expandedRowRender: (record) => (
<Table
style={{ marginLeft: 48 }}
columns={[
{
title: "库位名称",
dataIndex: "storePositionName",
key: "storePositionName",
search: false,
formItemProps: () => {
return {
rules: [
{ required: true, message: "此项为必填项" },
],
};
},
},
{
title: "上架数量",
dataIndex: "instroeNum",
key: "instroeNum",
search: false,
formItemProps: () => {
return {
rules: [
{ required: true, message: "此项为必填项" },
],
};
},
},
]}
dataSource={record.uploadList}
pagination={false}
/>
),
},
pagination: "false",
rowKey: "id",
rowSelection: {
onChange: (selectedRowKeys, selectedRows) => {
setselected(selectedRows);
},
},
// expandable: {
// defaultExpandAllRows: true,
// expandedRowRender: (record) => (
// <Table
// style={{ marginLeft: 48 }}
// columns={[
// {
// title: "库位名称",
// dataIndex: "storePositionName",
// key: "storePositionName",
// search: false,
// formItemProps: () => {
// return {
// rules: [
// { required: true, message: "此项为必填项" },
// ],
// };
// },
// },
// {
// title: "上架数量",
// dataIndex: "instroeNum",
// key: "instroeNum",
// search: false,
// formItemProps: () => {
// return {
// rules: [
// { required: true, message: "此项为必填项" },
// ],
// };
// },
// },
// ]}
// dataSource={record.uploadList}
// pagination={false}
// />
// ),
// },
// pagination: "false",
// rowKey: "id",
// rowSelection: {
// onChange: (selectedRowKeys, selectedRows) => {
// setselected(selectedRows);
// },
// },
},
],
},
......
......@@ -320,58 +320,58 @@ const defaultFields = {
],
pagination: "false",
rowKey: "id",
expandable: {
expandedRowRender: (record) => (
<Table
style={{ marginLeft: 48 }}
columns={[
{
title: "库位名称",
dataIndex: "storePositionName",
key: "storePositionName",
search: false,
formItemProps: () => {
return {
rules: [{ required: true, message: "此项为必填项" }],
};
},
},
{
title: "批次号",
dataIndex: "materieControlNo",
key: "materieControlNo",
search: false,
},
{
title: "供应商编号-名称",
dataIndex: "supplierNo",
key: "supplierNo",
search: false,
render: (dom, row) => {
return (
(row?.supplierNo ?? "") +
" - " +
(row?.supplierName ?? "")
);
},
},
{
title: "下架数量",
dataIndex: "outstroeNum",
key: "outstroeNum",
search: false,
},
]}
dataSource={record.downloadList}
pagination={false}
/>
),
},
rowSelection: {
onChange: (selectedRowKeys, selectedRows) => {
setselected(selectedRows);
},
},
// expandable: {
// expandedRowRender: (record) => (
// <Table
// style={{ marginLeft: 48 }}
// columns={[
// {
// title: "库位名称",
// dataIndex: "storePositionName",
// key: "storePositionName",
// search: false,
// formItemProps: () => {
// return {
// rules: [{ required: true, message: "此项为必填项" }],
// };
// },
// },
// {
// title: "批次号",
// dataIndex: "materieControlNo",
// key: "materieControlNo",
// search: false,
// },
// {
// title: "供应商编号-名称",
// dataIndex: "supplierNo",
// key: "supplierNo",
// search: false,
// render: (dom, row) => {
// return (
// (row?.supplierNo ?? "") +
// " - " +
// (row?.supplierName ?? "")
// );
// },
// },
// {
// title: "下架数量",
// dataIndex: "outstroeNum",
// key: "outstroeNum",
// search: false,
// },
// ]}
// dataSource={record.downloadList}
// pagination={false}
// />
// ),
// },
// rowSelection: {
// onChange: (selectedRowKeys, selectedRows) => {
// setselected(selectedRows);
// },
// },
},
],
},
......
......@@ -737,53 +737,53 @@ const one = {
],
pagination: "false",
rowKey: "id",
expandable: {
expandedRowRender: record => <Table
style={{ marginLeft: 48 }}
columns={[
{
title: "库位名称",
dataIndex: "storePositionName",
key: "storePositionName",
search: false,
"formItemProps": () => {
return {
rules: [{ required: true, message: '此项为必填项' }],
};
},
},
{
title: "批次号",
dataIndex: "materieControlNo",
key: "materieControlNo",
search: false,
},
{
title: "供应商编号-名称",
dataIndex: "supplierNo",
key: "supplierNo",
search: false,
render: (dom, row) => {
return (row?.supplierNo ?? '') + " - " + (row?.supplierName ?? '')
}
},
{
title: "下架数量",
dataIndex: "outstroeNum",
key: "outstroeNum",
search: false,
}
// expandable: {
// expandedRowRender: record => <Table
// style={{ marginLeft: 48 }}
// columns={[
// {
// title: "库位名称",
// dataIndex: "storePositionName",
// key: "storePositionName",
// search: false,
// "formItemProps": () => {
// return {
// rules: [{ required: true, message: '此项为必填项' }],
// };
// },
// },
// {
// title: "批次号",
// dataIndex: "materieControlNo",
// key: "materieControlNo",
// search: false,
// },
// {
// title: "供应商编号-名称",
// dataIndex: "supplierNo",
// key: "supplierNo",
// search: false,
// render: (dom, row) => {
// return (row?.supplierNo ?? '') + " - " + (row?.supplierName ?? '')
// }
// },
// {
// title: "下架数量",
// dataIndex: "outstroeNum",
// key: "outstroeNum",
// search: false,
// }
]}
dataSource={record.downloadList}
pagination={false}
/>,
},
rowSelection: {
onChange: (selectedRowKeys, selectedRows) => {
setselected(selectedRows)
},
}
// ]}
// dataSource={record.downloadList}
// pagination={false}
// />,
// },
// rowSelection: {
// onChange: (selectedRowKeys, selectedRows) => {
// setselected(selectedRows)
// },
// }
},
],
},
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment