fmui-base 2.1.44 → 2.1.46

package/lib/db/db.js

@@ -311,6 +311,34 @@ context.create('FlowModuleAPI', {
       });
     }
   },
+  insertBatchRelation: {
+    url: _variables2.default.URLS.insertBatchRelation,
+    method: 'POST',
+    header: {
+      Authorization: 'Bearer ' + getLoginUserInfo().token
+    },
+    /*    header:{'content-Type':'application/x-www-form-urlencoded'},*/
+    willFetch: function willFetch() {
+      _Toast2.default.show({
+        content: _react2.default.createElement(_loading2.default, null),
+        duration: 800
+      });
+    }
+  },
+  startFlowTest: {
+    url: _variables2.default.URLS.startFlowTest,
+    method: 'POST',
+    header: {
+      Authorization: 'Bearer ' + getLoginUserInfo().token
+    },
+    /*    header:{'content-Type':'application/x-www-form-urlencoded'},*/
+    willFetch: function willFetch() {
+      _Toast2.default.show({
+        content: _react2.default.createElement(_loading2.default, null),
+        duration: 800
+      });
+    }
+  },
   startProcess: {
     url: _variables2.default.URLS.startProcess,
     method: 'GET',
@@ -934,6 +962,21 @@ context.create('FlowModuleAPI', {
         duration: 800
       });
     }
+  },
+
+  getProcessListByCodes: {
+    mockUrl: 'query/queryCanBack.json',
+    url: _variables2.default.URLS.getProcessListByCodes,
+    method: 'GET',
+    header: {
+      Authorization: 'Bearer ' + getLoginUserInfo().token
+    },
+    /*    header:{'content-Type':'application/x-www-form-urlencoded'},*/
+    willFetch: function willFetch() {
+      // Toast.show({
+      //   content: <Loading />
+      // });
+    }
   }
 
 });

package/lib/db/variables.js

