fmui-base 2.3.52 → 2.3.54

package/lib/process_info/processInfo.js

@@ -100,6 +100,10 @@ var _RelationProcess = require('./RelationProcess');
 
 var _RelationProcess2 = _interopRequireDefault(_RelationProcess);
 
+var _MessageBoard = require('./MessageBoard');
+
+var _MessageBoard2 = _interopRequireDefault(_MessageBoard);
+
 var _select = require('../selectMember/select');
 
 var _select2 = _interopRequireDefault(_select);
@@ -259,7 +263,20 @@ var PageHome = function (_React$Component) {
         var status = '0';
         var dataId = props.dataId;
         var editType = '';
-        isSub = props.isSub ? props.isSub : '';
+        // 再次发起路由末段为 isSub=2；兼容 props 未透传时从 hash 解析
+        isSub = props.isSub != null && props.isSub !== '' && props.isSub !== 'undefined' && props.isSub !== 'null' ? String(props.isSub) : '';
+        if (isSub === '') {
+            try {
+                var hashParts = (window.location.hash || '').replace(/^#\/?/, '').split('/');
+                // process/processDetails/.../module/userId/search/isSub → isSub 在下标 11
+                if (hashParts.length >= 12 && hashParts[1] === 'processDetails') {
+                    var lastSeg = hashParts[11];
+                    if (lastSeg === '1' || lastSeg === '2') {
+                        isSub = lastSeg;
+                    }
+                }
+            } catch (e) {}
+        }
         // if(isSub!=''){
         //     window.location.reload();
         // }
@@ -514,6 +531,8 @@ var PageHome = function (_React$Component) {
             endSelect: false,
             mobileFlowChar: '0', //是否开启流程图  1开启 0禁用
             mobileSubTblDefault: '1', //移动端子表默认 1展开 0收起；未设置按展开
+            enableMessageBoard: '0', //流程启用留言板
+            enableAttachmentArea: '0', //流程启用附件区
             readScopeId: '',
             readScopeList: [],
             readRangeType: '', //传阅范围 0全部 2本组织及下属组织 4自定义
@@ -996,6 +1015,8 @@ var PageHome = function (_React$Component) {
                     var mobileFlowChar = content.mobileFlowChar;
                     // 移动端子表默认：1展开 0收起；缺省按展开
                     var mobileSubTblDefault = content.mobileSubTblDefault != null && content.mobileSubTblDefault !== '' ? String(content.mobileSubTblDefault) : '1';
+                    var enableMessageBoard = content.enableMessageBoard != null && content.enableMessageBoard !== '' ? String(content.enableMessageBoard) : '0';
+                    var enableAttachmentArea = content.enableAttachmentArea != null && content.enableAttachmentArea !== '' ? String(content.enableAttachmentArea) : '0';
 
                     //项目开发模块统一扩展
                     var mobileModuleExt;
@@ -1149,8 +1170,6 @@ var PageHome = function (_React$Component) {
                         commentAttitude: commentAttitude
                     });
                     if (t.state.listType == '4') {
-                        var details = content['details'];
-                        if (details != null && details['showType'] == '1' && details['operationDetails'] != null) {}
                         t.setState({
                             taskId: content.taskId
                         });
@@ -1171,6 +1190,7 @@ var PageHome = function (_React$Component) {
                                 'jump': '此文件已跳转',
                                 'zf': '此文件已作废',
                                 'end': '此文件已结束',
+                                'notPass': '此文件不通过',
                                 'withdraw': '此文件已撤回',
                                 'back': '此文件已退回',
                                 'view': '此文件已办理'
@@ -1391,6 +1411,12 @@ var PageHome = function (_React$Component) {
                         details.userName = details.dealName;
                         details.time = details.dealTime;
                         details.fullMessage = details.operationDetails;
+                        // 我的流程不通过：与 PC 一致弹「不通过原因」
+                        var processStatus = String(content.processStatus != null ? content.processStatus : content.status != null ? content.status : '');
+                        if (details.dealaction == 'notPass' || processStatus == '6') {
+                            var npName = t.state.finalButtons && t.state.finalButtons.get("BASE_NOTPASS") || '不通过';
+                            titleCommentBackAlert = npName + '原因';
+                        }
                         commentBackAlert.push(content.details);
                     } else if (content.details && content.details != null && content.details.showType == '3') {
                         titleCommentBackAlert = '加签意见';
@@ -1630,6 +1656,8 @@ var PageHome = function (_React$Component) {
                         dealReminderContent: dealReminderContent,
                         mobileFlowChar: mobileFlowChar,
                         mobileSubTblDefault: mobileSubTblDefault,
+                        enableMessageBoard: enableMessageBoard,
+                        enableAttachmentArea: enableAttachmentArea,
                         readScopeId: readScopeId,
                         readScopeList: readScopeList,
                         readRangeType: readRangeType,
@@ -1822,6 +1850,11 @@ var PageHome = function (_React$Component) {
                 // }
                 for (var b = 0; b < buttonArray.length; b++) {
                     var buttonCode = buttonArray[b];
+                    // 再次发起(isSub=2)：无论 start/pending，都不展示作废
+                    var againStart = String(t.state.isSub != null && t.state.isSub !== '' ? t.state.isSub : isSub || '') === '2';
+                    if (againStart && buttonCode == 'BASE_INVALID') {
+                        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') {
                         continue;
@@ -1884,8 +1917,21 @@ var PageHome = function (_React$Component) {
                             //发起人撤销按钮
                             buttonList.push({ name: t.state.finalButtons.get("FLOW_REVOKE"), type: 'secondary', display: 'inline', no: 7 });
                         }
-                        // 发起人配置了作废，且流程在发起人节点时（退回/撤回后）可作废
-                        if (startButtons.indexOf('BASE_INVALID') >= 0 && (isStart == true || isStart == 'true')) {
+                        // 与 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;
+                            if (startActId) {
+                                for (var di = 0; di < content.doingUserList.length; di++) {
+                                    if (content.doingUserList[di].activityId == startActId) {
+                                        backToInitiator = true;
+                                        break;
+                                    }
+                                }
+                            }
+                        }
+                        if (startButtons.indexOf('BASE_INVALID') >= 0 && processStatusNow == '1' && backToInitiator) {
                             buttonList.push({ name: t.state.finalButtons.get("BASE_INVALID"), type: 'danger', display: 'inline', no: 9 });
                         }
                     }
@@ -1912,7 +1958,8 @@ var PageHome = function (_React$Component) {
                         if (buttonCode == 'PAGE_SAVE' || buttonCode == 'BASE_SUMBIT') {
                             buttonArrayNew.push(buttonCode);
                         }
-                        if (buttonCode == 'BASE_INVALID' && dataId) {
+                        // 再次发起(isSub=2)不显示作废
+                        if (buttonCode == 'BASE_INVALID' && dataId && String(t.state.isSub || isSub || '') != '2') {
                             buttonArrayNew.push(buttonCode);
                         }
                     }
@@ -2564,6 +2611,9 @@ var PageHome = function (_React$Component) {
                         case 'BASE_END':
                             t.handleSubmit(8);
                             break;
+                        case 'BASE_NOTPASS':
+                            t.handleSubmit(21);
+                            break;
                         case 'BASE_INVALID':
                             t.handleSubmit(9);
                             break;
@@ -3352,6 +3402,40 @@ var PageHome = function (_React$Component) {
                 });
 
                 // this.handleEnd();
+            } else if (operate == 21) {
+                //不通过
+                _db2.default.FlowModuleAPI.getAllActivity({
+                    processInstanceId: t.state.processInstanceId
+                }).then(function (content) {
+                    var allActivity = content;
+                    if (allActivity != null && allActivity != '' && allActivity.length > 0) {
+                        var selectOptions = [];
+                        allActivity.map(function (item, index) {
+                            var option = {};
+                            option.value = item.id;
+                            option.text = item.name;
+                            option.disable = false;
+                            if (index == 0) {
+                                option.checked = true;
+                            } else {
+                                option.checked = false;
+                            }
+                            option.name = item.name;
+                            selectOptions.push(option);
+                        });
+                        t.setState({
+                            allActivityEnd: selectOptions,
+                            designActivityEnd: selectOptions[0].value,
+                            operate: operate,
+                            endReason: '',
+                            pageStatus: '1'
+                        }, function () {
+                            $(window).scrollTop(0);
+                        });
+                    }
+                }).catch(function (error) {
+                    console.error(error);
+                });
             } else if (operate == 9) {
                 //作废
 
@@ -3376,13 +3460,13 @@ var PageHome = function (_React$Component) {
                             selectOptions.push(option);
                         });
 
-                        var processDataList = [{ value: '1', name: '保留', disable: false, checked: true, text: '保留' }, { value: '2', name: '清除', disable: false, checked: false, text: '清除(已办人的已办记录)' }];
+                        var processDataList = [{ value: '1', name: '保留', disable: false, checked: true, text: '保留' }, { value: '2', name: '删除流程数据', disable: false, checked: false, text: '删除流程数据' }];
                         t.setState({
                             allActivity: selectOptions, //所有环节名称
                             designActivity: selectOptions[0].value, //选择的提醒环节id
                             processDataList: processDataList,
                             processDataListDefault: processDataList[0],
-                            processData: '1', //1 保留流程数据，2清除已办数据
+                            processData: '1', //1 保留流程数据，2删除流程数据
                             operate: operate,
                             pageStatus: '1'
                         }, function () {
@@ -4471,6 +4555,9 @@ var PageHome = function (_React$Component) {
             } else if (operate == 8) {
                 //结束
                 this.handleEnd();
+            } else if (operate == 21) {
+                //不通过
+                this.handleNotPass();
             } else if (operate == 9) {
                 //作废
                 this.handleInvalid();
@@ -5930,6 +6017,70 @@ var PageHome = function (_React$Component) {
             });
         }
 
+        //不通过
+
+    }, {
+        key: 'handleNotPass',
+        value: function handleNotPass() {
+            var t = this;
+            var isPush = t.state.isPush;
+            var db = _db2.default;
+            var btnName = t.state.finalButtons.get("BASE_NOTPASS") || '不通过';
+            if (t.state.endReason == null || t.state.endReason.trim() == '') {
+                _Toast2.default.show({
+                    type: 'error',
+                    content: btnName + '原因不能为空'
+                });
+                return false;
+            }
+            db.FlowModuleAPI.notPass({
+                taskId: t.state.taskId,
+                dataId: t.state.dataId,
+                formId: t.state.formId,
+                processInstanceId: t.state.processInstanceId,
+                module: t.state.module,
+                permissionCode: t.state.permissionCode,
+                designActivity: t.state.designActivityEnd,
+                reminders: t.state.endShortMessage,
+                notPassReason: t.state.endReason,
+                actionName: btnName
+            }).then(function (content) {
+                _Toast2.default.show({
+                    type: 'success',
+                    content: btnName + '成功'
+                });
+                var dataId = t.state.dataId;
+                if (typeof FlowCommon.operateCallBack === "function") {
+                    FlowCommon.operateCallBack({ type: 2, dataId: dataId, isBatch: 0 }, t.state);
+                }
+                var mobileExt;
+                try {
+                    if (t.state.formKey) {
+                        mobileExt = typeof eval(t.state.module + "_" + t.state.formKey + "_mobileExt") !== 'undefined' ? eval(t.state.module + "_" + t.state.formKey + "_mobileExt") : null;
+                    }
+                } catch (e) {}
+                if (typeof mobileExt !== 'undefined' && typeof mobileExt["operateCallBack"] === "function") {
+                    mobileExt["operateCallBack"]({ type: 2, dataId: dataId, isBatch: 0 }, t.state);
+                }
+                if (isPush == '0') {
+                    setTimeout(function () {
+                        history.back();
+                    }, 1500);
+                } else if (isPush == '1') {
+                    closePage();
+                } else {
+                    backPage();
+                }
+            }).catch(function (error) {
+                setTimeout(function () {
+                    _Toast2.default.show({
+                        type: 'error',
+                        content: error.errorMsg || btnName + '失败'
+                    });
+                }, 800);
+            });
+        }
+
         //完成
 
     }, {
@@ -7088,6 +7239,13 @@ var PageHome = function (_React$Component) {
                         buttonCodeList.push({ 'buttonCode': 'subprocess', 'buttonName': '发起子流程' });
                     }
                     buttonCodeList = buttonCodeList.concat();
+                    // 再次发起不展示作废（后端可能仍返回 BASE_INVALID）
+                    var againStartBtn = String(_this4.state.isSub != null && _this4.state.isSub !== '' ? _this4.state.isSub : isSub || '') === '2';
+                    if (againStartBtn) {
+                        buttonCodeList = buttonCodeList.filter(function (item) {
+                            return item && item.buttonCode != 'BASE_INVALID';
+                        });
+                    }
                     var alllength = buttonCodeList.length + extensionButtonList.length;
                     if (alllength > 3) {
                         buttonList.push({ name: '更多', type: 'secondary', display: 'inline', no: -1 });
@@ -7125,6 +7283,8 @@ var PageHome = function (_React$Component) {
                                     buttonCodeListNew.push({ name: buttonName, type: 'secondary', display: 'inline', no: 6 });
                                 } else if (buttonCode == 'BASE_END') {
                                     buttonCodeListNew.push({ name: buttonName, type: 'secondary', display: 'inline', no: 8 });
+                                } else if (buttonCode == 'BASE_NOTPASS') {
+                                    buttonCodeListNew.push({ name: buttonName, type: 'danger', display: 'inline', no: 21 });
                                 } else if (buttonCode == 'BASE_INVALID') {
                                     buttonCodeListNew.push({ name: buttonName, type: 'danger', display: 'inline', no: 9 });
                                 } else if (buttonCode == 'HELP_DISTRIBUTE') {
@@ -7178,6 +7338,8 @@ var PageHome = function (_React$Component) {
                                 buttonList.push({ name: buttonName, type: 'secondary', display: 'inline', no: 6 });
                             } else if (buttonCode == 'BASE_END') {
                                 buttonList.push({ name: buttonName, type: 'secondary', display: 'inline', no: 8 });
+                            } else if (buttonCode == 'BASE_NOTPASS') {
+                                buttonList.push({ name: buttonName, type: 'danger', display: 'inline', no: 21 });
                             } else if (buttonCode == 'BASE_INVALID') {
                                 buttonList.push({ name: buttonName, type: 'danger', display: 'inline', no: 9 });
                             } else if (buttonCode == 'HELP_DISTRIBUTE') {
@@ -8973,7 +9135,20 @@ var PageHome = function (_React$Component) {
                                         _react2.default.createElement(_RelationProcess2.default, { ref: "relationProcess_list", taskId: this.state.taskId, processInstanceId: this.state.processInstanceId, listType: this.state.listType })
                                     )
                                 )
-                            )
+                            ),
+                            this.state.enableMessageBoard === '1' || this.state.enableAttachmentArea === '1' ? _react2.default.createElement(
+                                _Tab2.default.Item,
+                                { key: '4', title: '\u7559\u8A00' },
+                                _react2.default.createElement(
+                                    'div',
+                                    { className: this.state.activeItemIndex == 4 ? '' : 't-DN' },
+                                    _react2.default.createElement(_MessageBoard2.default, {
+                                        processInstanceId: this.state.processInstanceId,
+                                        enableMessageBoard: this.state.enableMessageBoard,
+                                        enableAttachmentArea: this.state.enableAttachmentArea
+                                    })
+                                )
+                            ) : ''
                         )
                     )
                 ),
@@ -9735,6 +9910,42 @@ var PageHome = function (_React$Component) {
                             onChange: this.changEndShortMessage.bind(this),
                             required: false })
                     ),
+                    _react2.default.createElement(
+                        _Group2.default.List,
+                        { className: this.state.operate == 21 ? '' : '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("BASE_NOTPASS") || '不通过'
+                            )
+                        ),
+                        _react2.default.createElement(_TextareaField2.default, {
+                            readOnly: false,
+                            label: (this.state.finalButtons.get("BASE_NOTPASS") || '不通过') + '原因',
+                            required: true,
+                            minRows: 3, maxRows: 6,
+                            placeholder: '请输入' + (this.state.finalButtons.get("BASE_NOTPASS") || '不通过') + '原因',
+                            value: this.state.endReason,
+                            onChange: this.changeEndReasonText.bind(this) }),
+                        _react2.default.createElement(_CheckboxField2.default, {
+                            className: 't-W100',
+                            required: false,
+                            label: "提醒对象",
+                            readOnly: false,
+                            data: this.state.allActivityEnd,
+                            onChange: this.selectEndActivityChange.bind(this)
+                        }),
+                        _react2.default.createElement(_CheckboxField2.default, {
+                            data: this.state.shortMessageList,
+                            className: '',
+                            mode: 'list',
+                            onChange: this.changEndShortMessage.bind(this),
+                            required: false })
+                    ),
                     _react2.default.createElement(
                         _Group2.default.List,
                         { className: this.state.operate == 9 ? '' : 't-DN' },