Commit d80e190e authored by TZW's avatar TZW

0220

parent a0645d02
This diff is collapsed.
......@@ -36,14 +36,14 @@ function Warning(props) {
const columns = [
{
title: '线边库',
dataIndex: 'sparePartNo',
key: 'sparePartNo',
dataIndex: 'stockName',
key: 'stockName',
editable: false,
},
{
title: '备件料号',
dataIndex: 'sparePartName',
key: 'sparePartName',
dataIndex: 'sparePartNo',
key: 'sparePartNo',
span: 3,
editable: false,
},
......@@ -56,22 +56,22 @@ function Warning(props) {
},
{
title: '供应商编号',
dataIndex: 'sparePartName',
key: 'sparePartName',
dataIndex: 'supplierNo',
key: 'supplierNo',
span: 3,
editable: false,
},
{
title: '供应商名称',
dataIndex: 'sparePartName',
key: 'sparePartName',
dataIndex: 'supplierName',
key: 'supplierName',
span: 3,
editable: false,
},
{
title: '可用数量',
dataIndex: 'sparePartName',
key: 'sparePartName',
dataIndex: 'usedStock',
key: 'usedStock',
search: false,
span: 3,
editable: false,
......@@ -83,8 +83,12 @@ function Warning(props) {
</div>
),
search: false,
dataIndex: 'sparePartName',
key: 'sparePartName',
dataIndex: 'operateNum',
valueType: 'digit',
fieldProps: {
precision: 3,
},
key: 'operateNum',
span: 3,
hideInForm: true,
},
......@@ -109,9 +113,15 @@ function Warning(props) {
columns,
hideInSearch: true,
hideInTable: true,
path: '/sparepart/sparePartSupplier/queryList',
params: { status: 1 },
path: '/sparepart/lineStock/queryReplaceStock',
params: { lifePieceAccountId: drawer?.item?.id },
rowName: 'supplierList',
rowSelection: {
type: 'checkbox',
getCheckboxProps: (record) => ({
disabled: record.isAsh == '1',
}),
},
},
];
});
......@@ -248,7 +258,30 @@ function Warning(props) {
}
}}
>
<InitForm fields={changeColumns} />
<InitForm
fields={changeColumns}
onFinish={(vals) => {
console.log(vals);
if (vals.supplierList?.length == 0) {
return message.warning('请选择线边库存数据');
}
const lineStockUseList = vals?.supplierList?.map((it) => {
return {
lineStockId: it?.id,
operateNum: it?.operateNum,
};
});
for (let i of lineStockUseList) {
if (!i?.operateNum) {
return message.warning('请输入线边库存更换数量');
}
}
run({
url: '/sparepart/lifePieceAccount/replace',
params: { lineStockUseList, id: drawer?.item?.id },
});
}}
/>
</DrawerPro>
</div>
);
......
......@@ -2,7 +2,7 @@
* @Author: Li Hanlin
* @Date: 2023-02-17 13:36:11
* @Last Modified by: Li Hanlin
* @Last Modified time: 2023-02-17 13:50:04
* @Last Modified time: 2023-02-20 13:29:45
*/
import * as React from 'react';
......@@ -40,14 +40,14 @@ function Warning(props) {
const columns = [
{
title: '线边库',
dataIndex: 'sparePartNo',
key: 'sparePartNo',
dataIndex: 'stockName',
key: 'stockName',
editable: false,
},
{
title: '备件料号',
dataIndex: 'sparePartName',
key: 'sparePartName',
dataIndex: 'sparePartNo',
key: 'sparePartNo',
span: 3,
editable: false,
},
......@@ -60,22 +60,22 @@ function Warning(props) {
},
{
title: '供应商编号',
dataIndex: 'sparePartName',
key: 'sparePartName',
dataIndex: 'supplierNo',
key: 'supplierNo',
span: 3,
editable: false,
},
{
title: '供应商名称',
dataIndex: 'sparePartName',
key: 'sparePartName',
dataIndex: 'supplierName',
key: 'supplierName',
span: 3,
editable: false,
},
{
title: '可用数量',
dataIndex: 'sparePartName',
key: 'sparePartName',
dataIndex: 'usedStock',
key: 'usedStock',
search: false,
span: 3,
editable: false,
......@@ -87,8 +87,12 @@ function Warning(props) {
</div>
),
search: false,
dataIndex: 'sparePartName',
key: 'sparePartName',
dataIndex: 'operateNum',
valueType: 'digit',
fieldProps: {
precision: 3,
},
key: 'operateNum',
span: 3,
hideInForm: true,
},
......@@ -113,9 +117,15 @@ function Warning(props) {
columns,
hideInSearch: true,
hideInTable: true,
path: '/sparepart/sparePartSupplier/queryList',
params: { status: 1 },
path: '/sparepart/lineStock/queryReplaceStock',
params: { lifePieceAccountId: drawer?.item?.id },
rowName: 'supplierList',
rowSelection: {
type: 'checkbox',
getCheckboxProps: (record) => ({
disabled: record.isAsh == '1',
}),
},
},
];
});
......@@ -243,7 +253,30 @@ function Warning(props) {
}
}}
>
<InitForm fields={changeColumns} />
<InitForm
fields={changeColumns}
onFinish={(vals) => {
console.log(vals);
if (vals.supplierList?.length == 0) {
return message.warning('请选择线边库存数据');
}
const lineStockUseList = vals?.supplierList?.map((it) => {
return {
lineStockId: it?.id,
operateNum: it?.operateNum,
};
});
for (let i of lineStockUseList) {
if (!i?.operateNum) {
return message.warning('请输入线边库存更换数量');
}
}
run({
url: '/sparepart/lifePieceAccount/replace',
params: { lineStockUseList, id: drawer?.item?.id },
});
}}
/>
</DrawerPro>
</div>
);
......
function getcolumns(setdrawer) {
return {
columns: [
{
title: '操作时间',
dataIndex: 'operateTime',
key: 'operateTimeList',
valueType: 'dateTimeRange',
fieldProps: {
showTime: {
format: 'HH:mm',
},
format: 'YYYY-MM-DD HH:mm',
},
},
{
title: '操作人',
dataIndex: 'operateUserName',
key: 'operateUserId',
valueType: 'select',
fieldProps: {
dropdownMatchSelectWidth: 120,
showSearch: true,
},
options: {
path: '/auth/sysUser/selection',
params: {},
},
hideInSearch: false,
hideInTable: false,
},
{
title: '备件料号',
dataIndex: 'sparePartNo',
key: 'sparePartNo',
hideInSearch: false,
hideInTable: false,
},
{
title: '备件名称',
dataIndex: 'sparePartName',
key: 'sparePartName',
},
{
title: '供应商编号',
dataIndex: 'supplierNo',
key: 'supplierNo',
},
{
title: '供应商名称',
dataIndex: 'supplierName',
key: 'supplierName',
},
{
title: '设备编号',
dataIndex: 'equipmentNo',
key: 'equipmentNo',
},
{
title: '设备名称',
dataIndex: 'equipmentName',
key: 'equipmentName',
},
{
title: '使用数量',
dataIndex: 'operateNum',
key: 'operateNum',
search: false,
},
{
title: '使用类型',
dataIndex: 'operateTypeName',
key: 'operateType',
valueType: 'select',
fieldProps: {
dropdownMatchSelectWidth: 120,
},
options: [
{
value: '1',
label: '寿命件更换',
},
{
value: '2',
label: '维修使用',
},
{
value: '3',
label: '保养使用',
},
],
},
{
title: '相关单号',
dataIndex: 'relationNo',
key: 'relationNo',
},
],
pathconfig: {
enableadd: false,
enableedit: false,
enabledelete: false,
enabledetail: false,
add: '',
edit: '',
list: '/sparepart/lineStockAccess/queryList',
delete: '',
detail: '',
},
};
}
export default getcolumns;
import * as React from 'react';
import { useState, useMemo, useRef } from 'react';
import DrawerPro from '@/components/DrawerPro';
import AutoTable from '@/components/AutoTable';
import PremButton from '@/components/PremButton';
import getcolumns from './columns';
import { useRequest } from 'ahooks';
import { doFetch } from '@/utils/doFetch';
function Record(props) {
let actionRef = useRef(),
formRef = useRef();
const [drawer, setdrawer] = useState({
open: false,
});
const pathconfig = useMemo(() => {
let pathconf = getcolumns(setdrawer)?.pathconfig ?? {};
return pathconf;
}, []);
const { run, loading } = useRequest(doFetch, {
manual: true,
onSuccess: (res, params) => {
if (res?.code == '0000') {
actionRef?.current?.reload();
setdrawer((s) => ({
...s,
open: false,
}));
}
},
});
const detail = (text, row, _, action) => {
return (
<PremButton
btn={{
size: 'small',
type: 'link',
onClick: () => {
setdrawer((s) => ({
...s,
open: true,
item: row,
title: '详情',
val: 'detail',
title: '详细信息',
}));
},
}}
>
详情
</PremButton>
);
};
const edit = (text, row, _, action) => {
return (
<PremButton
btn={{
size: 'small',
onClick: () => {
setdrawer((s) => ({
...s,
open: true,
item: row,
title: '编辑',
val: 'edit',
}));
},
}}
>
编辑
</PremButton>
);
};
const remove = (text, row, _, action) => {
return (
<PremButton
pop={{
title: '是否删除?',
okText: '确认',
cancelText: '取消',
onConfirm: () => {
run({ url: pathconfig?.delete || '/delete', params: { id: row?.id } });
},
}}
btn={{
size: 'small',
type: 'danger',
}}
>
删除
</PremButton>
);
};
const columns = useMemo(() => {
let defcolumn = getcolumns(setdrawer)?.columns;
return defcolumn;
}, []);
return (
<div style={{ position: 'relative' }}>
<AutoTable
pagetitle={<h3 className="page-title">使用记录</h3>}
columns={columns}
actionRef={actionRef}
path={pathconfig?.list || '/ngic-auth/sysUser/query/page'}
pageextra={pathconfig?.enableadd ? 'add' : null}
resizeable={false}
addconfig={{
// access: 'sysDepartment_save',
btn: {
disabled: false,
onClick: () => {
setdrawer((s) => ({
...s,
open: true,
item: null,
title: '新增',
val: 'add',
}));
},
},
}}
/>
<DrawerPro
fields={columns}
params={{ id: drawer?.item?.id }}
formRef={formRef}
placement="right"
detailpath={pathconfig?.detail || null}
detailData={drawer?.item}
defaultFormValue={drawer?.item}
onClose={() => {
setdrawer((s) => ({
...s,
open: false,
}));
}}
{...drawer}
onFinish={(vals) => {
if (drawer?.val == 'add') {
run({ url: pathconfig?.add || '/add', params: { ...vals } });
} else if (drawer?.val == 'edit') {
run({ url: pathconfig?.edit || '/edit', params: { ...vals, id: drawer?.item?.id } });
}
}}
/>
</div>
);
}
export default Record;
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