diff --git a/frontend/src/pages/workInfo/index.less b/frontend/src/pages/workInfo/index.less index 5239e8e..dd14b99 100644 --- a/frontend/src/pages/workInfo/index.less +++ b/frontend/src/pages/workInfo/index.less @@ -2,4 +2,7 @@ width: 100px; margin: auto; } +.rowHeight{ + padding: 10px; +} diff --git a/frontend/src/pages/workInfo/index.tsx b/frontend/src/pages/workInfo/index.tsx index faa29e5..bb48ac3 100644 --- a/frontend/src/pages/workInfo/index.tsx +++ b/frontend/src/pages/workInfo/index.tsx @@ -149,9 +149,9 @@ export default () => { { title: '进度', dataIndex: 'status', - ellipsis: true, width:300, hideInSearch: true, + align:'center', fixed:'right', render(_, record) { return { { okText="确认" cancelText="关闭" > - + , { okText="确认" cancelText="关闭" > - + ] case 2: return [ { title: '操作', valueType: 'option', key: 'option', + fixed:'right', render: (_, record) => { switch (record.status) { case 0: @@ -446,7 +447,8 @@ export default () => { [ + : "" , { okText="确认" cancelText="关闭" > - + , ] ) @@ -522,7 +526,8 @@ export default () => { [ + , { okText="确认" cancelText="关闭" > - + , ] ) @@ -608,11 +614,11 @@ export default () => { setfinalPlan(res.data) } }); - ProductLineAPI.selectlist().then((res: MyResponse.Content) => { - if (res.statusCode === 200) { - setLineData(res.data) - } - }) + // ProductLineAPI.f().then((res: MyResponse.Content) => { + // if (res.statusCode === 200) { + // setLineData(res.data) + // } + // }) }, []) const UpdateGY = (lineId: string, finalId: string) => { productlineInfoStepsAPI.List({ lineId: lineId, finalId: finalId }).then((res: MyResponse.Content) => { @@ -718,8 +724,9 @@ export default () => { actionRef={actionRef} cardBordered style={{ - background: "burlywood" + background: "burlywood", }} + rowClassName={styles.rowHeight} loading={itemLoading} params={itemparams} dataSource={res} @@ -919,7 +926,7 @@ export default () => { typeForm.setFieldValue('finalName', res.data.finalName) typeForm.setFieldValue('quantity', res.data.quantity) setLineProcessList([]) - FinalAPI.LineList(res.data.finalId).then((res: MyResponse.Content) => { + FinalAPI.FinishLineList(res.data.finalId).then((res: MyResponse.Content) => { if (res.statusCode === 200) { setLineData(res.data) } @@ -985,7 +992,7 @@ export default () => { - + 0, message: '此项为必选项!' }]} > { item.devicesInfo.length > 0 ?