Skip to content

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

0220

parent a0645d02
Hide whitespace changes
Inline Side-by-side
Showing with 669 additions and 329 deletions
config/authRoutes.js
View file @ d80e190e
export default [
{
"path": "/welcome",
"name": "首页",
"icon": "smile",
"component": "./Welcome"
},
{
"name": "基础设置",
"icon": "setting",
"path": "/setting",
"routes": [
{
"name": "用户管理",
"path": "/setting/users",
"component": "./setting/users"
},
{
"name": "角色管理",
"path": "/setting/role",
"component": "./setting/role"
},
{
"name": "组织管理",
"path": "/setting/organization",
"component": "./setting/organization"
},
{
"name": "工厂管理",
"path": "/setting/factory",
"component": "./setting/factory"
},
{
"name": "车间管理",
"path": "/setting/workshop",
"component": "./setting/workshop"
},
{
"name": "工段管理",
"path": "/setting/section",
"component": "./setting/section"
},
{
"name": "产线管理",
"path": "/setting/production",
"component": "./setting/production"
}
]
},
{
"name": "设备管理",
"icon": "bulb",
"path": "/device",
"routes": [
{
"name": "设备台账",
"path": "/device/account",
"component": "./device/account"
},
{
"name": "设备类型",
"path": "/device/type",
"component": "./device/type"
},
{
"name": "设备型号",
"path": "/device/model",
"component": "./device/model"
},
{
"name": "设备供应商",
"path": "/device/supplier",
"component": "./device/supplier"
}
]
},
{
"name": "维修管理",
"path": "/repair",
"icon": "tool",
"routes": [
{
"name": "接单平台",
"path": "/repair/platform",
"icon": "",
"component": "./repair/platform"
},
{
"name": "故障报修",
"path": "/repair/failure",
"icon": "",
"component": "./repair/failure"
},
{
"name": "维修工单",
"path": "/repair/order",
"icon": "",
"component": "./repair/order"
},
{
"name": "追踪工单",
"path": "/repair/track",
"icon": "",
"component": "./repair/track"
},
{
"name": "外协工单",
"path": "/repair/outsourcing",
"icon": "",
"component": "./repair/outsourcing"
},
{
"name": "故障设置",
"path": "/repair/fault",
"icon": "",
"component": "./repair/fault"
}
]
},
{
"name": "系统管理",
"path": "/system",
"icon": "desktop",
"routes": [
{
"name": "数据字典",
"path": "/system/dictionary",
"icon": "",
"component": "./system/dictionary"
},
{
"name": "扩展字段",
"path": "/system/field",
"icon": "",
"component": "./system/field"
},
{
"name": "编号规则",
"path": "/system/rules",
"icon": "",
"component": "./system/rules"
},
{
"name": "推送配置",
"path": "/system/pushsetting",
"icon": "",
"component": "./system/pushsetting"
}
]
},
{
"name": "备件管理",
"path": "/spare",
"icon": "sliders",
"routes": [
{
"name": " 备件库存",
"path": "/spare/stock",
"icon": "",
"component": "./spare/stock"
},
{
"name": "入库管理",
"path": "/spare/instore",
"icon": "",
"component": "./spare/instore"
},
{
"name": "出库管理",
"path": "/spare/outstore",
"icon": "",
"component": "./spare/outstore"
},
{
"name": "出入库记录",
"path": "/spare/record",
"icon": "",
"component": "./spare/record"
},
{
"name": "备件领用",
"path": "/spare/requisition",
"icon": "",
"component": "./spare/requisition"
},
{
"name": "备件回冲",
"path": "/spare/spareback",
"icon": "",
"component": "./spare/spareback"
},
{
"name": " 线边库存",
"path": "/spare/edgestore",
"icon": "",
"component": "./spare/edgestore"
},
{
"name": "备件供应商",
"path": "/spare/supplier",
"icon": "",
"component": "./spare/supplier"
},
{
"name": " 备件设置",
"path": "/spare/setting",
"icon": "",
"component": "./spare/setting"
}
]
},
{
"name": "点检管理",
"path": "/check",
"icon": "check-circle",
"routes": [
{
"name": " 点检标准",
"path": "/check/standard",
"icon": "",
"component": "./check/standard"
},
{
"name": "点检计划",
"path": "/check/plan",
"icon": "",
"component": "./check/plan"
},
{
"name": "点检接单",
"path": "/check/order",
"icon": "",
"component": "./check/order"
},
{
"name": "点检工单",
"path": "/check/task",
"icon": "",
"component": "./check/task"
}
]
},
{
"name": "保养管理",
"path": "/maintain",
"icon": "dashboard",
"routes": [
{
"name": "保养接单",
"path": "/maintain/orders",
"icon": "",
"component": "./maintain/orders"
},
{
"name": "保养工单",
"path": "/maintain/workOrder",
"icon": "",
"component": "./maintain/workOrder"
},
{
"name": " 保养标准",
"path": "/maintain/criterion",
"icon": "",
"component": "./maintain/criterion"
},
{
"name": "保养计划",
"path": "/maintain/plan",
"icon": "",
"component": "./maintain/plan"
}
]
},
{
"name": "寿命件管理",
"path": "/lifeparts",
"icon": "control",
"routes": [
{
"name": "寿命件台账",
"path": "/lifeparts/count",
"icon": "",
"component": "./lifeparts/count"
},
{
"name": "寿命件预警",
"path": "/lifeparts/warning",
"icon": "",
"component": "./lifeparts/warning"
},
{
"name": "寿命件标准",
"path": "/lifeparts/criterion",
"icon": "",
"component": "./lifeparts/criterion"
}
]
}
];
\ No newline at end of file
{
path: '/welcome',
name: '首页',
icon: 'smile',
component: './Welcome',
},
{
name: '基础设置',
icon: 'setting',
path: '/setting',
routes: [
{
name: '用户管理',
path: '/setting/users',
component: './setting/users',
},
{
name: '角色管理',
path: '/setting/role',
component: './setting/role',
},
{
name: '组织管理',
path: '/setting/organization',
component: './setting/organization',
},
{
name: '工厂管理',
path: '/setting/factory',
component: './setting/factory',
},
{
name: '车间管理',
path: '/setting/workshop',
component: './setting/workshop',
},
{
name: '工段管理',
path: '/setting/section',
component: './setting/section',
},
{
name: '产线管理',
path: '/setting/production',
component: './setting/production',
},
],
},
{
name: '设备管理',
icon: 'bulb',
path: '/device',
routes: [
{
name: '设备台账',
path: '/device/account',
component: './device/account',
},
{
name: '设备类型',
path: '/device/type',
component: './device/type',
},
{
name: '设备型号',
path: '/device/model',
component: './device/model',
},
{
name: '设备供应商',
path: '/device/supplier',
component: './device/supplier',
},
],
},
{
name: '维修管理',
path: '/repair',
icon: 'tool',
routes: [
{
name: '接单平台',
path: '/repair/platform',
icon: '',
component: './repair/platform',
},
{
name: '故障报修',
path: '/repair/failure',
icon: '',
component: './repair/failure',
},
{
name: '维修工单',
path: '/repair/order',
icon: '',
component: './repair/order',
},
{
name: '追踪工单',
path: '/repair/track',
icon: '',
component: './repair/track',
},
{
name: '外协工单',
path: '/repair/outsourcing',
icon: '',
component: './repair/outsourcing',
},
{
name: '故障设置',
path: '/repair/fault',
icon: '',
component: './repair/fault',
},
],
},
{
name: '系统管理',
path: '/system',
icon: 'desktop',
routes: [
{
name: '数据字典',
path: '/system/dictionary',
icon: '',
component: './system/dictionary',
},
{
name: '扩展字段',
path: '/system/field',
icon: '',
component: './system/field',
},
{
name: '编号规则',
path: '/system/rules',
icon: '',
component: './system/rules',
},
{
name: '推送配置',
path: '/system/pushsetting',
icon: '',
component: './system/pushsetting',
},
],
},
{
name: '备件管理',
path: '/spare',
icon: 'sliders',
routes: [
{
name: ' 备件库存',
path: '/spare/stock',
icon: '',
component: './spare/stock',
},
{
name: '入库管理',
path: '/spare/instore',
icon: '',
component: './spare/instore',
},
{
name: '出库管理',
path: '/spare/outstore',
icon: '',
component: './spare/outstore',
},
{
name: '出入库记录',
path: '/spare/record',
icon: '',
component: './spare/record',
},
{
name: '备件领用',
path: '/spare/requisition',
icon: '',
component: './spare/requisition',
},
{
name: '备件回冲',
path: '/spare/spareback',
icon: '',
component: './spare/spareback',
},
{
name: ' 线边库存',
path: '/spare/edgestore',
icon: '',
component: './spare/edgestore',
},
{
name: '备件供应商',
path: '/spare/supplier',
icon: '',
component: './spare/supplier',
},
{
name: '使用记录',
path: '/spare/userecord',
icon: '',
component: './spare/userecord',
},
{
name: '备件设置',
path: '/spare/setting',
icon: '',
component: './spare/setting',
},
],
},
{
name: '点检管理',
path: '/check',
icon: 'check-circle',
routes: [
{
name: ' 点检标准',
path: '/check/standard',
icon: '',
component: './check/standard',
},
{
name: '点检计划',
path: '/check/plan',
icon: '',
component: './check/plan',
},
{
name: '点检接单',
path: '/check/order',
icon: '',
component: './check/order',
},
{
name: '点检工单',
path: '/check/task',
icon: '',
component: './check/task',
},
],
},
{
name: '保养管理',
path: '/maintain',
icon: 'dashboard',
routes: [
{
name: '保养接单',
path: '/maintain/orders',
icon: '',
component: './maintain/orders',
},
{
name: '保养工单',
path: '/maintain/workOrder',
icon: '',
component: './maintain/workOrder',
},
{
name: ' 保养标准',
path: '/maintain/criterion',
icon: '',
component: './maintain/criterion',
},
{
name: '保养计划',
path: '/maintain/plan',
icon: '',
component: './maintain/plan',
},
],
},
{
name: '寿命件管理',
path: '/lifeparts',
icon: 'control',
routes: [
{
name: '寿命件台账',
path: '/lifeparts/count',
icon: '',
component: './lifeparts/count',
},
{
name: '寿命件预警',
path: '/lifeparts/warning',
icon: '',
component: './lifeparts/warning',
},
{
name: '寿命件标准',
path: '/lifeparts/criterion',
icon: '',
component: './lifeparts/criterion',
},
],
},
];
src/pages/lifeparts/count/index.jsx
View file @ d80e190e
......@@ -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>
);
......
src/pages/lifeparts/warning/index.jsx
View file @ d80e190e
......@@ -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>
);
......
src/pages/spare/userecord/columns.js 0 → 100644
View file @ d80e190e
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;
src/pages/spare/userecord/index.jsx 0 → 100644
View file @ d80e190e
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