【更多】操作按钮

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

@@ -31,6 +31,7 @@ import EnclosureItem from '../../components/enclosureItem/EnclosureItem'
 import { saveReceiveState } from '../../redux/actions/homeState'
 import EmployeeItem from '../../components/employeeItem/EmployeeItem'
 
+const operation = Modal.operation
 //==============================================================================================
 let mMaster, mSessionId, mEmcode, mNodeId, mType, mCachePoints
 let mApprovalRecord = new ApprovalRecordBean()
@@ -425,34 +426,38 @@ class Approval extends Component {
                      height: '24px',
                    }}></div>
 
-              <div className={(approvalStatus === 0 && !takeoverAble)
-                ? 'menuItem'
-                : 'displayNone'}
-                   onClick={this.approvalChange}>变更
+              <div className={agreeAble ? 'menuItem' : 'displayNone'}
+                   onClick={this.approvalAgree}>同意
               </div>
-              <div className={(approvalStatus === 0 && !takeoverAble)
-                ? ''
-                : 'displayNone'}
+              <div className={agreeAble ? '' : 'displayNone'}
                    style={{
                      background: '#cccccc',
                      width: '1px',
                      height: '24px',
                    }}></div>
 
-              <div className={agreeAble ? 'menuItem' : 'displayNone'}
-                   onClick={this.approvalAgree}>同意
+              <div className={disagreeAble ? 'menuItem' : 'displayNone'}
+                   onClick={this.approvalDisagree}>不同意
               </div>
-              <div className={agreeAble ? '' : 'displayNone'}
+              <div className={disagreeAble ? '' : 'displayNone'}
                    style={{
                      background: '#cccccc',
                      width: '1px',
                      height: '24px',
                    }}></div>
 
-              <div className={disagreeAble ? 'menuItem' : 'displayNone'}
-                   onClick={this.approvalDisagree}>不同意
+              <div className={approvalStatus === 0 ? 'menuItem' : 'displayNone'}
+                   onClick={this.moreMenu}>更多
+              </div>
+
+              {/*<div className={(approvalStatus === 0 && !takeoverAble)
+                ? 'menuItem'
+                : 'displayNone'}
+                   onClick={this.approvalChange}>变更
               </div>
-              {/*<div className={disagreeAble ? '' : 'displayNone'}
+              <div className={(approvalStatus === 0 && !takeoverAble)
+                ? ''
+                : 'displayNone'}
                    style={{
                      background: '#cccccc',
                      width: '1px',
@@ -471,6 +476,20 @@ class Approval extends Component {
     </div>
   }
 
+  /**
+   * 弹出【更多】操作弹框
+   */
+  moreMenu = () => {
+    const { takeoverAble } = this.state
+    let actions = []
+
+    if (!takeoverAble) {
+      actions.push({ text: '变更', onPress: this.approvalChange })
+    }
+    actions.push({ text: '下一条', onPress: this.loadNextProcess })
+    operation(actions)
+  }
+
   getChangeModal () {
     const {
       changeModalOpen,//变更处理人弹框是否显示
@@ -526,12 +545,12 @@ class Approval extends Component {
               mEmployeeList),
           })
         }}
-        onCancel={() => {
+        /*onCancel={value => {
           this.setState({
             changeDataSource: changeDataSource.cloneWithRows(
               mEmployeeList),
           })
-        }}
+        }}*/
       />
       <ListView
         dataSource={this.state.changeDataSource}

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

@@ -55,7 +55,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://yrkj.usoftchina.com:9443/uas'
 // && 'http://erp.yitoa.com:8888/ERP'
 // && 'http://29226oq576.qicp.vip/erp'
 
@@ -214,6 +214,10 @@ export default class ApprovalAdd extends Component {
                     strContain(item.value, value)
                     || strContain(item.display, value)
                     || strContain(item.name, value)
+                    || strContain(item.EM_CODE, value)
+                    || strContain(item.EM_NAME, value)
+                    || strContain(item.EM_POSITION, value)
+                    || strContain(item.EM_DEFAULTORNAME, value)
                   )) {
                   searchList.push(item)
                 }
@@ -231,12 +235,12 @@ export default class ApprovalAdd extends Component {
               mModalList),
           })
         }}
-        onCancel={() => {
+        /*onCancel={() => {
           this.setState({
             modalDataSource: modalDataSource.cloneWithRows(
               mModalList),
           })
-        }}
+        }}*/
       />
       <ListView
         dataSource={modalDataSource}
@@ -846,6 +850,7 @@ export default class ApprovalAdd extends Component {
 
             candidateList.push(candidate)
           })
+          mModalList = candidateList
           this.setState({
             modalDataSource: this.state.modalDataSource.cloneWithRows(
               candidateList),