fmui-base 2.2.59 → 2.2.61

package/README.md

@@ -3,6 +3,8 @@
 ---npm publish
 
 ## 更新日志 
+- 2.2.61: 我的流程支持再次发起
+- 2.2.60: 数据表字段关联值支持关联日期字段带出星期几，数据表字段关联值可以关联其他字段，进行赋值，批量办理支持CA批示意见的加签和验签
 - 2.2.59: 上海CA异常处理
 - 2.2.58: 增加汇报周报组件，退回的批示意见增加标识
 - 2.2.57: 子表字段支持字段关联

package/lib/form/form.js

@@ -1355,6 +1355,7 @@ var PageHome = function (_React$Component) {
                 }
               }
             });
+
             t.props.onChange(data, t.state.itemParam);
           });
         } else {
@@ -1454,11 +1455,20 @@ var PageHome = function (_React$Component) {
 
       if (itemType != 'weboffice') {
         itemParam.value = value;
+
         //处理特有按钮事件
         if (typeof FlowCommon.dealwithCommonFormParam === "function") {
           itemParam = FlowCommon.dealwithCommonFormParam(itemParam, this);
           itemType = itemParam.itemType;
         }
+        if (itemType == 'text' || itemType == 'textarea') {
+          for (var i = 0; i < data.mainTblData.length; i++) {
+            if (itemParam.key == data.mainTblData[i].key) {
+              data.mainTblData[i].value = value;
+            }
+          }
+        }
+
         //项目开发扩展
         var mobileExt;
         try {
@@ -1543,8 +1553,7 @@ var PageHome = function (_React$Component) {
             }
           }
         });
-
-        this.props.onChange(data, this.state.itemParam);
+        this.props.onChange(data, itemParam);
       }
 
       //CA验签
