Skip to content

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

12061031

parent f69798e6
Show whitespace changes
Inline Side-by-side
Showing with 436 additions and 291 deletions
config/authRoutes.js
View file @ 52481c49
...@@ -91,19 +91,6 @@ export default [ ...@@ -91,19 +91,6 @@ export default [
icon: '', icon: '',
component: './repair/failure', component: './repair/failure',
}, },
{
name: '故障设置',
path: '/repair/fault',
icon: '',
component: './repair/fault',
},
{
name: '外协工单',
path: '/repair/outsourcing',
icon: '',
component: './repair/outsourcing',
},
{ {
name: '维修工单', name: '维修工单',
path: '/repair/order', path: '/repair/order',
...@@ -116,6 +103,18 @@ export default [ ...@@ -116,6 +103,18 @@ export default [
icon: '', icon: '',
component: './repair/track', component: './repair/track',
}, },
{
name: '外协工单',
path: '/repair/outsourcing',
icon: '',
component: './repair/outsourcing',
},
{
name: '故障设置',
path: '/repair/fault',
icon: '',
component: './repair/fault',
},
], ],
}, },
{ {
......
src/pages/repair/outsourcing/columns.js
View file @ 52481c49
...@@ -6,8 +6,8 @@ function getcolumns(setdrawer) { ...@@ -6,8 +6,8 @@ function getcolumns(setdrawer) {
columns: [ columns: [
{ {
title: '外协单号', title: '外协单号',
dataIndex: 'repairOrderNo', dataIndex: 'otherUnitsOrderNo',
key: 'repairOrderNo', key: 'otherUnitsOrderNo',
}, },
{ {
title: '设备编号', title: '设备编号',
...@@ -27,14 +27,14 @@ function getcolumns(setdrawer) { ...@@ -27,14 +27,14 @@ function getcolumns(setdrawer) {
}, },
{ {
title: '创建时间', title: '创建时间',
dataIndex: 'repairTime', dataIndex: 'createTime',
key: 'repairTimeList', key: 'createTimeList',
valueType: 'dateTimeRange', valueType: 'dateTimeRange',
}, },
{ {
title: '创建人员', title: '创建人员',
dataIndex: 'repairUserName', dataIndex: 'createUserName',
key: 'repairUserName', key: 'createUserName',
}, },
{ {
title: '最新外协人员', title: '最新外协人员',
...@@ -43,8 +43,8 @@ function getcolumns(setdrawer) { ...@@ -43,8 +43,8 @@ function getcolumns(setdrawer) {
}, },
{ {
title: '来源单号', title: '来源单号',
dataIndex: 'repairNo', dataIndex: 'dataSourcesNo',
key: 'repairNo', key: 'dataSourcesNo',
}, },
{ {
title: '工单状态', title: '工单状态',
...@@ -76,13 +76,13 @@ function getcolumns(setdrawer) { ...@@ -76,13 +76,13 @@ function getcolumns(setdrawer) {
}, },
}, },
{ {
tab: '我的待办', tab: '未完成',
key: '1', key: '2',
columns: [ columns: [
{ {
title: '外协单号', title: '外协单号',
dataIndex: 'repairOrderNo', dataIndex: 'otherUnitsOrderNo',
key: 'repairOrderNo', key: 'otherUnitsOrderNo',
}, },
{ {
title: '设备编号', title: '设备编号',
...@@ -102,8 +102,8 @@ function getcolumns(setdrawer) { ...@@ -102,8 +102,8 @@ function getcolumns(setdrawer) {
}, },
{ {
title: '创建时间', title: '创建时间',
dataIndex: 'repairTime', dataIndex: 'createTime',
key: 'repairTimeList', key: 'createTimeList',
valueType: 'dateTimeRange', valueType: 'dateTimeRange',
}, },
{ {
...@@ -118,8 +118,8 @@ function getcolumns(setdrawer) { ...@@ -118,8 +118,8 @@ function getcolumns(setdrawer) {
}, },
{ {
title: '来源单号', title: '来源单号',
dataIndex: 'repairNo', dataIndex: 'dataSourcesNo',
key: 'repairNo', key: 'dataSourcesNo',
}, },
{ {
title: '工单状态', title: '工单状态',
...@@ -151,13 +151,13 @@ function getcolumns(setdrawer) { ...@@ -151,13 +151,13 @@ function getcolumns(setdrawer) {
}, },
}, },
{ {
tab: '我的待办', tab: '已完成',
key: '1', key: '3',
columns: [ columns: [
{ {
title: '外协单号', title: '外协单号',
dataIndex: 'repairOrderNo', dataIndex: 'otherUnitsOrderNo',
key: 'repairOrderNo', key: 'otherUnitsOrderNo',
}, },
{ {
title: '设备编号', title: '设备编号',
...@@ -177,8 +177,8 @@ function getcolumns(setdrawer) { ...@@ -177,8 +177,8 @@ function getcolumns(setdrawer) {
}, },
{ {
title: '创建时间', title: '创建时间',
dataIndex: 'repairTime', dataIndex: 'createTime',
key: 'repairTimeList', key: 'createTimeList',
valueType: 'dateTimeRange', valueType: 'dateTimeRange',
}, },
{ {
...@@ -193,8 +193,8 @@ function getcolumns(setdrawer) { ...@@ -193,8 +193,8 @@ function getcolumns(setdrawer) {
}, },
{ {
title: '来源单号', title: '来源单号',
dataIndex: 'repairNo', dataIndex: 'dataSourcesNo',
key: 'repairNo', key: 'dataSourcesNo',
}, },
{ {
title: '工单状态', title: '工单状态',
......
src/pages/repair/track/columns.js
View file @ 52481c49
function getcolumns(setdrawer) { function getcolumns(setdrawer) {
return [ return [
{ {
title: '基础信息', tab: '我的待办',
valueType: 'split', key: '1',
columns: [
{
title: '追踪单号',
dataIndex: 'repairOrderNo',
key: 'repairOrderNo',
},
{
title: '设备编号',
dataIndex: 'equipmentNo',
key: 'equipmentNo',
}, },
{ {
title: '用户名', title: '设备名称',
dataIndex: 'accountName', dataIndex: 'equipmentName',
formItemProps: { key: 'equipmentName',
rules: [ },
{ {
required: false, title: '故障描述',
message: '此项为必填项', dataIndex: 'faultDescription',
key: 'faultDescription',
valueType: 'textarea',
},
{
title: '创建时间',
dataIndex: 'repairTime',
key: 'repairTimeList',
valueType: 'dateTimeRange',
},
{
title: '创建人员',
dataIndex: 'repairUserName',
key: 'repairUserName',
},
{
title: '下次追踪日期',
dataIndex: 'nextTrackDate',
key: 'nextTrackDateList',
valueType: 'dateTimeRange',
},
{
title: '最新追踪人员',
dataIndex: 'newRepairUserName',
key: 'newRepairUserName',
},
{
title: '来源单号',
dataIndex: 'dataSourcesNo',
key: 'dataSourcesNo',
},
{
title: '工单状态',
dataIndex: 'statusName',
key: 'status',
valueType: 'radio',
options: [
{
label: '待维修',
value: '1',
},
{
label: '维修中',
value: '2',
}, },
], ],
}, },
initialValue: '默认值', ],
hideInForm: false, pathconfig: {
search: false, enableadd: true,
render: (text, row) => { enableedit: false,
return ( enabledelete: true,
<a enabledetail: false,
onClick={() => { add: '',
setdrawer?.((s) => ({ edit: '',
...s, list: '/repair/umFailureRepair/queryNoFinishList',
visible: true, delete: '/repair/umFailureRepair/deleteById',
item: null, detail: '',
title: '新增',
val: 'add',
}));
}}
>
{text}
</a>
);
}, },
}, },
{ {
title: '姓名', tab: '未完成',
dataIndex: 'userName', key: '2',
key: 'userId', columns: [
hideInForm: { {
accountName: { title: '追踪单号',
reverse: ['1', '2', '5'], dataIndex: 'repairOrderNo',
key: 'repairOrderNo',
}, },
remark: ['3'], {
title: '设备编号',
dataIndex: 'equipmentNo',
key: 'equipmentNo',
}, },
search: false, {
title: '设备名称',
dataIndex: 'equipmentName',
key: 'equipmentName',
}, },
{ {
title: '额外信息', title: '故障描述',
valueType: 'split', dataIndex: 'faultDescription',
key: 'faultDescription',
valueType: 'textarea',
}, },
{ {
title: '联系电话', title: '创建时间',
dataIndex: 'telephone', dataIndex: 'repairTime',
formItemProps: { key: 'repairTimeList',
rules: [ valueType: 'dateTimeRange',
},
{ {
required: false, title: '创建人员',
message: '此项为必填项', dataIndex: 'repairUserName',
key: 'repairUserName',
}, },
], {
title: '最新外协人员',
dataIndex: 'newRepairUserName',
key: 'newRepairUserName',
}, },
search: false, {
title: '来源单号',
dataIndex: 'repairNo',
key: 'repairNo',
}, },
{ {
title: '邮箱', title: '工单状态',
dataIndex: 'mailNo', dataIndex: 'statusName',
formItemProps: { key: 'status',
rules: [ valueType: 'radio',
options: [
{
label: '待维修',
value: '1',
},
{ {
required: false, label: '维修中',
message: '此项为必填项', value: '2',
},
],
}, },
], ],
pathconfig: {
enableadd: true,
enableedit: false,
enabledelete: true,
enabledetail: false,
add: '',
edit: '',
list: '/repair/umFailureRepair/queryNoFinishList',
delete: '/repair/umFailureRepair/deleteById',
detail: '',
},
},
{
tab: '已完成',
key: '3',
columns: [
{
title: '追踪单号',
dataIndex: 'repairOrderNo',
key: 'repairOrderNo',
},
{
title: '设备编号',
dataIndex: 'equipmentNo',
key: 'equipmentNo',
}, },
search: false, {
title: '设备名称',
dataIndex: 'equipmentName',
key: 'equipmentName',
},
{
title: '故障描述',
dataIndex: 'faultDescription',
key: 'faultDescription',
valueType: 'textarea',
},
{
title: '创建时间',
dataIndex: 'repairTime',
key: 'repairTimeList',
valueType: 'dateTimeRange',
},
{
title: '创建人员',
dataIndex: 'repairUserName',
key: 'repairUserName',
},
{
title: '最新外协人员',
dataIndex: 'newRepairUserName',
key: 'newRepairUserName',
}, },
{ {
title: '备注', title: '来源单号',
dataIndex: 'remark', dataIndex: 'repairNo',
valueType: 'editor', key: 'repairNo',
search: false,
colProps: { span: 24 },
initialValue: '<p>Hello <b>World!</b></p>',
}, },
{ {
title: '上传样式-图片', title: '工单状态',
dataIndex: 'uploadImage', dataIndex: 'statusName',
key: 'uploadImage', key: 'status',
valueType: 'uploadImage', valueType: 'radio',
fieldProps: { options: [
limit: 2, {
label: '待维修',
value: '1',
}, },
formItemProps: {
rules: [
{ {
required: false, label: '维修中',
message: '此项为必填项', value: '2',
},
],
}, },
], ],
pathconfig: {
enableadd: true,
enableedit: false,
enabledelete: true,
enabledetail: false,
add: '',
edit: '',
list: '/repair/umFailureRepair/queryNoFinishList',
delete: '/repair/umFailureRepair/deleteById',
detail: '',
}, },
}, },
]; ];
} }
export default getcolumns; export default getcolumns;
src/pages/repair/track/index.jsx
View file @ 52481c49
import * as React from 'react'; /* 追踪工单
import { useState, useMemo, useRef } from 'react'; * @Author: Li Hanlin
import DrawerPro from '@/components/DrawerPro'; * @Date: 2022-12-02 11:41:03
import AutoTable from '@/components/AutoTable'; * @Last Modified by: Li Hanlin
import PremButton from '@/components/PremButton'; * @Last Modified time: 2022-12-06 09:38:18
import getcolumns from './columns'; */
import { useRequest } from 'ahooks';
import { doFetch } from '@/utils/doFetch';
const pathconfig = { import * as React from 'react';
"enableadd": true, import { useState, useMemo, useRef } from 'react';
"enableedit": true, import DrawerPro from '@/components/DrawerPro';
"enabledelete": true, import AutoTable from '@/components/AutoTable';
"enabledetail": true, import PremButton from '@/components/PremButton';
"add": "", import getcolumns from './columns';
"edit": "", import { useRequest } from 'ahooks';
"list": "", import { doFetch } from '@/utils/doFetch';
"delete": "",
"detail": ""
};
function Track(props) { function Failure(props) {
const actionRef = useRef(), const actionRef = useRef(),
formRef = useRef(); formRef = useRef();
const [drawer, setdrawer] = useState({ const [drawer, setdrawer] = useState({
open: false, open: false,
}); }),
[activeTabKey, setactiveTabKey] = useState('1');
const { run, loading } = useRequest(doFetch, { const { run, loading } = useRequest(doFetch, {
manual: true, manual: true,
...@@ -105,53 +101,74 @@ import * as React from 'react'; ...@@ -105,53 +101,74 @@ import * as React from 'react';
}; };
const columns = useMemo(() => { const columns = useMemo(() => {
let defcolumn = getcolumns(setdrawer); let defcolumn = getcolumns(setdrawer).filter((it) => it.key == activeTabKey)[0]?.columns;
let defpath = getcolumns(setdrawer).filter((it) => it.key == activeTabKey)[0]?.pathconfig ?? {};
return defcolumn.concat({ return defcolumn.concat({
title: '操作', title: '操作',
valueType: 'option', valueType: 'option',
width: 150, width: 150,
render: (text, row, _, action) => [ render: (text, row, _, action) => [
pathconfig?.enabledetail && detail(text, row, _, action), defpath?.enabledetail && detail(text, row, _, action),
pathconfig?.enableedit && edit(text, row, _, action), defpath?.enableedit && edit(text, row, _, action),
pathconfig?.enabledelete && remove(text, row, _, action), defpath?.enabledelete && remove(text, row, _, action),
], ],
}); });
}, []); }, [activeTabKey]);
const pathconfig = useMemo(() => {
let defpath = getcolumns(setdrawer).filter((it) => it.key == activeTabKey)[0]?.pathconfig ?? {};
return defpath;
}, [activeTabKey]);
const selectType = (type) => {
switch (type) {
case 'add':
return;
default:
break;
}
};
return ( return (
<div style={{ position: 'relative' }}> <div style={{ position: 'relative' }}>
<AutoTable <AutoTable
pagetitle="追踪工单" pagetitle={<h3 className="page-title">追踪工单</h3>}
columns={columns} columns={columns}
actionRef={actionRef}
path={pathconfig?.list || '/ngic-auth/sysUser/query/page'} path={pathconfig?.list || '/ngic-auth/sysUser/query/page'}
actionRef={actionRef}
pageextra={pathconfig?.enableadd ? 'add' : null} pageextra={pathconfig?.enableadd ? 'add' : null}
resizeable={true} resizeable={true}
addconfig={{ addconfig={{
// access: 'sysDepartment_save', // access: 'sysDepartment_save',
btn: { btn: {
disabled: false, disabled: false,
type: 'primary',
onClick: () => { onClick: () => {
setdrawer((s) => ({ setdrawer((s) => ({
...s, ...s,
open: true, open: true,
item: null, item: null,
title: '新增', title: '新增',
val: 'add', val: 'only',
type: 'add',
})); }));
}, },
}, },
}} }}
tabList={getcolumns()}
activeTabKey={activeTabKey}
onTabChange={(key) => {
setactiveTabKey(key);
}}
/> />
<DrawerPro <DrawerPro
fields={columns} fields={columns}
params={{ id: drawer?.item?.id }}
formRef={formRef}
placement="right"
detailpath={pathconfig?.detail || null} detailpath={pathconfig?.detail || null}
detailData={drawer?.item} detailData={drawer?.item}
defaultFormValue={drawer?.item} defaultFormValue={drawer?.item}
params={{ id: drawer?.item?.id }}
formRef={formRef}
placement="right"
onClose={() => { onClose={() => {
setdrawer((s) => ({ setdrawer((s) => ({
...s, ...s,
...@@ -166,9 +183,11 @@ import * as React from 'react'; ...@@ -166,9 +183,11 @@ import * as React from 'react';
run({ url: pathconfig?.edit || '/edit', params: { ...vals, id: drawer?.item?.id } }); run({ url: pathconfig?.edit || '/edit', params: { ...vals, id: drawer?.item?.id } });
} }
}} }}
/> >
{selectType(drawer?.type)}
</DrawerPro>
</div> </div>
); );
} }
export default Track; export default Failure;
\ No newline at end of file
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