diff --git a/src/components/CustomPages/SK/OperateLog.css b/src/components/CustomPages/SK/OperateLog.css index 9ce7a77..3f2952f 100644 --- a/src/components/CustomPages/SK/OperateLog.css +++ b/src/components/CustomPages/SK/OperateLog.css @@ -156,59 +156,6 @@ /* margin-right: 15px; */ width: 120px; height: 40px; - background-color: #70AD47; - color: white; - border: 1px solid white; - /* border: 1px solid #ddd; */ - display: flex; - align-items: center; - justify-content: center; - margin-top: 20px; - position: relative; - border-radius: 50px; - margin-left: 25px; -} - -/* 超时处理 */ -.stepxOutTime { - /* margin-right: 15px; */ - width: 120px; - height: 40px; - background-color: #FFC000; - color: white; - border: 1px solid white; - /* border: 1px solid #ddd; */ - display: flex; - align-items: center; - justify-content: center; - margin-top: 20px; - position: relative; - border-radius: 50px; - margin-left: 25px; -} - -.stepxOver { - width: 120px; - height: 40px; - background-color: #303133; - color: white; - border: 1px solid white; - /* border: 1px solid #ddd; */ - display: flex; - align-items: center; - justify-content: center; - margin-top: 20px; - position: relative; - border-radius: 50px; - margin-left: 25px; -} - -/* 未处理 */ -.stepxEnable { - /* margin-right: 15px; */ - width: 120px; - height: 40px; - background-color: #A5A5A5; color: white; border: 1px solid white; /* border: 1px solid #ddd; */ diff --git a/src/components/CustomPages/SK/SK006ShowOperateLog.js b/src/components/CustomPages/SK/SK006ShowOperateLog.js index c61dfbf..40caa60 100644 --- a/src/components/CustomPages/SK/SK006ShowOperateLog.js +++ b/src/components/CustomPages/SK/SK006ShowOperateLog.js @@ -1,4 +1,4 @@ -import { Button, Descriptions, Badge, Popconfirm, Row, Col, Form, Input, Select, Table } from 'antd'; +import { Button, Descriptions, Badge, Popconfirm, Row, Col, Form, Input, Select, Table, Modal } from 'antd'; import React from 'react'; import { initFilter, @@ -8,6 +8,7 @@ import { showApprove, guid, ShowDateTime, + GetFileModel, } from '../../../utils/common.js'; import ReactToPrint from 'react-to-print'; import { ExportToExcel } from '@woowalker/feui'; @@ -17,6 +18,7 @@ import moment from 'moment'; import { message } from 'antd/lib/index'; import styles from './OperateLog.css'; import config from '../../../config.js'; +import FormPage from '../../FormPage'; class SK006ShowOperateLog extends React.Component { constructor(props) { @@ -26,6 +28,17 @@ class SK006ShowOperateLog extends React.Component { riskCount: 1, riskHeight: 50, opEnd: null, + detailForm: { + isShow: false, + formCode: '', + title: '', + ID: '', + }, + fileData: [], + fileForm: { + title: '', + visible: false, + }, // dateFirst: [ // [{ OPERATEPOINT: 10 }, { OPERATEPOINT: 20 }, { OPERATEPOINT: 30 }, { OPERATEPOINT: 40 }], // [{ OPERATEPOINT: 48 }, { OPERATEPOINT: 50 }, { OPERATEPOINT: 60 }, { OPERATEPOINT: 70 }, { OPERATEPOINT: 80 }], @@ -87,6 +100,35 @@ class SK006ShowOperateLog extends React.Component { }, }); }; + showDetailModalPage = (ID, CODE) => { + if (ID == null) return message.warning('暂无待办'); + const newtmpData = { + data: { + id: ID, + // USER_ID: USER_ID, + }, + formCode: CODE, + }; + this.setState({ tmpDataPage: newtmpData }, () => { + var detailForm = { + isShow: true, + title: '', + }; + console.log(this.state.tmpDataPage, '00'); + this.setState({ + detailForm: detailForm, + }); + }); + }; + //详情弹窗关闭(隐藏) + detailFormClose = () => { + var detailForm = { + isShow: false, + }; + this.setState({ + detailForm: detailForm, + }); + }; render() { const { data, riskCount, dataRiskMore, opEnd, riskHeight } = this.state; const enums = this.props.data.enums ? this.props.data.enums : this.props.app.enums; @@ -108,14 +150,22 @@ class SK006ShowOperateLog extends React.Component { data?.map((item, index) => { // 判断当前item的logList中是否所有STATUS都是0 const allStatusZero = item.logList?.every((log) => log.STATUS === 0); + // 获取上一个item的FORM_NAME + const prevFormName = index > 0 ? data[index - 1].FORM_NAME : null; + // 判断当前FORM_NAME是否与上一个重复 + const isDuplicate = item.FORM_NAME === prevFormName; + { return (