eoss-ui 0.8.36 → 0.8.38

package/lib/flow.js

@@ -4878,7 +4878,7 @@ module.exports = require("vuedraggable");
 // 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=48a0a0a2&
+// 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=723b9982&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -4906,6 +4906,7 @@ var render = function () {
                       pendingId: _vm.pendingId,
                       nodeName: _vm.nodeName,
                       typeCode: _vm.typeCode,
+                      ownerType: _vm.ownerType,
                       selectorConfig: _vm.selectorConfig,
                       flowTypeCode: _vm.flowTypeCode,
                       defaultProcessKey: _vm.defaultProcessKey,
@@ -4932,7 +4933,10 @@ var render = function () {
                       flowLabelConfig: _vm.flowLabelConfig,
                       isEndMessage: _vm.isEndMessage,
                     },
-                    on: { success: _vm.handleNewFlowSuccess },
+                    on: {
+                      buttonClick: _vm.handleButtonClick,
+                      success: _vm.handleNewFlowSuccess,
+                    },
                   },
                   "FlowNew",
                   _vm.$attrs,
@@ -7702,6 +7706,14 @@ var render = function () {
                         },
                         [
                           _c("img", {
+                            directives: [
+                              {
+                                name: "show",
+                                rawName: "v-show",
+                                value: _vm.showFlowImg,
+                                expression: "showFlowImg",
+                              },
+                            ],
                             staticStyle: { width: "100%" },
                             attrs: {
                               src:
@@ -7710,6 +7722,14 @@ var render = function () {
                                 _vm.nodeInfo.nextNode,
                               alt: "加载失败",
                             },
+                            on: {
+                              error: function ($event) {
+                                _vm.handleErrorImg("error")
+                              },
+                              load: function ($event) {
+                                _vm.handleErrorImg("load")
+                              },
+                            },
                           }),
                         ]
                       )
@@ -7740,6 +7760,8 @@ var render = function () {
                               option: _vm.value,
                               showTooltip: _vm.showTooltip,
                               simpleTips: _vm.simpleTips,
+                              isCancelSecondConfirmationType:
+                                _vm.isCancelSecondConfirmationType,
                               flowLabelConfig: _vm.flowLabelConfig,
                               hideMessage: _vm.hideMessage,
                               "show-reject": _vm.showReject,
@@ -8016,7 +8038,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/flow/src/main.vue?vue&type=template&id=48a0a0a2&
+// CONCATENATED MODULE: ./packages/flow/src/main.vue?vue&type=template&id=723b9982&
 
 // EXTERNAL MODULE: external "babel-runtime/regenerator"
 var regenerator_ = __webpack_require__(4);
@@ -9080,8 +9102,8 @@ var CommonOpinions_component = Object(componentNormalizer["a" /* default */])(
 )
 
 /* harmony default export */ var CommonOpinions = (CommonOpinions_component.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/flow.vue?vue&type=template&id=68430d4b&
-var flowvue_type_template_id_68430d4b_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/flow.vue?vue&type=template&id=f7d7c7c6&
+var flowvue_type_template_id_f7d7c7c6_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -11301,6 +11323,8 @@ var flowvue_type_template_id_68430d4b_render = function () {
                           showTooltip: _vm.showTooltip,
                           simpleTips: _vm.simpleTips,
                           flowLabelConfig: _vm.flowLabelConfig,
+                          isCancelSecondConfirmationType:
+                            _vm.isCancelSecondConfirmationType,
                           hideMessage: _vm.hideMessage,
                           "show-reject": _vm.showReject,
                           "news-info": _vm.nextNode.notificationMsg,
@@ -11311,9 +11335,10 @@ var flowvue_type_template_id_68430d4b_render = function () {
                           },
                         },
                       })
