fmui-base 2.2.6 → 2.2.8
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 +14 -3
- package/lib/process_info/processInfo.js +30 -23
- package/package.json +1 -1
package/README.md
CHANGED
package/lib/comment_list/List.js
CHANGED
|
@@ -108,6 +108,17 @@ var PageHome = function (_React$Component) {
|
|
|
108
108
|
// },1000)
|
|
109
109
|
_db2.default.FlowApproval.verifySign(param).then(function (content) {
|
|
110
110
|
var result = content.verifySignRes;
|
|
111
|
+
var signatureImg = content.signatureImg;
|
|
112
|
+
if (signatureImg && signatureImg != null && signatureImg != '') {
|
|
113
|
+
if ($("#commentSign-" + item.id).find(".signPic").length > 0) {
|
|
114
|
+
$("#commentSign-" + item.id).find(".signPic").attr("src", 'data:image/png;base64,' + signatureImg);
|
|
115
|
+
} else {
|
|
116
|
+
var signPicHtml = '<img class="t-H64 t-PR5 signPic" src="data:image/png;base64,' + signatureImg + '"/>';
|
|
117
|
+
$("#commentSign-" + item.id).find('.comment-html').append(signPicHtml);
|
|
118
|
+
$("#commentSign-" + item.id).find(".userName").css("display", "none");
|
|
119
|
+
}
|
|
120
|
+
}
|
|
121
|
+
|
|
111
122
|
if (result == 'success') {
|
|
112
123
|
$("#commentSign-" + item.id).removeClass('t-PR16');
|
|
113
124
|
$("#" + item.id + "_sucess").show();
|
|
@@ -254,7 +265,7 @@ var PageHome = function (_React$Component) {
|
|
|
254
265
|
|
|
255
266
|
var userNameHtml = _react2.default.createElement(
|
|
256
267
|
'span',
|
|
257
|
-
{ className: 't-PR5' },
|
|
268
|
+
{ className: 't-PR5 userName' },
|
|
258
269
|
item.replacename && item.replacename != "" ? item.replacename : item.userName
|
|
259
270
|
);
|
|
260
271
|
var dateHtml = _react2.default.createElement(
|
|
@@ -272,7 +283,7 @@ var PageHome = function (_React$Component) {
|
|
|
272
283
|
{ className: 't-PR5' },
|
|
273
284
|
item.orgShowName
|
|
274
285
|
);
|
|
275
|
-
var signPicHtml = item.signPic ? _react2.default.createElement('img', { className: 't-H64 t-PR5', src: t.state.loadImg + item.signPic }) : "";
|
|
286
|
+
var signPicHtml = item.signPic ? _react2.default.createElement('img', { className: 't-H64 t-PR5 signPic', src: t.state.loadImg + item.signPic }) : "";
|
|
276
287
|
var taskNameHtml = _react2.default.createElement(
|
|
277
288
|
'span',
|
|
278
289
|
{ className: 't-PR5' },
|
|
@@ -299,7 +310,7 @@ var PageHome = function (_React$Component) {
|
|
|
299
310
|
var replaceHtml = item.replacename && item.replacename != "" ? "(代" + item.userName + "办理)" : "";
|
|
300
311
|
return _react2.default.createElement(
|
|
301
312
|
Box,
|
|
302
|
-
{ style: { marginLeft: "auto", "text-align": "right", width: '100%' } },
|
|
313
|
+
{ className: 'comment-html', style: { marginLeft: "auto", "text-align": "right", width: '100%' } },
|
|
303
314
|
_returnHtml,
|
|
304
315
|
replaceHtml
|
|
305
316
|
);
|
|
@@ -462,7 +462,7 @@ var PageHome = function (_React$Component) {
|
|
|
462
462
|
selectProcessCode: '', //选中的子流程
|
|
463
463
|
subProcessType: '', //子流程类型 0串行 1并行
|
|
464
464
|
urgencyList: [], //紧急程度列表
|
|
465
|
-
urgency: '' }, _defineProperty(_param, 'urgent', ''), _defineProperty(_param, 'backInitiatorEndFlow', '0'), _defineProperty(_param, 'oauthWindowURL', ''), _param);
|
|
465
|
+
urgency: '' }, _defineProperty(_param, 'urgent', ''), _defineProperty(_param, 'backInitiatorEndFlow', '0'), _defineProperty(_param, 'oauthWindowURL', ''), _defineProperty(_param, 'isCaUser', '0'), _param);
|
|
466
466
|
FlowCommon = require('pages/flow_common/' + module).default ? require('pages/flow_common/' + module).default : require('pages/flow_common/' + module);
|
|
467
467
|
|
|
468
468
|
//处理特有参数
|
|
@@ -1193,6 +1193,10 @@ var PageHome = function (_React$Component) {
|
|
|
1193
1193
|
oauthWindowURL = content.oauthWindowURL;
|
|
1194
1194
|
t.openCaPage(oauthWindowURL);
|
|
1195
1195
|
}
|
|
1196
|
+
var isCaUser = "0";
|
|
1197
|
+
if (content.isCaUser && content.isCaUser != null && content.isCaUser != 'null' && typeof content.isCaUser != 'undefined' && content.isCaUser != '') {
|
|
1198
|
+
isCaUser = content.isCaUser;
|
|
1199
|
+
}
|
|
1196
1200
|
var commentBackAlert = [];
|
|
1197
1201
|
if (content.commentCasign == '1') {
|
|
1198
1202
|
commentCasign = '1';
|
|
@@ -1428,7 +1432,8 @@ var PageHome = function (_React$Component) {
|
|
|
1428
1432
|
urgencyList: urgencyList,
|
|
1429
1433
|
urgentSelectList: urgentSelectList,
|
|
1430
1434
|
backInitiatorEndFlow: backInitiatorEndFlow,
|
|
1431
|
-
oauthWindowURL: oauthWindowURL
|
|
1435
|
+
oauthWindowURL: oauthWindowURL,
|
|
1436
|
+
isCaUser: isCaUser
|
|
1432
1437
|
}, function () {
|
|
1433
1438
|
t.refs["selectMember_circulate"].initSelectData();
|
|
1434
1439
|
t.refs["selectMember_circulate1"].initSelectData();
|
|
@@ -4455,7 +4460,7 @@ var PageHome = function (_React$Component) {
|
|
|
4455
4460
|
if (param.commentId && param.commentId != "" && param.commentId != null && typeof param.commentId != "undefined") {
|
|
4456
4461
|
commentbizSn = param.commentId;
|
|
4457
4462
|
}
|
|
4458
|
-
if (param.hasCommentField == '1' && param.comment != "" && t.state.commentCasign == "1" &&
|
|
4463
|
+
if (param.hasCommentField == '1' && param.comment != "" && t.state.commentCasign == "1" && t.state.isCaUser == '1' && t.state.caIsPrd == '1') {
|
|
4459
4464
|
param.commentbizSn = commentbizSn;
|
|
4460
4465
|
}
|
|
4461
4466
|
if (t.state.dataId != '' && t.state.dataId != null) {
|
|
@@ -4484,22 +4489,22 @@ var PageHome = function (_React$Component) {
|
|
|
4484
4489
|
}
|
|
4485
4490
|
|
|
4486
4491
|
//批示意见CA加签
|
|
4487
|
-
if (param.hasCommentField == '1' && param.comment != "" && t.state.commentCasign == "1" &&
|
|
4492
|
+
if (param.hasCommentField == '1' && param.comment != "" && t.state.commentCasign == "1" && t.state.isCaUser == '1' && t.state.caIsPrd == '1') {
|
|
4488
4493
|
t.commentSignCA(commentbizSn, param.comment);
|
|
4489
|
-
} else if (param.hasCommentField == '1' && param.comment != "" && t.state.commentCasign == "1" &&
|
|
4494
|
+
} else if (param.hasCommentField == '1' && param.comment != "" && t.state.commentCasign == "1" && t.state.isCaUser == '1') {
|
|
4490
4495
|
//二开批示意见CA加签
|
|
4491
4496
|
if (typeof mobileExt !== 'undefined' && typeof mobileExt["operateCallBack"] === "function") {
|
|
4492
4497
|
mobileExt["commentSignCA"]({ type: type, dataId: dataId, isBatch: 0 }, t.state);
|
|
4493
4498
|
}
|
|
4494
4499
|
}
|
|
4495
4500
|
|
|
4496
|
-
// if(
|
|
4501
|
+
// if(t.state.isCaUser='1' && t.state.caIsPrd=='1'){
|
|
4497
4502
|
// //CA加签
|
|
4498
4503
|
// setTimeout(
|
|
4499
4504
|
// function () {
|
|
4500
4505
|
// t.fieldSignCA(dataId,param.formData);
|
|
4501
4506
|
// },10);
|
|
4502
|
-
// }else if(
|
|
4507
|
+
// }else if(t.state.isCaUser='1' ){
|
|
4503
4508
|
// //项目二开CA加签
|
|
4504
4509
|
// if(typeof mobileExt !== 'undefined' && typeof mobileExt["operateCallBack"] === "function"){
|
|
4505
4510
|
// mobileExt["fieldSignCA"]({type:type,dataId:dataId,isBatch:0},t.state);
|
|
@@ -4825,7 +4830,7 @@ var PageHome = function (_React$Component) {
|
|
|
4825
4830
|
commentbizSn = param.commentId;
|
|
4826
4831
|
}
|
|
4827
4832
|
|
|
4828
|
-
// if(param.hasCommentField=='1'&¶m.comment!=""&&t.state.commentCasign=="1"&&
|
|
4833
|
+
// if(param.hasCommentField=='1'&¶m.comment!=""&&t.state.commentCasign=="1"&&t.state.isCaUser='1' && t.state.caIsPrd=='1'){
|
|
4829
4834
|
// param.commentbizSn=commentbizSn;
|
|
4830
4835
|
// }
|
|
4831
4836
|
param.commentbizSn = commentbizSn;
|
|
@@ -4875,9 +4880,9 @@ var PageHome = function (_React$Component) {
|
|
|
4875
4880
|
|
|
4876
4881
|
|
|
4877
4882
|
//批示意见CA加签
|
|
4878
|
-
if (param.hasCommentField == '1' && param.comment != "" && t.state.commentCasign == "1" &&
|
|
4883
|
+
if (param.hasCommentField == '1' && param.comment != "" && t.state.commentCasign == "1" && t.state.isCaUser == '1' && t.state.caIsPrd == '1') {
|
|
4879
4884
|
t.commentSignCA(commentbizSn, param.comment);
|
|
4880
|
-
} else if (param.hasCommentField == '1' && param.comment != "" && t.state.commentCasign == "1" &&
|
|
4885
|
+
} else if (param.hasCommentField == '1' && param.comment != "" && t.state.commentCasign == "1" && t.state.isCaUser == '1') {
|
|
4881
4886
|
//二开批示意见CA加签
|
|
4882
4887
|
if (typeof mobileExt !== 'undefined' && typeof mobileExt["operateCallBack"] === "function") {
|
|
4883
4888
|
mobileExt["commentSignCA"]({ type: type, dataId: dataId, isBatch: 0 }, t.state);
|
|
@@ -4888,12 +4893,12 @@ var PageHome = function (_React$Component) {
|
|
|
4888
4893
|
mobileExt["operateCallBack"]({ type: type, dataId: dataId, isBatch: 0 }, t.state);
|
|
4889
4894
|
}
|
|
4890
4895
|
|
|
4891
|
-
if (
|
|
4896
|
+
if (t.state.isCaUser == '1' && t.state.caIsPrd == '1') {
|
|
4892
4897
|
//CA加签
|
|
4893
4898
|
setTimeout(function () {
|
|
4894
4899
|
t.fieldSignCA(dataId);
|
|
4895
4900
|
}, 10);
|
|
4896
|
-
} else if (
|
|
4901
|
+
} else if (t.state.isCaUser == '1') {
|
|
4897
4902
|
//项目二开CA加签
|
|
4898
4903
|
if (typeof mobileExt !== 'undefined' && typeof mobileExt["operateCallBack"] === "function") {
|
|
4899
4904
|
mobileExt["fieldSignCA"]({ type: type, dataId: dataId, isBatch: 0 }, t.state);
|
|
@@ -4979,7 +4984,9 @@ var PageHome = function (_React$Component) {
|
|
|
4979
4984
|
_db2.default.FlowApproval.signCA({
|
|
4980
4985
|
bizSn: commentbizSn,
|
|
4981
4986
|
relationId: getLoginUserInfo().mobile,
|
|
4982
|
-
msg: comment
|
|
4987
|
+
msg: comment,
|
|
4988
|
+
isComment: '1',
|
|
4989
|
+
fileName: getLoginUserInfo().mobile
|
|
4983
4990
|
}).then(function (content) {}).catch(function (error) {
|
|
4984
4991
|
console.log(error);
|
|
4985
4992
|
});
|
|
@@ -5404,7 +5411,7 @@ var PageHome = function (_React$Component) {
|
|
|
5404
5411
|
if (param.commentId && param.commentId != "" && param.commentId != null && typeof param.commentId != "undefined") {
|
|
5405
5412
|
commentbizSn = param.commentId;
|
|
5406
5413
|
}
|
|
5407
|
-
if (param.hasCommentField == '1' && param.comment != "" && t.state.commentCasign == "1" &&
|
|
5414
|
+
if (param.hasCommentField == '1' && param.comment != "" && t.state.commentCasign == "1" && t.state.isCaUser == '1' && t.state.caIsPrd == '1') {
|
|
5408
5415
|
param.commentbizSn = commentbizSn;
|
|
5409
5416
|
}
|
|
5410
5417
|
// Dialog.confirm({
|
|
@@ -5425,9 +5432,9 @@ var PageHome = function (_React$Component) {
|
|
|
5425
5432
|
content: t.state.finalButtons.get("BASE_TRANSFER") + '成功'
|
|
5426
5433
|
});
|
|
5427
5434
|
//批示意见CA加签
|
|
5428
|
-
if (t.state.hasCommentField == '1' && newComment != "" && t.state.commentCasign == "1" &&
|
|
5435
|
+
if (t.state.hasCommentField == '1' && newComment != "" && t.state.commentCasign == "1" && t.state.isCaUser == '1' && t.state.caIsPrd == '1') {
|
|
5429
5436
|
t.commentSignCA(commentbizSn, newComment);
|
|
5430
|
-
} else if (t.state.hasCommentField == '1' && newComment != "" && t.state.commentCasign == "1" &&
|
|
5437
|
+
} else if (t.state.hasCommentField == '1' && newComment != "" && t.state.commentCasign == "1" && t.state.isCaUser == '1') {
|
|
5431
5438
|
//二开批示意见CA加签
|
|
5432
5439
|
if (typeof mobileExt !== 'undefined' && typeof mobileExt["operateCallBack"] === "function") {
|
|
5433
5440
|
mobileExt["commentSignCA"]({ type: type, dataId: dataId, isBatch: 0 }, t.state);
|
|
@@ -5436,12 +5443,12 @@ var PageHome = function (_React$Component) {
|
|
|
5436
5443
|
if (typeof mobileExt !== 'undefined' && typeof mobileExt["operateCallBack"] === "function") {
|
|
5437
5444
|
mobileExt["operateCallBack"]({ type: type, dataId: dataId, isBatch: 0 }, t.state);
|
|
5438
5445
|
}
|
|
5439
|
-
if (
|
|
5446
|
+
if (t.state.isCaUser == '1' && t.state.caIsPrd == '1') {
|
|
5440
5447
|
//CA加签
|
|
5441
5448
|
setTimeout(function () {
|
|
5442
5449
|
t.fieldSignCA(dataId);
|
|
5443
5450
|
}, 10);
|
|
5444
|
-
} else if (
|
|
5451
|
+
} else if (t.state.isCaUser == '1') {
|
|
5445
5452
|
//项目二开CA加签
|
|
5446
5453
|
if (typeof mobileExt !== 'undefined' && typeof mobileExt["operateCallBack"] === "function") {
|
|
5447
5454
|
mobileExt["fieldSignCA"]({ type: type, dataId: dataId, isBatch: 0 }, t.state);
|
|
@@ -6030,7 +6037,7 @@ var PageHome = function (_React$Component) {
|
|
|
6030
6037
|
if (param.commentId && param.commentId != "" && param.commentId != null && typeof param.commentId != "undefined") {
|
|
6031
6038
|
commentbizSn = param.commentId;
|
|
6032
6039
|
}
|
|
6033
|
-
if (param.hasCommentField == '1' && param.comment != "" && t.state.commentCasign == "1" &&
|
|
6040
|
+
if (param.hasCommentField == '1' && param.comment != "" && t.state.commentCasign == "1" && t.state.isCaUser == '1' && t.state.caIsPrd == '1') {
|
|
6034
6041
|
param.commentbizSn = commentbizSn;
|
|
6035
6042
|
}
|
|
6036
6043
|
// Dialog.confirm({
|
|
@@ -6057,9 +6064,9 @@ var PageHome = function (_React$Component) {
|
|
|
6057
6064
|
|
|
6058
6065
|
|
|
6059
6066
|
//批示意见CA加签
|
|
6060
|
-
if (t.state.hasCommentField == '1' && t.state.spyj != "" && t.state.commentCasign == "1" &&
|
|
6067
|
+
if (t.state.hasCommentField == '1' && t.state.spyj != "" && t.state.commentCasign == "1" && t.state.isCaUser == '1' && t.state.caIsPrd == '1') {
|
|
6061
6068
|
t.commentSignCA(commentbizSn, t.state.spyj);
|
|
6062
|
-
} else if (t.state.hasCommentField == '1' && t.state.spyj != "" && t.state.commentCasign == "1" &&
|
|
6069
|
+
} else if (t.state.hasCommentField == '1' && t.state.spyj != "" && t.state.commentCasign == "1" && t.state.isCaUser == '1') {
|
|
6063
6070
|
//二开批示意见CA加签
|
|
6064
6071
|
if (typeof mobileExt !== 'undefined' && typeof mobileExt["operateCallBack"] === "function") {
|
|
6065
6072
|
mobileExt["commentSignCA"]({ type: type, dataId: dataId, isBatch: 0 }, t.state);
|
|
@@ -6068,12 +6075,12 @@ var PageHome = function (_React$Component) {
|
|
|
6068
6075
|
if (typeof mobileExt !== 'undefined' && typeof mobileExt["operateCallBack"] === "function") {
|
|
6069
6076
|
mobileExt["operateCallBack"]({ type: type, dataId: dataId, isBatch: 0 }, t.state);
|
|
6070
6077
|
}
|
|
6071
|
-
if (
|
|
6078
|
+
if (t.state.isCaUser = '1' && t.state.caIsPrd == '1') {
|
|
6072
6079
|
//CA加签
|
|
6073
6080
|
setTimeout(function () {
|
|
6074
6081
|
t.fieldSignCA(dataId);
|
|
6075
6082
|
}, 10);
|
|
6076
|
-
} else if (
|
|
6083
|
+
} else if (t.state.isCaUser = '1') {
|
|
6077
6084
|
//项目二开CA加签
|
|
6078
6085
|
if (typeof mobileExt !== 'undefined' && typeof mobileExt["operateCallBack"] === "function") {
|
|
6079
6086
|
mobileExt["fieldSignCA"]({ type: type, dataId: dataId, isBatch: 0 }, t.state);
|