ecinc-cloud-wappaio 9.6.407 → 9.6.409

package/lib/ecwappaio.common.js

@@ -42756,7 +42756,7 @@ ___CSS_LOADER_EXPORT___.push([module.id, "[data-v-771f9a12] .todo-row .cell{line
 
 /***/ }),
 
-/***/ 61005:
+/***/ 32622:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -42770,7 +42770,7 @@ __webpack_require__.r(__webpack_exports__);
 
 var ___CSS_LOADER_EXPORT___ = _node_modules_css_loader_dist_runtime_api_js__WEBPACK_IMPORTED_MODULE_1___default()((_node_modules_css_loader_dist_runtime_noSourceMaps_js__WEBPACK_IMPORTED_MODULE_0___default()));
 // Module
-___CSS_LOADER_EXPORT___.push([module.id, ".tdw17[data-v-29ad0a91]{width:20%!important}.tdw83[data-v-29ad0a91]{width:80%!important}", ""]);
+___CSS_LOADER_EXPORT___.push([module.id, ".tdw17[data-v-2a6b1b26]{width:20%!important}.tdw83[data-v-2a6b1b26]{width:80%!important}", ""]);
 // Exports
 /* harmony default export */ __webpack_exports__["default"] = (___CSS_LOADER_EXPORT___);
 
@@ -135361,19 +135361,19 @@ var update = add("893b10d2", content, true, {"sourceMap":false,"shadowMode":fals
 
 /***/ }),
 
-/***/ 69887:
+/***/ 25604:
 /***/ (function(module, __unused_webpack_exports, __webpack_require__) {
 
 // style-loader: Adds some css to the DOM by adding a <style> tag
 
 // load the styles
-var content = __webpack_require__(61005);
+var content = __webpack_require__(32622);
 if(content.__esModule) content = content.default;
 if(typeof content === 'string') content = [[module.id, content, '']];
 if(content.locals) module.exports = content.locals;
 // add the styles to the DOM
 var add = (__webpack_require__(99548)/* ["default"] */ .A)
-var update = add("7cc04760", content, true, {"sourceMap":false,"shadowMode":false});
+var update = add("17b78f46", content, true, {"sourceMap":false,"shadowMode":false});
 
 /***/ }),
 
@@ -144199,7 +144199,10 @@ var wfengine_install = function install(Vue) {
               }
               if ($scope.wfJsonData && $scope.wfJsonData.routes) {
                 if ($scope.wfJsonData && $scope.wfInstance.passenger.isUdmNodes === 1) {
-                  $scope.wfJsonData.routes = [];
+                  if ($scope.curTN.tnToDoMode !== 2 && $scope.curTN.tnToDoMode !== 3) {
+                    //自由协同，非串行、会签节点，忽略后端wfJsonData数据
+                    $scope.wfJsonData.routes = [];
+                  }
                 }
 
                 // 是否有需要复制引用其它环节处理人
@@ -144412,6 +144415,11 @@ var wfengine_install = function install(Vue) {
         var customRoutes = [];
         if ($scope.curTN.passenger.needClaim) {
           return customRoutes;
+        } else if ($scope.curTN.tnToDoMode === 2 || $scope.curTN.tnToDoMode === 3) {
+          //会签、串行节点路径，由后端自动计算生成
+          if ($scope.wfJsonData && $scope.wfJsonData.routes && $scope.wfJsonData.routes.length > 0) {
+            return $scope.wfJsonData.routes;
+          }
         }
         $scope.wfInstance.udmNodes.forEach(function (taskNode, index) {
           if (taskNode.name === $scope.curTN.tnNodeName) {
@@ -144709,6 +144717,12 @@ var wfengine_install = function install(Vue) {
             if (res.code === 'success') {
               console.log('wfEngineService getWfJsonData success');
               $scope.wfJsonData = res.body.wfJsonData;
+              if ($scope.wfJsonData && $scope.wfInstance.passenger.isUdmNodes === 1) {
+                if ($scope.curTN.tnToDoMode !== 2 && $scope.curTN.tnToDoMode !== 3) {
+                  //自由协同，非串行、会签节点，忽略后端wfJsonData数据
+                  $scope.wfJsonData.routes = [];
+                }
+              }
               if (res.body.udmjysp) {
                 $scope.wfInstance.passenger.udmjysp = res.body.udmjysp;
                 $scope.wfInstance.passenger.isUdmNodes = res.body.isUdmNodes;
@@ -174273,8 +174287,8 @@ var SubmitHandlevue_type_template_id_69e5d915_scoped_true_render = function rend
 };
 var SubmitHandlevue_type_template_id_69e5d915_scoped_true_staticRenderFns = [];
 
-;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecwapp/Wflowform/src/WfTaskNode.vue?vue&type=template&id=29ad0a91&scoped=true
-var WfTaskNodevue_type_template_id_29ad0a91_scoped_true_render = function render() {
+;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecwapp/Wflowform/src/WfTaskNode.vue?vue&type=template&id=2a6b1b26&scoped=true
+var WfTaskNodevue_type_template_id_2a6b1b26_scoped_true_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('el-dialog', {
@@ -175111,11 +175125,7 @@ var WfTaskNodevue_type_template_id_29ad0a91_scoped_true_render = function render
     attrs: {
       "label": 2
     }
-  }, [_vm._v("退回发起节点")]), _c('el-radio', {
-    attrs: {
-      "label": 3
-    }
-  }, [_vm._v("退回任意节点")])], 1)], 1)]) : _vm._e(), !_vm.taskNode.startNode && _vm.taskNode.todoMode !== '0' ? _c('tr', [_c('td', {
+  }, [_vm._v("退回发起节点")])], 1)], 1)]) : _vm._e(), !_vm.taskNode.startNode && _vm.taskNode.todoMode !== '0' ? _c('tr', [_c('td', {
     staticClass: "el-table__cell tdlbl tdw17"
   }, [_vm._v("是否自动全选处理人")]), _c('td', {
     staticClass: "el-table__cell tdcont tdw83"
@@ -175197,7 +175207,7 @@ var WfTaskNodevue_type_template_id_29ad0a91_scoped_true_render = function render
     }
   }, [_vm._v("关 闭")])]], 2)], 1);
 };
