fmui-base 2.3.23 → 2.3.24

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -80,6 +80,8 @@ var _variables = require('../db/variables');
80
80
 
81
81
  var _variables2 = _interopRequireDefault(_variables);
82
82
 
83
+ var _approveUserResolve = require('../db/approveUserResolve');
84
+
83
85
  var _table = require('../form/table');
84
86
 
85
87
  var _table2 = _interopRequireDefault(_table);
@@ -116,6 +118,8 @@ function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj;
116
118
 
117
119
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
118
120
 
121
+ 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"); }); }; }
122
+
119
123
  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; }
120
124
 
121
125
  function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
@@ -2754,8 +2758,8 @@ var PageHome = function (_React$Component) {
2754
2758
  if (item.type == 3) {
2755
2759
  //指定人选择
2756
2760
  selectUserReadOnly = true;
2757
- popCode = 'org,group'; //选人组件code
2758
- chooseType = "userNotOrg,userNotGroup";
2761
+ popCode = 'org,group,duty'; //选人组件code
2762
+ chooseType = "userNotOrg,userAndGroup,userAndDuty";
2759
2763
  var participantList = item.participantList;
2760
2764
  participants = '';
2761
2765
  if (participantList != null && participantList != "" && participantList.length > 0) {
@@ -2787,10 +2791,10 @@ var PageHome = function (_React$Component) {
2787
2791
  if (item.type == 1) {
2788
2792
  //选择所有人
2789
2793
  selectUserReadOnly = false;
2790
- chooseType = "userNotOrg,userNotGroup";
2794
+ chooseType = "userNotOrg,userAndGroup,userAndDuty";
2791
2795
  if (item.nodeType == 'readtask') {
2792
2796
  //如果是传阅节点
2793
- chooseType = "userNotOrg,userNotGroup";
2797
+ chooseType = "userNotOrg,userAndGroup,userAndDuty";
2794
2798
  }
2795
2799
  var commonUsedId = ''; //常用选择范围
2796
2800
  var participantList = item.participantList;
@@ -2828,20 +2832,20 @@ var PageHome = function (_React$Component) {
2828
2832
  if (commonUsedData.length > 0) {
2829
2833
  popCode = "common,org,group";
2830
2834
  popCode = "common,org,group,duty,politicalOutlook";
2831
- chooseType = "userNotOrg,userNotGroup,userNotDuty,userNotPoliticalOutlook";
2835
+ chooseType = "userNotOrg,userAndGroup,userAndDuty,userNotPoliticalOutlook";
2832
2836
  if (commonUsedData.length == 1 || item.nodeType == 'readtask') {
2833
2837
  personValue = commonUsedData;
2834
2838
  }
2835
2839
  } else {
2836
2840
  popCode = "org,group";
2837
2841
  popCode = "org,group,duty,politicalOutlook";
2838
- chooseType = "userNotOrg,userNotGroup,userNotDuty,userNotPoliticalOutlook";
2842
+ chooseType = "userNotOrg,userAndGroup,userAndDuty,userNotPoliticalOutlook";
2839
2843
  }
2840
2844
  } else {
2841
2845
  chooseType = "userNotOrg";
2842
2846
  popCode = "org";
2843
2847
  popCode = "org,group,duty,politicalOutlook";
2844
- chooseType = "userNotOrg,userNotGroup,userNotDuty,userNotPoliticalOutlook";
2848
+ chooseType = "userNotOrg,userAndGroup,userAndDuty,userNotPoliticalOutlook";
2845
2849
  }
2846
2850
  }
2847
2851
 
@@ -3565,8 +3569,8 @@ var PageHome = function (_React$Component) {
3565
3569
  if (item.type == 3) {
3566
3570
  //指定人选择
3567
3571
  selectUserReadOnly = true;
3568
- popCode = 'org,group'; //选人组件code
3569
- chooseType = "userNotOrg,userNotGroup";
3572
+ popCode = 'org,group,duty'; //选人组件code
3573
+ chooseType = "userNotOrg,userAndGroup,userAndDuty";
3570
3574
  if (succeedRange == "" || item.level != parseInt(nowLevel) + 1) {
3571
3575
  //当后继为空时取下个活动的
3572
3576
  participantList = item.participantList;
@@ -3590,7 +3594,7 @@ var PageHome = function (_React$Component) {
3590
3594
  } else if (item.type == 1) {
3591
3595
  //选择所有人
3592
3596
  selectUserReadOnly = false;
3593
- chooseType = "userNotOrg,userNotGroup";
3597
+ chooseType = "userNotOrg,userAndGroup,userAndDuty";
3594
3598
  var commonUsedId = ''; //常用选择的用户id
3595
3599
  if (succeedRange == "" || item.level != parseInt(nowLevel) + 1) {
3596
3600
  //当后继为空时取下个活动的
@@ -3935,6 +3939,8 @@ var PageHome = function (_React$Component) {
3935
3939
  }, {
3936
3940
  key: 'handleSubmitClick',
3937
3941
  value: function handleSubmitClick() {
3942
+ var _this3 = this;
3943
+
3938
3944
  var t = this;
3939
3945
  var operate = this.state.operate;
3940
3946
 
@@ -3986,186 +3992,331 @@ var PageHome = function (_React$Component) {
3986
3992
 
3987
3993
  if (operate == 1) {
3988
3994
  //审批提交
3989
- var editFormData = this.state.editFormData;
3995
+ _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2() {
3996
+ 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, sshortMessage, sendShortMessage, cshortMessage, circulateShortMessage, allEditIds, dataId, param, dealActionName;
3997
+ return regeneratorRuntime.wrap(function _callee2$(_context2) {
3998
+ while (1) {
3999
+ switch (_context2.prev = _context2.next) {
4000
+ case 0:
4001
+ editFormData = _this3.state.editFormData;
4002
+ nextRadomListSelect = _this3.state.nextRadomList;
4003
+ nextActivityListSelect = _this3.state.nextActivityList;
4004
+ selectedActivity = '';
4005
+
4006
+ if (!(nextRadomListSelect.length > 0 || nextActivityListSelect.length > 0)) {
4007
+ _context2.next = 54;
4008
+ break;
4009
+ }
4010
+
4011
+ //下一个节点不为空时
4012
+ nextActivityList = [];
4013
+
4014
+ selectedActivity = '';
4015
+ nextRadomListSelect.map(function (item) {
4016
+ nextActivityList = nextActivityList.concat(item.subRandomList);
4017
+ });
4018
+ nextActivityList = nextActivityList.concat(nextActivityListSelect);
4019
+ i = 0;
4020
+
4021
+ case 10:
4022
+ if (!(i < nextActivityList.length)) {
4023
+ _context2.next = 47;
4024
+ break;
4025
+ }
4026
+
4027
+ auditorUserIds = '';
4028
+ auditorUserNames = '';
4029
+ checked = nextActivityList[i].checked;
4030
+
4031
+ if (!checked) {
4032
+ _context2.next = 44;
4033
+ break;
4034
+ }
4035
+
4036
+ personValue = nextActivityList[i].personValue;
4037
+ isEnd = nextActivityList[i].end;
4038
+
4039
+ console.log("personValue:" + JSON.stringify(personValue));
4040
+
4041
+ if (!(personValue.length <= 0 && !isEnd)) {
4042
+ _context2.next = 26;
4043
+ break;
4044
+ }
4045
+
4046
+ if (!(nextActivityList[i].type == 3)) {
4047
+ _context2.next = 24;
4048
+ break;
4049
+ }
3990
4050
 
3991
- var nextRadomListSelect = this.state.nextRadomList;
3992
- var nextActivityListSelect = this.state.nextActivityList;
3993
- var selectedActivity = '';
3994
- if (nextRadomListSelect.length > 0 || nextActivityListSelect.length > 0) {
3995
- //下一个节点不为空时
3996
- var nextActivityList = [];
3997
- selectedActivity = '';
3998
- nextRadomListSelect.map(function (item) {
3999
- nextActivityList = nextActivityList.concat(item.subRandomList);
4000
- });
4001
- nextActivityList = nextActivityList.concat(nextActivityListSelect);
4002
- for (var i = 0; i < nextActivityList.length; i++) {
4003
- var auditorUserIds = '';
4004
- var auditorUserNames = '';
4005
- var checked = nextActivityList[i].checked;
4006
- if (checked) {
4007
- var personValue = nextActivityList[i].personValue;
4008
- var isEnd = nextActivityList[i].end;
4009
- console.log("personValue:" + JSON.stringify(personValue));
4010
- if (personValue.length <= 0 && !isEnd) {
4011
- if (nextActivityList[i].type == 3) {
4012
4051
  _Toast2.default.show({
4013
4052
  type: 'error',
4014
4053
  content: '未找到办理人员,不允许提交'
4015
4054
  });
4016
- return false;
4017
- } else {
4055
+ return _context2.abrupt('return', false);
4056
+
4057
+ case 24:
4018
4058
  _Toast2.default.show({
4019
4059
  type: 'error',
4020
4060
  content: '请选择审批人'
4021
4061
  });
4022
- return false;
4023
- }
4024
- }
4025
- var participantMode = nextActivityList[i].participantMode;
4026
- if (participantMode == 0) {
4027
- if (personValue.length > 1) {
4062
+ return _context2.abrupt('return', false);
4063
+
4064
+ case 26:
4065
+ participantMode = nextActivityList[i].participantMode;
4066
+
4067
+ if (!(participantMode == 0)) {
4068
+ _context2.next = 33;
4069
+ break;
4070
+ }
4071
+
4072
+ if (!(personValue.length > 1)) {
4073
+ _context2.next = 31;
4074
+ break;
4075
+ }
4076
+
4028
4077
  _Toast2.default.show({
4029
4078
  type: 'error',
4030
4079
  content: nextActivityList[i].name + '节点的参与人只能是单人,请重新设置流程!'
4031
4080
  });
4032
- return false;
4033
- }
4034
- } else {
4035
- participantMode = participantMode + "";
4036
- if (participantMode.indexOf('1') > -1) {
4037
- participantMode = '1';
4038
- }
4039
- if (participantMode.indexOf('3') > -1) {
4040
- participantMode = '3';
4041
- }
4042
- if (participantMode.indexOf('2') > -1) {
4043
- participantMode = '2';
4044
- }
4045
- }
4046
- if (!isEnd) {
4047
- var orgUserList;
4048
- var orgUserids;
4049
- var orgUsernames;
4050
- var j;
4051
- var level;
4052
-
4053
- (function () {
4054
- var selectUserIds = '';
4055
- var selectOrgIds = '';
4056
- personValue.map(function (item, index) {
4057
- if (selectUserIds.split(',').indexOf(item.scopeValue) == -1) {
4058
- if (item.scopeType == 'user') {
4059
- //用户
4060
- selectUserIds += item.scopeValue + ",";
4061
- auditorUserIds += item.scopeValue + ',';
4062
- auditorUserNames += item.scopeName + ',';
4063
- } else if (item.scopeType == 'org') {
4064
- //组织
4065
- selectOrgIds += item.scopeValue + ",";
4066
- }
4067
- }
4068
- });
4069
- if (selectOrgIds != '') {
4070
- selectOrgIds = selectOrgIds.substring(0, selectOrgIds.length - 1);
4071
- orgUserList = getUsersByOrgIDs(selectOrgIds);
4072
- orgUserids = '';
4073
- orgUsernames = '';
4074
-
4075
- for (j = 0; j < orgUserList.length; j++) {
4076
- if (auditorUserIds.split(',').indexOf(orgUserList[j].id) < 0) {
4077
- orgUserids += orgUserList[j].id + ",";
4078
- orgUsernames += orgUserList[j].userName + ",";
4079
- }
4080
- }
4081
- auditorUserIds += orgUserids;
4082
- auditorUserNames += orgUsernames;
4081
+ return _context2.abrupt('return', false);
4082
+
4083
+ case 31:
4084
+ _context2.next = 37;
4085
+ break;
4086
+
4087
+ case 33:
4088
+ participantMode = participantMode + "";
4089
+ if (participantMode.indexOf('1') > -1) {
4090
+ participantMode = '1';
4083
4091
  }
4084
- if (auditorUserIds != '') {
4085
- auditorUserIds = auditorUserIds.substring(0, auditorUserIds.length - 1);
4086
- auditorUserNames = auditorUserNames.substring(0, auditorUserNames.length - 1);
4092
+ if (participantMode.indexOf('3') > -1) {
4093
+ participantMode = '3';
4087
4094
  }
4095
+ if (participantMode.indexOf('2') > -1) {
4096
+ participantMode = '2';
4097
+ }
4098
+
4099
+ case 37:
4100
+ if (isEnd) {
4101
+ _context2.next = 41;
4102
+ break;
4103
+ }
4104
+
4105
+ return _context2.delegateYield( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
4106
+ var selectUserIds, selectOrgIds, selectGroupIds, selectDutyIds;
4107
+ return regeneratorRuntime.wrap(function _callee$(_context) {
4108
+ while (1) {
4109
+ switch (_context.prev = _context.next) {
4110
+ case 0:
4111
+ selectUserIds = '';
4112
+ selectOrgIds = '';
4113
+ selectGroupIds = '';
4114
+ selectDutyIds = '';
4115
+
4116
+ personValue.map(function (item, index) {
4117
+ if (selectUserIds.split(',').indexOf(item.scopeValue) == -1) {
4118
+ if (item.scopeType == 'user') {
4119
+ //用户
4120
+ selectUserIds += item.scopeValue + ",";
4121
+ auditorUserIds += item.scopeValue + ',';
4122
+ auditorUserNames += item.scopeName + ',';
4123
+ } else if (item.scopeType == 'org') {
4124
+ //组织
4125
+ selectOrgIds += item.scopeValue + ",";
4126
+ } else if (item.scopeType == 'group') {
4127
+ //群组
4128
+ selectGroupIds += item.scopeValue + ",";
4129
+ } else if (item.scopeType == 'duty') {
4130
+ //职务
4131
+ selectDutyIds += item.scopeValue + ",";
4132
+ }
4133
+ }
4134
+ });
4135
+ if (selectOrgIds != '') {
4136
+ selectOrgIds = selectOrgIds.substring(0, selectOrgIds.length - 1);
4137
+ orgUserList = getUsersByOrgIDs(selectOrgIds);
4138
+ orgUserids = '';
4139
+ orgUsernames = '';
4140
+
4141
+ for (j = 0; j < orgUserList.length; j++) {
4142
+ if (auditorUserIds.split(',').indexOf(orgUserList[j].id) < 0) {
4143
+ orgUserids += orgUserList[j].id + ",";
4144
+ orgUsernames += orgUserList[j].userName + ",";
4145
+ }
4146
+ }
4147
+ auditorUserIds += orgUserids;
4148
+ auditorUserNames += orgUsernames;
4149
+ }
4150
+
4151
+ if (!(selectGroupIds != '')) {
4152
+ _context.next = 12;
4153
+ break;
4154
+ }
4155
+
4156
+ selectGroupIds = selectGroupIds.substring(0, selectGroupIds.length - 1);
4157
+ _context.next = 10;
4158
+ return (0, _approveUserResolve.getUsersByGrpIdSync)(selectGroupIds);
4159
+
4160
+ case 10:
4161
+ groupUserList = _context.sent;
4162
+
4163
+ for (gj = 0; gj < groupUserList.length; gj++) {
4164
+ gid = groupUserList[gj].id || groupUserList[gj].userId;
4165
+ gname = groupUserList[gj].userName || '';
4166
+
4167
+ if (gid && auditorUserIds.split(',').indexOf(gid) < 0) {
4168
+ auditorUserIds += gid + ",";
4169
+ auditorUserNames += gname + ",";
4170
+ }
4171
+ }
4172
+
4173
+ case 12:
4174
+ if (!(selectDutyIds != '')) {
4175
+ _context.next = 18;
4176
+ break;
4177
+ }
4178
+
4179
+ selectDutyIds = selectDutyIds.substring(0, selectDutyIds.length - 1);
4180
+ _context.next = 16;
4181
+ return (0, _approveUserResolve.getUsersByDutyIdSync)(selectDutyIds);
4182
+
4183
+ case 16:
4184
+ dutyUserList = _context.sent;
4185
+
4186
+ for (dj = 0; dj < dutyUserList.length; dj++) {
4187
+ did = dutyUserList[dj].id || dutyUserList[dj].userId;
4188
+ dname = dutyUserList[dj].userName || '';
4189
+
4190
+ if (did && auditorUserIds.split(',').indexOf(did) < 0) {
4191
+ auditorUserIds += did + ",";
4192
+ auditorUserNames += dname + ",";
4193
+ }
4194
+ }
4195
+
4196
+ case 18:
4197
+ if (auditorUserIds != '') {
4198
+ auditorUserIds = auditorUserIds.substring(0, auditorUserIds.length - 1);
4199
+ auditorUserNames = auditorUserNames.substring(0, auditorUserNames.length - 1);
4200
+ }
4201
+ level = nextActivityList[i].level;
4202
+
4203
+ if (level == null) {
4204
+ level = "";
4205
+ }
4206
+
4207
+ selectedActivity += '{"id":"' + nextActivityList[i].value + '","name":"' + nextActivityList[i].name + '","participants":"' + auditorUserIds + '","participantNames":"' + auditorUserNames + '","level":"' + level + '","participantType":"' + participantMode + '"},';
4208
+
4209
+ case 22:
4210
+ case 'end':
4211
+ return _context.stop();
4212
+ }
4213
+ }
4214
+ }, _callee, _this3);
4215
+ })(), 't0', 39);
4216
+
4217
+ case 39:
4218
+ _context2.next = 44;
4219
+ break;
4220
+
4221
+ case 41:
4088
4222
  level = nextActivityList[i].level;
4089
4223
 
4090
4224
  if (level == null) {
4091
4225
  level = "";
4092
4226
  }
4227
+ selectedActivity += '{"id":"' + nextActivityList[i].value + '","name":"' + nextActivityList[i].name + '","level":"' + level + '","participantType":"' + participantMode + '"},';
4093
4228
 
4094
- selectedActivity += '{"id":"' + nextActivityList[i].value + '","name":"' + nextActivityList[i].name + '","participants":"' + auditorUserIds + '","participantNames":"' + auditorUserNames + '","level":"' + level + '","participantType":"' + participantMode + '"},';
4095
- })();
4096
- } else {
4097
- var level = nextActivityList[i].level;
4098
- if (level == null) {
4099
- level = "";
4100
- }
4101
- selectedActivity += '{"id":"' + nextActivityList[i].value + '","name":"' + nextActivityList[i].name + '","level":"' + level + '","participantType":"' + participantMode + '"},';
4229
+ case 44:
4230
+ i++;
4231
+ _context2.next = 10;
4232
+ break;
4233
+
4234
+ case 47:
4235
+ if (!(selectedActivity != '')) {
4236
+ _context2.next = 52;
4237
+ break;
4238
+ }
4239
+
4240
+ selectedActivity = selectedActivity.substring(0, selectedActivity.length - 1);
4241
+ selectedActivity = '[' + selectedActivity + ']';
4242
+ _context2.next = 54;
4243
+ break;
4244
+
4245
+ case 52:
4246
+ _Toast2.default.show({
4247
+ type: 'error',
4248
+ content: '请选择节点'
4249
+ });
4250
+ return _context2.abrupt('return', false);
4251
+
4252
+ case 54:
4253
+ urgentListSelect = t.state.urgentSelectList;
4254
+ urgent = '';
4255
+
4256
+ if (urgentListSelect && typeof urgentListSelect != "undefined" && typeof urgentListSelect.value != "undefined" && urgentListSelect.value != "") {
4257
+ urgent = urgentListSelect.value;
4258
+ }
4259
+
4260
+ if (urgent == '') {
4261
+ urgent = '50';
4262
+ }
4263
+ sshortMessage = '0';
4264
+ sendShortMessage = t.state.sendShortMessage;
4265
+ /*if(sendShortMessage.length>0){
4266
+ sshortMessage=sendShortMessage[0].value;
4267
+ }*/
4268
+
4269
+ cshortMessage = '0';
4270
+ circulateShortMessage = t.state.circulateShortMessage;
4271
+ /* if(circulateShortMessage.length>0){
4272
+ cshortMessage=circulateShortMessage[0].value;
4273
+ }*/
4274
+
4275
+ allEditIds = _this3.getAllEditIds(t.state.editFormData);
4276
+ dataId = "";
4277
+
4278
+ if (allEditIds) {
4279
+ dataId = allEditIds.split(",")[0];
4280
+ }
4281
+ param = {
4282
+ taskId: _this3.state.taskId,
4283
+ selectedActivity: selectedActivity,
4284
+ allEditIds: allEditIds,
4285
+ corpId: corpid,
4286
+ code: _this3.state.code,
4287
+ formData: JSON.stringify(editFormData),
4288
+ module: t.state.module,
4289
+ comment: newComment,
4290
+ attachId: _this3.state.commentAttachId,
4291
+ sealId: _this3.state.commentSealId,
4292
+ commentId: t.state.commentId,
4293
+ commentAttitude: t.getSelectedCommentAttitude(),
4294
+ hasCommentField: t.state.hasCommentField,
4295
+ dataId: dataId,
4296
+ urgent: urgent,
4297
+ lock: t.state.lock,
4298
+ sendShortMessage: sendShortMessage,
4299
+ circulateShortMessage: circulateShortMessage,
4300
+ reminderContent: _this3.state.reminderContent
4301
+ /*alertalert(newComment);*/
4302
+ };
4303
+ dealActionName = "";
4304
+
4305
+ if (_this3.state.isStart == true) {
4306
+ dealActionName = "提交";
4307
+ } else {
4308
+ dealActionName = '通过';
4309
+ }
4310
+ param.dealActionName = dealActionName;
4311
+ _this3.sendFlow(param);
4312
+
4313
+ case 70:
4314
+ case 'end':
4315
+ return _context2.stop();
4102
4316
  }
4103
4317
  }
4104
- }
4105
- if (selectedActivity != '') {
4106
- selectedActivity = selectedActivity.substring(0, selectedActivity.length - 1);
4107
- selectedActivity = '[' + selectedActivity + ']';
4108
- } else {
4109
- _Toast2.default.show({
4110
- type: 'error',
4111
- content: '请选择节点'
4112
- });
4113
- return false;
4114
- }
4115
- }
4116
- var urgentListSelect = t.state.urgentSelectList;
4117
- var urgent = '';
4118
- if (urgentListSelect && typeof urgentListSelect != "undefined" && typeof urgentListSelect.value != "undefined" && urgentListSelect.value != "") {
4119
- urgent = urgentListSelect.value;
4120
- }
4121
-
4122
- if (urgent == '') {
4123
- urgent = '50';
4124
- }
4125
- var sshortMessage = '0';
4126
- var sendShortMessage = t.state.sendShortMessage;
4127
- /*if(sendShortMessage.length>0){
4128
- sshortMessage=sendShortMessage[0].value;
4129
- }*/
4130
- var cshortMessage = '0';
4131
- var circulateShortMessage = t.state.circulateShortMessage;
4132
- /* if(circulateShortMessage.length>0){
4133
- cshortMessage=circulateShortMessage[0].value;
4134
- }*/
4135
- var allEditIds = this.getAllEditIds(t.state.editFormData);
4136
- var dataId = "";
4137
- if (allEditIds) {
4138
- dataId = allEditIds.split(",")[0];
4139
- }
4140
- var param = {
4141
- taskId: this.state.taskId,
4142
- selectedActivity: selectedActivity,
4143
- allEditIds: allEditIds,
4144
- corpId: corpid,
4145
- code: this.state.code,
4146
- formData: JSON.stringify(editFormData),
4147
- module: t.state.module,
4148
- comment: newComment,
4149
- attachId: this.state.commentAttachId,
4150
- sealId: this.state.commentSealId,
4151
- commentId: t.state.commentId,
4152
- commentAttitude: t.getSelectedCommentAttitude(),
4153
- hasCommentField: t.state.hasCommentField,
4154
- dataId: dataId,
4155
- urgent: urgent,
4156
- lock: t.state.lock,
4157
- sendShortMessage: sendShortMessage,
4158
- circulateShortMessage: circulateShortMessage,
4159
- reminderContent: this.state.reminderContent
4160
- /*alertalert(newComment);*/
4161
- };var dealActionName = "";
4162
- if (this.state.isStart == true) {
4163
- dealActionName = "提交";
4164
- } else {
4165
- dealActionName = '通过';
4166
- }
4167
- param.dealActionName = dealActionName;
4168
- this.sendFlow(param);
4318
+ }, _callee2, _this3);
4319
+ }))();
4169
4320
  } else if (operate == 2) {
4170
4321
  //退回
4171
4322
  var buttons = this.state.buttons;
@@ -4181,8 +4332,8 @@ var PageHome = function (_React$Component) {
4181
4332
  //按钮不为空
4182
4333
  var backTypeListSelect = t.state.backTypeSelectList;
4183
4334
  var backType = '';
4184
- for (var _i2 = 0; _i2 < backTypeListSelect.length; _i2++) {
4185
- backType += backTypeListSelect[_i2].value + ",";
4335
+ for (var i = 0; i < backTypeListSelect.length; i++) {
4336
+ backType += backTypeListSelect[i].value + ",";
4186
4337
  }
4187
4338
  if (backType != '') {
4188
4339
  backType = backType.substring(0, backType.length - 1);
@@ -5120,6 +5271,7 @@ var PageHome = function (_React$Component) {
5120
5271
  console.log(JSON.stringify(circulatePersonValue));
5121
5272
  param.circulateIds = assignId;
5122
5273
  param.circulateNames = assignName;
5274
+ param.circulateReason = t.state.circulateReason || '';
5123
5275
  param.dealReminderContent = dealReminderContent;
5124
5276
  var editType = t.state.editType;
5125
5277
  // if(t.state.dataId == ''){
@@ -6649,7 +6801,7 @@ var PageHome = function (_React$Component) {
6649
6801
  }, {
6650
6802
  key: 'getListButtonsByCodes',
6651
6803
  value: function getListButtonsByCodes(buttonCodes, dataId, isStart, extensionButtonList) {
6652
- var _this3 = this;
6804
+ var _this4 = this;
6653
6805
 
6654
6806
  // buttonCodes=buttonCodes.replace('OTHER_RELATION','');
6655
6807
  // buttonCodes=buttonCodes.replace('MAILSEND','');
@@ -6671,8 +6823,8 @@ var PageHome = function (_React$Component) {
6671
6823
  // });
6672
6824
  var mobileExt;
6673
6825
  var mobileFormExt;
6674
- var formKey = _this3.state.formKey;
6675
- var module = _this3.state.module;
6826
+ var formKey = _this4.state.formKey;
6827
+ var module = _this4.state.module;
6676
6828
  try {
6677
6829
  if (module) {
6678
6830
  mobileExt = typeof eval(module + "_mobileExt") !== 'undefined' ? eval(module + "_mobileExt") : null;
@@ -6695,10 +6847,10 @@ var PageHome = function (_React$Component) {
6695
6847
  var actionSheetButtonOptName = [];
6696
6848
  var buttonIsMore = false;
6697
6849
  var buttonList = [];
6698
- var sysWatermark = _this3.state.sysWatermark;
6850
+ var sysWatermark = _this4.state.sysWatermark;
6699
6851
  /* buttonCodeList.push({'buttonCode':'BASE_SUMBIT','buttonName':'通过'});
6700
6852
  buttonCodeList.push({'buttonCode':'PAGE_SAVE','buttonName':'保存'});*/
6701
- if (_this3.state.subProcessCode && _this3.state.subProcessCode != '') {
6853
+ if (_this4.state.subProcessCode && _this4.state.subProcessCode != '') {
6702
6854
  buttonCodeList.push({ 'buttonCode': 'subprocess', 'buttonName': '发起子流程' });
6703
6855
  }
6704
6856
  buttonCodeList = buttonCodeList.concat();
@@ -6707,7 +6859,7 @@ var PageHome = function (_React$Component) {
6707
6859
  buttonList.push({ name: '更多', type: 'secondary', display: 'inline', no: -1 });
6708
6860
  var buttonCodeListNew = [];
6709
6861
  var mainSlotCount = 0;
6710
- var todoSaveInMore = _this3.state.listType == "0";
6862
+ var todoSaveInMore = _this4.state.listType == "0";
6711
6863
  for (var c = 0; c < buttonCodeList.length; c++) {
6712
6864
  var buttonCode = buttonCodeList[c]['buttonCode'];
6713
6865
  var buttonName = buttonCodeList[c]['buttonName'];
@@ -6806,7 +6958,7 @@ var PageHome = function (_React$Component) {
6806
6958
  }
6807
6959
  }
6808
6960
 
6809
- _this3.setState({
6961
+ _this4.setState({
6810
6962
  buttonCodeList: content,
6811
6963
  buttonList: buttonList,
6812
6964
  actionSheetButtonOpt: actionSheetButtonOpt,
@@ -8404,7 +8556,7 @@ var PageHome = function (_React$Component) {
8404
8556
  }, {
8405
8557
  key: 'render',
8406
8558
  value: function render() {
8407
- var _this4 = this;
8559
+ var _this5 = this;
8408
8560
 
8409
8561
  var isReadOnly = false;
8410
8562
  var t = this;
@@ -8448,7 +8600,7 @@ var PageHome = function (_React$Component) {
8448
8600
  title: this.state.titleCommentBackAlert,
8449
8601
  show: this.state.showCommentBackAlert,
8450
8602
  onConfirm: function onConfirm() {
8451
- _this4.setState({ showCommentBackAlert: false });
8603
+ _this5.setState({ showCommentBackAlert: false });
8452
8604
  }
8453
8605
  },
8454
8606
  _react2.default.createElement(