fmui-base 2.3.52 → 2.3.54

package/lib/process_list/processList.js

@@ -80,6 +80,34 @@ var HBox = _Boxs2.default.HBox,
 
 var searchVal = '';
 var isPageHide = false;
+
+function resolveFormKey(itemInfo, callback) {
+  var formKey = itemInfo.formKey || itemInfo.formId;
+  if (formKey && formKey !== 'undefined' && formKey !== 'null') {
+    callback(formKey);
+    return;
+  }
+  var processInstanceId = itemInfo.processInstanceId;
+  if (!processInstanceId) {
+    callback('');
+    return;
+  }
+  _db2.default.FlowModuleAPI.getDoneTaskListByProcessId({
+    processInstanceId: processInstanceId,
+    module: itemInfo.module || ''
+  }).then(function (content) {
+    var rows = content && (content.data || content.rows || content);
+    if (rows && !Array.isArray(rows) && rows.data) {
+      rows = rows.data;
+    }
+    if (Array.isArray(rows) && rows.length > 0 && rows[0].formKey) {
+      formKey = rows[0].formKey;
+    }
+    callback(formKey || '');
+  }).catch(function () {
+    callback('');
+  });
+}
 window.addEventListener('pageshow', function () {
   console.log("isPageHide===" + isPageHide);
   if (isPageHide) {
@@ -100,86 +128,194 @@ var ListItem = function (_React$Component) {
   }
 
   _createClass(ListItem, [{
+    key: 'navigateToProcessDetails',
+    value: function navigateToProcessDetails(itemInfo, param_list_type, param_formKey) {
+      var param_businessKey = itemInfo.businessKey;
+      var module = itemInfo.module;
+      var type = this.props.fromType;
+      var projectPath = this.props.projectPath;
+      var taskId = '';
+      var processInstanceId = itemInfo.processInstanceId;
+      // 避免 formKey 为空时拼出字面量 undefined
+      if (!param_formKey || param_formKey === 'undefined' || param_formKey === 'null') {
+        param_formKey = itemInfo.formKey || itemInfo.formId || '-1';
+      }
+      if (param_list_type == '2') {
+        taskId = itemInfo.taskId;
+      } else {
+        taskId = itemInfo.id;
+      }
+      var loginUserId = getLoginUserInfo().userId;
+      if (type == "self") {
+        var url = "process/processDetails/" + taskId + "/" + param_formKey + "/" + param_businessKey + "/" + param_list_type + "/0/" + processInstanceId + "/" + module + "/" + loginUserId;
+        if (searchVal != '') {
+          url += "/" + searchVal;
+        }
+        decodeURI(url);
+        location.hash = url;
+      } else {
+        isPageHide = true;
+        var fullUrl = window.location.href;
+        fullUrl = fullUrl.replace(/clientType/g, "");
+        fullUrl = fullUrl.replace(/thirdMenuType/g, "");
+        fullUrl = fullUrl.replace(/clientAppType/g, "");
+        var mobilePath = module;
+        if (module == 'bud_cost') {
+          fullUrl = fullUrl.replace("/" + projectPath + "/", "/budget/budgetcost/").split('?_')[0].split('/approval/all')[0];
+        } else if (module == 'bud_project') {
+          fullUrl = fullUrl.replace("/" + projectPath + "/", "/budget/budgetproject/").split('?_')[0].split('/approval/all')[0];
+        } else if (module == 'hoa_topic' || module == 'hoa_funds' || module == 'hoa_achievements') {
+          fullUrl = fullUrl.replace("/" + projectPath + "/", "/ky/ky/").split('?_')[0].split('/approval/all')[0];
+        } else if (module.indexOf("dj_") != '-1' || module.indexOf("jj_") != '-1' || module.indexOf("zdh_") != '-1' || module.indexOf("gh_") != '-1') {
+          fullUrl = fullUrl.split('?_')[0].split('/approval/all')[0];
+        } else if (module.indexOf("hoa_") != '-1') {
+          var category = module.split("_")[0];
+          mobilePath = module.substring(module.indexOf("_") + 1);
+          fullUrl = fullUrl.replace("/" + projectPath + "/", "/" + category + "/" + mobilePath + "/").split('?_')[0].split('/approval/all')[0];
+        } else {
+          fullUrl = fullUrl.replace("/" + projectPath + "/", "/modules/" + mobilePath + "/").split('?_')[0].split('/approval/all')[0];
+        }
+        var _url = "process/processDetails/" + taskId + "/" + param_formKey + "/" + param_businessKey + "/" + param_list_type + "/0/" + processInstanceId + "/" + module + "/" + loginUserId;
+        _url = fullUrl + '/' + _url;
+        decodeURI(_url);
+        location.href = _url;
+      }
+    }
+  }, {
+    key: 'openProcessDetails',
+    value: function openProcessDetails(itemInfo, param_list_type) {
+      var _this2 = this;
+
+      resolveFormKey(itemInfo, function (param_formKey) {
+        _this2.navigateToProcessDetails(itemInfo, param_list_type, param_formKey);
+      });
+    }
+  }, {
     key: 'clickDetail',
     value: function clickDetail(event) {
-      var _this2 = this;
+      var _this3 = this;
 
       //我的流程
-      if (this.props.type == '4') {
-        var t = this;
-        this.setState({
-          timeOutEvent: setTimeout(function () {
-            _ActionSheet2.default.show({
-              options: ['详情', '再次发送'],
-              destructiveButtonIndex: 2,
-              message: '',
-              maskClosable: true
-            }, function (index) {
-              var itemInfo = _this2.props.data;
-              console.log(itemInfo);
-              var param_processKey = itemInfo.processKey; // 流程类型code
-              var param_formKey = itemInfo.formKey; // 表单id
-              var param_businessKey = itemInfo.businessKey; // 表单数据id;
-              var param_startUserId = itemInfo.startUserId; // 流程发起人id
-              var param_list_type = _this2.props.type; // 列表类型 待办-0,待阅-1,
-              var processName = itemInfo.processName; // 流程名称
-              var module = itemInfo.module; // 流程名称
-              var type = _this2.props.fromType; //self：本应用，all:全模块
-              var projectPath = _this2.props.projectPath; //项目路径
-
-              var taskId = '';
-              var processInstanceId = itemInfo.processInstanceId;
-              if (index == 0) {
-                if (param_list_type == '2') {
-                  taskId = itemInfo.taskId;
-                } else {
-                  taskId = itemInfo.id;
-                }
-                var loginUserId = getLoginUserInfo().userId;
-                if (type == "self") {
-                  var url = "process/processDetails/" + taskId + "/" + param_formKey + "/" + param_businessKey + "/" + param_list_type + "/0/" + processInstanceId + "/" + module + "/" + loginUserId;
-                  if (searchVal != '') {
-                    url += "/" + searchVal;
-                  }
-                  decodeURI(url);
-                  location.hash = url;
-                } else {
-                  isPageHide = true;
-                  var fullUrl = window.location.href;
-                  fullUrl = fullUrl.replace(/clientType/g, "");
-                  fullUrl = fullUrl.replace(/thirdMenuType/g, "");
-                  fullUrl = fullUrl.replace(/clientAppType/g, "");
-                  var mobilePath = module;
-                  //projectPath =  modules/mobileoffice  
-                  // 预算模块跳转特殊处理
-                  if (module == 'bud_cost') {
-                    fullUrl = fullUrl.replace("/" + projectPath + "/", "/budget/budgetcost/").split('?_')[0].split('/approval/all')[0];
-                  } else if (module == 'bud_project') {
-                    fullUrl = fullUrl.replace("/" + projectPath + "/", "/budget/budgetproject/").split('?_')[0].split('/approval/all')[0];
-                  } else if (module == 'hoa_topic' || module == 'hoa_funds' || module == 'hoa_achievements') {
-                    fullUrl = fullUrl.replace("/" + projectPath + "/", "/ky/ky/").split('?_')[0].split('/approval/all')[0];
-                  } else if (module.indexOf("dj_") != '-1' || module.indexOf("jj_") != '-1' || module.indexOf("zdh_") != '-1' || module.indexOf("gh_") != '-1') {
-                    fullUrl = fullUrl.split('?_')[0].split('/approval/all')[0];
-                  } else if (module.indexOf("hoa_") != '-1') {
-                    var category = module.split("_")[0];
-                    mobilePath = module.substring(module.indexOf("_") + 1);
-                    fullUrl = fullUrl.replace("/" + projectPath + "/", "/" + category + "/" + mobilePath + "/").split('?_')[0].split('/approval/all')[0];
+      if (this.props.listTabType == '4') {
+        try {
+          _Popup2.default.hide();
+        } catch (e) {}
+        var itemInfo = this.props.data;
+        var status = String(itemInfo.status != null ? itemInfo.status : '');
+        var canDelete = status === '3' || status === '4' || status === '5';
+        // 删除项用内联红色，避免主题色覆盖 ActionSheet destructive 样式
+        var options = canDelete ? [_react2.default.createElement(
+          'span',
+          { style: { color: '#F03118' } },
+          '\u5220\u9664'
+        ), '详情', '再次发送'] : ['详情', '再次发送'];
+        _ActionSheet2.default.show({
+          options: options,
+          destructiveButtonIndex: canDelete ? 0 : undefined,
+          maskClosable: true
+        }, function (index) {
+          var param_processKey = itemInfo.processKey; // 流程类型code
+          var param_businessKey = itemInfo.businessKey; // 表单数据id;
+          var param_startUserId = itemInfo.startUserId; // 流程发起人id
+          var param_list_type = _this3.props.listTabType; // 列表类型 待办-0,待阅-1,
+          var processName = itemInfo.processName; // 流程名称
+          var module = itemInfo.module; // 流程名称
+          var type = _this3.props.fromType; //self：本应用，all:全模块
+          var projectPath = _this3.props.projectPath; //项目路径
+
+          var detailIndex = canDelete ? 1 : 0;
+          var resendIndex = canDelete ? 2 : 1;
+          if (canDelete && index == 0) {
+            var t = _this3;
+            _Dialog2.default.confirm({
+              locale: 'zh_CN',
+              title: '提示',
+              content: '确定删除该流程吗？',
+              onConfirm: function onConfirm() {
+                _db2.default.FlowModuleAPI.delMyProcess({
+                  processInstanceId: itemInfo.processInstanceId,
+                  module: module || 'approve'
+                }).then(function () {
+                  _Toast2.default.show({ type: 'success', content: '删除成功' });
+                  if (typeof t.props.onRefresh === 'function') {
+                    t.props.onRefresh();
                   } else {
-                    fullUrl = fullUrl.replace("/" + projectPath + "/", "/modules/" + mobilePath + "/").split('?_')[0].split('/approval/all')[0];
+                    try {
+                      window.location.reload();
+                    } catch (e) {}
                   }
-                  var _url = "process/processDetails/" + taskId + "/" + param_formKey + "/" + param_businessKey + "/" + param_list_type + "/0/" + processInstanceId + "/" + module + "/" + loginUserId;
-                  _url = fullUrl + '/' + _url;
-                  decodeURI(_url);
-                  location.href = _url;
-                }
-              } else if (index == 1) {
-                var param = {
-                  code: param_processKey
-                };
-                _db2.default.FlowModuleAPI.startFlowTest(param).then(function (content) {
-                  var canStart = content.canStart;
-                  var reminder = content.reminder;
-                  if (canStart == "1") {
+                }).catch(function (error) {
+                  _Toast2.default.show({
+                    type: 'error',
+                    content: error && (error.errorMsg || error.message) || '删除失败'
+                  });
+                });
+              },
+              onCancel: function onCancel() {}
+            });
+            return;
+          }
+          if (index == detailIndex) {
+            _this3.openProcessDetails(itemInfo, param_list_type);
+          } else if (index == resendIndex) {
+            var param = {
+              code: param_processKey
+            };
+            _db2.default.FlowModuleAPI.startFlowTest(param).then(function (content) {
+              var canStart = content.canStart;
+              var reminder = content.reminder;
+              if (canStart == "1") {
+                _db2.default.FlowModuleAPI.startProcess(param).then(function (content) {
+                  var openTaskId = content.openTaskId;
+                  var processInstanceId = content.processInstanceId;
+                  var list = content.list;
+                  if (openTaskId != null && openTaskId != '') {
+                    if (list != null && list != '' && list.length > 0) {
+                      for (var j = 0; j < list.length; j++) {
+                        if (openTaskId == list[j].id && module == 'approve') {
+
+                          var path = '#/process/processDetails/' + openTaskId + '/' + list[j].formKey + '/' + param_businessKey + '/0/0/' + list[j].processInstanceId + '/approve/' + param_startUserId + '/null/' + '2';
+                          location.hash = path;
+                        } else if (openTaskId == list[j].id && module != 'approve') {
+                          var fullUrl = window.location.href;
+                          fullUrl = fullUrl.replace(/clientType/g, "");
+                          fullUrl = fullUrl.replace(/thirdMenuType/g, "");
+                          fullUrl = fullUrl.replace(/clientAppType/g, "");
+                          var projectPath = 'modules/approve';
+                          var mobilePath = '';
+                          // 预算模块跳转特殊处理
+                          if (module == 'bud_cost') {
+                            fullUrl = fullUrl.replace("/" + projectPath + "/", "/budget/budgetcost/").split('?_')[0].split('#/')[0];
+                          } else if (module == 'bud_project') {
+                            fullUrl = fullUrl.replace("/" + projectPath + "/", "/budget/budgetproject/").split('?_')[0].split('#/')[0];
+                          } else if (module == 'hoa_topic' || module == 'hoa_funds' || module == 'hoa_achievements') {
+                            fullUrl = fullUrl.replace("/" + projectPath + "/", "/ky/ky/").split('?_')[0].split('#/')[0];
+                          } else if (module == 'contract_sign' || module == 'contract_exmanage') {
+                            fullUrl = fullUrl.replace("/" + projectPath + "/", "/contract/contract/").split('?_')[0].split('#/')[0];
+                          } else if (module.indexOf("dj_") != '-1' || module.indexOf("jj_") != '-1' || module.indexOf("zdh_") != '-1' || module.indexOf("gh_") != '-1') {
+                            fullUrl = fullUrl.split('?_')[0].split('#/')[0];
+                          } else if (module.indexOf("hoa_") != '-1') {
+                            var category = module.split("_")[0];
+                            mobilePath = module.substring(module.indexOf("_") + 1);
+                            fullUrl = fullUrl.replace("/" + projectPath + "/", "/" + category + "/" + mobilePath + "/").split('?_')[0].split('#/')[0];
+                          } else {
+                            fullUrl = fullUrl.replace("/" + projectPath + "/", "/modules/" + module + "/").split('?_')[0].split('#/')[0];
+                          }
+                          var url = "process/processDetails/" + openTaskId + "/" + list[j].formKey + "/" + param_businessKey + "/0/0/" + list[j].processInstanceId + "/" + module + "/" + param_startUserId + "/null/" + "2";
+                          url = fullUrl + '#/' + url;
+                          decodeURI(url);
+                          location.href = url;
+                        }
+                      }
+                    }
+                  }
+                }).catch(function (error) {});
+              } else {
+                _Dialog2.default.confirm({
+                  locale: 'zh_CN',
+                  title: '提示',
+                  content: reminder,
+                  onConfirm: function onConfirm() {
                     _db2.default.FlowModuleAPI.startProcess(param).then(function (content) {
                       var openTaskId = content.openTaskId;
                       var processInstanceId = content.processInstanceId;
@@ -189,87 +325,34 @@ var ListItem = function (_React$Component) {
                           for (var j = 0; j < list.length; j++) {
                             if (openTaskId == list[j].id && module == 'approve') {
 
-                              var path = '#/process/processDetails/' + openTaskId + '/' + list[j].formKey + '/' + param_businessKey + '/0/0/' + list[j].processInstanceId + '/approve/' + param_startUserId + '/null/' + '2';
+                              var path = '#/process/processDetails/' + openTaskId + '/' + list[j].formKey + '/' + param_businessKey + '/0/0/' + list[j].processInstanceId + '/approve/' + param_startUserId + '/null/' + '2';;
                               location.hash = path;
-                            } else if (openTaskId == list[j].id && module != 'approve') {
-                              var _fullUrl = window.location.href;
-                              _fullUrl = _fullUrl.replace(/clientType/g, "");
-                              _fullUrl = _fullUrl.replace(/thirdMenuType/g, "");
-                              _fullUrl = _fullUrl.replace(/clientAppType/g, "");
-                              var projectPath = 'modules/approve';
-                              var mobilePath = '';
-                              // 预算模块跳转特殊处理
-                              if (module == 'bud_cost') {
-                                _fullUrl = _fullUrl.replace("/" + projectPath + "/", "/budget/budgetcost/").split('?_')[0].split('#/')[0];
-                              } else if (module == 'bud_project') {
-                                _fullUrl = _fullUrl.replace("/" + projectPath + "/", "/budget/budgetproject/").split('?_')[0].split('#/')[0];
-                              } else if (module == 'hoa_topic' || module == 'hoa_funds' || module == 'hoa_achievements') {
-                                _fullUrl = _fullUrl.replace("/" + projectPath + "/", "/ky/ky/").split('?_')[0].split('#/')[0];
-                              } else if (module == 'contract_sign' || module == 'contract_exmanage') {
-                                _fullUrl = _fullUrl.replace("/" + projectPath + "/", "/contract/contract/").split('?_')[0].split('#/')[0];
-                              } else if (module.indexOf("dj_") != '-1' || module.indexOf("jj_") != '-1' || module.indexOf("zdh_") != '-1' || module.indexOf("gh_") != '-1') {
-                                _fullUrl = _fullUrl.split('?_')[0].split('#/')[0];
-                              } else if (module.indexOf("hoa_") != '-1') {
-                                var category = module.split("_")[0];
-                                mobilePath = module.substring(module.indexOf("_") + 1);
-                                _fullUrl = _fullUrl.replace("/" + projectPath + "/", "/" + category + "/" + mobilePath + "/").split('?_')[0].split('#/')[0];
-                              } else {
-                                _fullUrl = _fullUrl.replace("/" + projectPath + "/", "/modules/" + module + "/").split('?_')[0].split('#/')[0];
-                              }
-                              var _url2 = "process/processDetails/" + openTaskId + "/" + list[j].formKey + "/" + param_businessKey + "/0/0/" + list[j].processInstanceId + "/" + module + "/" + param_startUserId + "/null/" + "2";
-                              _url2 = _fullUrl + '#/' + _url2;
-                              decodeURI(_url2);
-                              location.href = _url2;
                             }
                           }
                         }
-                      }
-                    }).catch(function (error) {});
-                  } else {
-                    _Dialog2.default.confirm({
-                      locale: 'zh_CN',
-                      title: '提示',
-                      content: reminder,
-                      onConfirm: function onConfirm() {
-                        _db2.default.FlowModuleAPI.startProcess(param).then(function (content) {
-                          var openTaskId = content.openTaskId;
-                          var processInstanceId = content.processInstanceId;
-                          var list = content.list;
-                          if (openTaskId != null && openTaskId != '') {
-                            if (list != null && list != '' && list.length > 0) {
-                              for (var j = 0; j < list.length; j++) {
-                                if (openTaskId == list[j].id && module == 'approve') {
-
-                                  var path = '#/process/processDetails/' + openTaskId + '/' + list[j].formKey + '/' + param_businessKey + '/0/0/' + list[j].processInstanceId + '/approve/' + param_startUserId + '/null/' + '2';;
-                                  location.hash = path;
-                                }
-                              }
-                            }
-                          } else {
-                            if (list != null && list != '' && list.length > 0) {
-                              var assigneeName = '';
-                              for (var i = 0; i < list.length; i++) {
-                                if (list[i].assigneeName != null && list[i].assigneeName != '') {
-                                  assigneeName = assigneeName + ',' + list[i].assigneeName;
-                                }
-                              }
-                              _Toast2.default.show({
-                                type: 'success',
-                                content: "流程已发送给" + assigneeName.substring(1)
-                              });
+                      } else {
+                        if (list != null && list != '' && list.length > 0) {
+                          var assigneeName = '';
+                          for (var i = 0; i < list.length; i++) {
+                            if (list[i].assigneeName != null && list[i].assigneeName != '') {
+                              assigneeName = assigneeName + ',' + list[i].assigneeName;
                             }
                           }
-                        }).catch(function (error) {});
-                      },
-                      onCancel: function onCancel() {
-                        console.log('confirm cancel');
+                          _Toast2.default.show({
+                            type: 'success',
+                            content: "流程已发送给" + assigneeName.substring(1)
+                          });
+                        }
                       }
-                    });
+                    }).catch(function (error) {});
+                  },
+                  onCancel: function onCancel() {
+                    console.log('confirm cancel');
                   }
-                }).catch(function (error) {});
+                });
               }
-            });
-          }, 1)
+            }).catch(function (error) {});
+          }
         });
       } else {
         if (this.props.isBatch) {
@@ -285,64 +368,10 @@ var ListItem = function (_React$Component) {
           }
         } else {
           if (this.props.ableClick) {
-            var itemInfo = this.props.data;
-            console.log(itemInfo);
-            var param_processKey = itemInfo.processKey; // 流程类型code
-            var param_formKey = itemInfo.formKey; // 表单id
-            var param_businessKey = itemInfo.businessKey; // 表单数据id;
-            var param_startUserId = itemInfo.startUserId; // 流程发起人id
-            var param_list_type = this.props.type; // 列表类型 待办-0,待阅-1,
-            var processName = itemInfo.processName; // 流程名称
-            var module = itemInfo.module; // 流程名称
-            var type = this.props.fromType; //self：本应用，all:全模块
-            var projectPath = this.props.projectPath; //项目路径
-
-            var taskId = '';
-            var processInstanceId = itemInfo.processInstanceId;
-            if (param_list_type == '2') {
-              taskId = itemInfo.taskId;
-            } else {
-              taskId = itemInfo.id;
-            }
-            var loginUserId = getLoginUserInfo().userId;
-            if (type == "self") {
-              var url = "process/processDetails/" + taskId + "/" + param_formKey + "/" + param_businessKey + "/" + param_list_type + "/0/" + processInstanceId + "/" + module + "/" + loginUserId;
-              if (searchVal != '') {
-                url += "/" + searchVal;
-              }
-              decodeURI(url);
-              location.hash = url;
-            } else {
-              isPageHide = true;
-              var fullUrl = window.location.href;
-              fullUrl = fullUrl.replace(/clientType/g, "");
-              fullUrl = fullUrl.replace(/thirdMenuType/g, "");
-              fullUrl = fullUrl.replace(/clientAppType/g, "");
-              var mobilePath = module;
-              //projectPath =  modules/mobileoffice  
-              // 预算模块跳转特殊处理
-              if (module == 'bud_cost') {
-                fullUrl = fullUrl.replace("/" + projectPath + "/", "/budget/budgetcost/").split('?_')[0].split('#/')[0];
-              } else if (module == 'bud_project') {
-                fullUrl = fullUrl.replace("/" + projectPath + "/", "/budget/budgetproject/").split('?_')[0].split('#/')[0];
-              } else if (module == 'hoa_topic' || module == 'hoa_funds' || module == 'hoa_achievements') {
-                fullUrl = fullUrl.replace("/" + projectPath + "/", "/ky/ky/").split('?_')[0].split('#/')[0];
-              } else if (module == 'contract_sign' || module == 'contract_exmanage') {
-                fullUrl = fullUrl.replace("/" + projectPath + "/", "/contract/contract/").split('?_')[0].split('#/')[0];
-              } else if (module.indexOf("dj_") != '-1' || module.indexOf("jj_") != '-1' || module.indexOf("zdh_") != '-1' || module.indexOf("gh_") != '-1') {
-                fullUrl = fullUrl.split('?_')[0].split('#/')[0];
-              } else if (module.indexOf("hoa_") != '-1') {
-                var category = module.split("_")[0];
-                mobilePath = module.substring(module.indexOf("_") + 1);
-                fullUrl = fullUrl.replace("/" + projectPath + "/", "/" + category + "/" + mobilePath + "/").split('?_')[0].split('#/')[0];
-              } else {
-                fullUrl = fullUrl.replace("/" + projectPath + "/", "/modules/" + mobilePath + "/").split('?_')[0].split('#/')[0];
-              }
-              var _url3 = "process/processDetails/" + taskId + "/" + param_formKey + "/" + param_businessKey + "/" + param_list_type + "/0/" + processInstanceId + "/" + module + "/" + loginUserId;
-              _url3 = fullUrl + '#/' + _url3;
-              decodeURI(_url3);
-              location.href = _url3;
-            }
+            var _itemInfo = this.props.data;
+            console.log(_itemInfo);
+            var param_list_type = this.props.listTabType;
+            this.openProcessDetails(_itemInfo, param_list_type);
           } else {
             this.props.updateAbleClick(true);
           }
@@ -356,9 +385,9 @@ var ListItem = function (_React$Component) {
       var checkIsNotComplete = true;
       var urgencyTag = false;
       var tagClass = '';
-      if (data.type == 0 || data.type == 2) {
+      if (data.listTabType == 0 || data.listTabType == 2) {
         //待办 / 已办：缓急角标
-        if (data.type == 0) {
+        if (data.listTabType == 0) {
           checkIsNotComplete = true;
         } else if (data.status == 2) {
           checkIsNotComplete = false;
@@ -380,14 +409,14 @@ var ListItem = function (_React$Component) {
         } else {
           urgencyTag = false;
         }
-      } else if (data.type == 1) {
+      } else if (data.listTabType == 1) {
         //待阅
         if (data.status == 2) {
           checkIsNotComplete = false;
         } else {
           checkIsNotComplete = true;
         }
-      } else if (data.type == 3) {
+      } else if (data.listTabType == 3) {
         //已阅
         if (data.status == 2) {
           checkIsNotComplete = false;
@@ -403,12 +432,12 @@ var ListItem = function (_React$Component) {
         }
       }
       var comleteName = data.name;
-      if (data.type == 0) {//待办
+      if (data.listTabType == 0) {//待办
         // comleteName=   data.curStepName;
-      } else if (data.type == 1) {
+      } else if (data.listTabType == 1) {
         //待阅
         comleteName = data.nodeName;
-      } else if (data.type == 2) {
+      } else if (data.listTabType == 2) {
         //已办
         if (data.status == '2') {
           comleteName = "结束";
@@ -422,10 +451,13 @@ var ListItem = function (_React$Component) {
         } else if (data.status == '5') {
           comleteName = "结束(退回)";
           checkIsNotComplete = false;
+        } else if (data.status == '6') {
+          comleteName = "不通过";
+          checkIsNotComplete = false;
         } else {
           comleteName = data.nodeName;
         }
-      } else if (data.type == 3) {
+      } else if (data.listTabType == 3) {
         //已阅
         comleteName = data.nodeName;
       } else {
@@ -442,6 +474,9 @@ var ListItem = function (_React$Component) {
         } else if (data.status == '5') {
           comleteName = "结束(退回)";
           checkIsNotComplete = false;
+        } else if (data.status == '6') {
+          comleteName = "不通过";
+          checkIsNotComplete = false;
         } else {
           comleteName = data.nodeName;
         }
@@ -452,23 +487,23 @@ var ListItem = function (_React$Component) {
 
       var assigneeName = '申请人：' + data.startUserName;
 
-      if (data.type == 0) {
+      if (data.listTabType == 0) {
         //待办
         assigneeName = '申请人：' + data.startUserName;
-      } else if (data.type == 1) {
+      } else if (data.listTabType == 1) {
         //待阅
         assigneeName = '申请人：' + data.startUserName;
-      } else if (data.type == 2) {
+      } else if (data.listTabType == 2) {
         //已办
         if (data.curUserName) {
           assigneeName = '办理人：' + data.curUserName;
         }
-      } else if (data.type == 3) {
+      } else if (data.listTabType == 3) {
         //已阅
         if (data.startUserName) {
           assigneeName = '申请人：' + data.startUserName;
         }
-      } else if (data.type == 4) {
+      } else if (data.listTabType == 4) {
         //我的
         if (data.curUserName) {
           assigneeName = '办理人：' + data.curUserName;
@@ -479,16 +514,16 @@ var ListItem = function (_React$Component) {
       }
       var formatTime = data.createTime;
 
-      if (data.type == 0) {
+      if (data.listTabType == 0) {
         //待办
         formatTime = data.createTime;
-      } else if (data.type == 1) {
+      } else if (data.listTabType == 1) {
         //待阅
         formatTime = data.createTime;
-      } else if (data.type == 2) {
+      } else if (data.listTabType == 2) {
         //已办
         formatTime = data.dealTime;
-      } else if (data.type == 3) {
+      } else if (data.listTabType == 3) {
         //已阅
         formatTime = data.endTime;
       } else {
@@ -551,7 +586,7 @@ var ListItem = function (_React$Component) {
             { className: this.props.isBatch == false ? 't-DN' : 'approve-check' },
             _react2.default.createElement(
               Box,
-              { className: this.props.isBatch == false ? 't-DN' : 't-checkbox-field-icon-list un-checked t-MR10', 'data-taskId': this.props.id, 'data-module': this.props.module, 'data-processInstanceId': this.props.processInstanceId },
+              { className: this.props.isBatch == false ? 't-DN' : 't-checkbox-field-icon-list un-checked t-MR10', 'data-taskid': this.props.id, 'data-module': this.props.module, 'data-processinstanceid': this.props.processInstanceId },
               _react2.default.createElement('i', { className: 'iconfont icon-checked t-FCf t-FS14' })
             )
           ),
@@ -568,12 +603,12 @@ var ListItem = function (_React$Component) {
               ),
               _react2.default.createElement(
                 Box,
-                { className: this.props.dueDate != null && this.props.dueDate < clock && this.props.type == 0 ? 'label label-warn' : 't-DN' },
+                { className: this.props.dueDate != null && this.props.dueDate < clock && this.props.listTabType == 0 ? 'label label-warn' : 't-DN' },
                 '\u8D85\u65F6'
               ),
               _react2.default.createElement(
                 Box,
-                { className: this.props.deleted != null && this.props.deleted == '1' && this.props.type == 0 ? 'label label-info' : 't-DN' },
+                { className: this.props.deleted != null && this.props.deleted == '1' && this.props.listTabType == 0 ? 'label label-info' : 't-DN' },
                 '\u6682\u4E0D\u529E\u7406'
               ),
               _react2.default.createElement(
@@ -629,7 +664,7 @@ var PageHome = function (_React$Component2) {
 
     document.addEventListener('resume', function (e) {});
 
-    var _this3 = _possibleConstructorReturn(this, (PageHome.__proto__ || Object.getPrototypeOf(PageHome)).call(this, props));
+    var _this4 = _possibleConstructorReturn(this, (PageHome.__proto__ || Object.getPrototypeOf(PageHome)).call(this, props));
 
     setPageTitle('办理');
     // 禁用iOS弹性事件
@@ -678,7 +713,7 @@ var PageHome = function (_React$Component2) {
       readListUrl = _variables2.default.URLS.transaction.read + "&unified=1&sourceType=unitedapprove&module=" + module + "&category=" + category;
       myselfListUrl = _variables2.default.URLS.transaction.myself + "&unified=1&sourceType=unitedapprove&module=" + module + "&category=" + category;
     }
-    _this3.state = {
+    _this4.state = {
       tabCodes: tabCodes,
       type: type,
       activeTabIndex: activeIndex, // 待办-0；待阅-1；已办-2；已阅-3；我的-4
@@ -720,13 +755,13 @@ var PageHome = function (_React$Component2) {
       category4: [],
       category: category
     };
-    _this3.getTransactionTitleCount(module, "undo,unread", category);
-    _this3.getCategoryListByModule(module, category, activeIndex);
+    _this4.getTransactionTitleCount(module, "undo,unread", category);
+    _this4.getCategoryListByModule(module, category, activeIndex);
     /**
      * 办理页面搜索框设置项
      * @type {{locale: string, instantSearch: boolean, hasHistory: boolean, searchDelay: number, onEnter: (()), onExit: (()), onChange: ((p1:*)), onSearch: ((p1?:*))}}
      */
-    _this3.searchBarProps = {
+    _this4.searchBarProps = {
       placeholder: "请输入流程标题查询",
       instantSearch: false,
       hasHistory: false,
@@ -736,14 +771,14 @@ var PageHome = function (_React$Component2) {
       onEnter: function onEnter() {
         console.log('enter');
       },
-      onExit: _this3.onExit.bind(_this3),
+      onExit: _this4.onExit.bind(_this4),
       onChange: function onChange(value) {
         console.log('Typing>>' + value);
       },
-      onSearch: _this3.onSearch.bind(_this3)
+      onSearch: _this4.onSearch.bind(_this4)
     };
 
-    return _this3;
+    return _this4;
   }
 
   _createClass(PageHome, [{
@@ -812,7 +847,7 @@ var PageHome = function (_React$Component2) {
   }, {
     key: 'getTransactionTitleCount',
     value: function getTransactionTitleCount(module, codes, category) {
-      var _this4 = this;
+      var _this5 = this;
 
       var t = this;
       _db2.default.FlowApproval.getApproveCount({
@@ -820,8 +855,8 @@ var PageHome = function (_React$Component2) {
         codes: codes,
         category: category
       }).then(function (content) {
-        _this4.state.titleCount.undo = content.undo;
-        _this4.state.titleCount.unread = content.unread;
+        _this5.state.titleCount.undo = content.undo;
+        _this5.state.titleCount.unread = content.unread;
       }).catch(function (error) {
         console.log(error);
       });
@@ -835,7 +870,7 @@ var PageHome = function (_React$Component2) {
   }, {
     key: 'getCategoryListByModule',
     value: function getCategoryListByModule(module, category, listType) {
-      var _this5 = this;
+      var _this6 = this;
 
       var t = this;
       var type = listType;
@@ -848,11 +883,11 @@ var PageHome = function (_React$Component2) {
         listType: type
       }).then(function (content) {
         if (content) {
-          _this5.setState({
+          _this6.setState({
             categoryList: content
           });
         } else {
-          _this5.setState({
+          _this6.setState({
             categoryList: []
           });
         }
@@ -1204,7 +1239,7 @@ var PageHome = function (_React$Component2) {
         var _module = '';
         $(".checked").map(function (index, item) {
           taskIds += $(item).attr("data-taskid") + ",";
-          processInstanceIds += $(item).attr("data-processInstanceId") + ",";
+          processInstanceIds += $(item).attr("data-processinstanceid") + ",";
 
           if (index == 0) {
             taskId = $(item).attr("data-taskid");
@@ -1310,7 +1345,7 @@ var PageHome = function (_React$Component2) {
         var permissionCode = "unRead";
         $(".checked").map(function (index, item) {
           taskIds += $(item).attr("data-taskid") + ",";
-          processInstanceIds += $(item).attr("data-processInstanceId") + ",";
+          processInstanceIds += $(item).attr("data-processinstanceid") + ",";
 
           if (index == 0) {
             module = $(item).attr("data-module");
@@ -1423,7 +1458,7 @@ var PageHome = function (_React$Component2) {
   }, {
     key: 'render',
     value: function render() {
-      var _this6 = this;
+      var _this7 = this;
 
       var tabBarStyle = {};
       var winHeightStyle = { height: this.state.winHeight };
@@ -1489,7 +1524,7 @@ var PageHome = function (_React$Component2) {
                 items: this.state.categoryList
               }],
               onConfirm: function onConfirm(data) {
-                _this6.filterConfirm(data);
+                _this7.filterConfirm(data);
               } }),
             _react2.default.createElement(
               'div',
@@ -1506,7 +1541,7 @@ var PageHome = function (_React$Component2) {
                   noDataImage: _variables2.default.nodataIcon,
                   currentPageKey: 'page'
                 },
-                _react2.default.createElement(ListItem, { type: '0', isBatch: this.state.isBatch, ableClick: this.state.ableClick, fromType: this.state.type, projectPath: this.state.projectPath, updateAbleClick: this.updateAbleClick.bind(this) })
+                _react2.default.createElement(ListItem, { listTabType: '0', isBatch: this.state.isBatch, ableClick: this.state.ableClick, fromType: this.state.type, projectPath: this.state.projectPath, updateAbleClick: this.updateAbleClick.bind(this) })
               )
             )
           ) : "",
@@ -1523,7 +1558,7 @@ var PageHome = function (_React$Component2) {
               ),
               _react2.default.createElement(
                 Box,
-                { className: this.state.hasBatch ? this.state.isBatch ? "t-FCc t-PR16" : "theme-color t-PR16" : "t-DN", isBatch: this.state.isBatch, onClick: this.clickBatch.bind(this, this.state.isBatch) },
+                { className: this.state.hasBatch ? this.state.isBatch ? "t-FCc t-PR16" : "theme-color t-PR16" : "t-DN", onClick: this.clickBatch.bind(this, this.state.isBatch) },
                 '\u6279\u91CF'
               )
             ),
@@ -1538,7 +1573,7 @@ var PageHome = function (_React$Component2) {
                 items: this.state.categoryList
               }],
               onConfirm: function onConfirm(data) {
-                _this6.filterConfirm(data);
+                _this7.filterConfirm(data);
               } }),
             _react2.default.createElement(
               'div',
@@ -1555,7 +1590,7 @@ var PageHome = function (_React$Component2) {
                   noDataImage: _variables2.default.nodataIcon,
                   currentPageKey: 'page'
                 },
-                _react2.default.createElement(ListItem, { type: '1', ableClick: this.state.ableClick, isBatch: this.state.isBatch, fromType: this.state.type, projectPath: this.state.projectPath, updateAbleClick: this.updateAbleClick.bind(this) })
+                _react2.default.createElement(ListItem, { listTabType: '1', ableClick: this.state.ableClick, isBatch: this.state.isBatch, fromType: this.state.type, projectPath: this.state.projectPath, updateAbleClick: this.updateAbleClick.bind(this) })
               )
             )
           ) : "",
@@ -1582,7 +1617,7 @@ var PageHome = function (_React$Component2) {
                 items: this.state.categoryList
               }],
               onConfirm: function onConfirm(data) {
-                _this6.filterConfirm(data);
+                _this7.filterConfirm(data);
               } }),
             _react2.default.createElement(
               'div',
@@ -1599,7 +1634,7 @@ var PageHome = function (_React$Component2) {
                   noDataImage: _variables2.default.nodataIcon,
                   currentPageKey: 'page'
                 },
-                _react2.default.createElement(ListItem, { type: '2', ableClick: this.state.ableClick, isBatch: this.state.isBatch, fromType: this.state.type, projectPath: this.state.projectPath, updateAbleClick: this.updateAbleClick.bind(this) })
+                _react2.default.createElement(ListItem, { listTabType: '2', ableClick: this.state.ableClick, isBatch: this.state.isBatch, fromType: this.state.type, projectPath: this.state.projectPath, updateAbleClick: this.updateAbleClick.bind(this) })
               )
             )
           ) : "",
@@ -1626,7 +1661,7 @@ var PageHome = function (_React$Component2) {
                 items: this.state.categoryList
               }],
               onConfirm: function onConfirm(data) {
-                _this6.filterConfirm(data);
+                _this7.filterConfirm(data);
               } }),
             _react2.default.createElement(
               'div',
@@ -1643,7 +1678,7 @@ var PageHome = function (_React$Component2) {
                   noDataImage: _variables2.default.nodataIcon,
                   currentPageKey: 'page'
                 },
-                _react2.default.createElement(ListItem, { type: '3', ableClick: this.state.ableClick, isBatch: this.state.isBatch, fromType: this.state.type, projectPath: this.state.projectPath, updateAbleClick: this.updateAbleClick.bind(this) })
+                _react2.default.createElement(ListItem, { listTabType: '3', ableClick: this.state.ableClick, isBatch: this.state.isBatch, fromType: this.state.type, projectPath: this.state.projectPath, updateAbleClick: this.updateAbleClick.bind(this) })
               )
             )
           ) : "",
@@ -1670,7 +1705,7 @@ var PageHome = function (_React$Component2) {
                 items: this.state.categoryList
               }],
               onConfirm: function onConfirm(data) {
-                _this6.filterConfirm(data);
+                _this7.filterConfirm(data);
               } }),
             _react2.default.createElement(
               'div',
@@ -1688,7 +1723,11 @@ var PageHome = function (_React$Component2) {
                   currentPageKey: 'page'
 
                 },
-                _react2.default.createElement(ListItem, { type: '4', ableClick: this.state.ableClick, isBatch: this.state.isBatch, fromType: this.state.type, projectPath: this.state.projectPath, updateAbleClick: this.updateAbleClick.bind(this) })
+                _react2.default.createElement(ListItem, { listTabType: '4', ableClick: this.state.ableClick, isBatch: this.state.isBatch, fromType: this.state.type, projectPath: this.state.projectPath, updateAbleClick: this.updateAbleClick.bind(this), onRefresh: function onRefresh() {
+                    if (_this7.refs.transaction_myself_ref) {
+                      _this7.refs.transaction_myself_ref.fetchData({ type: 'refresh' });
+                    }
+                  } })
               )
             )
           ) : ""