Skip to content

E
ems3.3
Commit f7862cfa authored by TZW's avatar TZW
Browse files
Options

111

parent 7834d23e
Hide whitespace changes
Inline Side-by-side
Showing with 122 additions and 108 deletions
src/components/InitForm/Expandable/index.jsx
View file @ f7862cfa
......@@ -76,18 +76,18 @@ function Expandables({ value = [], onChange, item }) {
editable: false,
},
{
title: '库存数量',
dataIndex: 'actualStock',
title: '可用数量',
dataIndex: 'usedStock',
search: false,
key: 'actualStock',
key: 'usedStock',
editable: false,
},
{
title: '下架数量',
title: '更换数量',
dataIndex: 'operateNum',
search: false,
key: 'operateNum',
valueType: 'digit',
valueType: 'input',
fieldProps: {
precision: 3,
},
......
src/pages/maintain/workOrder/index.jsx
View file @ f7862cfa
......@@ -2,7 +2,7 @@
* @Author: Li Hanlin
* @Date: 2023-01-19 09:53:59
* @Last Modified by: Li Hanlin
* @Last Modified time: 2023-02-24 17:39:49
* @Last Modified time: 2023-02-24 19:18:49
*/
import * as React from 'react';
......@@ -590,7 +590,7 @@ function WorkOrder(props) {
hideInSearch: true,
hideInTable: true,
path: '/sparepart/lineStock/queryConsumeStock',
rowName: 'supplierList',
rowName: 'lineStockUseList',
rowSelection: {
type: 'checkbox',
getCheckboxProps: (record) => ({
......@@ -672,9 +672,20 @@ function WorkOrder(props) {
};
}
});
let lineStockUseList =
vals?.lineStockUseList?.map((it) => ({
lineStockId: it?.id,
operateNum: it?.operateNum,
})) ?? [];
let ifePieceStockUseList = vals?.ifePieceStockUseList ?? [];
run({
url: '/maintain/umMaintainTask/finishMaintainTask',
params: { id: drawer?.item?.id, maintainTaskItemList },
params: {
id: drawer?.item?.id,
maintainTaskItemList,
lineStockUseList,
ifePieceStockUseList,
},
});
}}
/>
......
src/pages/repair/order/index.jsx
View file @ f7862cfa
......@@ -3,7 +3,7 @@
* @Author: Li Hanlin
* @Date: 2022-12-02 11:41:03
* @Last Modified by: Li Hanlin
* @Last Modified time: 2023-02-24 15:18:44
* @Last Modified time: 2023-02-24 19:10:16
*/
import * as React from 'react';
......@@ -711,90 +711,90 @@ function Failure(props) {
};
// 完成维修
const Finishrepair = () => {
const EditTableItem = ({ record }) => {
const [value, setvalue] = useState([]);
// const EditTableItem = ({ record }) => {
// const [value, setvalue] = useState([]);
return (
<div>
<EditTable
resizeable={false}
alwaysShowAlert={false}
tableAlertRender={false}
tableAlertOptionRender={false}
columns={[
{
title: '线边库',
dataIndex: 'supplierNo',
key: 'supplierNo',
editable: false,
},
{
title: '供应商编号',
dataIndex: 'supplierNo',
key: 'supplierNo',
span: 3,
editable: false,
},
{
title: '供应商名称',
dataIndex: 'supplierName',
key: 'supplierName',
span: 3,
editable: false,
},
{
title: '可用数量',
dataIndex: 'usedStock',
key: 'usedStock',
search: false,
span: 3,
editable: false,
},
{
title: (
<div>
更换数量 <span style={{ color: 'red' }}>* </span>
</div>
),
search: false,
dataIndex: 'operateNum',
valueType: 'digit',
fieldProps: {
precision: 3,
},
key: 'operateNum',
span: 3,
hideInForm: true,
editable: true,
},
]}
path="/sparepart/lineStock/queryReplaceStock"
extraparams={{ lifePieceAccountId: record?.id }}
rowSelection={{
type: 'checkbox',
columnWidth: 44,
preserveSelectedRowKeys: true,
selectedRowKeys: value?.map((it) => it?.lineStockId) ?? [],
onChange: (selectedKeys, selectedRows) => {
const lineStockUseList = selectedRows?.map((it) => {
return { lineStockId: it?.id, operateNum: it?.operateNum };
});
setvalue(lineStockUseList);
},
}}
editable={{
onValuesChange: (rower, recordList) => {
setvalue((value) => {
const curkey = value?.map((it) => it?.lineStockId);
const newValue = value.concat(rower);
return [...newValue];
});
},
}}
/>
</div>
);
};
// return (
// <div>
// <EditTable
// resizeable={false}
// alwaysShowAlert={false}
// tableAlertRender={false}
// tableAlertOptionRender={false}
// columns={[
// {
// title: '线边库',
// dataIndex: 'supplierNo',
// key: 'supplierNo',
// editable: false,
// },
// {
// title: '供应商编号',
// dataIndex: 'supplierNo',
// key: 'supplierNo',
// span: 3,
// editable: false,
// },
// {
// title: '供应商名称',
// dataIndex: 'supplierName',
// key: 'supplierName',
// span: 3,
// editable: false,
// },
// {
// title: '可用数量',
// dataIndex: 'usedStock',
// key: 'usedStock',
// search: false,
// span: 3,
// editable: false,
// },
// {
// title: (
// <div>
// 更换数量 <span style={{ color: 'red' }}>* </span>
// </div>
// ),
// search: false,
// dataIndex: 'operateNum',
// valueType: 'digit',
// fieldProps: {
// precision: 3,
// },
// key: 'operateNum',
// span: 3,
// hideInForm: true,
// editable: true,
// },
// ]}
// path="/sparepart/lineStock/queryReplaceStock"
// extraparams={{ lifePieceAccountId: record?.id }}
// rowSelection={{
// type: 'checkbox',
// columnWidth: 44,
// preserveSelectedRowKeys: true,
// selectedRowKeys: value?.map((it) => it?.lineStockId) ?? [],
// onChange: (selectedKeys, selectedRows) => {
// const lineStockUseList = selectedRows?.map((it) => {
// return { lineStockId: it?.id, operateNum: it?.operateNum };
// });
// setvalue(lineStockUseList);
// },
// }}
// editable={{
// onValuesChange: (rower, recordList) => {
// setvalue((value) => {
// const curkey = value?.map((it) => it?.lineStockId);
// const newValue = value.concat(rower);
// return [...newValue];
// });
// },
// }}
// />
// </div>
// );
// };
const columns_fsmjxh = [
{
title: '线边库',
......@@ -846,7 +846,7 @@ function Failure(props) {
),
search: false,
dataIndex: 'operateNum',
valueType: 'digit',
valueType: 'input',
fieldProps: {
precision: 3,
},
......@@ -1075,7 +1075,6 @@ function Failure(props) {
}
}}
onFinish={async (vals) => {
console.log(vals);
let params = {
repairComplete: {
faultType: vals.faultSettingId,
......@@ -1087,20 +1086,24 @@ function Failure(props) {
},
id: drawer?.item.id,
repairAssistList: vals?.repairAssistList?.map((it) => ({ assistUserId: it })),
lineStockUseList: vals?.supplierList?.map((it) => ({
lineStockId: it?.id,
operateNum: it?.operateNum,
})),
ifePieceStockUseList: vals?.ifePieceStockUseList,
};
console.log(params);
// let res = await doFetch({
// url: '/repair/umRepairOrder/completeRepair',
// params,
// });
// if (res.code === '0000') {
// message.success('操作成功！');
// setdrawer((s) => ({
// ...s,
// open: false,
// }));
// actionRef.current.reload();
// }
let res = await doFetch({
url: '/repair/umRepairOrder/completeRepair',
params,
});
if (res.code === '0000') {
message.success('操作成功！');
setdrawer((s) => ({
...s,
open: false,
}));
actionRef.current.reload();
}
}}
{...drawer}
/>
......@@ -1144,7 +1147,7 @@ function Failure(props) {
...s,
open: false,
}));
actionRef.current.reload();
actionRef?.current?.reload();
}
}}
{...drawer}
......
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