eoss-ui 0.4.81 → 0.4.82

package/lib/eoss-ui.common.js

@@ -91,13 +91,13 @@ module.exports =
 
 "use strict";
 /* harmony import */ var _config_api__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(1);
-/* harmony import */ var axios__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(4);
+/* harmony import */ var axios__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(5);
 /* harmony import */ var axios__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(axios__WEBPACK_IMPORTED_MODULE_1__);
 /* harmony import */ var qs__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(3);
 /* harmony import */ var qs__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(qs__WEBPACK_IMPORTED_MODULE_2__);
 /* harmony import */ var json_bigint__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(8);
 /* harmony import */ var json_bigint__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(json_bigint__WEBPACK_IMPORTED_MODULE_3__);
-/* harmony import */ var eoss_element__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(5);
+/* harmony import */ var eoss_element__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(6);
 /* harmony import */ var eoss_element__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(eoss_element__WEBPACK_IMPORTED_MODULE_4__);
 var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
 
@@ -3238,19 +3238,19 @@ module.exports = require("qs");
 /* 4 */
 /***/ (function(module, exports) {
 
-module.exports = require("axios");
+module.exports = require("interactjs");
 
 /***/ }),
 /* 5 */
 /***/ (function(module, exports) {
 
-module.exports = require("eoss-element");
+module.exports = require("axios");
 
 /***/ }),
 /* 6 */
 /***/ (function(module, exports) {
 
-module.exports = require("interactjs");
+module.exports = require("eoss-element");
 
 /***/ }),
 /* 7 */
@@ -12524,8 +12524,8 @@ error_page_src_main.install = function (Vue) {
 };
 
 /* harmony default export */ var error_page = (error_page_src_main);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/form/src/main.vue?vue&type=template&id=34321f7c&
-var mainvue_type_template_id_34321f7c_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/form/src/main.vue?vue&type=template&id=ec79e274&
+var mainvue_type_template_id_ec79e274_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -23370,11 +23370,11 @@ var mainvue_type_template_id_34321f7c_render = function () {
       )
     : _vm._e()
 }
-var mainvue_type_template_id_34321f7c_staticRenderFns = []
-mainvue_type_template_id_34321f7c_render._withStripped = true
+var mainvue_type_template_id_ec79e274_staticRenderFns = []
+mainvue_type_template_id_ec79e274_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/form/src/main.vue?vue&type=template&id=34321f7c&
+// CONCATENATED MODULE: ./packages/form/src/main.vue?vue&type=template&id=ec79e274&
 
 // CONCATENATED MODULE: ./src/utils/rules.js
 // 手机号
