RaoMeng 5 лет назад
Родитель
Сommit
262e56ec9b

+ 6 - 4
uas-office-web/uas-mobile/src/components/common/currencyList/CurrencyList.jsx

@@ -62,10 +62,12 @@ class CurrencyList extends Component {
       }),
     })
     setTimeout(() => {
-      this.setState({
-        height: document.documentElement.clientHeight -
-          ReactDOM.findDOMNode(this.lv).offsetTop,
-      })
+      if (ReactDOM.findDOMNode(this.lv)) {
+        this.setState({
+          height: document.documentElement.clientHeight -
+            ReactDOM.findDOMNode(this.lv).offsetTop,
+        })
+      }
     }, 400)
 
     const {

+ 10 - 2
uas-office-web/uas-mobile/src/configs/antd.config.less

@@ -160,6 +160,14 @@
 
 /*************************弹框**************************/
 
-.am-modal-wrap-popup::-webkit-scrollbar {
-  display: none;
+.am-modal-wrap-popup {
+  &::-webkit-scrollbar {
+    display: none;
+  }
+}
+
+.am-modal-body {
+  &::-webkit-scrollbar {
+    display: none;
+  }
 }

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

@@ -4,9 +4,10 @@
  */
 
 export const _host = window.location.origin
-  // && 'http://10.1.7.44:8081/erp'//吴雨骁
-  // && 'http://10.1.7.137: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'
+// && 'http://erp.yitoa.com:8888/ERP/'
 
 export const _baseURL = _host + (process.env.REACT_APP_ROUTER_BASE_NAME || '')
 

+ 1 - 1
uas-office-web/uas-mobile/src/pages/private/report/report.less

@@ -16,7 +16,7 @@
 
 .report-detail-root {
   width: 100%;
-  height: 80vh;
+  max-height: 80vh;
   background-color: white;
   overflow: auto;
   display: flex;

+ 5 - 3
uas-office-web/uas-mobile/src/pages/private/schedulePage/ConferenceDetail.jsx

@@ -10,7 +10,8 @@ import { message } from 'antd'
 import { isObjEmpty } from '../../../utils/common/common.util'
 import { API } from '../../../configs/api.config'
 import { fetchPostObj } from '../../../utils/common/fetchRequest'
-import CurrencyDetail from '../../../components/common/currencyDetail/CurrencyDetail'
+import CurrencyDetail
+  from '../../../components/common/currencyDetail/CurrencyDetail'
 import FormInput from '../../../components/common/formNew/FormInput'
 import './conference-detail.less'
 
@@ -111,9 +112,10 @@ class ConferenceDetail extends Component {
 
   onDataLoadComplete = (billGroupList) => {
     if (billGroupList && billGroupList[0] && billGroupList[0].showBillFields) {
-      for (let index = 0; index < billGroupList[0].showBillFields.length; index++) {
+      for (let index = 0; index <
+      billGroupList[0].showBillFields.length; index++) {
         const item = billGroupList[0].showBillFields[index]
-        if (item.caption === '与会人员') {
+        if (item.caption === '与会人员' || item.caption === '参会人员') {
           billGroupList[0].showBillFields.splice(index, 1)
           break
         }