ecinc-cloud-wappaio 9.6.438 → 9.6.439

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/ecwappaio.common.js +41 -31
  2. package/lib/ecwappaio.umd.js +41 -31
  3. package/lib/ecwappaio.umd.min.js +1 -1
  4. package/package.json +1 -1
package/lib/ecwappaio.common.js CHANGED
@@ -146026,6 +146026,9 @@ var wfengine_install = function install(Vue) {
146026
146026
  if ($scope.curTN.staffOrgName) {
146027
146027
  $scope.curTN.staffOrgShortName = $scope.curTN.staffOrgName.substring($scope.curTN.staffOrgName.indexOf('-') + 1);
146028
146028
  }
146029
+ if ($scope.$route.query.wfNodelogId && $scope.$route.query.wfNodelogId !== $scope.curTN.tnID) {
146030
+ $scope.$route.query.wfNodelogId = $scope.curTN.tnID;
146031
+ }
146029
146032
  $scope.wfJsonData = $scope.wfInstance.passenger.wfJsonData;
146030
146033
  if (typeof $scope.wfJsonData === 'string') {
146031
146034
  $scope.wfJsonData = JSON.parse($scope.wfJsonData);
@@ -146965,41 +146968,48 @@ var wfengine_install = function install(Vue) {
146965
146968
  checkPrarllelTodoCount: function checkPrarllelTodoCount($scope, params) {
146966
146969
  var _this4 = this;
146967
146970
  return new Promise(function (resole) {
146968
- var selRoute = $scope.wfJsonData.routes[$scope.submitHandle.route.index];
146969
- if ($scope.curTN.passenger.prarllelTodoCount > 1 && selRoute.type === '4') {
146970
- //检查是否还有其它并行办理人
146971
- var saveData = {
146972
- wfInstance: JSON.stringify($scope.wfInstance),
146973
- curTN: JSON.stringify($scope.curTN)
146974
- };
146975
- _this4.$http({
146976
- method: 'POST',
146977
- contentType: 'application/x-www-form-urlencoded',
146978
- data: lib_default().stringify(saveData),
146979
- params: $scope.$vnode.context.wfParams,
146980
- url: 'workflow/wfInstance/getUdmNodeUsers'
146981
- }).then(function (res) {
146982
- if (res.code === 'success') {
146983
- if (res.body.prarllelTodoCount === 1) {
146984
- $scope.$set($scope.curTN.passenger, 'prarllelTodoCount', 1);
146985
- $scope.$set($scope.wfInstance.passenger, 'udmNodeUsers', res.body.udmNodeUsers);
146986
- resole({
146987
- code: 'retry',
146988
- message: '提交路径不可用，请重试。'
146989
- });
146971
+ if ($scope.wfJsonData && $scope.wfJsonData.routes && $scope.wfJsonData.routes.length > 0) {
146972
+ var selRoute = $scope.wfJsonData.routes[$scope.submitHandle.route.index];
146973
+ if ($scope.curTN.passenger.prarllelTodoCount > 1 && selRoute.type === '4') {
146974
+ //检查是否还有其它并行办理人
146975
+ var saveData = {
146976
+ wfInstance: JSON.stringify($scope.wfInstance),
146977
+ curTN: JSON.stringify($scope.curTN)
146978
+ };
146979
+ _this4.$http({
146980
+ method: 'POST',
146981
+ contentType: 'application/x-www-form-urlencoded',
146982
+ data: lib_default().stringify(saveData),
146983
+ params: $scope.$vnode.context.wfParams,
146984
+ url: 'workflow/wfInstance/getUdmNodeUsers'
146985
+ }).then(function (res) {
146986
+ if (res.code === 'success') {
146987
+ if (res.body.prarllelTodoCount === 1) {
146988
+ $scope.$set($scope.curTN.passenger, 'prarllelTodoCount', 1);
146989
+ $scope.$set($scope.wfInstance.passenger, 'udmNodeUsers', res.body.udmNodeUsers);
146990
+ resole({
146991
+ code: 'retry',
146992
+ message: '提交路径不可用，请重试。'
146993
+ });
146994
+ } else {
146995
+ resole({
146996
+ code: 'success',
146997
+ message: '未检测到并行冲突，可继续提交。'
146998
+ });
146999
+ }
146990
147000
  } else {
146991
147001
  resole({
146992
- code: 'success',
146993
- message: '未检测到并行冲突，可继续提交。'
147002
+ code: 'warning',
147003
+ message: res.message
146994
147004
  });
146995
147005
  }
146996
- } else {
146997
- resole({
146998
- code: 'warning',
146999
- message: res.message
147000
- });
147001
- }
147002
- });
147006
+ });
147007
+ } else {
147008
+ resole({
147009
+ code: 'success',
147010
+ message: '未检测到并行冲突，可继续提交。'
147011
+ });
147012
+ }
147003
147013
  } else {
147004
147014
  resole({
147005
147015
  code: 'success',
package/lib/ecwappaio.umd.js CHANGED
@@ -146036,6 +146036,9 @@ var wfengine_install = function install(Vue) {
146036
146036
  if ($scope.curTN.staffOrgName) {
146037
146037
  $scope.curTN.staffOrgShortName = $scope.curTN.staffOrgName.substring($scope.curTN.staffOrgName.indexOf('-') + 1);
146038
146038
  }
146039
+ if ($scope.$route.query.wfNodelogId && $scope.$route.query.wfNodelogId !== $scope.curTN.tnID) {
146040
+ $scope.$route.query.wfNodelogId = $scope.curTN.tnID;
146041
+ }
146039
146042
  $scope.wfJsonData = $scope.wfInstance.passenger.wfJsonData;
146040
146043
  if (typeof $scope.wfJsonData === 'string') {
146041
146044
  $scope.wfJsonData = JSON.parse($scope.wfJsonData);
@@ -146975,41 +146978,48 @@ var wfengine_install = function install(Vue) {
146975
146978
  checkPrarllelTodoCount: function checkPrarllelTodoCount($scope, params) {
146976
146979
  var _this4 = this;
146977
146980
  return new Promise(function (resole) {
146978
- var selRoute = $scope.wfJsonData.routes[$scope.submitHandle.route.index];
146979
- if ($scope.curTN.passenger.prarllelTodoCount > 1 && selRoute.type === '4') {
146980
- //检查是否还有其它并行办理人
146981
- var saveData = {
146982
- wfInstance: JSON.stringify($scope.wfInstance),
146983
- curTN: JSON.stringify($scope.curTN)
146984
- };
146985
- _this4.$http({
146986
- method: 'POST',
146987
- contentType: 'application/x-www-form-urlencoded',
146988
- data: lib_default().stringify(saveData),
146989
- params: $scope.$vnode.context.wfParams,
146990
- url: 'workflow/wfInstance/getUdmNodeUsers'
146991
- }).then(function (res) {
146992
- if (res.code === 'success') {
146993
- if (res.body.prarllelTodoCount === 1) {
146994
- $scope.$set($scope.curTN.passenger, 'prarllelTodoCount', 1);
146995
- $scope.$set($scope.wfInstance.passenger, 'udmNodeUsers', res.body.udmNodeUsers);
146996
- resole({
146997
- code: 'retry',
146998
- message: '提交路径不可用，请重试。'
146999
- });
146981
+ if ($scope.wfJsonData && $scope.wfJsonData.routes && $scope.wfJsonData.routes.length > 0) {
146982
+ var selRoute = $scope.wfJsonData.routes[$scope.submitHandle.route.index];
146983
+ if ($scope.curTN.passenger.prarllelTodoCount > 1 && selRoute.type === '4') {
146984
+ //检查是否还有其它并行办理人
146985
+ var saveData = {
146986
+ wfInstance: JSON.stringify($scope.wfInstance),
146987
+ curTN: JSON.stringify($scope.curTN)
146988
+ };
146989
+ _this4.$http({
146990
+ method: 'POST',
146991
+ contentType: 'application/x-www-form-urlencoded',
146992
+ data: lib_default().stringify(saveData),
146993
+ params: $scope.$vnode.context.wfParams,
146994
+ url: 'workflow/wfInstance/getUdmNodeUsers'
146995
+ }).then(function (res) {
146996
+ if (res.code === 'success') {
146997
+ if (res.body.prarllelTodoCount === 1) {
146998
+ $scope.$set($scope.curTN.passenger, 'prarllelTodoCount', 1);
146999
+ $scope.$set($scope.wfInstance.passenger, 'udmNodeUsers', res.body.udmNodeUsers);
147000
+ resole({
147001
+ code: 'retry',
147002
+ message: '提交路径不可用，请重试。'
147003
+ });
147004
+ } else {
147005
+ resole({
147006
+ code: 'success',
147007
+ message: '未检测到并行冲突，可继续提交。'
147008
+ });
147009
+ }
147000
147010
  } else {
147001
147011
  resole({
147002
- code: 'success',
147003
- message: '未检测到并行冲突，可继续提交。'
147012
+ code: 'warning',
147013
+ message: res.message
147004
147014
  });
147005
147015
  }
147006
- } else {
147007
- resole({
147008
- code: 'warning',
147009
- message: res.message
147010
- });
147011
- }
147012
- });
147016
+ });
147017
+ } else {
147018
+ resole({
147019
+ code: 'success',
147020
+ message: '未检测到并行冲突，可继续提交。'
147021
+ });
147022
+ }
147013
147023
  } else {
147014
147024
  resole({
147015
147025
  code: 'success',