-var WfTaskNodevue_type_template_id_29ad0a91_scoped_true_staticRenderFns = [];
+var WfTaskNodevue_type_template_id_2a6b1b26_scoped_true_staticRenderFns = [];
 
 ;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[0]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecwapp/Wflowform/src/WfTaskNode.vue?vue&type=script&lang=js
 
@@ -175597,9 +175607,9 @@ var WfTaskNodevue_type_template_id_29ad0a91_scoped_true_staticRenderFns = [];
 });
 ;// CONCATENATED MODULE: ./packages/ecwapp/Wflowform/src/WfTaskNode.vue?vue&type=script&lang=js
  /* harmony default export */ var src_WfTaskNodevue_type_script_lang_js = (WfTaskNodevue_type_script_lang_js); 
-// EXTERNAL MODULE: ./node_modules/vue-style-loader/index.js??clonedRuleSet-22.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[2]!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[3]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22.use[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecwapp/Wflowform/src/WfTaskNode.vue?vue&type=style&index=0&id=29ad0a91&prod&scoped=true&lang=scss
-var WfTaskNodevue_type_style_index_0_id_29ad0a91_prod_scoped_true_lang_scss = __webpack_require__(69887);
-;// CONCATENATED MODULE: ./packages/ecwapp/Wflowform/src/WfTaskNode.vue?vue&type=style&index=0&id=29ad0a91&prod&scoped=true&lang=scss
+// EXTERNAL MODULE: ./node_modules/vue-style-loader/index.js??clonedRuleSet-22.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[2]!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[3]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22.use[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecwapp/Wflowform/src/WfTaskNode.vue?vue&type=style&index=0&id=2a6b1b26&prod&scoped=true&lang=scss
+var WfTaskNodevue_type_style_index_0_id_2a6b1b26_prod_scoped_true_lang_scss = __webpack_require__(25604);
+;// CONCATENATED MODULE: ./packages/ecwapp/Wflowform/src/WfTaskNode.vue?vue&type=style&index=0&id=2a6b1b26&prod&scoped=true&lang=scss
 
 ;// CONCATENATED MODULE: ./packages/ecwapp/Wflowform/src/WfTaskNode.vue
 
@@ -175612,11 +175622,11 @@ var WfTaskNodevue_type_style_index_0_id_29ad0a91_prod_scoped_true_lang_scss = __
 
 var WfTaskNode_component = (0,componentNormalizer/* default */.A)(
   src_WfTaskNodevue_type_script_lang_js,
-  WfTaskNodevue_type_template_id_29ad0a91_scoped_true_render,
-  WfTaskNodevue_type_template_id_29ad0a91_scoped_true_staticRenderFns,
+  WfTaskNodevue_type_template_id_2a6b1b26_scoped_true_render,
+  WfTaskNodevue_type_template_id_2a6b1b26_scoped_true_staticRenderFns,
   false,
   null,
-  "29ad0a91",
+  "2a6b1b26",
   null
   
 )