@@ -2166,6 +2175,7 @@ var PageHome = function (_React$Component) {
   }, {
     key: 'handleTextChange',
     value: function handleTextChange(item, newValue) {
+      var t = this;
       var inputFormat = item.inputFormat;
       var fieldType = item.fieldType;
       var decimalPlace = parseInt(item.decimalPlace);
@@ -2239,6 +2249,57 @@ var PageHome = function (_React$Component) {
       data = this.editData(name, newValue, data);
       var itemParam = this.state.itemParam;
       itemParam.value = newValue;
+      var code = itemParam.key;
+      var formItem = this.props.allForm.item;
+      var mainTblData = data.mainTblData;
+      for (var i = 0; i < formItem.length; i++) {
+        var item = formItem[i];
+        if (item.dataAttr && item.dataAttr.relatepopuserField && item.dataAttr.relatepopuserField == code) {
+          var relatepopuservalue = item.dataAttr.relatepopuserValue;
+          for (var j = 0; j < mainTblData.length; j++) {
+            var mainTblDataItem = mainTblData[j];
+            if (mainTblDataItem.key == item.itemCode) {
+              if (relatepopuservalue == 'relatedata') {
+                mainTblDataItem.value = newValue;
+              }
+              t.props.reloadItemParam(data.mainTblName + "_" + mainTblDataItem.key, mainTblDataItem.value);
+            }
+          }
+        } else if (item.children && item.children.length > 0) {
+          for (var k = 0; k < item.children.length; k++) {
+            var childItem = item.children[k];
+            if (childItem.dataAttr && childItem.dataAttr.relatepopuserField && childItem.dataAttr.relatepopuserField == code) {
+              var relatepopuservalue = childItem.dataAttr.relatepopuserValue;
+              for (var j = 0; j < mainTblData.length; j++) {
+                var mainTblDataItem = mainTblData[j];
+                if (mainTblDataItem.key == childItem.itemCode) {
+                  if (relatepopuservalue == 'relatedata') {
+                    mainTblDataItem.value = newValue;
+                  }
+
+                  // 如果当前Form是在子表中（dataType === 'sub'），需要通过SubForm来刷新
+                  // SubForm的reloadSubItemParam方法可以刷新子表所有行的字段
+                  if (t.props.dataType === 'sub' && t.props.subTblName === data.mainTblName) {
+                    // 尝试通过props获取reloadSubItemParam方法（如果SubForm传递了的话）
+                    if (t.props.reloadSubItemParam && typeof t.props.reloadSubItemParam === 'function') {
+                      var reloadParams = [];
+                      reloadParams.push({
+                        key: mainTblDataItem.uniqueName,
+                        value: mainTblDataItem.value,
+                        index: t.props.keyNo
+                      });
+                      if (reloadParams.length > 0) {
+                        t.props.reloadSubItemParam(reloadParams);
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+
       this.setState({
         itemParam: itemParam
       });
@@ -2320,6 +2381,7 @@ var PageHome = function (_React$Component) {
   }, {
     key: 'handleTextAreaChange',
     value: function handleTextAreaChange(name, newValue) {
+      var t = this;
       var data = this.props.data;
       data = this.editData(name, newValue, data);
       var itemParam = this.state.itemParam;
@@ -2374,6 +2436,58 @@ var PageHome = function (_React$Component) {
         }
       }
       itemParam.value = newValue;
+      var code = itemParam.key;
+      var formItem = this.props.allForm.item;
+      var mainTblData = data.mainTblData;
+      for (var i = 0; i < formItem.length; i++) {
+        var item = formItem[i];
+        if (item.dataAttr && item.dataAttr.relatepopuserField && item.dataAttr.relatepopuserField == code) {
+          var relatepopuservalue = item.dataAttr.relatepopuserValue;
+          for (var j = 0; j < mainTblData.length; j++) {
+            var mainTblDataItem = mainTblData[j];
+            if (mainTblDataItem.key == item.itemCode) {
+              //赋值
+              if (relatepopuservalue == 'relatedata') {
+                mainTblDataItem.value = newValue;
+              }
+              t.props.reloadItemParam(data.mainTblName + "_" + mainTblDataItem.key, mainTblDataItem.value);
+            }
+          }
+        } else if (item.children && item.children.length > 0) {
+          for (var k = 0; k < item.children.length; k++) {
+            var childItem = item.children[k];
+            if (childItem.dataAttr && childItem.dataAttr.relatepopuserField && childItem.dataAttr.relatepopuserField == code) {
+              var relatepopuservalue = childItem.dataAttr.relatepopuserValue;
+              for (var j = 0; j < mainTblData.length; j++) {
+                var mainTblDataItem = mainTblData[j];
+                if (mainTblDataItem.key == childItem.itemCode) {
+                  if (relatepopuservalue == 'relatedata') {
+                    mainTblDataItem.value = newValue;
+                  }
+
+                  // 如果当前Form是在子表中（dataType === 'sub'），需要通过SubForm来刷新
+                  // SubForm的reloadSubItemParam方法可以刷新子表所有行的字段
+                  if (t.props.dataType === 'sub' && t.props.subTblName === data.mainTblName) {
+                    // 尝试通过props获取reloadSubItemParam方法（如果SubForm传递了的话）
+                    if (t.props.reloadSubItemParam && typeof t.props.reloadSubItemParam === 'function') {
+                      var reloadParams = [];
+                      reloadParams.push({
+                        key: mainTblDataItem.uniqueName,
+                        value: mainTblDataItem.value,
+                        index: t.props.keyNo
+                      });
+                      if (reloadParams.length > 0) {
+                        t.props.reloadSubItemParam(reloadParams);
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+
       this.setState({
         itemParam: itemParam
       });
@@ -2448,6 +2562,22 @@ var PageHome = function (_React$Component) {
         this.props.onChange(data, itemParam);
       }
     }
+  }, {
+    key: 'getWeekdaysByDate',
+    value: function getWeekdaysByDate(date) {
+      var dateObj = new Date(date);
+      // 验证日期是否有效
+      if (isNaN(dateObj.getTime())) {
+        // EZUI.util.msgbox("无效的日期格式", 1, 1000);
+        return "";
+      }
+      // 获取星期几 (0=周日, 1=周一, ..., 6=周六)
+      var dayIndex = dateObj.getDay();
+
+      // 中文星期数组
+      var weekdays = ['星期日', '星期一', '星期二', '星期三', '星期四', '星期五', '星期六'];
+      return weekdays[dayIndex];
+    }
 
     //时间
 
@@ -2455,6 +2585,7 @@ var PageHome = function (_React$Component) {
     key: 'handleChangeDate',
     value: function handleChangeDate(code, value) {
       console.log("handleChangeDate===" + JSON.stringify(value));
+      var t = this;
       var data = this.props.data;
       var itemParam = this.state.itemParam;
       var dateFormat = itemParam.dateFormat;
@@ -2474,6 +2605,63 @@ var PageHome = function (_React$Component) {
       }
 
       itemParam.value = value;
+
+      var formItem = this.props.allForm.item;
+      var mainTblData = data.mainTblData;
+      for (var i = 0; i < formItem.length; i++) {
+        var item = formItem[i];
+        if (item.dataAttr && item.dataAttr.relatepopuserField && item.dataAttr.relatepopuserField == code) {
+          var relatepopuservalue = item.dataAttr.relatepopuserValue;
+          for (var j = 0; j < mainTblData.length; j++) {
+            var mainTblDataItem = mainTblData[j];
+            if (mainTblDataItem.key == item.itemCode) {
+              if (relatepopuservalue == 'relatedata') {
+                mainTblDataItem.value = this.dateFormat(value.value, dateFormat);
+              }
+              //星期几
+              else if (relatepopuservalue == 'relateweek') {
+                  mainTblDataItem.value = this.getWeekdaysByDate(value.value);
+                }
+              this.props.reloadItemParam(data.mainTblName + "_" + mainTblDataItem.key, mainTblDataItem.value);
+            }
+          }
+        } else if (item.children && item.children.length > 0) {
+          for (var k = 0; k < item.children.length; k++) {
+            var childItem = item.children[k];
+            if (childItem.dataAttr && childItem.dataAttr.relatepopuserField && childItem.dataAttr.relatepopuserField == code) {
+              var relatepopuservalue = childItem.dataAttr.relatepopuserValue;
+              for (var j = 0; j < mainTblData.length; j++) {
+                var mainTblDataItem = mainTblData[j];
+                if (mainTblDataItem.key == childItem.itemCode) {
+                  if (relatepopuservalue == 'relatedata') {
+                    mainTblDataItem.value = this.dateFormat(value.value, dateFormat);
+                  } else if (relatepopuservalue == 'relateweek') {
+                    mainTblDataItem.value = this.getWeekdaysByDate(value.value);
+                  }
+
+                  // 如果当前Form是在子表中（dataType === 'sub'），需要通过SubForm来刷新
+                  // SubForm的reloadSubItemParam方法可以刷新子表所有行的字段
+                  if (t.props.dataType === 'sub' && t.props.subTblName === data.mainTblName) {
+                    // 尝试通过props获取reloadSubItemParam方法（如果SubForm传递了的话）
+                    if (t.props.reloadSubItemParam && typeof t.props.reloadSubItemParam === 'function') {
+                      var reloadParams = [];
+                      reloadParams.push({
+                        key: mainTblDataItem.uniqueName,
+                        value: mainTblDataItem.value,
+                        index: t.props.keyNo
+                      });
+                      if (reloadParams.length > 0) {
+                        t.props.reloadSubItemParam(reloadParams);
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+
       this.setState({
         itemParam: itemParam
       });

package/lib/process_info/processInfo.js

@@ -246,7 +246,7 @@ var PageHome = function (_React$Component) {
             permissionCode = 'start';
             setPageTitle("新建");
         }
-        //子流程打开
+        //1子流程打开 2再次发起
         if (isSub != '') {
             editType = 'readd';
             permissionCode = 'start';
@@ -751,7 +751,7 @@ var PageHome = function (_React$Component) {
                 } else {
                     t.loadPage(param);
                 }
-                if (isSub != '') {
+                if (isSub == '1') {
                     t.insertBatchRelation(t.state.processInstanceId, isSub, t.state.activityId, '');
                 }
             } else {
@@ -4756,7 +4756,7 @@ var PageHome = function (_React$Component) {
                                 if (typeof mobileExt !== 'undefined' && typeof mobileExt["operateCallBack"] === "function") {
                                     mobileExt["operateCallBack"]({ type: 5, dataId: dataId, isBatch: 0 }, t.state);
                                 }
-                                if (isSub != '') {
+                                if (isSub == '1') {
                                     backPage(2);
                                 }
                                 if (isPush == '1') {
@@ -5053,7 +5053,7 @@ var PageHome = function (_React$Component) {
                         t.handleSubmit(1);
                     });
                 } else {
-                    if (isSub != '') {
+                    if (isSub == '1') {
                         backPage(2);
                     }
                     if (isPush == '1') {
@@ -5107,17 +5107,19 @@ var PageHome = function (_React$Component) {
         key: 'commentSignCA',
         value: function commentSignCA(commentbizSn, comment) {
             console.log("commentbizSn==" + commentbizSn);
-            if (comment && comment != "") {
-                _db2.default.FlowApproval.signCA({
-                    bizSn: commentbizSn,
-                    relationId: getLoginUserInfo().mobile,
-                    msg: comment,
-                    isComment: '1',
-                    fileName: getLoginUserInfo().mobile
-                }).then(function (content) {}).catch(function (error) {
-                    console.log(error);
-                });
-            }
+            // if(comment && comment!=""){
+            //     DB.FlowApproval.signCA({
+            //         bizSn: commentbizSn,
+            //         relationId: getLoginUserInfo().mobile,
+            //         msg: comment, 
+            //         isComment:'1',
+            //         fileName:getLoginUserInfo().mobile,
+            //     }).then((content) => {
+
+            //     }).catch((error) => {
+            //        console.log(error);
+            //     });
+            // }
         }
         //上海CA检查是否免密
 

package/lib/process_list/processList.js

@@ -45,6 +45,14 @@ var _Filter = require('saltui/lib/Filter');
 
 var _Filter2 = _interopRequireDefault(_Filter);
 
+var _ActionSheet = require('saltui/lib/ActionSheet');
+
+var _ActionSheet2 = _interopRequireDefault(_ActionSheet);
+
+var _Dialog = require('saltui/lib/Dialog');
+
+var _Dialog2 = _interopRequireDefault(_Dialog);
+
 var _AngleRight = require('salt-icon/lib/AngleRight');
 
 var _AngleRight2 = _interopRequireDefault(_AngleRight);
@@ -94,93 +102,246 @@ var ListItem = function (_React$Component) {
   _createClass(ListItem, [{
     key: 'clickDetail',
     value: function clickDetail(event) {
-      if (this.props.isBatch) {
-        //批量状态
-        var checkDiv = $(event.currentTarget).find(".t-checkbox-field-icon-list");
-        if (checkDiv.hasClass("un-checked")) {
-          //判断是否未选中
-          checkDiv.removeClass("un-checked");
-          checkDiv.addClass("checked");
-        } else {
-          checkDiv.removeClass("checked");
-          checkDiv.addClass("un-checked");
-        }
+      var _this2 = 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];
+                  } 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;
+                }
+              } 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") {
+                    _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.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)
+                              });
+                            }
+                          }
+                        }).catch(function (error) {});
+                      },
+                      onCancel: function onCancel() {
+                        console.log('confirm cancel');
+                      }
+                    });
+                  }
+                }).catch(function (error) {});
+              }
+            });
+          }, 1)
+        });
       } 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;
+        if (this.props.isBatch) {
+          //批量状态
+          var checkDiv = $(event.currentTarget).find(".t-checkbox-field-icon-list");
+          if (checkDiv.hasClass("un-checked")) {
+            //判断是否未选中
+            checkDiv.removeClass("un-checked");
+            checkDiv.addClass("checked");
           } else {
-            taskId = itemInfo.id;
+            checkDiv.removeClass("checked");
+            checkDiv.addClass("un-checked");
           }
-          var loginUserId = getLoginUserInfo().userId;
-          // location.hash = 'approval/approval-details/detail-servlet/' + param_list_type + '/1/' + param_processKey + '/' + param_formKey + '/' +param_businessKey +
-          //                     '/' + param_startUserId;
-          // alert(searchVal);
-          if (type == "self") {
-            var url = "process/processDetails/" + taskId + "/" + param_formKey + "/" + param_businessKey + "/" + param_list_type + "/0/" + processInstanceId + "/" + module + "/" + loginUserId;
-            if (searchVal != '') {
-              url += "/" + searchVal;
+        } 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;
             }
-            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];
+            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 {
-              fullUrl = fullUrl.replace("/" + projectPath + "/", "/modules/" + mobilePath + "/").split('?_')[0].split('/approval/all')[0];
+              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];
+              } else {
+                fullUrl = fullUrl.replace("/" + projectPath + "/", "/modules/" + mobilePath + "/").split('?_')[0].split('/approval/all')[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;
             }
-            //alert(fullUrl);
-            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 {
+            this.props.updateAbleClick(true);
           }
-
-          // window.salt.router.push({
-          //     id: 'detailPage',
-          //     url: url,
-          //     anim: 1,
-          //     needPost: true,
-          //     param: {
-          //         title: processName,
-          //     }
-          // }).then().catch((e) => {
-          //     // alert(e);
-          // });
-        } else {
-          this.props.updateAbleClick(true);
         }
       }
     }
@@ -465,7 +626,7 @@ var PageHome = function (_React$Component2) {
 
     document.addEventListener('resume', function (e) {});
 
-    var _this2 = _possibleConstructorReturn(this, (PageHome.__proto__ || Object.getPrototypeOf(PageHome)).call(this, props));
+    var _this3 = _possibleConstructorReturn(this, (PageHome.__proto__ || Object.getPrototypeOf(PageHome)).call(this, props));
 
     setPageTitle('办理');
     // 禁用iOS弹性事件
@@ -514,7 +675,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;
     }
-    _this2.state = {
+    _this3.state = {
       tabCodes: tabCodes,
       type: type,
       activeTabIndex: activeIndex, // 待办-0；待阅-1；已办-2；已阅-3；我的-4
@@ -556,13 +717,13 @@ var PageHome = function (_React$Component2) {
       category4: [],
       category: category
     };
-    _this2.getTransactionTitleCount(module, "undo,unread", category);
-    _this2.getCategoryListByModule(module, category);
+    _this3.getTransactionTitleCount(module, "undo,unread", category);
+    _this3.getCategoryListByModule(module, category);
     /**
      * 办理页面搜索框设置项
      * @type {{locale: string, instantSearch: boolean, hasHistory: boolean, searchDelay: number, onEnter: (()), onExit: (()), onChange: ((p1:*)), onSearch: ((p1?:*))}}
      */
-    _this2.searchBarProps = {
+    _this3.searchBarProps = {
       placeholder: "请输入流程标题查询",
       instantSearch: false,
       hasHistory: false,
@@ -572,14 +733,14 @@ var PageHome = function (_React$Component2) {
       onEnter: function onEnter() {
         console.log('enter');
       },
-      onExit: _this2.onExit.bind(_this2),
+      onExit: _this3.onExit.bind(_this3),
       onChange: function onChange(value) {
         console.log('Typing>>' + value);
       },
-      onSearch: _this2.onSearch.bind(_this2)
+      onSearch: _this3.onSearch.bind(_this3)
     };
 
-    return _this2;
+    return _this3;
   }
 
   _createClass(PageHome, [{
@@ -646,7 +807,7 @@ var PageHome = function (_React$Component2) {
   }, {
     key: 'getTransactionTitleCount',
     value: function getTransactionTitleCount(module, codes, category) {
-      var _this3 = this;
+      var _this4 = this;
 
       var t = this;
       _db2.default.FlowApproval.getApproveCount({
@@ -654,8 +815,8 @@ var PageHome = function (_React$Component2) {
         codes: codes,
         category: category
       }).then(function (content) {
-        _this3.state.titleCount.undo = content.undo;
-        _this3.state.titleCount.unread = content.unread;
+        _this4.state.titleCount.undo = content.undo;
+        _this4.state.titleCount.unread = content.unread;
       }).catch(function (error) {
         console.log(error);
       });
@@ -668,7 +829,7 @@ var PageHome = function (_React$Component2) {
   }, {
     key: 'getCategoryListByModule',
     value: function getCategoryListByModule(module, category) {
-      var _this4 = this;
+      var _this5 = this;
 
       var t = this;
       _db2.default.FlowApproval.getCategoryListByModule({
@@ -676,7 +837,7 @@ var PageHome = function (_React$Component2) {
         code: category
       }).then(function (content) {
         if (content) {
-          _this4.state.categoryList = content;
+          _this5.state.categoryList = content;
         }
       }).catch(function (error) {
         console.log(error);
@@ -1245,7 +1406,7 @@ var PageHome = function (_React$Component2) {
   }, {
     key: 'render',
     value: function render() {
-      var _this5 = this;
+      var _this6 = this;
 
       var tabBarStyle = {};
       var winHeightStyle = { height: this.state.winHeight };
@@ -1311,7 +1472,7 @@ var PageHome = function (_React$Component2) {
                 items: this.state.categoryList
               }],
               onConfirm: function onConfirm(data) {
-                _this5.filterConfirm(data);
+                _this6.filterConfirm(data);
               } }),
             _react2.default.createElement(
               'div',
@@ -1360,7 +1521,7 @@ var PageHome = function (_React$Component2) {
                 items: this.state.categoryList
               }],
               onConfirm: function onConfirm(data) {
-                _this5.filterConfirm(data);
+                _this6.filterConfirm(data);
               } }),
             _react2.default.createElement(
               'div',
@@ -1404,7 +1565,7 @@ var PageHome = function (_React$Component2) {
                 items: this.state.categoryList
               }],
               onConfirm: function onConfirm(data) {
-                _this5.filterConfirm(data);
+                _this6.filterConfirm(data);
               } }),
             _react2.default.createElement(
               'div',
@@ -1448,7 +1609,7 @@ var PageHome = function (_React$Component2) {
                 items: this.state.categoryList
               }],
               onConfirm: function onConfirm(data) {
-                _this5.filterConfirm(data);
+                _this6.filterConfirm(data);
               } }),
             _react2.default.createElement(
               'div',
@@ -1492,7 +1653,7 @@ var PageHome = function (_React$Component2) {
                 items: this.state.categoryList
               }],
               onConfirm: function onConfirm(data) {
-                _this5.filterConfirm(data);
+                _this6.filterConfirm(data);
               } }),
             _react2.default.createElement(
               'div',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fmui-base",
-  "version": "2.2.59",
+  "version": "2.2.61",
   "title": "fmui-base",
   "description": "fmui移动端组件",
   "main": "lib/index.js",