fmui-base 2.3.58 → 2.3.60

package/lib/process_info/processInfo.js

@@ -100,6 +100,10 @@ var _RelationProcess = require('./RelationProcess');
 
 var _RelationProcess2 = _interopRequireDefault(_RelationProcess);
 
+var _RelationProcessPicker = require('./RelationProcessPicker');
+
+var _RelationProcessPicker2 = _interopRequireDefault(_RelationProcessPicker);
+
 var _MessageBoard = require('./MessageBoard');
 
 var _MessageBoard2 = _interopRequireDefault(_MessageBoard);
@@ -470,6 +474,10 @@ var PageHome = function (_React$Component) {
             nextJumpActivity: [], //下一个跳转节点
             jumpPersonValue: [], //转交选择的用户
             addlotsPersonValue: [], //加签选择的用户
+            reduceSignUserList: [], //减签候选原始列表
+            reduceSignAddPool: [], //加签用户池（可移到减签）
+            reduceSignReducePool: [], //减签用户池（真正提交）
+            reduceShortMessage: '0', //减签提醒方式
             circulateNodePersonValue: [], //传阅节点选择的用户
             forwardNodePersonValue: [], //转发节点选择的用户
             circulatePersonValue: [], //通过传阅的用户
@@ -534,6 +542,8 @@ var PageHome = function (_React$Component) {
             mobileSubTblDefault: '1', //移动端子表默认 1展开 0收起；未设置按展开
             enableMessageBoard: '0', //流程启用留言板
             enableAttachmentArea: '0', //流程启用附件区
+            relationCount: 0, //关联流程数量
+            hasRelationBtn: false, //当前是否具备关联流程按钮权限
             readScopeId: '',
             readScopeList: [],
             readRangeType: '', //传阅范围 0全部 2本组织及下属组织 4自定义
@@ -1351,6 +1361,10 @@ var PageHome = function (_React$Component) {
                     }
                     formData.linkFields = form.linkFields;
                     formData.formItem = formItem;
+                    // 后端偶发带回字符串 "null"，会导致提交带无效 dataId+optlock 被乐观锁拦截
+                    if (!(0, _filterEmptySubTblRows.isValidFormDataId)(formData.dataId)) {
+                        formData.dataId = '';
+                    }
 
                     //关联字段
                     var formRelaField = content.formRelaField;
@@ -1595,9 +1609,18 @@ var PageHome = function (_React$Component) {
                     //     }
                     // }
                     var resolvedOptlock = formData && formData.optlock !== undefined && formData.optlock !== null && formData.optlock !== '' ? String(formData.optlock) : content.optlock !== undefined && content.optlock !== null && content.optlock !== '' ? String(content.optlock) : '';
+                    var forceOptlock = false;
                     if (t._pendingForceOptlock) {
                         resolvedOptlock = String(t._pendingForceOptlock);
                         t._pendingForceOptlock = null;
+                        forceOptlock = true;
+                    }
+                    // 无有效主表主键时不缓存 optlock，避免发起/新建误传版本号
+                    if (!forceOptlock && !(0, _filterEmptySubTblRows.isValidFormDataId)(formData && formData.dataId) && !(0, _filterEmptySubTblRows.isValidFormDataId)(t.state.dataId)) {
+                        var contentDataId = content && (content.dataId || content.businessKey);
+                        if (!(0, _filterEmptySubTblRows.isValidFormDataId)(contentDataId)) {
+                            resolvedOptlock = '';
+                        }
                     }
                     t.setState({
                         editFormData: formData,
@@ -1616,6 +1639,7 @@ var PageHome = function (_React$Component) {
                         defaultValue: defaultValue,
                         commentId: commentId,
                         buttons: buttons,
+                        hasRelationBtn: (',' + (buttons || '') + ',').indexOf(',OTHER_RELATION,') !== -1,
                         startButtons: startButtons,
                         code: content.code,
                         formItem: formItem,
@@ -1685,6 +1709,11 @@ var PageHome = function (_React$Component) {
                         startUserOrgId: content.startUserOrgId || content.startUserGroupId || '',
                         taskAssignOrgId: content.taskAssignOrgId || ''
                     }, function () {
+                        // 进页即拉取关联数量（显式传当前实例 id，避免 state 未齐）
+                        try {
+                            var pidForRelation = t.state.processInstanceId || t.props.processInstanceId;
+                            t.loadRelationCount(pidForRelation);
+                        } catch (eCount) {}
                         if (t._pendingCommentRestore != null && t._pendingCommentRestore !== '') {
                             var restoredComment = t._pendingCommentRestore;
                             t._pendingCommentRestore = null;
@@ -1857,11 +1886,12 @@ var PageHome = function (_React$Component) {
                         continue;
                     }
                     //PAGE_SAVE保存按钮只有当新建时才有，HELP_ADDLOTS加签只有在会签和串签才有,RADOM_FINISH随机流程完成按钮去掉
-                    if (buttonCode == 'OTHER_RELATION' || buttonCode == 'FLOW_REVOKE' || buttonCode == 'RADOM_FINISH' || buttonCode == 'FLOW_CANCEL' || buttonCode == 'FLOW_RECOVER' || buttonCode == 'PAGE_PRINT' || buttonCode == 'PAGE_URGE' || buttonCode == 'PAGE_REDSET' || buttonCode == 'PAGE_FEEDBACK' || buttonCode == 'RECORD' || buttonCode == 'HELP_ADDLOTS' && participantMode == '0') {
+                    // OTHER_RELATION 移动端已支持，不再跳过
+                    if (buttonCode == 'FLOW_REVOKE' || buttonCode == 'RADOM_FINISH' || buttonCode == 'FLOW_CANCEL' || buttonCode == 'FLOW_RECOVER' || buttonCode == 'PAGE_PRINT' || buttonCode == 'PAGE_URGE' || buttonCode == 'PAGE_REDSET' || buttonCode == 'PAGE_FEEDBACK' || buttonCode == 'RECORD' || buttonCode == 'HELP_ADDLOTS' && participantMode == '0') {
                         continue;
                     } else {
                         if (isStart == true && permissionCode == 'start' || isDraft == '1') {
-                            if (buttonCode == 'PAGE_SAVE' || buttonCode == 'BASE_SUMBIT') {
+                            if (buttonCode == 'PAGE_SAVE' || buttonCode == 'BASE_SUMBIT' || buttonCode == 'OTHER_RELATION') {
                                 buttonArrayNew.push(buttonCode);
                             }
                             // 发起人已配置作废，且流程已有数据（退回/撤回到发起人）时显示作废
@@ -1907,6 +1937,7 @@ var PageHome = function (_React$Component) {
                 buttonList.push({ name: t.state.finalButtons.get("HELP_FORWARD"), type: 'secondary', display: 'inline', no: 20 });
             } else if (listType == "4") {
                 //我的
+                var processStatusNow = String(content.processStatus != null ? content.processStatus : content.status != null ? content.status : '');
                 if (this.state.processIsComplete == "0") {
                     //当流程未结束时,
                     if (buttons.indexOf('FLOW_CANCEL') >= 0) {
@@ -1919,7 +1950,6 @@ var PageHome = function (_React$Component) {
                             buttonList.push({ name: t.state.finalButtons.get("FLOW_REVOKE"), type: 'secondary', display: 'inline', no: 7 });
                         }
                         // 与 PC 一致：发起人配置作废 + 进行中 + 当前待办在发起节点
-                        var processStatusNow = String(content.processStatus != null ? content.processStatus : content.status != null ? content.status : '');
                         var backToInitiator = isStart == true || isStart == 'true';
                         if (!backToInitiator && content.processLogList && content.processLogList.length > 0 && content.doingUserList && content.doingUserList.length > 0) {
                             var startActId = content.processLogList[0].curactivityid;
@@ -1940,6 +1970,18 @@ var PageHome = function (_React$Component) {
                         buttonList.push({ name: t.state.finalButtons.get("PAGE_URGE"), type: 'secondary', display: 'inline', no: 12 });
                     }
                 }
+                // 不通过(status=6)：与 PC 一致，点开详情允许作废（发起人节点配置了 BASE_INVALID）
+                if (processStatusNow == '6' && startButtons && startButtons.indexOf('BASE_INVALID') >= 0) {
+                    var hasInvalidBtn = false;
+                    for (var bi = 0; bi < buttonList.length; bi++) {
+                        if (buttonList[bi] && buttonList[bi].no == 9) {
+                            hasInvalidBtn = true;break;
+                        }
+                    }
+                    if (!hasInvalidBtn) {
+                        buttonList.push({ name: t.state.finalButtons.get("BASE_INVALID"), type: 'danger', display: 'inline', no: 9 });
+                    }
+                }
                 if (startButtons) {
                     if (startButtons.indexOf('HELP_CIRCULATE') >= 0) {
                         //传阅
@@ -2606,6 +2648,9 @@ var PageHome = function (_React$Component) {
                         case 'HELP_ADDLOTS':
                             t.handleSubmit(6);
                             break;
+                        case 'HELP_REDUCELOTS':
+                            t.handleSubmit(22);
+                            break;
                         case 'FLOW_REVOKE':
                             t.handleSubmit(7);
                             break;
@@ -2630,6 +2675,9 @@ var PageHome = function (_React$Component) {
                         case 'MAILSEND':
                             t.handleSubmit(18);
                             break;
+                        case 'OTHER_RELATION':
+                            t.handleSubmit('OTHER_RELATION');
+                            break;
                         default:
                             t.handleSubmit(actionSheetButtonOpt[index]);
                             break;
@@ -2674,7 +2722,11 @@ var PageHome = function (_React$Component) {
                         permissionCode: _this2.state.permissionCode
                     };
                     if (t.state.module === 'approve' && t.state.formDataOptlock !== '' && t.state.formDataOptlock !== null && typeof t.state.formDataOptlock !== 'undefined') {
-                        param.optlock = t.state.formDataOptlock;
+                        // 无有效主表 dataId 时不传 optlock，避免后端「已传版本却无主键」直接报冲突
+                        var optlockDataId = dataId || sendData && sendData.dataId || t.state.dataId;
+                        if ((0, _filterEmptySubTblRows.isValidFormDataId)(optlockDataId)) {
+                            param.optlock = t.state.formDataOptlock;
+                        }
                     }
                     var dealActionName = "";
                     if (_this2.state.isStart == true) {
@@ -2683,6 +2735,12 @@ var PageHome = function (_React$Component) {
                         dealActionName = _this2.state.finalButtons.get("BASE_SUMBIT");
                     }
                     param.dealActionName = dealActionName;
+                    // 网关条件「上一环节办理人批示内容」依赖当前批示意见，getNextActivity 必须透传
+                    param.comment = typeof newComment === 'undefined' || newComment == null ? '' : newComment;
+                    param.commentType = 'text';
+                    if (t.state.commentId) {
+                        param.commentId = t.state.commentId;
+                    }
                     var nextList = null; //下一个后继节点列表
                     var radomList = null; //下一个随机活动节点
                     var succeedRange = ""; //后继活动id
@@ -3362,6 +3420,9 @@ var PageHome = function (_React$Component) {
                 }, function () {
                     $(window).scrollTop(0);
                 });
+            } else if (operate == 22) {
+                //减签
+                t.openReduceSign();
             } else if (operate == 7) {
                 //撤销
                 this.recallClick();
@@ -3599,6 +3660,9 @@ var PageHome = function (_React$Component) {
                         $(window).scrollTop(0);
                     });
                 }
+            } else if (operate == 'OTHER_RELATION') {
+                //关联流程
+                this.openRelationPicker();
             } else {
                 //其他按钮
                 if (typeof FlowCommon[operate] === "function") {
@@ -3991,7 +4055,7 @@ var PageHome = function (_React$Component) {
             var allEditIdsArray = [];
 
             //主表id
-            if (data.dataId) {
+            if ((0, _filterEmptySubTblRows.isValidFormDataId)(data && data.dataId)) {
                 var mainTableId = data.dataId;
                 allEditIdsArray.push(mainTableId);
             }
@@ -4607,6 +4671,9 @@ var PageHome = function (_React$Component) {
             } else if (operate == 6) {
                 //加签
                 this.addlots();
+            } else if (operate == 22) {
+                //减签
+                this.reduceSign();
             } else if (operate == 4) {
                 //传阅
                 this.circulateNode();
@@ -4652,6 +4719,162 @@ var PageHome = function (_React$Component) {
                 this.startSubProcess();
             }
         }
+
+        // 打开关联流程选择（标题搜索多选）
+
+    }, {
+        key: 'openRelationPicker',
+        value: function openRelationPicker() {
+            var t = this;
+            var processInstanceId = t.state.processInstanceId;
+            if (!processInstanceId || processInstanceId === '-99' || processInstanceId === 'undefined' || processInstanceId === 'null') {
+                _Toast2.default.show({
+                    type: 'error',
+                    content: '请先保存/提交生成流程后再关联'
+                });
+                return;
+            }
+            // 先拉已关联列表再打开，保证已关联流程不可选；关闭必须用本层 Popup 实例 close
+            _db2.default.FlowModuleAPI.getRelationProcess({
+                processInstanceId: processInstanceId
+            }).then(function (content) {
+                var excludeIds = [processInstanceId];
+                var list = [];
+                if (Array.isArray(content)) {
+                    list = content;
+                } else if (content && Array.isArray(content.data)) {
+                    list = content.data;
+                }
+                for (var i = 0; i < list.length; i++) {
+                    var rid = list[i].processInstanceId || list[i].id;
+                    if (rid) {
+                        excludeIds.push(String(rid));
+                    }
+                }
+                var relationRef = t.refs.relationProcess_list;
+                if (relationRef && relationRef.state && relationRef.state.relationList) {
+                    for (var j = 0; j < relationRef.state.relationList.length; j++) {
+                        var rid2 = relationRef.state.relationList[j].processInstanceId;
+                        if (rid2) {
+                            excludeIds.push(String(rid2));
+                        }
+                    }
+                }
+                var popupInst = null;
+                var closePicker = function closePicker() {
+                    try {
+                        if (popupInst && typeof popupInst.close === 'function') {
+                            popupInst.close();
+                        } else {
+                            _Popup2.default.hide();
+                        }
+                    } catch (e) {
+                        try {
+                            _Popup2.default.hide();
+                        } catch (e2) {}
+                    }
+                };
+                popupInst = _Popup2.default.show(_react2.default.createElement(_RelationProcessPicker2.default, {
+                    processInstanceId: processInstanceId,
+                    activityId: t.state.activityId,
+                    excludeIds: excludeIds,
+                    onClose: closePicker,
+                    onSuccess: function onSuccess() {
+                        t.refreshRelationTab();
+                    }
+                }), {
+                    animationType: 'slide-left',
+                    className: 'relation-process-picker-popup',
+                    maskClosable: true
+                });
+            }).catch(function () {
+                _Toast2.default.show({
+                    type: 'error',
+                    content: '获取已关联流程失败'
+                });
+            });
+        }
+
+        // 刷新关联流程页签数量与列表
+
+    }, {
+        key: 'refreshRelationTab',
+        value: function refreshRelationTab() {
+            var t = this;
+            var relationRef = t.refs.relationProcess_list;
+            if (relationRef && typeof relationRef.reload === 'function') {
+                relationRef.reload();
+            }
+            t.loadRelationCount();
+        }
+
+        // 仅刷新页签数量（不依赖 RelationProcess 是否已挂载）；可显式传入 processInstanceId
+
+    }, {
+        key: 'loadRelationCount',
+        value: function loadRelationCount(forceProcessInstanceId) {
+            var t = this;
+            var processInstanceId = forceProcessInstanceId || t.state.processInstanceId || t.props.processInstanceId;
+            if (!processInstanceId || processInstanceId === '-99' || processInstanceId === 'undefined' || processInstanceId === 'null') {
+                t.setState({ relationCount: 0 });
+                return;
+            }
+            _db2.default.FlowModuleAPI.getRelationProcess({
+                processInstanceId: processInstanceId
+            }).then(function (content) {
+                var list = t.normalizeRelationList(content);
+                t.setState({ relationCount: list.length });
+            }).catch(function () {
+                t.setState({ relationCount: 0 });
+            });
+        }
+
+        // 配合详情页 flex:0.25，完整展示「关联流程(N)」
+
+    }, {
+        key: 'getRelationTabTitle',
+        value: function getRelationTabTitle() {
+            var n = parseInt(this.state.relationCount, 10);
+            if (isNaN(n) || n < 0) {
+                n = 0;
+            }
+            return n > 0 ? '关联流程(' + n + ')' : '关联流程';
+        }
+    }, {
+        key: 'normalizeRelationList',
+        value: function normalizeRelationList(content) {
+            if (Array.isArray(content)) {
+                return content;
+            }
+            if (content && Array.isArray(content.data)) {
+                return content.data;
+            }
+            if (content && Array.isArray(content.content)) {
+                return content.content;
+            }
+            if (content && content.list && Array.isArray(content.list)) {
+                return content.list;
+            }
+            return [];
+        }
+    }, {
+        key: 'onRelationCountChange',
+        value: function onRelationCountChange(count) {
+            var n = parseInt(count, 10);
+            if (isNaN(n) || n < 0) {
+                n = 0;
+            }
+            // 与列表回写对齐，始终刷新页签数字
+            if (n !== this.state.relationCount) {
+                this.setState({
+                    relationCount: n
+                });
+            } else if (n > 0) {
+                // 同值也强制一次，避免 Tab 标题未重绘
+                this.forceUpdate();
+            }
+        }
+
         //子流程自动关联
 
     }, {
@@ -5606,7 +5829,21 @@ var PageHome = function (_React$Component) {
             // }
             param.commentbizSn = commentbizSn;
             if (t.state.module === 'approve' && t.state.formDataOptlock !== '' && t.state.formDataOptlock !== null && typeof t.state.formDataOptlock !== 'undefined') {
-                param.optlock = t.state.formDataOptlock;
+                // 无有效主表 dataId 时不传 optlock，避免后端「已传版本却无主键」直接报冲突
+                var sendOptlockDataId = param.dataId || t.state.dataId;
+                try {
+                    if ((!sendOptlockDataId || !(0, _filterEmptySubTblRows.isValidFormDataId)(sendOptlockDataId)) && param.formData) {
+                        var parsedFd = typeof param.formData === 'string' ? JSON.parse(param.formData) : param.formData;
+                        if (parsedFd && (0, _filterEmptySubTblRows.isValidFormDataId)(parsedFd.dataId)) {
+                            sendOptlockDataId = parsedFd.dataId;
+                        }
+                    }
+                } catch (eOpt) {}
+                if ((0, _filterEmptySubTblRows.isValidFormDataId)(sendOptlockDataId)) {
+                    param.optlock = t.state.formDataOptlock;
+                } else if (param.optlock !== undefined) {
+                    delete param.optlock;
+                }
             }
 
             var db = _db2.default;
@@ -6538,6 +6775,152 @@ var PageHome = function (_React$Component) {
                 }
             });
         }
+
+        // 打开减签页：拉取本节点被加签人列表
+
+    }, {
+        key: 'openReduceSign',
+        value: function openReduceSign() {
+            var t = this;
+            _db2.default.FlowModuleAPI.getSignUserList({
+                taskId: t.state.taskId
+            }).then(function (content) {
+                var list = content || [];
+                var addPool = [];
+                for (var i = 0; i < list.length; i++) {
+                    var item = list[i];
+                    addPool.push({
+                        userid: item.userid,
+                        username: item.username,
+                        status: item.status
+                    });
+                }
+                t.setState({
+                    pageStatus: '1',
+                    operate: 22,
+                    reduceSignUserList: list,
+                    reduceSignAddPool: addPool,
+                    reduceSignReducePool: [],
+                    reduceShortMessage: t.state.addlotsShortMessage || '0'
+                }, function () {
+                    $(window).scrollTop(0);
+                });
+            }).catch(function (error) {
+                _Toast2.default.show({
+                    type: 'error',
+                    content: error && error.errorMsg ? error.errorMsg : '获取减签用户失败'
+                });
+            });
+        }
+    }, {
+        key: 'moveToReducePool',
+        value: function moveToReducePool(userId) {
+            var addPool = (this.state.reduceSignAddPool || []).slice();
+            var reducePool = (this.state.reduceSignReducePool || []).slice();
+            for (var i = 0; i < addPool.length; i++) {
+                if (addPool[i].userid == userId && addPool[i].status != '1') {
+                    reducePool.push(addPool[i]);
+                    addPool.splice(i, 1);
+                    break;
+                }
+            }
+            this.setState({
+                reduceSignAddPool: addPool,
+                reduceSignReducePool: reducePool
+            });
+        }
+    }, {
+        key: 'moveToAddPool',
+        value: function moveToAddPool(userId) {
+            var addPool = (this.state.reduceSignAddPool || []).slice();
+            var reducePool = (this.state.reduceSignReducePool || []).slice();
+            for (var i = 0; i < reducePool.length; i++) {
+                if (reducePool[i].userid == userId) {
+                    addPool.push(reducePool[i]);
+                    reducePool.splice(i, 1);
+                    break;
+                }
+            }
+            this.setState({
+                reduceSignAddPool: addPool,
+                reduceSignReducePool: reducePool
+            });
+        }
+    }, {
+        key: 'changeReduceShortMessage',
+        value: function changeReduceShortMessage(data) {
+            var newremindStyle = "";
+            for (var i = 0; i < data.length; i++) {
+                if (i == data.length - 1) newremindStyle += data[i].value;else newremindStyle += data[i].value + ',';
+            }
+            this.setState({
+                reduceShortMessage: newremindStyle || '0'
+            });
+        }
+    }, {
+        key: 'reduceSign',
+        value: function reduceSign() {
+            var t = this;
+            var selected = t.state.reduceSignReducePool || [];
+            var userIds = '';
+            var userNames = '';
+            selected.map(function (item) {
+                userIds += item.userid + ',';
+                userNames += item.username + ',';
+            });
+            if (userIds == '') {
+                _Toast2.default.show({
+                    type: 'error',
+                    content: '请选择需要减签的用户'
+                });
+                return false;
+            }
+            userIds = userIds.substring(0, userIds.length - 1);
+            userNames = userNames.substring(0, userNames.length - 1);
+            var processTitle = t.state.processTitle || t.state.fileTitle || '';
+            var reminders = t.state.reduceShortMessage;
+            if (reminders == '0') {
+                reminders = '';
+            }
+            var isPush = t.state.isPush;
+            _db2.default.FlowModuleAPI.reduceSign({
+                taskId: t.state.taskId,
+                userIds: userIds,
+                userNames: userNames,
+                reminders: reminders,
+                processTitle: processTitle,
+                module: t.state.module,
+                processInstanceId: t.state.processInstanceId,
+                formId: t.state.formId,
+                dataId: t.state.dataId,
+                permissionCode: t.state.permissionCode,
+                categoryCode: t.state.category || ''
+            }).then(function (content) {
+                _Toast2.default.show({
+                    type: 'success',
+                    content: (t.state.finalButtons.get('HELP_REDUCELOTS') || '减签') + '成功'
+                });
+                if (isPush == '1') {
+                    closePage();
+                } else {
+                    setTimeout(function () {
+                        history.back();
+                    }, 1500);
+                }
+            }).catch(function (error) {
+                if (typeof error.errorMsg == 'undefined') {
+                    _Toast2.default.show({
+                        type: 'error',
+                        content: '提交出错'
+                    });
+                } else {
+                    _Toast2.default.show({
+                        type: 'error',
+                        content: error.errorMsg.replace('!', '').replace('！', '')
+                    });
+                }
+            });
+        }
     }, {
         key: 'circulateNode',
         value: function circulateNode() {
@@ -7282,6 +7665,11 @@ var PageHome = function (_React$Component) {
                                     buttonCodeListNew.push({ name: buttonName, type: 'secondary', display: 'inline', no: 5 });
                                 } else if (buttonCode == 'HELP_ADDLOTS') {
                                     buttonCodeListNew.push({ name: buttonName, type: 'secondary', display: 'inline', no: 6 });
+                                    var pmMore = String(_this4.state.participantMode);
+                                    if (pmMore == '1' || pmMore == '2') {
+                                        var reduceNameMore = _this4.state.finalButtons.get('HELP_REDUCELOTS') || '减签';
+                                        buttonCodeListNew.push({ name: reduceNameMore, type: 'secondary', display: 'inline', no: 22 });
+                                    }
                                 } else if (buttonCode == 'BASE_END') {
                                     buttonCodeListNew.push({ name: buttonName, type: 'secondary', display: 'inline', no: 8 });
                                 } else if (buttonCode == 'BASE_NOTPASS') {
@@ -7292,6 +7680,8 @@ var PageHome = function (_React$Component) {
                                     buttonCodeListNew.push({ name: buttonName, type: 'secondary', display: 'inline', no: 'distributeFlow' });
                                 } else if (buttonCode == 'MAILSEND') {
                                     buttonCodeListNew.push({ name: buttonName, type: 'secondary', display: 'inline', no: 18 });
+                                } else if (buttonCode == 'OTHER_RELATION') {
+                                    buttonCodeListNew.push({ name: buttonName, type: 'secondary', display: 'inline', no: 'OTHER_RELATION' });
                                 } else {
                                     buttonCodeListNew.push({ name: buttonName, type: 'secondary', display: 'inline', no: buttonCode });
                                 }
@@ -7299,6 +7689,13 @@ var PageHome = function (_React$Component) {
                             } else {
                                 actionSheetButtonOpt.push(buttonCode);
                                 actionSheetButtonOptName.push(buttonName);
+                                if (buttonCode == 'HELP_ADDLOTS') {
+                                    var pmSheet = String(_this4.state.participantMode);
+                                    if (pmSheet == '1' || pmSheet == '2') {
+                                        actionSheetButtonOpt.push('HELP_REDUCELOTS');
+                                        actionSheetButtonOptName.push(_this4.state.finalButtons.get('HELP_REDUCELOTS') || '减签');
+                                    }
+                                }
                             }
                         }
                         var nowNum = mainSlotCount;
@@ -7337,6 +7734,11 @@ var PageHome = function (_React$Component) {
                                 buttonList.push({ name: buttonName, type: 'secondary', display: 'inline', no: 5 });
                             } else if (buttonCode == 'HELP_ADDLOTS') {
                                 buttonList.push({ name: buttonName, type: 'secondary', display: 'inline', no: 6 });
+                                var pmFew = String(_this4.state.participantMode);
+                                if (pmFew == '1' || pmFew == '2') {
+                                    var reduceNameFew = _this4.state.finalButtons.get('HELP_REDUCELOTS') || '减签';
+                                    buttonList.push({ name: reduceNameFew, type: 'secondary', display: 'inline', no: 22 });
+                                }
                             } else if (buttonCode == 'BASE_END') {
                                 buttonList.push({ name: buttonName, type: 'secondary', display: 'inline', no: 8 });
                             } else if (buttonCode == 'BASE_NOTPASS') {
@@ -7349,6 +7751,8 @@ var PageHome = function (_React$Component) {
                                 buttonList.push({ name: buttonName, type: 'secondary', display: 'inline', no: 20 });
                             } else if (buttonCode == 'MAILSEND') {
                                 buttonList.push({ name: buttonName, type: 'secondary', display: 'inline', no: 18 });
+                            } else if (buttonCode == 'OTHER_RELATION') {
+                                buttonList.push({ name: buttonName, type: 'secondary', display: 'inline', no: 'OTHER_RELATION' });
                             } else {
                                 buttonList.push({ name: buttonName, type: 'secondary', display: 'inline', no: buttonCode });
                             }
@@ -7923,11 +8327,19 @@ var PageHome = function (_React$Component) {
         key: 'handleChange',
         value: function handleChange(obj) {
             var t = this;
-            this.setState({ activeItemIndex: obj.active });
+            this.setState({ activeItemIndex: obj.active }, function () {
+                if (String(obj.active) === '3') {
+                    t.loadRelationCount();
+                }
+            });
             if (obj.active == '2') {
                 t.refs.flowChart_list.componentDidMount();
             } else if (obj.active == '3') {
-                t.refs.relationProcess_list.componentDidMount();
+                if (t.refs.relationProcess_list && typeof t.refs.relationProcess_list.reload === 'function') {
+                    t.refs.relationProcess_list.reload();
+                } else if (t.refs.relationProcess_list && typeof t.refs.relationProcess_list.componentDidMount === 'function') {
+                    t.refs.relationProcess_list.componentDidMount();
+                }
             }
         }
 
@@ -9127,14 +9539,26 @@ var PageHome = function (_React$Component) {
                             ),
                             _react2.default.createElement(
                                 _Tab2.default.Item,
-                                { key: '3', title: '\u5173\u8054\u6D41\u7A0B' },
+                                {
+                                    key: '3',
+                                    title: this.getRelationTabTitle()
+                                },
                                 _react2.default.createElement(
                                     _Group2.default.List,
                                     null,
                                     _react2.default.createElement(
                                         'div',
                                         { className: this.state.activeItemIndex == 3 ? '' : 't-DN' },
-                                        _react2.default.createElement(_RelationProcess2.default, { ref: "relationProcess_list", taskId: this.state.taskId, processInstanceId: this.state.processInstanceId, listType: this.state.listType })
+                                        _react2.default.createElement(_RelationProcess2.default, {
+                                            ref: "relationProcess_list",
+                                            taskId: this.state.taskId,
+                                            processInstanceId: this.state.processInstanceId,
+                                            listType: this.state.listType,
+                                            activityId: this.state.activityId,
+                                            canManage: this.state.hasRelationBtn && (this.state.listType == '0' || this.state.isDraft == '1' || this.state.permissionCode == 'start' || this.state.isStart === true),
+                                            onCountChange: this.onRelationCountChange.bind(this),
+                                            onDeleted: this.refreshRelationTab.bind(this)
+                                        })
                                     )
                                 )
                             ),
@@ -9692,6 +10116,73 @@ var PageHome = function (_React$Component) {
                             onChange: this.changeAddlotsShortMessage.bind(this),
                             required: false })
                     ),
+                    _react2.default.createElement(
+                        _Group2.default.List,
+                        { className: this.state.operate == 22 ? '' : 't-DN' },
+                        _react2.default.createElement(
+                            'div',
+                            { style: { background: '#f2f3f5', padding: '10px 5px' } },
+                            _react2.default.createElement(
+                                'span',
+                                { className: 'theme-color' },
+                                _react2.default.createElement('i', { className: 'iconfont icon-back t-rotate-180 t-FS14 t-FR' }),
+                                this.state.finalButtons.get("HELP_REDUCELOTS") || '减签'
+                            )
+                        ),
+                        _react2.default.createElement(
+                            'div',
+                            { className: 't-field-box t-FBH t-FBAC', style: { padding: '10px 16px', flexWrap: 'wrap' } },
+                            _react2.default.createElement(
+                                'div',
+                                { className: 't-field-layout-h-label', style: { width: '100%', marginBottom: '6px' } },
+                                '\u52A0\u7B7E\u7528\u6237'
+                            ),
+                            _react2.default.createElement(
+                                'div',
+                                { style: { display: 'flex', flexWrap: 'wrap', width: '100%' } },
+                                (this.state.reduceSignAddPool || []).map(function (item, idx) {
+                                    return item.status == '1' ? _react2.default.createElement(
+                                        'span',
+                                        { key: 'add-' + item.userid + '-' + idx, style: { margin: '0 8px 8px 0', padding: '4px 10px', background: '#f0f0f0', color: '#999', borderRadius: '4px', fontSize: '13px' } },
+                                        item.username,
+                                        '(\u5DF2\u529E)'
+                                    ) : _react2.default.createElement(
+                                        'span',
+                                        { key: 'add-' + item.userid + '-' + idx, onClick: _this5.moveToReducePool.bind(_this5, item.userid), style: { margin: '0 8px 8px 0', padding: '4px 10px', background: '#e60012', color: '#fff', borderRadius: '4px', fontSize: '13px' } },
+                                        item.username,
+                                        ' \xD7'
+                                    );
+                                })
+                            )
+                        ),
+                        _react2.default.createElement(
+                            'div',
+                            { className: 't-field-box t-FBH t-FBAC', style: { padding: '10px 16px', flexWrap: 'wrap' } },
+                            _react2.default.createElement(
+                                'div',
+                                { className: 't-field-layout-h-label', style: { width: '100%', marginBottom: '6px' } },
+                                '\u51CF\u7B7E\u7528\u6237'
+                            ),
+                            _react2.default.createElement(
+                                'div',
+                                { style: { display: 'flex', flexWrap: 'wrap', width: '100%' } },
+                                (this.state.reduceSignReducePool || []).map(function (item, idx) {
+                                    return _react2.default.createElement(
+                                        'span',
+                                        { key: 'reduce-' + item.userid + '-' + idx, onClick: _this5.moveToAddPool.bind(_this5, item.userid), style: { margin: '0 8px 8px 0', padding: '4px 10px', background: '#e60012', color: '#fff', borderRadius: '4px', fontSize: '13px' } },
+                                        item.username,
+                                        ' \xD7'
+                                    );
+                                })
+                            )
+                        ),
+                        _react2.default.createElement(_CheckboxField2.default, {
+                            data: this.state.shortMessageList,
+                            className: '',
+                            mode: 'list',
+                            onChange: this.changeReduceShortMessage.bind(this),
+                            required: false })
+                    ),
                     _react2.default.createElement(
                         _Group2.default.List,
                         { className: this.state.operate == 4 ? '' : 't-DN' },