待审批数角标显示

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

@@ -1850,11 +1850,14 @@ class Approval extends Component {
         approvalStatus: 2,
       })
       if (mType == 0) {
-        let { homeState: { receiveState: { tabIndex, itemIndex, listData } } } = this.props
+        let { homeState: { receiveState: { tabIndex, itemIndex, listData, todoCount } } } = this.props
         if (tabIndex == 0 && !isObjEmpty(listData) && listData.length >
           itemIndex) {
           listData.splice(itemIndex, 1)
-          saveReceiveState({ listData })()
+          saveReceiveState({
+            listData,
+            todoCount: todoCount > 0 ? todoCount - 1 : 0,
+          })()
         }
       }
       this.loadNextProcess()
@@ -1960,11 +1963,14 @@ class Approval extends Component {
         approvalStatus: 1,
       })
       if (mType == 0) {
-        let { homeState: { receiveState: { tabIndex, itemIndex, listData } } } = this.props
+        let { homeState: { receiveState: { tabIndex, itemIndex, listData, todoCount } } } = this.props
         if (tabIndex == 0 && !isObjEmpty(listData) && listData.length >
           itemIndex) {
           listData.splice(itemIndex, 1)
-          saveReceiveState({ listData })()
+          saveReceiveState({
+            listData,
+            todoCount: todoCount > 0 ? todoCount - 1 : 0,
+          })()
         }
       }
       this.loadNextProcess()
@@ -2015,11 +2021,14 @@ class Approval extends Component {
               approvalStatus: 4,
             })
             if (mType == 0) {
-              let { homeState: { receiveState: { tabIndex, itemIndex, listData } } } = this.props
+              let { homeState: { receiveState: { tabIndex, itemIndex, listData, todoCount } } } = this.props
               if (tabIndex == 0 && !isObjEmpty(listData) && listData.length >
                 itemIndex) {
                 listData.splice(itemIndex, 1)
-                saveReceiveState({ listData })()
+                saveReceiveState({
+                  listData,
+                  todoCount: todoCount > 0 ? todoCount - 1 : 0,
+                })()
               }
               this.props.history.goBack()
             }

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

