eoss-ui 0.6.91 → 0.6.92

package/lib/eoss-ui.common.js

@@ -27141,8 +27141,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=8a0e2250&
-var mainvue_type_template_id_8a0e2250_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=27037024&
+var mainvue_type_template_id_27037024_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -28549,7 +28549,9 @@ var mainvue_type_template_id_8a0e2250_render = function () {
                                                     1
                                                   )
                                                 : _vm._e(),
-                                              _vm.isHideCurrentOrg
+                                              _vm.isHideCurrentOrg &&
+                                              _vm.nextNode.isReturnSubmitter !=
+                                                1
                                                 ? _c(
                                                     "el-form-item",
                                                     {
@@ -28590,7 +28592,9 @@ var mainvue_type_template_id_8a0e2250_render = function () {
                                                     1
                                                   )
                                                 : _vm._e(),
-                                              _vm.isHideOtherOrg
+                                              _vm.isHideOtherOrg &&
+                                              _vm.nextNode.isReturnSubmitter !=
+                                                1
                                                 ? _c(
                                                     "el-form-item",
                                                     {
@@ -30019,11 +30023,11 @@ var mainvue_type_template_id_8a0e2250_render = function () {
       )
     : _vm._e()
 }
-var mainvue_type_template_id_8a0e2250_staticRenderFns = []
-mainvue_type_template_id_8a0e2250_render._withStripped = true
+var mainvue_type_template_id_27037024_staticRenderFns = []
+mainvue_type_template_id_27037024_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/flow/src/main.vue?vue&type=template&id=8a0e2250&
+// CONCATENATED MODULE: ./packages/flow/src/main.vue?vue&type=template&id=27037024&
 
 // 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=19364a89&
 var CommonOpinionsvue_type_template_id_19364a89_render = function () {
@@ -31827,8 +31831,8 @@ processFormvue_type_template_id_a60e74a6_render._withStripped = true
 
 // CONCATENATED MODULE: ./packages/flow/src/processForm.vue?vue&type=template&id=a60e74a6&
 
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow/src/selectUser.vue?vue&type=template&id=319fd53c&
-var selectUservue_type_template_id_319fd53c_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/selectUser.vue?vue&type=template&id=3d8ca42d&
+var selectUservue_type_template_id_3d8ca42d_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -31941,7 +31945,8 @@ var selectUservue_type_template_id_319fd53c_render = function () {
                     types: _vm.types,
                     tabs: _vm.tabs,
                     title: _vm.title,
-                    "collapse-tags": 3,
+                    classify: _vm.classify,
+                    "collapse-tags": 2,
                     mix: _vm.mix,
                     min: _vm.isUnionSeal ? 1 : 0,
                     disabled:
@@ -31949,9 +31954,13 @@ var selectUservue_type_template_id_319fd53c_render = function () {
                       _vm.isCurrentNodeForbiddenChangeCandidate == 1,
                     filterable: Boolean(_vm.isCustomUser && !_vm.isUnionSeal),
                     select: _vm.isUnionSeal == false,
-                    where: _vm.newWhere,
+                    where: Object.assign({}, _vm.newWhere, {
+                      info: _vm.classify ? "" : "no",
+                    }),
                     multiple: _vm.newMultiple,
-                    param: Object.assign({}, _vm.newParams, { info: "no" }),
+                    param: Object.assign({}, _vm.newParams, {
+                      info: _vm.classify ? "" : "no",
+                    }),
                     disableds: _vm.disableds,
                   },
                   on: {
@@ -31976,11 +31985,11 @@ var selectUservue_type_template_id_319fd53c_render = function () {
     2
   )
 }
-var selectUservue_type_template_id_319fd53c_staticRenderFns = []
-selectUservue_type_template_id_319fd53c_render._withStripped = true
+var selectUservue_type_template_id_3d8ca42d_staticRenderFns = []
+selectUservue_type_template_id_3d8ca42d_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/flow/src/selectUser.vue?vue&type=template&id=319fd53c&
+// CONCATENATED MODULE: ./packages/flow/src/selectUser.vue?vue&type=template&id=3d8ca42d&
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow/src/selectUser.vue?vue&type=script&lang=js&
 var selectUservue_type_script_lang_js_extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
@@ -32081,6 +32090,7 @@ var selectUservue_type_script_lang_js_extends = Object.assign || function (targe
 //
 //
 //
+//
 
 
 
@@ -32176,6 +32186,7 @@ var selectUservue_type_script_lang_js_extends = Object.assign || function (targe
     return {
       searchLoading: false,
       newNextUser: [],
+      classify: true,
       newOptions: [],
       newSelectUserList: [],
       url: api["fb" /* handleInfo */],
@@ -32276,6 +32287,10 @@ var selectUservue_type_script_lang_js_extends = Object.assign || function (targe
       immediate: true
     }
   },
+  mounted: function mounted() {
+    this.classify = utils_util["a" /* default */].getStorage('classify') != undefined ? utils_util["a" /* default */].getStorage('classify') : true;
+  },
+
 
   methods: {
     changeInfo: function changeInfo(data) {
@@ -32474,8 +32489,8 @@ var selectUservue_type_script_lang_js_extends = Object.assign || function (targe
 
 var selectUser_component = normalizeComponent(
   src_selectUservue_type_script_lang_js_,
-  selectUservue_type_template_id_319fd53c_render,
-  selectUservue_type_template_id_319fd53c_staticRenderFns,
+  selectUservue_type_template_id_3d8ca42d_render,
+  selectUservue_type_template_id_3d8ca42d_staticRenderFns,
   false,
   null,
   null,
@@ -47177,7 +47192,7 @@ function flow_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return func
         pendingId: this.pendingId
       };
       this.loading = utils_util["a" /* default */].loading(this.$loading, '保存中...');
-      utils_util["a" /* default */].ajax({ url: api["Xb" /* tempSave */], params: params }).then(function (res) {
+      utils_util["a" /* default */].ajax({ url: api["Xb" /* tempSave */], data: params, method: 'post' }).then(function (res) {
         var status = res.status,
             message = res.message;
 
@@ -48477,7 +48492,7 @@ function flow_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return func
       //   return false;
       // }
 
-      if ((this.currentNodeIsCircularReadNode || this.isHideOtherOrg && this.isHideCurrentOrg) && this.nextNode.nextCurrentOrgObj.length == 0 && this.nextNode.nextOtherOrgObj.length == 0) {
+      if ((this.currentNodeIsCircularReadNode || this.isHideOtherOrg && this.isHideCurrentOrg) && this.nextNode.nextCurrentOrgObj.length == 0 && this.nextNode.nextOtherOrgObj.length == 0 && this.nextNode.isReturnSubmitter != 1) {
         this.$message.warning('\u8BF7\u9009\u62E9\u4E0B\u6B65\u529E\u7406\u5BF9\u8C61!');
         return false;
       }
@@ -48739,8 +48754,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_8a0e2250_render,
-  mainvue_type_template_id_8a0e2250_staticRenderFns,
+  mainvue_type_template_id_27037024_render,
+  mainvue_type_template_id_27037024_staticRenderFns,
   false,
   null,
   null,
@@ -76499,8 +76514,8 @@ select_ganged_src_main.install = function (Vue) {
 };
 
 /* harmony default export */ var select_ganged = (select_ganged_src_main);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/selector/src/main.vue?vue&type=template&id=31df2fd0&
-var mainvue_type_template_id_31df2fd0_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/selector/src/main.vue?vue&type=template&id=6cd08dd8&
+var mainvue_type_template_id_6cd08dd8_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -77092,11 +77107,11 @@ var mainvue_type_template_id_31df2fd0_render = function () {
       )
     : _vm._e()
 }
-var mainvue_type_template_id_31df2fd0_staticRenderFns = []
-mainvue_type_template_id_31df2fd0_render._withStripped = true
+var mainvue_type_template_id_6cd08dd8_staticRenderFns = []
+mainvue_type_template_id_6cd08dd8_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/selector/src/main.vue?vue&type=template&id=31df2fd0&
+// CONCATENATED MODULE: ./packages/selector/src/main.vue?vue&type=template&id=6cd08dd8&
 
 // EXTERNAL MODULE: external "eoss-element/src/utils/clickoutside"
 var clickoutside_ = __webpack_require__(17);
@@ -77339,6 +77354,8 @@ var clickoutside_default = /*#__PURE__*/__webpack_require__.n(clickoutside_);
 //
 //
 //
+//
+//
 
 
 
@@ -77459,7 +77476,13 @@ var clickoutside_default = /*#__PURE__*/__webpack_require__.n(clickoutside_);
         };
       }
     },
+    //混选
     mix: Boolean,
+    //混选时是否分类显示
+    classify: {
+      type: Boolean,
+      default: true
+    },
     noMatchText: {
       type: String,
       default: '无匹配数据'
@@ -77812,7 +77835,7 @@ var clickoutside_default = /*#__PURE__*/__webpack_require__.n(clickoutside_);
     getLabel: function getLabel(res) {
       var tag = '';
       if (this.mix) {
-        tag = utils_util["a" /* default */].getTypeName(res.stype);
+        tag = this.classify ? utils_util["a" /* default */].getTypeName(res.stype) : '';
       } else if (this.showFilterListDep) {
         tag = this.getDep(res);
       }
@@ -77842,8 +77865,8 @@ var clickoutside_default = /*#__PURE__*/__webpack_require__.n(clickoutside_);
 
 var selector_src_main_component = normalizeComponent(
   packages_selector_src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_31df2fd0_render,
-  mainvue_type_template_id_31df2fd0_staticRenderFns,
+  mainvue_type_template_id_6cd08dd8_render,
+  mainvue_type_template_id_6cd08dd8_staticRenderFns,
   false,
   null,
   null,
@@ -90162,8 +90185,8 @@ form_src_table.install = function (Vue) {
 };
 
 /* harmony default export */ var table_form = (form_src_table);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/upload/src/main.vue?vue&type=template&id=8bdc905c&
-var mainvue_type_template_id_8bdc905c_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/upload/src/main.vue?vue&type=template&id=02b1ced8&
+var mainvue_type_template_id_02b1ced8_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -90543,11 +90566,11 @@ var mainvue_type_template_id_8bdc905c_render = function () {
       )
     : _vm._e()
 }
-var mainvue_type_template_id_8bdc905c_staticRenderFns = []
-mainvue_type_template_id_8bdc905c_render._withStripped = true
+var mainvue_type_template_id_02b1ced8_staticRenderFns = []
+mainvue_type_template_id_02b1ced8_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/upload/src/main.vue?vue&type=template&id=8bdc905c&
+// CONCATENATED MODULE: ./packages/upload/src/main.vue?vue&type=template&id=02b1ced8&
 
 // CONCATENATED MODULE: ./packages/upload/src/picture.js
 /* harmony default export */ var picture = ({
@@ -91365,7 +91388,7 @@ var mainvue_type_script_lang_js_props;
         } else {
           var file = res.response ? res.response : res;
           var url = typeof this.preview === 'string' ? this.preview : typeof this.preview === 'function' ? this.preview(file) : null;
-          if (res.status === 'success') {
+          if (res.status === 'success' || res.status == 0) {
             var suffix = file.suffix;
             suffix = suffix.toLowerCase();
             if (this.dochubConfig.previewDocumentUrl) {
@@ -91510,7 +91533,7 @@ var mainvue_type_script_lang_js_props;
     handleBeforeRemove: function handleBeforeRemove(file, fileList) {
       var _this7 = this;
 
-      if (file && file.status === 'success') {
+      if (file && (file.status === 'success' || file.status == 0)) {
         return this.$confirm('确定删除文件吗?', '提示', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
@@ -91518,7 +91541,7 @@ var mainvue_type_script_lang_js_props;
         }).then(function () {
           if (_this7.beforeRemove) {
             return _this7.beforeRemove(file, fileList);
-          } else if (file.status === 'success') {
+          } else if (file.status === 'success' || file.status == 0) {
             var userName = file.userName || file.response && file.response.userName || utils_util["a" /* default */].getStorage('userName');
             // eslint-disable-next-line no-undef
             return new Promise(function (resolve, reject) {
@@ -91565,7 +91588,7 @@ var mainvue_type_script_lang_js_props;
       utils_util["a" /* default */].win.open(this.host + url + '?ownId=' + this.ownId + '&code=' + this.code + (this.extendCode ? '&extendCode=' + this.extendCode : '') + '&businessId=' + this.ownId + '&fileName=文档.zip' + '&bucketCode=' + this.code);
     },
     handleDownload: function handleDownload(file) {
-      if (file.status === 'success') {
+      if (file.status === 'success' || file.status == 0) {
         var url = typeof this.download === 'string' ? this.download : this.dochubConfig.downloadDocumentUrl || api["v" /* downloadByAdjunctId */];
         utils_util["a" /* default */].win.open(this.host + url + '?adjunctId=' + (file.adjunctId || file.response.adjunctId) + '&documentId=' + (file.adjunctId || file.response.adjunctId));
       } else {
@@ -91594,7 +91617,7 @@ var mainvue_type_script_lang_js_props;
           this.onSort(files);
         } else {
           var ids = files.map(function (item) {
-            if (item.status === 'success') {
+            if (item.status === 'success' || item.status == 0) {
               return item.adjunctId || item.response.adjunctId;
             }
           });
@@ -91710,8 +91733,8 @@ var mainvue_type_script_lang_js_props;
 
 var upload_src_main_component = normalizeComponent(
   packages_upload_src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_8bdc905c_render,
-  mainvue_type_template_id_8bdc905c_staticRenderFns,
+  mainvue_type_template_id_02b1ced8_render,
+  mainvue_type_template_id_02b1ced8_staticRenderFns,
   false,
   null,
   null,
@@ -92212,7 +92235,7 @@ if (typeof window !== 'undefined' && window.Vue) {
 }
 
 /* harmony default export */ var src_0 = __webpack_exports__["default"] = ({
-  version: '0.6.91',
+  version: '0.6.92',
   install: install,
   Button: packages_button,
   ButtonGroup: button_group,

package/lib/flow.js

@@ -4483,7 +4483,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=8a0e2250&
+// 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=27037024&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -5891,7 +5891,9 @@ var render = function () {
                                                     1
                                                   )
                                                 : _vm._e(),
-                                              _vm.isHideCurrentOrg
+                                              _vm.isHideCurrentOrg &&
+                                              _vm.nextNode.isReturnSubmitter !=
+                                                1
                                                 ? _c(
                                                     "el-form-item",
                                                     {
@@ -5932,7 +5934,9 @@ var render = function () {
                                                     1
                                                   )
                                                 : _vm._e(),
-                                              _vm.isHideOtherOrg
+                                              _vm.isHideOtherOrg &&
+                                              _vm.nextNode.isReturnSubmitter !=
+                                                1
                                                 ? _c(
                                                     "el-form-item",
                                                     {
@@ -7365,7 +7369,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/flow/src/main.vue?vue&type=template&id=8a0e2250&
+// CONCATENATED MODULE: ./packages/flow/src/main.vue?vue&type=template&id=27037024&
 
 // EXTERNAL MODULE: external "babel-runtime/regenerator"
 var regenerator_ = __webpack_require__(4);
@@ -9182,8 +9186,8 @@ processFormvue_type_template_id_a60e74a6_render._withStripped = true
 
 // CONCATENATED MODULE: ./packages/flow/src/processForm.vue?vue&type=template&id=a60e74a6&
 
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow/src/selectUser.vue?vue&type=template&id=319fd53c&
-var selectUservue_type_template_id_319fd53c_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/selectUser.vue?vue&type=template&id=3d8ca42d&
+var selectUservue_type_template_id_3d8ca42d_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -9296,7 +9300,8 @@ var selectUservue_type_template_id_319fd53c_render = function () {
                     types: _vm.types,
                     tabs: _vm.tabs,
                     title: _vm.title,
-                    "collapse-tags": 3,
+                    classify: _vm.classify,
+                    "collapse-tags": 2,
                     mix: _vm.mix,
                     min: _vm.isUnionSeal ? 1 : 0,
                     disabled:
@@ -9304,9 +9309,13 @@ var selectUservue_type_template_id_319fd53c_render = function () {
                       _vm.isCurrentNodeForbiddenChangeCandidate == 1,
                     filterable: Boolean(_vm.isCustomUser && !_vm.isUnionSeal),
                     select: _vm.isUnionSeal == false,
-                    where: _vm.newWhere,
+                    where: Object.assign({}, _vm.newWhere, {
+                      info: _vm.classify ? "" : "no",
+                    }),
                     multiple: _vm.newMultiple,
-                    param: Object.assign({}, _vm.newParams, { info: "no" }),
+                    param: Object.assign({}, _vm.newParams, {
+                      info: _vm.classify ? "" : "no",
+                    }),
                     disableds: _vm.disableds,
                   },
                   on: {
@@ -9331,11 +9340,11 @@ var selectUservue_type_template_id_319fd53c_render = function () {
     2
   )
 }
-var selectUservue_type_template_id_319fd53c_staticRenderFns = []
-selectUservue_type_template_id_319fd53c_render._withStripped = true
+var selectUservue_type_template_id_3d8ca42d_staticRenderFns = []
+selectUservue_type_template_id_3d8ca42d_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/flow/src/selectUser.vue?vue&type=template&id=319fd53c&
+// CONCATENATED MODULE: ./packages/flow/src/selectUser.vue?vue&type=template&id=3d8ca42d&
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow/src/selectUser.vue?vue&type=script&lang=js&
 var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
@@ -9436,6 +9445,7 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
 //
 //
 //
+//
 
 
 
@@ -9531,6 +9541,7 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
     return {
       searchLoading: false,
       newNextUser: [],
+      classify: true,
       newOptions: [],
       newSelectUserList: [],
       url: api["fb" /* handleInfo */],
@@ -9631,6 +9642,10 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
       immediate: true
     }
   },
+  mounted: function mounted() {
+    this.classify = util["a" /* default */].getStorage('classify') != undefined ? util["a" /* default */].getStorage('classify') : true;
+  },
+
 
   methods: {
     changeInfo: function changeInfo(data) {
@@ -9829,8 +9844,8 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
 
 var selectUser_component = Object(componentNormalizer["a" /* default */])(
   src_selectUservue_type_script_lang_js_,
-  selectUservue_type_template_id_319fd53c_render,
-  selectUservue_type_template_id_319fd53c_staticRenderFns,
+  selectUservue_type_template_id_3d8ca42d_render,
+  selectUservue_type_template_id_3d8ca42d_staticRenderFns,
   false,
   null,
   null,
@@ -24375,7 +24390,7 @@ function mainvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
         pendingId: this.pendingId
       };
       this.loading = util["a" /* default */].loading(this.$loading, '保存中...');
-      util["a" /* default */].ajax({ url: api["Xb" /* tempSave */], params: params }).then(function (res) {
+      util["a" /* default */].ajax({ url: api["Xb" /* tempSave */], data: params, method: 'post' }).then(function (res) {
         var status = res.status,
             message = res.message;
 
@@ -25675,7 +25690,7 @@ function mainvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
       //   return false;
       // }
 
-      if ((this.currentNodeIsCircularReadNode || this.isHideOtherOrg && this.isHideCurrentOrg) && this.nextNode.nextCurrentOrgObj.length == 0 && this.nextNode.nextOtherOrgObj.length == 0) {
+      if ((this.currentNodeIsCircularReadNode || this.isHideOtherOrg && this.isHideCurrentOrg) && this.nextNode.nextCurrentOrgObj.length == 0 && this.nextNode.nextOtherOrgObj.length == 0 && this.nextNode.isReturnSubmitter != 1) {
         this.$message.warning('\u8BF7\u9009\u62E9\u4E0B\u6B65\u529E\u7406\u5BF9\u8C61!');
         return false;
       }