fmui-base 1.0.29 → 1.0.30

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.
Files changed (7) hide show
  1. package/README.md +1 -0
  2. package/lib/db/db.js +15 -0
  3. package/lib/db/variables.js +1 -0
  4. package/lib/form/form.js +11 -1
  5. package/lib/process_info/processInfo.js +384 -336
  6. package/lib/process_list/processList.js +86 -61
  7. package/package.json +1 -1
package/README.md CHANGED
@@ -3,6 +3,7 @@
3
3
  ---
4
4
 
5
5
  ## 更新日志
6
+ - 1.0.30：流程批量办理增加必填校验，流程组件在钉钉PC客户端办理后关闭页面修改;日期组件增加区间选项
6
7
  - 1.0.29：流程项目开发外扩展js修改
7
8
  - 1.0.28：选人个人群组适配
8
9
  - 1.0.27：流程批示意见问题修复
package/lib/db/db.js CHANGED
@@ -654,6 +654,21 @@ context.create('FlowModuleAPI', {
654
654
  });
655
655
  }
656
656
  },
657
+ batchValidateForm: {
658
+ mockUrl: 'query/batchValidateForm.json',
659
+ url: _variables2.default.URLS.batchValidateForm,
660
+ method: 'GET',
661
+ header: {
662
+ Authorization: 'Bearer ' + getLoginUserInfo().token
663
+ },
664
+ /* header:{'content-Type':'application/x-www-form-urlencoded'},*/
665
+ willFetch: function willFetch() {
666
+ _Toast2.default.show({
667
+ content: _react2.default.createElement(_loading2.default, null),
668
+ duration: 800
669
+ });
670
+ }
671
+ },
657
672
  completeTaskBatch: {
658
673
  mockUrl: 'query/getDoneTaskListByProcessId.json',
659
674
  url: _variables2.default.URLS.completeTaskBatch,
package/lib/db/variables.js CHANGED
@@ -76,6 +76,7 @@ exports.default = {
76
76
  cancelProcess: approveUrlPrefix + 'cancelProcess' + '?token=' + getLoginUserInfo().token, //作废流程
77
77
  forceEnd: approveUrlPrefix + 'forceEnd' + '?token=' + getLoginUserInfo().token, //结束流程
78
78
  getUndoTaskInfo: approveUrlPrefix + "getUndoTaskInfo" + '?token=' + getLoginUserInfo().token, //获取待办详情
79
+ batchValidateForm: approveUrlPrefix + "batchValidateForm" + '?token=' + getLoginUserInfo().token, //批量校验表单必填
79
80
  completeTaskBatch: approveUrlPrefix + "completeTaskBatch" + '?token=' + getLoginUserInfo().token, //批量办理
80
81
  readCompleteTaskBatch: approveUrlPrefix + "readCompleteTaskBatch" + '?token=' + getLoginUserInfo().token, //批量已阅
81
82
  getPersonalPhrase: approveUrlPrefix + "getPersonalPhrase" + '?token=' + getLoginUserInfo().token, //获取常用语
package/lib/form/form.js CHANGED
@@ -537,8 +537,16 @@ var PageHome = function (_React$Component) {
537
537
  } else {
538
538
  dateFormat = "YMDHM";
539
539
  }
540
-
541
540
  itemParam.dateFormat = dateFormat;
541
+
542
+ var minDate = form.dataAttr.minDate;
543
+ var maxDate = form.dataAttr.maxDate;
544
+ if (minDate) {
545
+ itemParam.minDate = minDate;
546
+ }
547
+ if (maxDate) {
548
+ itemParam.maxDate = maxDate;
549
+ }
542
550
  if (value && Array.isArray(value)) {
543
551
  if (value.length == 5) {
544
552
  var month = value[1] < 10 ? '0' + value[1] : value[1];
@@ -1852,6 +1860,8 @@ var PageHome = function (_React$Component) {
1852
1860
  onSelect: t.handleChangeDate.bind(t, t.state.itemParam.key),
1853
1861
  value: t.state.itemParam.value,
1854
1862
  columns: _DatetimeField2.default[t.state.itemParam.dateFormat],
1863
+ minDate: t.state.itemParam.minDate ? t.state.itemParam.minDate : new Date(1900, 0, 1).getTime(),
1864
+ maxDate: t.state.itemParam.maxDate ? t.state.itemParam.maxDate : new Date(2051, 0, 1).getTime() - 1,
1855
1865
  placeholder: t.state.itemParam.readOnly ? '' : t.state.itemParam.placeholder })
1856
1866
  ) : this.state.itemParam.itemType == 'datetimeStep' ? _react2.default.createElement(
1857
1867
  _Group2.default.List,
package/lib/process_info/processInfo.js CHANGED
@@ -508,33 +508,33 @@ var PageHome = function (_React$Component) {
508
508
  value: function initButton(iconIndex) {
509
509
  var t = this;
510
510
  //设置帮助
511
- /*dd.biz.navigation.setIcon({
512
- showIcon : true,//是否显示icon
513
- iconIndex : iconIndex,//显示的iconIndex,如上图
514
- onSuccess : function(result) {
515
- var key = "";
516
- var project = t.state.project;
517
- if(project=='mobileportal'){//如果项目是首页
518
- key = 'hospitalmanage';
519
- }else{
520
- key = t.state.module;
521
- }
522
- location.hash=key+'/help_index';
523
- },
524
- onFail : function(err) {
525
- }
511
+ /*dd.biz.navigation.setIcon({
512
+ showIcon : true,//是否显示icon
513
+ iconIndex : iconIndex,//显示的iconIndex,如上图
514
+ onSuccess : function(result) {
515
+ var key = "";
516
+ var project = t.state.project;
517
+ if(project=='mobileportal'){//如果项目是首页
518
+ key = 'hospitalmanage';
519
+ }else{
520
+ key = t.state.module;
521
+ }
522
+ location.hash=key+'/help_index';
523
+ },
524
+ onFail : function(err) {
525
+ }
526
526
  });*/
527
- /*let title = "";
528
- //处理特有参数
529
- if(typeof FlowCommon.dealwithTitle === "function"){
530
- title = FlowCommon.dealwithTitle(this.props);
531
- }
527
+ /*let title = "";
528
+ //处理特有参数
529
+ if(typeof FlowCommon.dealwithTitle === "function"){
530
+ title = FlowCommon.dealwithTitle(this.props);
531
+ }
532
532
  setPageTitle(title);*/
533
- /* dd.biz.navigation.setTitle({
534
- title : title,//控制标题文本，空字符串表示显示默认文本
535
- onSuccess : function(result) {
536
- },
537
- onFail : function(err) {}
533
+ /* dd.biz.navigation.setTitle({
534
+ title : title,//控制标题文本，空字符串表示显示默认文本
535
+ onSuccess : function(result) {
536
+ },
537
+ onFail : function(err) {}
538
538
  });*/
539
539
  dd.biz.navigation.setRight({
540
540
  show: true, //控制按钮显示， true 显示， false 隐藏， 默认true
@@ -587,39 +587,39 @@ var PageHome = function (_React$Component) {
587
587
  if (listType == '0') {
588
588
  if (taskId != null && taskId != undefined) {
589
589
  t.loadPage(param);
590
- /* DB.FlowModuleAPI.claimTask({taskId:taskId,processInstanceId:processInstanceId}).then((content) => {
591
- if(t.state.permissionCode=='other'){
592
- if(content.success){
593
- t.setState({
594
- permissionCode:'pending'
595
- });
596
- }else{
597
- t.setState({
598
- permissionCode:'done'
599
- });
600
- }
601
- }
602
-
603
- if(content!=null && content!=''){
604
-
605
- if(content['showType']=='1' && content['operationDetails']!=null){
606
- t.setState({
607
- operationDetails:content.operationDetails
608
- });
609
- }
610
- else if(content['showType']=='2' && content['operationDetails']!=null){
611
-
612
- Dialog.alert({
613
- title: '收回原因',
614
- content: content['operationDetails']
615
-
616
- });
617
- }
618
- }
619
-
620
- t.loadPage(param);
621
- }).catch((error) => {
622
- t.loadPage(param,"0");//没有待办权限
590
+ /* DB.FlowModuleAPI.claimTask({taskId:taskId,processInstanceId:processInstanceId}).then((content) => {
591
+ if(t.state.permissionCode=='other'){
592
+ if(content.success){
593
+ t.setState({
594
+ permissionCode:'pending'
595
+ });
596
+ }else{
597
+ t.setState({
598
+ permissionCode:'done'
599
+ });
600
+ }
601
+ }
602
+
603
+ if(content!=null && content!=''){
604
+
605
+ if(content['showType']=='1' && content['operationDetails']!=null){
606
+ t.setState({
607
+ operationDetails:content.operationDetails
608
+ });
609
+ }
610
+ else if(content['showType']=='2' && content['operationDetails']!=null){
611
+
612
+ Dialog.alert({
613
+ title: '收回原因',
614
+ content: content['operationDetails']
615
+
616
+ });
617
+ }
618
+ }
619
+
620
+ t.loadPage(param);
621
+ }).catch((error) => {
622
+ t.loadPage(param,"0");//没有待办权限
623
623
  });*/
624
624
  } else {
625
625
  t.loadPage(param);
@@ -649,9 +649,9 @@ var PageHome = function (_React$Component) {
649
649
  //查询流程详情
650
650
  if (typeof FlowCommon.dealwithCommonFolowInfo === "function") {
651
651
  FlowCommon.dealwithCommonFolowInfo(param, t.state, function (content) {
652
- /* var sysSMSsetting1=content['sysSMSsetting'];
653
- var evoRemind1=content['evoRemind'];
654
- var shortMessageList1=[];
652
+ /* var sysSMSsetting1=content['sysSMSsetting'];
653
+ var evoRemind1=content['evoRemind'];
654
+ var shortMessageList1=[];
655
655
  var readShortMessageList1=[];*/
656
656
  if (!content.code) {
657
657
  _Dialog2.default.alert({
@@ -659,20 +659,23 @@ var PageHome = function (_React$Component) {
659
659
  content: '此文件已作废'
660
660
  });
661
661
  if (isPush == '1') {
662
- if (_thirdMenuType == 'WX') {
663
- wx.ready(function () {
664
- wx.closeWindow();
665
- });
666
- } else if (_thirdMenuType == 'MH' && typeof emp != "undefined") {
667
- emp.window.close({
668
- id: 'this' //指定被关闭窗口标识，如果id=‘this‘，则关闭当前窗口
669
- });
670
- } else {
671
- setTimeout(function () {
672
-
673
- backPage();
674
- }, 1500);
675
- }
662
+ closePage();
663
+ // if(_thirdMenuType == 'WX'){
664
+ // wx.ready(function(){
665
+ // wx.closeWindow();
666
+ // });
667
+ // }else if(_thirdMenuType =='MH' && typeof(emp)!="undefined"){
668
+ // emp.window.close({
669
+ // id:'this', //指定被关闭窗口标识，如果id=‘this‘，则关闭当前窗口
670
+ // })
671
+ // }else{
672
+ // setTimeout(
673
+ // function () {
674
+
675
+ // backPage();
676
+
677
+ // }, 1500);
678
+ // }
676
679
  } else {
677
680
  setTimeout(function () {
678
681
  history.back();
@@ -1044,17 +1047,17 @@ var PageHome = function (_React$Component) {
1044
1047
  activityId = "";
1045
1048
  }
1046
1049
 
1047
- /* let sysMailSetting=content.sysMailSetting;
1048
- var remindersLists=[];
1049
- if(sysMailSetting=='1' || sysMailSetting=='2'){
1050
- var option = {};
1051
- option.value = "0";
1052
- option.content = '邮件';
1053
- option.disable = false;
1054
- option.checked = false;
1055
- remindersLists.push(option);
1056
- }*/ /*
1057
- var evoRemind2 = this.state.evoRemind;
1050
+ /* let sysMailSetting=content.sysMailSetting;
1051
+ var remindersLists=[];
1052
+ if(sysMailSetting=='1' || sysMailSetting=='2'){
1053
+ var option = {};
1054
+ option.value = "0";
1055
+ option.content = '邮件';
1056
+ option.disable = false;
1057
+ option.checked = false;
1058
+ remindersLists.push(option);
1059
+ }*/ /*
1060
+ var evoRemind2 = this.state.evoRemind;
1058
1061
  var sysSMSsetting2 = this.state.sysSMSsetting;*/
1059
1062
  var remindersLists = [];
1060
1063
  if (sysSMSsetting == '1' || sysSMSsetting == '2') {
@@ -1496,8 +1499,8 @@ var PageHome = function (_React$Component) {
1496
1499
  return "";
1497
1500
  }
1498
1501
 
1499
- /**
1500
- * 提交按钮的点击事件（获得下一个活动节点列表）
1502
+ /**
1503
+ * 提交按钮的点击事件（获得下一个活动节点列表）
1501
1504
  */
1502
1505
 
1503
1506
  }, {
@@ -2015,13 +2018,13 @@ var PageHome = function (_React$Component) {
2015
2018
  if (participantList != null && participantList != "" && participantList.length > 0) {
2016
2019
  for (var i = 0; i < participantList.length; i++) {
2017
2020
  if (participantList[i].type != "user") {
2018
- /* var children = participantList[i];
2019
- for(var j=0; j<children.length; j++ ){
2020
- var personValueItem = {scopeType:"user",scopeValue:children[j].id,scopeName:children[j].userName,imageId:""};
2021
- if(commonUsedId.indexOf(children[j].id) == -1){
2022
- commonUsedId += children[j].id+',';
2023
- commonUsedData.push(personValueItem);
2024
- }
2021
+ /* var children = participantList[i];
2022
+ for(var j=0; j<children.length; j++ ){
2023
+ var personValueItem = {scopeType:"user",scopeValue:children[j].id,scopeName:children[j].userName,imageId:""};
2024
+ if(commonUsedId.indexOf(children[j].id) == -1){
2025
+ commonUsedId += children[j].id+',';
2026
+ commonUsedData.push(personValueItem);
2027
+ }
2025
2028
  }*/
2026
2029
  } else if (participantList[i].secretLevel == 0 || participantList[i].secretLevel || !participantList[i].orgId) {
2027
2030
  var personValueItem = { scopeType: "user", scopeValue: participantList[i].id, scopeName: participantList[i].name, imageId: "", orgNamePath: participantList[i].orgPath };
@@ -2651,20 +2654,23 @@ var PageHome = function (_React$Component) {
2651
2654
  content: '已阅成功'
2652
2655
  });
2653
2656
  if (isPush == '1') {
2654
- if (_thirdMenuType == 'WX') {
2655
- wx.ready(function () {
2656
- wx.closeWindow();
2657
- });
2658
- } else if (_thirdMenuType == 'MH' && typeof emp != "undefined") {
2659
- emp.window.close({
2660
- id: 'this' //指定被关闭窗口标识，如果id=‘this‘，则关闭当前窗口
2661
- });
2662
- } else {
2663
- setTimeout(function () {
2664
-
2665
- backPage();
2666
- }, 1500);
2667
- }
2657
+ closePage();
2658
+ // if(_thirdMenuType == 'WX'){
2659
+ // wx.ready(function(){
2660
+ // wx.closeWindow();
2661
+ // });
2662
+ // }else if(_thirdMenuType =='MH' && typeof(emp)!="undefined"){
2663
+ // emp.window.close({
2664
+ // id:'this', //指定被关闭窗口标识，如果id=‘this‘，则关闭当前窗口
2665
+ // })
2666
+ // }else{
2667
+ // setTimeout(
2668
+ // function () {
2669
+
2670
+ // backPage();
2671
+
2672
+ // }, 1500);
2673
+ // }
2668
2674
  } else {
2669
2675
  setTimeout(function () {
2670
2676
  history.back();
@@ -2940,13 +2946,13 @@ var PageHome = function (_React$Component) {
2940
2946
  }
2941
2947
  var sshortMessage = '0';
2942
2948
  var sendShortMessage = t.state.sendShortMessage;
2943
- /*if(sendShortMessage.length>0){
2944
- sshortMessage=sendShortMessage[0].value;
2949
+ /*if(sendShortMessage.length>0){
2950
+ sshortMessage=sendShortMessage[0].value;
2945
2951
  }*/
2946
2952
  var cshortMessage = '0';
2947
2953
  var circulateShortMessage = t.state.circulateShortMessage;
2948
- /* if(circulateShortMessage.length>0){
2949
- cshortMessage=circulateShortMessage[0].value;
2954
+ /* if(circulateShortMessage.length>0){
2955
+ cshortMessage=circulateShortMessage[0].value;
2950
2956
  }*/
2951
2957
  var param = {
2952
2958
  taskId: this.state.taskId,
@@ -2999,8 +3005,8 @@ var PageHome = function (_React$Component) {
2999
3005
  var selectBackActivity = this.state.selectBackActivity;
3000
3006
  var shortMessage = '0';
3001
3007
  var backShortMessage = this.state.backShortMessage;
3002
- /* if(backShortMessage.length>0){
3003
- shortMessage=backShortMessage[0].value;
3008
+ /* if(backShortMessage.length>0){
3009
+ shortMessage=backShortMessage[0].value;
3004
3010
  }*/
3005
3011
  var param = {
3006
3012
  taskId: this.state.taskId,
@@ -3031,13 +3037,13 @@ var PageHome = function (_React$Component) {
3031
3037
  var editFormData = this.state.editFormData;
3032
3038
  var sshortMessage = '0';
3033
3039
  var sendShortMessage = t.state.sendShortMessage;
3034
- /*if(sendShortMessage.length>0){
3035
- sshortMessage=sendShortMessage[0].value;
3040
+ /*if(sendShortMessage.length>0){
3041
+ sshortMessage=sendShortMessage[0].value;
3036
3042
  }*/
3037
3043
  var cshortMessage = '0';
3038
3044
  var circulateShortMessage = t.state.circulateShortMessage;
3039
- /*if(circulateShortMessage.length>0){
3040
- cshortMessage=circulateShortMessage[0].value;
3045
+ /*if(circulateShortMessage.length>0){
3046
+ cshortMessage=circulateShortMessage[0].value;
3041
3047
  }*/
3042
3048
  var param = {
3043
3049
  taskId: this.state.taskId,
@@ -3136,22 +3142,25 @@ var PageHome = function (_React$Component) {
3136
3142
  }
3137
3143
 
3138
3144
  if (isPush == '1') {
3145
+ closePage();
3139
3146
  //alert("_thirdMenuType:"+_thirdMenuType);
3140
3147
  //不得已的办法
3141
- if (_thirdMenuType == 'WX') {
3142
- wx.ready(function () {
3143
- wx.closeWindow();
3144
- });
3145
- } else if (_thirdMenuType == 'MH' && typeof emp != "undefined") {
3146
- emp.window.close({
3147
- id: 'this' //指定被关闭窗口标识，如果id=‘this‘，则关闭当前窗口
3148
- });
3149
- } else {
3150
- setTimeout(function () {
3151
-
3152
- backPage();
3153
- }, 1500);
3154
- }
3148
+ // if(_thirdMenuType == 'WX'){
3149
+ // wx.ready(function(){
3150
+ // wx.closeWindow();
3151
+ // });
3152
+ // }else if(_thirdMenuType =='MH' && typeof(emp)!="undefined"){
3153
+ // emp.window.close({
3154
+ // id:'this', //指定被关闭窗口标识，如果id=‘this‘，则关闭当前窗口
3155
+ // })
3156
+ // }else{
3157
+ // setTimeout(
3158
+ // function () {
3159
+
3160
+ // backPage();
3161
+
3162
+ // }, 1500);
3163
+ // }
3155
3164
  } else {
3156
3165
  setTimeout(function () {
3157
3166
  // window.ReactNativeWebView.postMessage('final');
@@ -3195,22 +3204,25 @@ var PageHome = function (_React$Component) {
3195
3204
  content: t.state.finalButtons.get("FLOW_RECOVER") + '成功'
3196
3205
  });
3197
3206
  if (isPush == '1') {
3207
+ closePage();
3198
3208
  //alert("_thirdMenuType:"+_thirdMenuType);
3199
3209
  //不得已的办法
3200
- if (_thirdMenuType == 'WX') {
3201
- wx.ready(function () {
3202
- wx.closeWindow();
3203
- });
3204
- } else if (_thirdMenuType == 'MH' && typeof emp != "undefined") {
3205
- emp.window.close({
3206
- id: 'this' //指定被关闭窗口标识，如果id=‘this‘，则关闭当前窗口
3207
- });
3208
- } else {
3209
- setTimeout(function () {
3210
-
3211
- backPage();
3212
- }, 1500);
3213
- }
3210
+ // if(_thirdMenuType == 'WX'){
3211
+ // wx.ready(function(){
3212
+ // wx.closeWindow();
3213
+ // });
3214
+ // }else if(_thirdMenuType =='MH' && typeof(emp)!="undefined"){
3215
+ // emp.window.close({
3216
+ // id:'this', //指定被关闭窗口标识，如果id=‘this‘，则关闭当前窗口
3217
+ // })
3218
+ // }else{
3219
+ // setTimeout(
3220
+ // function () {
3221
+
3222
+ // backPage();
3223
+
3224
+ // }, 1500);
3225
+ // }
3214
3226
  } else {
3215
3227
  setTimeout(function () {
3216
3228
  //window.ReactNativeWebView.postMessage('final');
@@ -3359,22 +3371,25 @@ var PageHome = function (_React$Component) {
3359
3371
  // }, 1500);
3360
3372
 
3361
3373
  if (isPush == '1') {
3374
+ closePage();
3362
3375
  //alert("_thirdMenuType:"+_thirdMenuType);
3363
3376
  //不得已的办法
3364
- if (_thirdMenuType == 'WX') {
3365
- wx.ready(function () {
3366
- wx.closeWindow();
3367
- });
3368
- } else if (_thirdMenuType == 'MH' && typeof emp != "undefined") {
3369
- emp.window.close({
3370
- id: 'this' //指定被关闭窗口标识，如果id=‘this‘，则关闭当前窗口
3371
- });
3372
- } else {
3373
- setTimeout(function () {
3377
+ // if(_thirdMenuType == 'WX'){
3378
+ // wx.ready(function(){
3379
+ // wx.closeWindow();
3380
+ // });
3381
+ // }else if(_thirdMenuType =='MH' && typeof(emp)!="undefined"){
3382
+ // emp.window.close({
3383
+ // id:'this', //指定被关闭窗口标识，如果id=‘this‘，则关闭当前窗口
3384
+ // })
3385
+ // }else{
3386
+ // setTimeout(
3387
+ // function () {
3374
3388
 
3375
- backPage();
3376
- }, 1500);
3377
- }
3389
+ // backPage();
3390
+
3391
+ // }, 1500);
3392
+ // }
3378
3393
  } else {
3379
3394
  setTimeout(function () {
3380
3395
  // window.ReactNativeWebView.postMessage('final');
@@ -3433,22 +3448,25 @@ var PageHome = function (_React$Component) {
3433
3448
  }
3434
3449
 
3435
3450
  if (isPush == '1') {
3451
+ closePage();
3436
3452
  //alert("_thirdMenuType:"+_thirdMenuType);
3437
3453
  //不得已的办法
3438
- if (_thirdMenuType == 'WX') {
3439
- wx.ready(function () {
3440
- wx.closeWindow();
3441
- });
3442
- } else if (_thirdMenuType == 'MH' && typeof emp != "undefined") {
3443
- emp.window.close({
3444
- id: 'this' //指定被关闭窗口标识，如果id=‘this‘，则关闭当前窗口
3445
- });
3446
- } else {
3447
- setTimeout(function () {
3448
-
3449
- backPage();
3450
- }, 1500);
3451
- }
3454
+ // if(_thirdMenuType == 'WX'){
3455
+ // wx.ready(function(){
3456
+ // wx.closeWindow();
3457
+ // });
3458
+ // }else if(_thirdMenuType =='MH' && typeof(emp)!="undefined"){
3459
+ // emp.window.close({
3460
+ // id:'this', //指定被关闭窗口标识，如果id=‘this‘，则关闭当前窗口
3461
+ // })
3462
+ // }else{
3463
+ // setTimeout(
3464
+ // function () {
3465
+
3466
+ // backPage();
3467
+
3468
+ // }, 1500);
3469
+ // }
3452
3470
  } else {
3453
3471
  setTimeout(function () {
3454
3472
  // window.ReactNativeWebView.postMessage('final');
@@ -3670,22 +3688,25 @@ var PageHome = function (_React$Component) {
3670
3688
  // alert(searchVal);
3671
3689
  // window.ReactNativeWebView.postMessage('final');
3672
3690
  if (isPush == '1') {
3691
+ closePage();
3673
3692
  //alert("_thirdMenuType:"+_thirdMenuType);
3674
3693
  //不得已的办法
3675
- if (_thirdMenuType == 'WX') {
3676
- wx.ready(function () {
3677
- wx.closeWindow();
3678
- });
3679
- } else if (_thirdMenuType == 'MH' && typeof emp != "undefined") {
3680
- emp.window.close({
3681
- id: 'this' //指定被关闭窗口标识，如果id=‘this‘，则关闭当前窗口
3682
- });
3683
- } else {
3684
- setTimeout(function () {
3685
-
3686
- backPage();
3687
- }, 1500);
3688
- }
3694
+ // if(_thirdMenuType == 'WX'){
3695
+ // wx.ready(function(){
3696
+ // wx.closeWindow();
3697
+ // });
3698
+ // }else if(_thirdMenuType =='MH' && typeof(emp)!="undefined"){
3699
+ // emp.window.close({
3700
+ // id:'this', //指定被关闭窗口标识，如果id=‘this‘，则关闭当前窗口
3701
+ // })
3702
+ // }else{
3703
+ // setTimeout(
3704
+ // function () {
3705
+
3706
+ // backPage();
3707
+
3708
+ // }, 1500);
3709
+ // }
3689
3710
  } else {
3690
3711
  setTimeout(function () {
3691
3712
 
@@ -3774,22 +3795,25 @@ var PageHome = function (_React$Component) {
3774
3795
  history.back();
3775
3796
  }, 1500);
3776
3797
  } else if (isPush == '1') {
3798
+ closePage();
3777
3799
  //alert("_thirdMenuType:"+_thirdMenuType);
3778
3800
  //不得已的办法
3779
- if (_thirdMenuType == 'WX') {
3780
- wx.ready(function () {
3781
- wx.closeWindow();
3782
- });
3783
- } else if (_thirdMenuType == 'MH' && typeof emp != "undefined") {
3784
- emp.window.close({
3785
- id: 'this' //指定被关闭窗口标识，如果id=‘this‘，则关闭当前窗口
3786
- });
3787
- } else {
3788
- setTimeout(function () {
3789
- // window.ReactNativeWebView.postMessage('final');
3790
- backPage();
3791
- }, 1500);
3792
- }
3801
+ // if(_thirdMenuType == 'WX'){
3802
+ // wx.ready(function(){
3803
+ // wx.closeWindow();
3804
+ // });
3805
+ // }else if(_thirdMenuType =='MH' && typeof(emp)!="undefined"){
3806
+ // emp.window.close({
3807
+ // id:'this', //指定被关闭窗口标识，如果id=‘this‘，则关闭当前窗口
3808
+ // })
3809
+ // } else {
3810
+ // setTimeout(
3811
+ // function () {
3812
+ // // window.ReactNativeWebView.postMessage('final');
3813
+ // backPage();
3814
+
3815
+ // }, 1500);
3816
+ // }
3793
3817
  } else {
3794
3818
  // window.ReactNativeWebView.postMessage('final');
3795
3819
  backPage();
@@ -3887,22 +3911,25 @@ var PageHome = function (_React$Component) {
3887
3911
  history.back();
3888
3912
  }, 1500);
3889
3913
  } else if (isPush == '1') {
3914
+ closePage();
3890
3915
  //alert("_thirdMenuType:"+_thirdMenuType);
3891
3916
  //不得已的办法
3892
- if (_thirdMenuType == 'WX') {
3893
- wx.ready(function () {
3894
- wx.closeWindow();
3895
- });
3896
- } else if (_thirdMenuType == 'MH' && typeof emp != "undefined") {
3897
- emp.window.close({
3898
- id: 'this' //指定被关闭窗口标识，如果id=‘this‘，则关闭当前窗口
3899
- });
3900
- } else {
3901
- setTimeout(function () {
3902
- // window.ReactNativeWebView.postMessage('final');
3903
- backPage();
3904
- }, 1500);
3905
- }
3917
+ // if(_thirdMenuType == 'WX'){
3918
+ // wx.ready(function(){
3919
+ // wx.closeWindow();
3920
+ // });
3921
+ // }else if(_thirdMenuType =='MH' && typeof(emp)!="undefined"){
3922
+ // emp.window.close({
3923
+ // id:'this', //指定被关闭窗口标识，如果id=‘this‘，则关闭当前窗口
3924
+ // })
3925
+ // } else {
3926
+ // setTimeout(
3927
+ // function () {
3928
+ // // window.ReactNativeWebView.postMessage('final');
3929
+ // backPage();
3930
+
3931
+ // }, 1500);
3932
+ // }
3906
3933
  } else {
3907
3934
  //window.ReactNativeWebView.postMessage('final');
3908
3935
  backPage();
@@ -3995,26 +4022,29 @@ var PageHome = function (_React$Component) {
3995
4022
  type: 'success',
3996
4023
  content: t.state.finalButtons.get("BASE_TRANSFER") + '成功'
3997
4024
  });
3998
- if (isPush == '1') {
4025
+ if (isPush == '0') {
3999
4026
  //window.ReactNativeWebView.postMessage('final');
4000
4027
  backPage();
4001
4028
  } else if (isPush == '1') {
4029
+ closePage();
4002
4030
  //alert("_thirdMenuType:"+_thirdMenuType);
4003
4031
  //不得已的办法
4004
- if (_thirdMenuType == 'WX') {
4005
- wx.ready(function () {
4006
- wx.closeWindow();
4007
- });
4008
- } else if (_thirdMenuType == 'MH' && typeof emp != "undefined") {
4009
- emp.window.close({
4010
- id: 'this' //指定被关闭窗口标识，如果id=‘this‘，则关闭当前窗口
4011
- });
4012
- } else {
4013
- setTimeout(function () {
4014
- // window.ReactNativeWebView.postMessage('final');
4015
- backPage();
4016
- }, 1500);
4017
- }
4032
+ // if(_thirdMenuType == 'WX'){
4033
+ // wx.ready(function(){
4034
+ // wx.closeWindow();
4035
+ // });
4036
+ // }else if(_thirdMenuType =='MH' && typeof(emp)!="undefined"){
4037
+ // emp.window.close({
4038
+ // id:'this', //指定被关闭窗口标识，如果id=‘this‘，则关闭当前窗口
4039
+ // })
4040
+ // } else {
4041
+ // setTimeout(
4042
+ // function () {
4043
+ // // window.ReactNativeWebView.postMessage('final');
4044
+ // backPage();
4045
+
4046
+ // }, 1500);
4047
+ // }
4018
4048
  } else {
4019
4049
  setTimeout(function () {
4020
4050
  history.back();
@@ -4093,22 +4123,25 @@ var PageHome = function (_React$Component) {
4093
4123
  content: t.state.finalButtons.get("HELP_ADDLOTS") + '成功'
4094
4124
  });
4095
4125
  if (isPush == '1') {
4126
+ closePage();
4096
4127
  //alert("_thirdMenuType:"+_thirdMenuType);
4097
4128
  //不得已的办法
4098
- if (_thirdMenuType == 'WX') {
4099
- wx.ready(function () {
4100
- wx.closeWindow();
4101
- });
4102
- } else if (_thirdMenuType == 'MH' && typeof emp != "undefined") {
4103
- emp.window.close({
4104
- id: 'this' //指定被关闭窗口标识，如果id=‘this‘，则关闭当前窗口
4105
- });
4106
- } else {
4107
- setTimeout(function () {
4108
- // window.ReactNativeWebView.postMessage('final');
4109
- backPage();
4110
- }, 1500);
4111
- }
4129
+ // if(_thirdMenuType == 'WX'){
4130
+ // wx.ready(function(){
4131
+ // wx.closeWindow();
4132
+ // });
4133
+ // }else if(_thirdMenuType =='MH' && typeof(emp)!="undefined"){
4134
+ // emp.window.close({
4135
+ // id:'this', //指定被关闭窗口标识，如果id=‘this‘，则关闭当前窗口
4136
+ // })
4137
+ // } else {
4138
+ // setTimeout(
4139
+ // function () {
4140
+ // // window.ReactNativeWebView.postMessage('final');
4141
+ // backPage();
4142
+
4143
+ // }, 1500);
4144
+ // }
4112
4145
  } else {
4113
4146
  setTimeout(function () {
4114
4147
  history.back();
@@ -4183,8 +4216,8 @@ var PageHome = function (_React$Component) {
4183
4216
  }
4184
4217
  var shortMessage = '0';
4185
4218
  var circulateShortMessage = t.state.circulateShortMessage;
4186
- /* if(circulateShortMessage.length>0){
4187
- shortMessage=circulateShortMessage[0].value;
4219
+ /* if(circulateShortMessage.length>0){
4220
+ shortMessage=circulateShortMessage[0].value;
4188
4221
  }*/
4189
4222
  _Dialog2.default.confirm({
4190
4223
  locale: 'zh_CN',
@@ -4326,20 +4359,23 @@ var PageHome = function (_React$Component) {
4326
4359
  });
4327
4360
 
4328
4361
  if (isPush == '1') {
4329
- if (_thirdMenuType == 'WX') {
4330
- wx.ready(function () {
4331
- wx.closeWindow();
4332
- });
4333
- } else if (_thirdMenuType == 'MH' && typeof emp != "undefined") {
4334
- emp.window.close({
4335
- id: 'this' //指定被关闭窗口标识，如果id=‘this‘，则关闭当前窗口
4336
- });
4337
- } else {
4338
- setTimeout(function () {
4339
-
4340
- backPage();
4341
- }, 1500);
4342
- }
4362
+ // if(_thirdMenuType == 'WX'){
4363
+ // wx.ready(function(){
4364
+ // wx.closeWindow();
4365
+ // });
4366
+ // }else if(_thirdMenuType =='MH' && typeof(emp)!="undefined"){
4367
+ // emp.window.close({
4368
+ // id:'this', //指定被关闭窗口标识，如果id=‘this‘，则关闭当前窗口
4369
+ // })
4370
+ // }else{
4371
+ // setTimeout(
4372
+ // function () {
4373
+
4374
+ // backPage();
4375
+
4376
+ // }, 1500);
4377
+ // }
4378
+ closePage();
4343
4379
  } else {
4344
4380
  setTimeout(function () {
4345
4381
  history.back();
@@ -4583,20 +4619,23 @@ var PageHome = function (_React$Component) {
4583
4619
  content: t.state.finalButtons.get("BASE_JUMP") + '成功'
4584
4620
  });
4585
4621
  if (isPush == '1') {
4586
- if (_thirdMenuType == 'WX') {
4587
- wx.ready(function () {
4588
- wx.closeWindow();
4589
- });
4590
- } else if (_thirdMenuType == 'MH' && typeof emp != "undefined") {
4591
- emp.window.close({
4592
- id: 'this' //指定被关闭窗口标识，如果id=‘this‘，则关闭当前窗口
4593
- });
4594
- } else {
4595
- setTimeout(function () {
4596
-
4597
- backPage();
4598
- }, 1500);
4599
- }
4622
+ closePage();
4623
+ // if(_thirdMenuType == 'WX'){
4624
+ // wx.ready(function(){
4625
+ // wx.closeWindow();
4626
+ // });
4627
+ // }else if(_thirdMenuType =='MH' && typeof(emp)!="undefined"){
4628
+ // emp.window.close({
4629
+ // id:'this', //指定被关闭窗口标识，如果id=‘this‘，则关闭当前窗口
4630
+ // })
4631
+ // }else{
4632
+ // setTimeout(
4633
+ // function () {
4634
+
4635
+ // backPage();
4636
+
4637
+ // }, 1500);
4638
+ // }
4600
4639
  } else {
4601
4640
  setTimeout(function () {
4602
4641
  history.back();
@@ -4687,20 +4726,23 @@ var PageHome = function (_React$Component) {
4687
4726
  content: t.state.finalButtons.get("PAGE_URGE") + '成功'
4688
4727
  });
4689
4728
  if (isPush == '1') {
4690
- if (_thirdMenuType == 'WX') {
4691
- wx.ready(function () {
4692
- wx.closeWindow();
4693
- });
4694
- } else if (_thirdMenuType == 'MH' && typeof emp != "undefined") {
4695
- emp.window.close({
4696
- id: 'this' //指定被关闭窗口标识，如果id=‘this‘，则关闭当前窗口
4697
- });
4698
- } else {
4699
- setTimeout(function () {
4700
-
4701
- backPage();
4702
- }, 1500);
4703
- }
4729
+ closePage();
4730
+ // if(_thirdMenuType == 'WX'){
4731
+ // wx.ready(function(){
4732
+ // wx.closeWindow();
4733
+ // });
4734
+ // }else if(_thirdMenuType =='MH' && typeof(emp)!="undefined"){
4735
+ // emp.window.close({
4736
+ // id:'this', //指定被关闭窗口标识，如果id=‘this‘，则关闭当前窗口
4737
+ // })
4738
+ // }else{
4739
+ // setTimeout(
4740
+ // function () {
4741
+
4742
+ // backPage();
4743
+
4744
+ // }, 1500);
4745
+ // }
4704
4746
  } else {
4705
4747
  setTimeout(function () {
4706
4748
  history.back();
@@ -4757,7 +4799,7 @@ var PageHome = function (_React$Component) {
4757
4799
  var buttonIsMore = false;
4758
4800
  var buttonList = [];
4759
4801
  var sysWatermark = _this2.state.sysWatermark;
4760
- /* buttonCodeList.push({'buttonCode':'BASE_SUMBIT','buttonName':'通过'});
4802
+ /* buttonCodeList.push({'buttonCode':'BASE_SUMBIT','buttonName':'通过'});
4761
4803
  buttonCodeList.push({'buttonCode':'PAGE_SAVE','buttonName':'保存'});*/
4762
4804
  if (buttonCodeList.length > 4) {
4763
4805
  buttonList.push({ name: '更多', type: 'secondary', display: 'banner', no: -1 });
@@ -4908,20 +4950,23 @@ var PageHome = function (_React$Component) {
4908
4950
  mobileExt["operateCallBack"]({ type: 3, dataId: dataId, isBatch: 0 }, t.state);
4909
4951
  }
4910
4952
  if (isPush == '1') {
4911
- if (_thirdMenuType == 'WX') {
4912
- wx.ready(function () {
4913
- wx.closeWindow();
4914
- });
4915
- } else if (_thirdMenuType == 'MH' && typeof emp != "undefined") {
4916
- emp.window.close({
4917
- id: 'this' //指定被关闭窗口标识，如果id=‘this‘，则关闭当前窗口
4918
- });
4919
- } else {
4920
- setTimeout(function () {
4921
-
4922
- backPage();
4923
- }, 1500);
4924
- }
4953
+ closePage();
4954
+ // if(_thirdMenuType == 'WX'){
4955
+ // wx.ready(function(){
4956
+ // wx.closeWindow();
4957
+ // });
4958
+ // }else if(_thirdMenuType =='MH' && typeof(emp)!="undefined"){
4959
+ // emp.window.close({
4960
+ // id:'this', //指定被关闭窗口标识，如果id=‘this‘，则关闭当前窗口
4961
+ // })
4962
+ // }else{
4963
+ // setTimeout(
4964
+ // function () {
4965
+
4966
+ // backPage();
4967
+
4968
+ // }, 1500);
4969
+ // }
4925
4970
  } else {
4926
4971
  setTimeout(function () {
4927
4972
  history.back();
@@ -4983,20 +5028,23 @@ var PageHome = function (_React$Component) {
4983
5028
  mobileExt["operateCallBack"]({ type: 2, dataId: dataId, isBatch: 0 }, t.state);
4984
5029
  }
4985
5030
  if (isPush == '1') {
4986
- if (_thirdMenuType == 'WX') {
4987
- wx.ready(function () {
4988
- wx.closeWindow();
4989
- });
4990
- } else if (_thirdMenuType == 'MH' && typeof emp != "undefined") {
4991
- emp.window.close({
4992
- id: 'this' //指定被关闭窗口标识，如果id=‘this‘，则关闭当前窗口
4993
- });
4994
- } else {
4995
- setTimeout(function () {
4996
-
4997
- backPage();
4998
- }, 1500);
4999
- }
5031
+ closePage();
5032
+ // if(_thirdMenuType == 'WX'){
5033
+ // wx.ready(function(){
5034
+ // wx.closeWindow();
5035
+ // });
5036
+ // }else if(_thirdMenuType =='MH' && typeof(emp)!="undefined"){
5037
+ // emp.window.close({
5038
+ // id:'this', //指定被关闭窗口标识，如果id=‘this‘，则关闭当前窗口
5039
+ // })
5040
+ // }else{
5041
+ // setTimeout(
5042
+ // function () {
5043
+
5044
+ // backPage();
5045
+
5046
+ // }, 1500);
5047
+ // }
5000
5048
  } else {
5001
5049
  setTimeout(function () {
5002
5050
  history.back();
@@ -5149,22 +5197,22 @@ var PageHome = function (_React$Component) {
5149
5197
  });
5150
5198
  }
5151
5199
 
5152
- /*//修改审批意见
5153
- changeSpyj(newValue) {
5154
- let regRule= /\uD83C[\uDF00-\uDFFF]|\uD83D[\uDC00-\uDE4F]/g;
5155
- if(newValue.match(regRule)){
5156
- Toast.show({
5157
- type: 'error',
5158
- content: '不能输入表情',
5159
- });
5160
- return false;
5161
- }
5162
- if(newValue.length>200){
5163
- newValue=newValue.substring(0,200);
5164
- }
5165
- this.setState({
5166
- spyj: newValue,
5167
- });
5200
+ /*//修改审批意见
5201
+ changeSpyj(newValue) {
5202
+ let regRule= /\uD83C[\uDF00-\uDFFF]|\uD83D[\uDC00-\uDE4F]/g;
5203
+ if(newValue.match(regRule)){
5204
+ Toast.show({
5205
+ type: 'error',
5206
+ content: '不能输入表情',
5207
+ });
5208
+ return false;
5209
+ }
5210
+ if(newValue.length>200){
5211
+ newValue=newValue.substring(0,200);
5212
+ }
5213
+ this.setState({
5214
+ spyj: newValue,
5215
+ });
5168
5216
  }*/
5169
5217
 
5170
5218
  //修改催办内容
@@ -5244,8 +5292,8 @@ var PageHome = function (_React$Component) {
5244
5292
  });
5245
5293
  }
5246
5294
 
5247
- /**
5248
- * 取消操作
5295
+ /**
5296
+ * 取消操作
5249
5297
  **/
5250
5298
 
5251
5299
  }, {
package/lib/process_list/processList.js CHANGED
@@ -469,9 +469,9 @@ var PageHome = function (_React$Component2) {
469
469
  hasBatch: hasBatch
470
470
  };
471
471
 
472
- /**
473
- * 办理页面搜索框设置项
474
- * @type {{locale: string, instantSearch: boolean, hasHistory: boolean, searchDelay: number, onEnter: (()), onExit: (()), onChange: ((p1:*)), onSearch: ((p1?:*))}}
472
+ /**
473
+ * 办理页面搜索框设置项
474
+ * @type {{locale: string, instantSearch: boolean, hasHistory: boolean, searchDelay: number, onEnter: (()), onExit: (()), onChange: ((p1:*)), onSearch: ((p1?:*))}}
475
475
  */
476
476
  _this2.searchBarProps = {
477
477
  placeholder: "请输入流程标题查询",
@@ -525,9 +525,9 @@ var PageHome = function (_React$Component2) {
525
525
  // });
526
526
  }
527
527
 
528
- /**
529
- * tab页切换方法
530
- * @param obj
528
+ /**
529
+ * tab页切换方法
530
+ * @param obj
531
531
  */
532
532
 
533
533
  }, {
@@ -547,8 +547,8 @@ var PageHome = function (_React$Component2) {
547
547
  var preActive = obj.preActive;
548
548
  }
549
549
 
550
- /**
551
- * 获取页面 标题数量 方法
550
+ /**
551
+ * 获取页面 标题数量 方法
552
552
  */
553
553
 
554
554
  }, {
@@ -557,8 +557,8 @@ var PageHome = function (_React$Component2) {
557
557
  // this.dispatch('getTransactionListDate', this.state.activeTabItemIndex);
558
558
 
559
559
 
560
- /**
561
- * ScrollList 请求数据之前的函数
560
+ /**
561
+ * ScrollList 请求数据之前的函数
562
562
  */
563
563
 
564
564
  }, {
@@ -647,10 +647,10 @@ var PageHome = function (_React$Component2) {
647
647
  return data;
648
648
  }
649
649
 
650
- /**
651
- * ScrollList 得到返回数据
652
- * @param data
653
- * @returns {*}
650
+ /**
651
+ * ScrollList 得到返回数据
652
+ * @param data
653
+ * @returns {*}
654
654
  */
655
655
 
656
656
  }, {
@@ -663,8 +663,8 @@ var PageHome = function (_React$Component2) {
663
663
  return data;
664
664
  }
665
665
 
666
- /**
667
- * 搜索栏，确认搜索
666
+ /**
667
+ * 搜索栏，确认搜索
668
668
  */
669
669
 
670
670
  }, {
@@ -732,8 +732,8 @@ var PageHome = function (_React$Component2) {
732
732
  }
733
733
  }
734
734
 
735
- /**
736
- * 退出搜索栏工具
735
+ /**
736
+ * 退出搜索栏工具
737
737
  */
738
738
 
739
739
  }, {
@@ -878,55 +878,80 @@ var PageHome = function (_React$Component2) {
878
878
  });
879
879
  return;
880
880
  }
881
- _db2.default.FlowModuleAPI.getUndoTaskInfo({
882
- taskId: taskId,
883
- type: 0
884
- }).then(function (taskContent) {
885
- var buttonCodes = taskContent.buttons;
886
- var tasktype = taskContent.tasktype;
887
- if (tasktype != 'radom') {
888
- //是否有批示意见
889
- var commentIsNotNull = taskContent.commentIsNotNull; //审批意见是否为空
890
- if (!commentIsNotNull) {
891
- commentIsNotNull = '0';
881
+ console.log("taskIds===" + taskIds);
882
+ _db2.default.FlowModuleAPI.batchValidateForm({
883
+ taskIds: taskIds
884
+ }).then(function (validateContent) {
885
+
886
+ if (validateContent != null && validateContent.length > 0) {
887
+ var titles = '';
888
+ for (var s = 0; s < validateContent.length; s++) {
889
+ titles += validateContent[s].title + '、';
892
890
  }
893
- var hasCommentField = taskContent.hasCommentField;
894
- if (!hasCommentField) {
895
- hasCommentField = '0';
891
+ if (titles.length > 0) {
892
+ titles = titles.substring(0, titles.length - 1);
893
+ _Toast2.default.show({
894
+ type: 'success',
895
+ content: '批量提交失败，' + titles + '，存在必填项没有填写！'
896
+ });
897
+ return;
896
898
  }
897
- var commentType = taskContent.commentType; //审批意见类型
898
- if (!commentType) {
899
- commentType = '-1';
900
- }
901
-
902
- var signPicId = taskContent.signPicId; //签名图片id
903
- if (!signPicId) {
904
- signPicId = "-1";
905
- }
906
-
907
- //紧急
908
- var urgent = taskContent.urgency;
909
- if (!urgent) {
910
- urgent = '0';
899
+ }
900
+ _db2.default.FlowModuleAPI.getUndoTaskInfo({
901
+ taskId: taskId,
902
+ type: 0
903
+ }).then(function (taskContent) {
904
+ var buttonCodes = taskContent.buttons;
905
+ var tasktype = taskContent.tasktype;
906
+ if (tasktype != 'radom') {
907
+ //是否有批示意见
908
+ var commentIsNotNull = taskContent.commentIsNotNull; //审批意见是否为空
909
+ if (!commentIsNotNull) {
910
+ commentIsNotNull = '0';
911
+ }
912
+ var hasCommentField = taskContent.hasCommentField;
913
+ if (!hasCommentField) {
914
+ hasCommentField = '0';
915
+ }
916
+ var commentType = taskContent.commentType; //审批意见类型
917
+ if (!commentType) {
918
+ commentType = '-1';
919
+ }
920
+
921
+ var signPicId = taskContent.signPicId; //签名图片id
922
+ if (!signPicId) {
923
+ signPicId = "-1";
924
+ }
925
+
926
+ //紧急
927
+ var urgent = taskContent.urgency;
928
+ if (!urgent) {
929
+ urgent = '0';
930
+ }
931
+
932
+ //是否有锁
933
+ var lock = taskContent.lock;
934
+
935
+ //流程编码
936
+ var code = taskContent.code;
937
+
938
+ //是否是起点
939
+ var isStart = taskContent.isStart == true ? "1" : "0";
940
+
941
+ location.hash = 'approval/batch/' + taskIds + "/" + processInstanceIds + "/1/" + code + "/" + hasCommentField + "/" + commentIsNotNull + "/" + commentType + "/" + signPicId + "/" + urgent + "/" + isStart + "/" + _module + "?project=mobileportal";
942
+ } else {
943
+ _Toast2.default.show({
944
+ type: 'error',
945
+ content: '当前勾选的任务中，含有不支持批量通过的任务！'
946
+ });
947
+ return;
911
948
  }
912
-
913
- //是否有锁
914
- var lock = taskContent.lock;
915
-
916
- //流程编码
917
- var code = taskContent.code;
918
-
919
- //是否是起点
920
- var isStart = taskContent.isStart == true ? "1" : "0";
921
-
922
- location.hash = 'approval/batch/' + taskIds + "/" + processInstanceIds + "/1/" + code + "/" + hasCommentField + "/" + commentIsNotNull + "/" + commentType + "/" + signPicId + "/" + urgent + "/" + isStart + "/" + _module + "?project=mobileportal";
923
- } else {
949
+ }).catch(function (error) {
924
950
  _Toast2.default.show({
925
951
  type: 'error',
926
- content: '当前勾选的任务中，含有不支持批量通过的任务！'
952
+ content: error.errorMsg
927
953
  });
928
- return;
929
- }
954
+ });
930
955
  }).catch(function (error) {
931
956
  _Toast2.default.show({
932
957
  type: 'error',
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "fmui-base",
3
- "version": "1.0.29",
3
+ "version": "1.0.30",
4
4
  "title": "fmui-base",
5
5
  "description": "fmui移动端组件",
6
6
  "main": "lib/index.js",