@@ -28170,7 +28170,7 @@ function src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return function
                     }).then(function (res) {
                       loading && loading.close();
                       if (res.rCode === 0) {
-                        _this11.$message.success(res.msg || res.message || '成功！');
+                        _this11.showMsg && _this11.$message.success(res.msg || res.message || '成功！');
                         _this11.$emit('success', res, models);
                         _this11.models = {};
                         if (_this11.esTabs) {
@@ -28442,8 +28442,8 @@ function src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return function
 
 var form_src_main_component = normalizeComponent(
   packages_form_src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_34321f7c_render,
-  mainvue_type_template_id_34321f7c_staticRenderFns,
+  mainvue_type_template_id_ec79e274_render,
+  mainvue_type_template_id_ec79e274_staticRenderFns,
   false,
   null,
   null,
@@ -28460,8 +28460,8 @@ form_src_main.install = function (Vue) {
 };
 
 /* harmony default export */ var packages_form = (form_src_main);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow/src/main.vue?vue&type=template&id=c517cdba&
-var mainvue_type_template_id_c517cdba_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow/src/main.vue?vue&type=template&id=3b4925ad&
+var mainvue_type_template_id_3b4925ad_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -30081,11 +30081,11 @@ var mainvue_type_template_id_c517cdba_render = function () {
       )
     : _vm._e()
 }
-var mainvue_type_template_id_c517cdba_staticRenderFns = []
-mainvue_type_template_id_c517cdba_render._withStripped = true
+var mainvue_type_template_id_3b4925ad_staticRenderFns = []
+mainvue_type_template_id_3b4925ad_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/flow/src/main.vue?vue&type=template&id=c517cdba&
+// CONCATENATED MODULE: ./packages/flow/src/main.vue?vue&type=template&id=3b4925ad&
 
 // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow/src/component/CommonOpinions.vue?vue&type=template&id=4e1f4030&
 var CommonOpinionsvue_type_template_id_4e1f4030_render = function () {
@@ -39117,6 +39117,7 @@ function flow_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return func
             _this17.value = _this17.value.replace(RegExp('同意。', 'g'), '');
             _this17.value = val + _this17.value;
           }
+          if (!_this17.validInfo()) return;
           if (_this17.beforeSubmit == undefined) {
             _this17.subFun(_this17.sendData);
           } else {
@@ -39127,7 +39128,39 @@ function flow_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return func
         }
       });
     },
-    validInfo: function validInfo() {},
+    validInfo: function validInfo() {
+      if (!this.endFlow && this.newTypeCode != 'fenyue' && !this.shrink && this.nextNode.isAddSign != '1' && this.nextNode.isRemoveSign != '1' && this.isSpecial && !this.isReject && this.nodeInfos.length != 0 && this.isNextUser) {
+        if (this.isShowNextUser) {
+          if (this.nextNode.nextUserId == '' || this.multiple && this.nextNode.nextUserId.length == 0) {
+            this.$message.warning('请选择下步办理人');
+            return false;
+          }
+        } else {
+          if (this.nextNode.nextOrgId == '' || this.multiple && this.nextNode.nextOrgId.length == 0) {
+            this.$message.warning('请选择办理对象');
+            return false;
+          }
+        }
+      }
+
+      if (this.nextNode.isAddSign == '1' && this.nextNode.addSignUserId.length == 0) {
+        this.$message.warning('请选择加签办理人');
+        return false;
+      }
+      if (this.nextNode.isRemoveSign == '1' && this.nextNode.removeSignUserId.length == 0) {
+        this.$message.warning('请选择减签办理人');
+        return false;
+      }
+      if (!this.value && this.isOpinionRequired === 1) {
+        this.$message.warning('请选择输入审批意见');
+        return false;
+      }
+      if (this.isHideCurrentOrg && !this.nextNode.nextCurrentOrgObjJson) {
+        this.$message.warning('\u8BF7\u9009\u62E9' + (this.currentOrgName || '本单位'));
+        return false;
+      }
+      return true;
+    },
     sendData: function sendData() {
       var _this18 = this;
 
@@ -39139,7 +39172,7 @@ function flow_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return func
               switch (_context.prev = _context.next) {
                 case 0:
                   if (!valid) {
-                    _context.next = 60;
+                    _context.next = 42;
                     break;
                   }
 
@@ -39151,36 +39184,6 @@ function flow_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return func
                   return _context.abrupt('return', _this18.handleVisible = true);
 
                 case 3:
-                  if (!(!_this18.endFlow && _this18.newTypeCode != 'fenyue' && !_this18.shrink && _this18.nextNode.isAddSign != '1' && _this18.nextNode.isRemoveSign != '1' && _this18.isSpecial && !_this18.isReject && _this18.nodeInfos.length != 0 && _this18.isNextUser)) {
-                    _context.next = 11;
-                    break;
-                  }
-
-                  if (!_this18.isShowNextUser) {
-                    _context.next = 9;
-                    break;
-                  }
-
-                  if (!(_this18.nextNode.nextUserId == '' || _this18.multiple && _this18.nextNode.nextUserId.length == 0)) {
-                    _context.next = 7;
-                    break;
-                  }
-
-                  return _context.abrupt('return', _this18.$message.warning('请选择下步办理人'));
-
-                case 7:
-                  _context.next = 11;
-                  break;
-
-                case 9:
-                  if (!(_this18.nextNode.nextOrgId == '' || _this18.multiple && _this18.nextNode.nextOrgId.length == 0)) {
-                    _context.next = 11;
-                    break;
-                  }
-
-                  return _context.abrupt('return', _this18.$message.warning('请选择办理对象'));
-
-                case 11:
                   nextUserId = [];
 
                   if (_this18.multiple) {
@@ -39188,23 +39191,6 @@ function flow_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return func
                       return nextUserId.push(item);
                     });
                   }
-
-                  if (!(_this18.nextNode.isAddSign == '1' && _this18.nextNode.addSignUserId.length == 0)) {
-                    _context.next = 15;
-                    break;
-                  }
-
-                  return _context.abrupt('return', _this18.$message.warning('请选择加签办理人'));
-
-                case 15:
-                  if (!(_this18.nextNode.isRemoveSign == '1' && _this18.nextNode.removeSignUserId.length == 0)) {
-                    _context.next = 17;
-                    break;
-                  }
-
-                  return _context.abrupt('return', _this18.$message.warning('请选择减签办理人'));
-
-                case 17:
                   addSignUserId = [];
 
                   if (_this18.isCanAddSign && _this18.nextNode.isAddSign == '1') {
@@ -39219,25 +39205,6 @@ function flow_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return func
                       removeSignUserId.push(item);
                     });
                   }