@@ -55,9 +55,9 @@ 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'
+// && 'http://yrkj.usoftchina.com:9443/uas'
+// && 'http://erp.yitoa.com:8888/ERP'
+// && 'http://29226oq576.qicp.vip/erp'
 
 export default class ApprovalAdd extends Component {
 
@@ -241,21 +241,34 @@ export default class ApprovalAdd extends Component {
       <ListView
         dataSource={modalDataSource}
         renderRow={(rowData, sectionID, rowID) => {
-          return (selectType === 'MF')
-            ? (<CheckboxItem key={rowID}
-                             checked={rowData.isSelected == true}
-                             onChange={e => {
-                               let checked = e.target.checked
-                               rowData.isSelected = checked
-                               this.setState({
-                                 modalDataSource,
-                               })
-                             }}>{rowData.value}</CheckboxItem>)
-            : (<List.Item key={rowID}
-                          wrap
-                          onClick={this.onDbfindSelect.bind(this,
-                            selectModel,
-                            rowData)}>{rowData.value}</List.Item>)
+          switch (selectType) {
+            case SELECT_APPROVAL:
+              return <List.Item
+                key={rowID}
+                wrap
+                onClick={this.onEmployeeSelect.bind(this,
+                  rowData)}>
+                <EmployeeItem employee={rowData}/>
+              </List.Item>
+            case 'MF':
+              return <CheckboxItem
+                key={rowID}
+                checked={rowData.isSelected == true}
+                onChange={e => {
+                  let checked = e.target.checked
+                  rowData.isSelected = checked
+                  this.setState({
+                    modalDataSource,
+                  })
+                }}>{rowData.value}</CheckboxItem>
+            default:
+              return <List.Item
+                key={rowID}
+                wrap
+                onClick={this.onDbfindSelect.bind(this,
+                  selectModel,
+                  rowData)}>{rowData.value}</List.Item>
+          }
         }}
         style={{
           height: '72vh',
@@ -268,67 +281,47 @@ export default class ApprovalAdd extends Component {
     </Modal>
   }
 
+  onEmployeeSelect = rowData => {
+    this.setState({
+      modalOpen: false,
+      modalDataSource: new ListView.DataSource({
+        rowHasChanged: (row1, row2) => row1 !== row2,
+      }),
+      selectModel: {},
+    })
+    let emcode = rowData.EM_CODE
+    let nodeId = rowData.nodeId
+    this.approvalTakeover(emcode, nodeId)
+  }
+
   /**
    * 放大镜选项选中
    */
   onDbfindSelect = (selectModel, rowData) => {
-    if (selectModel.type == SELECT_APPROVAL) {
+    const { billGroupModelList } = this.state
+    let groupIndex = selectModel.groupIndex
+    let childIndex = selectModel.childIndex
+    let selectData = rowData
+    if (selectModel.type === 'C') {
+      if (!isObjEmpty(billGroupModelList) &&
+        !isObjNull(billGroupModelList[groupIndex])) {
+        let billGroup = billGroupModelList[groupIndex]
+        billGroup[childIndex].value = selectData.value
+        billGroup[childIndex].display = selectData.display
+      }
       this.setState({
+        billGroupModelList,
         modalOpen: false,
-        modalDataSource: new ListView.DataSource({
-          rowHasChanged: (row1, row2) => row1 !== row2,
-        }),
         selectModel: {},
       })
-      let emcode = getParenthesesStr(rowData.value)
-      let nodeId = rowData.nodeId
-      this.approvalTakeover(emcode, nodeId)
     } else {
-      const { billGroupModelList } = this.state
-      let groupIndex = selectModel.groupIndex
-      let childIndex = selectModel.childIndex
-      let selectData = rowData
-      if (selectModel.type === 'C') {
-        if (!isObjEmpty(billGroupModelList) &&
-          !isObjNull(billGroupModelList[groupIndex])) {
-          let billGroup = billGroupModelList[groupIndex]
-          billGroup[childIndex].value = selectData.value
-          billGroup[childIndex].display = selectData.display
-        }
-        this.setState({
-          billGroupModelList,
-          modalOpen: false,
-          selectModel: {},
-        })
-      } else {
-        let dataObj = selectData.obj
-        let isForm = selectModel.isForm
-        if (!isObjEmpty(billGroupModelList) &&
-          !isObjNull(billGroupModelList[groupIndex])) {
-          if (isForm == true) {
-            billGroupModelList.forEach((billGroup, index) => {
-              if (!isObjNull(billGroup) && billGroup.isForm) {
-                let showBillFields = billGroup.showBillFields
-                let hideBillFields = billGroup.hideBillFields
-                if (!isObjEmpty(showBillFields)) {
-                  showBillFields.forEach((showModel, index) => {
-                    if (showModel.field in dataObj) {
-                      showModel.value = dataObj[showModel.field]
-                    }
-                  })
-                }
-                if (!isObjEmpty(hideBillFields)) {
-                  hideBillFields.forEach((showModel, index) => {
-                    if (showModel.field in dataObj) {
-                      showModel.value = dataObj[showModel.field]
-                    }
-                  })
-                }
-              }
-            })
-          } else {
-            let billGroup = billGroupModelList[groupIndex]
-            if (!isObjNull(billGroup)) {
+      let dataObj = selectData.obj
+      let isForm = selectModel.isForm
+      if (!isObjEmpty(billGroupModelList) &&
+        !isObjNull(billGroupModelList[groupIndex])) {
+        if (isForm == true) {
+          billGroupModelList.forEach((billGroup, index) => {
+            if (!isObjNull(billGroup) && billGroup.isForm) {
               let showBillFields = billGroup.showBillFields
               let hideBillFields = billGroup.hideBillFields
               if (!isObjEmpty(showBillFields)) {
@@ -346,17 +339,36 @@ export default class ApprovalAdd extends Component {
                 })
               }
             }
+          })
+        } else {
+          let billGroup = billGroupModelList[groupIndex]
+          if (!isObjNull(billGroup)) {
+            let showBillFields = billGroup.showBillFields
+            let hideBillFields = billGroup.hideBillFields
+            if (!isObjEmpty(showBillFields)) {
+              showBillFields.forEach((showModel, index) => {
+                if (showModel.field in dataObj) {
+                  showModel.value = dataObj[showModel.field]
+                }
+              })
+            }
+            if (!isObjEmpty(hideBillFields)) {
+              hideBillFields.forEach((showModel, index) => {
+                if (showModel.field in dataObj) {
+                  showModel.value = dataObj[showModel.field]
+                }
+              })
+            }
           }
         }
-        // console.log(billGroupModelList)
-        this.setState({
-          billGroupModelList,
-          modalOpen: false,
-          selectModel: {},
-        })
       }
+      // console.log(billGroupModelList)
+      this.setState({
+        billGroupModelList,
+        modalOpen: false,
+        selectModel: {},
+      })
     }
-
   }
 
   //接管单据
@@ -813,7 +825,7 @@ export default class ApprovalAdd extends Component {
 
   judgeApproval = (oldNodeId, keyvalue, formcode) => {
     Toast.loading('正在触发审批流', 0)
-    fetchGet(mBaseUrl + '/common/getMultiNodeAssigns.action', {
+    fetchGet(mBaseUrl + '/uapproval/common/getMultiNodeAssigns.action', {
       condition: '1=1',
       caller: mCaller,
       id: keyvalue,
@@ -827,8 +839,7 @@ export default class ApprovalAdd extends Component {
         if (!isObjEmpty(nodeid) && !isObjEmpty(candidates)) {
           let candidateList = []
           candidates.forEach(item => {
-            let candidate = {}
-            candidate.value = item
+            let candidate = item
             candidate.id = keyvalue
             candidate.formcode = formcode
             candidate.nodeId = nodeid

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

@@ -55,8 +55,6 @@ class ApprovalHome extends Component {
       isReceiveDoneLoading: true,
       isReceiveTodoRefresh: false,
       isReceiveDoneRefresh: false,
-      // receiveHeight: document.documentElement.clientHeight,
-      // sendHeight: document.documentElement.clientHeight,
       isSendRefresh: false,
       isSendLoading: true,
       receiveKey: '',