fmui-base 2.0.2 → 2.0.4
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 +28 -26
- package/lib/form/form.js +7 -3
- package/lib/form/table.js +21 -15
- package/lib/process_info/processInfo.js +187 -64
- package/lib/selectMember/select.js +20 -7
- package/package.json +1 -1
package/README.md
CHANGED
package/lib/comment_list/List.js
CHANGED
|
@@ -97,33 +97,35 @@ var PageHome = function (_React$Component) {
|
|
|
97
97
|
key: 'casigin',
|
|
98
98
|
value: function casigin() {
|
|
99
99
|
var commentList = this.props.list;
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
100
|
+
if (commentList) {
|
|
101
|
+
commentList.map(function (item) {
|
|
102
|
+
var param = {};
|
|
103
|
+
param.bizSn = item.id;
|
|
104
|
+
param.relationId = getLoginUserInfo().mobile;
|
|
105
|
+
param.msg = item.fullMessage;
|
|
106
|
+
// setTimeout(function(){
|
|
107
|
+
// $("#"+item.id+"_sucess").show();
|
|
108
|
+
// },1000)
|
|
109
|
+
_db2.default.FlowApproval.verifySign(param).then(function (content) {
|
|
110
|
+
var result = content.verifySignRes;
|
|
111
|
+
if (result == 'success') {
|
|
112
|
+
$("#commentSign-" + item.id).removeClass('t-PR16');
|
|
113
|
+
$("#" + item.id + "_sucess").show();
|
|
114
|
+
}
|
|
115
|
+
}).catch(function (error) {
|
|
116
|
+
if (error.errorMsg == "签名值与原文不匹配") {
|
|
117
|
+
$("#commentSign-" + item.id).removeClass('t-PR16');
|
|
118
|
+
$("#" + item.id + "_fail").show();
|
|
119
|
+
}
|
|
120
|
+
// else{
|
|
121
|
+
// Toast.show({
|
|
122
|
+
// type: 'error',
|
|
123
|
+
// content: error.errorMsg,
|
|
124
|
+
// });
|
|
125
|
+
// }
|
|
126
|
+
});
|
|
125
127
|
});
|
|
126
|
-
}
|
|
128
|
+
}
|
|
127
129
|
}
|
|
128
130
|
|
|
129
131
|
//初始化ids
|
package/lib/form/form.js
CHANGED
|
@@ -1040,6 +1040,10 @@ var PageHome = function (_React$Component) {
|
|
|
1040
1040
|
if (form.popuserMap.chooseScope == 5) {
|
|
1041
1041
|
itemParam.queryLimit = form.popuserMap.chooseScope;
|
|
1042
1042
|
itemParam.limitData = getLoginUserInfo().orgId;
|
|
1043
|
+
} else if (form.popuserMap.chooseScope == "4") {
|
|
1044
|
+
//查上级
|
|
1045
|
+
itemParam.queryLimit = "3";
|
|
1046
|
+
itemParam.limitData = form.popuserMap.chooseScopeVal;
|
|
1043
1047
|
} else if (form.popuserMap.chooseScope == "all") {} else {
|
|
1044
1048
|
itemParam.queryLimit = 5;
|
|
1045
1049
|
itemParam.limitData = form.popuserMap.chooseScope;
|
|
@@ -2723,7 +2727,7 @@ var PageHome = function (_React$Component) {
|
|
|
2723
2727
|
required: t.state.itemParam.required,
|
|
2724
2728
|
label: t.state.itemParam.title,
|
|
2725
2729
|
readOnly: t.state.itemParam.readOnly,
|
|
2726
|
-
minRows:
|
|
2730
|
+
minRows: 1,
|
|
2727
2731
|
placeholder: t.state.itemParam.readOnly ? '' : t.state.itemParam.placeholder,
|
|
2728
2732
|
value: t.state.itemParam.value,
|
|
2729
2733
|
onChange: function onChange(value) {
|
|
@@ -2747,7 +2751,7 @@ var PageHome = function (_React$Component) {
|
|
|
2747
2751
|
required: t.state.itemParam.required,
|
|
2748
2752
|
label: t.state.itemParam.title,
|
|
2749
2753
|
readOnly: t.state.itemParam.readOnly,
|
|
2750
|
-
minRows:
|
|
2754
|
+
minRows: 1,
|
|
2751
2755
|
placeholder: t.state.itemParam.readOnly ? '' : t.state.itemParam.placeholder,
|
|
2752
2756
|
value: t.state.itemParam.value,
|
|
2753
2757
|
onChange: function onChange(value) {
|
|
@@ -3076,7 +3080,7 @@ var PageHome = function (_React$Component) {
|
|
|
3076
3080
|
{ id: t.state.prefixName + "_" + t.state.itemParam.key },
|
|
3077
3081
|
_react2.default.createElement(_TextareaField2.default, {
|
|
3078
3082
|
readOnly: false,
|
|
3079
|
-
minRows:
|
|
3083
|
+
minRows: 1, maxRows: 5,
|
|
3080
3084
|
placeholder: '请输入批示意见',
|
|
3081
3085
|
value: t.state.spyj,
|
|
3082
3086
|
onChange: this.changeSpyj3.bind(this) })
|
package/lib/form/table.js
CHANGED
|
@@ -86,8 +86,8 @@ var PageHome = function (_React$Component) {
|
|
|
86
86
|
var defaultValue = props.defaultValue;
|
|
87
87
|
var status = props.status;
|
|
88
88
|
var formRelaField = props.formRelaField; //关联字段
|
|
89
|
-
var linkFields = props.allForm.linkFields; //级联字段
|
|
90
|
-
var formId = props.data.formId; //表单id
|
|
89
|
+
var linkFields = props.allForm ? props.allForm.linkFields : ""; //级联字段
|
|
90
|
+
var formId = props.data ? props.data.formId : ""; //表单id
|
|
91
91
|
|
|
92
92
|
//关联字段
|
|
93
93
|
var formRelaFieldMapsNew = {};
|
|
@@ -230,7 +230,9 @@ var PageHome = function (_React$Component) {
|
|
|
230
230
|
};
|
|
231
231
|
|
|
232
232
|
var module = props.module && props.module != "undefined" ? props.module : "approve";
|
|
233
|
-
|
|
233
|
+
try {
|
|
234
|
+
FlowCommon = require('pages/flow_common/' + module).default ? require('pages/flow_common/' + module).default : require('pages/flow_common/' + module);
|
|
235
|
+
} catch (error) {}
|
|
234
236
|
|
|
235
237
|
// DB.form.getRelaFieldsMap({
|
|
236
238
|
// formId: formId,
|
|
@@ -302,8 +304,8 @@ var PageHome = function (_React$Component) {
|
|
|
302
304
|
value: function change(data, itemParam) {
|
|
303
305
|
var t = this;
|
|
304
306
|
var module = t.props.module;
|
|
305
|
-
var formKey = t.props.allForm.formcode;
|
|
306
|
-
var formTblId = t.props.allForm.formTblId;
|
|
307
|
+
var formKey = t.props.allForm ? t.props.allForm.formcode : "";
|
|
308
|
+
var formTblId = t.props.allForm ? t.props.allForm.formTblId : "";
|
|
307
309
|
if (itemParam && itemParam.key) {
|
|
308
310
|
//修改事件的时候
|
|
309
311
|
|
|
@@ -1472,15 +1474,19 @@ var PageHome = function (_React$Component) {
|
|
|
1472
1474
|
|
|
1473
1475
|
var t = this;
|
|
1474
1476
|
var allForm = this.props.allForm;
|
|
1475
|
-
var tabCodes =
|
|
1476
|
-
var tabNames =
|
|
1477
|
+
var tabCodes = [];
|
|
1478
|
+
var tabNames = [];
|
|
1479
|
+
if (allForm) {
|
|
1480
|
+
tabCodes = allForm.tabCodes;
|
|
1481
|
+
tabNames = allForm.tabNames;
|
|
1482
|
+
}
|
|
1477
1483
|
return _react2.default.createElement(
|
|
1478
1484
|
'div',
|
|
1479
1485
|
null,
|
|
1480
1486
|
_react2.default.createElement(
|
|
1481
1487
|
'div',
|
|
1482
1488
|
null,
|
|
1483
|
-
tabCodes == null || tabCodes.length < 2 ? this.props.form.map(function (item, i) {
|
|
1489
|
+
tabCodes == null || tabCodes.length < 2 ? this.props.form ? this.props.form.map(function (item, i) {
|
|
1484
1490
|
return item.itemType == 'twocolumns' || item.itemType == 'threecolumns' ? item.children.map(function (item2, j) {
|
|
1485
1491
|
return _react2.default.createElement(
|
|
1486
1492
|
'div',
|
|
@@ -1496,7 +1502,7 @@ var PageHome = function (_React$Component) {
|
|
|
1496
1502
|
null,
|
|
1497
1503
|
_react2.default.createElement(_form2.default, { ref: item.uniqueName, keyNo: i, operate: t.props.operate, newspyj: t.props.newspyj, hasCommentField: t.props.hasCommentField, commentField: t.props.commentField, module: t.props.module, formKey: t.props.allForm.formcode, status: t.props.status, form: item, allForm: t.props.allForm, formStyle: t.props.formStyleObj, commentList: t.props.commentFieldList, defaultValue: t.props.defaultValue, data: t.props.data, fieldControll: t.props.fieldControll, caIsPrd: t.props.caIsPrd, preCaFields: t.props.preCaFields, formRelaFieldMaps: t.state.formRelaFieldMaps, linkFields: t.state.linkFields, onChange: this.change.bind(this) })
|
|
1498
1504
|
);
|
|
1499
|
-
}.bind(this)) : _react2.default.createElement(
|
|
1505
|
+
}.bind(this)) : "" : _react2.default.createElement(
|
|
1500
1506
|
'div',
|
|
1501
1507
|
null,
|
|
1502
1508
|
_react2.default.createElement(
|
|
@@ -1536,10 +1542,10 @@ var PageHome = function (_React$Component) {
|
|
|
1536
1542
|
)
|
|
1537
1543
|
)
|
|
1538
1544
|
),
|
|
1539
|
-
_react2.default.createElement('div', { className: t.props.commentBackList.length > 0 ? "t-H10 t-BCf7" : 't-DN' }),
|
|
1545
|
+
_react2.default.createElement('div', { className: t.props.commentBackList && t.props.commentBackList.length > 0 ? "t-H10 t-BCf7" : 't-DN' }),
|
|
1540
1546
|
_react2.default.createElement(
|
|
1541
1547
|
'div',
|
|
1542
|
-
{ className: t.props.commentBackList.length > 0 ? '' : 't-DN' },
|
|
1548
|
+
{ className: t.props.commentBackList && t.props.commentBackList.length > 0 ? '' : 't-DN' },
|
|
1543
1549
|
_react2.default.createElement(
|
|
1544
1550
|
HBox,
|
|
1545
1551
|
{ className: 't-field-box' },
|
|
@@ -1555,10 +1561,10 @@ var PageHome = function (_React$Component) {
|
|
|
1555
1561
|
)
|
|
1556
1562
|
)
|
|
1557
1563
|
),
|
|
1558
|
-
_react2.default.createElement('div', { className: t.props.commentDefaultList.length > 0 ? "t-H10 t-BCf7" : 't-DN' }),
|
|
1564
|
+
_react2.default.createElement('div', { className: t.props.commentDefaultList && t.props.commentDefaultList.length > 0 ? "t-H10 t-BCf7" : 't-DN' }),
|
|
1559
1565
|
_react2.default.createElement(
|
|
1560
1566
|
'div',
|
|
1561
|
-
{ className: t.props.commentDefaultList.length > 0 ? '' : 't-DN' },
|
|
1567
|
+
{ className: t.props.commentDefaultList && t.props.commentDefaultList.length > 0 ? '' : 't-DN' },
|
|
1562
1568
|
_react2.default.createElement(
|
|
1563
1569
|
HBox,
|
|
1564
1570
|
{ className: 'flex-comment t-field-box' },
|
|
@@ -1615,10 +1621,10 @@ var PageHome = function (_React$Component) {
|
|
|
1615
1621
|
)
|
|
1616
1622
|
)
|
|
1617
1623
|
),
|
|
1618
|
-
_react2.default.createElement('div', { className: t.props.commentDefaultList.length == 0 ? "t-H10 t-BCf7" : 't-DN' }),
|
|
1624
|
+
_react2.default.createElement('div', { className: t.props.commentDefaultList && t.props.commentDefaultList.length == 0 ? "t-H10 t-BCf7" : 't-DN' }),
|
|
1619
1625
|
_react2.default.createElement(
|
|
1620
1626
|
'div',
|
|
1621
|
-
{ className: t.props.commentDefaultList.length == 0 && t.props.commentField == "default" ? '' : 't-DN' },
|
|
1627
|
+
{ className: t.props.commentDefaultList && t.props.commentDefaultList.length == 0 && t.props.commentField == "default" ? '' : 't-DN' },
|
|
1622
1628
|
_react2.default.createElement(
|
|
1623
1629
|
HBox,
|
|
1624
1630
|
{ className: 't-field-box' },
|
|
@@ -424,7 +424,11 @@ var PageHome = function (_React$Component) {
|
|
|
424
424
|
commentBackAlert: [], //退回批示意见弹出
|
|
425
425
|
showCommentBackAlert: true //显示退回批示意见弹出
|
|
426
426
|
};
|
|
427
|
-
|
|
427
|
+
try {
|
|
428
|
+
FlowCommon = require('pages/flow_common/' + module).default ? require('pages/flow_common/' + module).default : require('pages/flow_common/' + module);
|
|
429
|
+
} catch (error) {
|
|
430
|
+
alert("流程缺少扩展js，" + error);
|
|
431
|
+
}
|
|
428
432
|
|
|
429
433
|
//处理特有参数
|
|
430
434
|
if (typeof FlowCommon.dealwithCommonParam === "function") {
|
|
@@ -1286,7 +1290,7 @@ var PageHome = function (_React$Component) {
|
|
|
1286
1290
|
formRelaField: formRelaField,
|
|
1287
1291
|
dealReminderContent: dealReminderContent
|
|
1288
1292
|
});
|
|
1289
|
-
t.dealWithButtons(content);
|
|
1293
|
+
t.dealWithButtons(content, formKey);
|
|
1290
1294
|
}, function (error) {
|
|
1291
1295
|
setTimeout(function () {
|
|
1292
1296
|
_Toast2.default.show({
|
|
@@ -1313,19 +1317,54 @@ var PageHome = function (_React$Component) {
|
|
|
1313
1317
|
|
|
1314
1318
|
}, {
|
|
1315
1319
|
key: 'dealWithButtons',
|
|
1316
|
-
value: function dealWithButtons(content) {
|
|
1320
|
+
value: function dealWithButtons(content, formKey) {
|
|
1317
1321
|
var t = this;
|
|
1322
|
+
var module = t.state.module;
|
|
1318
1323
|
//处理特有按钮事件
|
|
1319
1324
|
|
|
1325
|
+
if (t.state.listType == "0") {
|
|
1326
|
+
//待办默认提交和保存按钮
|
|
1327
|
+
var buttons = content.buttons;
|
|
1328
|
+
|
|
1329
|
+
if (buttons) {
|
|
1330
|
+
var lastChar = buttons.substring(buttons.length - 1, buttons.length);
|
|
1331
|
+
if (lastChar != ",") {
|
|
1332
|
+
buttons += ",";
|
|
1333
|
+
}
|
|
1334
|
+
}
|
|
1335
|
+
if (buttons.indexOf('PAGE_SAVE,') == -1) {
|
|
1336
|
+
buttons += "PAGE_SAVE,";
|
|
1337
|
+
}
|
|
1338
|
+
if (buttons.indexOf('BASE_SUMBIT,') == -1) {
|
|
1339
|
+
buttons += "BASE_SUMBIT,";
|
|
1340
|
+
}
|
|
1341
|
+
content.buttons = buttons;
|
|
1342
|
+
}
|
|
1320
1343
|
if (typeof FlowCommon.dealwithCommonButton === "function") {
|
|
1321
|
-
FlowCommon.dealwithCommonButton(
|
|
1322
|
-
|
|
1344
|
+
FlowCommon.dealwithCommonButton(t.state, function (extensionButtonList, contentNew) {
|
|
1345
|
+
//项目开发扩展
|
|
1346
|
+
if (!contentNew) {
|
|
1347
|
+
contentNew = content;
|
|
1348
|
+
}
|
|
1349
|
+
var mobileExt;
|
|
1350
|
+
try {
|
|
1351
|
+
if (formKey) {
|
|
1352
|
+
mobileExt = typeof eval(module + "_" + formKey + "_mobileExt") !== 'undefined' ? eval(module + "_" + formKey + "_mobileExt") : null;
|
|
1353
|
+
}
|
|
1354
|
+
} catch (e) {}
|
|
1355
|
+
if (typeof mobileExt !== 'undefined' && typeof mobileExt["dealwithCommonButtonExt"] === "function") {
|
|
1356
|
+
mobileExt["dealwithCommonButtonExt"](t.state, contentNew, extensionButtonList, function (contentNewExt, extensionButtonListExt) {
|
|
1357
|
+
t.dealwithButtonsFunc(contentNewExt, extensionButtonListExt);
|
|
1358
|
+
});
|
|
1359
|
+
} else {
|
|
1360
|
+
t.dealwithButtonsFunc(contentNew, extensionButtonList);
|
|
1361
|
+
}
|
|
1323
1362
|
}, function (error) {
|
|
1324
1363
|
_Toast2.default.show({
|
|
1325
1364
|
type: 'error',
|
|
1326
1365
|
content: error
|
|
1327
1366
|
});
|
|
1328
|
-
});
|
|
1367
|
+
}, content);
|
|
1329
1368
|
} else {
|
|
1330
1369
|
t.dealwithButtonsFunc(content, []);
|
|
1331
1370
|
}
|
|
@@ -1356,39 +1395,27 @@ var PageHome = function (_React$Component) {
|
|
|
1356
1395
|
var listType = this.state.listType;
|
|
1357
1396
|
if (listType == "0") {
|
|
1358
1397
|
//待办
|
|
1359
|
-
for
|
|
1360
|
-
|
|
1361
|
-
}
|
|
1398
|
+
// for(var d=0; d<extensionButtonList.length;d++){
|
|
1399
|
+
// buttonArray.push(extensionButtonList[d].no);
|
|
1400
|
+
// }
|
|
1362
1401
|
for (var b = 0; b < buttonArray.length; b++) {
|
|
1363
1402
|
var buttonCode = buttonArray[b];
|
|
1364
1403
|
//PAGE_SAVE保存按钮只有当新建时才有，HELP_ADDLOTS加签只有在会签和串签才有,RADOM_FINISH随机流程完成按钮去掉
|
|
1365
|
-
if (buttonCode == 'FLOW_REVOKE' || buttonCode == 'RADOM_FINISH' || buttonCode == 'FLOW_CANCEL' || buttonCode == 'FLOW_RECOVER' || buttonCode == 'PAGE_PRINT' || buttonCode == 'PAGE_URGE' || buttonCode == 'PAGE_REDSET' || buttonCode == 'PAGE_FEEDBACK' || buttonCode == 'RECORD' || buttonCode == 'HELP_ADDLOTS' && (participantMode == '0' || participantMode == '3')) {
|
|
1404
|
+
if (buttonCode == 'OTHER_RELATION' || buttonCode == 'HELP_CIRCULATE' || buttonCode == 'BASE_INVALID' || buttonCode == 'FLOW_REVOKE' || buttonCode == 'RADOM_FINISH' || buttonCode == 'FLOW_CANCEL' || buttonCode == 'FLOW_RECOVER' || buttonCode == 'PAGE_PRINT' || buttonCode == 'PAGE_URGE' || buttonCode == 'PAGE_REDSET' || buttonCode == 'PAGE_FEEDBACK' || buttonCode == 'RECORD' || buttonCode == 'HELP_ADDLOTS' && (participantMode == '0' || participantMode == '3')) {
|
|
1366
1405
|
continue;
|
|
1367
1406
|
} else {
|
|
1368
1407
|
if (dataId == '' || isStart == true && permissionCode == 'start' || isDraft == '1') {
|
|
1369
|
-
if
|
|
1370
|
-
|
|
1371
|
-
}
|
|
1372
|
-
if (buttonCode.indexOf('PAGE_SAVE') == -1) {
|
|
1373
|
-
buttonArrayNew.push('PAGE_SAVE');
|
|
1374
|
-
}
|
|
1375
|
-
if (buttonCode.indexOf('BASE_SUMBIT') == -1) {
|
|
1376
|
-
buttonArrayNew.push('BASE_SUMBIT');
|
|
1377
|
-
}
|
|
1408
|
+
// if(buttonCode == 'PAGE_SAVE' || buttonCode == 'BASE_SUMBIT'){
|
|
1409
|
+
buttonArrayNew.push(buttonCode);
|
|
1410
|
+
// }
|
|
1378
1411
|
} else {
|
|
1379
|
-
if (buttonCode.indexOf('PAGE_SAVE') == -1) {
|
|
1380
|
-
buttonArrayNew.push('PAGE_SAVE');
|
|
1381
|
-
}
|
|
1382
|
-
if (buttonCode.indexOf('BASE_SUMBIT') == -1) {
|
|
1383
|
-
buttonArrayNew.push('BASE_SUMBIT');
|
|
1384
|
-
}
|
|
1385
1412
|
if (buttonCode != '') {
|
|
1386
1413
|
buttonArrayNew.push(buttonCode);
|
|
1387
1414
|
}
|
|
1388
1415
|
}
|
|
1389
1416
|
}
|
|
1390
1417
|
}
|
|
1391
|
-
this.getListButtonsByCodes(buttonArrayNew.join(','), dataId, isStart);
|
|
1418
|
+
this.getListButtonsByCodes(buttonArrayNew.join(','), dataId, isStart, extensionButtonList);
|
|
1392
1419
|
} else if (listType == "2") {
|
|
1393
1420
|
//已办
|
|
1394
1421
|
|
|
@@ -1396,21 +1423,21 @@ var PageHome = function (_React$Component) {
|
|
|
1396
1423
|
if (buttons.indexOf('FLOW_REVOKE') >= 0) {
|
|
1397
1424
|
if (this.state.processIsComplete == "0") {
|
|
1398
1425
|
//当流程未结束时
|
|
1399
|
-
buttonList.push({ name: t.state.finalButtons.get("FLOW_REVOKE"), type: 'secondary', display: '
|
|
1426
|
+
buttonList.push({ name: t.state.finalButtons.get("FLOW_REVOKE"), type: 'secondary', display: 'inline', no: 7 });
|
|
1400
1427
|
}
|
|
1401
1428
|
}
|
|
1402
1429
|
if (buttons.indexOf('FLOW_RECOVER') >= 0) {
|
|
1403
1430
|
if (this.state.processIsComplete == "0") {
|
|
1404
1431
|
//当流程未结束时
|
|
1405
|
-
buttonList.push({ name: t.state.finalButtons.get("FLOW_RECOVER"), type: 'secondary', display: '
|
|
1432
|
+
buttonList.push({ name: t.state.finalButtons.get("FLOW_RECOVER"), type: 'secondary', display: 'inline', no: 14 });
|
|
1406
1433
|
}
|
|
1407
1434
|
}
|
|
1408
1435
|
if (t.state.urgeDataList != null && t.state.urgeDataList.length > 0) {
|
|
1409
|
-
buttonList.push({ name: t.state.finalButtons.get("PAGE_URGE"), type: 'secondary', display: '
|
|
1436
|
+
buttonList.push({ name: t.state.finalButtons.get("PAGE_URGE"), type: 'secondary', display: 'inline', no: 12 });
|
|
1410
1437
|
}
|
|
1411
1438
|
}
|
|
1412
1439
|
if (buttons.indexOf('HELP_CIRCULATE') >= 0) {
|
|
1413
|
-
buttonList.push({ name: t.state.finalButtons.get("HELP_CIRCULATE"), type: 'secondary', display: '
|
|
1440
|
+
buttonList.push({ name: t.state.finalButtons.get("HELP_CIRCULATE"), type: 'secondary', display: 'inline', no: 4 });
|
|
1414
1441
|
}
|
|
1415
1442
|
for (var d = 0; d < extensionButtonList.length; d++) {
|
|
1416
1443
|
buttonList.push(extensionButtonList[d]);
|
|
@@ -1421,22 +1448,22 @@ var PageHome = function (_React$Component) {
|
|
|
1421
1448
|
//当流程未结束时,
|
|
1422
1449
|
if (buttons.indexOf('FLOW_CANCEL') >= 0) {
|
|
1423
1450
|
//取消按钮
|
|
1424
|
-
buttonList.push({ name: t.state.finalButtons.get("FLOW_CANCEL"), type: 'secondary', display: '
|
|
1451
|
+
buttonList.push({ name: t.state.finalButtons.get("FLOW_CANCEL"), type: 'secondary', display: 'inline', no: 11 });
|
|
1425
1452
|
}
|
|
1426
1453
|
if (startButtons) {
|
|
1427
1454
|
if (startButtons.indexOf('FLOW_REVOKE') >= 0) {
|
|
1428
1455
|
//发起人撤销按钮
|
|
1429
|
-
buttonList.push({ name: t.state.finalButtons.get("FLOW_REVOKE"), type: 'secondary', display: '
|
|
1456
|
+
buttonList.push({ name: t.state.finalButtons.get("FLOW_REVOKE"), type: 'secondary', display: 'inline', no: 7 });
|
|
1430
1457
|
}
|
|
1431
1458
|
}
|
|
1432
1459
|
if (t.state.urgeDataList != null && t.state.urgeDataList.length > 0) {
|
|
1433
|
-
buttonList.push({ name: t.state.finalButtons.get("PAGE_URGE"), type: 'secondary', display: '
|
|
1460
|
+
buttonList.push({ name: t.state.finalButtons.get("PAGE_URGE"), type: 'secondary', display: 'inline', no: 12 });
|
|
1434
1461
|
}
|
|
1435
1462
|
}
|
|
1436
1463
|
if (startButtons) {
|
|
1437
1464
|
if (startButtons.indexOf('HELP_CIRCULATE') >= 0) {
|
|
1438
1465
|
//传阅
|
|
1439
|
-
buttonList.push({ name: t.state.finalButtons.get("HELP_CIRCULATE"), type: 'secondary', display: '
|
|
1466
|
+
buttonList.push({ name: t.state.finalButtons.get("HELP_CIRCULATE"), type: 'secondary', display: 'inline', no: 4 });
|
|
1440
1467
|
}
|
|
1441
1468
|
}
|
|
1442
1469
|
for (var d = 0; d < extensionButtonList.length; d++) {
|
|
@@ -1458,9 +1485,9 @@ var PageHome = function (_React$Component) {
|
|
|
1458
1485
|
for (var c = 0; c < buttonArrayNew.length; c++) {
|
|
1459
1486
|
var buttonCode = buttonArrayNew[c];
|
|
1460
1487
|
if (buttonCode == 'BASE_SUMBIT') {
|
|
1461
|
-
buttonList.push({ name: t.state.finalButtons.get("BASE_SUMBIT"), type: 'primary', display: '
|
|
1488
|
+
buttonList.push({ name: t.state.finalButtons.get("BASE_SUMBIT"), type: 'primary', display: 'inline', no: 1 });
|
|
1462
1489
|
} else if (buttonCode == 'PAGE_SAVE') {
|
|
1463
|
-
buttonList.push({ name: t.state.finalButtons.get("PAGE_SAVE"), type: 'secondary', display: '
|
|
1490
|
+
buttonList.push({ name: t.state.finalButtons.get("PAGE_SAVE"), type: 'secondary', display: 'inline', no: 13 });
|
|
1464
1491
|
}
|
|
1465
1492
|
}
|
|
1466
1493
|
}
|
|
@@ -2682,17 +2709,58 @@ var PageHome = function (_React$Component) {
|
|
|
2682
2709
|
} else {
|
|
2683
2710
|
//其他按钮
|
|
2684
2711
|
if (typeof FlowCommon[operate] === "function") {
|
|
2685
|
-
FlowCommon[operate](
|
|
2686
|
-
|
|
2687
|
-
|
|
2688
|
-
|
|
2689
|
-
|
|
2712
|
+
FlowCommon[operate](t.state, function (msg) {
|
|
2713
|
+
//项目开发扩展
|
|
2714
|
+
var mobileExt;
|
|
2715
|
+
try {
|
|
2716
|
+
if (t.state.formKey) {
|
|
2717
|
+
mobileExt = typeof eval(t.state.module + "_" + t.state.formKey + "_mobileExt") !== 'undefined' ? eval(t.state.module + "_" + t.state.formKey + "_mobileExt") : null;
|
|
2718
|
+
}
|
|
2719
|
+
} catch (e) {
|
|
2720
|
+
// alert("exception: "+e.message);
|
|
2721
|
+
}
|
|
2722
|
+
if (typeof mobileExt !== 'undefined' && typeof mobileExt[operate] === "function") {
|
|
2723
|
+
mobileExt[operate](t.state, function (msg) {
|
|
2724
|
+
_Toast2.default.show({
|
|
2725
|
+
type: 'success',
|
|
2726
|
+
content: msg
|
|
2727
|
+
});
|
|
2728
|
+
}, function (msg) {
|
|
2729
|
+
_Toast2.default.show({
|
|
2730
|
+
type: 'error',
|
|
2731
|
+
content: msg
|
|
2732
|
+
});
|
|
2733
|
+
});
|
|
2734
|
+
}
|
|
2690
2735
|
}, function (msg) {
|
|
2691
2736
|
_Toast2.default.show({
|
|
2692
2737
|
type: 'error',
|
|
2693
2738
|
content: msg
|
|
2694
2739
|
});
|
|
2695
2740
|
});
|
|
2741
|
+
} else {
|
|
2742
|
+
//项目开发扩展
|
|
2743
|
+
var mobileExt;
|
|
2744
|
+
try {
|
|
2745
|
+
if (t.state.formKey) {
|
|
2746
|
+
mobileExt = typeof eval(t.state.module + "_" + t.state.formKey + "_mobileExt") !== 'undefined' ? eval(t.state.module + "_" + t.state.formKey + "_mobileExt") : null;
|
|
2747
|
+
}
|
|
2748
|
+
} catch (e) {
|
|
2749
|
+
// alert("exception: "+e.message);
|
|
2750
|
+
}
|
|
2751
|
+
if (typeof mobileExt !== 'undefined' && typeof mobileExt[operate] === "function") {
|
|
2752
|
+
mobileExt[operate](t.state, function (msg) {
|
|
2753
|
+
_Toast2.default.show({
|
|
2754
|
+
type: 'success',
|
|
2755
|
+
content: msg
|
|
2756
|
+
});
|
|
2757
|
+
}, function (msg) {
|
|
2758
|
+
_Toast2.default.show({
|
|
2759
|
+
type: 'error',
|
|
2760
|
+
content: msg
|
|
2761
|
+
});
|
|
2762
|
+
});
|
|
2763
|
+
}
|
|
2696
2764
|
}
|
|
2697
2765
|
}
|
|
2698
2766
|
}
|
|
@@ -5316,11 +5384,11 @@ var PageHome = function (_React$Component) {
|
|
|
5316
5384
|
}
|
|
5317
5385
|
}, {
|
|
5318
5386
|
key: 'getListButtonsByCodes',
|
|
5319
|
-
value: function getListButtonsByCodes(buttonCodes, dataId, isStart) {
|
|
5387
|
+
value: function getListButtonsByCodes(buttonCodes, dataId, isStart, extensionButtonList) {
|
|
5320
5388
|
var _this2 = this;
|
|
5321
5389
|
|
|
5322
|
-
buttonCodes
|
|
5323
|
-
buttonCodes
|
|
5390
|
+
// buttonCodes=buttonCodes.replace('OTHER_RELATION','');
|
|
5391
|
+
// buttonCodes=buttonCodes.replace('MAILSEND','');
|
|
5324
5392
|
if (buttonCodes == null || buttonCodes == '') {
|
|
5325
5393
|
var sysWatermark = this.state.sysWatermark;
|
|
5326
5394
|
if (null != sysWatermark && sysWatermark != '') {
|
|
@@ -5331,11 +5399,11 @@ var PageHome = function (_React$Component) {
|
|
|
5331
5399
|
}
|
|
5332
5400
|
} else {
|
|
5333
5401
|
_db2.default.FlowModuleAPI.getListButtonsByCodes({
|
|
5334
|
-
buttonCodes: buttonCodes
|
|
5402
|
+
buttonCodes: buttonCodes
|
|
5335
5403
|
}).then(function (content) {
|
|
5336
|
-
|
|
5337
|
-
|
|
5338
|
-
});
|
|
5404
|
+
// this.setState({
|
|
5405
|
+
|
|
5406
|
+
// });
|
|
5339
5407
|
var buttonCodeList = content;
|
|
5340
5408
|
var actionSheetButtonOpt = [];
|
|
5341
5409
|
var actionSheetButtonOptName = [];
|
|
@@ -5344,42 +5412,45 @@ var PageHome = function (_React$Component) {
|
|
|
5344
5412
|
var sysWatermark = _this2.state.sysWatermark;
|
|
5345
5413
|
/* buttonCodeList.push({'buttonCode':'BASE_SUMBIT','buttonName':'通过'});
|
|
5346
5414
|
buttonCodeList.push({'buttonCode':'PAGE_SAVE','buttonName':'保存'});*/
|
|
5347
|
-
|
|
5415
|
+
buttonCodeList = buttonCodeList.concat();
|
|
5416
|
+
var alllength = buttonCodeList.length + extensionButtonList.length;
|
|
5417
|
+
if (alllength > 4) {
|
|
5348
5418
|
buttonList.push({ name: '更多', type: 'text', display: 'inline', no: -1 });
|
|
5419
|
+
var buttonCodeListNew = [];
|
|
5349
5420
|
for (var c = 0; c < buttonCodeList.length; c++) {
|
|
5350
5421
|
var buttonCode = buttonCodeList[c]['buttonCode'];
|
|
5351
5422
|
var buttonName = buttonCodeList[c]['buttonName'];
|
|
5352
5423
|
if (c < 3) {
|
|
5353
5424
|
if (buttonCode == 'BACK') {
|
|
5354
|
-
|
|
5425
|
+
buttonCodeListNew.push({ name: buttonName, type: 'danger', display: 'inline', no: 2 });
|
|
5355
5426
|
} else if (buttonCode == 'PAGE_SAVE') {
|
|
5356
|
-
|
|
5427
|
+
buttonCodeListNew.push({ name: buttonName, type: 'secondary', display: 'inline', no: 13 });
|
|
5357
5428
|
} else if (buttonCode == 'BASE_SUMBIT') {
|
|
5358
5429
|
var sumbmitName = buttonName;
|
|
5359
5430
|
if (dataId == '' || isStart == true) {
|
|
5360
5431
|
sumbmitName = '提交';
|
|
5361
5432
|
}
|
|
5362
|
-
|
|
5433
|
+
buttonCodeListNew.push({ name: sumbmitName, type: 'primary', display: 'inline', no: 1 });
|
|
5363
5434
|
} else if (buttonCode == 'BASE_TRANSFER') {
|
|
5364
|
-
|
|
5435
|
+
buttonCodeListNew.push({ name: buttonName, type: 'secondary', display: 'inline', no: 3 });
|
|
5365
5436
|
} else if (buttonCode == 'HELP_CIRCULATE') {
|
|
5366
|
-
|
|
5437
|
+
buttonCodeListNew.push({ name: buttonName, type: 'secondary', display: 'inline', no: 4 });
|
|
5367
5438
|
} else if (buttonCode == 'HELP_FORWARD') {
|
|
5368
|
-
|
|
5439
|
+
buttonCodeListNew.push({ name: buttonName, type: 'secondary', display: 'inline', no: 20 });
|
|
5369
5440
|
} else if (buttonCode == 'BASE_JUMP') {
|
|
5370
|
-
|
|
5441
|
+
buttonCodeListNew.push({ name: buttonName, type: 'secondary', display: 'inline', no: 5 });
|
|
5371
5442
|
} else if (buttonCode == 'HELP_ADDLOTS') {
|
|
5372
|
-
|
|
5443
|
+
buttonCodeListNew.push({ name: buttonName, type: 'secondary', display: 'inline', no: 6 });
|
|
5373
5444
|
} else if (buttonCode == 'BASE_END') {
|
|
5374
|
-
|
|
5445
|
+
buttonCodeListNew.push({ name: buttonName, type: 'secondary', display: 'inline', no: 8 });
|
|
5375
5446
|
} else if (buttonCode == 'BASE_INVALID') {
|
|
5376
|
-
|
|
5447
|
+
buttonCodeListNew.push({ name: buttonName, type: 'secondary', display: 'inline', no: 9 });
|
|
5377
5448
|
} else if (buttonCode == 'HELP_DISTRIBUTE') {
|
|
5378
|
-
|
|
5449
|
+
buttonCodeListNew.push({ name: buttonName, type: 'secondary', display: 'inline', no: 'distributeFlow' });
|
|
5379
5450
|
} else if (buttonCode == 'MAILSEND') {
|
|
5380
|
-
|
|
5451
|
+
buttonCodeListNew.push({ name: buttonName, type: 'secondary', display: 'inline', no: 18 });
|
|
5381
5452
|
} else {
|
|
5382
|
-
|
|
5453
|
+
buttonCodeListNew.push({ name: buttonName, type: 'secondary', display: 'inline', no: buttonCode });
|
|
5383
5454
|
}
|
|
5384
5455
|
} else if (c == 3) {
|
|
5385
5456
|
//buttonList.push({name:'更多',type:'secondary',display:'banner',no:-1});
|
|
@@ -5390,8 +5461,20 @@ var PageHome = function (_React$Component) {
|
|
|
5390
5461
|
actionSheetButtonOptName.push(buttonName);
|
|
5391
5462
|
}
|
|
5392
5463
|
}
|
|
5464
|
+
var nowNum = buttonCodeList.length;
|
|
5465
|
+
for (var d = 0; d < extensionButtonList.length; d++) {
|
|
5466
|
+
if (nowNum < 3) {
|
|
5467
|
+
buttonList.push(extensionButtonList[d]);
|
|
5468
|
+
} else {
|
|
5469
|
+
actionSheetButtonOpt.push(extensionButtonList[d].no);
|
|
5470
|
+
actionSheetButtonOptName.push(extensionButtonList[d].name);
|
|
5471
|
+
}
|
|
5472
|
+
nowNum++;
|
|
5473
|
+
}
|
|
5474
|
+
buttonList = buttonList.concat(buttonCodeListNew);
|
|
5393
5475
|
buttonIsMore = true;
|
|
5394
5476
|
} else {
|
|
5477
|
+
buttonList = buttonList.concat(extensionButtonList);
|
|
5395
5478
|
for (var c = 0; c < buttonCodeList.length; c++) {
|
|
5396
5479
|
var buttonCode = buttonCodeList[c]['buttonCode'];
|
|
5397
5480
|
var buttonName = buttonCodeList[c]['buttonName'];
|
|
@@ -5430,6 +5513,7 @@ var PageHome = function (_React$Component) {
|
|
|
5430
5513
|
}
|
|
5431
5514
|
}
|
|
5432
5515
|
_this2.setState({
|
|
5516
|
+
buttonCodeList: content,
|
|
5433
5517
|
buttonList: buttonList,
|
|
5434
5518
|
actionSheetButtonOpt: actionSheetButtonOpt,
|
|
5435
5519
|
actionSheetButtonOptName: actionSheetButtonOptName,
|
|
@@ -6459,6 +6543,45 @@ var PageHome = function (_React$Component) {
|
|
|
6459
6543
|
)
|
|
6460
6544
|
)
|
|
6461
6545
|
),
|
|
6546
|
+
_react2.default.createElement(
|
|
6547
|
+
_Tab2.default.Item,
|
|
6548
|
+
{ key: '1', title: '\u6D41\u7A0B\u56FE' },
|
|
6549
|
+
_react2.default.createElement(
|
|
6550
|
+
_Group2.default.List,
|
|
6551
|
+
null,
|
|
6552
|
+
_react2.default.createElement(
|
|
6553
|
+
'div',
|
|
6554
|
+
{ className: this.state.activeItemIndex == 1 ? 't-BCf' : 't-DN' },
|
|
6555
|
+
_react2.default.createElement(
|
|
6556
|
+
HBox,
|
|
6557
|
+
{ vAlign: 'center', className: 't-PL16 t-PR16 t-PT10 t-PB10 t-BCf t-FS14' },
|
|
6558
|
+
_react2.default.createElement(Box, { className: 't-BCyellow t-WH10 t-MR4' }),
|
|
6559
|
+
_react2.default.createElement(
|
|
6560
|
+
Box,
|
|
6561
|
+
null,
|
|
6562
|
+
'\u5BA1\u6279\u4E2D'
|
|
6563
|
+
),
|
|
6564
|
+
_react2.default.createElement(Box, { className: 't-BCd t-WH10 t-MR4 t-ML10' }),
|
|
6565
|
+
_react2.default.createElement(
|
|
6566
|
+
Box,
|
|
6567
|
+
null,
|
|
6568
|
+
'\u5DF2\u5BA1\u6279'
|
|
6569
|
+
),
|
|
6570
|
+
_react2.default.createElement(Box, { className: 't-BCddblue t-WH10 t-MR4 t-ML10' }),
|
|
6571
|
+
_react2.default.createElement(
|
|
6572
|
+
Box,
|
|
6573
|
+
null,
|
|
6574
|
+
'\u672A\u5BA1\u6279'
|
|
6575
|
+
)
|
|
6576
|
+
),
|
|
6577
|
+
_react2.default.createElement(
|
|
6578
|
+
'div',
|
|
6579
|
+
{ style: { textAlign: 'center', overflowX: 'scroll' } },
|
|
6580
|
+
_react2.default.createElement('img', { src: _variables2.default.URLS.getFlowImage + this.state.processInstanceId + '&random=' + this.state.keyNum })
|
|
6581
|
+
)
|
|
6582
|
+
)
|
|
6583
|
+
)
|
|
6584
|
+
),
|
|
6462
6585
|
_react2.default.createElement(
|
|
6463
6586
|
_Tab2.default.Item,
|
|
6464
6587
|
{ key: '2', title: '\u6D41\u7A0B\u8BB0\u5F55' },
|
|
@@ -6789,12 +6912,12 @@ var PageHome = function (_React$Component) {
|
|
|
6789
6912
|
null,
|
|
6790
6913
|
_react2.default.createElement(
|
|
6791
6914
|
_Button2.default,
|
|
6792
|
-
{ type: 'secondary', display: '
|
|
6915
|
+
{ type: 'secondary', display: 'inline', onClick: t.handleSubmit.bind(t, 4) },
|
|
6793
6916
|
this.state.finalButtons.get("HELP_CIRCULATE")
|
|
6794
6917
|
),
|
|
6795
6918
|
_react2.default.createElement(
|
|
6796
6919
|
_Button2.default,
|
|
6797
|
-
{ type: 'primary', display: '
|
|
6920
|
+
{ type: 'primary', display: 'inline', onClick: t.clickRead.bind(t) },
|
|
6798
6921
|
'\u5DF2\u9605'
|
|
6799
6922
|
)
|
|
6800
6923
|
)
|
|
@@ -1517,15 +1517,28 @@ var Page = function (_React$Component) {
|
|
|
1517
1517
|
|
|
1518
1518
|
for (var i = 0; i < politicalOutlookUserList.length; i++) {
|
|
1519
1519
|
if (politicalOutlookUserList[i].isSameOrg == "1") {
|
|
1520
|
-
if (
|
|
1521
|
-
politicalOutlookUserList[i].checked
|
|
1522
|
-
|
|
1523
|
-
|
|
1520
|
+
if (navList[index].checkThisOrg) {
|
|
1521
|
+
if (!politicalOutlookUserList[i].checked) {
|
|
1522
|
+
politicalOutlookUserList[i].checked = true;
|
|
1523
|
+
total++;
|
|
1524
|
+
selectPoliticalOutlookUserNum++;
|
|
1525
|
+
}
|
|
1524
1526
|
} else {
|
|
1525
|
-
politicalOutlookUserList[i].checked
|
|
1526
|
-
|
|
1527
|
-
|
|
1527
|
+
if (politicalOutlookUserList[i].checked) {
|
|
1528
|
+
politicalOutlookUserList[i].checked = false;
|
|
1529
|
+
total--;
|
|
1530
|
+
selectPoliticalOutlookUserNum--;
|
|
1531
|
+
}
|
|
1528
1532
|
}
|
|
1533
|
+
// if (!politicalOutlookUserList[i].checked) {
|
|
1534
|
+
// politicalOutlookUserList[i].checked = true;
|
|
1535
|
+
// total++;
|
|
1536
|
+
// selectPoliticalOutlookUserNum++;
|
|
1537
|
+
// }else{
|
|
1538
|
+
// politicalOutlookUserList[i].checked = false;
|
|
1539
|
+
// total--;
|
|
1540
|
+
// selectPoliticalOutlookUserNum--;
|
|
1541
|
+
// }
|
|
1529
1542
|
|
|
1530
1543
|
var flag = true;
|
|
1531
1544
|
for (var j = 0; j < selectUsers.length; j++) {
|