@@ -61,7 +61,8 @@ exports.default = {
 
         getComponentInfoList: urlBasicPrefix + 'mobilehall/mobileoffice/getComponentInfoList' + '?', //获取关联表单字段
 
-
+        insertBatchRelation: approveUrlPrefix + 'insertBatchRelation' + '?', // 关联流程
+        startFlowTest: approveUrlPrefix + 'startFlowTest' + '?', // 检验间隔时间
         startProcess: approveUrlPrefix + 'startProcess' + '?', // 启动流程的接口
         claimTask: approveUrlPrefix + 'claimTask' + '?', //校验流程
         saveForm: approveUrlPrefix + 'saveForm' + '?', //保存到草稿箱
@@ -122,7 +123,8 @@ exports.default = {
         getCategoryListByModule: approveUrlPrefix + "getCategoryListByModule" + '?', //获取所有节点
         cancelLimit: approveUrlPrefix + "cancelLimit" + '?', //取消超时
         getCanCancelLimit: approveUrlPrefix + "getCanCancelLimit" + '?', //是否可以取消超时
-        getUserInfo: approveUrlPrefix + "getUserInfo" + '?' //获取用户信息
+        getUserInfo: approveUrlPrefix + "getUserInfo" + '?', //获取用户信息
+        getProcessListByCodes: approveUrlPrefix + "getProcessListByCodes" + '?' //获取可发起的子流程
     },
     nodataIcon: context + "/mobile/fmui/images/noData.png",
     loadingIcon: context + "/mobile/fmui/images/loading.gif",

package/lib/process_info/processInfo.js

@@ -141,6 +141,7 @@ var commentAttachId = '';
 var remindStyle = '';
 var FlowCommon = void 0;
 var _thirdMenuType = void 0;
+var isSub = '';
 var regxp = {
     "*": /[\w\W]+/,
     "*6-16": /^[\w\W]{6,16}$/,
@@ -199,6 +200,7 @@ var PageHome = function (_React$Component) {
         var status = '0';
         var dataId = props.dataId;
         var editType = '';
+        isSub = props.isSub ? props.isSub : '';
         if (dataId && dataId != '-1') {
             //非新增
             setPageTitle("流程详情");
@@ -230,6 +232,12 @@ var PageHome = function (_React$Component) {
             permissionCode = 'start';
             setPageTitle("新建");
         }
+        //子流程打开
+        if (isSub != '') {
+            editType = 'readd';
+            permissionCode = 'start';
+            setPageTitle("新建");
+        }
         var isPush = props.isPush;
 
         var query = props.query == null ? {} : JSON.parse(props.query);
@@ -323,7 +331,7 @@ var PageHome = function (_React$Component) {
             // category:category,
             processInstanceId: props.processInstanceId,
             taskId: props.taskId,
-            userId: userId,
+            userId: loginUserId,
             formItem: [],
             formStyleObj: {}, //表单字体样式
             formTblName: '',
@@ -441,7 +449,13 @@ var PageHome = function (_React$Component) {
             designActivity: '', //选择的提醒环节id
             processData: '1', //1 保留流程数据，2清除已办数据
             processDataList: [],
-            commentUpload: '' //1 批示意见允许上传
+            commentUpload: '', //1 批示意见允许上传
+            subProcessCode: '', //子流程code
+            allSubprocessList: [], //可选择的子流程
+            dataInherit: '', //是否同步主表数据 1为同步
+            selectProcessCode: '', //选中的子流程
+            subProcessType: '' //子流程类型 0串行  1并行
+
         };
         FlowCommon = require('pages/flow_common/' + module).default ? require('pages/flow_common/' + module).default : require('pages/flow_common/' + module);
 
@@ -777,6 +791,9 @@ var PageHome = function (_React$Component) {
                     var readScopeId = '';
                     var readScopeList = [];
                     var isRemoveCommentFormHtml = '0';
+                    var subProcessCode = '';
+                    var dataInherit = '';
+                    var subProcessType = '';
                     if (content.readScopeId && typeof content.readScopeId != "undefined") {
                         readScopeId = content.readScopeId;
                     }
@@ -790,6 +807,15 @@ var PageHome = function (_React$Component) {
                     if (content.commentUpload && typeof content.commentUpload != "undefined") {
                         commentUpload = content.commentUpload;
                     }
+                    if (content.subProcessCode && typeof content.subProcessCode != "undefined") {
+                        subProcessCode = content.subProcessCode;
+                    }
+                    if (content.dataInherit && typeof content.dataInherit != "undefined") {
+                        dataInherit = content.dataInherit;
+                    }
+                    if (content.subProcessType && typeof content.subProcessType != "undefined") {
+                        subProcessType = content.subProcessType;
+                    }
                     var formKey = form.formcode;
                     var formStyleObj = form.formStyle;
 
@@ -1353,7 +1379,10 @@ var PageHome = function (_React$Component) {
                         readScopeId: readScopeId,
                         readScopeList: readScopeList,
                         isRemoveCommentFormHtml: isRemoveCommentFormHtml,
-                        commentUpload: commentUpload
+                        commentUpload: commentUpload,
+                        subProcessCode: subProcessCode,
+                        dataInherit: dataInherit,
+                        subProcessType: subProcessType
                     }, function () {
                         t.refs["selectMember_circulate"].initSelectData();
                         t.refs["selectMember_circulate1"].initSelectData();
@@ -1616,6 +1645,17 @@ var PageHome = function (_React$Component) {
         key: 'change',
         value: function change(data, itemParam) {
             console.log("数据回调" + itemParam.key);
+            //子流程去除id字段
+            if (isSub != '' && data) {
+                var mainTblData = data.mainTblData;
+                if (mainTblData && mainTblData.length > 0) {
+                    for (var i = 0; i < mainTblData.length; i++) {
+                        if (mainTblData[i].key == 'id') {
+                            mainTblData.splice(i, 1);
+                        }
+                    }
+                }
+            }
             this.setState({
                 editFormData: data
             });
@@ -2078,6 +2118,7 @@ var PageHome = function (_React$Component) {
     }, {
         key: 'handleSubmitFunc',
         value: function handleSubmitFunc(operate) {
+            console.log("handleSubmitFunc   operate==" + operate);
             var t = this;
             var auditorUserIds = null;
             // this.state.personValue.map((item, index) => {
@@ -2926,6 +2967,58 @@ var PageHome = function (_React$Component) {
                 }).catch(function (error) {
                     console.error(error);
                 });
+            } else if (operate == 'subprocess') {
+                //发起子流程
+                var subProcessCode = t.state.subProcessCode;
+                var canBackType = '';
+
+                if (subProcessCode != '') {
+                    //没有点击过驳回
+                    _db2.default.FlowModuleAPI.getProcessListByCodes({
+                        processCodes: subProcessCode
+                    }).then(function (content) {
+                        var subProcessList = content;
+                        if (subProcessList != null && subProcessList != '' && subProcessList.length > 0) {
+                            var selectOptions = [];
+                            subProcessList.map(function (item, index) {
+                                var option = {};
+                                option.value = item.code;
+                                option.content = item.processName;
+                                option.disable = false;
+                                option.checked = false;
+                                option.name = item.processName;
+                                if (index == 0) {
+                                    option.checked = true;
+                                }
+                                selectOptions.push(option);
+                            });
+                            t.setState({
+                                allSubprocessList: selectOptions,
+                                selectProcessCode: selectOptions[0].value,
+                                operate: operate,
+                                pageStatus: '1'
+                            }, function () {
+                                $(window).scrollTop(0);
+                            });
+                        } else {
+                            _Toast2.default.show({
+                                type: 'error',
+                                content: '当前节点无可发起的子流程'
+                            });
+                            return false;
+                        }
+                    }).catch(function (error) {
+                        console.error(error);
+                    });
+                } else {
+                    t.setState({
+                        operate: operate,
+                        pageStatus: '1',
+                        backReasonText: ''
+                    }, function () {
+                        $(window).scrollTop(0);
+                    });
+                }
             } else {
                 //其他按钮
                 if (typeof FlowCommon[operate] === "function") {
@@ -3772,9 +3865,150 @@ var PageHome = function (_React$Component) {
                 this.cancelLimitFlow(param);
             } else if (operate == 18) {
                 this.sendMail();
+            } else if (operate == 'subprocess') {
+                this.startSubProcess();
             }
         }
+        //子流程自动关联
+
+    }, {
+        key: 'insertBatchRelation',
+        value: function insertBatchRelation(processInstanceId, relationIds, activityId, dataInherit) {
+            _db2.default.FlowModuleAPI.insertBatchRelation({
+                processInstanceId: processInstanceId,
+                relationIds: relationIds,
+                activityId: activityId,
+                dataInherit: dataInherit
+            }).then(function (content) {
+                console.log("content==" + content);
+            }).catch(function (error) {
+                console.error(error);
+            });
+        }
+
+        //发起子流程
+
+    }, {
+        key: 'startSubProcess',
+        value: function startSubProcess() {
+            console.log("startSubProcess====");
+            var t = this;
+            var selectProcessCode = t.state.selectProcessCode;
+            var dataInherit = t.state.dataInherit;
+            var parentProcessInstanceId = t.state.processInstanceId;
+            var parentTaskId = t.state.taskId;
+            var parentDataId = t.state.dataId;
+            var userId = t.state.userId;
+            var isPush = t.state.isPush;
+            var activityId = t.state.activityId;
+            var param = {
+                code: selectProcessCode
+            };
 
+            _db2.default.FlowModuleAPI.startFlowTest(param).then(function (content) {
+                var canStart = content.canStart;
+                var reminder = content.reminder;
+                if (canStart == "1") {
+                    param.parentProcessInstanceId = parentProcessInstanceId;
+                    param.parentTaskId = parentTaskId;
+                    _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) {
+                                t.insertBatchRelation(parentProcessInstanceId, processInstanceId, activityId, dataInherit);
+                                for (var j = 0; j < list.length; j++) {
+                                    if (openTaskId == list[j].id) {
+                                        var jumppath = '#/process/processDetails/' + openTaskId + '/' + list[j].formKey + '/-1/0/0/' + list[j].processInstanceId + '/approve/' + userId + '/undefined/' + parentProcessInstanceId;
+                                        if (dataInherit && dataInherit == '1') {
+                                            jumppath = '#/process/processDetails/' + openTaskId + '/' + list[j].formKey + '/' + parentDataId + '/0/0/' + list[j].processInstanceId + '/approve/' + userId + '/undefined/' + parentProcessInstanceId;
+                                        }
+                                        if (isPush == '1') {
+                                            closePage();
+                                        } else {
+                                            backPage();
+                                        }
+                                        setTimeout(function () {
+                                            location.hash = jumppath;
+                                        }, 100);
+                                    }
+                                }
+                            }
+                        } 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) {
+                        console.log(error.message);
+                    });
+                } else {
+                    _Dialog2.default.confirm({
+                        locale: 'zh_CN',
+                        title: '提示',
+                        content: reminder,
+                        onConfirm: function onConfirm() {
+                            param.parentProcessInstanceId = parentProcessInstanceId;
+                            param.parentTaskId = parentTaskId;
+                            _db2.default.FlowModuleAPI.startProcess(param).then(function (content) {
+                                var openTaskId = content.openTaskId;
+                                var processInstanceId = content.processInstanceId;
+                                var list = content.list;
+                                t.insertBatchRelation(parentProcessInstanceId, processInstanceId, activityId, dataInherit);
+                                if (openTaskId != null && openTaskId != '') {
+                                    if (list != null && list != '' && list.length > 0) {
+                                        for (var j = 0; j < list.length; j++) {
+                                            if (openTaskId == list[j].id) {
+                                                var jumppath = '#/process/processDetails/' + openTaskId + '/' + list[j].formKey + '/-1/0/0/' + list[j].processInstanceId + '/approve/' + userId + '/undefined/' + parentProcessInstanceId;
+                                                if (dataInherit && dataInherit == '1') {
+                                                    jumppath = '#/process/processDetails/' + openTaskId + '/' + list[j].formKey + '/' + parentDataId + '/0/0/' + list[j].processInstanceId + '/approve/' + userId + '/undefined/' + parentProcessInstanceId;
+                                                }
+                                                if (isPush == '1') {
+                                                    closePage();
+                                                } else {
+                                                    backPage();
+                                                }
+                                                setTimeout(function () {
+                                                    location.hash = jumppath;
+                                                }, 100);
+                                            }
+                                        }
+                                    }
+                                } 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) {
+                                console.log(error.message);
+                            });
+                        },
+                        onCancel: function onCancel() {
+                            console.log('confirm cancel');
+                        }
+                    });
+                }
+            }).catch(function (error) {});
+        }
         //驳回流程
 
     }, {
@@ -4469,6 +4703,9 @@ var PageHome = function (_React$Component) {
                     dataId = content.dataId;
                     t.setState({ dataId: dataId });
                 }
+                if (isSub != '') {
+                    t.insertBatchRelation(t.state.processInstanceId, isSub, t.state.activityId, '');
+                }
                 if (typeof FlowCommon.operateCallBack === "function") {
                     // var type = 6;
                     // if(t.state.isStart &&  t.state.dataId==''){//是不是起始节点
@@ -5875,6 +6112,9 @@ var PageHome = function (_React$Component) {
                     var sysWatermark = _this2.state.sysWatermark;
                     /* buttonCodeList.push({'buttonCode':'BASE_SUMBIT','buttonName':'通过'});
                      buttonCodeList.push({'buttonCode':'PAGE_SAVE','buttonName':'保存'});*/
+                    if (_this2.state.subProcessCode && _this2.state.subProcessCode != '') {
+                        buttonCodeList.push({ 'buttonCode': 'subprocess', 'buttonName': '发起子流程' });
+                    }
                     buttonCodeList = buttonCodeList.concat();
                     var alllength = buttonCodeList.length + extensionButtonList.length;
                     if (alllength > 4) {
@@ -6250,6 +6490,17 @@ var PageHome = function (_React$Component) {
             });
         }
 
+        //选择子流程
+
+    }, {
+        key: 'selectSubProcess',
+        value: function selectSubProcess(value, index, data) {
+            debugger;
+            this.setState({
+                selectProcessCode: value
+            });
+        }
+
         //选择跳转节点
 
     }, {
@@ -6901,6 +7152,12 @@ var PageHome = function (_React$Component) {
                     permissionCode = 'other';
                 }
             }
+            //子流程打开
+            if (isSub != '') {
+                editType = 'readd';
+                permissionCode = 'start';
+                setPageTitle("新建");
+            }
             var isPush = nextProps.isPush;
             var isDraft = nextProps.query.isDraft; //是不是草稿箱,1是，0：不是
             if (isDraft) {
@@ -7824,6 +8081,26 @@ var PageHome = function (_React$Component) {
                             value: this.state.cancelLimitReasonText,
                             onChange: this.changeCancelLimitReasonText.bind(this) })
                     ),
+                    _react2.default.createElement(
+                        _Group2.default.List,
+                        { className: this.state.operate == 'subprocess' && this.state.allSubprocessList.length > 0 ? '' : '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' }),
+                                '\u53D1\u8D77\u5B50\u6D41\u7A0B'
+                            )
+                        ),
+                        _react2.default.createElement(_RadioField2.default, {
+                            data: this.state.allSubprocessList,
+                            mode: 'list',
+                            onChange: this.selectSubProcess.bind(this),
+                            required: true
+                        })
+                    ),
                     _react2.default.createElement(
                         'div',
                         { className: 't-P0 t-bottom-fixed' },