-                    : _vm.btnType === "toStartTaskRead"
+                    : _vm.btnType === "toStartTaskRead" ||
+                      _vm.btnType === "toTaskReadAndEnd"
                     ? _c("StartTaskRead", {
-                        ref: "toStartTaskRead",
+                        ref: _vm.btnType,
                         staticClass: "es-info",
                         attrs: {
                           "pending-id": _vm.pendingId,
@@ -11716,6 +11741,8 @@ var flowvue_type_template_id_68430d4b_render = function () {
                                   "pending-id": _vm.pendingId,
                                   option: _vm.value,
                                   showTooltip: _vm.showTooltip,
+                                  isCancelSecondConfirmationType:
+                                    _vm.isCancelSecondConfirmationType,
                                   simpleTips: _vm.simpleTips,
                                   flowLabelConfig: _vm.flowLabelConfig,
                                   hideMessage: _vm.hideMessage,
@@ -11990,11 +12017,11 @@ var flowvue_type_template_id_68430d4b_render = function () {
       )
     : _vm._e()
 }
-var flowvue_type_template_id_68430d4b_staticRenderFns = []
-flowvue_type_template_id_68430d4b_render._withStripped = true
+var flowvue_type_template_id_f7d7c7c6_staticRenderFns = []
+flowvue_type_template_id_f7d7c7c6_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/flow/src/flow.vue?vue&type=template&id=68430d4b&
+// CONCATENATED MODULE: ./packages/flow/src/flow.vue?vue&type=template&id=f7d7c7c6&
 
 // 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/Opinions.vue?vue&type=template&id=5f07a050&
 var Opinionsvue_type_template_id_5f07a050_render = function () {
@@ -12706,8 +12733,8 @@ var Opinions_component = Object(componentNormalizer["a" /* default */])(
 )
 
 /* harmony default export */ var Opinions = (Opinions_component.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/processForm.vue?vue&type=template&id=1fcc557e&
-var processFormvue_type_template_id_1fcc557e_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/processForm.vue?vue&type=template&id=2860b038&
+var processFormvue_type_template_id_2860b038_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -13661,14 +13688,14 @@ var processFormvue_type_template_id_1fcc557e_render = function () {
     1
   )
 }
-var processFormvue_type_template_id_1fcc557e_staticRenderFns = []
-processFormvue_type_template_id_1fcc557e_render._withStripped = true
+var processFormvue_type_template_id_2860b038_staticRenderFns = []
+processFormvue_type_template_id_2860b038_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/flow/src/processForm.vue?vue&type=template&id=1fcc557e&
+// CONCATENATED MODULE: ./packages/flow/src/processForm.vue?vue&type=template&id=2860b038&
 
-// 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=e270ebde&
-var selectUservue_type_template_id_e270ebde_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=3a5614a4&
+var selectUservue_type_template_id_3a5614a4_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -13787,6 +13814,7 @@ var selectUservue_type_template_id_e270ebde_render = function () {
                     types: _vm.types,
                     tabs: _vm.tabs,
                     title: _vm.title,
+                    showFilterListDep: false,
                     reset: "",
                     classify: _vm.classify,
                     "collapse-tags": _vm.selectorTags,
@@ -13829,11 +13857,11 @@ var selectUservue_type_template_id_e270ebde_render = function () {
     1
   )
 }
-var selectUservue_type_template_id_e270ebde_staticRenderFns = []
-selectUservue_type_template_id_e270ebde_render._withStripped = true
+var selectUservue_type_template_id_3a5614a4_staticRenderFns = []
+selectUservue_type_template_id_3a5614a4_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/flow/src/selectUser.vue?vue&type=template&id=e270ebde&
+// CONCATENATED MODULE: ./packages/flow/src/selectUser.vue?vue&type=template&id=3a5614a4&
 
 // 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; };
@@ -13940,6 +13968,7 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
 //
 //
 //
+//
 
 
 
@@ -14147,7 +14176,7 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
   },
   mounted: function mounted() {
     console.log(this.nextUser, 'nextUser');
-    this.classify = util["a" /* default */].getStorage('classify') != undefined ? util["a" /* default */].getStorage('classify') : true;
+    this.classify = util["a" /* default */].getStorage('classify') != undefined ? util["a" /* default */].getStorage('classify') : false;
   },
 
 
@@ -14363,8 +14392,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_e270ebde_render,
-  selectUservue_type_template_id_e270ebde_staticRenderFns,
+  selectUservue_type_template_id_3a5614a4_render,
+  selectUservue_type_template_id_3a5614a4_staticRenderFns,
   false,
   null,
   null,
@@ -14373,8 +14402,8 @@ var selectUser_component = Object(componentNormalizer["a" /* default */])(
 )
 
 /* harmony default export */ var selectUser = (selectUser_component.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/component/CustomPreset.vue?vue&type=template&id=9f7598ce&
-var CustomPresetvue_type_template_id_9f7598ce_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/component/CustomPreset.vue?vue&type=template&id=36ac9599&
+var CustomPresetvue_type_template_id_36ac9599_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -14477,11 +14506,11 @@ var CustomPresetvue_type_template_id_9f7598ce_render = function () {
     1
   )
 }
-var CustomPresetvue_type_template_id_9f7598ce_staticRenderFns = []
-CustomPresetvue_type_template_id_9f7598ce_render._withStripped = true
+var CustomPresetvue_type_template_id_36ac9599_staticRenderFns = []
+CustomPresetvue_type_template_id_36ac9599_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/flow/src/component/CustomPreset.vue?vue&type=template&id=9f7598ce&
+// CONCATENATED MODULE: ./packages/flow/src/component/CustomPreset.vue?vue&type=template&id=36ac9599&
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow/src/component/CustomPreset.vue?vue&type=script&lang=js&
 var CustomPresetvue_type_script_lang_js_components;
@@ -14780,9 +14809,13 @@ var CustomPresetvue_type_script_lang_js_components;
     changeSelectData: function changeSelectData() {
       var customPresetUserJson = [];
       this.newPresetList.map(function (item) {
+        var label = item.option.filter(function (x) {
+          return x.nodeId == item.name;
+        });
         customPresetUserJson.push({
           name: item.name,
           lastName: item.lastName,
+          label: label.length > 0 ? label[0].nodeName : '',
           value: item.name != 'endEvent' ? item.multiple ? item.nextUser.join(',') : item.nextUser : '',
           sequence: item.sequence
         });
@@ -14804,8 +14837,8 @@ var CustomPresetvue_type_script_lang_js_components;
 
 var CustomPreset_component = Object(componentNormalizer["a" /* default */])(
   component_CustomPresetvue_type_script_lang_js_,
-  CustomPresetvue_type_template_id_9f7598ce_render,
-  CustomPresetvue_type_template_id_9f7598ce_staticRenderFns,
+  CustomPresetvue_type_template_id_36ac9599_render,
+  CustomPresetvue_type_template_id_36ac9599_staticRenderFns,
   false,
   null,
   null,
@@ -15791,6 +15824,7 @@ var processFormvue_type_script_lang_js_components;
       isCurrentNodeForbiddenChangeCandidate: 0,
       allLoading: null,
       selectUser: false,
+      pOrgId: '',
       multiple: false,
       readMultiple: true,
       showOpinion: true,
@@ -16010,11 +16044,11 @@ var processFormvue_type_script_lang_js_components;
   },
 
   methods: {
-    /**
-     * getProcess
-     * @desc:获取选择流程
-     * @author liufan
-     * @date 2022年5月25日
+    /**
+     * getProcess
+     * @desc:获取选择流程
+     * @author liufan
+     * @date 2022年5月25日
      **/
     getProcess: function getProcess(val) {
       var _this2 = this;
@@ -16404,6 +16438,16 @@ var processFormvue_type_script_lang_js_components;
           if ((_this8.isHideOtherOrg || _this8.isHideCurrentOrg) && !nextCurrentOrgObj && !nextOtherOrgObj) {
             return _this8.$message.warning('请选择办理对象');
           }
+          if (_this8.isCustomPreset && _this8.activeNames == '1') {
+            for (var i = 0; i < _this8.presetList.length; i++) {
+              if (_this8.presetList[i].name && _this8.presetList[i].name != '1' && _this8.presetList[i].name != 'endEvent' && (!_this8.presetList[i].value || _this8.presetList[i].value.length == 0)) {
+                return _this8.$message.warning('\u9884\u8BBE\u8282\u70B9<\u8282\u70B9' + _this8.presetList[i].sequence + '-' + _this8.presetList[i].label + '>\u5FC5\u987B\u9009\u62E9\u529E\u7406\u4EBA\uFF01');
+              } else {
+                delete _this8.presetList[i].label;
+              }
+            }
+          }
+
           if (_this8.isCancelSecondConfirmationType) {
             _this8.$confirm('确认提交吗?', '提示', {
               confirmButtonText: '确定',
@@ -16477,6 +16521,8 @@ var processFormvue_type_script_lang_js_components;
 
                 newParm.submitTaskParamJson = JSON.stringify(_this8.taskParams);
                 if (_this8.formType == 'readTransfer') {
+                  newParm.customPresetUserJson = params.customPresetUserJson;
+                  delete params.customPresetUserJson;
                   newParm.readTransferHandleStartFlowParamJson = JSON.stringify(params);
                   newParm.taskReadEndParamJson = JSON.stringify(_this8.taskParams);
                   delete newParm.copyHistory;
@@ -16588,12 +16634,16 @@ var processFormvue_type_script_lang_js_components;
 
             newParm.submitTaskParamJson = JSON.stringify(_this8.taskParams);
             if (_this8.formType == 'readTransfer') {
-              newParm.readTransferHandleStartFlowParamJson = JSON.stringify(params);
+              newParm.customPresetUserJson = params.customPresetUserJson;
               newParm.taskReadEndParamJson = JSON.stringify(_this8.taskParams);
+              delete params.customPresetUserJson;
+              newParm.readTransferHandleStartFlowParamJson = JSON.stringify(params);
+
               delete newParm.copyHistory;
               delete newParm.startFlowParamJson;
               delete newParm.submitTaskParamJson;
             }
+
             params = newParm;
           }
           if (_this8.copyHistory && !_this8.isFreeStartFlow) {
@@ -16603,6 +16653,7 @@ var processFormvue_type_script_lang_js_components;
           util["a" /* default */].ajax({
             url: _this8.isFreeStartFlow ? api["M" /* freeStartFlowWithSubmitTask */] : _this8.formType == 'readTransfer' ? api["ec" /* startReadTransferHandleFlowWithTaskReadEnd */] : _this8.copyHistory ? api["L" /* freeStartFlow */] : api["Rb" /* register */],
             method: 'post',
+
             data: params
           }).then(function (res) {
             var status = res.status,
@@ -16820,11 +16871,11 @@ var processFormvue_type_script_lang_js_components;
       });
     },
 
-    /**
-     * isMultiple
-     * @desc:是否多选
-     * @author liufan
-     * @date 2022年9月13日
+    /**
+     * isMultiple
+     * @desc:是否多选
+     * @author liufan
+     * @date 2022年9月13日
      **/
     isMultiple: function isMultiple(val, choiceOrgId, choiceDeptId, pOrgId) {
       var multiple = false;
@@ -16850,7 +16901,7 @@ var processFormvue_type_script_lang_js_components;
         }
       }
       if (val == 15 || val == 16) {
-        params.filid = this.userModel.orgId;
+        params.filid = this.pOrgId;
         if (pOrgId) {
           params.filid = pOrgId;
         }
@@ -16961,6 +17012,7 @@ var processFormvue_type_script_lang_js_components;
           _this11.presetTaskNodeKeyStr = data.presetTaskNodeKeyStr;
           _this11.presetTaskNodeMap = data.presetTaskNodeMap;
           _this11.isSinglePage = data.taskExamine.isSinglePage;
+          _this11.pOrgId = data.pOrgId;
           _this11.isSinglePage && (_this11.nextNode.opinion = data.taskExamine.opinion);
           // this.nextNode.noticeInfo = data.taskExamine.notificationMsg;
           _this11.nextNode.nodeName = data.taskExamine.nodeName;
@@ -16982,7 +17034,11 @@ var processFormvue_type_script_lang_js_components;
           }
           _this11.getNodeInfos(undefined, undefined, processId);
           // this.getPresetFlowInfo();
-          _this11.isCustomPreset && _this11.$refs.customPreset.getPresetFlowInfo(_this11.nextNode.nextNode, undefined, true);
+          if (_this11.isCustomPreset) {
+            _this11.$nextTick(function () {
+              _this11.$refs.customPreset && _this11.$refs.customPreset.getPresetFlowInfo(_this11.nextNode.nextNode, undefined, true);
+            });
+          }
           _this11.getFind();
           _this11.getMessage();
         } else {
@@ -17013,8 +17069,8 @@ var processFormvue_type_script_lang_js_components;
 
 var processForm_component = Object(componentNormalizer["a" /* default */])(
   src_processFormvue_type_script_lang_js_,
-  processFormvue_type_template_id_1fcc557e_render,
-  processFormvue_type_template_id_1fcc557e_staticRenderFns,
+  processFormvue_type_template_id_2860b038_render,
+  processFormvue_type_template_id_2860b038_staticRenderFns,
   false,
   null,
   null,
@@ -17906,8 +17962,8 @@ var TimeLimit_component = Object(componentNormalizer["a" /* default */])(
 )
 
 /* harmony default export */ var TimeLimit = (TimeLimit_component.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/processReject.vue?vue&type=template&id=6c65370c&
-var processRejectvue_type_template_id_6c65370c_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/processReject.vue?vue&type=template&id=1d2ca35f&
+var processRejectvue_type_template_id_1d2ca35f_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -18150,11 +18206,11 @@ var processRejectvue_type_template_id_6c65370c_render = function () {
     1
   )
 }
-var processRejectvue_type_template_id_6c65370c_staticRenderFns = []
-processRejectvue_type_template_id_6c65370c_render._withStripped = true
+var processRejectvue_type_template_id_1d2ca35f_staticRenderFns = []
+processRejectvue_type_template_id_1d2ca35f_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/flow/src/processReject.vue?vue&type=template&id=6c65370c&
+// CONCATENATED MODULE: ./packages/flow/src/processReject.vue?vue&type=template&id=1d2ca35f&
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow/src/processReject.vue?vue&type=script&lang=js&
 //
@@ -18262,7 +18318,8 @@ processRejectvue_type_template_id_6c65370c_render._withStripped = true
     option: { type: String, default: '' },
     hideBtn: { type: Boolean, default: false },
     simpleTips: { type: Boolean, default: true },
-    hideMessage: { type: Boolean, default: false }
+    hideMessage: { type: Boolean, default: false },
+    isCancelSecondConfirmationType: { type: Boolean, default: false }
   },
   data: function data() {
     return {
@@ -18331,47 +18388,59 @@ processRejectvue_type_template_id_6c65370c_render._withStripped = true
 
     // 提交表单
     subProcess: function subProcess(formName, isNoObj) {
+      var _this2 = this;
+
       if (isNoObj) {
         this.quit(false);
         return;
       }
-      this.saveProcess(formName);
+      if (this.isCancelSecondConfirmationType) {
+        this.$confirm('确认提交吗?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(function () {
+          _this2.saveProcess(formName);
+        }).catch(function () {});
+      } else {
+        this.saveProcess(formName);
+      }
     },
     saveProcess: function saveProcess(formName) {
-      var _this2 = this;
+      var _this3 = this;
 
       this.$refs[formName].validate(function (valid) {
         if (valid) {
-          if (!_this2.option && _this2.isOpinionRequired === 1) {
-            _this2.$message.warning('请选择输入审批意见');
+          if (!_this3.option && _this3.isOpinionRequired === 1) {
+            _this3.$message.warning('请选择输入审批意见');
             return;
           }
-          _this2.loading = true;
-          var noticeType = _this2.nextNode.noticeType.join(',');
+          _this3.loading = true;
+          var noticeType = _this3.nextNode.noticeType.join(',');
           var params = {
-            pendingId: _this2.pendingId,
-            opinion: _this2.option, // 审批意见
-            notificationMsg: _this2.newsInformation, // 系统消息
+            pendingId: _this3.pendingId,
+            opinion: _this3.option, // 审批意见
+            notificationMsg: _this3.newsInformation, // 系统消息
             notificationType: noticeType,
             userId: util["a" /* default */].getStorage('userId'),
-            nextNodeId: _this2.nextNode.nextNodeId
+            nextNodeId: _this3.nextNode.nextNodeId
           };
           util["a" /* default */].ajax({ url: api["lc" /* taskRejectHtml */], method: 'post', data: params }).then(function (res) {
             var status = res.status,
                 message = res.message;
 
-            _this2.loading = false;
+            _this3.loading = false;
             if (status === 'success') {
-              _this2.quit(true);
-              _this2.simpleTips && _this2.$message.success('操作成功');
+              _this3.quit(true);
+              _this3.simpleTips && _this3.$message.success('操作成功');
             } else {
-              _this2.$message.error(message || '系统错误，请联系管理员！');
-              _this2.quit(false);
+              _this3.$message.error(message || '系统错误，请联系管理员！');
+              _this3.quit(false);
             }
           }).catch(function (err) {
-            _this2.loading = false;
+            _this3.loading = false;
             if (err.message && err.message !== 'canceled') {
-              _this2.$message.error(err.message);
+              _this3.$message.error(err.message);
             }
           });
         } else {
@@ -18385,7 +18454,7 @@ processRejectvue_type_template_id_6c65370c_render._withStripped = true
       this.$emit('cancel', val);
     },
     getFind: function getFind() {
-      var _this3 = this;
+      var _this4 = this;
 
       util["a" /* default */].ajax({
         url: api["I" /* findSysCodes */]
@@ -18394,27 +18463,27 @@ processRejectvue_type_template_id_6c65370c_render._withStripped = true
             message = res.message;
 
         if (status === 'success') {
-          if (_this3.hideMessage) return;
-          _this3.nextNode.noticeType = message.split(',');
+          if (_this4.hideMessage) return;
+          _this4.nextNode.noticeType = message.split(',');
           var arr = [];
-          _this3.nextNode.noticeList.map(function (item) {
-            _this3.nextNode.noticeType.map(function (x) {
+          _this4.nextNode.noticeList.map(function (item) {
+            _this4.nextNode.noticeType.map(function (x) {
               if (x == item.cciValue) {
                 arr.push(x);
               }
             });
           });
-          _this3.nextNode.noticeType = arr;
+          _this4.nextNode.noticeType = arr;
         }
       }).catch(function (err) {
-        _this3.loading = false;
+        _this4.loading = false;
         if (err.message && err.message !== 'canceled') {
-          _this3.$message.error(err.message);
+          _this4.$message.error(err.message);
         }
       });
     },
     getProcessReject: function getProcessReject() {
-      var _this4 = this;
+      var _this5 = this;
 
       this.loading = true;
       var params = {
@@ -18423,7 +18492,7 @@ processRejectvue_type_template_id_6c65370c_render._withStripped = true
         opinion: this.option
       };
       util["a" /* default */].ajax({ url: api["Cc" /* toTaskRejectHtml */], params: params }).then(function (res) {
-        _this4.loading = false;
+        _this5.loading = false;
         if (res.status === 'success') {
           var _res$data = res.data,
               rejectTaskNodes = _res$data.rejectTaskNodes,
@@ -18432,11 +18501,11 @@ processRejectvue_type_template_id_6c65370c_render._withStripped = true
               notificationMessageReadOnly = _res$data.notificationMessageReadOnly,
               readOnlyNotificationType = _res$data.readOnlyNotificationType;
 
-          _this4.isOpinionRequired = nodeInfoMap.nodeExtAttr.isOpinionRequired;
-          _this4.readOnlyNotificationType = readOnlyNotificationType;
-          _this4.notificationMessageReadOnly = notificationMessageReadOnly == 'true';
-          if (!_this4.isOpinionRequired) {
-            _this4.isOpinionRequired = 0;
+          _this5.isOpinionRequired = nodeInfoMap.nodeExtAttr.isOpinionRequired;
+          _this5.readOnlyNotificationType = readOnlyNotificationType;
+          _this5.notificationMessageReadOnly = notificationMessageReadOnly == 'true';
+          if (!_this5.isOpinionRequired) {
+            _this5.isOpinionRequired = 0;
           }
           var list = [];
           if (rejectTaskNodes) {
@@ -18447,18 +18516,18 @@ processRejectvue_type_template_id_6c65370c_render._withStripped = true
               };
               list.push(obj);
             }
-            _this4.nodeName = taskExamine.nodeName;
-            _this4.rejectObj = list;
-            _this4.rejectObj.length != 0 && (_this4.nextNode.nextNodeId = _this4.rejectObj[0].id);
+            _this5.nodeName = taskExamine.nodeName;
+            _this5.rejectObj = list;
+            _this5.rejectObj.length != 0 && (_this5.nextNode.nextNodeId = _this5.rejectObj[0].id);
           }
         } else {
-          _this4.$message.error(res.message || '系统错误，请联系管理员！');
-          _this4.quit(false);
+          _this5.$message.error(res.message || '系统错误，请联系管理员！');
+          _this5.quit(false);
         }
       }).catch(function (err) {
-        _this4.loading = false;
+        _this5.loading = false;
         if (err.message && err.message !== 'canceled') {
-          _this4.$message.error(err.message);
+          _this5.$message.error(err.message);
         }
       });
     }
@@ -18476,8 +18545,8 @@ processRejectvue_type_template_id_6c65370c_render._withStripped = true
 
 var processReject_component = Object(componentNormalizer["a" /* default */])(
   src_processRejectvue_type_script_lang_js_,
-  processRejectvue_type_template_id_6c65370c_render,
-  processRejectvue_type_template_id_6c65370c_staticRenderFns,
+  processRejectvue_type_template_id_1d2ca35f_render,
+  processRejectvue_type_template_id_1d2ca35f_staticRenderFns,
   false,
   null,
   null,
@@ -18486,8 +18555,8 @@ var processReject_component = Object(componentNormalizer["a" /* default */])(
 )
 
 /* harmony default export */ var processReject = (processReject_component.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/startTaskRead.vue?vue&type=template&id=d6b2d084&
-var startTaskReadvue_type_template_id_d6b2d084_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/startTaskRead.vue?vue&type=template&id=fffcbc42&
+var startTaskReadvue_type_template_id_fffcbc42_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -18918,11 +18987,11 @@ var startTaskReadvue_type_template_id_d6b2d084_render = function () {
     1
   )
 }
-var startTaskReadvue_type_template_id_d6b2d084_staticRenderFns = []
-startTaskReadvue_type_template_id_d6b2d084_render._withStripped = true
+var startTaskReadvue_type_template_id_fffcbc42_staticRenderFns = []
+startTaskReadvue_type_template_id_fffcbc42_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/flow/src/startTaskRead.vue?vue&type=template&id=d6b2d084&
+// CONCATENATED MODULE: ./packages/flow/src/startTaskRead.vue?vue&type=template&id=fffcbc42&
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow/src/startTaskRead.vue?vue&type=script&lang=js&
 var startTaskReadvue_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; };
@@ -19164,6 +19233,7 @@ var startTaskReadvue_type_script_lang_js_components;
     };
   },
 
+
   computed: {
     tabs: function tabs() {
       var tab = {};
@@ -19517,6 +19587,7 @@ var startTaskReadvue_type_script_lang_js_components;
 
     // 提交表单
     subProcess: function subProcess(formName) {
+
       this.submit(formName);
     },
 
@@ -19530,7 +19601,6 @@ var startTaskReadvue_type_script_lang_js_components;
             _this8.$message.warning('请选择输入审批意见');
             return;
           }
-          console.log(_this8.mixList, 'this.mixList');
           // let nextUser = [];
           // this.nextNode.nextUser.map(item => {
           //   nextUser.push(item);
@@ -19673,8 +19743,8 @@ var startTaskReadvue_type_script_lang_js_components;
 
 var startTaskRead_component = Object(componentNormalizer["a" /* default */])(
   src_startTaskReadvue_type_script_lang_js_,
-  startTaskReadvue_type_template_id_d6b2d084_render,
-  startTaskReadvue_type_template_id_d6b2d084_staticRenderFns,
+  startTaskReadvue_type_template_id_fffcbc42_render,
+  startTaskReadvue_type_template_id_fffcbc42_staticRenderFns,
   false,
   null,
   null,
@@ -21104,8 +21174,8 @@ var reset_component = Object(componentNormalizer["a" /* default */])(
 )
 
 /* harmony default export */ var src_reset = (reset_component.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/component/taskUnionExamine.vue?vue&type=template&id=3256c512&
-var taskUnionExaminevue_type_template_id_3256c512_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/component/taskUnionExamine.vue?vue&type=template&id=f2f9c652&
+var taskUnionExaminevue_type_template_id_f2f9c652_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -21131,7 +21201,7 @@ var taskUnionExaminevue_type_template_id_3256c512_render = function () {
           attrs: {
             model: _vm.infoList,
             rules: _vm.rules,
-            "label-width": "120px",
+            "label-width": _vm.type != "startDraf" ? "80px" : "120px",
           },
         },
         [
@@ -21185,6 +21255,7 @@ var taskUnionExaminevue_type_template_id_3256c512_render = function () {
                       selectorTags: 4,
                       showTooltip: _vm.showTooltip,
                       mix: _vm.currentMix,
+                      title: "选择对象",
                       isUnionSeal: _vm.type == "unionSeal",
                       selectUserList: _vm.unionSealData || [],
                       types:
@@ -21420,11 +21491,11 @@ var taskUnionExaminevue_type_template_id_3256c512_render = function () {
     1
   )
 }
-var taskUnionExaminevue_type_template_id_3256c512_staticRenderFns = []
-taskUnionExaminevue_type_template_id_3256c512_render._withStripped = true
+var taskUnionExaminevue_type_template_id_f2f9c652_staticRenderFns = []
+taskUnionExaminevue_type_template_id_f2f9c652_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/flow/src/component/taskUnionExamine.vue?vue&type=template&id=3256c512&
+// CONCATENATED MODULE: ./packages/flow/src/component/taskUnionExamine.vue?vue&type=template&id=f2f9c652&
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow/src/component/taskUnionExamine.vue?vue&type=script&lang=js&
 var taskUnionExaminevue_type_script_lang_js_components;
@@ -21603,6 +21674,7 @@ var taskUnionExaminevue_type_script_lang_js_components;
 //
 //
 //
+//
 
 
 
@@ -21858,13 +21930,13 @@ var taskUnionExaminevue_type_script_lang_js_components;
               var param = res.data.customizedConfig.currentOrgSelectorRangeList.split(',');
               _this3.currentOrgTabs.map(function (x, i) {
                 _this3.params[x] = {
-                  filid: param[i] == 'my' ? _this3.params.filid = JSON.parse(util["a" /* default */].getStorage('mainConfig')).userModel.orgId : param[i],
+                  filid: param[i] == 'my' ? _this3.params.filid = choiceOrgId || JSON.parse(util["a" /* default */].getStorage('mainConfig')).userModel.orgId : param[i],
                   only_filid: true
                 };
               });
             } else {
               if (_this3.type == 'takeAdvice') {
-                _this3.params.filid = JSON.parse(util["a" /* default */].getStorage('mainConfig')).userModel.orgId;
+                _this3.params.filid = choiceOrgId || JSON.parse(util["a" /* default */].getStorage('mainConfig')).userModel.orgId;
               }
             }
 
@@ -22131,8 +22203,8 @@ var taskUnionExaminevue_type_script_lang_js_components;
 
 var taskUnionExamine_component = Object(componentNormalizer["a" /* default */])(
   component_taskUnionExaminevue_type_script_lang_js_,
-  taskUnionExaminevue_type_template_id_3256c512_render,
-  taskUnionExaminevue_type_template_id_3256c512_staticRenderFns,
+  taskUnionExaminevue_type_template_id_f2f9c652_render,
+  taskUnionExaminevue_type_template_id_f2f9c652_staticRenderFns,
   false,
   null,
   null,
@@ -22141,8 +22213,8 @@ var taskUnionExamine_component = Object(componentNormalizer["a" /* default */])(
 )
 
 /* harmony default export */ var taskUnionExamine = (taskUnionExamine_component.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/freeStartFlow.vue?vue&type=template&id=458144cd&
-var freeStartFlowvue_type_template_id_458144cd_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/freeStartFlow.vue?vue&type=template&id=61ab09c6&
+var freeStartFlowvue_type_template_id_61ab09c6_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -24259,11 +24331,11 @@ var freeStartFlowvue_type_template_id_458144cd_render = function () {
       )
     : _vm._e()
 }
-var freeStartFlowvue_type_template_id_458144cd_staticRenderFns = []
-freeStartFlowvue_type_template_id_458144cd_render._withStripped = true
+var freeStartFlowvue_type_template_id_61ab09c6_staticRenderFns = []
+freeStartFlowvue_type_template_id_61ab09c6_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/flow/src/freeStartFlow.vue?vue&type=template&id=458144cd&
+// CONCATENATED MODULE: ./packages/flow/src/freeStartFlow.vue?vue&type=template&id=61ab09c6&
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow/src/freeStartFlow.vue?vue&type=script&lang=js&
 
@@ -25625,11 +25697,11 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
       });
     },
 
-    /**
-     * saveInfo
-     * @desc:暂存
-     * @author liufan
-     * @date 2022年9月9日
+    /**
+     * saveInfo
+     * @desc:暂存
+     * @author liufan
+     * @date 2022年9月9日
      **/
     saveInfo: function saveInfo(type, btn) {
       var _this6 = this;
@@ -25691,11 +25763,11 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
       });
     },
 
-    /**
-     * rejectBtn
-     * @desc:点击驳回
-     * @author liufan
-     * @date 2022年5月25日
+    /**
+     * rejectBtn
+     * @desc:点击驳回
+     * @author liufan
+     * @date 2022年5月25日
      **/
     rejectBtn: function rejectBtn() {
       var _this8 = this;
@@ -25713,11 +25785,11 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
       }
     },
 
-    /**
-     * taskReadBtn
-     * @desc:点击分阅
-     * @author liufan
-     * @date 2022年5月25日
+    /**
+     * taskReadBtn
+     * @desc:点击分阅
+     * @author liufan
+     * @date 2022年5月25日
      **/
     taskReadBtn: function taskReadBtn() {
       var _this9 = this;
@@ -25736,11 +25808,11 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
       }
     },
 
-    /**
-     * getFind
-     * @desc:获取通知方式
-     * @author liufan
-     * @date 2022年5月25日
+    /**
+     * getFind
+     * @desc:获取通知方式
+     * @author liufan
+     * @date 2022年5月25日
      **/
     getFind: function getFind() {
       var _this10 = this;
@@ -25796,12 +25868,12 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
       });
     },
 
-    /**
-     * endFlows
-     * @desc:直接办结
-     * @author liufan
-     * @param {Object} res 直接办结数据
-     * @date 2022年5月25日
+    /**
+     * endFlows
+     * @desc:直接办结
+     * @author liufan
+     * @param {Object} res 直接办结数据
+     * @date 2022年5月25日
      **/
     endFlows: function endFlows(res) {
       var _this12 = this;
@@ -25855,12 +25927,12 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
       }).catch(function (e) {});
     },
 
-    /**
-     * goView
-     * @desc:更多流程按钮操作
-     * @author liufan
-     * @param {Object} res 当前点击操作按钮数据
-     * @date 2022年5月25日
+    /**
+     * goView
+     * @desc:更多流程按钮操作
+     * @author liufan
+     * @param {Object} res 当前点击操作按钮数据
+     * @date 2022年5月25日
      **/
     goView: function goView(res) {
       // 驳回并办结：rejectAndEndHtml
@@ -25945,11 +26017,11 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
       // isCanStartSubFlow
     },
 
-    /**
-     * toTakeAdvice
-     * @desc:征求意见
-     * @author liufan
-     * @date 2022年9月29日
+    /**
+     * toTakeAdvice
+     * @desc:征求意见
+     * @author liufan
+     * @date 2022年9月29日
      **/
     toTakeAdvice: function toTakeAdvice(res) {
       var _this14 = this;
@@ -25993,11 +26065,11 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
       });
     },
 
-    /**
-     * toStartDraf
-     * @desc: 稿件递送、联合审核、复核
-     * @author liufan
-     * @date 2022年9月29日
+    /**
+     * toStartDraf
+     * @desc: 稿件递送、联合审核、复核
+     * @author liufan
+     * @date 2022年9月29日
      **/
     toStartDraf: function toStartDraf(res) {
       var _this16 = this;
@@ -26011,11 +26083,11 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
       }
     },
 
-    /**
-     * toSendMsg
-     * @desc:核稿通知
-     * @author liufan
-     * @date 2022年9月29日
+    /**
+     * toSendMsg
+     * @desc:核稿通知
+     * @author liufan
+     * @date 2022年9月29日
      **/
     toSendMsg: function toSendMsg(res) {
       var _this17 = this;
@@ -26029,11 +26101,11 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
       }
     },
 
-    /**
-     * toTaskReadAndEnd
-     * @desc:分阅并办结
-     * @author liufan
-     * @date 2022年9月29日
+    /**
+     * toTaskReadAndEnd
+     * @desc:分阅并办结
+     * @author liufan
+     * @date 2022年9月29日
      **/
     toTaskReadAndEnd: function toTaskReadAndEnd(res) {
       var _this18 = this;
@@ -26051,11 +26123,11 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
       }
     },
 
-    /**
-     * rejectAndEnd
-     * @desc:驳回并办结
-     * @author liufan
-     * @date 2022年9月29日
+    /**
+     * rejectAndEnd
+     * @desc:驳回并办结
+     * @author liufan
+     * @date 2022年9月29日
      **/
     rejectAndEnd: function rejectAndEnd(res) {
       var _this19 = this;
@@ -26110,11 +26182,11 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
       });
     },
 
-    /**
-     * toTransfer
-     * @desc:转办
-     * @author liufan
-     * @date 2022年9月29日
+    /**
+     * toTransfer
+     * @desc:转办
+     * @author liufan
+     * @date 2022年9月29日
      **/
     toTransfer: function toTransfer(res) {
       var _this21 = this;
@@ -26130,11 +26202,11 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
       }
     },
 
-    /**
-     * getNodeInfo
-     * @desc:获取节点信息
-     * @author liufan
-     * @date 2022年5月25日
+    /**
+     * getNodeInfo
+     * @desc:获取节点信息
+     * @author liufan
+     * @date 2022年5月25日
      **/
     getNodeInfo: function getNodeInfo() {
       var _this22 = this;
@@ -26221,7 +26293,11 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
             _this22.handleMode = data.countersignaturetypeText;
             data.globalNodeType === 'endEvent' ? _this22.endFlow = true : '';
           }
-          _this22.isCustomPreset && _this22.$refs.customPreset.getPresetFlowInfo(_this22.nextNode.nextNodeId, _this22.nodeInfo.nextNode, true);
+          if (_this22.isCustomPreset) {
+            _this22.$nextTick(function () {
+              _this22.$refs.customPreset && _this22.$refs.customPreset.getPresetFlowInfo(_this22.nextNode.nextNodeId, _this22.nodeInfo.nextNode, true);
+            });
+          }
         } else {
           _this22.$message.error(message || '系统错误，请联系管理员！');
         }
