Skip to content

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

111

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