eoss-ui 0.6.93 → 0.6.94

package/lib/flow.js

@@ -4485,7 +4485,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=2181006a&
+// 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=531ac436&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -6308,6 +6308,7 @@ var render = function () {
                                 _vm.freeStartFlowNextNode ||
                                 _vm.nodeInfo.nextNode,
                               opinion: _vm.value,
+                              keyCount: _vm.msgTypeCount,
                               pendingId: _vm.pendingId,
                               taskExamineParam:
                                 _vm.freeStartFlowParams
@@ -6350,7 +6351,7 @@ var render = function () {
                             },
                           })
                         : _vm._e(),
-                      !_vm.isFlow && _vm.isSpecial
+                      !_vm.isFlow && _vm.isSpecial && _vm.newsList.length > 0
                         ? _c(
                             "div",
                             {
@@ -7149,7 +7150,7 @@ var render = function () {
                             },
                             on: {
                               cancel: function ($event) {
-                                _vm.closeProcess(true, "showReject")
+                                _vm.closeProcess($event, "showReject")
                               },
                             },
                           }),
@@ -7373,7 +7374,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/flow/src/main.vue?vue&type=template&id=2181006a&
+// CONCATENATED MODULE: ./packages/flow/src/main.vue?vue&type=template&id=531ac436&
 
 // EXTERNAL MODULE: external "babel-runtime/regenerator"
 var regenerator_ = __webpack_require__(4);
@@ -8426,8 +8427,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=1672698e&
-var processFormvue_type_template_id_1672698e_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=e536b88e&
+var processFormvue_type_template_id_e536b88e_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -8899,8 +8900,8 @@ var processFormvue_type_template_id_1672698e_render = function () {
                     {
                       name: "show",
                       rawName: "v-show",
-                      value: _vm.showBtn,
-                      expression: "showBtn",
+                      value: _vm.showBtn && _vm.nextNode.noticeList.length > 0,
+                      expression: "showBtn && nextNode.noticeList.length>0",
                     },
                   ],
                   attrs: { prop: "noticeType", label: "通知方式" },
@@ -9087,7 +9088,7 @@ var processFormvue_type_template_id_1672698e_render = function () {
         ],
         1
       ),