@@ -26233,12 +26309,12 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
       });
     },
 
-    /**
-     * selecNext
-     * @desc:下步节点变化时更新数据
-     * @author liufan
-     * @param {String} val 当前选中值
-     * @date 2022年5月25日
+    /**
+     * selecNext
+     * @desc:下步节点变化时更新数据
+     * @author liufan
+     * @param {String} val 当前选中值
+     * @date 2022年5月25日
      **/
     selecNext: function selecNext(val, type, isDef) {
       var _this23 = this;
@@ -26347,11 +26423,11 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
       if (isDef !== true) this.getNodeInfo();
     },
 
-    /**
-     * isMultiple
-     * @desc:是否多选
-     * @author liufan
-     * @date 2022年9月13日
+    /**
+     * isMultiple
+     * @desc:是否多选
+     * @author liufan
+     * @date 2022年9月13日
      **/
     isMultiple: function isMultiple(val, choiceOrgId, choiceDeptId, pOrgId) {
       if (val == 2 || val == 4 || val == 6 || val == 16) {
@@ -26383,11 +26459,11 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
       }
     },
 
-    /**
-     * getHedInfo
-     * @desc:获取审核页面数据
-     * @author liufan
-     * @date 2022年5月25日
+    /**
+     * getHedInfo
+     * @desc:获取审核页面数据
+     * @author liufan
+     * @date 2022年5月25日
      **/
     getHedInfo: function getHedInfo() {
       var _this24 = this;
@@ -26623,13 +26699,13 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
       });
     },
 