package/lib/ecwappaio.umd.js

@@ -42766,7 +42766,7 @@ ___CSS_LOADER_EXPORT___.push([module.id, "[data-v-771f9a12] .todo-row .cell{line
 
 /***/ }),
 
-/***/ 84461:
+/***/ 56078:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -42780,7 +42780,7 @@ __webpack_require__.r(__webpack_exports__);
 
 var ___CSS_LOADER_EXPORT___ = _node_modules_css_loader_dist_runtime_api_js__WEBPACK_IMPORTED_MODULE_1___default()((_node_modules_css_loader_dist_runtime_noSourceMaps_js__WEBPACK_IMPORTED_MODULE_0___default()));
 // Module
-___CSS_LOADER_EXPORT___.push([module.id, ".tdw17[data-v-29ad0a91]{width:20%!important}.tdw83[data-v-29ad0a91]{width:80%!important}", ""]);
+___CSS_LOADER_EXPORT___.push([module.id, ".tdw17[data-v-2a6b1b26]{width:20%!important}.tdw83[data-v-2a6b1b26]{width:80%!important}", ""]);
 // Exports
 /* harmony default export */ __webpack_exports__["default"] = (___CSS_LOADER_EXPORT___);
 
@@ -135371,19 +135371,19 @@ var update = add("3253775b", content, true, {"sourceMap":false,"shadowMode":fals
 
 /***/ }),
 
-/***/ 75161:
+/***/ 78114:
 /***/ (function(module, __unused_webpack_exports, __webpack_require__) {
 
 // style-loader: Adds some css to the DOM by adding a <style> tag
 
 // load the styles
-var content = __webpack_require__(84461);
+var content = __webpack_require__(56078);
 if(content.__esModule) content = content.default;
 if(typeof content === 'string') content = [[module.id, content, '']];
 if(content.locals) module.exports = content.locals;
 // add the styles to the DOM
 var add = (__webpack_require__(99548)/* ["default"] */ .A)
-var update = add("3d4d6a24", content, true, {"sourceMap":false,"shadowMode":false});
+var update = add("969d49be", content, true, {"sourceMap":false,"shadowMode":false});
 
 /***/ }),
 
@@ -144209,7 +144209,10 @@ var wfengine_install = function install(Vue) {
               }
               if ($scope.wfJsonData && $scope.wfJsonData.routes) {
                 if ($scope.wfJsonData && $scope.wfInstance.passenger.isUdmNodes === 1) {
-                  $scope.wfJsonData.routes = [];
+                  if ($scope.curTN.tnToDoMode !== 2 && $scope.curTN.tnToDoMode !== 3) {
+                    //自由协同，非串行、会签节点，忽略后端wfJsonData数据
+                    $scope.wfJsonData.routes = [];
+                  }
                 }
 
                 // 是否有需要复制引用其它环节处理人
@@ -144422,6 +144425,11 @@ var wfengine_install = function install(Vue) {
         var customRoutes = [];
         if ($scope.curTN.passenger.needClaim) {
           return customRoutes;
+        } else if ($scope.curTN.tnToDoMode === 2 || $scope.curTN.tnToDoMode === 3) {
+          //会签、串行节点路径，由后端自动计算生成
+          if ($scope.wfJsonData && $scope.wfJsonData.routes && $scope.wfJsonData.routes.length > 0) {
+            return $scope.wfJsonData.routes;
+          }
         }
         $scope.wfInstance.udmNodes.forEach(function (taskNode, index) {
           if (taskNode.name === $scope.curTN.tnNodeName) {
@@ -144719,6 +144727,12 @@ var wfengine_install = function install(Vue) {
             if (res.code === 'success') {
               console.log('wfEngineService getWfJsonData success');
               $scope.wfJsonData = res.body.wfJsonData;
+              if ($scope.wfJsonData && $scope.wfInstance.passenger.isUdmNodes === 1) {
+                if ($scope.curTN.tnToDoMode !== 2 && $scope.curTN.tnToDoMode !== 3) {
+                  //自由协同，非串行、会签节点，忽略后端wfJsonData数据
+                  $scope.wfJsonData.routes = [];
+                }
+              }
               if (res.body.udmjysp) {
                 $scope.wfInstance.passenger.udmjysp = res.body.udmjysp;
                 $scope.wfInstance.passenger.isUdmNodes = res.body.isUdmNodes;
@@ -174283,8 +174297,8 @@ var SubmitHandlevue_type_template_id_69e5d915_scoped_true_render = function rend
 };
 var SubmitHandlevue_type_template_id_69e5d915_scoped_true_staticRenderFns = [];
 
-;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-82.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecwapp/Wflowform/src/WfTaskNode.vue?vue&type=template&id=29ad0a91&scoped=true
-var WfTaskNodevue_type_template_id_29ad0a91_scoped_true_render = function render() {
+;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-82.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecwapp/Wflowform/src/WfTaskNode.vue?vue&type=template&id=2a6b1b26&scoped=true
+var WfTaskNodevue_type_template_id_2a6b1b26_scoped_true_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('el-dialog', {
@@ -175121,11 +175135,7 @@ var WfTaskNodevue_type_template_id_29ad0a91_scoped_true_render = function render
     attrs: {
       "label": 2
     }
-  }, [_vm._v("退回发起节点")]), _c('el-radio', {
-    attrs: {
-      "label": 3
-    }
-  }, [_vm._v("退回任意节点")])], 1)], 1)]) : _vm._e(), !_vm.taskNode.startNode && _vm.taskNode.todoMode !== '0' ? _c('tr', [_c('td', {
+  }, [_vm._v("退回发起节点")])], 1)], 1)]) : _vm._e(), !_vm.taskNode.startNode && _vm.taskNode.todoMode !== '0' ? _c('tr', [_c('td', {
     staticClass: "el-table__cell tdlbl tdw17"
   }, [_vm._v("是否自动全选处理人")]), _c('td', {
     staticClass: "el-table__cell tdcont tdw83"
@@ -175207,7 +175217,7 @@ var WfTaskNodevue_type_template_id_29ad0a91_scoped_true_render = function render
     }
   }, [_vm._v("关 闭")])]], 2)], 1);
 };
