From c4f38bb66cacf5a684f95f73fd83b0e90edeeec5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?zhaobing=E2=80=99?= Date: Fri, 15 Sep 2023 19:01:46 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E8=A1=A8=E5=A4=B4=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sections/workOrder/containers/aboutMe.jsx | 22 ++++++++++------- .../workOrder/containers/initiated.jsx | 5 ++-- .../workOrder/containers/preserve.jsx | 11 ++++++++- .../sections/workOrder/containers/receipt.jsx | 24 +++++++++++-------- .../workOrder/containers/stayDoWorkOrder.jsx | 12 +++++----- 5 files changed, 45 insertions(+), 29 deletions(-) diff --git a/web/client/src/sections/workOrder/containers/aboutMe.jsx b/web/client/src/sections/workOrder/containers/aboutMe.jsx index 86ab190..65fa158 100644 --- a/web/client/src/sections/workOrder/containers/aboutMe.jsx +++ b/web/client/src/sections/workOrder/containers/aboutMe.jsx @@ -72,17 +72,27 @@ const Rest = (props) => { dataIndex: 'index', render: (text, record, index) => index + 1 }, + { + title: '事项名称', + dataIndex: 'fsFormItemName', + render: (text, record, index) => { + return record?.name || '' + } + }, { title: '项目名称', dataIndex: 'pomsProject', render: (text, record, index) => { - return record?.pomsNeedData?.projectName?.value || '' + return record.fsFormItemName==='运维中台售后问题处理工单'? + pomsProjectBasicAll?.find(item=>item.value==record?.pomsNeedData?.pomsProjectId?.value).label||'':record?.pomsNeedData?.projectName?.value || '' + } }, { title: '申请内容描述', dataIndex: 'applyContent', render: (text, record, index) => { - return record?.pomsNeedData?.applyContent?.value || '' + return record.fsFormItemName==='运维中台售后问题处理工单'?record?.pomsNeedData?.detail?.value.length>5? + {record?.pomsNeedData?.detail?.value.substring(0, 5) + '...'}:record?.pomsNeedData?.detail?.value || '':record?.pomsNeedData?.applyContent?.value || '' } }, // { @@ -128,13 +138,7 @@ const Rest = (props) => { // return record?.pomsNeedData?.handlingResult?.value || '' // } // }, - { - title: '事项名称', - dataIndex: 'fsFormItemName', - render: (text, record, index) => { - return record?.name || '' - } - }, + { title: '问题类型', dataIndex: 'issueType', diff --git a/web/client/src/sections/workOrder/containers/initiated.jsx b/web/client/src/sections/workOrder/containers/initiated.jsx index a2b993f..70aa2e4 100644 --- a/web/client/src/sections/workOrder/containers/initiated.jsx +++ b/web/client/src/sections/workOrder/containers/initiated.jsx @@ -37,7 +37,6 @@ const Rest = (props) => { }) .then(res => { let nextTableData = (res?.data || []).map(r => { - console.log('11111112222',res?.data) let pomsNeedData = {} if (r?.formData?.submitFormData && r?.formData?.workflowProcessVersion?.workflowProcessForm?.formSchema) { pomsNeedData = parseProcessData({ @@ -75,19 +74,19 @@ const Rest = (props) => { title: '项目名称', dataIndex: 'pomsProject', render: (text, record, index) => { - console.log('record1111',record) return record?.pomsNeedData?.projectName?.value || '' } }, { title: '申请内容描述', dataIndex: 'applyContent', render: (text, record, index) => { + console.log('record1',record) return record?.pomsNeedData?.applyContent?.value || '' } }, // { // title: '关联项目', - // dataIndex: 'pomsProject', + // dataIndex: 'pomsProject',console // render: (text, record, index) => { // const pomsProjectId = record?.pomsNeedData?.pomsProjectId?.value // if (pomsProjectId) { diff --git a/web/client/src/sections/workOrder/containers/preserve.jsx b/web/client/src/sections/workOrder/containers/preserve.jsx index 0a2ca66..8e0ea19 100644 --- a/web/client/src/sections/workOrder/containers/preserve.jsx +++ b/web/client/src/sections/workOrder/containers/preserve.jsx @@ -66,7 +66,16 @@ const Rest = (props) => { title: '项目名称', dataIndex: 'pomsProject', render: (text, record, index) => { - return record?.pomsNeedData?.projectName?.value || '' + return record.fsFormItemName==='运维中台售后问题处理工单'? + pomsProjectBasicAll?.find(item=>item.value==record?.pomsNeedData?.pomsProjectId?.value).label||'':record?.pomsNeedData?.projectName?.value || '' + + } + }, { + title: '申请内容描述', + dataIndex: 'applyContent', + render: (text, record, index) => { + return record.fsFormItemName==='运维中台售后问题处理工单'?record?.pomsNeedData?.detail?.value.length>5? + {record?.pomsNeedData?.detail?.value.substring(0, 5) + '...'}:record?.pomsNeedData?.detail?.value || '':record?.pomsNeedData?.applyContent?.value || '' } }, { title: '申请内容描述', diff --git a/web/client/src/sections/workOrder/containers/receipt.jsx b/web/client/src/sections/workOrder/containers/receipt.jsx index cd0487c..e611115 100644 --- a/web/client/src/sections/workOrder/containers/receipt.jsx +++ b/web/client/src/sections/workOrder/containers/receipt.jsx @@ -74,17 +74,27 @@ const Rest = (props) => { title: '序号', dataIndex: 'index', render: (text, record, index) => index + 1 - }, { + }, + { + title: '事项名称', + dataIndex: 'fsFormItemName', + render: (text, record, index) => { + return record?.name || '' + } + },{ title: '项目名称', dataIndex: 'pomsProject', render: (text, record, index) => { - return record?.pomsNeedData?.projectName?.value || '' + return record.fsFormItemName==='运维中台售后问题处理工单'? + pomsProjectBasicAll?.find(item=>item.value==record?.pomsNeedData?.pomsProjectId?.value).label||'':record?.pomsNeedData?.projectName?.value || '' + } }, { title: '申请内容描述', dataIndex: 'applyContent', render: (text, record, index) => { - return record?.pomsNeedData?.applyContent?.value || '' + return record.fsFormItemName==='运维中台售后问题处理工单'?record?.pomsNeedData?.detail?.value.length>5? + {record?.pomsNeedData?.detail?.value.substring(0, 5) + '...'}:record?.pomsNeedData?.detail?.value || '':record?.pomsNeedData?.applyContent?.value || '' } }, // { @@ -130,13 +140,7 @@ const Rest = (props) => { // return record?.pomsNeedData?.handlingResult?.value || '' // } // }, - { - title: '事项名称', - dataIndex: 'fsFormItemName', - render: (text, record, index) => { - return record?.name || '' - } - }, + { title: '问题类型', dataIndex: 'issueType', diff --git a/web/client/src/sections/workOrder/containers/stayDoWorkOrder.jsx b/web/client/src/sections/workOrder/containers/stayDoWorkOrder.jsx index 8717817..9ed211e 100644 --- a/web/client/src/sections/workOrder/containers/stayDoWorkOrder.jsx +++ b/web/client/src/sections/workOrder/containers/stayDoWorkOrder.jsx @@ -1,7 +1,7 @@ import React, { useEffect, useRef, useState } from 'react'; import { connect } from 'react-redux'; import { ApiTable, EmisApiTable, EmisRequest, parseProcessData } from '$utils' -import { Skeleton, Button, Pagination, Form, Popconfirm, Table, Toast } from '@douyinfe/semi-ui'; +import { Skeleton, Button, Pagination, Form, Popconfirm, Table, Toast, Tooltip } from '@douyinfe/semi-ui'; import { IconSearch } from '@douyinfe/semi-icons'; import { SkeletonScreen, WorkflowModal, WorkflowApprovalModal } from "$components"; import moment from "moment"; @@ -16,7 +16,6 @@ const Rest = (props) => { const [loading, setLoading] = useState(true); //获取项目状态列表 const [workflowModalVisible, setWorkflowModalVisible] = useState(false) const [checkProcessInstanceId, setCheckProcessInstanceId] = useState(null) - useEffect(() => { backlogData() if (!pomsProjectBasicAll.length) { @@ -58,7 +57,6 @@ const Rest = (props) => { setLoading(false) }); } -console.log('nextTableData',tableData) let columns = [{ title: '序号', dataIndex: 'index', @@ -74,14 +72,16 @@ console.log('nextTableData',tableData) title: '项目名称', dataIndex: 'pomsProject', render: (text, record, index) => { - console.log('recordstay',record) - return record?.pomsNeedData?.pomsProjectId?.value || '' + return record.fsFormItemName==='运维中台售后问题处理工单'? + pomsProjectBasicAll?.find(item=>item.value==record?.pomsNeedData?.pomsProjectId?.value).label||'':record?.pomsNeedData?.projectName?.value || '' + } }, { title: '申请内容描述', dataIndex: 'applyContent', render: (text, record, index) => { - return record?.pomsNeedData?.applyContent?.value || '' + return record.fsFormItemName==='运维中台售后问题处理工单'?record?.pomsNeedData?.detail?.value.length>5? + {record?.pomsNeedData?.detail?.value.substring(0, 5) + '...'}:record?.pomsNeedData?.detail?.value || '':record?.pomsNeedData?.applyContent?.value || '' } }, // {