eoss-ui 0.4.40 → 0.4.42

package/lib/flow.js

@@ -1402,7 +1402,7 @@ var isFunction = function isFunction(obj) {
 };
 
 /**
- * isLogged
+ * isLogined
  * @desc:是否登录（用于路由守卫中）
  * @author huangbo
  * @date 2022年5月7日
@@ -1415,7 +1415,9 @@ var isFunction = function isFunction(obj) {
  * @param {sting} [loginPage] - 第三方登录页面地址
  * @param {boolean} [redirect] - 是否重定向（用于新脚手架）
  **/
-var isLogged = function isLogged(_ref8) {
+var isLogined = function isLogined(_ref8) {
+  var _this = this;
+
   var to = _ref8.to,
       from = _ref8.from,
       next = _ref8.next,
@@ -1459,16 +1461,18 @@ var isLogged = function isLogged(_ref8) {
         data: to.query
       }).then(function (res) {
         if (res.rCode === 0) {
-          switch (res.results.statusCode) {
+          var results = res.results;
+
+          switch (results.statusCode) {
             case 0:
               var storage = getStorage('storage');
               setStorage({
                 type: storage,
                 key: {
-                  ssId: res.results.ssId,
-                  token: res.results.token,
-                  Authorization: res.results.token,
-                  deviceUnique: res.results.deviceUnique
+                  ssId: results.ssId,
+                  token: results.token,
+                  Authorization: results.token,
+                  deviceUnique: results.deviceUnique
                 }
               });
               next();
@@ -1478,7 +1482,7 @@ var isLogged = function isLogged(_ref8) {
             case 2:
               break;
             case 3:
-              var href = res.results.authorizeUrl.replace('{redirectUri}', encodeURIComponent(url));
+              var href = results.authorizeUrl.replace('{redirectUri}', encodeURIComponent(url));
               if (to.query.openType) {
                 switch (to.query.openType) {
                   case 'self':
@@ -1502,6 +1506,25 @@ var isLogged = function isLogged(_ref8) {
                 }
               }
               break;
+            case 4:
+              _this.$alert(results.msg ? results.msg : '账号未绑定，账号密码登录后自动绑定！', '提示', {
+                confirmButtonText: '确定',
+                type: 'error'
+              }).then(function () {
+                sessionStorage.setItem('extUserBindHandleId', results.extUserBindHandleId);
+                window.location.href = delUrlParam({ key: 'code' });
+                if (loginPage) {
+                  win.top.location.replace(loginPage);
+                } else if (document.referrer) {
+                  win.top.location.replace(document.referrer);
+                } else if (win.top.location.href.indexOf('main.html') > -1) {
+                  win.top.location.href = './login.html';
+                } else {
+                  next('/login');
+                }
+              }).catch(function (e) {});
+              break;
+            default:
           }
         } else {
           if (token) {
@@ -1530,6 +1553,9 @@ var isLogged = function isLogged(_ref8) {
     }
   }
 };
+var isLogged = function isLogged(res) {
+  isLogined(res);
+};
 
 /**
  * isObject
@@ -2181,6 +2207,7 @@ var watermark = function watermark(option) {
   indexOfObj: indexOfObj,
   isFunction: isFunction,
   isLogged: isLogged,
+  isLogined: isLogined,
   isObject: isObject,
   jointUrl: jointUrl,
   loadJs: loadJs,
@@ -2873,7 +2900,7 @@ var component = Object(componentNormalizer["a" /* default */])(
 // ESM COMPAT FLAG
 __webpack_require__.r(__webpack_exports__);
 
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow/src/main.vue?vue&type=template&id=6933e740&
+// 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=508a8a72&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -2999,6 +3026,7 @@ var render = function () {
             attrs: {
               opinion: _vm.value,
               isBanInputOpinion: _vm.isBanInputOpinion,
+              nodeFixedOpinionSelectList: _vm.nodeFixedOpinionSelectList,
             },
             on: {
               change: function (val) {
@@ -3484,6 +3512,8 @@ var render = function () {
                                               isCustomUser: !_vm.isShowNextUser
                                                 ? 1
                                                 : _vm.isCustomUser,
+                                              isCurrentNodeForbiddenChangeCandidate:
+                                                _vm.isCurrentNodeForbiddenChangeCandidate,
                                               options: _vm.options,
                                               mix: _vm.multiple,
                                               presetEdit: _vm.presetEdit,
@@ -3650,6 +3680,7 @@ var render = function () {
                     ref: "customPreset",
                     attrs: {
                       nextNode: _vm.nextNode.nextNodeId,
+                      customPresetHintMessage: _vm.customPresetHintMessage,
                       id: _vm.businessIds,
                       processDefinitionId: _vm.nodeInfo.nextNode,
                     },
@@ -3674,6 +3705,7 @@ var render = function () {
                     attrs: {
                       nodeId: _vm.nextNode.nextNodeId,
                       businessId: _vm.businessIds,
+                      customPresetHintMessage: _vm.customPresetHintMessage,
                       processDefinitionId: _vm.nodeInfo.nextNode,
                       presetTaskNodeMap: _vm.presetTaskNodeMap,
                       presetTaskNodeKeyStr: _vm.presetTaskNodeKeyStr,
@@ -3847,7 +3879,9 @@ var render = function () {
                     1
                   )
                 : _vm._e(),
-              _vm.nodeInfos.length > 0 || _vm.nodeInfo.option.length > 0
+              _vm.nodeInfos.length > 0 ||
+              _vm.nodeInfo.option.length > 0 ||
+              _vm.operationList.length > 0
                 ? _c(
                     "div",
                     { staticClass: "es-user-defined" },
@@ -4206,14 +4240,14 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/flow/src/main.vue?vue&type=template&id=6933e740&
+// CONCATENATED MODULE: ./packages/flow/src/main.vue?vue&type=template&id=508a8a72&
 
 // EXTERNAL MODULE: external "babel-runtime/regenerator"
 var regenerator_ = __webpack_require__(9);
 var regenerator_default = /*#__PURE__*/__webpack_require__.n(regenerator_);
 
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow/src/component/CommonOpinions.vue?vue&type=template&id=9185d05c&
-var CommonOpinionsvue_type_template_id_9185d05c_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/CommonOpinions.vue?vue&type=template&id=4e1f4030&
+var CommonOpinionsvue_type_template_id_4e1f4030_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -4223,7 +4257,7 @@ var CommonOpinionsvue_type_template_id_9185d05c_render = function () {
     [
       _c("el-input", {
         attrs: {
-          disabled: _vm.isBanInputOpinion == "1",
+          disabled: _vm.isBanInputOpinion == "1" || _vm.disabled,
           type: "textarea",
           clear: "inp",
           placeholder: "请输入意见",
@@ -4279,7 +4313,11 @@ var CommonOpinionsvue_type_template_id_9185d05c_render = function () {
             1
           ),
           _c("el-button", {
-            attrs: { slot: "append", icon: "el-icon-edit" },
+            attrs: {
+              slot: "append",
+              disabled: _vm.disabled,
+              icon: "el-icon-edit",
+            },
             on: {
               click: function ($event) {
                 _vm.dialogVisible = true
@@ -4378,11 +4416,11 @@ var CommonOpinionsvue_type_template_id_9185d05c_render = function () {
     1
   )
 }
-var CommonOpinionsvue_type_template_id_9185d05c_staticRenderFns = []
-CommonOpinionsvue_type_template_id_9185d05c_render._withStripped = true
+var CommonOpinionsvue_type_template_id_4e1f4030_staticRenderFns = []
+CommonOpinionsvue_type_template_id_4e1f4030_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/flow/src/component/CommonOpinions.vue?vue&type=template&id=9185d05c&
+// CONCATENATED MODULE: ./packages/flow/src/component/CommonOpinions.vue?vue&type=template&id=4e1f4030&
 
 // EXTERNAL MODULE: ./src/config/api.js
 var api = __webpack_require__(1);
@@ -4903,6 +4941,7 @@ var _components;
 //
 //
 //
+//
 
 
 
@@ -4919,6 +4958,7 @@ var _components;
       optionList: [],
       dialogVisible: false,
       addVisible: false,
+      disabled: false,
       FormData: {
         id: null
       }
@@ -4933,10 +4973,21 @@ var _components;
     opinion: {
       type: String,
       default: ''
+    },
+    nodeFixedOpinionSelectList: {
+      type: Array,
+      default: function _default() {
+        return [];
+      }
     }
   },
   mounted: function mounted() {
-    this.getCommonOpion();
+    if (this.nodeFixedOpinionSelectList.length > 0) {
+      this.optionList = this.nodeFixedOpinionSelectList;
+      this.disabled = true;
+    } else {
+      this.getCommonOpion();
+    }
   },
 
   watch: {
@@ -5012,7 +5063,10 @@ var _components;
       var _this2 = this;
 
       var that = this;
-      util["a" /* default */].ajax({ url: api["u" /* findSysParam */], params: { cpName: 'commonOpinionsSelectType' } }).then(function (res) {
+      util["a" /* default */].ajax({
+        url: api["u" /* findSysParam */],
+        params: { cpName: 'commonOpinionsSelectType' }
+      }).then(function (res) {
         if (res.status == 'success') {
           res.data == 2 ? that.value = that.value + val : that.value = val;
         } else {
@@ -5129,8 +5183,8 @@ var _components;
 
 var CommonOpinions_component = Object(componentNormalizer["a" /* default */])(
   component_CommonOpinionsvue_type_script_lang_js_,
-  CommonOpinionsvue_type_template_id_9185d05c_render,
-  CommonOpinionsvue_type_template_id_9185d05c_staticRenderFns,
+  CommonOpinionsvue_type_template_id_4e1f4030_render,
+  CommonOpinionsvue_type_template_id_4e1f4030_staticRenderFns,
   false,
   null,
   null,
@@ -5139,8 +5193,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/processForm.vue?vue&type=template&id=954fcc0c&
-var processFormvue_type_template_id_954fcc0c_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=6cd1221f&
+var processFormvue_type_template_id_6cd1221f_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -5531,6 +5585,7 @@ var processFormvue_type_template_id_954fcc0c_render = function () {
                 ],
                 ref: "customPreset",
                 attrs: {
+                  customPresetHintMessage: _vm.customPresetHintMessage,
                   nextNode: _vm.nextNode.nextNode,
                   id: _vm.id,
                   processDefinitionId: _vm.processDefinitionId,
@@ -5560,6 +5615,7 @@ var processFormvue_type_template_id_954fcc0c_render = function () {
                   },
                 ],
                 attrs: {
+                  customPresetHintMessage: _vm.customPresetHintMessage,
                   nodeId: _vm.nextNode.nextNode,
                   businessId: _vm.id,
                   processDefinitionId: _vm.processDefinitionId,
@@ -5614,14 +5670,14 @@ var processFormvue_type_template_id_954fcc0c_render = function () {
     1
   )
 }
-var processFormvue_type_template_id_954fcc0c_staticRenderFns = []
-processFormvue_type_template_id_954fcc0c_render._withStripped = true
+var processFormvue_type_template_id_6cd1221f_staticRenderFns = []
+processFormvue_type_template_id_6cd1221f_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/flow/src/processForm.vue?vue&type=template&id=954fcc0c&
+// CONCATENATED MODULE: ./packages/flow/src/processForm.vue?vue&type=template&id=6cd1221f&
 
-// 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=3190cc8c&
-var selectUservue_type_template_id_3190cc8c_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=db651118&
+var selectUservue_type_template_id_db651118_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -5646,7 +5702,10 @@ var selectUservue_type_template_id_3190cc8c_render = function () {
               },
             ],
             key: index,
-            attrs: { label: item.id || item.showid },
+            attrs: {
+              disabled: _vm.isCurrentNodeForbiddenChangeCandidate == 1,
+              label: item.id || item.showid,
+            },
             on: {
               change: function ($event) {
                 _vm.cancelSelectUser(true)
@@ -5678,6 +5737,7 @@ var selectUservue_type_template_id_3190cc8c_render = function () {
                 "newRadioList.length > 0 && newMultiple && newPresetEdit != 0",
             },
           ],
+          attrs: { disabled: _vm.isCurrentNodeForbiddenChangeCandidate == 1 },
           on: {
             change: function ($event) {
               _vm.cancelSelectUser(true)
@@ -5719,14 +5779,20 @@ var selectUservue_type_template_id_3190cc8c_render = function () {
             ? _c(
                 "es-selector",
                 {
-                  class: _vm.isCustomUser ? "" : "no-icon",
+                  class:
+                    _vm.isCustomUser &&
+                    _vm.isCurrentNodeForbiddenChangeCandidate == 0
+                      ? ""
+                      : "no-icon",
                   attrs: {
                     "value-type": "string",
                     types: _vm.types,
                     tabs: _vm.tabs,
                     title: _vm.title,
                     mix: _vm.mix,
-                    disabled: !_vm.isCustomUser,
+                    disabled:
+                      !_vm.isCustomUser ||
+                      _vm.isCurrentNodeForbiddenChangeCandidate == 1,
                     filterable: Boolean(_vm.isCustomUser),
                     multiple: _vm.newMultiple,
                     param: _vm.newParams,
@@ -5753,11 +5819,11 @@ var selectUservue_type_template_id_3190cc8c_render = function () {
     2
   )
 }
-var selectUservue_type_template_id_3190cc8c_staticRenderFns = []
-selectUservue_type_template_id_3190cc8c_render._withStripped = true
+var selectUservue_type_template_id_db651118_staticRenderFns = []
+selectUservue_type_template_id_db651118_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/flow/src/selectUser.vue?vue&type=template&id=3190cc8c&
+// CONCATENATED MODULE: ./packages/flow/src/selectUser.vue?vue&type=template&id=db651118&
 
 // 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; };
@@ -5845,6 +5911,12 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
 //
 //
 //
+//
+//
+//
+//
+//
+//
 
 
 
@@ -5874,6 +5946,7 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
       default: false
     },
     isCustomUser: { type: Number, default: 1 },
+    isCurrentNodeForbiddenChangeCandidate: { type: Number, default: 0 },
     options: {
       type: Array,
       default: function _default() {
@@ -6219,8 +6292,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_3190cc8c_render,
-  selectUservue_type_template_id_3190cc8c_staticRenderFns,
+  selectUservue_type_template_id_db651118_render,
+  selectUservue_type_template_id_db651118_staticRenderFns,
   false,
   null,
   null,
@@ -6229,8 +6302,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=2da7bf34&
-var CustomPresetvue_type_template_id_2da7bf34_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=7a0fdf16&
+var CustomPresetvue_type_template_id_7a0fdf16_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -6249,7 +6322,13 @@ var CustomPresetvue_type_template_id_2da7bf34_render = function () {
     [
       _c(
         "el-collapse-item",
-        { attrs: { title: "预设节点信息（折叠不作处理）", name: "1" } },
+        {
+          attrs: {
+            title:
+              _vm.customPresetHintMessage || "预设节点信息（折叠不作处理）",
+            name: "1",
+          },
+        },
         _vm._l(_vm.newPresetList, function (item, index) {
           return _c(
             "div",
@@ -6326,11 +6405,11 @@ var CustomPresetvue_type_template_id_2da7bf34_render = function () {
     1
   )
 }
-var CustomPresetvue_type_template_id_2da7bf34_staticRenderFns = []
-CustomPresetvue_type_template_id_2da7bf34_render._withStripped = true
+var CustomPresetvue_type_template_id_7a0fdf16_staticRenderFns = []
+CustomPresetvue_type_template_id_7a0fdf16_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/flow/src/component/CustomPreset.vue?vue&type=template&id=2da7bf34&
+// CONCATENATED MODULE: ./packages/flow/src/component/CustomPreset.vue?vue&type=template&id=7a0fdf16&
 
 // 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;
@@ -6399,6 +6478,10 @@ var CustomPresetvue_type_script_lang_js_components;
       type: String,
       default: ''
     },
+    customPresetHintMessage: {
+      type: String,
+      default: ''
+    },
     id: {
       type: String,
       default: ''
@@ -6640,8 +6723,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_2da7bf34_render,
-  CustomPresetvue_type_template_id_2da7bf34_staticRenderFns,
+  CustomPresetvue_type_template_id_7a0fdf16_render,
+  CustomPresetvue_type_template_id_7a0fdf16_staticRenderFns,
   false,
   null,
   null,
@@ -6650,8 +6733,8 @@ var CustomPreset_component = Object(componentNormalizer["a" /* default */])(
 )
 
 /* harmony default export */ var CustomPreset = (CustomPreset_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/Preset.vue?vue&type=template&id=931afcb0&
-var Presetvue_type_template_id_931afcb0_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/Preset.vue?vue&type=template&id=62657536&
+var Presetvue_type_template_id_62657536_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -6747,11 +6830,11 @@ var Presetvue_type_template_id_931afcb0_render = function () {
     1
   )
 }
-var Presetvue_type_template_id_931afcb0_staticRenderFns = []
-Presetvue_type_template_id_931afcb0_render._withStripped = true
+var Presetvue_type_template_id_62657536_staticRenderFns = []
+Presetvue_type_template_id_62657536_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/flow/src/component/Preset.vue?vue&type=template&id=931afcb0&
+// CONCATENATED MODULE: ./packages/flow/src/component/Preset.vue?vue&type=template&id=62657536&
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow/src/component/Preset.vue?vue&type=script&lang=js&
 var Presetvue_type_script_lang_js_components;
@@ -6818,6 +6901,10 @@ var Presetvue_type_script_lang_js_components;
       type: String,
       default: ''
     },
+    customPresetHintMessage: {
+      type: String,
+      default: ''
+    },
     presetTaskNodeMap: {
       type: Object,
       default: function _default() {}
@@ -7018,8 +7105,8 @@ var Presetvue_type_script_lang_js_components;
 
 var Preset_component = Object(componentNormalizer["a" /* default */])(
   component_Presetvue_type_script_lang_js_,
-  Presetvue_type_template_id_931afcb0_render,
-  Presetvue_type_template_id_931afcb0_staticRenderFns,
+  Presetvue_type_template_id_62657536_render,
+  Presetvue_type_template_id_62657536_staticRenderFns,
   false,
   null,
   null,
@@ -7285,6 +7372,8 @@ var processFormvue_type_script_lang_js_components;
 //
 //
 //
+//
+//
 
 
 
@@ -7317,6 +7406,7 @@ var processFormvue_type_script_lang_js_components;
       selectUser: false,
       multiple: false,
       readMultiple: true,
+      customPresetHintMessage: '', //流程预设标题
       show: true,
       radioList: [],
       activeNames: '',
@@ -7565,7 +7655,6 @@ var processFormvue_type_script_lang_js_components;
           if (noticeType) {
             newNoticeType = noticeType.join(',');
           }
-
           var params = {
             processDefinitionId: _this3.processDefinitionId,
             nextUserId: _this3.multiple ? newNextUser.join(',') : nextUser,
@@ -7580,7 +7669,7 @@ var processFormvue_type_script_lang_js_components;
             nextOrgId: !_this3.isShowNextUser ? _this3.multiple ? _this3.mixOrgIdList && _this3.mixOrgIdList.join('|') : nextOrgId : '',
             handleExplain: handleExplain,
             presetReadUserId: _this3.mixPresetList && _this3.mixPresetList.length > 0 ? _this3.mixPresetList.join('|') : presetReadUserId.join(','),
-            opinion: newOpinion
+            opinion: _this3.newOpinion || newOpinion
           };
           if (_this3.activeNames != '1') delete params.customPresetUserJson;
           util["a" /* default */].ajax({ url: api["eb" /* register */], method: 'post', data: params }).then(function (res) {
@@ -7783,6 +7872,7 @@ var processFormvue_type_script_lang_js_components;
           }).then(function () {}).catch(function () {
             _this6.quit();
           });
+          _this6.customPresetHintMessage = data.customPresetHintMessage;
           _this6.nextNode.nodeInfo = data.nextNodeList;
           _this6.nextNode.nextNode = data.nextNodeList[0].nodeId;
           _this6.isPreset = data.isPreset;
@@ -7866,8 +7956,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_954fcc0c_render,
-  processFormvue_type_template_id_954fcc0c_staticRenderFns,
+  processFormvue_type_template_id_6cd1221f_render,
+  processFormvue_type_template_id_6cd1221f_staticRenderFns,
   false,
   null,
   null,
@@ -11447,6 +11537,10 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
 //
 //
 //
+//
+//
+//
+//
 
 
 
@@ -11498,6 +11592,8 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
       NodeName: '', // 当前节点值
       radioList: [],
       value: '',
+      nodeFixedOpinionSelectList: [],
+      customPresetHintMessage: '', //流程预设标题
       flowType: '',
       flowDisabled: false,
       activeNames: '',
@@ -11556,6 +11652,7 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
       showTaskUnionExamine: false, //展示联合审核弹窗
       charUrl: util["a" /* default */].win.location.origin,
       endFlow: false, // 是否结束流程
+      isCurrentNodeForbiddenChangeCandidate: 0, //是否禁止选择办理人
       isSubmitButtonShowAgreeAndDisagree: 0, //是否展示同意和不同意按钮
       pointsReadingObj: {
         value: '分阅',
@@ -12397,6 +12494,7 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
 
       if (val === 9) {
         this.isReject = true;
+        this.loading.close();
         return;
       } else {
         this.isReject = false;
@@ -12473,6 +12571,7 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
             nodeInfoMap = _res$data2.nodeInfoMap,
             canRemoveSignUserList = _res$data2.canRemoveSignUserList,
             defaultNotificationMessage = _res$data2.defaultNotificationMessage,
+            customPresetHintMessage = _res$data2.customPresetHintMessage,
             isCanAddSign = _res$data2.isCanAddSign,
             isCanRemoveSign = _res$data2.isCanRemoveSign,
             attachedCode = _res$data2.attachedCode,
@@ -12492,6 +12591,8 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
           _this14.endFlowInfo.pOrgId = pOrgId;
           _this14.canPresetRead = canPresetRead;
           _this14.isCdjxjTaskHandle = isCdjxjTaskHandle;
+
+          _this14.customPresetHintMessage = customPresetHintMessage;
           if (canPresetRead) {
             var ids = nodeInfoMap.nodeExtAttr.presetReadCandinateIds.split(',');
             var names = nodeInfoMap.nodeExtAttr.presetReadCandinateNames.split(',');
@@ -12533,6 +12634,13 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
           }
           _this14.operationList = taskOperations;
           if (nodeInfoMap && JSON.stringify(nodeInfoMap) != '{}') {
+            if (nodeInfoMap.nodeExtAttr.nodeFixedOpinionSelectList) {
+              var notice = JSON.parse(nodeInfoMap.nodeExtAttr.nodeFixedOpinionSelectList);
+              notice.map(function (x) {
+                _this14.nodeFixedOpinionSelectList.push({ content: x });
+              });
+            }
+            _this14.isCurrentNodeForbiddenChangeCandidate = nodeInfoMap.nodeExtAttr.isCurrentNodeForbiddenChangeCandidate;
             _this14.nodeDefaultSubmitOpinion = nodeInfoMap.nodeExtAttr.nodeDefaultSubmitOpinion;
             _this14.isSubmitButtonShowAgreeAndDisagree = nodeInfoMap.nodeExtAttr.isSubmitButtonShowAgreeAndDisagree;
             _this14.isBanInputOpinion = nodeInfoMap.nodeExtAttr.isBanInputOpinion;