-var WfTaskNodevue_type_template_id_29ad0a91_scoped_true_staticRenderFns = [];
+var WfTaskNodevue_type_template_id_2a6b1b26_scoped_true_staticRenderFns = [];
 
 ;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-82.use[0]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecwapp/Wflowform/src/WfTaskNode.vue?vue&type=script&lang=js
 
@@ -175607,9 +175617,9 @@ var WfTaskNodevue_type_template_id_29ad0a91_scoped_true_staticRenderFns = [];
 });
 ;// CONCATENATED MODULE: ./packages/ecwapp/Wflowform/src/WfTaskNode.vue?vue&type=script&lang=js
  /* harmony default export */ var src_WfTaskNodevue_type_script_lang_js = (WfTaskNodevue_type_script_lang_js); 
-// EXTERNAL MODULE: ./node_modules/vue-style-loader/index.js??clonedRuleSet-64.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-64.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-64.use[2]!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-64.use[3]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-64.use[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecwapp/Wflowform/src/WfTaskNode.vue?vue&type=style&index=0&id=29ad0a91&prod&scoped=true&lang=scss
-var WfTaskNodevue_type_style_index_0_id_29ad0a91_prod_scoped_true_lang_scss = __webpack_require__(75161);
-;// CONCATENATED MODULE: ./packages/ecwapp/Wflowform/src/WfTaskNode.vue?vue&type=style&index=0&id=29ad0a91&prod&scoped=true&lang=scss
+// EXTERNAL MODULE: ./node_modules/vue-style-loader/index.js??clonedRuleSet-64.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-64.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-64.use[2]!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-64.use[3]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-64.use[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecwapp/Wflowform/src/WfTaskNode.vue?vue&type=style&index=0&id=2a6b1b26&prod&scoped=true&lang=scss
+var WfTaskNodevue_type_style_index_0_id_2a6b1b26_prod_scoped_true_lang_scss = __webpack_require__(78114);
+;// CONCATENATED MODULE: ./packages/ecwapp/Wflowform/src/WfTaskNode.vue?vue&type=style&index=0&id=2a6b1b26&prod&scoped=true&lang=scss
 
 ;// CONCATENATED MODULE: ./packages/ecwapp/Wflowform/src/WfTaskNode.vue
 
@@ -175622,11 +175632,11 @@ var WfTaskNodevue_type_style_index_0_id_29ad0a91_prod_scoped_true_lang_scss = __
 
 var WfTaskNode_component = (0,componentNormalizer/* default */.A)(
   src_WfTaskNodevue_type_script_lang_js,
-  WfTaskNodevue_type_template_id_29ad0a91_scoped_true_render,
-  WfTaskNodevue_type_template_id_29ad0a91_scoped_true_staticRenderFns,
+  WfTaskNodevue_type_template_id_2a6b1b26_scoped_true_render,
+  WfTaskNodevue_type_template_id_2a6b1b26_scoped_true_staticRenderFns,
   false,
   null,
-  "29ad0a91",
+  "2a6b1b26",
   null
   
 )