uas手机版

放大镜

uas-office-web/uas-mobile/src/components/common/currencyDetail/CurrencyDetail.jsx

@@ -660,22 +660,22 @@ class CurrencyDetail extends Component {
       params.gridField = fieldKey
       params.gridCaller = (billGroup.billCaller || mCaller)
     }
-    fetchGet(_baseURL + '/uapproval/common/dbfind.action',
+    fetchPostObj(API.APPCOMMON_DBFIND,
       params).then(response => {
       Toast.hide()
-      let dbfinds = response.dbfinds || response.gridDbfinds
+      let dbfinds = response.data.dbfinds || response.data.gridDbfinds
       if (isObjEmpty(dbfinds)) {
         message.warn('选项数据为空')
         return
       }
-      let dataStr = response.data
+      let dataStr = response.data.data
       let dataList = JSON.parse(dataStr)
       if (isObjEmpty(dataList)) {
         message.warn('选项数据为空')
         return
       }
       let fieldKeyLike = ''
-      let configMap = {}
+      let configMap = {}, showConfig = {}
       dbfinds.forEach((config, index) => {
         //显示值对应字段名
         let dbGridField = config.dbGridField || config.ds_dbfindfield
@@ -686,17 +686,23 @@ class CurrencyDetail extends Component {
             fieldKeyLike = dbGridField
           }
           configMap[dbGridField] = field
+          if (config.isdefault) {
+            showConfig[dbGridField] = field
+          }
         }
       })
       let dbList = []
       dataList.forEach((item, index) => {
         let localData = new LocalData()
         localData.name = item[fieldKeyLike]
-        let jsonMap = {}
+        let jsonMap = {}, showJson = {}
         for (let key in configMap) {
           jsonMap[configMap[key]] = item[key]
         }
-        localData.value = this.getShowValue(jsonMap)
+        for (let key in showConfig) {
+          showJson[showConfig[key]] = item[key]
+        }
+        localData.value = this.getShowValue(showJson)
         localData.obj = jsonMap
         dbList.push(localData)
       })

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

@@ -31,7 +31,6 @@ import {
   getFormAndGrid,
 } from '../../../utils/common/form.request'
 import { fetchPostObj } from '../../../utils/common/fetchRequest'
-import { API } from '../../../configs/api.config'
 import { message } from 'antd'
 
 class CurrencyList extends Component {
@@ -180,7 +179,8 @@ class CurrencyList extends Component {
           }}
           pullToRefresh={refreshLayout}
           onEndReachedThreshold={10}
-          onEndReached={hasNextPage ? this.requestList : null}
+          // onEndReached={hasNextPage ? this.requestList : null}
+          onEndReached={this.requestList}
           pageSize={LIST_PAGE_SIZE}
         />
         {this.props.children}
@@ -312,9 +312,15 @@ class CurrencyList extends Component {
     }).then(response => {
       if (!isObjEmpty(response, response.data, response.data.list)) {
         listData = listData.concat(response.data.list)
+        this.setState({
+          hasNextPage: true,
+        })
       } else {
         pageIndex--
         Toast.show('数据为空', 2)
+        this.setState({
+          hasNextPage: false,
+        })
       }
       this.setState({
         refreshing: false,

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

@@ -24,6 +24,8 @@ export const API = {
   COMMON_CHANGEACCOUNT: _baseURL + '/common/changeMaster.action',
   //获取图表
   COMMON_GETSUBSDATA: _baseURL + '/mobile/appcommon/showChartOnHome.action',
+  //放大镜数据
+  APPCOMMON_DBFIND: _baseURL + '/mobile/appcommon/dbfind.action',
 
   /*******************************应用*************************************/
   //应用菜单列表

uas-office-web/uas-mobile/src/pages/private/homePage/HomePage.jsx

@@ -77,7 +77,8 @@ class HomePage extends Component {
         icon={<UasIcon type="uas-main-normal"/>}
         selectedIcon={<UasIcon type="uas-main-select"/>}
         selected={this.props.homeState.selectedTab === 0}
-        badge={this.props.homeState.mainCount}
+        // badge={this.props.homeState.mainCount}
+        badge={''}
         dot={false}
         onPress={this.onMainTabSelected}
       >