fmui-base 2.3.23 → 2.3.25

package/lib/form_info/formInfo.js

@@ -70,6 +70,8 @@ var _variables = require('../db/variables');
 
 var _variables2 = _interopRequireDefault(_variables);
 
+var _approveUserResolve = require('../db/approveUserResolve');
+
 var _table = require('../form/table');
 
 var _table2 = _interopRequireDefault(_table);
@@ -90,6 +92,8 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
+function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, arguments); return new Promise(function (resolve, reject) { function step(key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { return Promise.resolve(value).then(function (value) { step("next", value); }, function (err) { step("throw", err); }); } } return step("next"); }); }; }
+
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 
 function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; }
@@ -1571,8 +1575,8 @@ var PageHome = function (_React$Component) {
                                 if (item.type == 3) {
                                     //指定人选择
                                     selectUserReadOnly = true;
-                                    popCode = 'org,group'; //选人组件code
-                                    chooseType = "userNotOrg,userNotGroup";
+                                    popCode = 'org,group,duty'; //选人组件code
+                                    chooseType = "userNotOrg,userAndGroup,userAndDuty";
                                     var participantList = item.participantList;
                                     participants = '';
                                     if (participantList != null && participantList != "" && participantList.length > 0) {
@@ -1604,10 +1608,10 @@ var PageHome = function (_React$Component) {
                                 if (item.type == 1) {
                                     //选择所有人
                                     selectUserReadOnly = false;
-                                    chooseType = "userNotOrg,userNotGroup";
+                                    chooseType = "userNotOrg,userAndGroup,userAndDuty";
                                     if (item.nodeType == 'readtask') {
                                         //如果是传阅节点
-                                        chooseType = "userNotOrg,userNotGroup";
+                                        chooseType = "userNotOrg,userAndGroup,userAndDuty";
                                     }
                                     var commonUsedId = ''; //常用选择范围
                                     var participantList = item.participantList;
@@ -1645,7 +1649,7 @@ var PageHome = function (_React$Component) {
                                     //指定候选人
                                     selectUserReadOnly = false;
                                     popCode = 'common'; //选人组件code
-                                    chooseType = "userNotOrg,userNotGroup";
+                                    chooseType = "userNotOrg,userAndGroup,userAndDuty";
                                     var commonUsedId = ''; //常用选择范围
                                     var participantList = item.participantList;
                                     if (participantList != null && participantList != "" && participantList.length > 0) {
@@ -2096,7 +2100,7 @@ var PageHome = function (_React$Component) {
                                 //指定人选择
                                 selectUserReadOnly = true;
                                 popCode = 'org,group'; //选人组件code
-                                chooseType = "userNotOrg,userNotGroup";
+                                chooseType = "userNotOrg,userAndGroup,userAndDuty";
                                 if (succeedRange == "" || item.level != parseInt(nowLevel) + 1) {
                                     //当后继为空时取下个活动的
                                     participantList = item.participantList;
@@ -2120,7 +2124,7 @@ var PageHome = function (_React$Component) {
                             } else if (item.type == 1) {
                                 //选择所有人
                                 selectUserReadOnly = false;
-                                chooseType = "userNotOrg,userNotGroup";
+                                chooseType = "userNotOrg,userAndGroup,userAndDuty";
                                 var commonUsedId = ''; //常用选择的用户id
                                 if (succeedRange == "" || item.level != parseInt(nowLevel) + 1) {
                                     //当后继为空时取下个活动的
@@ -2388,6 +2392,8 @@ var PageHome = function (_React$Component) {
     }, {
         key: 'handleSubmitClick',
         value: function handleSubmitClick() {
+            var _this2 = this;
+
             var t = this;
             var operate = this.state.operate;
 
@@ -2439,173 +2445,312 @@ var PageHome = function (_React$Component) {
 
             if (operate == 1) {
                 //审批提交
-                var editFormData = this.state.editFormData;
+                _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2() {
+                    var editFormData, nextRadomListSelect, nextActivityListSelect, selectedActivity, nextActivityList, i, auditorUserIds, auditorUserNames, checked, personValue, isEnd, participantMode, orgUserList, orgUserids, orgUsernames, j, groupUserList, gj, gid, gname, dutyUserList, dj, did, dname, level, urgentListSelect, urgent, _i, sshortMessage, sendShortMessage, cshortMessage, circulateShortMessage, param, dealActionName;
+
+                    return regeneratorRuntime.wrap(function _callee2$(_context2) {
+                        while (1) {
+                            switch (_context2.prev = _context2.next) {
+                                case 0:
+                                    editFormData = _this2.state.editFormData;
+                                    nextRadomListSelect = _this2.state.nextRadomList;
+                                    nextActivityListSelect = _this2.state.nextActivityList;
+                                    selectedActivity = '';
+
+                                    if (!(nextRadomListSelect.length > 0 || nextActivityListSelect.length > 0)) {
+                                        _context2.next = 48;
+                                        break;
+                                    }
+
+                                    //下一个节点不为空时
+                                    nextActivityList = [];
+
+                                    selectedActivity = '';
+                                    nextRadomListSelect.map(function (item) {
+                                        nextActivityList = nextActivityList.concat(item.subRandomList);
+                                    });
+                                    nextActivityList = nextActivityList.concat(nextActivityListSelect);
+                                    i = 0;
+
+                                case 10:
+                                    if (!(i < nextActivityList.length)) {
+                                        _context2.next = 41;
+                                        break;
+                                    }
+
+                                    auditorUserIds = '';
+                                    auditorUserNames = '';
+                                    checked = nextActivityList[i].checked;
+
+                                    if (!checked) {
+                                        _context2.next = 38;
+                                        break;
+                                    }
+
+                                    personValue = nextActivityList[i].personValue;
+                                    isEnd = nextActivityList[i].end;
+
+                                    if (!(personValue.length <= 0 && !isEnd)) {
+                                        _context2.next = 20;
+                                        break;
+                                    }
 
-                var nextRadomListSelect = this.state.nextRadomList;
-                var nextActivityListSelect = this.state.nextActivityList;
-                var selectedActivity = '';
-                if (nextRadomListSelect.length > 0 || nextActivityListSelect.length > 0) {
-                    //下一个节点不为空时
-                    var nextActivityList = [];
-                    selectedActivity = '';
-                    nextRadomListSelect.map(function (item) {
-                        nextActivityList = nextActivityList.concat(item.subRandomList);
-                    });
-                    nextActivityList = nextActivityList.concat(nextActivityListSelect);
-                    for (var i = 0; i < nextActivityList.length; i++) {
-                        var auditorUserIds = '';
-                        var auditorUserNames = '';
-                        var checked = nextActivityList[i].checked;
-                        if (checked) {
-                            var personValue = nextActivityList[i].personValue;
-                            var isEnd = nextActivityList[i].end;
-
-                            if (personValue.length <= 0 && !isEnd) {
-                                _Toast2.default.show({
-                                    type: 'error',
-                                    content: '请选择审批人'
-                                });
-                                return false;
-                            }
-                            var participantMode = nextActivityList[i].participantMode;
-                            if (participantMode == 0) {
-                                if (personValue.length > 1) {
                                     _Toast2.default.show({
                                         type: 'error',
-                                        content: nextActivityList[i].name + '节点的参与人只能是单人，请重新设置流程！'
+                                        content: '请选择审批人'
                                     });
-                                    return false;
-                                }
-                            } else {
-                                participantMode = participantMode + "";
-                                if (participantMode.indexOf('1') > -1) {
-                                    participantMode = '1';
-                                }
-                                if (participantMode.indexOf('3') > -1) {
-                                    participantMode = '3';
-                                }
-                                if (participantMode.indexOf('2') > -1) {
-                                    participantMode = '2';
-                                }
-                            }
-                            if (!isEnd) {
-                                var orgUserList;
-                                var orgUserids;
-                                var orgUsernames;
-                                var j;
-                                var level;
-
-                                (function () {
-                                    var selectUserIds = '';
-                                    var selectOrgIds = '';
-                                    personValue.map(function (item, index) {
-                                        if (selectUserIds.indexOf(item.scopeValue) == -1) {
-                                            if (item.scopeType == 'user') {
-                                                //用户
-                                                selectUserIds += item.scopeValue + ",";
-                                                auditorUserIds += item.scopeValue + ',';
-                                                auditorUserNames += item.scopeName + ',';
-                                            } else if (item.scopeType == 'org') {
-                                                //组织
-                                                selectOrgIds += item.scopeValue + ",";
-                                            }
-                                        }
+                                    return _context2.abrupt('return', false);
+
+                                case 20:
+                                    participantMode = nextActivityList[i].participantMode;
+
+                                    if (!(participantMode == 0)) {
+                                        _context2.next = 27;
+                                        break;
+                                    }
+
+                                    if (!(personValue.length > 1)) {
+                                        _context2.next = 25;
+                                        break;
+                                    }
+
+                                    _Toast2.default.show({
+                                        type: 'error',
+                                        content: nextActivityList[i].name + '节点的参与人只能是单人，请重新设置流程！'
                                     });
-                                    if (selectOrgIds != '') {
-                                        selectOrgIds = selectOrgIds.substring(0, selectOrgIds.length - 1);
-                                        orgUserList = getUsersByOrgIDs(selectOrgIds);
-                                        orgUserids = '';
-                                        orgUsernames = '';
-
-                                        for (j = 0; j < orgUserList.length; j++) {
-                                            if (auditorUserIds.indexOf(orgUserList[j].id) < 0) {
-                                                orgUserids += orgUserList[j].id + ",";
-                                                orgUsernames += orgUserList[j].userName + ",";
-                                            }
-                                        }
-                                        auditorUserIds += orgUserids;
-                                        auditorUserNames += orgUsernames;
+                                    return _context2.abrupt('return', false);
+
+                                case 25:
+                                    _context2.next = 31;
+                                    break;
+
+                                case 27:
+                                    participantMode = participantMode + "";
+                                    if (participantMode.indexOf('1') > -1) {
+                                        participantMode = '1';
+                                    }
+                                    if (participantMode.indexOf('3') > -1) {
+                                        participantMode = '3';
+                                    }
+                                    if (participantMode.indexOf('2') > -1) {
+                                        participantMode = '2';
                                     }
-                                    if (auditorUserIds != '') {
-                                        auditorUserIds = auditorUserIds.substring(0, auditorUserIds.length - 1);
-                                        auditorUserNames = auditorUserNames.substring(0, auditorUserNames.length - 1);
+
+                                case 31:
+                                    if (isEnd) {
+                                        _context2.next = 35;
+                                        break;
                                     }
+
+                                    return _context2.delegateYield( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
+                                        var selectUserIds, selectOrgIds, selectGroupIds, selectDutyIds;
+                                        return regeneratorRuntime.wrap(function _callee$(_context) {
+                                            while (1) {
+                                                switch (_context.prev = _context.next) {
+                                                    case 0:
+                                                        selectUserIds = '';
+                                                        selectOrgIds = '';
+                                                        selectGroupIds = '';
+                                                        selectDutyIds = '';
+
+                                                        personValue.map(function (item, index) {
+                                                            if (selectUserIds.indexOf(item.scopeValue) == -1) {
+                                                                if (item.scopeType == 'user') {
+                                                                    //用户
+                                                                    selectUserIds += item.scopeValue + ",";
+                                                                    auditorUserIds += item.scopeValue + ',';
+                                                                    auditorUserNames += item.scopeName + ',';
+                                                                } else if (item.scopeType == 'org') {
+                                                                    //组织
+                                                                    selectOrgIds += item.scopeValue + ",";
+                                                                } else if (item.scopeType == 'group') {
+                                                                    //群组
+                                                                    selectGroupIds += item.scopeValue + ",";
+                                                                } else if (item.scopeType == 'duty') {
+                                                                    //职务
+                                                                    selectDutyIds += item.scopeValue + ",";
+                                                                }
+                                                            }
+                                                        });
+                                                        if (selectOrgIds != '') {
+                                                            selectOrgIds = selectOrgIds.substring(0, selectOrgIds.length - 1);
+                                                            orgUserList = getUsersByOrgIDs(selectOrgIds);
+                                                            orgUserids = '';
+                                                            orgUsernames = '';
+
+                                                            for (j = 0; j < orgUserList.length; j++) {
+                                                                if (auditorUserIds.indexOf(orgUserList[j].id) < 0) {
+                                                                    orgUserids += orgUserList[j].id + ",";
+                                                                    orgUsernames += orgUserList[j].userName + ",";
+                                                                }
+                                                            }
+                                                            auditorUserIds += orgUserids;
+                                                            auditorUserNames += orgUsernames;
+                                                        }
+
+                                                        if (!(selectGroupIds != '')) {
+                                                            _context.next = 12;
+                                                            break;
+                                                        }
+
+                                                        selectGroupIds = selectGroupIds.substring(0, selectGroupIds.length - 1);
+                                                        _context.next = 10;
+                                                        return (0, _approveUserResolve.getUsersByGrpIdSync)(selectGroupIds);
+
+                                                    case 10:
+                                                        groupUserList = _context.sent;
+
+                                                        for (gj = 0; gj < groupUserList.length; gj++) {
+                                                            gid = groupUserList[gj].id || groupUserList[gj].userId;
+                                                            gname = groupUserList[gj].userName || '';
+
+                                                            if (gid && auditorUserIds.indexOf(gid) < 0) {
+                                                                auditorUserIds += gid + ",";
+                                                                auditorUserNames += gname + ",";
+                                                            }
+                                                        }
+
+                                                    case 12:
+                                                        if (!(selectDutyIds != '')) {
+                                                            _context.next = 18;
+                                                            break;
+                                                        }
+
+                                                        selectDutyIds = selectDutyIds.substring(0, selectDutyIds.length - 1);
+                                                        _context.next = 16;
+                                                        return (0, _approveUserResolve.getUsersByDutyIdSync)(selectDutyIds);
+
+                                                    case 16:
+                                                        dutyUserList = _context.sent;
+
+                                                        for (dj = 0; dj < dutyUserList.length; dj++) {
+                                                            did = dutyUserList[dj].id || dutyUserList[dj].userId;
+                                                            dname = dutyUserList[dj].userName || '';
+
+                                                            if (did && auditorUserIds.indexOf(did) < 0) {
+                                                                auditorUserIds += did + ",";
+                                                                auditorUserNames += dname + ",";
+                                                            }
+                                                        }
+
+                                                    case 18:
+                                                        if (auditorUserIds != '') {
+                                                            auditorUserIds = auditorUserIds.substring(0, auditorUserIds.length - 1);
+                                                            auditorUserNames = auditorUserNames.substring(0, auditorUserNames.length - 1);
+                                                        }
+                                                        level = nextActivityList[i].level;
+
+                                                        if (level == null) {
+                                                            level = "";
+                                                        }
+
+                                                        selectedActivity += '{"id":"' + nextActivityList[i].value + '","name":"' + nextActivityList[i].name + '","participants":"' + auditorUserIds + '","participantNames":"' + auditorUserNames + '","level":"' + level + '","participantType":"' + participantMode + '"},';
+
+                                                    case 22:
+                                                    case 'end':
+                                                        return _context.stop();
+                                                }
+                                            }
+                                        }, _callee, _this2);
+                                    })(), 't0', 33);
+
+                                case 33:
+                                    _context2.next = 38;
+                                    break;
+
+                                case 35:
                                     level = nextActivityList[i].level;
 
                                     if (level == null) {
                                         level = "";
                                     }
+                                    selectedActivity += '{"id":"' + nextActivityList[i].value + '","name":"' + nextActivityList[i].name + '","level":"' + level + '","participantType":"' + participantMode + '"},';
 
-                                    selectedActivity += '{"id":"' + nextActivityList[i].value + '","name":"' + nextActivityList[i].name + '","participants":"' + auditorUserIds + '","participantNames":"' + auditorUserNames + '","level":"' + level + '","participantType":"' + participantMode + '"},';
-                                })();
-                            } else {
-                                var level = nextActivityList[i].level;
-                                if (level == null) {
-                                    level = "";
-                                }
-                                selectedActivity += '{"id":"' + nextActivityList[i].value + '","name":"' + nextActivityList[i].name + '","level":"' + level + '","participantType":"' + participantMode + '"},';
+                                case 38:
+                                    i++;
+                                    _context2.next = 10;
+                                    break;
+
+                                case 41:
+                                    if (!(selectedActivity != '')) {
+                                        _context2.next = 46;
+                                        break;
+                                    }
+
+                                    selectedActivity = selectedActivity.substring(0, selectedActivity.length - 1);
+                                    selectedActivity = '[' + selectedActivity + ']';
+                                    _context2.next = 48;
+                                    break;
+
+                                case 46:
+                                    _Toast2.default.show({
+                                        type: 'error',
+                                        content: '请选择节点'
+                                    });
+                                    return _context2.abrupt('return', false);
+
+                                case 48:
+                                    urgentListSelect = t.state.urgentSelectList;
+                                    urgent = '';
+
+                                    for (_i = 0; _i < urgentListSelect.length; _i++) {
+                                        urgent += urgentListSelect[_i].value + ",";
+                                    }
+                                    if (urgent != '') {
+                                        urgent = urgent.substring(0, urgent.length - 1);
+                                    }
+                                    if (urgent == '' && t.state.urgentHidden == false) {
+                                        urgent = '0';
+                                    }
+                                    sshortMessage = '0';
+                                    sendShortMessage = t.state.sendShortMessage;
+                                    /*if(sendShortMessage.length>0){
+                                        sshortMessage=sendShortMessage[0].value;
+                                    }*/
+
+                                    cshortMessage = '0';
+                                    circulateShortMessage = t.state.circulateShortMessage;
+                                    /* if(circulateShortMessage.length>0){
+                                         cshortMessage=circulateShortMessage[0].value;
+                                     }*/
+
+                                    param = {
+                                        taskId: _this2.state.taskId,
+                                        selectedActivity: selectedActivity,
+                                        allEditIds: _this2.getAllEditIds(t.state.editFormData),
+                                        corpId: corpid,
+                                        code: _this2.state.code,
+                                        formData: JSON.stringify(editFormData),
+                                        module: t.state.module,
+                                        comment: newComment,
+                                        commentId: t.state.commentId,
+                                        hasCommentField: t.state.hasCommentField,
+                                        dataId: t.state.dataId,
+                                        urgent: urgent,
+                                        lock: t.state.lock,
+                                        sendShortMessage: sendShortMessage,
+                                        circulateShortMessage: circulateShortMessage,
+                                        reminderContent: _this2.state.reminderContent
+                                        /*alertalert(newComment);*/
+                                    };
+                                    dealActionName = "";
+
+                                    if (_this2.state.isStart == true) {
+                                        dealActionName = "提交";
+                                    } else {
+                                        dealActionName = '通过';
+                                    }
+                                    param.dealActionName = dealActionName;
+
+                                    _this2.sendFlow(param);
+
+                                case 62:
+                                case 'end':
+                                    return _context2.stop();
                             }
                         }
-                    }
-                    if (selectedActivity != '') {
-                        selectedActivity = selectedActivity.substring(0, selectedActivity.length - 1);
-                        selectedActivity = '[' + selectedActivity + ']';
-                    } else {
-                        _Toast2.default.show({
-                            type: 'error',
-                            content: '请选择节点'
-                        });
-                        return false;
-                    }
-                }
-                var urgentListSelect = t.state.urgentSelectList;
-                var urgent = '';
-                for (var _i = 0; _i < urgentListSelect.length; _i++) {
-                    urgent += urgentListSelect[_i].value + ",";
-                }
-                if (urgent != '') {
-                    urgent = urgent.substring(0, urgent.length - 1);
-                }
-                if (urgent == '' && t.state.urgentHidden == false) {
-                    urgent = '0';
-                }
-                var sshortMessage = '0';
-                var sendShortMessage = t.state.sendShortMessage;
-                /*if(sendShortMessage.length>0){
-                    sshortMessage=sendShortMessage[0].value;
-                }*/
-                var cshortMessage = '0';
-                var circulateShortMessage = t.state.circulateShortMessage;
-                /* if(circulateShortMessage.length>0){
-                     cshortMessage=circulateShortMessage[0].value;
-                 }*/
-                var param = {
-                    taskId: this.state.taskId,
-                    selectedActivity: selectedActivity,
-                    allEditIds: this.getAllEditIds(t.state.editFormData),
-                    corpId: corpid,
-                    code: this.state.code,
-                    formData: JSON.stringify(editFormData),
-                    module: t.state.module,
-                    comment: newComment,
-                    commentId: t.state.commentId,
-                    hasCommentField: t.state.hasCommentField,
-                    dataId: t.state.dataId,
-                    urgent: urgent,
-                    lock: t.state.lock,
-                    sendShortMessage: sendShortMessage,
-                    circulateShortMessage: circulateShortMessage,
-                    reminderContent: this.state.reminderContent
-                    /*alertalert(newComment);*/
-                };var dealActionName = "";
-                if (this.state.isStart == true) {
-                    dealActionName = "提交";
-                } else {
-                    dealActionName = '通过';
-                }
-                param.dealActionName = dealActionName;
-
-                this.sendFlow(param);
+                    }, _callee2, _this2);
+                }))();
             } else if (operate == 2) {
                 //退回
                 var buttons = this.state.buttons;
@@ -2621,8 +2766,8 @@ var PageHome = function (_React$Component) {
                     //按钮不为空
                     var backTypeListSelect = t.state.backTypeSelectList;
                     var backType = '';
-                    for (var _i2 = 0; _i2 < backTypeListSelect.length; _i2++) {
-                        backType += backTypeListSelect[_i2].value + ",";
+                    for (var i = 0; i < backTypeListSelect.length; i++) {
+                        backType += backTypeListSelect[i].value + ",";
                     }
                     if (backType != '') {
                         backType = backType.substring(0, backType.length - 1);
@@ -4159,7 +4304,7 @@ var PageHome = function (_React$Component) {
     }, {
         key: 'getListButtonsByCodes',
         value: function getListButtonsByCodes(buttonCodes, dataId, isStart) {
-            var _this2 = this;
+            var _this3 = this;
 
             buttonCodes = buttonCodes.replace('OTHER_RELATION', '');
             buttonCodes = buttonCodes.replace('MAILSEND', '');
@@ -4175,7 +4320,7 @@ var PageHome = function (_React$Component) {
                 _db2.default.FlowModuleAPI.getListButtonsByCodes({
                     buttonCodes: buttonCodes + ',MAILSEND'
                 }).then(function (content) {
-                    _this2.setState({
+                    _this3.setState({
                         buttonCodeList: content
                     });
                     var buttonCodeList = content;
@@ -4183,7 +4328,7 @@ var PageHome = function (_React$Component) {
                     var actionSheetButtonOptName = [];
                     var buttonIsMore = false;
                     var buttonList = [];
-                    var sysWatermark = _this2.state.sysWatermark;
+                    var sysWatermark = _this3.state.sysWatermark;
                     /* buttonCodeList.push({'buttonCode':'BASE_SUMBIT','buttonName':'通过'});
                      buttonCodeList.push({'buttonCode':'PAGE_SAVE','buttonName':'保存'});*/
                     if (buttonCodeList.length > 4) {
@@ -4271,7 +4416,7 @@ var PageHome = function (_React$Component) {
                             }
                         }
                     }
-                    _this2.setState({
+                    _this3.setState({
                         buttonList: buttonList,
                         actionSheetButtonOpt: actionSheetButtonOpt,
                         actionSheetButtonOptName: actionSheetButtonOptName,