eoss-ui 0.6.63 → 0.6.65

package/lib/flow.js

@@ -82,7 +82,7 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 29);
+/******/ 	return __webpack_require__(__webpack_require__.s = 30);
 /******/ })
 /************************************************************************/
 /******/ ([
@@ -100,8 +100,10 @@ module.exports =
 /* harmony import */ var json_bigint__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(7);
 /* harmony import */ var json_bigint__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(json_bigint__WEBPACK_IMPORTED_MODULE_4__);
 /* harmony import */ var _webSocket__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(8);
-/* harmony import */ var eoss_element__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(2);
-/* harmony import */ var eoss_element__WEBPACK_IMPORTED_MODULE_6___default = /*#__PURE__*/__webpack_require__.n(eoss_element__WEBPACK_IMPORTED_MODULE_6__);
+/* harmony import */ var ua_parser_js__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(11);
+/* harmony import */ var ua_parser_js__WEBPACK_IMPORTED_MODULE_6___default = /*#__PURE__*/__webpack_require__.n(ua_parser_js__WEBPACK_IMPORTED_MODULE_6__);
+/* harmony import */ var eoss_element__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(2);
+/* harmony import */ var eoss_element__WEBPACK_IMPORTED_MODULE_7___default = /*#__PURE__*/__webpack_require__.n(eoss_element__WEBPACK_IMPORTED_MODULE_7__);
 
 
 var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
@@ -120,16 +122,17 @@ function _objectWithoutProperties(obj, keys) { var target = {}; for (var i in ob
  **/
 
 /* eslint-disable indent */
-var sm2 = __webpack_require__(12).sm2;
-var lodash = __webpack_require__(11);
+var sm2 = __webpack_require__(13).sm2;
+var lodash = __webpack_require__(12);
 
 
 
 
 
 
-var win = window.__WUJIE_RAW_WINDOW__ ? window.__WUJIE_RAW_WINDOW__ : window;
 
+var win = window.__WUJIE_RAW_WINDOW__ ? window.__WUJIE_RAW_WINDOW__ : window;
+var parser = new ua_parser_js__WEBPACK_IMPORTED_MODULE_6__["UAParser"]();
 var $hueStep = 2;
 var $saturationStep1 = 0.16;
 var $saturationStep2 = 0.05;
@@ -266,7 +269,7 @@ var ajax = function ajax(_ref) {
               clearTimeout(loginMsg);
               loginMsg = setTimeout(function () {
                 sessionStorage.setItem('remind', 1);
-                eoss_element__WEBPACK_IMPORTED_MODULE_6__["MessageBox"].confirm(response.data.rCode === 69 ? '该账号在其他地方已登陆!' : '登录已过期，请重新登录!', '提示', response.data.rCode === 69 ? {
+                eoss_element__WEBPACK_IMPORTED_MODULE_7__["MessageBox"].confirm(response.data.rCode === 69 ? '该账号在其他地方已登陆!' : '登录已过期，请重新登录!', '提示', response.data.rCode === 69 ? {
                   confirmButtonText: '确定',
                   closeOnClickModal: false,
                   type: 'warning'
@@ -317,7 +320,7 @@ var ajax = function ajax(_ref) {
         } else if (response.data.rCode === 61) {
           clearTimeout(initAuth);
           initAuth = setTimeout(function () {
-            Object(eoss_element__WEBPACK_IMPORTED_MODULE_6__["MessageBox"])({
+            Object(eoss_element__WEBPACK_IMPORTED_MODULE_7__["MessageBox"])({
               title: '请进行二次鉴权',
               closeOnClickModal: false,
               closeOnPressEscape: false,
@@ -2406,7 +2409,7 @@ var isLogined = function () {
               break;
             }
 
-            loadingInstance = eoss_element__WEBPACK_IMPORTED_MODULE_6__["Loading"].service({ text: '页面加载中', spinner: 'el-icon-loading', background: 'rgba(0, 0, 0, 0.65)' });
+            loadingInstance = eoss_element__WEBPACK_IMPORTED_MODULE_7__["Loading"].service({ text: '页面加载中', spinner: 'el-icon-loading', background: 'rgba(0, 0, 0, 0.65)' });
             _context.next = 17;
             return ajax({
               method: 'post',
@@ -2462,7 +2465,7 @@ var isLogined = function () {
                     }
                     break;
                   case 4:
-                    eoss_element__WEBPACK_IMPORTED_MODULE_6__["MessageBox"].alert(results.msg ? results.msg : '账号未绑定，账号密码登录后自动绑定！', '提示', {
+                    eoss_element__WEBPACK_IMPORTED_MODULE_7__["MessageBox"].alert(results.msg ? results.msg : '账号未绑定，账号密码登录后自动绑定！', '提示', {
                       confirmButtonText: '确定',
                       type: 'error',
                       callback: function callback() {
@@ -2486,7 +2489,7 @@ var isLogined = function () {
                   default:
                 }
               } else {
-                eoss_element__WEBPACK_IMPORTED_MODULE_6__["MessageBox"].alert(res.msg, '提示', {
+                eoss_element__WEBPACK_IMPORTED_MODULE_7__["MessageBox"].alert(res.msg, '提示', {
                   confirmButtonText: '确定',
                   type: 'error',
                   callback: function callback() {
@@ -2657,7 +2660,7 @@ var loadJs = function loadJs(_ref13) {
  **/
 var loading = function loading($loading, res) {
   if (!$loading) {
-    $loading = eoss_element__WEBPACK_IMPORTED_MODULE_6__["Loading"].service;
+    $loading = eoss_element__WEBPACK_IMPORTED_MODULE_7__["Loading"].service;
   }
   if (isObject(res)) {
     var config = extend({}, {
@@ -3497,6 +3500,7 @@ var watermark = function watermark(option) {
   trimWhitespace: trimWhitespace,
   toFixed: toFixed,
   toFunction: toFunction,
+  parser: parser,
   updateTheme: updateTheme,
   upperCase: upperCase,
   urlJoinParams: urlJoinParams,
@@ -3799,15 +3803,15 @@ var toStartTaskRead = '/bpm/bpmBackend/toStartTaskRead';
 // 获取分阅办理页面
 var toStartTaskReadIndex = '/bpm/bpmBackend/toTaskReadIndex';
 // 分阅提交
-var taskReadHtml = 'bpm/task/taskHandle/taskRead.dhtml';
+var taskReadHtml = flowPendingPrefix + '/task/taskHandle/taskRead.dhtml';
 // 驳回并办结
-var rejectAndEnd = '/bpm/task/taskHandle/rejectAndEnd.dhtml';
+var rejectAndEnd = flowPendingPrefix + '/task/taskHandle/rejectAndEnd.dhtml';
 // 核稿通知
 var toSendMsg = '/bpm/bpmBackend/toSendMsgIndex';
 // 核稿通知提交
-var sendMsg = 'bpm/task/taskHandle/sendMsg.dhtml';
+var sendMsg = flowPendingPrefix + '/task/taskHandle/sendMsg.dhtml';
 // 直接办结
-var endFlowHtml = '/bpm/task/taskHandle/endFlow.dhtml';
+var endFlowHtml = flowPendingPrefix + '/task/taskHandle/endFlow.dhtml';
 // 获取用户信息
 // export const findUserBaseInfos = '/api/v1/mecpSys/findUserBaseInfo.dhtml';
 // 搜索用户信息
@@ -3826,11 +3830,11 @@ var getPresetNodeInfo = flowPendingPrefix + '/task/taskHandle/getPresetNodeInfo.
 // 获取转办页面数据
 var toTaskTransferIndex = '/bpm/bpmBackend/toTaskTransferIndex';
 // 转办提交按钮
-var taskTransfer = '/bpm/task/taskHandle/taskTransfer.dhtml';
+var taskTransfer = flowPendingPrefix + '/task/taskHandle/taskTransfer.dhtml';
 // 流程预设列表
 var toPresetInfoListIndex = '/bpm/bpmBackend/toPresetInfoListIndex';
 // 流程预设置为失效
-var deletePresetInfo = '/bpm/task/taskHandle/deletePresetInfo.dhtml';
+var deletePresetInfo = flowPendingPrefix + '/task/taskHandle/deletePresetInfo.dhtml';
 // 流程列表
 var historyListJson = flowPendingPrefix + '/pendedhistoryManager/historyListJson.dhtml';
 // 获取流程列表配置
@@ -3840,15 +3844,15 @@ var pressListJson = flowPendingPrefix + '/wfUrgeRecord/listJson.dhtml';
 // 删除流程列表节点
 var deleteFlow = flowPendingPrefix + '/pendedhistoryManager/delete.dhtml';
 // 是否允许启动子流程(必经节点)
-var isCanStartSubFlow = '/bpm/task/taskHandle/isCanStartSubFlow.dhtml';
+var isCanStartSubFlow = flowPendingPrefix + '/task/taskHandle/isCanStartSubFlow.dhtml';
 // 联合审核
 var toTaskUnionExamine = '/bpm/bpmBackend/toTaskUnionExamine';
 // 联合审核提交
-var taskUnionExamine = '/bpm/task/taskHandle/taskUnionExamine.dhtml';
+var taskUnionExamine = flowPendingPrefix + '/task/taskHandle/taskUnionExamine.dhtml';
 // 征求意见
 var toTaskTakeAdvice = '/bpm/bpmBackend/toTaskTakeAdvice';
 // 征求意见提交
-var taskTakeAdvice = '/bpm/task/taskHandle/taskTakeAdvice.dhtml';
+var taskTakeAdvice = flowPendingPrefix + '/task/taskHandle/taskTakeAdvice.dhtml';
 // 稿件递送
 var toTaskStartDraft = '/bpm/bpmBackend/totaskStartDraft';
 // 获取督办页面信息
@@ -3857,7 +3861,7 @@ var toTaskSupervise = '/bpm/bpmBackend/toTaskSupervise';
 var toTaskSuperviseSub = '/bpm/bpmBackend/taskSupervise';
 // 稿件递送提交接口
 // export const taskStartDraft = flowPendingPrefix + '/task/taskHandle/taskStartDraft.dhtml';
-var taskStartDraft = '/bpm/task/taskHandle/taskStartDraft.dhtml';
+var taskStartDraft = flowPendingPrefix + '/task/taskHandle/taskStartDraft.dhtml';
 // 复核
 var toTaskReview = '/bpm/bpmBackend/toTaskReview';
 // 复核提交
@@ -3865,19 +3869,19 @@ var taskReview = flowPendingPrefix + '/task/taskHandle/taskReview.dhtml';
 // 联合用印
 var toTaskUnionSeal = '/bpm/bpmBackend/toTaskUnionSeal';
 // 联合用印提交
-var taskUnionSeal = '/bpm/task/taskHandle/taskUnionSeal.dhtml';
+var taskUnionSeal = flowPendingPrefix + '/task/taskHandle/taskUnionSeal.dhtml';
 // 报送两办
 var toTwoOfficesDispatch = '/bpm/bpmBackend/toTwoOfficesDispatch';
 // 报送两办提交
-var twoOfficesDispatch = '/bpm/task/taskHandle/twoOfficesDispatch.dhtml';
+var twoOfficesDispatch = flowPendingPrefix + '/task/taskHandle/twoOfficesDispatch.dhtml';
 // 重设流程
 var toResetProcessIndex = '/bpm/bpmBackend/toResetProcessIndex';
 // 提交重设流程
-var resetProcess = '/bpm/task/taskHandle/resetProcess.dhtml';
+var resetProcess = flowPendingPrefix + '/task/taskHandle/resetProcess.dhtml';
 // 续办流程
 var toTaskContinuationIndex = '/bpm/bpmBackend/toTaskContinuationIndex';
 // 续办提交
-var taskContinuation = '/bpm/task/taskHandle/taskContinuation.dhtml';
+var taskContinuation = flowPendingPrefix + '/task/taskHandle/taskContinuation.dhtml';
 // 自由发起流程获取配置参数
 var getFreeStartFlowParams = '/bpm/bpmBackend/getFreeStartFlowParams';
 // 自由发起流程提交
@@ -3910,7 +3914,7 @@ var sendBatch = '/notify2/sendRecord/reSendNotifyMessageBatch';
 
 var formContents = '/lowcode/admin/online/onlineForm/getOnlineFormFromCache';
 var directStartTaskCircularRead = '/bpm/bpmBackend/directStartTaskCircularRead';
-var getNodeInfoForStart = '/bpm/task/taskHandle/getNodeInfoForStart.dhtml';
+var getNodeInfoForStart = flowPendingPrefix + '/task/taskHandle/getNodeInfoForStart.dhtml';
 
 /***/ }),
 /* 2 */
@@ -4204,20 +4208,26 @@ module.exports = require("stompjs");
 /* 11 */
 /***/ (function(module, exports) {
 
-module.exports = require("lodash");
+module.exports = require("ua-parser-js");
 
 /***/ }),
 /* 12 */
 /***/ (function(module, exports) {
 
+module.exports = require("lodash");
+
+/***/ }),
+/* 13 */
+/***/ (function(module, exports) {
+
 module.exports = require("sm-crypto");
 
 /***/ }),
-/* 13 */,
 /* 14 */,
 /* 15 */,
 /* 16 */,
-/* 17 */
+/* 17 */,
+/* 18 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -4393,7 +4403,6 @@ var component = Object(componentNormalizer["a" /* default */])(
 /* harmony default export */ var FileList = __webpack_exports__["a"] = (component.exports);
 
 /***/ }),
-/* 18 */,
 /* 19 */,
 /* 20 */,
 /* 21 */,
@@ -4404,14 +4413,15 @@ var component = Object(componentNormalizer["a" /* default */])(
 /* 26 */,
 /* 27 */,
 /* 28 */,
-/* 29 */
+/* 29 */,
+/* 30 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 // 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=fc4f395a&
+// 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=07497b53&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -4425,7 +4435,132 @@ var render = function () {
           style: _vm.styles,
         },
         [
-          _vm.typeCode == "read"
+          _vm.showCirculate
+            ? _c(
+                "div",
+                [
+                  _c("CommonOpinions", {
+                    directives: [
+                      {
+                        name: "show",
+                        rawName: "v-show",
+                        value: !_vm.shrink,
+                        expression: "!shrink",
+                      },
+                    ],
+                    ref: "commonOpinions",
+                    staticClass: "es-common-opinions",
+                    attrs: {
+                      opinion: _vm.value,
+                      rows: _vm.rows,
+                      required: _vm.isOpinionRequired == 1,
+                      isBanInputOpinion: _vm.isBanInputOpinion,
+                      nodeFixedOpinionSelectList:
+                        _vm.nodeFixedOpinionSelectList,
+                    },
+                    on: {
+                      change: function (val) {
+                        return (_vm.value = val)
+                      },
+                    },
+                  }),
+                  _c(
+                    "el-form",
+                    {
+                      ref: "form",
+                      attrs: {
+                        model: _vm.circulateForm,
+                        "label-width": "120px",
+                      },
+                    },
+                    [
+                      _c(
+                        "el-form-item",
+                        { attrs: { prop: "nextNodeId", label: "下步节点" } },
+                        [
+                          _vm.nextNodeCheckType == "select"
+                            ? _c(
+                                "el-select",
+                                {
+                                  attrs: { placeholder: "请选择下步节点" },
+                                  model: {
+                                    value: _vm.circulateForm.nextNodeId,
+                                    callback: function ($$v) {
+                                      _vm.$set(
+                                        _vm.circulateForm,
+                                        "nextNodeId",
+                                        $$v
+                                      )
+                                    },
+                                    expression: "circulateForm.nextNodeId",
+                                  },
+                                },
+                                [
+                                  _c("el-option", {
+                                    attrs: { label: "传阅", value: "111" },
+                                  }),
+                                ],
+                                1
+                              )
+                            : _vm.nextNodeCheckType == "radio"
+                            ? _c("es-radio-group", {
+                                attrs: {
+                                  data: [{ nodeId: "111", nodeName: "传阅" }],
+                                  "value-key": "nodeId",
+                                  "label-key": "nodeName",
+                                },
+                                model: {
+                                  value: _vm.circulateForm.nextNodeId,
+                                  callback: function ($$v) {
+                                    _vm.$set(
+                                      _vm.circulateForm,
+                                      "nextNodeId",
+                                      $$v
+                                    )
+                                  },
+                                  expression: "circulateForm.nextNodeId",
+                                },
+                              })
+                            : _vm._e(),
+                        ],
+                        1
+                      ),
+                    ],
+                    1
+                  ),
+                  _c("circulate", {
+                    ref: "circulate",
+                    staticStyle: { "margin-top": "10px" },
+                    attrs: {
+                      businessId: _vm.businessId,
+                      showBtn: false,
+                      processDefinitionId: _vm.nodeInfo.nextNode,
+                      simpleTips: _vm.simpleTips,
+                      oldOption: _vm.value,
+                    },
+                    on: {
+                      cancel: function ($event) {
+                        _vm.closeProcess($event, "circulateVisible")
+                      },
+                    },
+                  }),
+                  _c(
+                    "el-button",
+                    {
+                      staticStyle: { width: "100%" },
+                      attrs: { type: "primary" },
+                      on: {
+                        click: function ($event) {
+                          _vm.handleClickCirculate()
+                        },
+                      },
+                    },
+                    [_vm._v("\n      提交\n    ")]
+                  ),
+                ],
+                1
+              )
+            : _vm.typeCode == "read"
             ? _c("StartTaskRead", {
                 key: _vm.StartTaskReadKey,
                 attrs: {
@@ -4767,6 +4902,7 @@ var render = function () {
                                       _c(
                                         "el-select",
                                         {
+                                          key: _vm.optionsKey,
                                           staticStyle: {
                                             width: "calc(100% + 40px)",
                                           },
@@ -4795,6 +4931,7 @@ var render = function () {
                                               key: items.id,
                                               attrs: {
                                                 label: items.name,
+                                                disabled: items.disabled,
                                                 value: items.processDefId,
                                               },
                                             })
@@ -6845,7 +6982,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/flow/src/main.vue?vue&type=template&id=fc4f395a&
+// CONCATENATED MODULE: ./packages/flow/src/main.vue?vue&type=template&id=07497b53&
 
 // EXTERNAL MODULE: external "babel-runtime/regenerator"
 var regenerator_ = __webpack_require__(4);
@@ -10976,7 +11113,7 @@ var processForm_component = Object(componentNormalizer["a" /* default */])(
 
 /* harmony default export */ var processForm = (processForm_component.exports);
 // EXTERNAL MODULE: ./packages/flow/src/component/FileList.vue + 4 modules
-var FileList = __webpack_require__(17);
+var FileList = __webpack_require__(18);
 
 // 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/SendMsg.vue?vue&type=template&id=5cb986c6&
 var SendMsgvue_type_template_id_5cb986c6_render = function () {
@@ -20799,8 +20936,8 @@ var supervise_component = Object(componentNormalizer["a" /* default */])(
 )
 
 /* harmony default export */ var supervise = (supervise_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/Circulate.vue?vue&type=template&id=4f5020b6&
-var Circulatevue_type_template_id_4f5020b6_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/Circulate.vue?vue&type=template&id=cd78d70e&
+var Circulatevue_type_template_id_cd78d70e_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -20962,35 +21099,37 @@ var Circulatevue_type_template_id_4f5020b6_render = function () {
         ],
         1
       ),
-      _c(
-        "div",
-        { staticStyle: { "text-align": "right" } },
-        [
-          _c(
-            "el-button",
-            {
-              attrs: { type: "primary", size: "small" },
-              on: { click: _vm.subMit },
-            },
-            [_vm._v(" 确定 ")]
-          ),
-          _c(
-            "el-button",
-            { attrs: { size: "small" }, on: { click: _vm.quit } },
-            [_vm._v(" 取消 ")]
-          ),
-        ],
-        1
-      ),
+      _vm.showBtn
+        ? _c(
+            "div",
+            { staticStyle: { "text-align": "right" } },
+            [
+              _c(
+                "el-button",
+                {
+                  attrs: { type: "primary", size: "small" },
+                  on: { click: _vm.subMit },
+                },
+                [_vm._v(" 确定 ")]
+              ),
+              _c(
+                "el-button",
+                { attrs: { size: "small" }, on: { click: _vm.quit } },
+                [_vm._v(" 取消 ")]
+              ),
+            ],
+            1
+          )
+        : _vm._e(),
     ],
     1
   )
 }
-var Circulatevue_type_template_id_4f5020b6_staticRenderFns = []
-Circulatevue_type_template_id_4f5020b6_render._withStripped = true
+var Circulatevue_type_template_id_cd78d70e_staticRenderFns = []
+Circulatevue_type_template_id_cd78d70e_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/flow/src/component/Circulate.vue?vue&type=template&id=4f5020b6&
+// CONCATENATED MODULE: ./packages/flow/src/component/Circulate.vue?vue&type=template&id=cd78d70e&
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow/src/component/Circulate.vue?vue&type=script&lang=js&
 var Circulatevue_type_script_lang_js_components;
@@ -21095,6 +21234,7 @@ var Circulatevue_type_script_lang_js_components;
     oldOption: { type: String, default: '' },
     disabled: { type: Boolean, default: false },
     simpleTips: { type: Boolean, default: true },
+    showBtn: { type: Boolean, default: true },
     multiple: { type: Boolean, default: true }
   },
   inheritAttrs: false,
@@ -21132,6 +21272,17 @@ var Circulatevue_type_script_lang_js_components;
       loading: false
     };
   },
+
+  watch: {
+    oldOption: {
+      handler: function handler(val) {
+        this.opinion = val;
+      },
+
+      deep: true,
+      immediate: true
+    }
+  },
   mounted: function mounted() {
     this.loading = true;
     this.newMultiple = this.multiple;
@@ -21315,8 +21466,8 @@ var Circulatevue_type_script_lang_js_components;
 
 var Circulate_component = Object(componentNormalizer["a" /* default */])(
   component_Circulatevue_type_script_lang_js_,
-  Circulatevue_type_template_id_4f5020b6_render,
-  Circulatevue_type_template_id_4f5020b6_staticRenderFns,
+  Circulatevue_type_template_id_cd78d70e_render,
+  Circulatevue_type_template_id_cd78d70e_staticRenderFns,
   false,
   null,
   null,
@@ -22227,7 +22378,56 @@ function mainvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
 //
 //
 //
-
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
 
 
 
@@ -22260,7 +22460,7 @@ function mainvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
     flowTypeCode: { type: String, default: '' },
     defaultProcessKey: { type: String, default: '' },
     hideBtn: { type: Boolean, default: false },
-
+    isCirculate: { type: Boolean, default: false },
     btnList: {
       type: Array,
       default: function _default() {
@@ -22297,6 +22497,9 @@ function mainvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
 
     return _ref = {
       styles: {},
+      optionsKey: 0,
+      showCirculate: false,
+      circulateForm: { nextNodeId: '111' },
       userModel: {},
       simpleTips: true,
       showFreeStartFlow: false, //自由发起流程弹窗
@@ -22444,19 +22647,21 @@ function mainvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
   mounted: function mounted() {
     this.businessIds = this.businessId;
     this.nextNode.nextNodeId = this.nextNodeId;
-    if (this.typeCode == 'supervise' || this.typeCode == 'read') return;
-    this.getNodeType();
-    !this.isFlow && (this.newTypeCode = this.typeCode || this.$route.query.typecode);
-    if (this.isFlow) {
-      this.businessId && this.getProcess();
-    } else if (this.newTypeCode == 'fenyue') {
-      this.getTaskReadFlow();
-    } else if (this.newTypeCode != 'reset' && this.newTypeCode != 'continuation') {
-      this.getHedInfo();
-    }
+    this.getInfo();
   },
 
   watch: {
+    isCirculate: {
+      handler: function handler(val) {
+        this.showCirculate = val;
+        if (!val) {
+          this.getInfo();
+        }
+      },
+
+      deep: true,
+      immediate: true
+    },
     width: {
       immediate: true,
       handler: function handler(val) {
@@ -22550,6 +22755,21 @@ function mainvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
     }
   },
   methods: {
+    getInfo: function getInfo() {
+      if (this.typeCode == 'supervise' || this.typeCode == 'read') return;
+      this.getNodeType();
+      !this.isFlow && (this.newTypeCode = this.typeCode || this.$route.query.typecode);
+      if (this.isFlow) {
+        this.businessId && this.getProcess();
+      } else if (this.newTypeCode == 'fenyue') {
+        this.getTaskReadFlow();
+      } else if (this.newTypeCode != 'reset' && this.newTypeCode != 'continuation') {
+        this.getHedInfo();
+      }
+    },
+    handleClickCirculate: function handleClickCirculate() {
+      this.$refs.circulate.subMit();
+    },
     getNodeInfoForStartFlow: function getNodeInfoForStartFlow(processDefinitionId) {
       var _this = this;
 
@@ -22561,6 +22781,17 @@ function mainvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
         if (res.status == 'success') {
           _this.isBanInputOpinion = res.data.nodeExtAttr.isBanInputOpinion;
           _this.directCreateCircularReadWhenFlowStarted = res.data.nodeExtAttr.directCreateCircularReadWhenFlowStarted == 1;
+
+          if (_this.directCreateCircularReadWhenFlowStarted) {
+            _this.nodeInfo.option.map(function (item) {
+              item.disabled = item.processDefId != processDefinitionId;
+            });
+          } else {
+            _this.nodeInfo.option.map(function (item) {
+              item.disabled = false;
+            });
+          }
+          _this.optionsKey++;
           _this.isOpinionRequired = res.data.nodeExtAttr.isOpinionRequired == 1;
         }
       });
@@ -23518,7 +23749,10 @@ function mainvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
             _this25.presetEdit = data.nodeExtAttr.presetEdit;
             _this25.countersignaturetypeCode = data.countersignaturetypeCode; //是否展示处理方式
             _this25.handleMode = data.countersignaturetypeText;
-            data.globalNodeType === 'endEvent' ? _this25.endFlow = true : '';
+            if (data.globalNodeType === 'endEvent') {
+              _this25.isNextUser = data.globalNodeType != 'endEvent';
+              data.globalNodeType === 'endEvent' ? _this25.endFlow = true : '';
+            }
           }
           _this25.isCustomPreset && _this25.$refs.customPreset.getPresetFlowInfo(_this25.nextNode.nextNodeId, _this25.nodeInfo.nextNode, true);
         } else {
@@ -23557,6 +23791,7 @@ function mainvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
         this.isShowNode = false;
         this.isMainSubProcess = false;
         this.isNodeShowProcess = false;
+        this.endFlow = false;
         this.nextNode.nextNodeId = '';
         this.nextNode.isReturnSubmitter = 0;
         this.nextNode.isUndertakeReply = 0;