待审批数角标显示

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

@@ -56,6 +56,7 @@ let mShowBillModels, mFormBillModels, mUpdateBillModels, mAllBillModels
 let mBaseUrl = window.location.origin
   + (process.env.REACT_APP_ROUTER_BASE_NAME || '/ERP')
   // && 'http://yrkj.usoftchina.com:9443/uas'
+  // && 'http://erp.yitoa.com:8888/ERP'
   // && 'http://29226oq576.qicp.vip/erp'
 
 export default class ApprovalAdd extends Component {

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

@@ -38,8 +38,8 @@ let mSendIndex = 0
 
 let mBaseUrl = window.location.origin
   + (process.env.REACT_APP_ROUTER_BASE_NAME || '/ERP')
-  // && 'http://yrkj.usoftchina.com:9443/uas'
-
+// && 'http://yrkj.usoftchina.com:9443/uas'
+// && 'http://erp.yitoa.com:8888/ERP'
 // && 'http://29226oq576.qicp.vip/erp'
 
 class ApprovalHome extends Component {
@@ -540,25 +540,6 @@ class ApprovalHome extends Component {
 
     return (
       <div className='receive-content-root'>
-        {/*<RefreshLayout*/}
-        {/*  ref={el => {*/}
-        {/*    this.sendList = el*/}
-        {/*  }}*/}
-        {/*  refreshing={this.state.isSendRefresh}*/}
-        {/*  onRefresh={this.loadSendList}*/}
-        {/*  height={this.state.sendHeight}>*/}
-        {/*  <Skeleton loading={this.state.isSendLoading} active*/}
-        {/*            paragraph={{ rows: 4 }}>*/}
-        {/*    <List split={false}*/}
-        {/*          dataSource={this.props.homeState.sendState.sendList}*/}
-        {/*          renderItem={(item, index) => (*/}
-        {/*            <ApprovalItem approval={item}*/}
-        {/*                          type={3}*/}
-        {/*                          onItemClick={this.onSendItemClick.bind(this)}*/}
-        {/*                          index={index}/>*/}
-        {/*          )}/>*/}
-        {/*  </Skeleton>*/}
-        {/*</RefreshLayout>*/}
         <SearchBar
           value={this.state.sendKey}
           placeholder={'搜索'}
@@ -616,32 +597,13 @@ class ApprovalHome extends Component {
 
   renderReceiveTodoItems = () => (
     <div className='receive-content-root'>
-      {/*<RefreshLayout
-        ref={el => {
-          this.todoTab = el
-        }}
-        refreshing={this.state.isReceiveTodoRefresh}
-        onRefresh={this.loadTodoList}
-        height={this.state.receiveHeight}>
-        <Skeleton loading={this.state.isReceiveTodoLoading} active
-                  paragraph={{ rows: 4 }}>
-          <List split={false}
-                dataSource={this.props.homeState.receiveState.listData}
-                renderItem={(item, index) => (
-                  <ApprovalItem approval={item}
-                                type={1}
-                                onItemClick={this.onReceiveItemClick.bind(this)}
-                                index={index}/>
-                )}/>
-        </Skeleton>
-      </RefreshLayout>*/}
       <InfiniteScroll
         initialLoad={false}
         pageStart={0}
         ref={el => {
           this.todoTab = el
         }}
-        loadMore={this.loadTodoList}
+        loadMore={this.loadTodoList.bind(this,undefined)}
         hasMore={this.props.homeState.receiveState.hasMore1}
         loader={<LoadingMore/>}
         threshold={1}
@@ -663,32 +625,13 @@ class ApprovalHome extends Component {
 
   renderReceiveDoneItems = () => (
     <div className='receive-content-root'>
-      {/*<RefreshLayout
-        ref={el => {
-          this.doneTab = el
-        }}
-        refreshing={this.state.isReceiveDoneRefresh}
-        onRefresh={this.loadDoneList}
-        height={this.state.receiveHeight}>
-        <Skeleton loading={this.state.isReceiveDoneLoading} active
-                  paragraph={{ rows: 4 }}>
-          <List split={false}
-                dataSource={this.props.homeState.receiveState.listData2}
-                renderItem={(item, index) => (
-                  <ApprovalItem approval={item}
-                                type={2}
-                                onItemClick={this.onReceiveItemClick.bind(this)}
-                                index={index}/>
-                )}/>
-        </Skeleton>
-      </RefreshLayout>*/}
       <InfiniteScroll
         initialLoad={false}
         pageStart={0}
         ref={el => {
           this.doneTab = el
         }}
-        loadMore={this.loadDoneList}
+        loadMore={this.loadDoneList.bind(this,undefined)}
         hasMore={this.props.homeState.receiveState.hasMore2}
         loader={<LoadingMore/>}
         threshold={1}