-
-                  if (!(!_this18.value && _this18.isOpinionRequired === 1)) {
-                    _context.next = 24;
-                    break;
-                  }
-
-                  _this18.$message.warning('请选择输入审批意见');
-                  return _context.abrupt('return');
-
-                case 24:
-                  if (!(_this18.isHideCurrentOrg && !_this18.nextNode.nextCurrentOrgObjJson)) {
-                    _context.next = 27;
-                    break;
-                  }
-
-                  _this18.$message.warning('\u8BF7\u9009\u62E9' + (_this18.currentOrgName || '本单位'));
-                  return _context.abrupt('return');
-
-                case 27:
                   str = '';
 
                   if (_this18.value) {
@@ -39257,10 +39224,10 @@ function flow_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return func
                   if (_this18.nextNode.nextOperate != 0 && _this18.nextNode.nextOperate != 1) {
                     delete _this18.nextNode.nextNodeId;
                   }
-                  _context.next = 35;
+                  _context.next = 17;
                   return _this18.saveInfo('subMit');
 
-                case 35:
+                case 17:
                   _this18.loading = utils_util["a" /* default */].loading(_this18.$loading, '加载中...');
 
                   notificationType = '';
@@ -39323,10 +39290,10 @@ function flow_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return func
                     }
                   }));
 
-                case 60:
+                case 42:
                   return _context.abrupt('return', false);
 
-                case 61:
+                case 43:
                 case 'end':
                   return _context.stop();
               }
@@ -39385,8 +39352,8 @@ function flow_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return func
 
 var flow_src_main_component = normalizeComponent(
   packages_flow_src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_c517cdba_render,
-  mainvue_type_template_id_c517cdba_staticRenderFns,
+  mainvue_type_template_id_3b4925ad_render,
+  mainvue_type_template_id_3b4925ad_staticRenderFns,
   false,
   null,
   null,
@@ -44246,26 +44213,40 @@ label_src_main.install = function (Vue) {
 };
 
 /* harmony default export */ var packages_label = (label_src_main);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/layout/src/main.vue?vue&type=template&id=6868aa00&
-var mainvue_type_template_id_6868aa00_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/layout/src/main.vue?vue&type=template&id=3f931032&
+var mainvue_type_template_id_3f931032_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
   return _c(
     "div",
     { staticClass: "es-layout" },
-    [_c("layout-item"), _c("layout-item", { attrs: { top: "100px" } })],
-    1
+    [
+      _c("layout-item"),
+      _c("layout-item", { attrs: { top: "100px" } }),
+      _vm._l(_vm.contents, function (item, index) {
+        return _c(
+          "layout-item",
+          _vm._b(
+            { key: item.id || index },
+            "layout-item",
+            Object.assign({}, item, { disabled: _vm.disabled }),
+            false
+          )
+        )
+      }),
+    ],
+    2
   )
 }