-    /**
-     * closeProcess
-     * @desc:关闭弹窗
-     * @author liufan
-     * @param {boolean} val 当前是否办理流程
-     * @param {String} type 当前点击的弹窗类型
-     * @date 2022年5月25日
+    /**
+     * closeProcess
+     * @desc:关闭弹窗
+     * @author liufan
+     * @param {boolean} val 当前是否办理流程
+     * @param {String} type 当前点击的弹窗类型
+     * @date 2022年5月25日
      **/
     closeProcess: function closeProcess(val, type, closeParent) {
       if (closeParent) {
@@ -26646,23 +26722,23 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
       }
     },
 
-    /**
-     * selectChange
-     * @desc:常用语选择
-     * @author liufan
-     * @param {String} val 选中值
-     * @date 2022年5月25日
+    /**
+     * selectChange
+     * @desc:常用语选择
+     * @author liufan
+     * @param {String} val 选中值
+     * @date 2022年5月25日
      **/
     selectChange: function selectChange(val) {
       this.value = val;
     },
 
-    /**
-     * upDate
-     * @desc:修改常用语
-     * @author liufan
-     * @param {Object} val 修改值
-     * @date 2022年5月25日
+    /**
+     * upDate
+     * @desc:修改常用语
+     * @author liufan
+     * @param {Object} val 修改值
+     * @date 2022年5月25日
      **/
     upDate: function upDate(val) {
       this.FormData.id = val.id;
@@ -26670,11 +26746,11 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
     },
 
 
-    /**
-     * getProcess
-     * @desc:获取选择流程
-     * @author liufan
-     * @date 2022年5月25日
+    /**
+     * getProcess
+     * @desc:获取选择流程
+     * @author liufan
+     * @date 2022年5月25日
      **/
     getProcess: function getProcess() {
       var _this25 = this;
@@ -26728,11 +26804,11 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
       });
     },
 
-    /**
-     * getPendedhistoryList
-     * @desc:获取流程列表
-     * @author liufan
-     * @date 2022年5月25日
+    /**
+     * getPendedhistoryList
+     * @desc:获取流程列表
+     * @author liufan
+     * @date 2022年5月25日
      **/
     getPendedhistoryList: function getPendedhistoryList() {
       var _this26 = this;
@@ -26764,12 +26840,12 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
     },
 
     // 提交流程
-    /**
-     * subProcess
-     * @desc:提交流程
-     * @author liufan
-     * @param {String} formName 当前form表单ref值
-     * @date 2022年5月25日
+    /**
+     * subProcess
+     * @desc:提交流程
+     * @author liufan
+     * @param {String} formName 当前form表单ref值
+     * @date 2022年5月25日
      **/
     subProcess: function subProcess(val) {
       var _this27 = this;
@@ -27019,8 +27095,8 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
 
 var freeStartFlow_component = Object(componentNormalizer["a" /* default */])(
   src_freeStartFlowvue_type_script_lang_js_,
-  freeStartFlowvue_type_template_id_458144cd_render,
-  freeStartFlowvue_type_template_id_458144cd_staticRenderFns,
+  freeStartFlowvue_type_template_id_61ab09c6_render,
+  freeStartFlowvue_type_template_id_61ab09c6_staticRenderFns,
   false,
   null,
   null,
@@ -29966,6 +30042,8 @@ function flowvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
 //
 //
 //
+//
+//
 
 
 
@@ -30006,6 +30084,7 @@ function flowvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
     hideBtn: { type: Boolean, default: false },
     isCirculate: { type: Boolean, default: false },
     newFlow: { type: Boolean, default: false },
+    ownerType: { type: String, default: '' },
     formLabelPosition: {
       type: String,
       default: 'left'
@@ -30917,11 +30996,11 @@ function flowvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
       });
     },
 
-    /**
-     * saveInfo
-     * @desc:暂存
-     * @author liufan
-     * @date 2022年9月9日
+    /**
+     * saveInfo
+     * @desc:暂存
+     * @author liufan
+     * @date 2022年9月9日
      **/
     saveInfo: function saveInfo(type, btn) {
       var _this14 = this;
@@ -30983,11 +31062,11 @@ function flowvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
       });
     },
 
-    /**
-     * rejectBtn
-     * @desc:点击驳回
-     * @author liufan
-     * @date 2022年5月25日
+    /**
+     * rejectBtn
+     * @desc:点击驳回
+     * @author liufan
+     * @date 2022年5月25日
      **/
     rejectBtn: function rejectBtn(res) {
       var _this16 = this;
@@ -31007,37 +31086,39 @@ function flowvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
       }
     },
 
-    /**
-     * taskReadBtn
-     * @desc:点击分阅
-     * @author liufan
-     * @date 2022年5月25日
+    /**
+     * taskReadBtn
+     * @desc:点击分阅
+     * @author liufan
+     * @date 2022年5月25日
      **/
     taskReadBtn: function taskReadBtn(res) {
       var _this17 = this;
 
       // return this.$message.warning('暂未开放！敬请期待');
-
-      if (this.beforeSubmit != undefined) {
-        this.beforeSubmit().then(function (next) {
+      this.btnType = '';
+      setTimeout(function () {
+        if (_this17.beforeSubmit != undefined) {
+          _this17.beforeSubmit().then(function (next) {
+            if (_this17.value === '') _this17.value = _this17.nodeDefaultRejectOpinion;
+            _this17.taskReadType = 'create';
+            // this.showTaskRead = true;
+            _this17.btnType = _this17.btnFunValue(res.fun);
+          }).catch(function (e) {});
+        } else {
           if (_this17.value === '') _this17.value = _this17.nodeDefaultRejectOpinion;
           _this17.taskReadType = 'create';
           // this.showTaskRead = true;
           _this17.btnType = _this17.btnFunValue(res.fun);
-        }).catch(function (e) {});
-      } else {
-        if (this.value === '') this.value = this.nodeDefaultRejectOpinion;
-        this.taskReadType = 'create';
-        // this.showTaskRead = true;
-        this.btnType = this.btnFunValue(res.fun);
-      }
+        }
+      }, 0);
     },
 
-    /**
-     * getFind
-     * @desc:获取通知方式
-     * @author liufan
-     * @date 2022年5月25日
+    /**
+     * getFind
+     * @desc:获取通知方式
+     * @author liufan
+     * @date 2022年5月25日
      **/
     getFind: function getFind() {
       var _this18 = this;
@@ -31104,12 +31185,12 @@ function flowvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
       });
     },
 
-    /**
-     * endFlows
-     * @desc:直接办结
-     * @author liufan
-     * @param {Object} res 直接办结数据
-     * @date 2022年5月25日
+    /**
+     * endFlows
+     * @desc:直接办结
+     * @author liufan
+     * @param {Object} res 直接办结数据
+     * @date 2022年5月25日
      **/
     endFlows: function endFlows(res) {
       var _this20 = this;
@@ -31123,9 +31204,9 @@ function flowvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
       }
     },
 
-    /**
-     * 获取弹性布局样式
-     * @returns {string} 弹性布局值
+    /**
+     * 获取弹性布局样式
+     * @returns {string} 弹性布局值
      */
     getFlexStyle: function getFlexStyle() {
       var isDefaultFlex = (!this.endFlow || this.nodeInfos.length > 1 || this.taskOperationShiftedNodeList) && this.newTypeCode != 'fenyue' && !this.shrink && this.btnType === 'default' || this.btnType != 'default';
@@ -31173,12 +31254,12 @@ function flowvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
       }).catch(function (e) {});
     },
 
-    /**
-     * goView
-     * @desc:更多流程按钮操作
-     * @author liufan
-     * @param {Object} res 当前点击操作按钮数据
-     * @date 2022年5月25日
+    /**
+     * goView
+     * @desc:更多流程按钮操作
+     * @author liufan
+     * @param {Object} res 当前点击操作按钮数据
+     * @date 2022年5月25日
      **/
     goView: function goView(res) {
       // 驳回并办结：rejectAndEndHtml
@@ -31190,7 +31271,8 @@ function flowvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
       // 驳回：taskRejectHtml
       // 直接办结：endFlowHtml
       // 自由发起子流程：toFreeStartFlow
-      console.log(res, '123');
+
+
       if (res.type == 4) {
         this.$emit('buttonClick', { fun: res.fun, opinion: this.value }, this.sendData);
       } else if (res.fun === 'toStartTaskRead()') {
@@ -31268,11 +31350,11 @@ function flowvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
       // isCanStartSubFlow
     },
 
-    /**
-     * toTakeAdvice
-     * @desc:征求意见
-     * @author liufan
-     * @date 2022年9月29日
+    /**
+     * toTakeAdvice
+     * @desc:征求意见
+     * @author liufan
+     * @date 2022年9月29日
      **/
     toTakeAdvice: function toTakeAdvice(res) {
       var _this22 = this;
@@ -31320,16 +31402,15 @@ function flowvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
       });
     },
 
-    /**
-     * toStartDraf
-     * @desc: 稿件递送、联合审核、复核
-     * @author liufan
-     * @date 2022年9月29日
+    /**
+     * toStartDraf
+     * @desc: 稿件递送、联合审核、复核
+     * @author liufan
+     * @date 2022年9月29日
      **/
     toStartDraf: function toStartDraf(res) {
       var _this24 = this;
 
-      console.log(res);
       if (this.beforeSubmit != undefined) {
         this.beforeSubmit().then(function (next) {
           // this.showTaskUnionExamine = true;
@@ -31348,11 +31429,11 @@ function flowvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
       }
     },
 
-    /**
-     * toSendMsg
-     * @desc:核稿通知
-     * @author liufan
-     * @date 2022年9月29日
+    /**
+     * toSendMsg
+     * @desc:核稿通知
+     * @author liufan
+     * @date 2022年9月29日
      **/
     toSendMsg: function toSendMsg(res) {
       var _this25 = this;
@@ -31366,33 +31447,39 @@ function flowvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
       }
     },
 
-    /**
-     * toTaskReadAndEnd
-     * @desc:分阅并办结
-     * @author liufan
-     * @date 2022年9月29日
+    /**
+     * toTaskReadAndEnd
+     * @desc:分阅并办结
+     * @author liufan
+     * @date 2022年9月29日
      **/
     toTaskReadAndEnd: function toTaskReadAndEnd(res) {
       var _this26 = this;
 
-      if (this.beforeSubmit != undefined) {
-        this.beforeSubmit().then(function (next) {
+      this.btnType = '';
+      setTimeout(function () {
+        if (_this26.beforeSubmit != undefined) {
+          _this26.beforeSubmit().then(function (next) {
+            if (_this26.value === '') _this26.value = _this26.nodeDefaultRejectOpinion;
+            _this26.taskReadType = 'taskReadAndEnd';
+            _this26.btnType = _this26.btnFunValue(res.fun);
+
+            // this.showTaskRead = true;
+          }).catch(function (e) {});
+        } else {
           if (_this26.value === '') _this26.value = _this26.nodeDefaultRejectOpinion;
           _this26.taskReadType = 'taskReadAndEnd';
-          _this26.showTaskRead = true;
-        }).catch(function (e) {});
-      } else {
-        if (this.value === '') this.value = this.nodeDefaultRejectOpinion;
-        this.taskReadType = 'taskReadAndEnd';
-        this.showTaskRead = true;
-      }
+          _this26.btnType = _this26.btnFunValue(res.fun);
+          // this.showTaskRead = true;
+        }
+      }, 0);
     },
 
-    /**
-     * rejectAndEnd
-     * @desc:驳回并办结
-     * @author liufan
-     * @date 2022年9月29日
+    /**
+     * rejectAndEnd
+     * @desc:驳回并办结
+     * @author liufan
+     * @date 2022年9月29日
      **/
     rejectAndEnd: function rejectAndEnd(res) {
       var _this27 = this;
@@ -31448,11 +31535,11 @@ function flowvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
       });
     },
 
-    /**
-     * toTransfer
-     * @desc:转办
-     * @author liufan
-     * @date 2022年9月29日
+    /**
+     * toTransfer
+     * @desc:转办
+     * @author liufan
+     * @date 2022年9月29日
      **/
     toTransfer: function toTransfer(res) {
       var _this29 = this;
@@ -31471,11 +31558,11 @@ function flowvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
       this.nextNode.customLimitTime = val;
     },
 
