Merge branch 'dev' of ssh://10.10.100.21/source/uas-office-integration into dev

uas-office-web/uas-mobile/src/components/private/noticematter/NoticeMatter.jsx

@@ -4,13 +4,14 @@
  */
 
 import React, { Component } from 'react'
+import { withRouter } from 'react-router-dom'
 import './notice-matter.less'
 import { Steps, Divider } from 'antd'
 import { isObjEmpty } from '../../../utils/common/common.util'
 
 const { Step } = Steps
 
-export default class NoticeMatter extends Component {
+class NoticeMatter extends Component {
 
   constructor () {
     super()
@@ -31,9 +32,11 @@ export default class NoticeMatter extends Component {
     let MeetingList = []
     if (!isObjEmpty(noticeMatterData)) {
       noticeMatterData.forEach((item, index) => {
+        console.log(item)
         MeetingList.push(
-          <Step className="step-icon" key={index} status="finish" title={item.TIME}
-                description={item.MEETINGNAME + '来自(' + item.MEETINGFROM + ')'} onClick={this.onCancelClick}/>,
+          <Step className={item.CALLER == '' ? '' : 'step-icon'} key={index} status="finish" title={item.TIME}
+                description={item.MEETINGNAME + '来自(' + item.MEETINGFROM + ')'}
+                onClick={this.onJumpDetail.bind(this, item)}/>,
         )
       })
     }
@@ -47,8 +50,12 @@ export default class NoticeMatter extends Component {
     )
   }
 
-  onCancelClick = () => {
-    return true
+  onJumpDetail = (item) => {
+    let { ID, CALLER } = item
+    this.props.history.push(
+      '/serviceDetail/' + ID + '/' + CALLER)
   }
 
 }
+
+export default withRouter(NoticeMatter)

uas-office-web/uas-mobile/src/configs/router.config.js

@@ -43,6 +43,8 @@ const DailyTask = PageLoadable(
   import(/* webpackChunkName:'tasktodo' */'@/pages/private/taskTodo/DailyTask'))
 const ProjectTask = PageLoadable(
   import(/* webpackChunkName:'tasktodo' */'@/pages/private/taskTodo/ProjectTask'))
+const TaskTodoDetail = PageLoadable(
+  import(/* webpackChunkName:'tasktodo' */'@/pages/private/taskTodo/TaskTodoDetail'))
 
 /**************************************************报表**************************************************/
 const ReportSearch = PageLoadable(
@@ -122,6 +124,9 @@ class Routes extends React.Component {
           <Route path='/dailyTask/:type/:id' component={DailyTask}/>
           {/*项目任务*/}
           <Route path='/projectTask/:type/:id' component={ProjectTask}/>
+          {/* 待办详情 */}
+          <Route path='/taskTodoDetail/:id/:caller'
+                 component={TaskTodoDetail}/>
 
           {/***************************************报表******************************************/}
           {/*报表搜索*/}

uas-office-web/uas-mobile/src/pages/private/taskTodo/TaskTodoDetail.jsx

@@ -0,0 +1,38 @@
+/**
+ * Created by Hujs on 2020/12/17
+ * Desc: 待办任务详情
+ */
+
+import React, { Component } from 'react'
+import { connect } from 'react-redux'
+import CurrencyDetail from '../../../components/common/currencyDetail/CurrencyDetail'
+
+class TaskTodoDetail extends Component {
+
+  constructor () {
+    super()
+
+    this.state = {}
+  }
+
+  componentDidMount () {
+    const title = this.props.match.params.title
+    document.title = title || '会议详情'
+  }
+
+  componentWillUnmount () {
+
+  }
+
+  render () {
+    return (<CurrencyDetail
+      caller={this.props.match.params.caller}
+      id={this.props.match.params.id}
+      isDetail
+    />)
+  }
+}
+
+let mapStateToProps = (state) => ({})
+
+export default connect(mapStateToProps)(TaskTodoDetail)