Skip to content

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

111

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