-    /**
-     * getNodeInfo
-     * @desc:获取节点信息
-     * @author liufan
-     * @date 2022年5月25日
+    /**
+     * getNodeInfo
+     * @desc:获取节点信息
+     * @author liufan
+     * @date 2022年5月25日
      **/
     getNodeInfo: function getNodeInfo() {
       var _this30 = this;
@@ -31606,8 +31693,11 @@ function flowvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
               data.globalNodeType === 'endEvent' ? _this30.endFlow = true : '';
             }
           }
-          console.log(_this30.$refs.customPreset.getPresetFlowInfo, 'his.$refs.customPreset');
-          _this30.isCustomPreset && _this30.$refs.customPreset.getPresetFlowInfo(_this30.nextNode.nextNodeId, _this30.nodeInfo.nextNode, true);
+          if (_this30.isCustomPreset) {
+            _this30.$nextTick(function () {
+              _this30.$refs.customPreset && _this30.$refs.customPreset.getPresetFlowInfo(_this30.nextNode.nextNodeId, _this30.nodeInfo.nextNode, true);
+            });
+          }
         } else {
           _this30.$message.error(message || '系统错误，请联系管理员！');
         }
@@ -31619,12 +31709,12 @@ function flowvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
       });
     },
 
-    /**
-     * selecNext
-     * @desc:下步节点变化时更新数据
-     * @author liufan
-     * @param {String} val 当前选中值
-     * @date 2022年5月25日
+    /**
+     * selecNext
+     * @desc:下步节点变化时更新数据
+     * @author liufan
+     * @param {String} val 当前选中值
+     * @date 2022年5月25日
      **/
     selecNext: function selecNext(val, type, isDef) {
       var _this31 = this;
@@ -31764,11 +31854,11 @@ function flowvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
       }
     },
 
-    /**
-     * isMultiple
-     * @desc:是否多选
-     * @author liufan
-     * @date 2022年9月13日
+    /**
+     * isMultiple
+     * @desc:是否多选
+     * @author liufan
+     * @date 2022年9月13日
      **/
     isMultiple: function isMultiple(val, choiceOrgId, choiceDeptId, pOrgId) {
       if (val == 2 || val == 4 || val == 6 || val == 16) {
@@ -31793,7 +31883,7 @@ function flowvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
         }
       }
       if (val == 15 || val == 16) {
-        this.params.filid = this.userModel.orgId;
+        this.params.filid = this.pOrgId;
         if (pOrgId) {
           this.params.filid = pOrgId;
         }
@@ -31803,11 +31893,11 @@ function flowvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
       return fun.replace('()', '');
     },
 
-    /**
-     * getHedInfo
-     * @desc:获取审核页面数据
-     * @author liufan
-     * @date 2022年5月25日
+    /**
+     * getHedInfo
+     * @desc:获取审核页面数据
+     * @author liufan
+     * @date 2022年5月25日
      **/
     getHedInfo: function getHedInfo() {
       var _this32 = this;
@@ -32083,7 +32173,6 @@ function flowvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
           // opinion && (this.value = opinion);
           _this32.nextNode.notificationMsg = defaultNotificationMessage;
           _this32.moreList = [];
-          console.log(taskButtonList, 'taskButtonList');
           if (taskButtonList && taskButtonList.length != 0) {
             taskButtonList.map(function (item) {
               if (item.fun === 'reject()') {
@@ -32126,13 +32215,13 @@ function flowvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
       });
     },
 
-    /**
-     * closeProcess
-     * @desc:关闭弹窗
-     * @author liufan
-     * @param {boolean} val 当前是否办理流程
-     * @param {String} type 当前点击的弹窗类型
-     * @date 2022年5月25日
+    /**
+     * closeProcess
+     * @desc:关闭弹窗
+     * @author liufan
+     * @param {boolean} val 当前是否办理流程
+     * @param {String} type 当前点击的弹窗类型
+     * @date 2022年5月25日
      **/
     closeProcess: function closeProcess(val, type, closeParent) {
       if (this.closeParent && !this.startFlowPageEmbeddedIntoStartFlowIndex) {
@@ -32148,27 +32237,32 @@ function flowvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
         this.flowSuccess(true);
         // this.$emit('success');
       } else {
-        this.$emit('cancel');
+        if (type == 'showTaskRead') {
+          !this.simpleTips && this.$message.success('分阅成功');
+          this.$emit('success', 'taskRead');
+        } else {
+          this.$emit('cancel');
+        }
       }
     },
 
-    /**
-     * selectChange
-     * @desc:常用语选择
-     * @author liufan
-     * @param {String} val 选中值
-     * @date 2022年5月25日
+    /**
+     * selectChange
+     * @desc:常用语选择
+     * @author liufan
+     * @param {String} val 选中值
+     * @date 2022年5月25日
      **/
     selectChange: function selectChange(val) {
       this.value = val;
     },
 
-    /**
-     * upDate
-     * @desc:修改常用语
-     * @author liufan
-     * @param {Object} val 修改值
-     * @date 2022年5月25日
+    /**
+     * upDate
+     * @desc:修改常用语
+     * @author liufan
+     * @param {Object} val 修改值
+     * @date 2022年5月25日
      **/
     upDate: function upDate(val) {
       this.FormData.id = val.id;
@@ -32176,11 +32270,11 @@ function flowvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
     },
 
 
-    /**
-     * getProcess
-     * @desc:获取选择流程
-     * @author liufan
-     * @date 2022年5月25日
+    /**
+     * getProcess
+     * @desc:获取选择流程
+     * @author liufan
+     * @date 2022年5月25日
      **/
     getProcess: function getProcess(val) {
       var _this33 = this;
@@ -32192,6 +32286,9 @@ function flowvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
         isOnly: true,
         hideTempSave: true
       }, this.param);
+      if (this.ownerType) {
+        params.ownerType = this.ownerType;
+      }
       this.loading = util["a" /* default */].loading(this.$loading, '加载中...');
       util["a" /* default */].ajax({ url: api["gb" /* getProcessDefList */], params: params }).then(function (res) {
         var status = res.status,
@@ -32240,11 +32337,11 @@ function flowvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
       });
     },
 
-    /**
-     * getPendedhistoryList
-     * @desc:获取流程列表
-     * @author liufan
-     * @date 2022年5月25日
+    /**
+     * getPendedhistoryList
+     * @desc:获取流程列表
+     * @author liufan
+     * @date 2022年5月25日
      **/
     getPendedhistoryList: function getPendedhistoryList() {
       var _this34 = this;
@@ -32312,28 +32409,9 @@ function flowvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
     },
 
     // 提交流程前验证
