Browse Source

uas手机版
链接地址本窗口打开

RaoMeng 5 years ago
parent
commit
520a7abf9b

+ 2 - 1
uas-office-web/uas-mobile/src/components/common/formNew/formCommon.less

@@ -2,7 +2,8 @@
   width: 100%;
   display: flex;
   flex-direction: row;
-  padding: 6px;
+  padding: 5px 0px 5px 8px;
+  //padding: 6px;
   background: white;
   border-bottom: 1px solid #eeeeee;
   align-items: center;

+ 3 - 4
uas-office-web/uas-mobile/src/components/common/func/FuncItem.jsx

@@ -106,10 +106,9 @@ class FuncItem extends Component {
     if (this.props.onFuncClick) {
       this.props.onFuncClick(funcObj)
     } else {
-      // if (funcObj.url) {
-      //   window.open(funcObj.url)
-      // } else
-      if (funcObj.funcType === FUNC_TYPE_DOC) {
+      if (funcObj.url) {
+        window.open(funcObj.url, '_self')
+      } else if (funcObj.funcType === FUNC_TYPE_DOC) {
         this.props.history.push(
           '/serviceList/' + funcObj.caller + '/' + funcObj.name)
       } else if (funcObj.funcType === FUNC_TYPE_REPORT) {

+ 2 - 1
uas-office-web/uas-mobile/src/components/common/mainHeader/MainHeader.jsx

@@ -83,7 +83,8 @@ class MainHeader extends Component {
       this.props.history.push('/subscribeList')
     } else if (funcObj.name === '待审批') {
       window.open(
-        _baseURL + '/uas/#/uasApproval/' + this.props.userState.accountCode)
+        _baseURL + '/uas/#/uasApproval/' + this.props.userState.accountCode,
+        '_self')
     }
   }
 

+ 2 - 2
uas-office-web/uas-mobile/src/configs/api.config.js

@@ -4,9 +4,9 @@
  */
 
 export const _host = window.location.origin
-  // && 'http://10.1.7.104:8090/ERP'//吴炳
-  // && 'http://usoft.f3322.net:10007/uas'
   // && 'http://10.1.7.44:8081/erp'//吴雨骁
+  // && 'http://10.1.7.137:8090/ERP'//吴炳
+  // && 'http://usoft.f3322.net:10007/uas'
 
 export const _baseURL = _host + (process.env.REACT_APP_ROUTER_BASE_NAME || '')
 

+ 2 - 1
uas-office-web/uas-mobile/src/pages/private/subscribe/SubscribeAlready.jsx

@@ -85,7 +85,8 @@ class SubscribeAlready extends Component {
 
   onSubItemClick = (subObj) => {
     window.open(
-      _baseURL + '/common/charts/mobilePreview.action?id=' + subObj.id)
+      _baseURL + '/common/charts/mobilePreview.action?id=' + subObj.id,
+      '_self')
   }
 
   /**

+ 1 - 1
uas-office-web/uas-mobile/src/pages/private/subscribe/SubscribeList.jsx

@@ -183,7 +183,7 @@ class SubscribeList extends Component {
         _baseURL + '/common/charts/mobileCharts.action?numId=' + subObj.NUM_ID_
         + '&mainId=' + subObj.INSTANCE_ID_
         + '&insId=' + subObj.ID_
-        + '&title=' + subObj.TITLE_,
+        + '&title=' + subObj.TITLE_, '_self',
       )
     }
   }

+ 3 - 1
uas-office-web/uas-mobile/src/pages/private/subscribe/SubscribeNot.jsx

@@ -113,7 +113,9 @@ class SubscribeNot extends Component {
   }
 
   onSubItemClick = (subObj) => {
-    window.open(_baseURL + '/common/charts/mobilePreview.action?id=' + subObj.id)
+    window.open(
+      _baseURL + '/common/charts/mobilePreview.action?id=' + subObj.id,
+      '_self')
   }
 
   onSubSelect = (subObj) => {