Commit fd466937 authored by TZW's avatar TZW

111

parent 650b6727
......@@ -181,8 +181,8 @@ function Order(props) {
},
{
title: '创建时间',
dataIndex: 'createTime',
key: 'createTime',
dataIndex: 'createTimes',
key: 'createTimes',
},
{
title: '工单状态',
......
......@@ -317,8 +317,8 @@ function Plan(props) {
},
{
title: '创建时间',
dataIndex: 'createTime',
key: 'createTime',
dataIndex: 'createTimes',
key: 'createTimes',
},
{
title: '状态',
......
function getcolumns(id) {
return {
"columns": [
return {
columns: [
{
title: '标准编号',
dataIndex: 'standardNo',
key: 'standardNo',
formItemProps: {
rules: [
{
"title": "标准编号",
"dataIndex": "standardNo",
"key": "standardNo",
"formItemProps": {
"rules": [
{
"required": false,
"message": "此项为必填项"
}
]
},
"hideInForm": true
},
{
"title": "点检类型",
"dataIndex": "checkTypeName",
"key": "checkType",
"valueType": "select",
"options": [
{
"label": "制造点检",
"value": 1
},
{
"label": "设备点检",
"value": 2
}
],
fieldProps: {
dropdownMatchSelectWidth: 100
}
required: false,
message: '此项为必填项',
},
],
},
hideInForm: true,
},
{
title: '点检类型',
dataIndex: 'checkTypeName',
key: 'checkType',
valueType: 'select',
options: [
{
label: '制造点检',
value: 1,
},
{
label: '设备点检',
value: 2,
},
],
fieldProps: {
dropdownMatchSelectWidth: 100,
},
},
{
title: '设备型号',
dataIndex: 'equipmentModelName',
key: 'equipmentModelId',
formItemProps: {
rules: [
{
"title": "设备型号",
"dataIndex": "equipmentModelName",
"key": "equipmentModelId",
"formItemProps": {
"rules": [
{
"required": true,
"message": "此项为必填项"
}
]
},
"valueType": "select",
"mode": "radio",
"options": {
"path": "/check/umEquipmentCheckStandard/queryModelByType",
"linkParams": {
"checkType": "",
},
"extraParams": { id }
},
fieldProps: {
placeholder: '请选择',
showSearch: true,
},
required: true,
message: '此项为必填项',
},
{
"title": "备注",
"dataIndex": "remark",
"key": "remark",
"valueType": "textarea",
"colProps": {
"span": 24
},
"hideInSearch": true,
"hideInDescriptions": true
}
],
"pathconfig": {
"enableadd": true,
"enableedit": true,
"enabledelete": true,
"enabledetail": false,
"add": "/check/umEquipmentCheckStandard/save",
"edit": "/check/umEquipmentCheckStandard/save",
"list": "/check/umEquipmentCheckStandard/queryList",
"delete": "/check/umEquipmentCheckStandard/deleteById",
"detail": ""
}
};
],
},
valueType: 'select',
mode: 'radio',
options: {
path: '/check/umEquipmentCheckStandard/queryModelByType',
linkParams: {
checkType: '',
},
extraParams: { id },
},
fieldProps: {
placeholder: '请选择',
showSearch: true,
},
},
{
title: '备注',
dataIndex: 'remark',
key: 'remark',
valueType: 'textarea',
colProps: {
span: 24,
},
hideInSearch: true,
hideInDescriptions: true,
},
],
pathconfig: {
enableadd: true,
enableedit: true,
enabledelete: true,
enabledetail: false,
add: '/check/umEquipmentCheckStandard/save',
edit: '/check/umEquipmentCheckStandard/save',
list: '/check/umEquipmentCheckStandard/queryList',
delete: '/check/umEquipmentCheckStandard/deleteById',
detail: '',
},
};
}
export default getcolumns;
......@@ -240,8 +240,8 @@ function Task(props) {
},
{
title: '创建时间',
dataIndex: 'createTime',
key: 'createTime',
dataIndex: 'createTimes',
key: 'createTimes',
},
{
title: '工单状态',
......@@ -346,8 +346,8 @@ function Task(props) {
},
{
title: '创建时间',
dataIndex: 'createTime',
key: 'createTime',
dataIndex: 'createTimes',
key: 'createTimes',
},
{
title: '工单状态',
......
......@@ -168,8 +168,8 @@ function Orders(props) {
},
{
title: '创建时间',
dataIndex: 'createTime',
key: 'createTime',
dataIndex: 'createTimes',
key: 'createTimes',
},
{
title: '工单状态',
......
......@@ -2,7 +2,7 @@
* @Author: Li Hanlin
* @Date: 2023-01-16 15:35:00
* @Last Modified by: Li Hanlin
* @Last Modified time: 2023-02-03 10:36:00
* @Last Modified time: 2023-02-08 13:22:09
*/
import * as React from 'react';
......@@ -270,8 +270,8 @@ function Plan(props) {
},
{
title: '创建时间',
dataIndex: 'createTime',
key: 'createTime',
dataIndex: 'createTimes',
key: 'createTimes',
},
{
title: '状态',
......
......@@ -2,7 +2,7 @@
* @Author: Li Hanlin
* @Date: 2023-01-19 09:53:59
* @Last Modified by: Li Hanlin
* @Last Modified time: 2023-02-03 16:29:31
* @Last Modified time: 2023-02-08 13:22:27
*/
import * as React from 'react';
......@@ -270,8 +270,8 @@ function WorkOrder(props) {
},
{
title: '创建时间',
dataIndex: 'createTime',
key: 'createTime',
dataIndex: 'createTimes',
key: 'createTimes',
},
{
title: '工单状态',
......@@ -612,8 +612,8 @@ function WorkOrder(props) {
},
{
title: '创建时间',
dataIndex: 'createTime',
key: 'createTime',
dataIndex: 'createTimes',
key: 'createTimes',
},
{
title: '工单状态',
......@@ -639,8 +639,8 @@ function WorkOrder(props) {
},
{
title: '创建时间',
dataIndex: 'createTime',
key: 'createTime',
dataIndex: 'createTimes',
key: 'createTimes',
},
{
title: '工单状态',
......
......@@ -2,7 +2,7 @@
* @Author: Li Hanlin
* @Date: 2022-12-02 11:41:03
* @Last Modified by: Li Hanlin
* @Last Modified time: 2023-02-07 13:31:07
* @Last Modified time: 2023-02-08 13:22:34
*/
import * as React from 'react';
......@@ -116,8 +116,8 @@ function Failure(props) {
return [
{
title: '创建时间',
dataIndex: 'createTime',
key: 'createTime',
dataIndex: 'createTimes',
key: 'createTimes',
},
{
title: '工单状态',
......@@ -134,8 +134,8 @@ function Failure(props) {
return [
{
title: '创建时间',
dataIndex: 'createTime',
key: 'createTime',
dataIndex: 'createTimes',
key: 'createTimes',
},
{
title: '工单状态',
......
......@@ -3,7 +3,7 @@
* @Author: Li Hanlin
* @Date: 2022-12-02 11:41:03
* @Last Modified by: Li Hanlin
* @Last Modified time: 2023-02-08 09:27:02
* @Last Modified time: 2023-02-08 13:22:44
*/
import * as React from 'react';
......@@ -18,10 +18,13 @@ import InitForm from '@/components/InitForm';
import OrderHandle from '../platform/RepairOrderHandle';
import getcolumns from './columns';
import Detail from '@/components/RepaireDetail/Detail';
import { useModel } from '@umijs/max';
function Failure(props) {
const actionRef = useRef(),
formRef = useRef();
const { initialState, error, refresh, setInitialState } = useModel('@@initialState');
console.log(initialState);
const [drawer, setdrawer] = useState({
open: false,
SpecName: null,
......@@ -1450,8 +1453,8 @@ function Failure(props) {
return [
{
title: '创建时间',
dataIndex: 'createTime',
key: 'createTime',
dataIndex: 'createTimes',
key: 'createTimes',
},
{
title: '工单状态',
......@@ -1478,8 +1481,8 @@ function Failure(props) {
return [
{
title: '创建时间',
dataIndex: 'createTime',
key: 'createTime',
dataIndex: 'createTimes',
key: 'createTimes',
},
{
title: '工单状态',
......@@ -1561,6 +1564,7 @@ function Failure(props) {
resizeable={false}
tabList={getcolumns()}
activeTabKey={activeTabKey}
extraparams={activeTabKey == 1 ? { newUserId: initialState?.currentUser?.id } : null}
onTabChange={(key) => {
setactiveTabKey(key);
}}
......
......@@ -70,7 +70,7 @@ function getcolumns(setdrawer, bus) {
},
{
title: '创建时间',
dataIndex: 'createTime',
dataIndex: 'createTimes',
key: 'createTimeList',
valueType: 'dateTimeRange',
fieldProps: {
......@@ -178,7 +178,7 @@ function getcolumns(setdrawer, bus) {
},
{
title: '创建时间',
dataIndex: 'createTime',
dataIndex: 'createTimes',
key: 'createTimeList',
valueType: 'dateTimeRange',
fieldProps: {
......@@ -286,7 +286,7 @@ function getcolumns(setdrawer, bus) {
},
{
title: '创建时间',
dataIndex: 'createTime',
dataIndex: 'createTimes',
key: 'createTimeList',
valueType: 'dateTimeRange',
fieldProps: {
......@@ -325,6 +325,12 @@ function getcolumns(setdrawer, bus) {
dataIndex: 'repairCloseTime',
key: 'repairCloseTimeList',
valueType: 'dateTimeRange',
fieldProps: {
showTime: {
format: 'HH:mm',
},
format: 'YYYY-MM-DD HH:mm',
},
},
{
title: '来源单号',
......
......@@ -3,7 +3,7 @@
* @Author: Li Hanlin
* @Date: 2022-12-02 11:41:03
* @Last Modified by: Li Hanlin
* @Last Modified time: 2023-02-07 16:50:52
* @Last Modified time: 2023-02-08 11:45:14
*/
import * as React from 'react';
......@@ -456,8 +456,8 @@ function Failure(props) {
},
{
title: '创建时间',
dataIndex: 'createTime',
key: 'createTime',
dataIndex: 'createTimes',
key: 'createTimes',
},
{
title: '工单状态',
......@@ -494,8 +494,8 @@ function Failure(props) {
},
{
title: '创建时间',
dataIndex: 'createTime',
key: 'createTime',
dataIndex: 'createTimes',
key: 'createTimes',
},
{
title: '工单状态',
......@@ -584,6 +584,7 @@ function Failure(props) {
},
}}
tabList={getcolumns()}
extraparams={activeTabKey == 1 ? { newUserId: initialState?.currentUser?.id } : null}
activeTabKey={activeTabKey}
onTabChange={(key) => {
setactiveTabKey(key);
......
......@@ -178,9 +178,9 @@ function getcolumns(setdrawer, bus) {
},
{
title: '创建时间',
dataIndex: 'createTime',
dataIndex: 'createTimes',
valueType: 'dateTimeRange',
key: 'createTime',
key: 'createTimes',
fieldProps: {
showTime: {
format: 'HH:mm',
......@@ -273,7 +273,7 @@ function getcolumns(setdrawer, bus) {
},
{
title: '创建时间',
dataIndex: 'createTime',
dataIndex: 'createTimes',
key: 'createTimeList',
valueType: 'dateTimeRange',
fieldProps: {
......
......@@ -3,7 +3,7 @@
* @Author: Li Hanlin
* @Date: 2022-12-05 10:13:42
* @Last Modified by: Li Hanlin
* @Last Modified time: 2023-02-01 14:00:27
* @Last Modified time: 2023-02-08 13:23:20
*/
import * as React from 'react';
......@@ -313,8 +313,8 @@ function Platform(props) {
basecolumns={[
{
title: '创建时间',
dataIndex: 'createTime',
key: 'createTime',
dataIndex: 'createTimes',
key: 'createTimes',
},
{
title: '工单状态',
......@@ -356,8 +356,8 @@ function Platform(props) {
},
{
title: '创建时间',
dataIndex: 'createTime',
key: 'createTime',
dataIndex: 'createTimes',
key: 'createTimes',
},
{
title: '工单状态',
......@@ -404,8 +404,8 @@ function Platform(props) {
},
{
title: '创建时间',
dataIndex: 'createTime',
key: 'createTime',
dataIndex: 'createTimes',
key: 'createTimes',
},
{
title: '工单状态',
......
......@@ -49,7 +49,7 @@ function getcolumns(setdrawer, bus) {
},
{
title: '创建时间',
dataIndex: 'createTime',
dataIndex: 'createTimes',
key: 'createTimeList',
valueType: 'dateTimeRange',
fieldProps: {
......@@ -184,7 +184,7 @@ function getcolumns(setdrawer, bus) {
},
{
title: '创建时间',
dataIndex: 'createTime',
dataIndex: 'createTimes',
key: 'createTimeList',
valueType: 'dateTimeRange',
fieldProps: {
......@@ -292,7 +292,7 @@ function getcolumns(setdrawer, bus) {
},
{
title: '创建时间',
dataIndex: 'createTime',
dataIndex: 'createTimes',
key: 'createTimeList',
valueType: 'dateTimeRange',
fieldProps: {
......
......@@ -3,7 +3,7 @@
* @Author: Li Hanlin
* @Date: 2022-12-02 11:41:03
* @Last Modified by: Li Hanlin
* @Last Modified time: 2023-02-07 16:08:46
* @Last Modified time: 2023-02-08 13:30:00
*/
import * as React from 'react';
......@@ -513,6 +513,7 @@ function Failure(props) {
...row,
trackAssistList: row?.trackAssistList ? row?.trackAssistList : [],
},
title: '重新指派',
type: 'Reassig',
open: true,
val: 'only',
......@@ -574,8 +575,8 @@ function Failure(props) {
},
{
title: '创建时间',
dataIndex: 'createTime',
key: 'createTime',
dataIndex: 'createTimes',
key: 'createTimes',
},
{
title: '工单状态',
......@@ -617,8 +618,8 @@ function Failure(props) {
},
{
title: '创建时间',
dataIndex: 'createTime',
key: 'createTime',
dataIndex: 'createTimes',
key: 'createTimes',
},
{
title: '工单状态',
......@@ -692,6 +693,7 @@ function Failure(props) {
path={pathconfig?.list || '/ngic-auth/sysUser/query/page'}
actionRef={actionRef}
pageextra={pathconfig?.enableadd ? 'add' : null}
extraparams={activeTabKey == 1 ? { newUserId: initialState?.currentUser?.id } : null}
resizeable={false}
addconfig={{
// access: 'sysDepartment_save',
......
......@@ -216,12 +216,18 @@ function getcolumns(setdrawer) {
},
{
title: '创建时间',
dataIndex: 'createTime',
dataIndex: 'createTimes',
key: 'createTimeList',
fieldProps: {
showTime: {
format: 'HH:mm',
},
format: 'YYYY-MM-DD HH:mm',
},
hideInForm: true,
valueType: 'dateTimeRange',
render: (text, row) => {
return <span>{row?.createTime}</span>;
return <span>{row?.createTimes}</span>;
},
},
{
......@@ -389,18 +395,30 @@ function getcolumns(setdrawer) {
},
{
title: '创建时间',
dataIndex: 'createTime',
dataIndex: 'createTimes',
key: 'createTimeList',
hideInForm: true,
valueType: 'dateTimeRange',
fieldProps: {
showTime: {
format: 'HH:mm',
},
format: 'YYYY-MM-DD HH:mm',
},
render: (text, row) => {
return <span>{row?.createTime}</span>;
return <span>{row?.createTimes}</span>;
},
},
{
title: '完成时间',
dataIndex: 'completeTime',
key: 'completeTimeList',
fieldProps: {
showTime: {
format: 'HH:mm',
},
format: 'YYYY-MM-DD HH:mm',
},
hideInForm: true,
span: 3,
valueType: 'dateRange',
......
......@@ -194,12 +194,18 @@ function getcolumns(setdrawer) {
},
{
title: '创建时间',
dataIndex: 'createTime',
dataIndex: 'createTimes',
key: 'createTimeList',
fieldProps: {
showTime: {
format: 'HH:mm',
},
format: 'YYYY-MM-DD HH:mm',
},
hideInForm: true,
valueType: 'dateRange',
render: (text, row) => {
return <span>{row?.createTime}</span>;
return <span>{row?.createTimes}</span>;
},
hideInForm: true,
},
......@@ -381,12 +387,18 @@ function getcolumns(setdrawer) {
},
{
title: '创建时间',
dataIndex: 'createTime',
dataIndex: 'createTimes',
key: 'createTimeList',
fieldProps: {
showTime: {
format: 'HH:mm',
},
format: 'YYYY-MM-DD HH:mm',
},
hideInForm: true,
valueType: 'dateRange',
render: (text, row) => {
return <span>{row?.createTime}</span>;
return <span>{row?.createTimes}</span>;
},
hideInForm: true,
},
......@@ -395,6 +407,12 @@ function getcolumns(setdrawer) {
dataIndex: 'completeTime',
key: 'completeTimeList',
hideInForm: true,
fieldProps: {
showTime: {
format: 'HH:mm',
},
format: 'YYYY-MM-DD HH:mm',
},
valueType: 'dateRange',
render: (text, row) => {
return <span>{row?.completeTime}</span>;
......
function getcolumns(setdrawer) {
return {
"pathconfig": {
"enableadd": false,
"enableedit": false,
"enabledelete": false,
"enabledetail": false,
"add": "",
"edit": "",
"list": "/repair/umRepairOrder/queryRepairOrderList",
"delete": "",
"detail": ""
},
"columns": [
{
"title": "维修单号",
"dataIndex": "repairOrderNo",
"key": "repairOrderNo"
},
{
"title": "设备编号",
"dataIndex": "equipmentNo",
"key": "equipmentNo"
},
{
"title": "设备名称",
"dataIndex": "equipmentName",
"key": "equipmentName"
},
{
"title": "故障描述",
"dataIndex": "faultDescription",
"key": "faultDescription"
},
{
"title": "报修人员",
"dataIndex": "repairUserName",
"key": "repairUserName"
},
{
"title": "报修时间",
"dataIndex": "repairTime",
"key": "repairTimeList",
"valueType": "dateTimeRange"
},
{
"title": "报修单号",
"dataIndex": "repairNo",
"key": "repairNo"
},
{
"title": "工单状态",
"dataIndex": "statusName",
"key": "statusName"
}
]
};
pathconfig: {
enableadd: false,
enableedit: false,
enabledelete: false,
enabledetail: false,
add: '',
edit: '',
list: '/repair/umRepairOrder/queryRepairOrderList',
delete: '',
detail: '',
},
columns: [
{
title: '维修单号',
dataIndex: 'repairOrderNo',
key: 'repairOrderNo',
},
{
title: '设备编号',
dataIndex: 'equipmentNo',
key: 'equipmentNo',
},
{
title: '设备名称',
dataIndex: 'equipmentName',
key: 'equipmentName',
},
{
title: '故障描述',
dataIndex: 'faultDescription',
key: 'faultDescription',
},
{
title: '报修人员',
dataIndex: 'repairUserName',
key: 'repairUserName',
},
{
title: '报修时间',
dataIndex: 'repairTime',
key: 'repairTimeList',
valueType: 'dateTimeRange',
fieldProps: {
showTime: {
format: 'HH:mm',
},
format: 'YYYY-MM-DD HH:mm',
},
},
{
title: '报修单号',
dataIndex: 'repairNo',
key: 'repairNo',
},
{
title: '工单状态',
dataIndex: 'statusName',
key: 'statusName',
},
],
};
}
export default getcolumns;
\ No newline at end of file
export default getcolumns;
......@@ -133,12 +133,12 @@ function getcolumns(type, fullName) {
},
{
title: '创建时间',
dataIndex: 'createTime',
dataIndex: 'createTimes',
key: 'createTimeList',
hideInForm: true,
valueType: 'dateRange',
render: (text, row) => {
return <span>{row?.createTime}</span>;
return <span>{row?.createTimes}</span>;
},
hideInForm: true,
},
......@@ -348,12 +348,12 @@ function getcolumns(type, fullName) {
},
{
title: '创建时间',
dataIndex: 'createTime',
dataIndex: 'createTimes',
key: 'createTimeList',
hideInForm: true,
valueType: 'dateRange',
render: (text, row) => {
return <span>{row?.createTime}</span>;
return <span>{row?.createTimes}</span>;
},
hideInForm: true,
},
......
......@@ -149,12 +149,12 @@ function getcolumns(type, fullName) {
},
{
title: '创建时间',
dataIndex: 'createTime',
dataIndex: 'createTimes',
key: 'createTimeList',
hideInForm: true,
valueType: 'dateRange',
render: (text, row) => {
return <span>{row?.createTime}</span>;
return <span>{row?.createTimes}</span>;
},
hideInForm: true,
},
......@@ -378,12 +378,12 @@ function getcolumns(type, fullName) {
},
{
title: '创建时间',
dataIndex: 'createTime',
dataIndex: 'createTimes',
key: 'createTimeList',
hideInForm: true,
valueType: 'dateRange',
render: (text, row) => {
return <span>{row?.createTime}</span>;
return <span>{row?.createTimes}</span>;
},
hideInForm: true,
},
......
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