-    beforeSubProcess: function beforeSubProcess() {},
-
-    // 提交流程
-    /**
-     * subProcess
-     * @desc:提交流程
-     * @author liufan
-     * @param {String} formName 当前form表单ref值
-     * @date 2022年5月25日
-     **/
-    subProcess: function subProcess(val, type) {
+    beforeSubProcess: function beforeSubProcess(val, type) {
       var _this36 = this;
 
-      if (this.btnType != 'default') {
-        if (this.btnType == 'reject' && this.$refs[this.btnType].rejectObj.length == 0) {
-          warning('暂无可驳回节点及对象');
-          return;
-        }
-        console.log('taskReadBtn', this.btnType);
-        this.$refs[this.btnType].subProcess('nextNode');
-        return;
-      }
       return this.$refs['nextNode'].validate(function (valid) {
         if (valid) {
           if (_this36.isSubmitButtonShowAgreeAndDisagree == 1) {
@@ -32354,6 +32432,7 @@ function flowvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
           //   this.reqCircularRead(type);
           //   return;
           // }
+
           if (_this36.submitButtonFunKey) {
             var btnInfo = _this36.taskNodeButtons.filter(function (x) {
               return x.key === _this36.submitButtonFunKey;
@@ -32374,13 +32453,39 @@ function flowvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
           if (_this36.beforeSubmit == undefined) {
             _this36.subFun(_this36.sendData);
           } else {
-            _this36.beforeSubmit(1).then(function (next) {
-              _this36.sendData();
-            }).catch(function (e) {});
+            _this36.sendData();
           }
         }
       });
     },
+
+    // 提交流程
+    /**
+     * subProcess
+     * @desc:提交流程
+     * @author liufan
+     * @param {String} formName 当前form表单ref值
+     * @date 2022年5月25日
+     **/
+    subProcess: function subProcess(val, type) {
+      var _this37 = this;
+
+      if (this.btnType != 'default') {
+        if (this.btnType == 'reject' && this.$refs[this.btnType].rejectObj.length == 0) {
+          warning('暂无可驳回节点及对象');
+          return;
+        }
+        this.$refs[this.btnType].subProcess('nextNode');
+        return;
+      }
+      if (this.beforeSubmit == undefined) {
+        this.beforeSubProcess(val, type);
+      } else {
+        this.beforeSubmit(1).then(function (next) {
+          _this37.beforeSubProcess(val, type);
+        }).catch(function (e) {});
+      }
+    },
     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) {
@@ -32420,14 +32525,14 @@ function flowvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
       return true;
     },
     flowSuccess: function flowSuccess(hideMessage) {
-      var _this37 = this;
+      var _this38 = this;
 
       if (!this.simpleTips) {
         this.$alert('提交成功', '', {
           confirmButtonText: '确定',
           type: 'success',
           callback: function callback(action) {
-            _this37.$emit('success');
+            _this38.$emit('success');
           }
         });
       } else {
@@ -32438,7 +32543,7 @@ function flowvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
       }
     },
     sendData: function sendData(freetype) {
-      var _this38 = this;
+      var _this39 = this;
 
       if (this.isFlow && !this.nodeInfo.nextNode) {
         this.$message.warning('请选择流程');
@@ -32454,85 +32559,114 @@ function flowvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
       }
       this.$refs['nextNode'].validate(function () {
         var _ref2 = flowvue_type_script_lang_js_asyncToGenerator( /*#__PURE__*/regenerator_default.a.mark(function _callee2(valid) {
-          var nextUserId, addSignUserId, removeSignUserId, str, notificationType, params, isEndUserTask, choiceOrgId, choiceDeptId, pOrgId, taskExamineInfo, currentNodeIsCircularReadNode, needRetrialAuth, circularReadParamsMap, currentNodeEnableItemHandleDescription;
+          var nextUserId, addSignUserId, removeSignUserId, str, i, notificationType, params, isEndUserTask, choiceOrgId, choiceDeptId, pOrgId, taskExamineInfo, currentNodeIsCircularReadNode, needRetrialAuth, circularReadParamsMap, currentNodeEnableItemHandleDescription;
           return regenerator_default.a.wrap(function _callee2$(_context2) {
             while (1) {
               switch (_context2.prev = _context2.next) {
                 case 0:
                   if (!valid) {
-                    _context2.next = 60;
+                    _context2.next = 71;
                     break;
                   }
 
-                  if (!_this38.isFlow) {
+                  if (!_this39.isFlow) {
                     _context2.next = 7;
                     break;
                   }
 
-                  if (!(_this38.isOpinionRequired && !_this38.$refs.commonOpinions.validate())) {
+                  if (!(_this39.isOpinionRequired && !_this39.$refs.commonOpinions.validate())) {
                     _context2.next = 5;
                     break;
                   }
 
-                  _this38.$message.warning('请输入审批意见');
+                  _this39.$message.warning('请输入审批意见');
                   return _context2.abrupt('return');
 
                 case 5:
-                  if (_this38.directCreateCircularReadWhenFlowStarted) {
-                    _this38.circulateVisible = true;
+                  if (_this39.directCreateCircularReadWhenFlowStarted) {
+                    _this39.circulateVisible = true;
                   } else {
-                    _this38.handleVisible = true;
+                    _this39.handleVisible = true;
                   }
                   return _context2.abrupt('return');
 
                 case 7:
                   nextUserId = [];
 
-                  if (_this38.multiple) {
-                    _this38.nextNode.nextUserId && _this38.nextNode.nextUserId.map(function (item) {
+                  if (_this39.multiple) {
+                    _this39.nextNode.nextUserId && _this39.nextNode.nextUserId.map(function (item) {
                       return nextUserId.push(item);
                     });
                   }
                   addSignUserId = [];
 
-                  if (_this38.isCanAddSign && _this38.nextNode.isAddSign == '1') {
-                    _this38.nextNode.addSignUserId.map(function (item) {
+                  if (_this39.isCanAddSign && _this39.nextNode.isAddSign == '1') {
+                    _this39.nextNode.addSignUserId.map(function (item) {
                       addSignUserId.push(item);
                     });
                   }
                   removeSignUserId = [];
 
-                  if (_this38.isCanRemoveSign && _this38.nextNode.isRemoveSign == '1') {
-                    _this38.nextNode.removeSignUserId.map(function (item) {
+                  if (_this39.isCanRemoveSign && _this39.nextNode.isRemoveSign == '1') {
+                    _this39.nextNode.removeSignUserId.map(function (item) {
                       removeSignUserId.push(item);
                     });
                   }
                   str = '';
 
-                  if (_this38.value) {
-                    str = _this38.value.replace(/\s+/g, '');
+                  if (_this39.value) {
+                    str = _this39.value.replace(/\s+/g, '');
                   }
-                  if ((!_this38.value || str === '') && _this38.nodeDefaultSubmitOpinion) {
-                    _this38.value = _this38.nodeDefaultSubmitOpinion;
+                  if ((!_this39.value || str === '') && _this39.nodeDefaultSubmitOpinion) {
+                    _this39.value = _this39.nodeDefaultSubmitOpinion;
                   }
-                  if (!_this38.isSpecial) {
-                    delete _this38.nextNode.nextOperate;
-                    delete _this38.nextNode.nextNodeId;
+                  if (!_this39.isSpecial) {
+                    delete _this39.nextNode.nextOperate;
+                    delete _this39.nextNode.nextNodeId;
                   }
-                  if (_this38.nextNode.nextOperate === 9 || _this38.oldNextOperate == 9) {
-                    _this38.nextNode.isReturnRejectNode = 1;
-                    _this38.nextNode.processDefinitionId = _this38.processObj.taskExamine.processDefinitionId;
+                  if (_this39.nextNode.nextOperate === 9 || _this39.oldNextOperate == 9) {
+                    _this39.nextNode.isReturnRejectNode = 1;
+                    _this39.nextNode.processDefinitionId = _this39.processObj.taskExamine.processDefinitionId;
                   }
-                  if (_this38.nextNode.nextOperate != 0 && _this38.nextNode.nextOperate != 1 && _this38.oldNextOperate === '' || _this38.oldNextOperate !== '' && _this38.oldNextOperate != 0 && _this38.oldNextOperate != 1) {
-                    delete _this38.nextNode.nextNodeId;
+                  if (_this39.nextNode.nextOperate != 0 && _this39.nextNode.nextOperate != 1 && _this39.oldNextOperate === '' || _this39.oldNextOperate !== '' && _this39.oldNextOperate != 0 && _this39.oldNextOperate != 1) {
+                    delete _this39.nextNode.nextNodeId;
                   }
 
-                  if (!_this38.isCancelSecondConfirmationType) {
-                    _context2.next = 22;
+                  if (!(_this39.isCustomPreset && _this39.activeNames == '1')) {
+                    _context2.next = 30;
                     break;
                   }
 
-                  _this38.$confirm('确认提交吗?', '提示', {
+                  i = 0;
+
+                case 21:
+                  if (!(i < _this39.presetList.length)) {
+                    _context2.next = 30;
+                    break;
+                  }
+
+                  if (!(_this39.presetList[i].name && _this39.presetList[i].name != '1' && _this39.presetList[i].name != 'endEvent' && (!_this39.presetList[i].value || _this39.presetList[i].value.length == 0))) {
+                    _context2.next = 26;
+                    break;
+                  }
+
+                  return _context2.abrupt('return', _this39.$message.warning('\u9884\u8BBE\u8282\u70B9<\u8282\u70B9' + _this39.presetList[i].sequence + '-' + _this39.presetList[i].label + '>\u5FC5\u987B\u9009\u62E9\u529E\u7406\u4EBA\uFF01'));
+
+                case 26:
+                  delete _this39.presetList[i].label;
+
+                case 27:
+                  i++;
+                  _context2.next = 21;
+                  break;
+
+                case 30:
+                  if (!_this39.isCancelSecondConfirmationType) {
+                    _context2.next = 33;
+                    break;
+                  }
+
+                  _this39.$confirm('确认提交吗?', '提示', {
                     confirmButtonText: '确定',
                     cancelButtonText: '取消',
                     type: 'warning'
@@ -32548,46 +32682,46 @@ function flowvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
                             }
 
                             _context.next = 3;
-                            return _this38.saveInfo('subMit');
+                            return _this39.saveInfo('subMit');
 
                           case 3:
-                            _this38.loading = util["a" /* default */].loading(_this38.$loading, '加载中...');
+                            _this39.loading = util["a" /* default */].loading(_this39.$loading, '加载中...');
 
                           case 4:
                             notificationType = '';
 
-                            notificationType = _this38.nextNode.notificationType.join(',');
+                            notificationType = _this39.nextNode.notificationType.join(',');
                             addSignUserId = addSignUserId.join(',');
                             removeSignUserId = removeSignUserId.join(',');
-                            if (!_this38.isCanPreAddSign || _this38.nextNode.isAddSign != '1') {
-                              delete _this38.nextNode.addSignMode;
+                            if (!_this39.isCanPreAddSign || _this39.nextNode.isAddSign != '1') {
+                              delete _this39.nextNode.addSignMode;
                             }
 
-                            params = flowvue_type_script_lang_js_extends({}, _this38.nextNode, {
-                              nextOperate: _this38.oldNextOperate !== '' ? _this38.oldNextOperate : _this38.nextNode.nextOperate,
-                              pendingId: _this38.pendingId,
-                              opinion: _this38.isForceDisplayDefaultOptionForPrefix && !_this38.value.startsWith(_this38.nodeDefaultSubmitOpinion) ? _this38.nodeDefaultSubmitOpinion + _this38.value : _this38.value,
+                            params = flowvue_type_script_lang_js_extends({}, _this39.nextNode, {
+                              nextOperate: _this39.oldNextOperate !== '' ? _this39.oldNextOperate : _this39.nextNode.nextOperate,
+                              pendingId: _this39.pendingId,
+                              opinion: _this39.isForceDisplayDefaultOptionForPrefix && !_this39.value.startsWith(_this39.nodeDefaultSubmitOpinion) ? _this39.nodeDefaultSubmitOpinion + _this39.value : _this39.value,
                               userId: util["a" /* default */].getStorage('userId'),
-                              nextUserId: _this38.multiple ? nextUserId.join(',') : _this38.nextNode.nextUserId,
+                              nextUserId: _this39.multiple ? nextUserId.join(',') : _this39.nextNode.nextUserId,
                               addSignUserId: addSignUserId,
-                              customPresetUserJson: JSON.stringify(_this38.presetList),
-                              presetUserJson: JSON.stringify(_this38.presetUserJson),
+                              customPresetUserJson: JSON.stringify(_this39.presetList),
+                              presetUserJson: JSON.stringify(_this39.presetUserJson),
                               removeSignUserId: removeSignUserId,
-                              nextReadUserId: _this38.readMultiple ? _this38.mixReadList && _this38.mixReadList.join('|') : _this38.nextNode.nextReadUserId,
-                              nextOrgId: !_this38.isShowNextUser ? _this38.multiple ? _this38.mixOrgIdList && _this38.mixOrgIdList.join('|') : _this38.nextNode.nextOrgId : '',
-                              presetReadUserId: _this38.mixPresetList && _this38.mixPresetList.length > 0 ? _this38.mixPresetList.join('|') : _this38.nextNode.presetReadUserId.join(','),
+                              nextReadUserId: _this39.readMultiple ? _this39.mixReadList ? _this39.mixReadList.join('|') : '' : _this39.nextNode.nextReadUserId.join(','),
+                              nextOrgId: !_this39.isShowNextUser ? _this39.multiple ? _this39.mixOrgIdList && _this39.mixOrgIdList.join('|') : _this39.nextNode.nextOrgId : '',
+                              presetReadUserId: _this39.mixPresetList && _this39.mixPresetList.length > 0 ? _this39.mixPresetList.join('|') : _this39.nextNode.presetReadUserId.join(','),
                               notificationType: notificationType
                             });
 
-                            if (_this38.activeNames != '1') delete params.customPresetUserJson;
+                            if (_this39.activeNames != '1' || !_this39.isCustomPreset) delete params.customPresetUserJson;
                             delete params.customLimitTimeText;
-                            if (_this38.nextNode.isRemoveSign != '1') {
+                            if (_this39.nextNode.isRemoveSign != '1') {
                               delete params.removeSignUserId;
                             }
-                            if (_this38.nextNode.isAddSign != '1') {
+                            if (_this39.nextNode.isAddSign != '1') {
                               delete params.addSignUserId;
                             }
-                            if (!_this38.isSpecial) {
+                            if (!_this39.isSpecial) {
                               delete params.nextUserId;
                             }
 
@@ -32596,13 +32730,13 @@ function flowvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
                               break;
                             }
 
-                            params.isSubFlow = _this38.taskExamineInfo.isSubFlow;
-                            _this38.taskParams = params;
+                            params.isSubFlow = _this39.taskExamineInfo.isSubFlow;
+                            _this39.taskParams = params;
                             return _context.abrupt('return');
 
                           case 19:
-                            _this38.loading = util["a" /* default */].loading(_this38.$loading, '提交中...');
-                            isEndUserTask = _this38.isEndUserTask, choiceOrgId = _this38.choiceOrgId, choiceDeptId = _this38.choiceDeptId, pOrgId = _this38.pOrgId, taskExamineInfo = _this38.taskExamineInfo, currentNodeIsCircularReadNode = _this38.currentNodeIsCircularReadNode, needRetrialAuth = _this38.needRetrialAuth, circularReadParamsMap = _this38.circularReadParamsMap, currentNodeEnableItemHandleDescription = _this38.currentNodeEnableItemHandleDescription;
+                            _this39.loading = util["a" /* default */].loading(_this39.$loading, '提交中...');
+                            isEndUserTask = _this39.isEndUserTask, choiceOrgId = _this39.choiceOrgId, choiceDeptId = _this39.choiceDeptId, pOrgId = _this39.pOrgId, taskExamineInfo = _this39.taskExamineInfo, currentNodeIsCircularReadNode = _this39.currentNodeIsCircularReadNode, needRetrialAuth = _this39.needRetrialAuth, circularReadParamsMap = _this39.circularReadParamsMap, currentNodeEnableItemHandleDescription = _this39.currentNodeEnableItemHandleDescription;
 
                             params.isEndUserTask = isEndUserTask;
                             params.choiceOrgId = choiceOrgId;
@@ -32626,17 +32760,17 @@ function flowvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
                               var status = res.status,
                                   message = res.message;
 
-                              _this38.loading.close();
+                              _this39.loading.close();
                               if (status === 'success') {
-                                _this38.flowSuccess();
+                                _this39.flowSuccess();
                               } else {
-                                _this38.$message.error(message || '系统错误，请联系管理员！');
-                                _this38.$emit('error');
+                                _this39.$message.error(message || '系统错误，请联系管理员！');
+                                _this39.$emit('error');
                               }
                             }).catch(function (err) {
-                              _this38.loading.close();
+                              _this39.loading.close();
                               if (err.message && err.message !== 'canceled') {
-                                _this38.$message.error(err.message);
+                                _this39.$message.error(err.message);
                               }
                             }));
 
@@ -32645,72 +32779,72 @@ function flowvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
                             return _context.stop();
                         }
                       }
-                    }, _callee, _this38);
+                    }, _callee, _this39);
                   })));
                   return _context2.abrupt('return');
 
-                case 22:
+                case 33:
                   if (!(freetype != 'multiInsMidwayWithSubmitScene')) {
-                    _context2.next = 26;
+                    _context2.next = 37;
                     break;
                   }
 
-                  _context2.next = 25;
-                  return _this38.saveInfo('subMit');
+                  _context2.next = 36;
+                  return _this39.saveInfo('subMit');
 
-                case 25:
-                  _this38.loading = util["a" /* default */].loading(_this38.$loading, '加载中...');
+                case 36:
+                  _this39.loading = util["a" /* default */].loading(_this39.$loading, '加载中...');
 
-                case 26:
+                case 37:
                   notificationType = '';
 
-                  notificationType = _this38.nextNode.notificationType.join(',');
+                  notificationType = _this39.nextNode.notificationType.join(',');
                   addSignUserId = addSignUserId.join(',');
                   removeSignUserId = removeSignUserId.join(',');
-                  if (!_this38.isCanPreAddSign || _this38.nextNode.isAddSign != '1') {
-                    delete _this38.nextNode.addSignMode;
+                  if (!_this39.isCanPreAddSign || _this39.nextNode.isAddSign != '1') {
+                    delete _this39.nextNode.addSignMode;
                   }
 
-                  params = flowvue_type_script_lang_js_extends({}, _this38.nextNode, {
-                    nextOperate: _this38.oldNextOperate !== '' ? _this38.oldNextOperate : _this38.nextNode.nextOperate,
-                    pendingId: _this38.pendingId,
-                    opinion: _this38.isForceDisplayDefaultOptionForPrefix && !_this38.value.startsWith(_this38.nodeDefaultSubmitOpinion) ? _this38.nodeDefaultSubmitOpinion + _this38.value : _this38.value,
+                  params = flowvue_type_script_lang_js_extends({}, _this39.nextNode, {
+                    nextOperate: _this39.oldNextOperate !== '' ? _this39.oldNextOperate : _this39.nextNode.nextOperate,
+                    pendingId: _this39.pendingId,
+                    opinion: _this39.isForceDisplayDefaultOptionForPrefix && !_this39.value.startsWith(_this39.nodeDefaultSubmitOpinion) ? _this39.nodeDefaultSubmitOpinion + _this39.value : _this39.value,
                     userId: util["a" /* default */].getStorage('userId'),
-                    nextUserId: _this38.multiple ? nextUserId.join(',') : _this38.nextNode.nextUserId,
+                    nextUserId: _this39.multiple ? nextUserId.join(',') : _this39.nextNode.nextUserId,
                     addSignUserId: addSignUserId,
-                    customPresetUserJson: JSON.stringify(_this38.presetList),
-                    presetUserJson: JSON.stringify(_this38.presetUserJson),
+                    customPresetUserJson: JSON.stringify(_this39.presetList),
+                    presetUserJson: JSON.stringify(_this39.presetUserJson),
                     removeSignUserId: removeSignUserId,
-                    nextReadUserId: _this38.readMultiple ? _this38.mixReadList && _this38.mixReadList.join('|') : _this38.nextNode.nextReadUserId,
-                    nextOrgId: !_this38.isShowNextUser ? _this38.multiple ? _this38.mixOrgIdList && _this38.mixOrgIdList.join('|') : _this38.nextNode.nextOrgId : '',
-                    presetReadUserId: _this38.mixPresetList && _this38.mixPresetList.length > 0 ? _this38.mixPresetList.join('|') : _this38.nextNode.presetReadUserId.join(','),
+                    nextReadUserId: _this39.readMultiple ? _this39.mixReadList ? _this39.mixReadList.join('|') : '' : _this39.nextNode.nextReadUserId.join(','),
+                    nextOrgId: !_this39.isShowNextUser ? _this39.multiple ? _this39.mixOrgIdList && _this39.mixOrgIdList.join('|') : _this39.nextNode.nextOrgId : '',
+                    presetReadUserId: _this39.mixPresetList && _this39.mixPresetList.length > 0 ? _this39.mixPresetList.join('|') : _this39.nextNode.presetReadUserId.join(','),
                     notificationType: notificationType
                   });
 
-                  if (_this38.activeNames != '1') delete params.customPresetUserJson;
+                  if (_this39.activeNames != '1' || !_this39.isCustomPreset) delete params.customPresetUserJson;
                   delete params.customLimitTimeText;
-                  if (_this38.nextNode.isRemoveSign != '1') {
+                  if (_this39.nextNode.isRemoveSign != '1') {
                     delete params.removeSignUserId;
                   }
-                  if (_this38.nextNode.isAddSign != '1') {
+                  if (_this39.nextNode.isAddSign != '1') {
                     delete params.addSignUserId;
                   }
-                  if (!_this38.isSpecial) {
+                  if (!_this39.isSpecial) {
                     delete params.nextUserId;
                   }
 
                   if (!(freetype === 'multiInsMidwayWithSubmitScene')) {
-                    _context2.next = 41;
+                    _context2.next = 52;
                     break;
                   }
 
-                  params.isSubFlow = _this38.taskExamineInfo.isSubFlow;
-                  _this38.taskParams = params;
+                  params.isSubFlow = _this39.taskExamineInfo.isSubFlow;
+                  _this39.taskParams = params;
                   return _context2.abrupt('return');
 
-                case 41:
-                  _this38.loading = util["a" /* default */].loading(_this38.$loading, '提交中...');
-                  isEndUserTask = _this38.isEndUserTask, choiceOrgId = _this38.choiceOrgId, choiceDeptId = _this38.choiceDeptId, pOrgId = _this38.pOrgId, taskExamineInfo = _this38.taskExamineInfo, currentNodeIsCircularReadNode = _this38.currentNodeIsCircularReadNode, needRetrialAuth = _this38.needRetrialAuth, circularReadParamsMap = _this38.circularReadParamsMap, currentNodeEnableItemHandleDescription = _this38.currentNodeEnableItemHandleDescription;
+                case 52:
+                  _this39.loading = util["a" /* default */].loading(_this39.$loading, '提交中...');
+                  isEndUserTask = _this39.isEndUserTask, choiceOrgId = _this39.choiceOrgId, choiceDeptId = _this39.choiceDeptId, pOrgId = _this39.pOrgId, taskExamineInfo = _this39.taskExamineInfo, currentNodeIsCircularReadNode = _this39.currentNodeIsCircularReadNode, needRetrialAuth = _this39.needRetrialAuth, circularReadParamsMap = _this39.circularReadParamsMap, currentNodeEnableItemHandleDescription = _this39.currentNodeEnableItemHandleDescription;
 
                   params.isEndUserTask = isEndUserTask;
                   params.choiceOrgId = choiceOrgId;
@@ -32734,29 +32868,29 @@ function flowvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
                     var status = res.status,
                         message = res.message;
 
-                    _this38.loading.close();
+                    _this39.loading.close();
                     if (status === 'success') {
-                      _this38.flowSuccess();
+                      _this39.flowSuccess();
                     } else {
-                      _this38.$message.error(message || '系统错误，请联系管理员！');
-                      _this38.$emit('error');
+                      _this39.$message.error(message || '系统错误，请联系管理员！');
+                      _this39.$emit('error');
                     }
                   }).catch(function (err) {
-                    _this38.loading.close();
+                    _this39.loading.close();
                     if (err.message && err.message !== 'canceled') {
-                      _this38.$message.error(err.message);
+                      _this39.$message.error(err.message);
                     }
                   }));
 
-                case 60:
+                case 71:
                   return _context2.abrupt('return', false);
 
-                case 61:
+                case 72:
                 case 'end':
                   return _context2.stop();
               }
             }
-          }, _callee2, _this38);
+          }, _callee2, _this39);
         }));
 
         return function (_x) {
@@ -32812,8 +32946,8 @@ function flowvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
 
 var flow_component = Object(componentNormalizer["a" /* default */])(
   src_flowvue_type_script_lang_js_,
-  flowvue_type_template_id_68430d4b_render,
-  flowvue_type_template_id_68430d4b_staticRenderFns,
+  flowvue_type_template_id_f7d7c7c6_render,
+  flowvue_type_template_id_f7d7c7c6_staticRenderFns,
   false,
   null,
   null,
@@ -34121,6 +34255,12 @@ function mainvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
 //
 //
 //
+//
+//
+//
+//
+//
+//
 
 
 
@@ -34161,6 +34301,7 @@ function mainvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
     hideBtn: { type: Boolean, default: false },
     isCirculate: { type: Boolean, default: false },
     newFlow: { type: Boolean, default: false },
+    ownerType: { type: String, default: '' },
     formLabelPosition: {
       type: String,
       default: 'left'
@@ -34246,6 +34387,7 @@ function mainvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
       oldNextOperate: '',
       showOpinion: true,
       submitButtonFunKey: '',
+      showFlowImg: true,
       activitiDefinitionSort: false,
       taskNodeButtons: [],
       taskOperationShiftedNodeList: null,
@@ -34552,6 +34694,12 @@ function mainvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
     }
   },
   methods: {
+    handleButtonClick: function handleButtonClick(val, call) {
+      this.$emit('buttonClick', val, call);
+    },
+    handleErrorImg: function handleErrorImg(type) {
+      this.showFlowImg = type != 'error';
+    },
     sortSuccess: function sortSuccess(list) {
       this.nodeInfo.option = list;
       if (this.defaultProcessKey == '') {
@@ -34643,7 +34791,6 @@ function mainvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
     getNodeInfoForStartFlow: function getNodeInfoForStartFlow(processDefinitionId) {
       var _this4 = this;
 
-      console.log('processDefinitionId', processDefinitionId);
       var params = {
         url: api["bb" /* getNodeInfoForStart */],
         params: { processDefinitionId: processDefinitionId }
@@ -34725,8 +34872,12 @@ function mainvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
         _this6.$refs.esContent.scrollTop += _this6.$refs.messagebox.clientHeight;
       });
     },
-    handleNewFlowSuccess: function handleNewFlowSuccess() {
-      this.$emit('success');
+    handleNewFlowSuccess: function handleNewFlowSuccess(type) {
+      if (type == 'taskRead') {
+        this.$emit('successRead', type);
+      } else {
+        this.$emit('success');
+      }
     },
     freeStartFlowSuccess: function freeStartFlowSuccess() {
       this.showFreeStartFlow = false;
@@ -34734,7 +34885,6 @@ function mainvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
       // this.$emit('success');
     },
     handleChange: function handleChange(val, isForStartFlow) {
-      console.log('handleChange val', val);
       this.getNodeInfoForStartFlow(val, isForStartFlow);
       this.$parent.$emit('flowChange', val);
     },
@@ -35053,11 +35203,11 @@ function mainvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
       });
     },
 
-    /**
-     * saveInfo
-     * @desc:暂存
-     * @author liufan
-     * @date 2022年9月9日
+    /**
+     * saveInfo
+     * @desc:暂存
+     * @author liufan
+     * @date 2022年9月9日
      **/
     saveInfo: function saveInfo(type, btn) {
       var _this14 = this;
@@ -35119,11 +35269,11 @@ function mainvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
       });
     },
 
-    /**
-     * rejectBtn
-     * @desc:点击驳回
-     * @author liufan
-     * @date 2022年5月25日
+    /**
+     * rejectBtn
+     * @desc:点击驳回
+     * @author liufan
+     * @date 2022年5月25日
      **/
     rejectBtn: function rejectBtn() {
       var _this16 = this;
@@ -35141,11 +35291,11 @@ function mainvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
       }
     },
 
-    /**
-     * taskReadBtn
-     * @desc:点击分阅
-     * @author liufan
-     * @date 2022年5月25日
+    /**
+     * taskReadBtn
+     * @desc:点击分阅
+     * @author liufan
+     * @date 2022年5月25日
      **/
     taskReadBtn: function taskReadBtn() {
       var _this17 = this;
@@ -35164,11 +35314,11 @@ function mainvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
       }
     },
 
-    /**
-     * getFind
-     * @desc:获取通知方式
-     * @author liufan
-     * @date 2022年5月25日
+    /**
+     * getFind
+     * @desc:获取通知方式
+     * @author liufan
+     * @date 2022年5月25日
      **/
     getFind: function getFind() {
       var _this18 = this;
@@ -35235,12 +35385,12 @@ function mainvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
       });
     },
 
-    /**
-     * endFlows
-     * @desc:直接办结
-     * @author liufan
-     * @param {Object} res 直接办结数据
-     * @date 2022年5月25日
+    /**
+     * endFlows
+     * @desc:直接办结
+     * @author liufan
+     * @param {Object} res 直接办结数据
+     * @date 2022年5月25日
      **/
     endFlows: function endFlows(res) {
       var _this20 = this;
@@ -35295,12 +35445,12 @@ function mainvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
       }).catch(function (e) {});
     },
 
-    /**
-     * goView
-     * @desc:更多流程按钮操作
-     * @author liufan
-     * @param {Object} res 当前点击操作按钮数据
-     * @date 2022年5月25日
+    /**
+     * goView
+     * @desc:更多流程按钮操作
+     * @author liufan
+     * @param {Object} res 当前点击操作按钮数据
+     * @date 2022年5月25日
      **/
     goView: function goView(res) {
       // 驳回并办结：rejectAndEndHtml
@@ -35343,6 +35493,7 @@ function mainvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
         this.toStartDraf(res);
       } else if (res.fun === 'toTakeAdvice()') {
         //征求意见
+        if (this.isOpinionRequired && !this.value) return this.$message.warning('请选择或输入审批意见');
         this.flowType = 'takeAdvice';
         this.flowMultiple = true;
         this.flowDisabled = false;
@@ -35387,11 +35538,11 @@ function mainvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
       // isCanStartSubFlow
     },
 
-    /**
-     * toTakeAdvice
-     * @desc:征求意见
-     * @author liufan
-     * @date 2022年9月29日
+    /**
+     * toTakeAdvice
+     * @desc:征求意见
+     * @author liufan
+     * @date 2022年9月29日
      **/
     toTakeAdvice: function toTakeAdvice(res) {
       var _this22 = this;
@@ -35435,11 +35586,11 @@ function mainvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
       });
     },
 
-    /**
-     * toStartDraf
-     * @desc: 稿件递送、联合审核、复核
-     * @author liufan
-     * @date 2022年9月29日
+    /**
+     * toStartDraf
+     * @desc: 稿件递送、联合审核、复核
+     * @author liufan
+     * @date 2022年9月29日
      **/
     toStartDraf: function toStartDraf(res) {
       var _this24 = this;
@@ -35453,11 +35604,11 @@ function mainvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
       }
     },
 
-    /**
-     * toSendMsg
-     * @desc:核稿通知
-     * @author liufan
-     * @date 2022年9月29日
+    /**
+     * toSendMsg
+     * @desc:核稿通知
+     * @author liufan
+     * @date 2022年9月29日
      **/
     toSendMsg: function toSendMsg(res) {
       var _this25 = this;
@@ -35471,11 +35622,11 @@ function mainvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
       }
     },
 
-    /**
-     * toTaskReadAndEnd
-     * @desc:分阅并办结
-     * @author liufan
-     * @date 2022年9月29日
+    /**
+     * toTaskReadAndEnd
+     * @desc:分阅并办结
+     * @author liufan
+     * @date 2022年9月29日
      **/
     toTaskReadAndEnd: function toTaskReadAndEnd(res) {
       var _this26 = this;
@@ -35493,11 +35644,11 @@ function mainvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
       }
     },
 
-    /**
-     * rejectAndEnd
-     * @desc:驳回并办结
-     * @author liufan
-     * @date 2022年9月29日
+    /**
+     * rejectAndEnd
+     * @desc:驳回并办结
+     * @author liufan
+     * @date 2022年9月29日
      **/
     rejectAndEnd: function rejectAndEnd(res) {
       var _this27 = this;
@@ -35553,11 +35704,11 @@ function mainvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
       });
     },
 
-    /**
-     * toTransfer
-     * @desc:转办
-     * @author liufan
-     * @date 2022年9月29日
+    /**
+     * toTransfer
+     * @desc:转办
+     * @author liufan
+     * @date 2022年9月29日
      **/
     toTransfer: function toTransfer(res) {
       var _this29 = this;
@@ -35576,11 +35727,11 @@ function mainvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
       this.nextNode.customLimitTime = val;
     },
 
-    /**
-     * getNodeInfo
-     * @desc:获取节点信息
-     * @author liufan
-     * @date 2022年5月25日
+    /**
+     * getNodeInfo
+     * @desc:获取节点信息
+     * @author liufan
+     * @date 2022年5月25日
      **/
     getNodeInfo: function getNodeInfo() {
       var _this30 = this;
@@ -35711,7 +35862,11 @@ function mainvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
               data.globalNodeType === 'endEvent' ? _this30.endFlow = true : '';
             }
           }
-          _this30.isCustomPreset && _this30.$refs.customPreset.getPresetFlowInfo(_this30.nextNode.nextNodeId, _this30.nodeInfo.nextNode, true);
+          if (_this30.isCustomPreset && !_this30.newFlow) {
+            _this30.$nextTick(function () {
+              _this30.$refs.customPreset && _this30.$refs.customPreset.getPresetFlowInfo(_this30.nextNode.nextNodeId, _this30.nodeInfo.nextNode, true);
+            });
+          }
         } else {
           _this30.$message.error(message || '系统错误，请联系管理员！');
         }
@@ -35723,12 +35878,12 @@ function mainvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
       });
     },
 
-    /**
-     * selecNext
-     * @desc:下步节点变化时更新数据
-     * @author liufan
-     * @param {String} val 当前选中值
-     * @date 2022年5月25日
+    /**
+     * selecNext
+     * @desc:下步节点变化时更新数据
+     * @author liufan
+     * @param {String} val 当前选中值
+     * @date 2022年5月25日
      **/
     selecNext: function selecNext(val, type, isDef) {
       var _this31 = this;
@@ -35868,11 +36023,11 @@ function mainvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
       }
     },
 
-    /**
-     * isMultiple
-     * @desc:是否多选
-     * @author liufan
-     * @date 2022年9月13日
+    /**
+     * isMultiple
+     * @desc:是否多选
+     * @author liufan
+     * @date 2022年9月13日
      **/
     isMultiple: function isMultiple(val, choiceOrgId, choiceDeptId, pOrgId) {
       if (val == 2 || val == 4 || val == 6 || val == 16) {
@@ -35896,19 +36051,19 @@ function mainvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
           this.params.filid = choiceOrgId;
         }
       }
-      if (val == 15 || val == 16) {
-        this.params.filid = this.userModel.orgId;
+      if (val == 15) {
+        this.params.filid = this.pOrgId;
         if (pOrgId) {
           this.params.filid = pOrgId;
         }
       }
     },
 
-    /**
-     * getHedInfo
-     * @desc:获取审核页面数据
-     * @author liufan
-     * @date 2022年5月25日
+    /**
+     * getHedInfo
+     * @desc:获取审核页面数据
+     * @author liufan
+     * @date 2022年5月25日
      **/
     getHedInfo: function getHedInfo() {
       var _this32 = this;
@@ -36227,13 +36382,13 @@ function mainvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
       });
     },
 