-var mainvue_type_template_id_6868aa00_staticRenderFns = []
-mainvue_type_template_id_6868aa00_render._withStripped = true
+var mainvue_type_template_id_3f931032_staticRenderFns = []
+mainvue_type_template_id_3f931032_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/layout/src/main.vue?vue&type=template&id=6868aa00&
+// CONCATENATED MODULE: ./packages/layout/src/main.vue?vue&type=template&id=3f931032&
 
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/layout/src/item.vue?vue&type=template&id=4b100112&
-var itemvue_type_template_id_4b100112_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/layout/src/item.vue?vue&type=template&id=3bdfff8c&
+var itemvue_type_template_id_3bdfff8c_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -44286,14 +44267,14 @@ var itemvue_type_template_id_4b100112_render = function () {
     1
   )
 }
-var itemvue_type_template_id_4b100112_staticRenderFns = []
-itemvue_type_template_id_4b100112_render._withStripped = true
+var itemvue_type_template_id_3bdfff8c_staticRenderFns = []
+itemvue_type_template_id_3bdfff8c_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/layout/src/item.vue?vue&type=template&id=4b100112&
+// CONCATENATED MODULE: ./packages/layout/src/item.vue?vue&type=template&id=3bdfff8c&
 
 // EXTERNAL MODULE: external "interactjs"
