fmui-base 2.3.22 → 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.
- package/README.md +2 -0
- package/lib/comment_list/List.js +33 -6
- package/lib/comment_list/List.less +43 -0
- package/lib/db/approveUserResolve.js +41 -0
- package/lib/db/db.js +18 -0
- package/lib/db/variables.js +3 -1
- package/lib/form_info/formInfo.js +310 -165
- package/lib/process_info/processInfo.js +447 -188
- package/lib/process_list/processList.js +19 -5
- package/lib/upload/upload.js +39 -20
- package/lib/upload/upload.less +345 -0
- package/package.json +1 -1
|
@@ -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"); } }
|
|
@@ -445,6 +449,7 @@ var PageHome = function (_React$Component) {
|
|
|
445
449
|
circulateNodePersonValue: [], //传阅节点选择的用户
|
|
446
450
|
forwardNodePersonValue: [], //转发节点选择的用户
|
|
447
451
|
circulatePersonValue: [], //通过传阅的用户
|
|
452
|
+
circulateReason: '', //传阅原因
|
|
448
453
|
chaoSongPersonValue: [], //邮件转发抄送的用户
|
|
449
454
|
sendMailPersonValue: [], //邮件转发选择的用户
|
|
450
455
|
buttonList: [], //待办按钮列表
|
|
@@ -902,8 +907,30 @@ var PageHome = function (_React$Component) {
|
|
|
902
907
|
if (content.subProcessType && typeof content.subProcessType != "undefined") {
|
|
903
908
|
subProcessType = content.subProcessType;
|
|
904
909
|
}
|
|
905
|
-
|
|
906
|
-
|
|
910
|
+
// 办理缓急默认（与 PC 对齐）：
|
|
911
|
+
// 发起/草稿/发起人：流程配置 processUrgency 优先
|
|
912
|
+
// 待办等：实例 urgency（非默认50）> processUrgency > 实例 urgency > 50
|
|
913
|
+
var processUrgencyVal = '';
|
|
914
|
+
if (content.processUrgency && typeof content.processUrgency != "undefined" && content.processUrgency != '') {
|
|
915
|
+
processUrgencyVal = String(content.processUrgency);
|
|
916
|
+
}
|
|
917
|
+
var instanceUrgency = '';
|
|
918
|
+
if (content.urgency != null && typeof content.urgency != "undefined" && content.urgency !== '') {
|
|
919
|
+
instanceUrgency = String(content.urgency);
|
|
920
|
+
}
|
|
921
|
+
var listTypeForUrgency = t.state && t.state.listType != null ? String(t.state.listType) : '';
|
|
922
|
+
var startLike = listTypeForUrgency === '5' || content.isStart == 'true' || content.isStart === true || content.isStart === 'true' || content.permissionCode == 'start' || content.owntype == 'initiator' || content.ownType == 'initiator';
|
|
923
|
+
// 与 PC 对齐：发起/发起人节点流程配置优先；其他待办非默认50用实例值，否则回落流程配置
|
|
924
|
+
if (startLike && processUrgencyVal) {
|
|
925
|
+
urgency = processUrgencyVal;
|
|
926
|
+
} else if (instanceUrgency && instanceUrgency !== '50') {
|
|
927
|
+
urgency = instanceUrgency;
|
|
928
|
+
} else if (processUrgencyVal) {
|
|
929
|
+
urgency = processUrgencyVal;
|
|
930
|
+
} else if (instanceUrgency) {
|
|
931
|
+
urgency = instanceUrgency;
|
|
932
|
+
} else {
|
|
933
|
+
urgency = '50';
|
|
907
934
|
}
|
|
908
935
|
if (content.backInitiatorEndFlow && typeof content.backInitiatorEndFlow != "undefined") {
|
|
909
936
|
backInitiatorEndFlow = content.backInitiatorEndFlow;
|
|
@@ -915,7 +942,18 @@ var PageHome = function (_React$Component) {
|
|
|
915
942
|
urgencyList = content.urgencyList;
|
|
916
943
|
if (urgencyList.length > 0) {
|
|
917
944
|
for (var i = 0; i < urgencyList.length; i++) {
|
|
918
|
-
|
|
945
|
+
// 兼容 value / urgencyCode，统一转字符串比较
|
|
946
|
+
var optCode = urgencyList[i].value;
|
|
947
|
+
if (optCode == null || optCode === '') {
|
|
948
|
+
optCode = urgencyList[i].urgencyCode;
|
|
949
|
+
}
|
|
950
|
+
if (optCode != null && optCode !== '' && !urgencyList[i].value) {
|
|
951
|
+
urgencyList[i].value = optCode;
|
|
952
|
+
}
|
|
953
|
+
if (optCode != null && urgencyList[i].urgencyName && !urgencyList[i].text) {
|
|
954
|
+
urgencyList[i].text = urgencyList[i].urgencyName;
|
|
955
|
+
}
|
|
956
|
+
if (String(urgency) === String(optCode)) {
|
|
919
957
|
urgentSelectList = urgencyList[i];
|
|
920
958
|
}
|
|
921
959
|
}
|
|
@@ -1322,6 +1360,22 @@ var PageHome = function (_React$Component) {
|
|
|
1322
1360
|
details.fullMessage = details.operationDetails;
|
|
1323
1361
|
commentBackAlert.push(content.details);
|
|
1324
1362
|
}
|
|
1363
|
+
var readtype = content.readtype;
|
|
1364
|
+
if (!readtype) {
|
|
1365
|
+
readtype = "2";
|
|
1366
|
+
}
|
|
1367
|
+
// 待阅传阅原因：与退回原因弹窗完全一致（CommentList + Dialog）
|
|
1368
|
+
var listTypeForReason = t.state && t.state.listType != null ? String(t.state.listType) : '';
|
|
1369
|
+
if ((readtype == '1' || listTypeForReason === '1') && content.circulateReason && content.circulateReason != 'null' && commentBackAlert.length == 0) {
|
|
1370
|
+
titleCommentBackAlert = '传阅原因';
|
|
1371
|
+
commentBackAlert.push({
|
|
1372
|
+
type: 'text',
|
|
1373
|
+
inscriptionShow: 'userName,date',
|
|
1374
|
+
userName: content.circulateSenderName || '',
|
|
1375
|
+
time: content.circulateTime || '',
|
|
1376
|
+
fullMessage: content.circulateReason
|
|
1377
|
+
});
|
|
1378
|
+
}
|
|
1325
1379
|
//退回意见弹框
|
|
1326
1380
|
// var commentBackAlert = [{
|
|
1327
1381
|
// "type":"text",
|
|
@@ -1356,10 +1410,6 @@ var PageHome = function (_React$Component) {
|
|
|
1356
1410
|
commentDefaultList.push(commentItem);
|
|
1357
1411
|
}
|
|
1358
1412
|
}
|
|
1359
|
-
var readtype = content.readtype;
|
|
1360
|
-
if (!readtype) {
|
|
1361
|
-
readtype = "2";
|
|
1362
|
-
}
|
|
1363
1413
|
|
|
1364
1414
|
//已办记录
|
|
1365
1415
|
var processLogList = content.processLogList;
|
|
@@ -1718,6 +1768,10 @@ var PageHome = function (_React$Component) {
|
|
|
1718
1768
|
if (buttonCode == 'PAGE_SAVE' || buttonCode == 'BASE_SUMBIT') {
|
|
1719
1769
|
buttonArrayNew.push(buttonCode);
|
|
1720
1770
|
}
|
|
1771
|
+
// 发起人已配置作废，且流程已有数据（退回/撤回到发起人）时显示作废
|
|
1772
|
+
if (buttonCode == 'BASE_INVALID' && dataId) {
|
|
1773
|
+
buttonArrayNew.push(buttonCode);
|
|
1774
|
+
}
|
|
1721
1775
|
} else {
|
|
1722
1776
|
if (buttonCode != '') {
|
|
1723
1777
|
buttonArrayNew.push(buttonCode);
|
|
@@ -1768,6 +1822,10 @@ var PageHome = function (_React$Component) {
|
|
|
1768
1822
|
//发起人撤销按钮
|
|
1769
1823
|
buttonList.push({ name: t.state.finalButtons.get("FLOW_REVOKE"), type: 'secondary', display: 'inline', no: 7 });
|
|
1770
1824
|
}
|
|
1825
|
+
// 发起人配置了作废，且流程在发起人节点时（退回/撤回后）可作废
|
|
1826
|
+
if (startButtons.indexOf('BASE_INVALID') >= 0 && (isStart == true || isStart == 'true')) {
|
|
1827
|
+
buttonList.push({ name: t.state.finalButtons.get("BASE_INVALID"), type: 'danger', display: 'inline', no: 9 });
|
|
1828
|
+
}
|
|
1771
1829
|
}
|
|
1772
1830
|
if (t.state.urgeDataList != null && t.state.urgeDataList.length > 0) {
|
|
1773
1831
|
buttonList.push({ name: t.state.finalButtons.get("PAGE_URGE"), type: 'secondary', display: 'inline', no: 12 });
|
|
@@ -1792,6 +1850,9 @@ var PageHome = function (_React$Component) {
|
|
|
1792
1850
|
if (buttonCode == 'PAGE_SAVE' || buttonCode == 'BASE_SUMBIT') {
|
|
1793
1851
|
buttonArrayNew.push(buttonCode);
|
|
1794
1852
|
}
|
|
1853
|
+
if (buttonCode == 'BASE_INVALID' && dataId) {
|
|
1854
|
+
buttonArrayNew.push(buttonCode);
|
|
1855
|
+
}
|
|
1795
1856
|
}
|
|
1796
1857
|
}
|
|
1797
1858
|
|
|
@@ -1801,6 +1862,8 @@ var PageHome = function (_React$Component) {
|
|
|
1801
1862
|
buttonList.push({ name: t.state.finalButtons.get("BASE_SUMBIT"), type: 'primary', display: 'inline', no: 1 });
|
|
1802
1863
|
} else if (buttonCode == 'PAGE_SAVE') {
|
|
1803
1864
|
buttonList.push({ name: t.state.finalButtons.get("PAGE_SAVE"), type: 'secondary', display: 'inline', no: 13 });
|
|
1865
|
+
} else if (buttonCode == 'BASE_INVALID') {
|
|
1866
|
+
buttonList.push({ name: t.state.finalButtons.get("BASE_INVALID"), type: 'danger', display: 'inline', no: 9 });
|
|
1804
1867
|
}
|
|
1805
1868
|
}
|
|
1806
1869
|
}
|
|
@@ -2695,8 +2758,8 @@ var PageHome = function (_React$Component) {
|
|
|
2695
2758
|
if (item.type == 3) {
|
|
2696
2759
|
//指定人选择
|
|
2697
2760
|
selectUserReadOnly = true;
|
|
2698
|
-
popCode = 'org,group'; //选人组件code
|
|
2699
|
-
chooseType = "userNotOrg,
|
|
2761
|
+
popCode = 'org,group,duty'; //选人组件code
|
|
2762
|
+
chooseType = "userNotOrg,userAndGroup,userAndDuty";
|
|
2700
2763
|
var participantList = item.participantList;
|
|
2701
2764
|
participants = '';
|
|
2702
2765
|
if (participantList != null && participantList != "" && participantList.length > 0) {
|
|
@@ -2728,10 +2791,10 @@ var PageHome = function (_React$Component) {
|
|
|
2728
2791
|
if (item.type == 1) {
|
|
2729
2792
|
//选择所有人
|
|
2730
2793
|
selectUserReadOnly = false;
|
|
2731
|
-
chooseType = "userNotOrg,
|
|
2794
|
+
chooseType = "userNotOrg,userAndGroup,userAndDuty";
|
|
2732
2795
|
if (item.nodeType == 'readtask') {
|
|
2733
2796
|
//如果是传阅节点
|
|
2734
|
-
chooseType = "userNotOrg,
|
|
2797
|
+
chooseType = "userNotOrg,userAndGroup,userAndDuty";
|
|
2735
2798
|
}
|
|
2736
2799
|
var commonUsedId = ''; //常用选择范围
|
|
2737
2800
|
var participantList = item.participantList;
|
|
@@ -2769,20 +2832,20 @@ var PageHome = function (_React$Component) {
|
|
|
2769
2832
|
if (commonUsedData.length > 0) {
|
|
2770
2833
|
popCode = "common,org,group";
|
|
2771
2834
|
popCode = "common,org,group,duty,politicalOutlook";
|
|
2772
|
-
chooseType = "userNotOrg,
|
|
2835
|
+
chooseType = "userNotOrg,userAndGroup,userAndDuty,userNotPoliticalOutlook";
|
|
2773
2836
|
if (commonUsedData.length == 1 || item.nodeType == 'readtask') {
|
|
2774
2837
|
personValue = commonUsedData;
|
|
2775
2838
|
}
|
|
2776
2839
|
} else {
|
|
2777
2840
|
popCode = "org,group";
|
|
2778
2841
|
popCode = "org,group,duty,politicalOutlook";
|
|
2779
|
-
chooseType = "userNotOrg,
|
|
2842
|
+
chooseType = "userNotOrg,userAndGroup,userAndDuty,userNotPoliticalOutlook";
|
|
2780
2843
|
}
|
|
2781
2844
|
} else {
|
|
2782
2845
|
chooseType = "userNotOrg";
|
|
2783
2846
|
popCode = "org";
|
|
2784
2847
|
popCode = "org,group,duty,politicalOutlook";
|
|
2785
|
-
chooseType = "userNotOrg,
|
|
2848
|
+
chooseType = "userNotOrg,userAndGroup,userAndDuty,userNotPoliticalOutlook";
|
|
2786
2849
|
}
|
|
2787
2850
|
}
|
|
2788
2851
|
|
|
@@ -2931,7 +2994,8 @@ var PageHome = function (_React$Component) {
|
|
|
2931
2994
|
nextActivityList: nextActivityList,
|
|
2932
2995
|
pageStatus: '1',
|
|
2933
2996
|
operate: operate,
|
|
2934
|
-
//
|
|
2997
|
+
// 打开提交页时兜底回填办理缓急，避免取消后再进显示「无」
|
|
2998
|
+
urgentSelectList: t.state.urgentSelectList && (t.state.urgentSelectList.value || t.state.urgentSelectList.urgencyCode) ? t.state.urgentSelectList : t.resolveUrgentSelectList(t.state.urgent, t.state.urgencyList),
|
|
2935
2999
|
urgentList: urgentList,
|
|
2936
3000
|
urgentHidden: urgentHidden,
|
|
2937
3001
|
isEnd: isEnd,
|
|
@@ -3505,8 +3569,8 @@ var PageHome = function (_React$Component) {
|
|
|
3505
3569
|
if (item.type == 3) {
|
|
3506
3570
|
//指定人选择
|
|
3507
3571
|
selectUserReadOnly = true;
|
|
3508
|
-
popCode = 'org,group'; //选人组件code
|
|
3509
|
-
chooseType = "userNotOrg,
|
|
3572
|
+
popCode = 'org,group,duty'; //选人组件code
|
|
3573
|
+
chooseType = "userNotOrg,userAndGroup,userAndDuty";
|
|
3510
3574
|
if (succeedRange == "" || item.level != parseInt(nowLevel) + 1) {
|
|
3511
3575
|
//当后继为空时取下个活动的
|
|
3512
3576
|
participantList = item.participantList;
|
|
@@ -3530,7 +3594,7 @@ var PageHome = function (_React$Component) {
|
|
|
3530
3594
|
} else if (item.type == 1) {
|
|
3531
3595
|
//选择所有人
|
|
3532
3596
|
selectUserReadOnly = false;
|
|
3533
|
-
chooseType = "userNotOrg,
|
|
3597
|
+
chooseType = "userNotOrg,userAndGroup,userAndDuty";
|
|
3534
3598
|
var commonUsedId = ''; //常用选择的用户id
|
|
3535
3599
|
if (succeedRange == "" || item.level != parseInt(nowLevel) + 1) {
|
|
3536
3600
|
//当后继为空时取下个活动的
|
|
@@ -3875,6 +3939,8 @@ var PageHome = function (_React$Component) {
|
|
|
3875
3939
|
}, {
|
|
3876
3940
|
key: 'handleSubmitClick',
|
|
3877
3941
|
value: function handleSubmitClick() {
|
|
3942
|
+
var _this3 = this;
|
|
3943
|
+
|
|
3878
3944
|
var t = this;
|
|
3879
3945
|
var operate = this.state.operate;
|
|
3880
3946
|
|
|
@@ -3926,186 +3992,331 @@ var PageHome = function (_React$Component) {
|
|
|
3926
3992
|
|
|
3927
3993
|
if (operate == 1) {
|
|
3928
3994
|
//审批提交
|
|
3929
|
-
|
|
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
|
+
}
|
|
3930
4050
|
|
|
3931
|
-
var nextRadomListSelect = this.state.nextRadomList;
|
|
3932
|
-
var nextActivityListSelect = this.state.nextActivityList;
|
|
3933
|
-
var selectedActivity = '';
|
|
3934
|
-
if (nextRadomListSelect.length > 0 || nextActivityListSelect.length > 0) {
|
|
3935
|
-
//下一个节点不为空时
|
|
3936
|
-
var nextActivityList = [];
|
|
3937
|
-
selectedActivity = '';
|
|
3938
|
-
nextRadomListSelect.map(function (item) {
|
|
3939
|
-
nextActivityList = nextActivityList.concat(item.subRandomList);
|
|
3940
|
-
});
|
|
3941
|
-
nextActivityList = nextActivityList.concat(nextActivityListSelect);
|
|
3942
|
-
for (var i = 0; i < nextActivityList.length; i++) {
|
|
3943
|
-
var auditorUserIds = '';
|
|
3944
|
-
var auditorUserNames = '';
|
|
3945
|
-
var checked = nextActivityList[i].checked;
|
|
3946
|
-
if (checked) {
|
|
3947
|
-
var personValue = nextActivityList[i].personValue;
|
|
3948
|
-
var isEnd = nextActivityList[i].end;
|
|
3949
|
-
console.log("personValue:" + JSON.stringify(personValue));
|
|
3950
|
-
if (personValue.length <= 0 && !isEnd) {
|
|
3951
|
-
if (nextActivityList[i].type == 3) {
|
|
3952
4051
|
_Toast2.default.show({
|
|
3953
4052
|
type: 'error',
|
|
3954
4053
|
content: '未找到办理人员，不允许提交'
|
|
3955
4054
|
});
|
|
3956
|
-
return false;
|
|
3957
|
-
|
|
4055
|
+
return _context2.abrupt('return', false);
|
|
4056
|
+
|
|
4057
|
+
case 24:
|
|
3958
4058
|
_Toast2.default.show({
|
|
3959
4059
|
type: 'error',
|
|
3960
4060
|
content: '请选择审批人'
|
|
3961
4061
|
});
|
|
3962
|
-
return false;
|
|
3963
|
-
|
|
3964
|
-
|
|
3965
|
-
|
|
3966
|
-
|
|
3967
|
-
|
|
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
|
+
|
|
3968
4077
|
_Toast2.default.show({
|
|
3969
4078
|
type: 'error',
|
|
3970
4079
|
content: nextActivityList[i].name + '节点的参与人只能是单人，请重新设置流程！'
|
|
3971
4080
|
});
|
|
3972
|
-
return false;
|
|
3973
|
-
|
|
3974
|
-
|
|
3975
|
-
|
|
3976
|
-
|
|
3977
|
-
|
|
3978
|
-
|
|
3979
|
-
|
|
3980
|
-
participantMode
|
|
3981
|
-
|
|
3982
|
-
|
|
3983
|
-
participantMode
|
|
3984
|
-
|
|
3985
|
-
}
|
|
3986
|
-
if (!isEnd) {
|
|
3987
|
-
var orgUserList;
|
|
3988
|
-
var orgUserids;
|
|
3989
|
-
var orgUsernames;
|
|
3990
|
-
var j;
|
|
3991
|
-
var level;
|
|
3992
|
-
|
|
3993
|
-
(function () {
|
|
3994
|
-
var selectUserIds = '';
|
|
3995
|
-
var selectOrgIds = '';
|
|
3996
|
-
personValue.map(function (item, index) {
|
|
3997
|
-
if (selectUserIds.split(',').indexOf(item.scopeValue) == -1) {
|
|
3998
|
-
if (item.scopeType == 'user') {
|
|
3999
|
-
//用户
|
|
4000
|
-
selectUserIds += item.scopeValue + ",";
|
|
4001
|
-
auditorUserIds += item.scopeValue + ',';
|
|
4002
|
-
auditorUserNames += item.scopeName + ',';
|
|
4003
|
-
} else if (item.scopeType == 'org') {
|
|
4004
|
-
//组织
|
|
4005
|
-
selectOrgIds += item.scopeValue + ",";
|
|
4006
|
-
}
|
|
4007
|
-
}
|
|
4008
|
-
});
|
|
4009
|
-
if (selectOrgIds != '') {
|
|
4010
|
-
selectOrgIds = selectOrgIds.substring(0, selectOrgIds.length - 1);
|
|
4011
|
-
orgUserList = getUsersByOrgIDs(selectOrgIds);
|
|
4012
|
-
orgUserids = '';
|
|
4013
|
-
orgUsernames = '';
|
|
4014
|
-
|
|
4015
|
-
for (j = 0; j < orgUserList.length; j++) {
|
|
4016
|
-
if (auditorUserIds.split(',').indexOf(orgUserList[j].id) < 0) {
|
|
4017
|
-
orgUserids += orgUserList[j].id + ",";
|
|
4018
|
-
orgUsernames += orgUserList[j].userName + ",";
|
|
4019
|
-
}
|
|
4020
|
-
}
|
|
4021
|
-
auditorUserIds += orgUserids;
|
|
4022
|
-
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';
|
|
4091
|
+
}
|
|
4092
|
+
if (participantMode.indexOf('3') > -1) {
|
|
4093
|
+
participantMode = '3';
|
|
4023
4094
|
}
|
|
4024
|
-
if (
|
|
4025
|
-
|
|
4026
|
-
auditorUserNames = auditorUserNames.substring(0, auditorUserNames.length - 1);
|
|
4095
|
+
if (participantMode.indexOf('2') > -1) {
|
|
4096
|
+
participantMode = '2';
|
|
4027
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:
|
|
4028
4222
|
level = nextActivityList[i].level;
|
|
4029
4223
|
|
|
4030
4224
|
if (level == null) {
|
|
4031
4225
|
level = "";
|
|
4032
4226
|
}
|
|
4227
|
+
selectedActivity += '{"id":"' + nextActivityList[i].value + '","name":"' + nextActivityList[i].name + '","level":"' + level + '","participantType":"' + participantMode + '"},';
|
|
4033
4228
|
|
|
4034
|
-
|
|
4035
|
-
|
|
4036
|
-
|
|
4037
|
-
|
|
4038
|
-
|
|
4039
|
-
|
|
4040
|
-
|
|
4041
|
-
|
|
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();
|
|
4042
4316
|
}
|
|
4043
4317
|
}
|
|
4044
|
-
}
|
|
4045
|
-
|
|
4046
|
-
selectedActivity = selectedActivity.substring(0, selectedActivity.length - 1);
|
|
4047
|
-
selectedActivity = '[' + selectedActivity + ']';
|
|
4048
|
-
} else {
|
|
4049
|
-
_Toast2.default.show({
|
|
4050
|
-
type: 'error',
|
|
4051
|
-
content: '请选择节点'
|
|
4052
|
-
});
|
|
4053
|
-
return false;
|
|
4054
|
-
}
|
|
4055
|
-
}
|
|
4056
|
-
var urgentListSelect = t.state.urgentSelectList;
|
|
4057
|
-
var urgent = '';
|
|
4058
|
-
if (urgentListSelect && typeof urgentListSelect != "undefined" && typeof urgentListSelect.value != "undefined" && urgentListSelect.value != "") {
|
|
4059
|
-
urgent = urgentListSelect.value;
|
|
4060
|
-
}
|
|
4061
|
-
|
|
4062
|
-
if (urgent == '') {
|
|
4063
|
-
urgent = '50';
|
|
4064
|
-
}
|
|
4065
|
-
var sshortMessage = '0';
|
|
4066
|
-
var sendShortMessage = t.state.sendShortMessage;
|
|
4067
|
-
/*if(sendShortMessage.length>0){
|
|
4068
|
-
sshortMessage=sendShortMessage[0].value;
|
|
4069
|
-
}*/
|
|
4070
|
-
var cshortMessage = '0';
|
|
4071
|
-
var circulateShortMessage = t.state.circulateShortMessage;
|
|
4072
|
-
/* if(circulateShortMessage.length>0){
|
|
4073
|
-
cshortMessage=circulateShortMessage[0].value;
|
|
4074
|
-
}*/
|
|
4075
|
-
var allEditIds = this.getAllEditIds(t.state.editFormData);
|
|
4076
|
-
var dataId = "";
|
|
4077
|
-
if (allEditIds) {
|
|
4078
|
-
dataId = allEditIds.split(",")[0];
|
|
4079
|
-
}
|
|
4080
|
-
var param = {
|
|
4081
|
-
taskId: this.state.taskId,
|
|
4082
|
-
selectedActivity: selectedActivity,
|
|
4083
|
-
allEditIds: allEditIds,
|
|
4084
|
-
corpId: corpid,
|
|
4085
|
-
code: this.state.code,
|
|
4086
|
-
formData: JSON.stringify(editFormData),
|
|
4087
|
-
module: t.state.module,
|
|
4088
|
-
comment: newComment,
|
|
4089
|
-
attachId: this.state.commentAttachId,
|
|
4090
|
-
sealId: this.state.commentSealId,
|
|
4091
|
-
commentId: t.state.commentId,
|
|
4092
|
-
commentAttitude: t.getSelectedCommentAttitude(),
|
|
4093
|
-
hasCommentField: t.state.hasCommentField,
|
|
4094
|
-
dataId: dataId,
|
|
4095
|
-
urgent: urgent,
|
|
4096
|
-
lock: t.state.lock,
|
|
4097
|
-
sendShortMessage: sendShortMessage,
|
|
4098
|
-
circulateShortMessage: circulateShortMessage,
|
|
4099
|
-
reminderContent: this.state.reminderContent
|
|
4100
|
-
/*alertalert(newComment);*/
|
|
4101
|
-
};var dealActionName = "";
|
|
4102
|
-
if (this.state.isStart == true) {
|
|
4103
|
-
dealActionName = "提交";
|
|
4104
|
-
} else {
|
|
4105
|
-
dealActionName = '通过';
|
|
4106
|
-
}
|
|
4107
|
-
param.dealActionName = dealActionName;
|
|
4108
|
-
this.sendFlow(param);
|
|
4318
|
+
}, _callee2, _this3);
|
|
4319
|
+
}))();
|
|
4109
4320
|
} else if (operate == 2) {
|
|
4110
4321
|
//退回
|
|
4111
4322
|
var buttons = this.state.buttons;
|
|
@@ -4121,8 +4332,8 @@ var PageHome = function (_React$Component) {
|
|
|
4121
4332
|
//按钮不为空
|
|
4122
4333
|
var backTypeListSelect = t.state.backTypeSelectList;
|
|
4123
4334
|
var backType = '';
|
|
4124
|
-
for (var
|
|
4125
|
-
backType += backTypeListSelect[
|
|
4335
|
+
for (var i = 0; i < backTypeListSelect.length; i++) {
|
|
4336
|
+
backType += backTypeListSelect[i].value + ",";
|
|
4126
4337
|
}
|
|
4127
4338
|
if (backType != '') {
|
|
4128
4339
|
backType = backType.substring(0, backType.length - 1);
|
|
@@ -5060,6 +5271,7 @@ var PageHome = function (_React$Component) {
|
|
|
5060
5271
|
console.log(JSON.stringify(circulatePersonValue));
|
|
5061
5272
|
param.circulateIds = assignId;
|
|
5062
5273
|
param.circulateNames = assignName;
|
|
5274
|
+
param.circulateReason = t.state.circulateReason || '';
|
|
5063
5275
|
param.dealReminderContent = dealReminderContent;
|
|
5064
5276
|
var editType = t.state.editType;
|
|
5065
5277
|
// if(t.state.dataId == ''){
|
|
@@ -6001,7 +6213,8 @@ var PageHome = function (_React$Component) {
|
|
|
6001
6213
|
formId: t.state.formId,
|
|
6002
6214
|
permissionCode: t.state.permissionCode,
|
|
6003
6215
|
processInstanceId: t.state.processInstanceId,
|
|
6004
|
-
shortMessage: circulateShortMessage
|
|
6216
|
+
shortMessage: circulateShortMessage,
|
|
6217
|
+
circulateReason: t.state.circulateReason || ''
|
|
6005
6218
|
}).then(function (content) {
|
|
6006
6219
|
_Toast2.default.show({
|
|
6007
6220
|
type: 'success',
|
|
@@ -6588,7 +6801,7 @@ var PageHome = function (_React$Component) {
|
|
|
6588
6801
|
}, {
|
|
6589
6802
|
key: 'getListButtonsByCodes',
|
|
6590
6803
|
value: function getListButtonsByCodes(buttonCodes, dataId, isStart, extensionButtonList) {
|
|
6591
|
-
var
|
|
6804
|
+
var _this4 = this;
|
|
6592
6805
|
|
|
6593
6806
|
// buttonCodes=buttonCodes.replace('OTHER_RELATION','');
|
|
6594
6807
|
// buttonCodes=buttonCodes.replace('MAILSEND','');
|
|
@@ -6610,8 +6823,8 @@ var PageHome = function (_React$Component) {
|
|
|
6610
6823
|
// });
|
|
6611
6824
|
var mobileExt;
|
|
6612
6825
|
var mobileFormExt;
|
|
6613
|
-
var formKey =
|
|
6614
|
-
var module =
|
|
6826
|
+
var formKey = _this4.state.formKey;
|
|
6827
|
+
var module = _this4.state.module;
|
|
6615
6828
|
try {
|
|
6616
6829
|
if (module) {
|
|
6617
6830
|
mobileExt = typeof eval(module + "_mobileExt") !== 'undefined' ? eval(module + "_mobileExt") : null;
|
|
@@ -6634,10 +6847,10 @@ var PageHome = function (_React$Component) {
|
|
|
6634
6847
|
var actionSheetButtonOptName = [];
|
|
6635
6848
|
var buttonIsMore = false;
|
|
6636
6849
|
var buttonList = [];
|
|
6637
|
-
var sysWatermark =
|
|
6850
|
+
var sysWatermark = _this4.state.sysWatermark;
|
|
6638
6851
|
/* buttonCodeList.push({'buttonCode':'BASE_SUMBIT','buttonName':'通过'});
|
|
6639
6852
|
buttonCodeList.push({'buttonCode':'PAGE_SAVE','buttonName':'保存'});*/
|
|
6640
|
-
if (
|
|
6853
|
+
if (_this4.state.subProcessCode && _this4.state.subProcessCode != '') {
|
|
6641
6854
|
buttonCodeList.push({ 'buttonCode': 'subprocess', 'buttonName': '发起子流程' });
|
|
6642
6855
|
}
|
|
6643
6856
|
buttonCodeList = buttonCodeList.concat();
|
|
@@ -6646,7 +6859,7 @@ var PageHome = function (_React$Component) {
|
|
|
6646
6859
|
buttonList.push({ name: '更多', type: 'secondary', display: 'inline', no: -1 });
|
|
6647
6860
|
var buttonCodeListNew = [];
|
|
6648
6861
|
var mainSlotCount = 0;
|
|
6649
|
-
var todoSaveInMore =
|
|
6862
|
+
var todoSaveInMore = _this4.state.listType == "0";
|
|
6650
6863
|
for (var c = 0; c < buttonCodeList.length; c++) {
|
|
6651
6864
|
var buttonCode = buttonCodeList[c]['buttonCode'];
|
|
6652
6865
|
var buttonName = buttonCodeList[c]['buttonName'];
|
|
@@ -6745,7 +6958,7 @@ var PageHome = function (_React$Component) {
|
|
|
6745
6958
|
}
|
|
6746
6959
|
}
|
|
6747
6960
|
|
|
6748
|
-
|
|
6961
|
+
_this4.setState({
|
|
6749
6962
|
buttonCodeList: content,
|
|
6750
6963
|
buttonList: buttonList,
|
|
6751
6964
|
actionSheetButtonOpt: actionSheetButtonOpt,
|
|
@@ -7275,12 +7488,14 @@ var PageHome = function (_React$Component) {
|
|
|
7275
7488
|
}
|
|
7276
7489
|
this.refs["selectMember_mailsend"].dialogClearItem();
|
|
7277
7490
|
this.refs["selectMember_chaosong"].dialogClearItem();
|
|
7491
|
+
// 取消后恢复办理缓急选中，避免再次打开显示「无」
|
|
7492
|
+
var restoreUrgent = this.resolveUrgentSelectList(this.state.urgent, this.state.urgencyList);
|
|
7278
7493
|
this.setState({
|
|
7279
7494
|
pageStatus: '0',
|
|
7280
7495
|
operate: 0,
|
|
7281
7496
|
nextActivityList: [], //下一个活动节点列表
|
|
7282
7497
|
nextRadomList: [], //下一个随机节点
|
|
7283
|
-
urgentSelectList:
|
|
7498
|
+
urgentSelectList: restoreUrgent, //紧急选项（按当前 urgent 回填）
|
|
7284
7499
|
circulatePersonValue: [], //清空传阅人
|
|
7285
7500
|
sendMailPersonValue: [],
|
|
7286
7501
|
chaosongPersonValue: [],
|
|
@@ -7561,6 +7776,13 @@ var PageHome = function (_React$Component) {
|
|
|
7561
7776
|
circulateNodePersonValue: value
|
|
7562
7777
|
});
|
|
7563
7778
|
}
|
|
7779
|
+
}, {
|
|
7780
|
+
key: 'changeCirculateReason',
|
|
7781
|
+
value: function changeCirculateReason(value) {
|
|
7782
|
+
this.setState({
|
|
7783
|
+
circulateReason: value
|
|
7784
|
+
});
|
|
7785
|
+
}
|
|
7564
7786
|
|
|
7565
7787
|
//转发回调
|
|
7566
7788
|
|
|
@@ -8089,6 +8311,27 @@ var PageHome = function (_React$Component) {
|
|
|
8089
8311
|
});
|
|
8090
8312
|
}
|
|
8091
8313
|
}
|
|
8314
|
+
/** 按缓急编码从选项列表解析已选项（兼容 value / urgencyCode） */
|
|
8315
|
+
|
|
8316
|
+
}, {
|
|
8317
|
+
key: 'resolveUrgentSelectList',
|
|
8318
|
+
value: function resolveUrgentSelectList(urgencyCode, urgencyList) {
|
|
8319
|
+
var list = urgencyList || [];
|
|
8320
|
+
var code = urgencyCode != null && urgencyCode !== '' ? String(urgencyCode) : '';
|
|
8321
|
+
if (!code || list.length === 0) {
|
|
8322
|
+
return {};
|
|
8323
|
+
}
|
|
8324
|
+
for (var i = 0; i < list.length; i++) {
|
|
8325
|
+
var optCode = list[i].value;
|
|
8326
|
+
if (optCode == null || optCode === '') {
|
|
8327
|
+
optCode = list[i].urgencyCode;
|
|
8328
|
+
}
|
|
8329
|
+
if (optCode != null && String(optCode) === code) {
|
|
8330
|
+
return list[i];
|
|
8331
|
+
}
|
|
8332
|
+
}
|
|
8333
|
+
return {};
|
|
8334
|
+
}
|
|
8092
8335
|
}, {
|
|
8093
8336
|
key: 'changeJumpShortMessage',
|
|
8094
8337
|
value: function changeJumpShortMessage(data) {
|
|
@@ -8313,7 +8556,7 @@ var PageHome = function (_React$Component) {
|
|
|
8313
8556
|
}, {
|
|
8314
8557
|
key: 'render',
|
|
8315
8558
|
value: function render() {
|
|
8316
|
-
var
|
|
8559
|
+
var _this5 = this;
|
|
8317
8560
|
|
|
8318
8561
|
var isReadOnly = false;
|
|
8319
8562
|
var t = this;
|
|
@@ -8357,7 +8600,7 @@ var PageHome = function (_React$Component) {
|
|
|
8357
8600
|
title: this.state.titleCommentBackAlert,
|
|
8358
8601
|
show: this.state.showCommentBackAlert,
|
|
8359
8602
|
onConfirm: function onConfirm() {
|
|
8360
|
-
|
|
8603
|
+
_this5.setState({ showCommentBackAlert: false });
|
|
8361
8604
|
}
|
|
8362
8605
|
},
|
|
8363
8606
|
_react2.default.createElement(
|
|
@@ -8784,6 +9027,14 @@ var PageHome = function (_React$Component) {
|
|
|
8784
9027
|
isDelete: true,
|
|
8785
9028
|
onChange: this.getCirculatePerson.bind(this)
|
|
8786
9029
|
}),
|
|
9030
|
+
_react2.default.createElement(_TextareaField2.default, {
|
|
9031
|
+
readOnly: false,
|
|
9032
|
+
label: '传阅原因',
|
|
9033
|
+
required: false,
|
|
9034
|
+
minRows: 3, maxRows: 6,
|
|
9035
|
+
placeholder: '请输入传阅原因',
|
|
9036
|
+
value: this.state.circulateReason,
|
|
9037
|
+
onChange: this.changeCirculateReason.bind(this) }),
|
|
8787
9038
|
_react2.default.createElement(_CheckboxField2.default, {
|
|
8788
9039
|
data: this.state.readShortMessageList,
|
|
8789
9040
|
className: '',
|
|
@@ -9045,6 +9296,14 @@ var PageHome = function (_React$Component) {
|
|
|
9045
9296
|
isDelete: true,
|
|
9046
9297
|
onChange: this.circulateCallback.bind(this)
|
|
9047
9298
|
}),
|
|
9299
|
+
_react2.default.createElement(_TextareaField2.default, {
|
|
9300
|
+
readOnly: false,
|
|
9301
|
+
label: '传阅原因',
|
|
9302
|
+
required: false,
|
|
9303
|
+
minRows: 3, maxRows: 6,
|
|
9304
|
+
placeholder: '请输入传阅原因',
|
|
9305
|
+
value: this.state.circulateReason,
|
|
9306
|
+
onChange: this.changeCirculateReason.bind(this) }),
|
|
9048
9307
|
_react2.default.createElement(_CheckboxField2.default, {
|
|
9049
9308
|
data: this.state.readShortMessageList,
|
|
9050
9309
|
className: '',
|