|
|
@@ -114,16 +114,16 @@ export default () => { |
|
|
|
hideInSearch: true, |
|
|
|
align: 'center', |
|
|
|
}, |
|
|
|
{ |
|
|
|
title: '炒锅名称', |
|
|
|
dataIndex: 'deviceName', |
|
|
|
ellipsis: true, |
|
|
|
hideInSearch: true, |
|
|
|
align: 'center', |
|
|
|
renderText(text, record, index, action) { |
|
|
|
return <>{record.deviceName ? record.deviceName : "自动分配"}</> |
|
|
|
}, |
|
|
|
}, |
|
|
|
// { |
|
|
|
// title: '炒锅名称', |
|
|
|
// dataIndex: 'deviceName', |
|
|
|
// ellipsis: true, |
|
|
|
// hideInSearch: true, |
|
|
|
// align: 'center', |
|
|
|
// renderText(text, record, index, action) { |
|
|
|
// return <>{record.deviceName ? record.deviceName : "自动分配"}</> |
|
|
|
// }, |
|
|
|
// }, |
|
|
|
{ |
|
|
|
title: '成品名称', |
|
|
|
dataIndex: 'finalName', |
|
|
@@ -137,6 +137,7 @@ export default () => { |
|
|
|
ellipsis: true, |
|
|
|
hideInSearch: true, |
|
|
|
align: 'center', |
|
|
|
width:80 |
|
|
|
}, |
|
|
|
{ |
|
|
|
dataIndex: 'batchId', |
|
|
@@ -149,7 +150,6 @@ export default () => { |
|
|
|
title: '进度', |
|
|
|
dataIndex: 'status', |
|
|
|
ellipsis: true, |
|
|
|
align: 'center', |
|
|
|
hideInSearch: true, |
|
|
|
render(_, record) { |
|
|
|
return <ConfigProvider |
|
|
@@ -174,12 +174,7 @@ export default () => { |
|
|
|
</ConfigProvider> |
|
|
|
}, |
|
|
|
}, |
|
|
|
{ |
|
|
|
title: '创建日期', |
|
|
|
dataIndex: 'createTime', |
|
|
|
ellipsis: true, |
|
|
|
hideInSearch: true, |
|
|
|
}, |
|
|
|
|
|
|
|
{ |
|
|
|
title: '操作', |
|
|
|
valueType: 'option', |
|
|
@@ -917,7 +912,9 @@ export default () => { |
|
|
|
typeForm.setFieldValue('lineId', '') |
|
|
|
workplanApi.Detail(v).then((res: MyResponse.Content) => { |
|
|
|
if (res.statusCode === 200) { |
|
|
|
setSelectFinal({ name: res.data.Name, finalId: res.data.finalId, quantity: res.data.quantity }) |
|
|
|
setSelectFinal({ name: res.data.finalName, finalId: res.data.finalId, quantity: res.data.quantity }) |
|
|
|
typeForm.setFieldValue('finalName', res.data.finalName) |
|
|
|
typeForm.setFieldValue('quantity', res.data.quantity) |
|
|
|
setLineProcessList([]) |
|
|
|
FinalAPI.LineList(res.data.finalId).then((res: MyResponse.Content) => { |
|
|
|
if (res.statusCode === 200) { |
|
|
|