-    /**
-     * closeProcess
-     * @desc:关闭弹窗
-     * @author liufan
-     * @param {boolean} val 当前是否办理流程
-     * @param {String} type 当前点击的弹窗类型
-     * @date 2022年5月25日
+    /**
+     * closeProcess
+     * @desc:关闭弹窗
+     * @author liufan
+     * @param {boolean} val 当前是否办理流程
+     * @param {String} type 当前点击的弹窗类型
+     * @date 2022年5月25日
      **/
     closeProcess: function closeProcess(val, type, closeParent) {
       if (this.closeParent && !this.startFlowPageEmbeddedIntoStartFlowIndex) {
@@ -36253,23 +36408,23 @@ function mainvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
       }
     },
 
-    /**
-     * selectChange
-     * @desc:常用语选择
-     * @author liufan
-     * @param {String} val 选中值
-     * @date 2022年5月25日
+    /**
+     * selectChange
+     * @desc:常用语选择
+     * @author liufan
+     * @param {String} val 选中值
+     * @date 2022年5月25日
      **/
     selectChange: function selectChange(val) {
       this.value = val;
     },
 
-    /**
-     * upDate
-     * @desc:修改常用语
-     * @author liufan
-     * @param {Object} val 修改值
-     * @date 2022年5月25日
+    /**
+     * upDate
+     * @desc:修改常用语
+     * @author liufan
+     * @param {Object} val 修改值
+     * @date 2022年5月25日
      **/
     upDate: function upDate(val) {
       this.FormData.id = val.id;
@@ -36277,11 +36432,11 @@ function mainvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
     },
 
 
