eoss-ui 0.6.78 → 0.6.80

package/lib/flow.js

@@ -4469,7 +4469,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=1ebfbd3f&
+// 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=4ea6a802&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -4483,7 +4483,7 @@ var render = function () {
           style: _vm.styles,
         },
         [
-          _vm.showCirculate
+          _vm.showCirculate && _vm.newTypeCode != "fenyue"
             ? _c(
                 "div",
                 {
@@ -5022,7 +5022,9 @@ var render = function () {
                           },
                         },
                         [
-                          _vm.isFlow && _vm.nodeInfo.option.length > 0
+                          _vm.isFlow &&
+                          _vm.nodeInfo.option.length > 0 &&
+                          !_vm.flowListDisabled
                             ? _c(
                                 "el-form-item",
                                 {
@@ -5083,9 +5085,7 @@ var render = function () {
                                               key: items.id,
                                               attrs: {
                                                 label: items.name,
-                                                disabled:
-                                                  _vm.flowListDisabled ||
-                                                  items.disabled,
+                                                disabled: items.disabled,
                                                 value: items.processDefId,
                                               },
                                             })
@@ -7285,7 +7285,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/flow/src/main.vue?vue&type=template&id=1ebfbd3f&
+// CONCATENATED MODULE: ./packages/flow/src/main.vue?vue&type=template&id=4ea6a802&
 
 // EXTERNAL MODULE: external "babel-runtime/regenerator"
 var regenerator_ = __webpack_require__(4);
@@ -8338,8 +8338,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=972ab99a&
-var processFormvue_type_template_id_972ab99a_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=7d7a1c8e&
+var processFormvue_type_template_id_7d7a1c8e_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -8386,6 +8386,14 @@ var processFormvue_type_template_id_972ab99a_render = function () {
               _c(
                 "el-form-item",
                 {
+                  directives: [
+                    {
+                      name: "show",
+                      rawName: "v-show",
+                      value: _vm.showBtn,
+                      expression: "showBtn",
+                    },
+                  ],
                   attrs: {
                     prop: "nodeName",
                     label: "当前节点",
@@ -8798,7 +8806,17 @@ var processFormvue_type_template_id_972ab99a_render = function () {
                 : _vm._e(),
               _c(
                 "el-form-item",
-                { attrs: { prop: "noticeType", label: "通知方式" } },
+                {
+                  directives: [
+                    {
+                      name: "show",
+                      rawName: "v-show",
+                      value: _vm.showBtn,
+                      expression: "showBtn",
+                    },
+                  ],
+                  attrs: { prop: "noticeType", label: "通知方式" },
+                },
                 [
                   _c(
                     "el-checkbox-group",
@@ -8846,8 +8864,8 @@ var processFormvue_type_template_id_972ab99a_render = function () {
                     {
                       name: "show",
                       rawName: "v-show",
-                      value: _vm.nextNode.noticeType.length != 0,
-                      expression: "nextNode.noticeType.length != 0",
+                      value: _vm.nextNode.noticeType.length != 0 && _vm.showBtn,
+                      expression: "nextNode.noticeType.length != 0 && showBtn",
                     },
                   ],
                   attrs: { prop: "nextNode", label: "通知消息" },
@@ -8981,15 +8999,107 @@ var processFormvue_type_template_id_972ab99a_render = function () {
         ],
         1
       ),
+      !_vm.showBtn
+        ? _c("div", { staticStyle: { padding: "5px", background: "#fff" } }, [
+            _c(
+              "div",
+              {
+                staticClass: "news",
+                on: {
+                  click: function ($event) {
+                    _vm.showNews = !_vm.showNews
+                  },
+                },
+              },
+              [
+                _c("span", { staticClass: "news-item" }, [_vm._v("消息通知")]),
+                _c("span", { class: _vm.showNews ? "show" : "sj" }),
+              ]
+            ),
+            _vm.showNews
+              ? _c(
+                  "div",
+                  { ref: "messagebox", staticStyle: { transition: "1s" } },
+                  [
+                    _c(
+                      "el-checkbox-group",
+                      {
+                        model: {
+                          value: _vm.nextNode.noticeType,
+                          callback: function ($$v) {
+                            _vm.$set(_vm.nextNode, "noticeType", $$v)
+                          },
+                          expression: "nextNode.noticeType",
+                        },
+                      },
+                      _vm._l(_vm.nextNode.noticeList, function (item) {
+                        return _c(
+                          "el-checkbox",
+                          {
+                            key: item.cciValue,
+                            attrs: {
+                              label: item.cciValue,
+                              disabled: _vm.readOnlyNotificationType
+                                ? _vm.readOnlyNotificationType.indexOf(
+                                    item.cciValue
+                                  ) != -1
+                                : false,
+                            },
+                          },
+                          [
+                            _vm._v(
+                              "\n              " +
+                                _vm._s(item.shortName) +
+                                "\n            "
+                            ),
+                          ]
+                        )
+                      }),
+                      1
+                    ),
+                    _c("es-input", {
+                      directives: [
+                        {
+                          name: "show",
+                          rawName: "v-show",
+                          value: _vm.showNews,
+                          expression: "showNews",
+                        },
+                      ],
+                      staticStyle: {
+                        "border-color": "#ccc",
+                        padding: "5px",
+                        "border-radius": "5px",
+                        "font-size": "13px",
+                      },
+                      attrs: {
+                        autosize: "",
+                        type: "textarea",
+                        readonly: _vm.notificationMessageReadOnly,
+                      },
+                      model: {
+                        value: _vm.nextNode.noticeInfo,
+                        callback: function ($$v) {
+                          _vm.$set(_vm.nextNode, "noticeInfo", $$v)
+                        },
+                        expression: "nextNode.noticeInfo",
+                      },
+                    }),
+                  ],
+                  1
+                )
+              : _vm._e(),
+          ])
+        : _vm._e(),
     ],
     1
   )
 }
-var processFormvue_type_template_id_972ab99a_staticRenderFns = []
-processFormvue_type_template_id_972ab99a_render._withStripped = true
+var processFormvue_type_template_id_7d7a1c8e_staticRenderFns = []
+processFormvue_type_template_id_7d7a1c8e_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/flow/src/processForm.vue?vue&type=template&id=972ab99a&
+// CONCATENATED MODULE: ./packages/flow/src/processForm.vue?vue&type=template&id=7d7a1c8e&
 
 // 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=49031d93&
 var selectUservue_type_template_id_49031d93_render = function () {
@@ -10785,6 +10895,42 @@ var processFormvue_type_script_lang_js_components;
 //
 //
 //
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
 
 
 
@@ -10850,6 +10996,7 @@ var processFormvue_type_script_lang_js_components;
       customPresetHintMessage: '', //流程预设标题
       nextNodeCheckType: 'select',
       nextOperateCheckType: 'select',
+      showNews: false, // 是否展示通知信息
       notificationMessageReadOnly: false,
       readOnlyNotificationType: '',
       show: true,
@@ -11572,8 +11719,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_972ab99a_render,
-  processFormvue_type_template_id_972ab99a_staticRenderFns,
+  processFormvue_type_template_id_7d7a1c8e_render,
+  processFormvue_type_template_id_7d7a1c8e_staticRenderFns,
   false,
   null,
   null,
@@ -12461,8 +12608,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=67bb0710&
-var processRejectvue_type_template_id_67bb0710_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=9cd54606&
+var processRejectvue_type_template_id_9cd54606_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -12490,7 +12637,11 @@ var processRejectvue_type_template_id_67bb0710_render = function () {
         {
           ref: "nextNode",
           staticClass: "demo-dynamic",
-          attrs: { model: _vm.nextNode, "label-width": "110px" },
+          attrs: {
+            model: _vm.nextNode,
+            "label-width": "100px",
+            "label-align": "left",
+          },
         },
         [
           _c(
@@ -12683,11 +12834,11 @@ var processRejectvue_type_template_id_67bb0710_render = function () {
     1
   )
 }
-var processRejectvue_type_template_id_67bb0710_staticRenderFns = []
-processRejectvue_type_template_id_67bb0710_render._withStripped = true
+var processRejectvue_type_template_id_9cd54606_staticRenderFns = []
+processRejectvue_type_template_id_9cd54606_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/flow/src/processReject.vue?vue&type=template&id=67bb0710&
+// CONCATENATED MODULE: ./packages/flow/src/processReject.vue?vue&type=template&id=9cd54606&
 
 // 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&
 //
@@ -12775,6 +12926,7 @@ processRejectvue_type_template_id_67bb0710_render._withStripped = true
 //
 //
 //
+//
 
 
 
@@ -12993,8 +13145,8 @@ processRejectvue_type_template_id_67bb0710_render._withStripped = true
 
 var processReject_component = Object(componentNormalizer["a" /* default */])(
   src_processRejectvue_type_script_lang_js_,
-  processRejectvue_type_template_id_67bb0710_render,
-  processRejectvue_type_template_id_67bb0710_staticRenderFns,
+  processRejectvue_type_template_id_9cd54606_render,
+  processRejectvue_type_template_id_9cd54606_staticRenderFns,
   false,
   null,
   null,
@@ -14154,8 +14306,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=803e1634&
-var resetvue_type_template_id_803e1634_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=73aacad2&
+var resetvue_type_template_id_73aacad2_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -14257,27 +14409,48 @@ var resetvue_type_template_id_803e1634_render = function () {
                   },
                 },
                 [
-                  _c(
-                    "el-select",
-                    {
-                      attrs: { placeholder: "请选择下步节点" },
-                      on: { change: _vm.changeSel },
-                      model: {
-                        value: _vm.nextNode.nextNode,
-                        callback: function ($$v) {
-                          _vm.$set(_vm.nextNode, "nextNode", $$v)
+                  _vm.nextNodeCheckType == "select"
+                    ? _c(
+                        "el-select",
+                        {
+                          attrs: { placeholder: "请选择下步节点" },
+                          on: { change: _vm.changeSel },
+                          model: {
+                            value: _vm.nextNode.nextNode,
+                            callback: function ($$v) {
+                              _vm.$set(_vm.nextNode, "nextNode", $$v)
+                            },
+                            expression: "nextNode.nextNode",
+                          },
+                        },
+                        _vm._l(_vm.nextNode.nodeInfo, function (items) {
+                          return _c("el-option", {
+                            key: items.nodeId,
+                            attrs: {
+                              label: items.nodeName,
+                              value: items.nodeId,
+                            },
+                          })
+                        }),
+                        1
+                      )
+                    : _vm.nextNodeCheckType == "radio"
+                    ? _c("es-radio-group", {
+                        attrs: {
+                          data: _vm.nextNode.nodeInfo,
+                          "value-key": "nodeId",
+                          "label-key": "nodeName",
+                        },
+                        on: { change: _vm.changeSel },
+                        model: {
+                          value: _vm.nextNode.nextNode,
+                          callback: function ($$v) {
+                            _vm.$set(_vm.nextNode, "nextNode", $$v)
+                          },
+                          expression: "nextNode.nextNode",
                         },
-                        expression: "nextNode.nextNode",
-                      },
-                    },
-                    _vm._l(_vm.nextNode.nodeInfo, function (items) {
-                      return _c("el-option", {
-                        key: items.nodeId,
-                        attrs: { label: items.nodeName, value: items.nodeId },
                       })
-                    }),
-                    1
-                  ),
+                    : _vm._e(),
                 ],
                 1
               ),
@@ -14581,11 +14754,11 @@ var resetvue_type_template_id_803e1634_render = function () {
     1
   )
 }
-var resetvue_type_template_id_803e1634_staticRenderFns = []
-resetvue_type_template_id_803e1634_render._withStripped = true
+var resetvue_type_template_id_73aacad2_staticRenderFns = []
+resetvue_type_template_id_73aacad2_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/flow/src/reset.vue?vue&type=template&id=803e1634&
+// CONCATENATED MODULE: ./packages/flow/src/reset.vue?vue&type=template&id=73aacad2&
 
 // 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; };
@@ -14804,6 +14977,15 @@ var resetvue_type_script_lang_js_components;
 //
 //
 //
+//
+//
+//
+//
+//
+//
+//
+//
+//
 
 
 
@@ -14833,6 +15015,7 @@ var resetvue_type_script_lang_js_components;
       loading: false,
       isCustomUser: 0,
       selectUser: false,
+      nextNodeCheckType: 'select',
       multiple: false,
       showNoticeType: false,
       readMultiple: true,
@@ -15370,6 +15553,7 @@ var resetvue_type_script_lang_js_components;
             data = res.data;
 
         if (status == 'success') {
+          data.nextNodeCheckType && (_this7.nextNodeCheckType = data.nextNodeCheckType);
           _this7.pendtitle = data.pendtitle || data.taskExamine.businessName;
           _this7.customPresetHintMessage = data.customPresetHintMessage;
           _this7.readOnlyNotificationType = data.readOnlyNotificationType;
@@ -15451,8 +15635,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_803e1634_render,
-  resetvue_type_template_id_803e1634_staticRenderFns,
+  resetvue_type_template_id_73aacad2_render,
+  resetvue_type_template_id_73aacad2_staticRenderFns,
   false,
   null,
   null,
@@ -23092,6 +23276,14 @@ function mainvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
 //
 //
 //
+//
+//
+//
+//
+//
+//
+//
+//
 
 
 
@@ -24470,6 +24662,13 @@ function mainvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
     selecNext: function selecNext(val, type, isDef) {
       var _this26 = this;
 
+      console.log(val, 'valvalval');
+      var isNextNode = false;
+      if (type) {
+        isNextNode = this.operationList.filter(function (x) {
+          return x.key == val;
+        })[0].isNextNode;
+      }
       this.loading = util["a" /* default */].loading(this.$loading, '加载中...');
       if (this.multiple) {
         this.nextNode.nextUserId = [];
@@ -24480,7 +24679,8 @@ function mainvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
       this.selectUserList = [];
       this.radioList = [];
 
-      if (type) {
+      if (type && !isNextNode) {
+        console.log('不是下一步节点');
         this.isNextUser = false;
         this.isShowNode = false;
         this.isMainSubProcess = false;
@@ -24497,12 +24697,30 @@ function mainvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
         this.nextNode.isReturnRejectNode = 0;
         this.nextNode.isSerialSubmit = 0;
         this.nodeInfos = [];
+        var newOperationList = [];
+        // this.operationList.map(x => {
+
+        // })
         this.operationList.forEach(function (item) {
           if (item.key === val) {
             if (!item.taskNodeList) {
               _this26.nodeInfos = [];
             } else {
-              _this26.nodeInfos = item.taskNodeList;
+              if (isDef) {
+                item.taskNodeList.map(function (x) {
+                  if (x.nodeName == '编号') {
+                    _this26.operationList.push({
+                      key: x.nodeId,
+                      value: x.nodeName,
+                      isNextNode: true
+                    });
+                  }
+                });
+              }
+
+              _this26.nodeInfos = item.taskNodeList.filter(function (x) {
+                return x.nodeName != '编号';
+              });
             }
             return;
           }
@@ -24520,7 +24738,10 @@ function mainvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
           this.nextNode.nextNodeId = this.nodeInfos[0].nodeId;
         }
       }
-
+      if (isNextNode) {
+        this.nodeInfos = [];
+        this.nextNode.nextNodeId = val;
+      }
       if (val === 9) {
         this.isReject = true;
       } else {
@@ -25080,14 +25301,6 @@ function mainvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
     subProcess: function subProcess(val, type) {
       var _this31 = this;
 
-      if (this.isFlow && this.nodeInfo.nextNode && this.startFlowPageEmbeddedIntoStartFlowIndex) {
-        if (this.directCreateCircularReadWhenFlowStarted) {
-          this.$refs.flowCirculate.subMit();
-        } else {
-          this.$refs.processFormIndex.subProcess('nextNode');
-        }
-        return;
-      }
       return this.$refs['nextNode'].validate(function (valid) {
         if (valid) {
           if (_this31.isSubmitButtonShowAgreeAndDisagree == 1) {
@@ -25181,6 +25394,14 @@ function mainvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
     sendData: function sendData(freetype) {
       var _this33 = this;
 
+      if (this.isFlow && this.nodeInfo.nextNode && this.startFlowPageEmbeddedIntoStartFlowIndex) {
+        if (this.directCreateCircularReadWhenFlowStarted) {
+          this.$refs.flowCirculate.subMit();
+        } else {
+          this.$refs.processFormIndex.subProcess('nextNode');
+        }
+        return;
+      }
       this.$refs['nextNode'].validate(function () {
         var _ref2 = mainvue_type_script_lang_js_asyncToGenerator( /*#__PURE__*/regenerator_default.a.mark(function _callee(valid) {
           var nextUserId, addSignUserId, removeSignUserId, str, notificationType, params, isEndUserTask, choiceOrgId, choiceDeptId, pOrgId, taskExamineInfo, currentNodeIsCircularReadNode, needRetrialAuth, circularReadParamsMap, currentNodeEnableItemHandleDescription;