ecinc-cloud-mappaio 9.6.118 → 9.6.119

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 (4) hide show
  1. package/lib/ecmappaio.common.js +41 -31
  2. package/lib/ecmappaio.umd.js +41 -31
  3. package/lib/ecmappaio.umd.min.js +1 -1
  4. package/package.json +1 -1
package/lib/ecmappaio.common.js CHANGED
@@ -41730,6 +41730,9 @@ var wfengine_install = function install(Vue) {
41730
41730
  if ($scope.curTN.staffOrgName) {
41731
41731
  $scope.curTN.staffOrgShortName = $scope.curTN.staffOrgName.substring($scope.curTN.staffOrgName.indexOf('-') + 1);
41732
41732
  }
41733
+ if ($scope.$route.query.wfNodelogId && $scope.$route.query.wfNodelogId !== $scope.curTN.tnID) {
41734
+ $scope.$route.query.wfNodelogId = $scope.curTN.tnID;
41735
+ }
41733
41736
  $scope.wfJsonData = $scope.wfInstance.passenger.wfJsonData;
41734
41737
  if (typeof $scope.wfJsonData === 'string') {
41735
41738
  $scope.wfJsonData = JSON.parse($scope.wfJsonData);
@@ -42669,41 +42672,48 @@ var wfengine_install = function install(Vue) {
42669
42672
  checkPrarllelTodoCount: function checkPrarllelTodoCount($scope, params) {
42670
42673
  var _this4 = this;
42671
42674
  return new Promise(function (resole) {
42672
- var selRoute = $scope.wfJsonData.routes[$scope.submitHandle.route.index];
42673
- if ($scope.curTN.passenger.prarllelTodoCount > 1 && selRoute.type === '4') {
42674
- //检查是否还有其它并行办理人
42675
- var saveData = {
42676
- wfInstance: JSON.stringify($scope.wfInstance),
42677
- curTN: JSON.stringify($scope.curTN)
42678
- };
42679
- _this4.$http({
42680
- method: 'POST',
42681
- contentType: 'application/x-www-form-urlencoded',
42682
- data: lib_default().stringify(saveData),
42683
- params: $scope.$vnode.context.wfParams,
42684
- url: 'workflow/wfInstance/getUdmNodeUsers'
42685
- }).then(function (res) {
42686
- if (res.code === 'success') {
42687
- if (res.body.prarllelTodoCount === 1) {
42688
- $scope.$set($scope.curTN.passenger, 'prarllelTodoCount', 1);
42689
- $scope.$set($scope.wfInstance.passenger, 'udmNodeUsers', res.body.udmNodeUsers);
42690
- resole({
42691
- code: 'retry',
42692
- message: '提交路径不可用，请重试。'
42693
- });
42675
+ if ($scope.wfJsonData && $scope.wfJsonData.routes && $scope.wfJsonData.routes.length > 0) {
42676
+ var selRoute = $scope.wfJsonData.routes[$scope.submitHandle.route.index];
42677
+ if ($scope.curTN.passenger.prarllelTodoCount > 1 && selRoute.type === '4') {
42678
+ //检查是否还有其它并行办理人
42679
+ var saveData = {
42680
+ wfInstance: JSON.stringify($scope.wfInstance),
42681
+ curTN: JSON.stringify($scope.curTN)
42682
+ };
42683
+ _this4.$http({
42684
+ method: 'POST',
42685
+ contentType: 'application/x-www-form-urlencoded',
42686
+ data: lib_default().stringify(saveData),
42687
+ params: $scope.$vnode.context.wfParams,
42688
+ url: 'workflow/wfInstance/getUdmNodeUsers'
42689
+ }).then(function (res) {
42690
+ if (res.code === 'success') {
42691
+ if (res.body.prarllelTodoCount === 1) {
42692
+ $scope.$set($scope.curTN.passenger, 'prarllelTodoCount', 1);
42693
+ $scope.$set($scope.wfInstance.passenger, 'udmNodeUsers', res.body.udmNodeUsers);
42694
+ resole({
42695
+ code: 'retry',
42696
+ message: '提交路径不可用，请重试。'
42697
+ });
42698
+ } else {
42699
+ resole({
42700
+ code: 'success',
42701
+ message: '未检测到并行冲突，可继续提交。'
42702
+ });
42703
+ }
42694
42704
  } else {
42695
42705
  resole({
42696
- code: 'success',
42697
- message: '未检测到并行冲突，可继续提交。'
42706
+ code: 'warning',
42707
+ message: res.message
42698
42708
  });
42699
42709
  }
42700
- } else {
42701
- resole({
42702
- code: 'warning',
42703
- message: res.message
42704
- });
42705
- }
42706
- });
42710
+ });
42711
+ } else {
42712
+ resole({
42713
+ code: 'success',
42714
+ message: '未检测到并行冲突，可继续提交。'
42715
+ });
42716
+ }
42707
42717
  } else {
42708
42718
  resole({
42709
42719
  code: 'success',
package/lib/ecmappaio.umd.js CHANGED
@@ -41740,6 +41740,9 @@ var wfengine_install = function install(Vue) {
41740
41740
  if ($scope.curTN.staffOrgName) {
41741
41741
  $scope.curTN.staffOrgShortName = $scope.curTN.staffOrgName.substring($scope.curTN.staffOrgName.indexOf('-') + 1);
41742
41742
  }
41743
+ if ($scope.$route.query.wfNodelogId && $scope.$route.query.wfNodelogId !== $scope.curTN.tnID) {
41744
+ $scope.$route.query.wfNodelogId = $scope.curTN.tnID;
41745
+ }
41743
41746
  $scope.wfJsonData = $scope.wfInstance.passenger.wfJsonData;
41744
41747
  if (typeof $scope.wfJsonData === 'string') {
41745
41748
  $scope.wfJsonData = JSON.parse($scope.wfJsonData);
@@ -42679,41 +42682,48 @@ var wfengine_install = function install(Vue) {
42679
42682
  checkPrarllelTodoCount: function checkPrarllelTodoCount($scope, params) {
42680
42683
  var _this4 = this;
42681
42684
  return new Promise(function (resole) {
42682
- var selRoute = $scope.wfJsonData.routes[$scope.submitHandle.route.index];
42683
- if ($scope.curTN.passenger.prarllelTodoCount > 1 && selRoute.type === '4') {
42684
- //检查是否还有其它并行办理人
42685
- var saveData = {
42686
- wfInstance: JSON.stringify($scope.wfInstance),
42687
- curTN: JSON.stringify($scope.curTN)
42688
- };
42689
- _this4.$http({
42690
- method: 'POST',
42691
- contentType: 'application/x-www-form-urlencoded',
42692
- data: lib_default().stringify(saveData),
42693
- params: $scope.$vnode.context.wfParams,
42694
- url: 'workflow/wfInstance/getUdmNodeUsers'
42695
- }).then(function (res) {
42696
- if (res.code === 'success') {
42697
- if (res.body.prarllelTodoCount === 1) {
42698
- $scope.$set($scope.curTN.passenger, 'prarllelTodoCount', 1);
42699
- $scope.$set($scope.wfInstance.passenger, 'udmNodeUsers', res.body.udmNodeUsers);
42700
- resole({
42701
- code: 'retry',
42702
- message: '提交路径不可用，请重试。'
42703
- });
42685
+ if ($scope.wfJsonData && $scope.wfJsonData.routes && $scope.wfJsonData.routes.length > 0) {
42686
+ var selRoute = $scope.wfJsonData.routes[$scope.submitHandle.route.index];
42687
+ if ($scope.curTN.passenger.prarllelTodoCount > 1 && selRoute.type === '4') {
42688
+ //检查是否还有其它并行办理人
42689
+ var saveData = {
42690
+ wfInstance: JSON.stringify($scope.wfInstance),
42691
+ curTN: JSON.stringify($scope.curTN)
42692
+ };
42693
+ _this4.$http({
42694
+ method: 'POST',
42695
+ contentType: 'application/x-www-form-urlencoded',
42696
+ data: lib_default().stringify(saveData),
42697
+ params: $scope.$vnode.context.wfParams,
42698
+ url: 'workflow/wfInstance/getUdmNodeUsers'
42699
+ }).then(function (res) {
42700
+ if (res.code === 'success') {
42701
+ if (res.body.prarllelTodoCount === 1) {
42702
+ $scope.$set($scope.curTN.passenger, 'prarllelTodoCount', 1);
42703
+ $scope.$set($scope.wfInstance.passenger, 'udmNodeUsers', res.body.udmNodeUsers);
42704
+ resole({
42705
+ code: 'retry',
42706
+ message: '提交路径不可用，请重试。'
42707
+ });
42708
+ } else {
42709
+ resole({
42710
+ code: 'success',
42711
+ message: '未检测到并行冲突，可继续提交。'
42712
+ });
42713
+ }
42704
42714
  } else {
42705
42715
  resole({
42706
- code: 'success',
42707
- message: '未检测到并行冲突，可继续提交。'
42716
+ code: 'warning',
42717
+ message: res.message
42708
42718
  });
42709
42719
  }
42710
- } else {
42711
- resole({
42712
- code: 'warning',
42713
- message: res.message
42714
- });
42715
- }
42716
- });
42720
+ });
42721
+ } else {
42722
+ resole({
42723
+ code: 'success',
42724
+ message: '未检测到并行冲突，可继续提交。'
42725
+ });
42726
+ }
42717
42727
  } else {
42718
42728
  resole({
42719
42729
  code: 'success',