-var external_interactjs_ = __webpack_require__(6);
+var external_interactjs_ = __webpack_require__(4);
 var external_interactjs_default = /*#__PURE__*/__webpack_require__.n(external_interactjs_);
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/layout/src/item.vue?vue&type=script&lang=js&
@@ -44401,13 +44382,22 @@ var external_interactjs_default = /*#__PURE__*/__webpack_require__.n(external_in
       }
     });
     this.interaction.resizable({
-      modifiers: [external_interactjs_default.a.modifiers.restrictSize({
-        min: { width: 100, height: 100 },
-        max: { width: this.$parent.$el.offsetWidth }
+      modifiers: [
+      // keep the edges inside the parent
+      external_interactjs_default.a.modifiers.restrictEdges({
+        outer: 'parent'
+      }),
+
+      // minimum size
+      external_interactjs_default.a.modifiers.restrictSize({
+        min: { width: 100, height: 100 }
       })],
+
+      //inertia: true,
       edges: { top: true, left: true, bottom: true, right: true },
       listeners: {
         move: function move(event) {
+          console.log(1212);
           var _event$target$dataset = event.target.dataset,
               x = _event$target$dataset.x,
               y = _event$target$dataset.y;
@@ -44443,8 +44433,8 @@ var external_interactjs_default = /*#__PURE__*/__webpack_require__.n(external_in
 
 var item_component = normalizeComponent(
   src_itemvue_type_script_lang_js_,
-  itemvue_type_template_id_4b100112_render,
-  itemvue_type_template_id_4b100112_staticRenderFns,
+  itemvue_type_template_id_3bdfff8c_render,
+  itemvue_type_template_id_3bdfff8c_staticRenderFns,
   false,
   null,
   null,
@@ -44460,12 +44450,20 @@ var item_component = normalizeComponent(
 //
 //
 //
+//
+//
+//
+//
+//
 
 
 /* harmony default export */ var layout_src_mainvue_type_script_lang_js_ = ({
   name: 'EsLayout',
   components: { layoutItem: src_item },
-  props: {},
+  props: {
+    contents: Array,
+    disabled: Boolean
+  },
   computed: {},
   watch: {},
   data: function data() {
@@ -44489,8 +44487,8 @@ var item_component = normalizeComponent(
 
 var layout_src_main_component = normalizeComponent(
   packages_layout_src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_6868aa00_render,
-  mainvue_type_template_id_6868aa00_staticRenderFns,
+  mainvue_type_template_id_3f931032_render,
+  mainvue_type_template_id_3f931032_staticRenderFns,
   false,
   null,
   null,
@@ -47115,8 +47113,8 @@ login_src_main.install = function (Vue) {
 };
 
 /* harmony default export */ var login = (login_src_main);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/main.vue?vue&type=template&id=0c933a5f&
-var mainvue_type_template_id_0c933a5f_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/main.vue?vue&type=template&id=4b1d4233&
+var mainvue_type_template_id_4b1d4233_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -47541,11 +47539,11 @@ var mainvue_type_template_id_0c933a5f_render = function () {
     1
   )
 }
-var mainvue_type_template_id_0c933a5f_staticRenderFns = []
-mainvue_type_template_id_0c933a5f_render._withStripped = true
+var mainvue_type_template_id_4b1d4233_staticRenderFns = []
+mainvue_type_template_id_4b1d4233_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/main/src/main.vue?vue&type=template&id=0c933a5f&
+// CONCATENATED MODULE: ./packages/main/src/main.vue?vue&type=template&id=4b1d4233&
 
 // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/userinfo.vue?vue&type=template&id=799780ee&
 var userinfovue_type_template_id_799780ee_render = function () {
@@ -50856,6 +50854,7 @@ var log = utils_util["a" /* default */].getParams('console');
           utils_util["a" /* default */].win.open(res.path, '_blank');
           break;
       }
+      this.$emit('handler-click', res);
     },
 
     //刷新子页面、子路由
@@ -51271,8 +51270,8 @@ var log = utils_util["a" /* default */].getParams('console');
 
 var main_src_main_component = normalizeComponent(
   packages_main_src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_0c933a5f_render,
-  mainvue_type_template_id_0c933a5f_staticRenderFns,
+  mainvue_type_template_id_4b1d4233_render,
+  mainvue_type_template_id_4b1d4233_staticRenderFns,
   false,
   null,
   null,
@@ -70264,7 +70263,7 @@ if (typeof window !== 'undefined' && window.Vue) {
 }
 
 /* harmony default export */ var src_0 = __webpack_exports__["default"] = ({
-  version: '0.4.81',
+  version: '0.4.82',
   install: install,
   Button: packages_button,
   ButtonGroup: button_group,

package/lib/flow.js

@@ -3561,7 +3561,7 @@ var component = Object(componentNormalizer["a" /* default */])(
 // ESM COMPAT FLAG
 __webpack_require__.r(__webpack_exports__);
 
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow/src/main.vue?vue&type=template&id=c517cdba&
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow/src/main.vue?vue&type=template&id=3b4925ad&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -5186,7 +5186,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/flow/src/main.vue?vue&type=template&id=c517cdba&
+// CONCATENATED MODULE: ./packages/flow/src/main.vue?vue&type=template&id=3b4925ad&
 
 // EXTERNAL MODULE: external "babel-runtime/regenerator"
 var regenerator_ = __webpack_require__(9);
@@ -14076,6 +14076,7 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
             _this17.value = _this17.value.replace(RegExp('同意。', 'g'), '');
             _this17.value = val + _this17.value;
           }
+          if (!_this17.validInfo()) return;
           if (_this17.beforeSubmit == undefined) {
             _this17.subFun(_this17.sendData);
           } else {
@@ -14086,7 +14087,39 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
         }
       });
     },
-    validInfo: function validInfo() {},
+    validInfo: function validInfo() {
+      if (!this.endFlow && this.newTypeCode != 'fenyue' && !this.shrink && this.nextNode.isAddSign != '1' && this.nextNode.isRemoveSign != '1' && this.isSpecial && !this.isReject && this.nodeInfos.length != 0 && this.isNextUser) {
+        if (this.isShowNextUser) {
+          if (this.nextNode.nextUserId == '' || this.multiple && this.nextNode.nextUserId.length == 0) {
+            this.$message.warning('请选择下步办理人');
+            return false;
+          }
+        } else {
+          if (this.nextNode.nextOrgId == '' || this.multiple && this.nextNode.nextOrgId.length == 0) {
+            this.$message.warning('请选择办理对象');
+            return false;
+          }
+        }
+      }
+
+      if (this.nextNode.isAddSign == '1' && this.nextNode.addSignUserId.length == 0) {
+        this.$message.warning('请选择加签办理人');
+        return false;
+      }
+      if (this.nextNode.isRemoveSign == '1' && this.nextNode.removeSignUserId.length == 0) {
+        this.$message.warning('请选择减签办理人');
+        return false;
+      }
+      if (!this.value && this.isOpinionRequired === 1) {
+        this.$message.warning('请选择输入审批意见');
+        return false;
+      }
+      if (this.isHideCurrentOrg && !this.nextNode.nextCurrentOrgObjJson) {
+        this.$message.warning('\u8BF7\u9009\u62E9' + (this.currentOrgName || '本单位'));
+        return false;
+      }
+      return true;
+    },
     sendData: function sendData() {
       var _this18 = this;
 
@@ -14098,7 +14131,7 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
               switch (_context.prev = _context.next) {
                 case 0:
                   if (!valid) {
-                    _context.next = 60;
+                    _context.next = 42;
                     break;
                   }
 
@@ -14110,36 +14143,6 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
                   return _context.abrupt('return', _this18.handleVisible = true);
 
                 case 3:
-                  if (!(!_this18.endFlow && _this18.newTypeCode != 'fenyue' && !_this18.shrink && _this18.nextNode.isAddSign != '1' && _this18.nextNode.isRemoveSign != '1' && _this18.isSpecial && !_this18.isReject && _this18.nodeInfos.length != 0 && _this18.isNextUser)) {
-                    _context.next = 11;
-                    break;
-                  }
-
-                  if (!_this18.isShowNextUser) {
-                    _context.next = 9;
-                    break;
-                  }
-
-                  if (!(_this18.nextNode.nextUserId == '' || _this18.multiple && _this18.nextNode.nextUserId.length == 0)) {
-                    _context.next = 7;
-                    break;
-                  }
-
-                  return _context.abrupt('return', _this18.$message.warning('请选择下步办理人'));
-
-                case 7:
-                  _context.next = 11;
-                  break;
-
-                case 9:
-                  if (!(_this18.nextNode.nextOrgId == '' || _this18.multiple && _this18.nextNode.nextOrgId.length == 0)) {
-                    _context.next = 11;
-                    break;
-                  }
-
-                  return _context.abrupt('return', _this18.$message.warning('请选择办理对象'));
-
-                case 11:
                   nextUserId = [];
 
                   if (_this18.multiple) {
@@ -14147,23 +14150,6 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
                       return nextUserId.push(item);
                     });
                   }
-
-                  if (!(_this18.nextNode.isAddSign == '1' && _this18.nextNode.addSignUserId.length == 0)) {
-                    _context.next = 15;
-                    break;
-                  }
-
-                  return _context.abrupt('return', _this18.$message.warning('请选择加签办理人'));
-
-                case 15:
-                  if (!(_this18.nextNode.isRemoveSign == '1' && _this18.nextNode.removeSignUserId.length == 0)) {
-                    _context.next = 17;
-                    break;
-                  }
-
-                  return _context.abrupt('return', _this18.$message.warning('请选择减签办理人'));
-
-                case 17:
                   addSignUserId = [];
 
                   if (_this18.isCanAddSign && _this18.nextNode.isAddSign == '1') {
@@ -14178,25 +14164,6 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
                       removeSignUserId.push(item);
                     });
                   }
-
-                  if (!(!_this18.value && _this18.isOpinionRequired === 1)) {
-                    _context.next = 24;
-                    break;
-                  }
-
-                  _this18.$message.warning('请选择输入审批意见');
-                  return _context.abrupt('return');
-
-                case 24:
-                  if (!(_this18.isHideCurrentOrg && !_this18.nextNode.nextCurrentOrgObjJson)) {
-                    _context.next = 27;
-                    break;
-                  }
-
-                  _this18.$message.warning('\u8BF7\u9009\u62E9' + (_this18.currentOrgName || '本单位'));
-                  return _context.abrupt('return');
-
-                case 27:
                   str = '';
 
                   if (_this18.value) {
@@ -14216,10 +14183,10 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
                   if (_this18.nextNode.nextOperate != 0 && _this18.nextNode.nextOperate != 1) {
                     delete _this18.nextNode.nextNodeId;
                   }
-                  _context.next = 35;
+                  _context.next = 17;
                   return _this18.saveInfo('subMit');
 
-                case 35:
+                case 17:
                   _this18.loading = util["a" /* default */].loading(_this18.$loading, '加载中...');
 
                   notificationType = '';
@@ -14282,10 +14249,10 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
                     }
                   }));
 
-                case 60:
+                case 42:
                   return _context.abrupt('return', false);
 
-                case 61:
+                case 43:
                 case 'end':
                   return _context.stop();
               }