-    /**
-     * getProcess
-     * @desc:获取选择流程
-     * @author liufan
-     * @date 2022年5月25日
+    /**
+     * getProcess
+     * @desc:获取选择流程
+     * @author liufan
+     * @date 2022年5月25日
      **/
     getProcess: function getProcess(val) {
       var _this33 = this;
@@ -36293,6 +36448,9 @@ function mainvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
         isOnly: true,
         hideTempSave: true
       }, this.param);
+      if (this.ownerType) {
+        params.ownerType = this.ownerType;
+      }
       this.loading = util["a" /* default */].loading(this.$loading, '加载中...');
       util["a" /* default */].ajax({ url: api["gb" /* getProcessDefList */], params: params }).then(function (res) {
         var status = res.status,
@@ -36341,11 +36499,11 @@ function mainvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
       });
     },
 
-    /**
-     * getPendedhistoryList
-     * @desc:获取流程列表
-     * @author liufan
-     * @date 2022年5月25日
+    /**
+     * getPendedhistoryList
+     * @desc:获取流程列表
+     * @author liufan
+     * @date 2022年5月25日
      **/
     getPendedhistoryList: function getPendedhistoryList() {
       var _this34 = this;
@@ -36418,12 +36576,12 @@ function mainvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
     beforeSubProcess: function beforeSubProcess() {},
 
     // 提交流程
-    /**
-     * subProcess
-     * @desc:提交流程
-     * @author liufan
-     * @param {String} formName 当前form表单ref值
-     * @date 2022年5月25日
+    /**
+     * subProcess
+     * @desc:提交流程
+     * @author liufan
+     * @param {String} formName 当前form表单ref值
+     * @date 2022年5月25日
      **/
     subProcess: function subProcess(val, type) {
       var _this36 = this;
@@ -36548,13 +36706,13 @@ function mainvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
       }
       this.$refs['nextNode'].validate(function () {
         var _ref2 = mainvue_type_script_lang_js_asyncToGenerator( /*#__PURE__*/regenerator_default.a.mark(function _callee2(valid) {
-          var nextUserId, addSignUserId, removeSignUserId, str, notificationType, params, isEndUserTask, choiceOrgId, choiceDeptId, pOrgId, taskExamineInfo, currentNodeIsCircularReadNode, needRetrialAuth, circularReadParamsMap, currentNodeEnableItemHandleDescription;
+          var nextUserId, addSignUserId, removeSignUserId, str, i, notificationType, params, isEndUserTask, choiceOrgId, choiceDeptId, pOrgId, taskExamineInfo, currentNodeIsCircularReadNode, needRetrialAuth, circularReadParamsMap, currentNodeEnableItemHandleDescription;
           return regenerator_default.a.wrap(function _callee2$(_context2) {
             while (1) {
               switch (_context2.prev = _context2.next) {
                 case 0:
                   if (!valid) {
-                    _context2.next = 60;
+                    _context2.next = 71;
                     break;
                   }
 
@@ -36621,8 +36779,37 @@ function mainvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
                     delete _this38.nextNode.nextNodeId;
                   }
 
+                  if (!(_this38.isCustomPreset && _this38.activeNames == '1')) {
+                    _context2.next = 30;
+                    break;
+                  }
+
+                  i = 0;
+
+                case 21:
+                  if (!(i < _this38.presetList.length)) {
+                    _context2.next = 30;
+                    break;
+                  }
+
+                  if (!(_this38.presetList[i].name && _this38.presetList[i].name != '1' && _this38.presetList[i].name != 'endEvent' && (!_this38.presetList[i].value || _this38.presetList[i].value.length == 0))) {
+                    _context2.next = 26;
+                    break;
+                  }
+
+                  return _context2.abrupt('return', _this38.$message.warning('\u9884\u8BBE\u8282\u70B9<\u8282\u70B9' + _this38.presetList[i].sequence + '-' + _this38.presetList[i].label + '>\u5FC5\u987B\u9009\u62E9\u529E\u7406\u4EBA\uFF01'));
+
+                case 26:
+                  delete _this38.presetList[i].label;
+
+                case 27:
+                  i++;
+                  _context2.next = 21;
+                  break;
+
+                case 30:
                   if (!_this38.isCancelSecondConfirmationType) {
-                    _context2.next = 22;
+                    _context2.next = 33;
                     break;
                   }
 
@@ -36667,13 +36854,13 @@ function mainvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
                               customPresetUserJson: JSON.stringify(_this38.presetList),
                               presetUserJson: JSON.stringify(_this38.presetUserJson),
                               removeSignUserId: removeSignUserId,
-                              nextReadUserId: _this38.readMultiple ? _this38.mixReadList && _this38.mixReadList.join('|') : _this38.nextNode.nextReadUserId,
+                              nextReadUserId: _this38.readMultiple ? _this38.mixReadList ? _this38.mixReadList.join('|') : '' : _this38.nextNode.nextReadUserId.join(','),
                               nextOrgId: !_this38.isShowNextUser ? _this38.multiple ? _this38.mixOrgIdList && _this38.mixOrgIdList.join('|') : _this38.nextNode.nextOrgId : '',
                               presetReadUserId: _this38.mixPresetList && _this38.mixPresetList.length > 0 ? _this38.mixPresetList.join('|') : _this38.nextNode.presetReadUserId.join(','),
                               notificationType: notificationType
                             });
 
-                            if (_this38.activeNames != '1') delete params.customPresetUserJson;
+                            if (_this38.activeNames != '1' || !_this38.isCustomPreset) delete params.customPresetUserJson;
                             delete params.customLimitTimeText;
                             if (_this38.nextNode.isRemoveSign != '1') {
                               delete params.removeSignUserId;
@@ -36743,19 +36930,19 @@ function mainvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
                   })));
                   return _context2.abrupt('return');
 
-                case 22:
+                case 33:
                   if (!(freetype != 'multiInsMidwayWithSubmitScene')) {
-                    _context2.next = 26;
+                    _context2.next = 37;
                     break;
                   }
 
-                  _context2.next = 25;
+                  _context2.next = 36;
                   return _this38.saveInfo('subMit');
 
-                case 25:
+                case 36:
                   _this38.loading = util["a" /* default */].loading(_this38.$loading, '加载中...');
 
-                case 26:
+                case 37:
                   notificationType = '';
 
                   notificationType = _this38.nextNode.notificationType.join(',');
@@ -36775,7 +36962,7 @@ function mainvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
                     customPresetUserJson: JSON.stringify(_this38.presetList),
                     presetUserJson: JSON.stringify(_this38.presetUserJson),
                     removeSignUserId: removeSignUserId,
-                    nextReadUserId: _this38.readMultiple ? _this38.mixReadList && _this38.mixReadList.join('|') : _this38.nextNode.nextReadUserId,
+                    nextReadUserId: _this38.readMultiple ? _this38.mixReadList ? _this38.mixReadList.join('|') : '' : _this38.nextNode.nextReadUserId.join(','),
                     nextOrgId: !_this38.isShowNextUser ? _this38.multiple ? _this38.mixOrgIdList && _this38.mixOrgIdList.join('|') : _this38.nextNode.nextOrgId : '',
                     presetReadUserId: _this38.mixPresetList && _this38.mixPresetList.length > 0 ? _this38.mixPresetList.join('|') : _this38.nextNode.presetReadUserId.join(','),
                     notificationType: notificationType
@@ -36794,7 +36981,7 @@ function mainvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
                   }
 
                   if (!(freetype === 'multiInsMidwayWithSubmitScene')) {
-                    _context2.next = 41;
+                    _context2.next = 52;
                     break;
                   }
 
@@ -36802,7 +36989,7 @@ function mainvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
                   _this38.taskParams = params;
                   return _context2.abrupt('return');
 
-                case 41:
+                case 52:
                   _this38.loading = util["a" /* default */].loading(_this38.$loading, '提交中...');
                   isEndUserTask = _this38.isEndUserTask, choiceOrgId = _this38.choiceOrgId, choiceDeptId = _this38.choiceDeptId, pOrgId = _this38.pOrgId, taskExamineInfo = _this38.taskExamineInfo, currentNodeIsCircularReadNode = _this38.currentNodeIsCircularReadNode, needRetrialAuth = _this38.needRetrialAuth, circularReadParamsMap = _this38.circularReadParamsMap, currentNodeEnableItemHandleDescription = _this38.currentNodeEnableItemHandleDescription;
 
@@ -36842,10 +37029,10 @@ function mainvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
                     }
                   }));
 
-                case 60:
+                case 71:
                   return _context2.abrupt('return', false);
 
-                case 61:
+                case 72:
                 case 'end':
                   return _context2.stop();
               }