U审批初代版本

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

@@ -23,11 +23,11 @@ export class Routes extends React.Component {
 
   render () {
     return <Router
-      basename={process.env.REACT_APP_ROUTER_BASE_NAME || '/ERP/uas'}>
+      basename={(process.env.REACT_APP_ROUTER_BASE_NAME || '/ERP') + '/uas'}>
       <div style={{ width: '100%', height: '100%' }}>
         <Switch>
           {/*U审批过渡页面（入口页面）*/}
-          <Route path='/uasApproval/:master:type?' component={UasApproval}/>
+          <Route path='/uasApproval/:master/:type?' component={UasApproval}/>
           {/*U审批首页*/}
           <Route path='/approvalHome/:master/:type?' component={ApprovalHome}/>
           {/*U审批详情页*/}

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

@@ -94,7 +94,8 @@ export default class Approval extends Component {
 
         paramsJson.baseUrl
           ? (mBaseUrl = decodeURIComponent(paramsJson.baseUrl))
-          : (mBaseUrl = window.location.origin)
+          : (mBaseUrl = window.location.origin +
+          process.env.REACT_APP_ROUTER_BASE_NAME || '/ERP')
         mMaster = paramsJson.master
         mNodeId = paramsJson.nodeId
         mType = paramsJson.type
@@ -1500,14 +1501,14 @@ export default class Approval extends Component {
   }
 
   getImagePathUrl = (path) => {
-    return mBaseUrl + 'common/download.action?path=' + path
+    return mBaseUrl + '/common/download.action?path=' + path
       // + '&sessionId=' + '094F0F24379928148A56D37EA83632AE'
       // + '&sessionUser=' + 'U0757'
       + '&master=' + mMaster
   }
 
   getImageIdUrl = (id) => {
-    return mBaseUrl + 'common/downloadbyId.action?id=' + id
+    return mBaseUrl + '/common/downloadbyId.action?id=' + id
       // + '&sessionId=' + '094F0F24379928148A56D37EA83632AE'
       // + '&sessionUser=' + 'U0757'
       + '&master=' + mMaster

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

@@ -34,7 +34,8 @@ let mDefaultMap
 
 let mShowBillModels, mFormBillModels, mUpdateBillModels, mAllBillModels
 
-let mBaseUrl = window.location.origin
+let mBaseUrl = window.location.origin +
+  process.env.REACT_APP_ROUTER_BASE_NAME || '/ERP'
   // && 'http://29226oq576.qicp.vip/uas/'
 
 export default class ApprovalAdd extends Component {
@@ -48,7 +49,7 @@ export default class ApprovalAdd extends Component {
   }
 
   componentDidMount () {
-    document.title = ''
+    document.title = '新增单据'
     mCaller = this.props.match.params.caller
     mMaster = this.props.match.params.master
     mId = this.props.match.params.id
@@ -357,8 +358,8 @@ export default class ApprovalAdd extends Component {
       console.log('formdata', JSON.stringify(gridStoreList))
       Toast.loading('单据提交中', 0)
       fetchPost(mBaseUrl + (mId <= 0
-        ? 'uapproval/common/commonSaveAndSubmit.action'
-        : 'uapproval/common/commonUpdate.action'), {
+        ? '/uapproval/common/commonSaveAndSubmit.action'
+        : '/uapproval/common/commonUpdate.action'), {
         caller: mCaller,
         keyid: mId,
         id: mId,
@@ -471,8 +472,8 @@ export default class ApprovalAdd extends Component {
    */
   loadFormandGridDetail () {
     fetchPost(mBaseUrl + (mId <= 0
-      ? 'mobile/uapproval/getformandgriddetail.action'
-      : 'mobile/getformandgriddetail_uapproval.action'), {
+      ? '/mobile/uapproval/getformandgriddetail.action'
+      : '/mobile/getformandgriddetail_uapproval.action'), {
       condition: '1=1',
       caller: mCaller,
       id: mId,

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

@@ -33,7 +33,8 @@ let mTodoIndex = 0
 let mDoneIndex = 0
 let mSendIndex = 0
 
-let mBaseUrl = window.location.origin
+let mBaseUrl = window.location.origin +
+  process.env.REACT_APP_ROUTER_BASE_NAME || '/ERP'
 
 // && 'http://29226oq576.qicp.vip/uas/'
 
@@ -81,7 +82,7 @@ class ApprovalHome extends Component {
         sendHeight: hei,
       })
     }
-    document.title = '审批'
+    document.title = 'U审批'
 
     const { homeState } = this.props
     let { newState, receiveState, sendState, selectedTab } = homeState