fmui-base 2.1.86 → 2.1.88

package/README.md

@@ -3,6 +3,8 @@
 ---npm publish
 
 ## 更新日志 
+- 2.1.88：流程增加结束(退回)状态
+- 2.1.87：流程办理支持选择办理缓急
 - 2.1.86：公众号隐藏附件下载按钮
 - 2.1.85：子流程同步主流程数据时，宏值不赋值
 - 2.1.84：子表扩展方法增加扩展参数

package/lib/db/db.js

@@ -1039,6 +1039,21 @@ context.create('FlowModuleAPI', {
       //   content: <Loading />
       // });
     }
+  },
+
+  getUrgencyEnum: {
+    mockUrl: 'query/queryCanBack.json',
+    url: _variables2.default.URLS.getUrgencyEnum,
+    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

@@ -125,7 +125,8 @@ exports.default = {
         getCanCancelLimit: approveUrlPrefix + "getCanCancelLimit" + '?', //是否可以取消超时
         getUserInfo: approveUrlPrefix + "getUserInfo" + '?', //获取用户信息
         getProcessListByCodes: approveUrlPrefix + "getProcessListByCodes" + '?', //获取可发起的子流程
-        getRelaObjByRelaId: approveUrlPrefix + "getRelaObjByRelaId" + '?' //获取相关对象
+        getRelaObjByRelaId: approveUrlPrefix + "getRelaObjByRelaId" + '?', //获取相关对象
+        getUrgencyEnum: approveUrlPrefix + "getUrgencyEnum" + '?' //获取相关对象
     },
     nodataIcon: context + "/mobile/fmui/images/noData.png",
     loadingIcon: context + "/mobile/fmui/images/loading.gif",

package/lib/process_info/processInfo.js

@@ -319,7 +319,7 @@ var PageHome = function (_React$Component) {
         //自动保存
         var autoSaveApprove = getSystemInfo().autoSaveApprove;
 
-        var param = {
+        var param = _defineProperty({
             bottom: bottom,
             editType: editType,
             isDraft: isDraft,
@@ -393,7 +393,7 @@ var PageHome = function (_React$Component) {
             buttonList: [], //待办按钮列表
             actionSheetButtonOpt: [], //动作面板选项属性
             buttonIsMore: false, //是否有更多按钮
-            urgentSelectList: [], //已选择的紧急选项
+            urgentSelectList: {}, //已选择的紧急选项
             urgentList: urgentList, //紧急选项
             urgentHidden: false, //紧急是否显示
             processLogList: [], //办理记录
@@ -402,7 +402,7 @@ var PageHome = function (_React$Component) {
             isStart: false,
             processStatus: '0',
             keyNum: keyNum,
-            urgent: '0', //紧急状态，0：不紧急
+            urgent: '50', //紧急状态，0：不紧急
             tasktype: '', //流程节点类型,随机流程radom
             level: '', //随机流程第几等级
             levelCount: '', //随机流程等级总数
@@ -456,9 +456,9 @@ var PageHome = function (_React$Component) {
             allSubprocessList: [], //可选择的子流程
             dataInherit: '', //是否同步主表数据 1为同步
             selectProcessCode: '', //选中的子流程
-            subProcessType: '' //子流程类型 0串行  1并行
-
-        };
+            subProcessType: '', //子流程类型 0串行  1并行
+            urgencyList: [], //紧急程度列表
+            urgency: '' }, 'urgent', '');
         FlowCommon = require('pages/flow_common/' + module).default ? require('pages/flow_common/' + module).default : require('pages/flow_common/' + module);
 
         //处理特有参数
@@ -803,6 +803,9 @@ var PageHome = function (_React$Component) {
                     var subProcessCode = '';
                     var dataInherit = '';
                     var subProcessType = '';
+                    var urgencyList = [];
+                    var urgency = '50';
+                    var urgentSelectList = {};
                     if (content.readScopeId && typeof content.readScopeId != "undefined") {
                         readScopeId = content.readScopeId;
                     }
@@ -831,6 +834,19 @@ var PageHome = function (_React$Component) {
                     if (content.subProcessType && typeof content.subProcessType != "undefined") {
                         subProcessType = content.subProcessType;
                     }
+                    if (content.urgency && typeof content.urgency != "undefined") {
+                        urgency = content.urgency;
+                    }
+                    if (content.urgencyList && typeof content.urgencyList != "undefined") {
+                        urgencyList = content.urgencyList;
+                        if (urgencyList.length > 0) {
+                            for (var i = 0; i < urgencyList.length; i++) {
+                                if (urgency == urgencyList[i].value) {
+                                    urgentSelectList = urgencyList[i];
+                                }
+                            }
+                        }
+                    }
                     var formKey = form.formcode;
                     var formStyleObj = form.formStyle;
 
@@ -1195,16 +1211,16 @@ var PageHome = function (_React$Component) {
                     //     "attachStr" : "{\"id\":\"4028818f8803a0ab018803a5dd570058\",\"dingSpaceId\":\"null\",\"url\":\"/attachment/download?fid=4028818f8803a0ab018803a5dd570058&chksum=64809a58e7ebee3b8b4b4fbcbc1e4dd4.2c93ab0a83bbec6b0183c109bc6a51dd\",\"name\":\"数据安全中心.png\",\"checksum\":\"64809a58e7ebee3b8b4b4fbcbc1e4dd4.2c93ab0a83bbec6b0183c109bc6a51dd\",\"fileExt\":\".png\",\"fileName\":\"e9190147e4b74a05a86d9155afbb61ad.png\",\"relativePath\":\"approve/202305\",\"secretLevel\":\"0\",\"size\":\"28962\"}"
                     //   }];
 
-                    for (var i = 0; i < commentList.length; i++) {
-                        var commentItem = commentList[i];
+                    for (var _i = 0; _i < commentList.length; _i++) {
+                        var commentItem = commentList[_i];
                         if (commentItem.type == 'text4' && commentItem.fullMessage.trim() == '') {
                             //当批示意见类型是无，且批示意见内容为空时过滤掉
                             continue;
                         }
-                        if (commentField == commentList[i].field && commentList[i].taskId == param.taskId) {
-                            newspyj = commentList[i];
-                            commentId = commentList[i].id;
-                            defaultValue = commentList[i].content;
+                        if (commentField == commentList[_i].field && commentList[_i].taskId == param.taskId) {
+                            newspyj = commentList[_i];
+                            commentId = commentList[_i].id;
+                            defaultValue = commentList[_i].content;
                             continue;
                         }
                         if (commentItem.field != 'default' && commentItem.commenttype != 'back') {
@@ -1262,10 +1278,6 @@ var PageHome = function (_React$Component) {
                     }
                     //紧急
 
-                    var urgency = content.urgency;
-                    if (!urgency) {
-                        urgency = '0';
-                    }
 
                     //随机流程
                     var tasktype = content.tasktype;
@@ -1399,7 +1411,9 @@ var PageHome = function (_React$Component) {
                         commentUpload: commentUpload,
                         subProcessCode: subProcessCode,
                         dataInherit: dataInherit,
-                        subProcessType: subProcessType
+                        subProcessType: subProcessType,
+                        urgencyList: urgencyList,
+                        urgentSelectList: urgentSelectList
                     }, function () {
                         t.refs["selectMember_circulate"].initSelectData();
                         t.refs["selectMember_circulate1"].initSelectData();
@@ -2434,7 +2448,7 @@ var PageHome = function (_React$Component) {
                         var checkActi = "0"; //判断是不是默认选中一个节点
                         //hasRadomList = true;//下个节点有随机活动
                         //后继活动
-                        var urgentSelectList = [];
+                        // let urgentSelectList = [];
                         var urgentList = [];
                         var endSelect = false;
                         if (nextList.length == 1 && nextList[0]['end']) {
@@ -2471,7 +2485,7 @@ var PageHome = function (_React$Component) {
                             //if(urgentHidden == false){ //当紧急状态显示时把判断是否选中值
                             if (urgent == '1') {
                                 urgentList[0].checked = true;
-                                urgentSelectList = urgentList;
+                                // urgentSelectList = urgentList;
                             }
                             //}
                         } else {
@@ -2725,7 +2739,7 @@ var PageHome = function (_React$Component) {
                                 //当紧急状态显示时把判断是否选中值
                                 if (_urgent == '1') {
                                     urgentList[0].checked = true;
-                                    urgentSelectList = urgentList;
+                                    // urgentSelectList = urgentList;
                                 }
                             }
                         }
@@ -2735,7 +2749,7 @@ var PageHome = function (_React$Component) {
                             nextActivityList: nextActivityList,
                             pageStatus: '1',
                             operate: operate,
-                            urgentSelectList: urgentSelectList,
+                            // urgentSelectList:urgentSelectList,
                             urgentList: urgentList,
                             urgentHidden: urgentHidden,
                             isEnd: isEnd,
@@ -3791,14 +3805,12 @@ var PageHome = function (_React$Component) {
                 }
                 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 (urgentListSelect && typeof urgentListSelect != "undefined" && typeof urgentListSelect.value != "undefined" && urgentListSelect.value != "") {
+                    urgent = urgentListSelect.value;
                 }
-                if (urgent == '' && t.state.urgentHidden == false) {
-                    urgent = '0';
+
+                if (urgent == '') {
+                    urgent = '50';
                 }
                 var sshortMessage = '0';
                 var sendShortMessage = t.state.sendShortMessage;
@@ -4387,7 +4399,7 @@ var PageHome = function (_React$Component) {
     }, {
         key: 'saveFormFuc',
         value: function saveFormFuc(isAuto) {
-            var _param;
+            var _param2;
 
             var t = this;
             var db = _db2.default;
@@ -4407,7 +4419,7 @@ var PageHome = function (_React$Component) {
             if (editType == "add" && dataId != "") {
                 editType = "edit";
             }
-            var param = (_param = {
+            var param = (_param2 = {
                 taskId: this.state.taskId,
                 module: t.state.module,
                 processInstanceId: t.state.processInstanceId,
@@ -4415,7 +4427,7 @@ var PageHome = function (_React$Component) {
                 formData: JSON.stringify(editFormData),
                 formType: "4",
                 editType: editType
-            }, _defineProperty(_param, 'module', t.state.module), _defineProperty(_param, 'comment', newComment), _defineProperty(_param, 'commentType', 'text'), _defineProperty(_param, 'commentId', t.state.commentId), _defineProperty(_param, 'attachId', t.state.commentAttachId), _defineProperty(_param, 'permissionCode', t.state.permissionCode), _defineProperty(_param, 'hasCommentField', t.state.hasCommentField), _defineProperty(_param, 'dataId', dataId), _param);
+            }, _defineProperty(_param2, 'module', t.state.module), _defineProperty(_param2, 'comment', newComment), _defineProperty(_param2, 'commentType', 'text'), _defineProperty(_param2, 'commentId', t.state.commentId), _defineProperty(_param2, 'attachId', t.state.commentAttachId), _defineProperty(_param2, 'permissionCode', t.state.permissionCode), _defineProperty(_param2, 'hasCommentField', t.state.hasCommentField), _defineProperty(_param2, 'dataId', dataId), _param2);
             var commentbizSn = t.guid2();
             if (param.commentId && param.commentId != "" && param.commentId != null && typeof param.commentId != "undefined") {
                 commentbizSn = param.commentId;
@@ -6833,7 +6845,7 @@ var PageHome = function (_React$Component) {
                 operate: 0,
                 nextActivityList: [], //下一个活动节点列表
                 nextRadomList: [], //下一个随机节点
-                urgentSelectList: [], //紧急选项
+                urgentSelectList: {}, //紧急选项
                 circulatePersonValue: [], //清空传阅人
                 sendMailPersonValue: [],
                 chaosongPersonValue: [],
@@ -7135,6 +7147,17 @@ var PageHome = function (_React$Component) {
                 sendShortMessage: newremindStyle
             });
         }
+    }, {
+        key: 'changeUrgencyList',
+        value: function changeUrgencyList(value) {
+            if (value) {
+                var selectValue = value.value;
+                this.setState({
+                    urgentSelectList: value,
+                    urgent: selectValue
+                });
+            }
+        }
     }, {
         key: 'changeJumpShortMessage',
         value: function changeJumpShortMessage(data) {
@@ -7675,6 +7698,19 @@ var PageHome = function (_React$Component) {
                             )
                         );
                     }.bind(this)),
+                    _react2.default.createElement(
+                        'div',
+                        { className: this.state.urgencyList && this.state.urgencyList.length > 0 ? '' : 't-DN' },
+                        _react2.default.createElement(_SelectField2.default, {
+                            label: "办理缓急",
+                            readOnly: false,
+                            options: this.state.urgencyList,
+                            placeholder: "请选择",
+                            onSelect: this.changeUrgencyList.bind(this),
+                            value: this.state.urgentSelectList,
+                            multiLine: true
+                        })
+                    ),
                     _react2.default.createElement(_CheckboxField2.default, {
                         data: this.state.shortMessageList,
                         className: this.state.nextActivityList.length == 0 || this.state.endSelect ? 't-DN' : '',

package/lib/process_list/processList.js

@@ -238,6 +238,9 @@ var ListItem = function (_React$Component) {
         } else if (data.status == '4') {
           comleteName = "取消";
           checkIsNotComplete = false;
+        } else if (data.status == '5') {
+          comleteName = "结束(退回)";
+          checkIsNotComplete = false;
         } else {
           comleteName = data.nodeName;
         }
@@ -255,6 +258,9 @@ var ListItem = function (_React$Component) {
         } else if (data.status == '4') {
           comleteName = "取消";
           checkIsNotComplete = false;
+        } else if (data.status == '5') {
+          comleteName = "结束(退回)";
+          checkIsNotComplete = false;
         } else {
           comleteName = data.nodeName;
         }

package/package.json

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