审批详情显示账套名称

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

@@ -371,7 +371,14 @@ class Approval extends Component {
         <div className='content'>
           <div className='headerLayout'>
             <Avatar size={42} src={require('@/images/default_header.png')}/>
-            <div className='headerText'>{titleApproval.caption}</div>
+            <div className='headerText'>
+              <div>{titleApproval.caption}</div>
+              <div style={{
+                fontSize: '12px',
+                color: '#333333',
+                marginTop: '4px',
+              }}>{titleApproval.masterName}</div>
+            </div>
             {
               approvalStatus === 0 ? null
                 : approvalStatus == 1 ?
@@ -593,6 +600,7 @@ class Approval extends Component {
       />
       <ListView
         dataSource={this.state.changeDataSource}
+        initialListSize={30}
         renderRow={(rowData, sectionID, rowID) => {
           return <List.Item
             key={rowID}
@@ -606,10 +614,10 @@ class Approval extends Component {
           height: '72vh',
           overflow: 'auto',
         }}
-        pageSize={10}
-        onScroll={() => {}}
-        scrollRenderAheadDistance={500}
-        onEndReachedThreshold={10}
+        pageSize={20}
+        // onScroll={() => {}}
+        // scrollRenderAheadDistance={500}
+        // onEndReachedThreshold={10}
       />
     </Modal>
   }
@@ -835,6 +843,7 @@ class Approval extends Component {
           return
         }
         mEmcode = infoObject.currentemcode//当前登录人
+        mApprovalRecord.masterName = infoObject.masterName
         mApprovalRecord.processInstanceId = infoObject.InstanceId
         mApprovalRecord.isForknode = (getIntValue(infoObject, 'forknode') ===
           0)
@@ -1857,6 +1866,9 @@ class Approval extends Component {
     if (!isObjNull(mApprovalRecord.title)) {
       approval.caption = mApprovalRecord.title
     }
+    if (!isObjNull(mApprovalRecord.masterName)) {
+      approval.masterName = mApprovalRecord.masterName
+    }
     if (!isObjEmpty(mApprovalRecord.imid)) {
       approval.idKey = mApprovalRecord.imid
     }

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

@@ -41,6 +41,7 @@ let mBaseUrl = window.location.origin
   // && 'http://yrkj.usoftchina.com:9443/uas'
   // && 'http://erp.yitoa.com:8888/ERP'
   // && 'http://29226oq576.qicp.vip/erp'
+  // && 'http://39.108.86.204:8099/ERP'
 
 class ApprovalHome extends Component {