【我审批的】【我发起的】类别判断

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

@@ -26,13 +26,18 @@ export class Routes extends React.Component {
       basename={process.env.REACT_APP_ROUTER_BASE_NAME || '/ERP/uas'}>
       <div style={{ width: '100%', height: '100%' }}>
         <Switch>
-          {/*<Route exact path='/bindPhone' component={BindPhone}/>*/}
-          <Route path='/uasApproval' component={UasApproval}/>
-          <Route path='/approvalHome' component={ApprovalHome}/>
+          {/*U审批过渡页面（入口页面）*/}
+          <Route path='/uasApproval/:master:type?' component={UasApproval}/>
+          {/*U审批首页*/}
+          <Route path='/approvalHome/:master/:type?' component={ApprovalHome}/>
+          {/*U审批详情页*/}
           <Route path='/approval/:paramsStr?' component={Approval}/>
+          {/*U审批新增页面*/}
           <Route path='/approvalAdd/:caller/:master/:id?'
                  component={ApprovalAdd}/>
           <Route path='/redirect/:paramsStr?' component={RedirectPage}/>
+
+          {/*<Route exact path='/bindPhone' component={BindPhone}/>*/}
           <Route path='/bindPhone/:openId?' component={BindPhone}/>
           <Route path='/bindResult/:result' component={BindResult}/>
           {/*<Redirect path='/' to={{pathname: '/bindPhone'}}/>*/}

uas-office-web/wxuasapproval/src/pages/approval/ApprovalHome.jsx

@@ -27,14 +27,15 @@ import {
 import CustomIcon from '../../utils/CustomIcon'
 import ApprovalItem from '../../components/approvalItem/ApprovalItem'
 
-let mMaster = 'UAS_DEV'
+let mMaster
 const mPageSize = 20
 let mTodoIndex = 0
 let mDoneIndex = 0
 let mSendIndex = 0
 
 let mBaseUrl = window.location.origin
-  // && 'http://29226oq576.qicp.vip/uas/'
+
+// && 'http://29226oq576.qicp.vip/uas/'
 
 class ApprovalHome extends Component {
 
@@ -62,6 +63,9 @@ class ApprovalHome extends Component {
         pageVisible: true,
       })
     }, 100)
+
+    mMaster = this.props.match.params.master
+
     // 用于刷新组建确认高度
     if (ReactDOM.findDOMNode(this.contain)) {
       const hei = this.state.receiveHeight -
@@ -80,10 +84,22 @@ class ApprovalHome extends Component {
     document.title = '审批'
 
     const { homeState } = this.props
-    const { newState, receiveState, sendState, selectedTab } = homeState
+    let { newState, receiveState, sendState, selectedTab } = homeState
 
     this.initSwiper(receiveState)
 
+    let pageType = this.props.match.params.type
+    if (pageType == 'receive') {
+      selectedTab = 1
+      freshHomeState({
+        selectedTab: 1,
+      })()
+    } else if (pageType == 'send') {
+      selectedTab = 2
+      freshHomeState({
+        selectedTab: 2,
+      })()
+    }
     switch (selectedTab) {
       case 0: {
         this.initNew(newState)
@@ -790,7 +806,8 @@ class ApprovalHome extends Component {
       sendList.length = 0
     }
 
-    fetchGet(mBaseUrl + '/common/desktop/process/uapproval/alreadyLaunch.action',
+    fetchGet(
+      mBaseUrl + '/common/desktop/process/uapproval/alreadyLaunch.action',
       {
         pageSize: mPageSize,
         page: mSendIndex,

uas-office-web/wxuasapproval/src/pages/approval/UasApproval.jsx

@@ -16,9 +16,12 @@ export default class UasApproval extends Component {
 
   componentDidMount () {
     document.title = 'U审批'
+    let master = this.props.match.params.master
+    let pageType = this.props.match.params.type
+
     clearHomeState()()
 
-    this.props.history.push('/approvalHome')
+    this.props.history.push('/approvalHome/' + master + '/' + pageType)
   }
 
   componentWillUnmount () {