Commit b894cdf5 authored by TZW's avatar TZW

bug 维修模块

parent 3a7ac0aa
function getcolumns(setdrawer) {
function getcolumns(setdrawer, bus) {
let listOptions = [];
if (bus !== "2") {
// 0:报修 1:接单 2:派单 3:完成维修 4:转追踪 5:转外协 6:转单 7:退单 8:追踪审核 9:外协审核 10:退单审核 11:效果验证
listOptions = [
{
label: '待接单',
value: '0',
},
{
label: '待接单(转单)',
value: '1',
},
{
label: '维修中',
value: '2',
},
{
label: '待验证(完成维修)',
value: '3',
},
{
label: '待审核(转外协)',
value: '4',
},
{
label: '外协中',
value: '5',
},
{
label: '待审核(转追踪)',
value: '6',
},
{
label: '待审核(退单)',
value: '7',
},
];
} else {
listOptions = [
{
label: '待派单',
value: '8',
},
{
label: '待派单(转单)',
value: '9',
},
{
label: '维修中',
value: '2',
},
{
label: '待验证(完成维修)',
value: '3',
},
{
label: '待审核(转外协)',
value: '4',
},
{
label: '外协中',
value: '5',
},
{
label: '待审核(转追踪)',
value: '6',
},
{
label: '待审核(退单)',
value: '7',
},
];
}
return [
{
tab: '我的待办',
......@@ -89,17 +163,11 @@ function getcolumns(setdrawer) {
title: '工单状态',
dataIndex: 'statusName',
key: 'status',
valueType: 'radio',
options: [
{
label: '待维修',
value: '1',
},
{
label: '维修中',
value: '2',
},
],
valueType: 'select',
options: listOptions,
fieldProps: {
dropdownMatchSelectWidth: 150,
},
},
],
pathconfig: {
......@@ -203,17 +271,11 @@ function getcolumns(setdrawer) {
title: '工单状态',
dataIndex: 'statusName',
key: 'status',
valueType: 'radio',
options: [
{
label: '待维修',
value: '1',
},
{
label: '维修中',
value: '2',
},
],
valueType: 'select',
options: listOptions,
fieldProps: {
dropdownMatchSelectWidth: 150,
},
},
],
pathconfig: {
......@@ -329,17 +391,11 @@ function getcolumns(setdrawer) {
title: '工单状态',
dataIndex: 'statusName',
key: 'status',
valueType: 'radio',
options: [
{
label: '待维修',
value: '1',
},
{
label: '维修中',
value: '2',
},
],
valueType: 'select',
options: listOptions,
fieldProps: {
dropdownMatchSelectWidth: 150,
},
},
],
pathconfig: {
......
This diff is collapsed.
function getcolumns(setdrawer) {
function getcolumns(setdrawer, bus) {
let listOptions = [];
if (bus !== '2') {
listOptions = [
{
label: '待接单',
value: '1',
},
{
label: '外协中',
value: '3',
},
{
label: '已完成',
value: '4',
},
];
} else {
listOptions = [
{
label: '待派单',
value: '2',
},
{
label: '外协中',
value: '3',
},
{
label: '已完成',
value: '4',
},
];
}
return [
{
tab: '我的待办',
......@@ -48,7 +80,8 @@ function getcolumns(setdrawer) {
title: '创建时间',
dataIndex: 'createTime',
key: 'createTimeList',
valueType: 'dateTimeRange', fieldProps: {
valueType: 'dateTimeRange',
fieldProps: {
showTime: {
format: 'HH:mm',
},
......@@ -88,17 +121,11 @@ function getcolumns(setdrawer) {
title: '工单状态',
dataIndex: 'statusName',
key: 'status',
valueType: 'radio',
options: [
{
label: '待维修',
value: '1',
},
{
label: '维修中',
value: '2',
},
],
valueType: 'select',
options: listOptions,
fieldProps: {
dropdownMatchSelectWidth: 150,
},
},
],
pathconfig: {
......@@ -161,7 +188,8 @@ function getcolumns(setdrawer) {
title: '创建时间',
dataIndex: 'createTime',
key: 'createTimeList',
valueType: 'dateTimeRange', fieldProps: {
valueType: 'dateTimeRange',
fieldProps: {
showTime: {
format: 'HH:mm',
},
......@@ -201,17 +229,11 @@ function getcolumns(setdrawer) {
title: '工单状态',
dataIndex: 'statusName',
key: 'status',
valueType: 'radio',
options: [
{
label: '待维修',
value: '1',
},
{
label: '维修中',
value: '2',
},
],
valueType: 'select',
options: listOptions,
fieldProps: {
dropdownMatchSelectWidth: 150,
},
},
],
pathconfig: {
......@@ -274,7 +296,8 @@ function getcolumns(setdrawer) {
title: '创建时间',
dataIndex: 'createTime',
key: 'createTimeList',
valueType: 'dateTimeRange', fieldProps: {
valueType: 'dateTimeRange',
fieldProps: {
showTime: {
format: 'HH:mm',
},
......@@ -314,17 +337,11 @@ function getcolumns(setdrawer) {
title: '工单状态',
dataIndex: 'statusName',
key: 'status',
valueType: 'radio',
options: [
{
label: '待维修',
value: '1',
},
{
label: '维修中',
value: '2',
},
],
valueType: 'select',
options: listOptions,
fieldProps: {
dropdownMatchSelectWidth: 150,
},
},
],
pathconfig: {
......
/* eslint-disable react-hooks/exhaustive-deps */
/* 外协工单
* @Author: Li Hanlin
* @Date: 2022-12-02 11:41:03
* @Last Modified by: Li Hanlin
* @Last Modified time: 2023-01-18 17:46:04
* @Last Modified time: 2023-01-29 16:49:15
*/
import * as React from 'react';
import { useState, useMemo, useRef } from 'react';
import { useState, useMemo, useRef, useEffect } from 'react';
import DrawerPro from '@/components/DrawerPro';
import AutoTable from '@/components/AutoTable';
import PremButton from '@/components/PremButton';
......@@ -24,6 +25,7 @@ function Failure(props) {
formRef = useRef();
const [drawer, setdrawer] = useState({
open: false,
SpecName: null,
}),
[activeTabKey, setactiveTabKey] = useState('1');
......@@ -40,6 +42,17 @@ function Failure(props) {
},
});
useEffect(async () => {
let res = await doFetch({
url: '/base/pmBaseBusinessData/queryBySpecName',
params: { businessSpecName: 'TRANSFER_ORDER_DISTRIBUTE' },
});
setdrawer((s) => ({
...s,
SpecName: res?.data?.data,
}));
}, []);
const detail = (text, row, _, action) => {
return (
<PremButton
......@@ -379,9 +392,14 @@ function Failure(props) {
};
const columns = useMemo(() => {
let defcolumn = getcolumns(setdrawer).filter((it) => it.key == activeTabKey)[0]?.columns;
let defcolumn = getcolumns(setdrawer, drawer?.SpecName?.businessData).filter(
(it) => it.key == activeTabKey,
)[0]?.columns;
//console.log(defcolumn);
let defpath = getcolumns(setdrawer).filter((it) => it.key == activeTabKey)[0]?.pathconfig ?? {};
let defpath =
getcolumns(setdrawer, drawer?.SpecName?.businessData).filter(
(it) => it.key == activeTabKey,
)[0]?.pathconfig ?? {};
if (activeTabKey == '1') {
return defcolumn.concat({
......
function getcolumns(setdrawer) {
function getcolumns(setdrawer, bus) {
let listOptions = [];
if (bus !== '2') {
listOptions = [
{
label: '待接单',
value: '0',
},
{
label: '待接单(转单)',
value: '1',
},
];
} else {
listOptions = [
{
label: '待派单',
value: '8',
},
{
label: '待派单(转单)',
value: '9',
},
];
}
return [
{
tab: '维修工单',
......@@ -76,6 +100,11 @@ function getcolumns(setdrawer) {
title: '工单状态',
dataIndex: 'statusName',
key: 'statusName',
valueType: 'select',
options: listOptions,
fieldProps: {
dropdownMatchSelectWidth: 150,
},
},
],
pathconfig: {
......@@ -166,6 +195,11 @@ function getcolumns(setdrawer) {
title: '工单状态',
dataIndex: 'statusName',
key: 'statusName',
valueType: 'select',
options: listOptions,
fieldProps: {
dropdownMatchSelectWidth: 150,
},
},
],
pathconfig: {
......@@ -256,6 +290,11 @@ function getcolumns(setdrawer) {
title: '工单状态',
dataIndex: 'statusName',
key: 'statusName',
valueType: 'select',
options: listOptions,
fieldProps: {
dropdownMatchSelectWidth: 150,
},
},
],
pathconfig: {
......
/* eslint-disable react-hooks/exhaustive-deps */
/* 接单平台
* @Author: Li Hanlin
* @Date: 2022-12-05 10:13:42
* @Last Modified by: Li Hanlin
* @Last Modified time: 2023-01-29 09:21:45
* @Last Modified time: 2023-01-29 16:25:57
*/
import * as React from 'react';
import { useState, useMemo, useRef } from 'react';
import { useState, useMemo, useRef, useEffect } from 'react';
import DrawerPro from '@/components/DrawerPro';
import AutoTable from '@/components/AutoTable';
import PremButton from '@/components/PremButton';
......@@ -21,6 +22,7 @@ function Platform(props) {
formRef = useRef();
const [drawer, setdrawer] = useState({
open: false,
SpecName: null,
}),
[activeTabKey, setactiveTabKey] = useState('1');
......@@ -37,6 +39,25 @@ function Platform(props) {
},
});
useEffect(async () => {
let params = {};
if (activeTabKey == '1') {
params.businessSpecName = 'ORDER_RECEIVING_DISTRIBUTE';
} else if (activeTabKey == '2') {
params.businessSpecName = 'TRACKING_ORDER_DISTRIBUTE';
} else if (activeTabKey == '3') {
params.businessSpecName = 'TRANSFER_ORDER_DISTRIBUTE';
}
let res = await doFetch({
url: '/base/pmBaseBusinessData/queryBySpecName',
params,
});
setdrawer((s) => ({
...s,
SpecName: res?.data?.data,
}));
}, [activeTabKey]);
const detail = (text, row, _, action) => {
return (
<PremButton
......@@ -219,8 +240,13 @@ function Platform(props) {
};
const columns = useMemo(() => {
let defcolumn = getcolumns(setdrawer).filter((it) => it.key == activeTabKey)[0]?.columns;
let defpath = getcolumns(setdrawer).filter((it) => it.key == activeTabKey)[0]?.pathconfig ?? {};
let defcolumn = getcolumns(setdrawer, drawer?.SpecName?.businessData).filter(
(it) => it.key == activeTabKey,
)[0]?.columns;
let defpath =
getcolumns(setdrawer, drawer?.SpecName?.businessData).filter(
(it) => it.key == activeTabKey,
)[0]?.pathconfig ?? {};
let actions = {
title: '操作',
valueType: 'option',
......
function getcolumns(setdrawer) {
import dayjs from 'dayjs';
console.log(dayjs().format('YYYY-MM-DD').valueOf());
function getcolumns(setdrawer, bus) {
let listOptions = [];
if (bus !== '2') {
listOptions = [
{
label: '待接单',
value: '1',
},
{
label: '追踪中',
value: '3',
},
{
label: '待验证',
value: '4',
},
{
label: '已完成',
value: '5',
},
];
} else {
listOptions = [
{
label: '待派单',
value: '2',
},
{
label: '追踪中',
value: '3',
},
{
label: '待验证',
value: '4',
},
{
label: '已完成',
value: '5',
},
];
}
return [
{
tab: '我的待办',
......@@ -72,13 +116,28 @@ function getcolumns(setdrawer) {
title: '下次追踪日期',
dataIndex: 'nextTrackDate',
key: 'nextTrackDateList',
valueType: 'dateTimeRange',
fieldProps: {
showTime: {
format: 'HH:mm',
},
format: 'YYYY-MM-DD HH:mm',
valueType: 'dateRange',
render: (text, row, _, action) => {
return (
<span
style={{
color: `${
row.nextTrackDate.valueOf() < dayjs().format('YYYY-MM-DD').valueOf()
? '#f50'
: 'rgba(0, 0, 0, 0.85)'
}`,
}}
>
{row.nextTrackDate}
</span>
);
},
// fieldProps: {
// showTime: {
// format: 'HH:mm',
// },
// format: 'YYYY-MM-DD HH:mm',
// },
},
{
title: '最新追踪人员',
......@@ -101,17 +160,11 @@ function getcolumns(setdrawer) {
title: '工单状态',
dataIndex: 'statusName',
key: 'status',
valueType: 'radio',
options: [
{
label: '待维修',
value: '1',
},
{
label: '维修中',
value: '2',
},
],
valueType: 'select',
options: listOptions,
fieldProps: {
dropdownMatchSelectWidth: 150,
},
},
],
pathconfig: {
......@@ -215,17 +268,11 @@ function getcolumns(setdrawer) {
title: '工单状态',
dataIndex: 'statusName',
key: 'status',
valueType: 'radio',
options: [
{
label: '待维修',
value: '1',
},
{
label: '维修中',
value: '2',
},
],
valueType: 'select',
options: listOptions,
fieldProps: {
dropdownMatchSelectWidth: 150,
},
},
],
pathconfig: {
......@@ -329,17 +376,11 @@ function getcolumns(setdrawer) {
title: '工单状态',
dataIndex: 'statusName',
key: 'status',
valueType: 'radio',
options: [
{
label: '待维修',
value: '1',
},
{
label: '维修中',
value: '2',
},
],
valueType: 'select',
options: listOptions,
fieldProps: {
dropdownMatchSelectWidth: 150,
},
},
],
pathconfig: {
......
/* eslint-disable react-hooks/exhaustive-deps */
/* 追踪工单
* @Author: Li Hanlin
* @Date: 2022-12-02 11:41:03
* @Last Modified by: Li Hanlin
* @Last Modified time: 2023-01-18 17:45:01
* @Last Modified time: 2023-01-29 16:29:20
*/
import * as React from 'react';
import { useState, useMemo, useRef } from 'react';
import { useState, useMemo, useRef, useEffect } from 'react';
import DrawerPro from '@/components/DrawerPro';
import AutoTable from '@/components/AutoTable';
import PremButton from '@/components/PremButton';
......@@ -23,6 +24,7 @@ function Failure(props) {
formRef = useRef();
const [drawer, setdrawer] = useState({
open: false,
SpecName: null,
}),
[activeTabKey, setactiveTabKey] = useState('1');
......@@ -39,6 +41,19 @@ function Failure(props) {
},
});
useEffect(async () => {
let res = await doFetch({
url: '/base/pmBaseBusinessData/queryBySpecName',
params: {
businessSpecName: 'TRACKING_ORDER_DISTRIBUTE',
},
});
setdrawer((s) => ({
...s,
SpecName: res?.data?.data,
}));
}, []);
// 重新指派
const Reassig = () => {
return (
......@@ -481,9 +496,14 @@ function Failure(props) {
};
const columns = useMemo(() => {
let defcolumn = getcolumns(setdrawer).filter((it) => it.key == activeTabKey)[0]?.columns;
let defcolumn = getcolumns(setdrawer, drawer?.SpecName?.businessData).filter(
(it) => it.key == activeTabKey,
)[0]?.columns;
//console.log(defcolumn);
let defpath = getcolumns(setdrawer).filter((it) => it.key == activeTabKey)[0]?.pathconfig ?? {};
let defpath =
getcolumns(setdrawer, drawer?.SpecName?.businessData).filter(
(it) => it.key == activeTabKey,
)[0]?.pathconfig ?? {};
if (activeTabKey == '1') {
return defcolumn.concat({
......
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