-      !_vm.showBtn
+      !_vm.showBtn && _vm.nextNode.noticeList.length > 0
         ? _c("div", { staticStyle: { padding: "5px", background: "#fff" } }, [
             _c(
               "div",
@@ -9184,11 +9185,11 @@ var processFormvue_type_template_id_1672698e_render = function () {
     1
   )
 }
-var processFormvue_type_template_id_1672698e_staticRenderFns = []
-processFormvue_type_template_id_1672698e_render._withStripped = true
+var processFormvue_type_template_id_e536b88e_staticRenderFns = []
+processFormvue_type_template_id_e536b88e_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/flow/src/processForm.vue?vue&type=template&id=1672698e&
+// CONCATENATED MODULE: ./packages/flow/src/processForm.vue?vue&type=template&id=e536b88e&
 
 // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow/src/selectUser.vue?vue&type=template&id=3d8ca42d&
 var selectUservue_type_template_id_3d8ca42d_render = function () {
@@ -11122,6 +11123,10 @@ var processFormvue_type_script_lang_js_components;
     urgencyLevel: {
       type: [Number, String],
       default: ''
+    },
+    keyCount: {
+      type: [Number, String],
+      default: 0
     }
   },
   data: function data() {
@@ -11224,7 +11229,7 @@ var processFormvue_type_script_lang_js_components;
       handler: function handler(val) {
         var _this = this;
 
-        if (val.length > 0 && this.urgencyLevel && this.msgTypeCount != 0) {
+        if (this.urgencyLevel) {
           this.nextNode.noticeList = val;
           var arr = [];
           this.nextNode.noticeList.map(function (item) {
@@ -11280,7 +11285,9 @@ var processFormvue_type_script_lang_js_components;
     this.getUserInfo();
   },
   mounted: function mounted() {
-    this.getNodeType();
+    if (!this.urgencyLevel) {
+      this.getNodeType();
+    }
     this.getStartFlow(this.processDefinitionId);
     if (this.copyHistory) {
       this.nextNode.newOpinion = this.opinion;
@@ -11907,8 +11914,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_1672698e_render,
-  processFormvue_type_template_id_1672698e_staticRenderFns,
+  processFormvue_type_template_id_e536b88e_render,
+  processFormvue_type_template_id_e536b88e_staticRenderFns,
   false,
   null,
   null,
@@ -11920,8 +11927,8 @@ var processForm_component = Object(componentNormalizer["a" /* default */])(
 // EXTERNAL MODULE: ./packages/flow/src/component/FileList.vue + 4 modules
 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 () {
+// 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=511ef65e&
+var SendMsgvue_type_template_id_511ef65e_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -11952,17 +11959,15 @@ var SendMsgvue_type_template_id_5cb986c6_render = function () {
           _c(
             "el-form-item",
             {
-              attrs: {
-                prop: "notificationType",
-                label: "通知方式",
-                rules: [
-                  {
-                    required: false,
-                    message: "请选择通知方式",
-                    trigger: "blur",
-                  },
-                ],
-              },
+              directives: [
+                {
+                  name: "show",
+                  rawName: "v-show",
+                  value: _vm.notificationList.length != 0,
+                  expression: "notificationList.length != 0",
+                },
+              ],
+              attrs: { prop: "notificationType", label: "通知方式" },
             },
             [
               _c(
@@ -12005,7 +12010,17 @@ var SendMsgvue_type_template_id_5cb986c6_render = function () {
           ),
           _c(
             "el-form-item",
-            { attrs: { prop: "nextNode", label: "通知消息" } },
+            {
+              directives: [
+                {
+                  name: "show",
+                  rawName: "v-show",
+                  value: _vm.notificationList.length != 0,
+                  expression: "notificationList.length != 0",
+                },
+              ],
+              attrs: { prop: "nextNode", label: "通知消息" },
+            },
             [
               _c("el-input", {
                 attrs: {
@@ -12126,11 +12141,11 @@ var SendMsgvue_type_template_id_5cb986c6_render = function () {
     1
   )
 }
-var SendMsgvue_type_template_id_5cb986c6_staticRenderFns = []
-SendMsgvue_type_template_id_5cb986c6_render._withStripped = true
+var SendMsgvue_type_template_id_511ef65e_staticRenderFns = []
+SendMsgvue_type_template_id_511ef65e_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/flow/src/component/SendMsg.vue?vue&type=template&id=5cb986c6&
+// CONCATENATED MODULE: ./packages/flow/src/component/SendMsg.vue?vue&type=template&id=511ef65e&
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow/src/component/SendMsg.vue?vue&type=script&lang=js&
 //
@@ -12225,6 +12240,7 @@ SendMsgvue_type_template_id_5cb986c6_render._withStripped = true
 //
 //
 //
+//
 
 
 
@@ -12387,8 +12403,8 @@ SendMsgvue_type_template_id_5cb986c6_render._withStripped = true
 
 var SendMsg_component = Object(componentNormalizer["a" /* default */])(
   component_SendMsgvue_type_script_lang_js_,
-  SendMsgvue_type_template_id_5cb986c6_render,
-  SendMsgvue_type_template_id_5cb986c6_staticRenderFns,
+  SendMsgvue_type_template_id_511ef65e_render,
+  SendMsgvue_type_template_id_511ef65e_staticRenderFns,
   false,
   null,
   null,
@@ -12796,8 +12812,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=9d3463f6&
-var processRejectvue_type_template_id_9d3463f6_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=4cc2d6c6&
+var processRejectvue_type_template_id_4cc2d6c6_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -12907,17 +12923,15 @@ var processRejectvue_type_template_id_9d3463f6_render = function () {
               _c(
                 "el-form-item",
                 {
-                  attrs: {
-                    prop: "noticeType",
-                    label: "通知方式",
-                    rules: [
-                      {
-                        required: false,
-                        message: "请选择通知方式",
-                        trigger: "blur",
-                      },
-                    ],
-                  },
+                  directives: [
+                    {
+                      name: "show",
+                      rawName: "v-show",
+                      value: _vm.nextNode.noticeList.lemgth != 0,
+                      expression: "nextNode.noticeList.lemgth != 0",
+                    },
+                  ],
+                  attrs: { prop: "noticeType", label: "通知方式" },
                 },
                 [
                   _c(
@@ -13022,11 +13036,11 @@ var processRejectvue_type_template_id_9d3463f6_render = function () {
     1
   )
 }
-var processRejectvue_type_template_id_9d3463f6_staticRenderFns = []
-processRejectvue_type_template_id_9d3463f6_render._withStripped = true
+var processRejectvue_type_template_id_4cc2d6c6_staticRenderFns = []
+processRejectvue_type_template_id_4cc2d6c6_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/flow/src/processReject.vue?vue&type=template&id=9d3463f6&
+// CONCATENATED MODULE: ./packages/flow/src/processReject.vue?vue&type=template&id=4cc2d6c6&
 
 // 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&
 //
@@ -13115,6 +13129,7 @@ processRejectvue_type_template_id_9d3463f6_render._withStripped = true
 //
 //
 //
+//
 
 
 
@@ -13224,6 +13239,7 @@ processRejectvue_type_template_id_9d3463f6_render._withStripped = true
               _this2.simpleTips && _this2.$message.success('操作成功');
             } else {
               _this2.$message.error(message || '系统错误，请联系管理员！');
+              _this2.quit(false);
             }
           }).catch(function (err) {
             _this2.loading = false;
@@ -13279,17 +13295,17 @@ processRejectvue_type_template_id_9d3463f6_render._withStripped = true
         opinion: this.option
       };
       util["a" /* default */].ajax({ url: api["gc" /* toTaskRejectHtml */], params: params }).then(function (res) {
-        var status = res.status,
-            message = res.message,
-            _res$data = res.data,
-            rejectTaskNodes = _res$data.rejectTaskNodes,
-            taskExamine = _res$data.taskExamine,
-            nodeInfoMap = _res$data.nodeInfoMap,
-            notificationMessageReadOnly = _res$data.notificationMessageReadOnly,
-            readOnlyNotificationType = _res$data.readOnlyNotificationType;
 
+        console.log(res, 'resssss');
         _this4.loading = false;
-        if (status === 'success') {
+        if (res.status === 'success') {
+          var _res$data = res.data,
+              rejectTaskNodes = _res$data.rejectTaskNodes,
+              taskExamine = _res$data.taskExamine,
+              nodeInfoMap = _res$data.nodeInfoMap,
+              notificationMessageReadOnly = _res$data.notificationMessageReadOnly,
+              readOnlyNotificationType = _res$data.readOnlyNotificationType;
+
           _this4.isOpinionRequired = nodeInfoMap.nodeExtAttr.isOpinionRequired;
           _this4.readOnlyNotificationType = readOnlyNotificationType;
           _this4.notificationMessageReadOnly = notificationMessageReadOnly == 'true';
@@ -13310,7 +13326,8 @@ processRejectvue_type_template_id_9d3463f6_render._withStripped = true
             _this4.rejectObj.length != 0 && (_this4.nextNode.nextNodeId = _this4.rejectObj[0].id);
           }
         } else {
-          _this4.$message.error(message || '系统错误，请联系管理员！');
+          _this4.$message.error(res.message || '系统错误，请联系管理员！');
+          _this4.quit(false);
         }
       }).catch(function (err) {
         _this4.loading = false;
@@ -13334,8 +13351,8 @@ processRejectvue_type_template_id_9d3463f6_render._withStripped = true
 
 var processReject_component = Object(componentNormalizer["a" /* default */])(
   src_processRejectvue_type_script_lang_js_,
-  processRejectvue_type_template_id_9d3463f6_render,
-  processRejectvue_type_template_id_9d3463f6_staticRenderFns,
+  processRejectvue_type_template_id_4cc2d6c6_render,
+  processRejectvue_type_template_id_4cc2d6c6_staticRenderFns,
   false,
   null,
   null,
@@ -13344,8 +13361,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=4f33d988&
-var startTaskReadvue_type_template_id_4f33d988_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=709ac034&
+var startTaskReadvue_type_template_id_709ac034_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -13642,22 +13659,11 @@ var startTaskReadvue_type_template_id_4f33d988_render = function () {
                     1
                   )
                 : _vm._e(),
-              _vm.configInfo.isCdjxjTaskHandle != "true"
+              _vm.configInfo.isCdjxjTaskHandle != "true" &&
+              _vm.noticeList.length > 0
                 ? _c(
                     "el-form-item",
-                    {
-                      attrs: {
-                        prop: "noticeType",
-                        label: "通知方式",
-                        rules: [
-                          {
-                            required: false,
-                            message: "请选择通知方式",
-                            trigger: "blur",
-                          },
-                        ],
-                      },
-                    },
+                    { attrs: { prop: "noticeType", label: "通知方式" } },
                     [
                       _c(
                         "el-checkbox-group",
@@ -13770,11 +13776,11 @@ var startTaskReadvue_type_template_id_4f33d988_render = function () {
     1
   )
 }
-var startTaskReadvue_type_template_id_4f33d988_staticRenderFns = []
-startTaskReadvue_type_template_id_4f33d988_render._withStripped = true
+var startTaskReadvue_type_template_id_709ac034_staticRenderFns = []
+startTaskReadvue_type_template_id_709ac034_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/flow/src/startTaskRead.vue?vue&type=template&id=4f33d988&
+// CONCATENATED MODULE: ./packages/flow/src/startTaskRead.vue?vue&type=template&id=709ac034&
 
 // 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; };
@@ -13947,9 +13953,6 @@ var startTaskReadvue_type_script_lang_js_components;
 //
 //
 //
-//
-//
-//
 
 
 
@@ -14491,8 +14494,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_4f33d988_render,
-  startTaskReadvue_type_template_id_4f33d988_staticRenderFns,
+  startTaskReadvue_type_template_id_709ac034_render,
+  startTaskReadvue_type_template_id_709ac034_staticRenderFns,
   false,
   null,
   null,
@@ -14501,8 +14504,8 @@ var startTaskRead_component = Object(componentNormalizer["a" /* default */])(
 )
 
 /* harmony default export */ var startTaskRead = (startTaskRead_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/reset.vue?vue&type=template&id=56dca055&
-var resetvue_type_template_id_56dca055_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/reset.vue?vue&type=template&id=f85d1446&
+var resetvue_type_template_id_f85d1446_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -14863,7 +14866,17 @@ var resetvue_type_template_id_56dca055_render = function () {
                 : _vm._e(),
               _c(
                 "el-form-item",
-                { attrs: { prop: "noticeType", label: "通知方式" } },
+                {
+                  directives: [
+                    {
+                      name: "show",
+                      rawName: "v-show",
+                      value: _vm.nextNode.noticeList.length != 0,
+                      expression: "nextNode.noticeList.length != 0",
+                    },
+                  ],
+                  attrs: { prop: "noticeType", label: "通知方式" },
+                },
                 [
                   _vm.showNoticeType
                     ? _c(
@@ -14978,11 +14991,11 @@ var resetvue_type_template_id_56dca055_render = function () {
     1
   )
 }
-var resetvue_type_template_id_56dca055_staticRenderFns = []
-resetvue_type_template_id_56dca055_render._withStripped = true
+var resetvue_type_template_id_f85d1446_staticRenderFns = []
+resetvue_type_template_id_f85d1446_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/flow/src/reset.vue?vue&type=template&id=56dca055&
+// CONCATENATED MODULE: ./packages/flow/src/reset.vue?vue&type=template&id=f85d1446&
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow/src/reset.vue?vue&type=script&lang=js&
 var resetvue_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; };
@@ -15522,10 +15535,10 @@ var resetvue_type_script_lang_js_components;
               nextRoleId = _nextNode.nextRoleId,
               nextOperate = _nextNode.nextOperate,
               newOpinion = _nextNode.newOpinion;
+          // if (noticeType.length === 0) {
+          //   return this.$message.warning('请选择通知方式');
+          // }
 
-          if (noticeType.length === 0) {
-            return _this4.$message.warning('请选择通知方式');
-          }
           if (_this4.nodeInfoExtAttr.nodeType != 1 && _this4.nodeInfoExtAttr.nodeType != 2 && !_this4.showRoleUser) {
             if (_this4.isShowNextUser) {
               if (nextUser == '' || _this4.multiple && nextUser.length == 0) {
@@ -15883,8 +15896,8 @@ var resetvue_type_script_lang_js_components;
 
 var reset_component = Object(componentNormalizer["a" /* default */])(
   src_resetvue_type_script_lang_js_,
-  resetvue_type_template_id_56dca055_render,
-  resetvue_type_template_id_56dca055_staticRenderFns,
+  resetvue_type_template_id_f85d1446_render,
+  resetvue_type_template_id_f85d1446_staticRenderFns,
   false,
   null,
   null,
@@ -15893,8 +15906,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=36d478ba&
-var taskUnionExaminevue_type_template_id_36d478ba_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=7cff7406&
+var taskUnionExaminevue_type_template_id_7cff7406_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -16039,17 +16052,15 @@ var taskUnionExaminevue_type_template_id_36d478ba_render = function () {
           _c(
             "el-form-item",
             {
-              attrs: {
-                prop: "noticeType",
-                label: "通知方式",
-                rules: [
-                  {
-                    required: false,
-                    message: "请选择通知方式",
-                    trigger: "blur",
-                  },
-                ],
-              },
+              directives: [
+                {
+                  name: "show",
+                  rawName: "v-show",
+                  value: _vm.infoList.noticeList.length != 0,
+                  expression: "infoList.noticeList.length != 0",
+                },
+              ],
+              attrs: { prop: "noticeType", label: "通知方式" },
             },
             [
               _c(
@@ -16153,11 +16164,11 @@ var taskUnionExaminevue_type_template_id_36d478ba_render = function () {
     1
   )
 }
-var taskUnionExaminevue_type_template_id_36d478ba_staticRenderFns = []
-taskUnionExaminevue_type_template_id_36d478ba_render._withStripped = true
+var taskUnionExaminevue_type_template_id_7cff7406_staticRenderFns = []
+taskUnionExaminevue_type_template_id_7cff7406_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/flow/src/component/taskUnionExamine.vue?vue&type=template&id=36d478ba&
+// CONCATENATED MODULE: ./packages/flow/src/component/taskUnionExamine.vue?vue&type=template&id=7cff7406&
 
 // 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;
@@ -16294,6 +16305,7 @@ var taskUnionExaminevue_type_script_lang_js_components;
 //
 //
 //
+//
 
 
 
@@ -16742,8 +16754,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_36d478ba_render,
-  taskUnionExaminevue_type_template_id_36d478ba_staticRenderFns,
+  taskUnionExaminevue_type_template_id_7cff7406_render,
+  taskUnionExaminevue_type_template_id_7cff7406_staticRenderFns,
   false,
   null,
   null,
@@ -21554,8 +21566,8 @@ var freeStartFlow_component = Object(componentNormalizer["a" /* default */])(
 )
 
 /* harmony default export */ var freeStartFlow = (freeStartFlow_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/supervise.vue?vue&type=template&id=5fbd4d48&
-var supervisevue_type_template_id_5fbd4d48_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/supervise.vue?vue&type=template&id=8ef7a708&
+var supervisevue_type_template_id_8ef7a708_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -21628,7 +21640,17 @@ var supervisevue_type_template_id_5fbd4d48_render = function () {
           ),
           _c(
             "el-form-item",
-            { attrs: { prop: "noticeType", label: "通知方式" } },
+            {
+              directives: [
+                {
+                  name: "show",
+                  rawName: "v-show",
+                  value: _vm.nextNode.notificationType.length > 0,
+                  expression: "nextNode.notificationType.length > 0",
+                },
+              ],
+              attrs: { prop: "noticeType", label: "通知方式" },
+            },
             [
               _c(
                 "el-checkbox-group",
@@ -21659,7 +21681,17 @@ var supervisevue_type_template_id_5fbd4d48_render = function () {
           ),
           _c(
             "el-form-item",
-            { attrs: { prop: "notifyMessage", label: "通知消息" } },
+            {
+              directives: [
+                {
+                  name: "show",
+                  rawName: "v-show",
+                  value: _vm.nextNode.noticeType.length != 0,
+                  expression: "nextNode.noticeType.length != 0",
+                },
+              ],
+              attrs: { prop: "notifyMessage", label: "通知消息" },
+            },
             [
               _c("es-input", {
                 staticStyle: {
@@ -21708,11 +21740,11 @@ var supervisevue_type_template_id_5fbd4d48_render = function () {
     1
   )
 }
-var supervisevue_type_template_id_5fbd4d48_staticRenderFns = []
-supervisevue_type_template_id_5fbd4d48_render._withStripped = true
+var supervisevue_type_template_id_8ef7a708_staticRenderFns = []
+supervisevue_type_template_id_8ef7a708_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/flow/src/supervise.vue?vue&type=template&id=5fbd4d48&
+// CONCATENATED MODULE: ./packages/flow/src/supervise.vue?vue&type=template&id=8ef7a708&
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow/src/supervise.vue?vue&type=script&lang=js&
 var supervisevue_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; };
@@ -21809,11 +21841,11 @@ var supervisevue_type_script_lang_js_extends = Object.assign || function (target
     subProcess: function subProcess() {
       var _this = this;
 
-      if (this.nextNode.noticeType.length == 0) {
-        this.$message.warning('请选择通知方式');
-        return;
-      }
-      if (!this.nextNode.notifyMessage) {
+      // if (this.nextNode.noticeType.length == 0) {
+      //   this.$message.warning('请选择通知方式');
+      //   return;
+      // }
+      if (this.nextNode.noticeType.length != 0 && !this.nextNode.notifyMessage) {
         this.$message.warning('请填写通知消息内容');
         return;
       }
@@ -21857,12 +21889,19 @@ var supervisevue_type_script_lang_js_extends = Object.assign || function (target
         }
       }).then(function (res) {
         _this2.loading.close();
-        if (res.rCode == 0) {
+        if (res.rCode == 0 || res.status == "success") {
           _this2.nextNode = supervisevue_type_script_lang_js_extends({}, _this2.nextNode, res.results);
+          var arr = [];
           _this2.nextNode.noticeType = res.results.defaultNotificationType.split(',');
+          _this2.nextNode.notificationType.map(function (x) {
+            if (_this2.nextNode.noticeType.indexOf(x.cciValue) != -1) {
+              arr.push(x.cciValue);
+            }
+          });
+          _this2.nextNode.noticeType = arr;
         } else {
           _this2.$message({
-            message: res.rMsg,
+            message: res.msg || res.message,
             type: 'error'
           });
           _this2.$emit('cancel');
@@ -21883,8 +21922,8 @@ var supervisevue_type_script_lang_js_extends = Object.assign || function (target
 
 var supervise_component = Object(componentNormalizer["a" /* default */])(
   src_supervisevue_type_script_lang_js_,
-  supervisevue_type_template_id_5fbd4d48_render,
-  supervisevue_type_template_id_5fbd4d48_staticRenderFns,
+  supervisevue_type_template_id_8ef7a708_render,
+  supervisevue_type_template_id_8ef7a708_staticRenderFns,
   false,
   null,
   null,
@@ -21893,8 +21932,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=858cd6e2&
-var Circulatevue_type_template_id_858cd6e2_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=46ad7cd0&
+var Circulatevue_type_template_id_46ad7cd0_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -21970,17 +22009,15 @@ var Circulatevue_type_template_id_858cd6e2_render = function () {
           _c(
             "el-form-item",
             {
-              attrs: {
-                prop: "noticeType",
-                label: "通知方式",
-                rules: [
-                  {
-                    required: false,
-                    message: "请选择通知方式",
-                    trigger: "blur",
-                  },
-                ],
-              },
+              directives: [
+                {
+                  name: "show",
+                  rawName: "v-show",
+                  value: _vm.infoList.noticeList != 0,
+                  expression: "infoList.noticeList != 0",
+                },
+              ],
+              attrs: { prop: "noticeType", label: "通知方式" },
             },
             [
               _c(
@@ -22087,11 +22124,11 @@ var Circulatevue_type_template_id_858cd6e2_render = function () {
     1
   )
 }
-var Circulatevue_type_template_id_858cd6e2_staticRenderFns = []
-Circulatevue_type_template_id_858cd6e2_render._withStripped = true
+var Circulatevue_type_template_id_46ad7cd0_staticRenderFns = []
+Circulatevue_type_template_id_46ad7cd0_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/flow/src/component/Circulate.vue?vue&type=template&id=858cd6e2&
+// CONCATENATED MODULE: ./packages/flow/src/component/Circulate.vue?vue&type=template&id=46ad7cd0&
 
 // 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;
@@ -22181,6 +22218,8 @@ var Circulatevue_type_script_lang_js_components;
 //
 //
 //
+//
+//
 
 
 
@@ -22405,7 +22444,8 @@ var Circulatevue_type_script_lang_js_components;
         params: {
           ccCode: 'notification_type',
           userId: util["a" /* default */].getStorage('userId'),
-          pendingId: this.pendingId
+          pendingId: this.pendingId,
+          startCircularRead: true
         }
       }).then(function (res) {
         var status = res.status,
@@ -22497,8 +22537,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_858cd6e2_render,
-  Circulatevue_type_template_id_858cd6e2_staticRenderFns,
+  Circulatevue_type_template_id_46ad7cd0_render,
+  Circulatevue_type_template_id_46ad7cd0_staticRenderFns,
   false,
   null,
   null,
@@ -23625,6 +23665,7 @@ function mainvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
 //
 //
 //
+//
 
 
 
@@ -23898,6 +23939,7 @@ function mainvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
     isCirculate: {
       handler: function handler(val) {
         if (!val && this.showCirculate != undefined) {
+          this.showCirculate = val;
           this.getInfo();
         }
         this.showCirculate = val;
@@ -24026,7 +24068,11 @@ function mainvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
     },
     getInfo: function getInfo() {
       if (this.typeCode == 'supervise' || this.typeCode == 'read') return;
-      this.getNodeType();
+      if (this.showCirculate != undefined && !this.showCirculate && this.urgencyLevel) {
+        this.getAdminMsgType();
+      } else {
+        this.getNodeType();
+      }
       !this.isFlow && (this.newTypeCode = this.typeCode || this.$route.query.typecode);
       if (this.isFlow) {
         this.businessId && this.getProcess();
@@ -24398,14 +24444,15 @@ function mainvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
     getNodeType: function getNodeType() {
       var _this9 = this;
 
-      util["a" /* default */].ajax({
+      var params = {
         url: api["z" /* findCodeValues */],
         params: {
           ccCode: 'notification_type',
           userId: util["a" /* default */].getStorage('userId'),
           pendingId: this.pendingId
         }
-      }).then(function (res) {
+      };
+      util["a" /* default */].ajax(params).then(function (res) {
         var status = res.status,
             data = res.data;
 
@@ -25606,6 +25653,9 @@ function mainvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
             if (_this29.nodeInfo.nextNode) {
               _this29.handleChange(_this29.nodeInfo.nextNode);
             }
+            if (_this29.showCirculate != undefined && !_this29.showCirculate && _this29.urgencyLevel) {
+              _this29.getAdminMsgType();
+            }
           }
         } else {
           _this29.$message.error(message || '系统错误，请联系管理员！');