Commit 4d8abce0 authored by krysent's avatar krysent

集成

parent 1de335aa
...@@ -828,47 +828,47 @@ const one = { ...@@ -828,47 +828,47 @@ const one = {
search: false, search: false,
}, },
], ],
expandable: { // expandable: {
defaultExpandAllRows: true, // defaultExpandAllRows: true,
expandedRowRender: (record) => ( // expandedRowRender: (record) => (
<Table // <Table
style={{ marginLeft: 48 }} // style={{ marginLeft: 48 }}
columns={[ // columns={[
{ // {
title: "库位名称", // title: "库位名称",
dataIndex: "storePositionName", // dataIndex: "storePositionName",
key: "storePositionName", // key: "storePositionName",
search: false, // search: false,
formItemProps: () => { // formItemProps: () => {
return { // return {
rules: [{ required: true, message: "此项为必填项" }], // rules: [{ required: true, message: "此项为必填项" }],
}; // };
}, // },
}, // },
{ // {
title: "上架数量", // title: "上架数量",
dataIndex: "instroeNum", // dataIndex: "instroeNum",
key: "instroeNum", // key: "instroeNum",
search: false, // search: false,
formItemProps: () => { // formItemProps: () => {
return { // return {
rules: [{ required: true, message: "此项为必填项" }], // rules: [{ required: true, message: "此项为必填项" }],
}; // };
}, // },
}, // },
]} // ]}
dataSource={record.uploadList} // dataSource={record.uploadList}
pagination={false} // pagination={false}
/> // />
), // ),
}, // },
pagination: "false", // pagination: "false",
rowKey: "id", // rowKey: "id",
rowSelection: { // rowSelection: {
onChange: (selectedRowKeys, selectedRows) => { // onChange: (selectedRowKeys, selectedRows) => {
setselected(selectedRows); // setselected(selectedRows);
}, // },
}, // },
}, },
], ],
}, },
......
...@@ -554,51 +554,51 @@ function Instore(props) { ...@@ -554,51 +554,51 @@ function Instore(props) {
search: false, search: false,
}, },
], ],
expandable: { // expandable: {
defaultExpandAllRows: true, // defaultExpandAllRows: true,
expandedRowRender: (record) => ( // expandedRowRender: (record) => (
<Table // <Table
style={{ marginLeft: 48 }} // style={{ marginLeft: 48 }}
columns={[ // columns={[
{ // {
title: "库位名称", // title: "库位名称",
dataIndex: "storePositionName", // dataIndex: "storePositionName",
key: "storePositionName", // key: "storePositionName",
search: false, // search: false,
formItemProps: () => { // formItemProps: () => {
return { // return {
rules: [ // rules: [
{ required: true, message: "此项为必填项" }, // { required: true, message: "此项为必填项" },
], // ],
}; // };
}, // },
}, // },
{ // {
title: "上架数量", // title: "上架数量",
dataIndex: "instroeNum", // dataIndex: "instroeNum",
key: "instroeNum", // key: "instroeNum",
search: false, // search: false,
formItemProps: () => { // formItemProps: () => {
return { // return {
rules: [ // rules: [
{ required: true, message: "此项为必填项" }, // { required: true, message: "此项为必填项" },
], // ],
}; // };
}, // },
}, // },
]} // ]}
dataSource={record.uploadList} // dataSource={record.uploadList}
pagination={false} // pagination={false}
/> // />
), // ),
}, // },
pagination: "false", // pagination: "false",
rowKey: "id", // rowKey: "id",
rowSelection: { // rowSelection: {
onChange: (selectedRowKeys, selectedRows) => { // onChange: (selectedRowKeys, selectedRows) => {
setselected(selectedRows); // setselected(selectedRows);
}, // },
}, // },
}, },
], ],
}, },
......
...@@ -320,58 +320,58 @@ const defaultFields = { ...@@ -320,58 +320,58 @@ const defaultFields = {
], ],
pagination: "false", pagination: "false",
rowKey: "id", rowKey: "id",
expandable: { // expandable: {
expandedRowRender: (record) => ( // expandedRowRender: (record) => (
<Table // <Table
style={{ marginLeft: 48 }} // style={{ marginLeft: 48 }}
columns={[ // columns={[
{ // {
title: "库位名称", // title: "库位名称",
dataIndex: "storePositionName", // dataIndex: "storePositionName",
key: "storePositionName", // key: "storePositionName",
search: false, // search: false,
formItemProps: () => { // formItemProps: () => {
return { // return {
rules: [{ required: true, message: "此项为必填项" }], // rules: [{ required: true, message: "此项为必填项" }],
}; // };
}, // },
}, // },
{ // {
title: "批次号", // title: "批次号",
dataIndex: "materieControlNo", // dataIndex: "materieControlNo",
key: "materieControlNo", // key: "materieControlNo",
search: false, // search: false,
}, // },
{ // {
title: "供应商编号-名称", // title: "供应商编号-名称",
dataIndex: "supplierNo", // dataIndex: "supplierNo",
key: "supplierNo", // key: "supplierNo",
search: false, // search: false,
render: (dom, row) => { // render: (dom, row) => {
return ( // return (
(row?.supplierNo ?? "") + // (row?.supplierNo ?? "") +
" - " + // " - " +
(row?.supplierName ?? "") // (row?.supplierName ?? "")
); // );
}, // },
}, // },
{ // {
title: "下架数量", // title: "下架数量",
dataIndex: "outstroeNum", // dataIndex: "outstroeNum",
key: "outstroeNum", // key: "outstroeNum",
search: false, // search: false,
}, // },
]} // ]}
dataSource={record.downloadList} // dataSource={record.downloadList}
pagination={false} // pagination={false}
/> // />
), // ),
}, // },
rowSelection: { // rowSelection: {
onChange: (selectedRowKeys, selectedRows) => { // onChange: (selectedRowKeys, selectedRows) => {
setselected(selectedRows); // setselected(selectedRows);
}, // },
}, // },
}, },
], ],
}, },
......
...@@ -737,53 +737,53 @@ const one = { ...@@ -737,53 +737,53 @@ const one = {
], ],
pagination: "false", pagination: "false",
rowKey: "id", rowKey: "id",
expandable: { // expandable: {
expandedRowRender: record => <Table // expandedRowRender: record => <Table
style={{ marginLeft: 48 }} // style={{ marginLeft: 48 }}
columns={[ // columns={[
{ // {
title: "库位名称", // title: "库位名称",
dataIndex: "storePositionName", // dataIndex: "storePositionName",
key: "storePositionName", // key: "storePositionName",
search: false, // search: false,
"formItemProps": () => { // "formItemProps": () => {
return { // return {
rules: [{ required: true, message: '此项为必填项' }], // rules: [{ required: true, message: '此项为必填项' }],
}; // };
}, // },
}, // },
{ // {
title: "批次号", // title: "批次号",
dataIndex: "materieControlNo", // dataIndex: "materieControlNo",
key: "materieControlNo", // key: "materieControlNo",
search: false, // search: false,
}, // },
{ // {
title: "供应商编号-名称", // title: "供应商编号-名称",
dataIndex: "supplierNo", // dataIndex: "supplierNo",
key: "supplierNo", // key: "supplierNo",
search: false, // search: false,
render: (dom, row) => { // render: (dom, row) => {
return (row?.supplierNo ?? '') + " - " + (row?.supplierName ?? '') // return (row?.supplierNo ?? '') + " - " + (row?.supplierName ?? '')
} // }
}, // },
{ // {
title: "下架数量", // title: "下架数量",
dataIndex: "outstroeNum", // dataIndex: "outstroeNum",
key: "outstroeNum", // key: "outstroeNum",
search: false, // search: false,
} // }
]} // ]}
dataSource={record.downloadList} // dataSource={record.downloadList}
pagination={false} // pagination={false}
/>, // />,
}, // },
rowSelection: { // rowSelection: {
onChange: (selectedRowKeys, selectedRows) => { // onChange: (selectedRowKeys, selectedRows) => {
setselected(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