Skip to content

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

1213

parent 2a842f9c
Hide whitespace changes
Inline Side-by-side
Showing with 210 additions and 549 deletions
src/components/DetailPro/index.jsx
View file @ 344a9802
...@@ -23,7 +23,7 @@ function DetailPro(props) { ...@@ -23,7 +23,7 @@ function DetailPro(props) {
if (props?.extendField) { if (props?.extendField) {
let obj = {}; let obj = {};
res?.data?.data[props.extendField]?.forEach((it) => { res?.data?.data[props.extendField]?.forEach((it) => {
obj[it?.fieldId] = it?.fieldRealValue; obj[it?.fieldId] = it?.fieldRealValueList;
}); });
//console.log('extendField:', obj); //console.log('extendField:', obj);
setcuritem({ setcuritem({
......
src/components/InitForm/index.jsx
View file @ 344a9802
...@@ -125,7 +125,7 @@ function InitForm({ ...@@ -125,7 +125,7 @@ function InitForm({
if (extendField) { if (extendField) {
let obj = {}; let obj = {};
res?.data?.data[extendField]?.forEach((it) => { res?.data?.data[extendField]?.forEach((it) => {
obj[it?.fieldId] = it?.fieldRealValue; obj[it?.fieldId] = it?.fieldRealValueList;
}); });
//console.log('extendField:', obj); //console.log('extendField:', obj);
return { return {
......
src/components/RepaireDetail/DesItem.jsx
View file @ 344a9802
...@@ -351,8 +351,8 @@ export default ({ index, title, dataSource, columns, hidden, navhidden = false, ...@@ -351,8 +351,8 @@ export default ({ index, title, dataSource, columns, hidden, navhidden = false,
1: [ 1: [
{ {
title: '追踪人员', title: '追踪人员',
dataIndex: 'repairName', dataIndex: 'trackerName',
key: 'repairName', key: 'trackerName',
}, },
{ {
title: '接单时间', title: '接单时间',
...@@ -373,8 +373,8 @@ export default ({ index, title, dataSource, columns, hidden, navhidden = false, ...@@ -373,8 +373,8 @@ export default ({ index, title, dataSource, columns, hidden, navhidden = false,
}, },
{ {
title: '追踪人员', title: '追踪人员',
dataIndex: 'repairName', dataIndex: 'trackerName',
key: 'repairName', key: 'trackerName',
}, },
], ],
3: [ 3: [
...@@ -390,45 +390,48 @@ export default ({ index, title, dataSource, columns, hidden, navhidden = false, ...@@ -390,45 +390,48 @@ export default ({ index, title, dataSource, columns, hidden, navhidden = false,
}, },
{ {
title: '追踪人员', title: '追踪人员',
dataIndex: 'repairName', dataIndex: 'trackerName',
key: 'repairName', key: 'trackerName',
}, },
], ],
4: [ 4: [
{ {
title: '追踪人员', title: '追踪人员',
dataIndex: 'reviewerName', dataIndex: 'trackerName',
key: 'reviewerName', key: 'trackerName',
}, },
{ {
title: '计划追踪日期', title: '计划追踪日期',
dataIndex: 'reviewerTime', dataIndex: 'planTrackTime',
key: 'reviewerTime', key: 'planTrackTime',
}, },
{ {
title: '实际追踪日期', title: '实际追踪日期',
dataIndex: 'reason', dataIndex: 'trackerTime',
key: 'reason', key: 'trackerTime',
}, },
{ {
title: '追踪结果', title: '追踪结果',
dataIndex: 'reviewerName', dataIndex: 'trackResults',
key: 'reviewerName', key: 'trackResults',
}, },
{ {
title: '是否完成追踪', title: '是否完成追踪',
dataIndex: 'reviewerTime', dataIndex: 'isFinishTrack',
key: 'reviewerTime', key: 'isFinishTrack',
render: (text, row, _, action) => {
return row?.isFinishTrack === 1 ? '是' : '否';
},
}, },
{ {
title: '追踪周期（天）', title: '追踪周期（天）',
dataIndex: 'reason', dataIndex: 'trackCycle',
key: 'reason', key: 'trackCycle',
}, },
{ {
title: '追踪内容', title: '追踪内容',
dataIndex: 'reason', dataIndex: 'trackContents',
key: 'reason', key: 'trackContents',
}, },
], ],
yz: [ yz: [
......
src/components/RepaireDetail/Detail.jsx
View file @ 344a9802
...@@ -12,521 +12,6 @@ export default (props) => { ...@@ -12,521 +12,6 @@ export default (props) => {
const request = useRequest(async () => { const request = useRequest(async () => {
console.log(detailpath, params); console.log(detailpath, params);
let res = await doFetch({ url: detailpath, params }); let res = await doFetch({ url: detailpath, params });
// const res = {
// code: '0000',
// msg: '',
// data: {
// dataList: [
// {
// id: '2022112931558310704',
// createTime: '2022-11-29 16:00:20',
// createUserId: '2022112227061106731',
// createUserName: 'HDKF1',
// updateTime: '2022-11-29 16:00:20',
// updateUserId: '2022112227061106731',
// updateUserName: 'HDKF1',
// isDelete: 0,
// pageIndex: 0,
// pageSize: 10,
// companyId: '2022110829866490982',
// trackOrderId: '2022112925456100066',
// operationType: 1,
// operationTypeName: '接单',
// sort: 0,
// workOrderId: null,
// umTrackOrder: null,
// trackOrderReceiving: null,
// trackTraceinfo: null,
// assistUserNames: null,
// repairId: '2022112227061106731',
// repairName: 'HDKF1',
// repairTime: '2022-11-29 16:00:20',
// dispatcherId: null,
// dispatcherName: null,
// dispatcherTime: null,
// trackerId: null,
// trackerName: null,
// trackerTime: null,
// planTrackTime: null,
// actualTrackTime: null,
// trackResult: null,
// trackResults: null,
// isFinishTrack: null,
// finishTrack: null,
// trackCycle: null,
// trackContents: null,
// trackProcessList: null,
// },
// {
// id: '2022112930928687096',
// createTime: '2022-11-29 16:43:41',
// createUserId: '2022112227061106731',
// createUserName: 'HDKF1',
// updateTime: '2022-11-29 16:43:41',
// updateUserId: '2022112227061106731',
// updateUserName: 'HDKF1',
// isDelete: 0,
// pageIndex: 0,
// pageSize: 10,
// companyId: '2022110829866490982',
// trackOrderId: '2022112925456100066',
// operationType: 4,
// operationTypeName: '追踪',
// sort: 1,
// workOrderId: null,
// umTrackOrder: null,
// trackOrderReceiving: null,
// trackTraceinfo: null,
// assistUserNames: null,
// repairId: null,
// repairName: null,
// repairTime: null,
// dispatcherId: null,
// dispatcherName: null,
// dispatcherTime: null,
// trackerId: null,
// trackerName: null,
// trackerTime: null,
// planTrackTime: null,
// actualTrackTime: null,
// trackResult: null,
// trackResults: null,
// isFinishTrack: null,
// finishTrack: null,
// trackCycle: null,
// trackContents: null,
// trackProcessList: null,
// },
// {
// id: '2022112932446783387',
// createTime: '2022-11-29 16:55:41',
// createUserId: '2022112227061106731',
// createUserName: 'HDKF1',
// updateTime: '2022-11-29 16:55:41',
// updateUserId: '2022112227061106731',
// updateUserName: 'HDKF1',
// isDelete: 0,
// pageIndex: 0,
// pageSize: 10,
// companyId: '2022110829866490982',
// trackOrderId: '2022112925456100066',
// operationType: 4,
// operationTypeName: '追踪',
// sort: 2,
// workOrderId: null,
// umTrackOrder: null,
// trackOrderReceiving: null,
// trackTraceinfo: null,
// assistUserNames: null,
// repairId: null,
// repairName: null,
// repairTime: null,
// dispatcherId: null,
// dispatcherName: null,
// dispatcherTime: null,
// trackerId: '2022112227061106731',
// trackerName: 'HDKF1',
// trackerTime: '2022-12-08 11:27:06',
// planTrackTime: '2022-11-29',
// actualTrackTime: null,
// trackResult: 1,
// trackResults: '通过',
// isFinishTrack: 1,
// finishTrack: '是',
// trackCycle: 7,
// trackContents: '追踪内容',
// trackProcessList: [
// {
// id: '2022113026622115346',
// createTime: '2022-11-30 09:36:31',
// createUserId: '2022112227061106731',
// createUserName: 'HDKF1',
// updateTime: '2022-11-30 09:36:31',
// updateUserId: '2022112227061106731',
// updateUserName: 'HDKF1',
// isDelete: 0,
// pageIndex: 0,
// pageSize: 10,
// companyId: '2022110829866490982',
// traceinfoId: '2022112930737666134',
// reviewerId: null,
// reviewerName: null,
// reviewerTime: null,
// reviewerResult: 1,
// reviewerResultName: null,
// remark: '备注',
// },
// ],
// },
// {
// id: '2022112932446783387',
// createTime: '2022-11-29 16:55:41',
// createUserId: '2022112227061106731',
// createUserName: 'HDKF1',
// updateTime: '2022-11-29 16:55:41',
// updateUserId: '2022112227061106731',
// updateUserName: 'HDKF1',
// isDelete: 0,
// pageIndex: 0,
// pageSize: 10,
// companyId: '2022110829866490982',
// trackOrderId: '2022112925456100066',
// operationType: 4,
// operationTypeName: '追踪',
// sort: 2,
// workOrderId: null,
// umTrackOrder: null,
// trackOrderReceiving: null,
// trackTraceinfo: null,
// assistUserNames: null,
// repairId: null,
// repairName: null,
// repairTime: null,
// dispatcherId: null,
// dispatcherName: null,
// dispatcherTime: null,
// trackerId: '2022112227061106731',
// trackerName: 'HDKF1',
// trackerTime: '2022-12-08 11:27:06',
// planTrackTime: '2022-11-29',
// actualTrackTime: null,
// trackResult: 1,
// trackResults: '通过',
// isFinishTrack: 1,
// finishTrack: '是',
// trackCycle: 7,
// trackContents: '追踪内容',
// trackProcessList: [
// {
// id: '2022113026622115346',
// createTime: '2022-11-30 09:36:31',
// createUserId: '2022112227061106731',
// createUserName: 'HDKF1',
// updateTime: '2022-11-30 09:36:31',
// updateUserId: '2022112227061106731',
// updateUserName: 'HDKF1',
// isDelete: 0,
// pageIndex: 0,
// pageSize: 10,
// companyId: '2022110829866490982',
// traceinfoId: '2022112930737666134',
// reviewerId: null,
// reviewerName: null,
// reviewerTime: null,
// reviewerResult: 1,
// reviewerResultName: null,
// remark: '备注',
// },
// ],
// },
// {
// id: '2022112932446783387',
// createTime: '2022-11-29 16:55:41',
// createUserId: '2022112227061106731',
// createUserName: 'HDKF1',
// updateTime: '2022-11-29 16:55:41',
// updateUserId: '2022112227061106731',
// updateUserName: 'HDKF1',
// isDelete: 0,
// pageIndex: 0,
// pageSize: 10,
// companyId: '2022110829866490982',
// trackOrderId: '2022112925456100066',
// operationType: 4,
// operationTypeName: '追踪',
// sort: 2,
// workOrderId: null,
// umTrackOrder: null,
// trackOrderReceiving: null,
// trackTraceinfo: null,
// assistUserNames: null,
// repairId: null,
// repairName: null,
// repairTime: null,
// dispatcherId: null,
// dispatcherName: null,
// dispatcherTime: null,
// trackerId: '2022112227061106731',
// trackerName: 'HDKF1',
// trackerTime: '2022-12-08 11:27:06',
// planTrackTime: '2022-11-29',
// actualTrackTime: null,
// trackResult: 1,
// trackResults: '通过',
// isFinishTrack: 1,
// finishTrack: '是',
// trackCycle: 7,
// trackContents: '追踪内容',
// trackProcessList: [
// {
// id: '2022113026622115346',
// createTime: '2022-11-30 09:36:31',
// createUserId: '2022112227061106731',
// createUserName: 'HDKF1',
// updateTime: '2022-11-30 09:36:31',
// updateUserId: '2022112227061106731',
// updateUserName: 'HDKF1',
// isDelete: 0,
// pageIndex: 0,
// pageSize: 10,
// companyId: '2022110829866490982',
// traceinfoId: '2022112930737666134',
// reviewerId: null,
// reviewerName: null,
// reviewerTime: null,
// reviewerResult: 1,
// reviewerResultName: null,
// remark: '备注',
// },
// ],
// },
// {
// id: '2022112932446783387',
// createTime: '2022-11-29 16:55:41',
// createUserId: '2022112227061106731',
// createUserName: 'HDKF1',
// updateTime: '2022-11-29 16:55:41',
// updateUserId: '2022112227061106731',
// updateUserName: 'HDKF1',
// isDelete: 0,
// pageIndex: 0,
// pageSize: 10,
// companyId: '2022110829866490982',
// trackOrderId: '2022112925456100066',
// operationType: 4,
// operationTypeName: '追踪',
// sort: 2,
// workOrderId: null,
// umTrackOrder: null,
// trackOrderReceiving: null,
// trackTraceinfo: null,
// assistUserNames: null,
// repairId: null,
// repairName: null,
// repairTime: null,
// dispatcherId: null,
// dispatcherName: null,
// dispatcherTime: null,
// trackerId: '2022112227061106731',
// trackerName: 'HDKF1',
// trackerTime: '2022-12-08 11:27:06',
// planTrackTime: '2022-11-29',
// actualTrackTime: null,
// trackResult: 1,
// trackResults: '通过',
// isFinishTrack: 1,
// finishTrack: '是',
// trackCycle: 7,
// trackContents: '追踪内容',
// trackProcessList: [
// {
// id: '2022113026622115346',
// createTime: '2022-11-30 09:36:31',
// createUserId: '2022112227061106731',
// createUserName: 'HDKF1',
// updateTime: '2022-11-30 09:36:31',
// updateUserId: '2022112227061106731',
// updateUserName: 'HDKF1',
// isDelete: 0,
// pageIndex: 0,
// pageSize: 10,
// companyId: '2022110829866490982',
// traceinfoId: '2022112930737666134',
// reviewerId: null,
// reviewerName: null,
// reviewerTime: null,
// reviewerResult: 1,
// reviewerResultName: null,
// remark: '备注',
// },
// ],
// },
// {
// id: '2022112932446783387',
// createTime: '2022-11-29 16:55:41',
// createUserId: '2022112227061106731',
// createUserName: 'HDKF1',
// updateTime: '2022-11-29 16:55:41',
// updateUserId: '2022112227061106731',
// updateUserName: 'HDKF1',
// isDelete: 0,
// pageIndex: 0,
// pageSize: 10,
// companyId: '2022110829866490982',
// trackOrderId: '2022112925456100066',
// operationType: 4,
// operationTypeName: '追踪',
// sort: 2,
// workOrderId: null,
// umTrackOrder: null,
// trackOrderReceiving: null,
// trackTraceinfo: null,
// assistUserNames: null,
// repairId: null,
// repairName: null,
// repairTime: null,
// dispatcherId: null,
// dispatcherName: null,
// dispatcherTime: null,
// trackerId: '2022112227061106731',
// trackerName: 'HDKF1',
// trackerTime: '2022-12-08 11:27:06',
// planTrackTime: '2022-11-29',
// actualTrackTime: null,
// trackResult: 1,
// trackResults: '通过',
// isFinishTrack: 1,
// finishTrack: '是',
// trackCycle: 7,
// trackContents: '追踪内容',
// trackProcessList: [
// {
// id: '2022113026622115346',
// createTime: '2022-11-30 09:36:31',
// createUserId: '2022112227061106731',
// createUserName: 'HDKF1',
// updateTime: '2022-11-30 09:36:31',
// updateUserId: '2022112227061106731',
// updateUserName: 'HDKF1',
// isDelete: 0,
// pageIndex: 0,
// pageSize: 10,
// companyId: '2022110829866490982',
// traceinfoId: '2022112930737666134',
// reviewerId: null,
// reviewerName: null,
// reviewerTime: null,
// reviewerResult: 1,
// reviewerResultName: null,
// remark: '备注',
// },
// ],
// },
// {
// id: '2022112932446783387',
// createTime: '2022-11-29 16:55:41',
// createUserId: '2022112227061106731',
// createUserName: 'HDKF1',
// updateTime: '2022-11-29 16:55:41',
// updateUserId: '2022112227061106731',
// updateUserName: 'HDKF1',
// isDelete: 0,
// pageIndex: 0,
// pageSize: 10,
// companyId: '2022110829866490982',
// trackOrderId: '2022112925456100066',
// operationType: 4,
// operationTypeName: '追踪',
// sort: 2,
// workOrderId: null,
// umTrackOrder: null,
// trackOrderReceiving: null,
// trackTraceinfo: null,
// assistUserNames: null,
// repairId: null,
// repairName: null,
// repairTime: null,
// dispatcherId: null,
// dispatcherName: null,
// dispatcherTime: null,
// trackerId: '2022112227061106731',
// trackerName: 'HDKF1',
// trackerTime: '2022-12-08 11:27:06',
// planTrackTime: '2022-11-29',
// actualTrackTime: null,
// trackResult: 1,
// trackResults: '通过',
// isFinishTrack: 1,
// finishTrack: '是',
// trackCycle: 7,
// trackContents: '追踪内容',
// trackProcessList: [
// {
// id: '2022113026622115346',
// createTime: '2022-11-30 09:36:31',
// createUserId: '2022112227061106731',
// createUserName: 'HDKF1',
// updateTime: '2022-11-30 09:36:31',
// updateUserId: '2022112227061106731',
// updateUserName: 'HDKF1',
// isDelete: 0,
// pageIndex: 0,
// pageSize: 10,
// companyId: '2022110829866490982',
// traceinfoId: '2022112930737666134',
// reviewerId: null,
// reviewerName: null,
// reviewerTime: null,
// reviewerResult: 1,
// reviewerResultName: null,
// remark: '备注',
// },
// ],
// },
// {
// id: '2022112932446783387',
// createTime: '2022-11-29 16:55:41',
// createUserId: '2022112227061106731',
// createUserName: 'HDKF1',
// updateTime: '2022-11-29 16:55:41',
// updateUserId: '2022112227061106731',
// updateUserName: 'HDKF1',
// isDelete: 0,
// pageIndex: 0,
// pageSize: 10,
// companyId: '2022110829866490982',
// trackOrderId: '2022112925456100066',
// operationType: 4,
// operationTypeName: '追踪',
// sort: 2,
// workOrderId: null,
// umTrackOrder: null,
// trackOrderReceiving: null,
// trackTraceinfo: null,
// assistUserNames: null,
// repairId: null,
// repairName: null,
// repairTime: null,
// dispatcherId: null,
// dispatcherName: null,
// dispatcherTime: null,
// trackerId: '2022112227061106731',
// trackerName: 'HDKF1',
// trackerTime: '2022-12-08 11:27:06',
// planTrackTime: '2022-11-29',
// actualTrackTime: null,
// trackResult: 1,
// trackResults: '通过',
// isFinishTrack: 1,
// finishTrack: '是',
// trackCycle: 7,
// trackContents: '追踪内容',
// trackProcessList: [
// {
// id: '2022113026622115346',
// createTime: '2022-11-30 09:36:31',
// createUserId: '2022112227061106731',
// createUserName: 'HDKF1',
// updateTime: '2022-11-30 09:36:31',
// updateUserId: '2022112227061106731',
// updateUserName: 'HDKF1',
// isDelete: 0,
// pageIndex: 0,
// pageSize: 10,
// companyId: '2022110829866490982',
// traceinfoId: '2022112930737666134',
// reviewerId: null,
// reviewerName: null,
// reviewerTime: null,
// reviewerResult: 1,
// reviewerResultName: null,
// remark: '备注',
// },
// ],
// },
// ],
// },
// };
if (res?.data?.dataList?.length > 4) { if (res?.data?.dataList?.length > 4) {
sethidden(true); sethidden(true);
} }
...@@ -643,6 +128,33 @@ export default (props) => { ...@@ -643,6 +128,33 @@ export default (props) => {
</> </>
); );
}; };
// 外协工单
const Wgd = () => {
return (
<>
<DesItem
dataSource={request?.data?.dataList[0]}
title="基本信息"
hidden={true}
index="0"
navhidden={true}
/>
{request?.data?.dataList?.splice(1).map((it, index) => {
return (
<>
<DesItem
type="wgd"
dataSource={it}
index={index + 2}
hidden={true}
navhidden={false}
/>
</>
);
})}
</>
);
};
const selectType = { const selectType = {
gzbx: ( gzbx: (
<DesItem <DesItem
...@@ -656,6 +168,7 @@ export default (props) => { ...@@ -656,6 +168,7 @@ export default (props) => {
), ),
wxgd: <Wxgd />, wxgd: <Wxgd />,
zzgd: <Zzgd />, zzgd: <Zzgd />,
wgd: <Wgd />,
}; };
return ( return (
<> <>
......
src/pages/device/account/index.jsx
View file @ 344a9802
...@@ -802,7 +802,7 @@ function Model(props) { ...@@ -802,7 +802,7 @@ function Model(props) {
//console.log(res?.data?.data); //console.log(res?.data?.data);
let obj = {}; let obj = {};
res?.data?.data['equipmentCharList']?.forEach((it) => { res?.data?.data['equipmentCharList']?.forEach((it) => {
obj[it?.fieldId] = it?.fieldRealValue; obj[it?.fieldId] = it?.fieldRealValueList;
}); });
console.log('drawerpro:', { console.log('drawerpro:', {
...(res?.data?.data ?? {}), ...(res?.data?.data ?? {}),
...@@ -2079,7 +2079,7 @@ function Model(props) { ...@@ -2079,7 +2079,7 @@ function Model(props) {
if (!isNaN(Number(i))) { if (!isNaN(Number(i))) {
equipmentCharReqList.push({ equipmentCharReqList.push({
fieldId: i, fieldId: i,
fieldRealValue: vals[i], fieldRealValueList: vals[i],
}); });
delete vals[i]; delete vals[i];
} }
...@@ -2124,7 +2124,7 @@ function Model(props) { ...@@ -2124,7 +2124,7 @@ function Model(props) {
if (!isNaN(Number(i))) { if (!isNaN(Number(i))) {
equipmentCharReqList.push({ equipmentCharReqList.push({
fieldId: i, fieldId: i,
fieldRealValue: vals[i], fieldRealValueList: vals[i],
}); });
delete vals[i]; delete vals[i];
} }
......
src/pages/device/supplier/index.jsx
View file @ 344a9802
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* @Author: Li Hanlin * @Author: Li Hanlin
* @Date: 2022-11-09 14:44:44 * @Date: 2022-11-09 14:44:44
* @Last Modified by: Li Hanlin * @Last Modified by: Li Hanlin
* @Last Modified time: 2022-12-12 15:01:27 * @Last Modified time: 2022-12-13 17:09:31
*/ */
import * as React from 'react'; import * as React from 'react';
...@@ -217,7 +217,7 @@ function Supplier(props) { ...@@ -217,7 +217,7 @@ function Supplier(props) {
//console.log(res?.data?.data); //console.log(res?.data?.data);
let obj = {}; let obj = {};
res?.data?.data['equipmentSupplierCharReqList']?.forEach((it) => { res?.data?.data['equipmentSupplierCharReqList']?.forEach((it) => {
obj[it?.fieldId] = it?.fieldRealValue; obj[it?.fieldId] = it?.fieldRealValueList;
}); });
// console.log('drawerpro:', { // console.log('drawerpro:', {
// ...(res?.data?.data ?? {}), // ...(res?.data?.data ?? {}),
...@@ -339,7 +339,7 @@ function Supplier(props) { ...@@ -339,7 +339,7 @@ function Supplier(props) {
if (!isNaN(Number(i))) { if (!isNaN(Number(i))) {
equipmentSupplierCharReqList.push({ equipmentSupplierCharReqList.push({
fieldId: i, fieldId: i,
fieldRealValue: vals[i], fieldRealValueList: vals[i],
}); });
delete vals[i]; delete vals[i];
} }
...@@ -385,7 +385,7 @@ function Supplier(props) { ...@@ -385,7 +385,7 @@ function Supplier(props) {
if (!isNaN(Number(i))) { if (!isNaN(Number(i))) {
equipmentSupplierCharReqList.push({ equipmentSupplierCharReqList.push({
fieldId: i, fieldId: i,
fieldRealValue: vals[i], fieldRealValueList: vals[i],
}); });
delete vals[i]; delete vals[i];
} }
......
src/pages/repair/failure/index.jsx
View file @ 344a9802
...@@ -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: 2022-12-12 13:22:33 * @Last Modified time: 2022-12-13 16:07:17
*/ */
import * as React from 'react'; import * as React from 'react';
......
src/pages/repair/outsourcing/columns.js
View file @ 344a9802
...@@ -8,6 +8,25 @@ function getcolumns(setdrawer) { ...@@ -8,6 +8,25 @@ function getcolumns(setdrawer) {
title: '外协单号', title: '外协单号',
dataIndex: 'otherUnitsOrderNo', dataIndex: 'otherUnitsOrderNo',
key: 'otherUnitsOrderNo', key: 'otherUnitsOrderNo',
render: (text, row, _, action) => {
return (
<a
onClick={() => {
setdrawer((s) => ({
...s,
open: true,
title: '详情',
val: 'only',
type: 'detail',
title: '详细信息',
item: row,
}));
}}
>
{row?.otherUnitsOrderNo}
</a>
);
},
}, },
{ {
title: '设备编号', title: '设备编号',
...@@ -83,6 +102,25 @@ function getcolumns(setdrawer) { ...@@ -83,6 +102,25 @@ function getcolumns(setdrawer) {
title: '外协单号', title: '外协单号',
dataIndex: 'otherUnitsOrderNo', dataIndex: 'otherUnitsOrderNo',
key: 'otherUnitsOrderNo', key: 'otherUnitsOrderNo',
render: (text, row, _, action) => {
return (
<a
onClick={() => {
setdrawer((s) => ({
...s,
open: true,
title: '详情',
val: 'only',
type: 'detail',
title: '详细信息',
item: row,
}));
}}
>
{row?.otherUnitsOrderNo}
</a>
);
},
}, },
{ {
title: '设备编号', title: '设备编号',
...@@ -158,6 +196,25 @@ function getcolumns(setdrawer) { ...@@ -158,6 +196,25 @@ function getcolumns(setdrawer) {
title: '外协单号', title: '外协单号',
dataIndex: 'otherUnitsOrderNo', dataIndex: 'otherUnitsOrderNo',
key: 'otherUnitsOrderNo', key: 'otherUnitsOrderNo',
render: (text, row, _, action) => {
return (
<a
onClick={() => {
setdrawer((s) => ({
...s,
open: true,
title: '详情',
val: 'only',
type: 'detail',
title: '详细信息',
item: row,
}));
}}
>
{row?.otherUnitsOrderNo}
</a>
);
},
}, },
{ {
title: '设备编号', title: '设备编号',
......
src/pages/repair/outsourcing/index.jsx
View file @ 344a9802
...@@ -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: 2022-12-08 14:35:09 * @Last Modified time: 2022-12-13 16:22:18
*/ */
import * as React from 'react'; import * as React from 'react';
...@@ -16,6 +16,7 @@ import { doFetch } from '@/utils/doFetch'; ...@@ -16,6 +16,7 @@ import { doFetch } from '@/utils/doFetch';
import Addform from '@/components/Addform'; import Addform from '@/components/Addform';
import { Menu, Dropdown, Button, message } from 'antd'; import { Menu, Dropdown, Button, message } from 'antd';
import InitForm from '@/components/InitForm'; import InitForm from '@/components/InitForm';
import Detail from '@/components/RepaireDetail/Detail';
function Failure(props) { function Failure(props) {
const actionRef = useRef(), const actionRef = useRef(),
...@@ -404,6 +405,81 @@ function Failure(props) { ...@@ -404,6 +405,81 @@ function Failure(props) {
return defpath; return defpath;
}, [activeTabKey]); }, [activeTabKey]);
const basecolumns = useMemo(() => {
if (activeTabKey == 3) {
return [
{
title: '创建人',
dataIndex: 'createUserName',
key: 'createUserName',
},
{
title: '创建时间',
dataIndex: 'createTime',
key: 'createTime',
},
{
title: '工单状态',
dataIndex: 'statusName',
key: 'statusName',
},
{
title: '来源工单',
dataIndex: 'dataSourcesNo',
key: 'dataSourcesNo',
},
{
title: '来源类型',
dataIndex: 'dataSourcesName',
key: 'dataSourcesName',
},
{
title: '最新外协人员',
dataIndex: 'newRepairUserName',
key: 'newRepairUserName',
},
{
title: '关单时间',
dataIndex: 'repairCloseTime',
key: 'repairCloseTime',
},
];
} else {
return [
{
title: '创建人',
dataIndex: 'createUserName',
key: 'createUserName',
},
{
title: '创建时间',
dataIndex: 'createTime',
key: 'createTime',
},
{
title: '工单状态',
dataIndex: 'statusName',
key: 'statusName',
},
{
title: '来源工单',
dataIndex: 'dataSourcesNo',
key: 'dataSourcesNo',
},
{
title: '来源类型',
dataIndex: 'dataSourcesName',
key: 'dataSourcesName',
},
{
title: '最新外协人员',
dataIndex: 'newRepairUserName',
key: 'newRepairUserName',
},
];
}
}, [activeTabKey]);
const selectType = (type) => { const selectType = (type) => {
switch (type) { switch (type) {
case 'add': case 'add':
...@@ -420,6 +496,18 @@ function Failure(props) { ...@@ -420,6 +496,18 @@ function Failure(props) {
return <Reassig />; return <Reassig />;
case 'wxpd': case 'wxpd':
return <Wxpd />; return <Wxpd />;
case 'detail':
return (
<Detail
title="外协单号"
titleno={drawer?.item.repairNo}
detailpath="/repair/umOtherUnitsOperation/queryOperationList"
params={{ otherUnitsOrderId: drawer?.item.id }}
baseRow={drawer?.item}
basecolumns={basecolumns}
type="wgd"
/>
);
default: default:
break; break;
} }
......
src/pages/setting/users/index.jsx
View file @ 344a9802
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* @Author: Li Hanlin * @Author: Li Hanlin
* @Date: 2022-11-09 14:44:44 * @Date: 2022-11-09 14:44:44
* @Last Modified by: Li Hanlin * @Last Modified by: Li Hanlin
* @Last Modified time: 2022-12-09 13:13:57 * @Last Modified time: 2022-12-13 17:09:41
*/ */
import * as React from 'react'; import * as React from 'react';
...@@ -163,7 +163,7 @@ function User(props) { ...@@ -163,7 +163,7 @@ function User(props) {
if (!isNaN(Number(i))) { if (!isNaN(Number(i))) {
userCharReqList.push({ userCharReqList.push({
fieldId: i, fieldId: i,
fieldRealValue: vals[i], fieldRealValueList: vals[i],
}); });
delete vals[i]; delete vals[i];
} }
...@@ -211,7 +211,7 @@ function User(props) { ...@@ -211,7 +211,7 @@ function User(props) {
if (!isNaN(Number(i))) { if (!isNaN(Number(i))) {
userCharReqList.push({ userCharReqList.push({
fieldId: i, fieldId: i,
fieldRealValue: vals[i], fieldRealValueList: vals[i],
}); });
delete vals[i]; delete vals[i];
} }
......
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