eoss-ui 0.6.64 → 0.6.66

package/lib/flow.js

@@ -4421,7 +4421,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=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=fe0ac130&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -4435,7 +4435,133 @@ 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,
+                      selectorParams: _vm.params,
+                      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: {
@@ -4777,6 +4903,7 @@ var render = function () {
                                       _c(
                                         "el-select",
                                         {
+                                          key: _vm.optionsKey,
                                           staticStyle: {
                                             width: "calc(100% + 40px)",
                                           },
@@ -4805,6 +4932,7 @@ var render = function () {
                                               key: items.id,
                                               attrs: {
                                                 label: items.name,
+                                                disabled: items.disabled,
                                                 value: items.processDefId,
                                               },
                                             })
@@ -5568,11 +5696,7 @@ var render = function () {
                                                             "department",
                                                             "employee",
                                                           ],
-                                                          params: {
-                                                            filid:
-                                                              _vm.userModel
-                                                                .orgId,
-                                                          },
+                                                          params: _vm.params,
                                                         },
                                                         on: {
                                                           change: function (
@@ -6508,6 +6632,7 @@ var render = function () {
                               businessId: _vm.businessId,
                               processDefinitionId: _vm.nodeInfo.nextNode,
                               simpleTips: _vm.simpleTips,
+                              selectorParams: _vm.params,
                               oldOption: _vm.value,
                             },
                             on: {
@@ -6855,7 +6980,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=fe0ac130&
 
 // EXTERNAL MODULE: external "babel-runtime/regenerator"
 var regenerator_ = __webpack_require__(4);
@@ -20809,8 +20934,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=1012ba25&
+var Circulatevue_type_template_id_1012ba25_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -20972,35 +21097,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_1012ba25_staticRenderFns = []
+Circulatevue_type_template_id_1012ba25_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=1012ba25&
 
 // 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;
@@ -21105,7 +21232,9 @@ var Circulatevue_type_script_lang_js_components;
     oldOption: { type: String, default: '' },
     disabled: { type: Boolean, default: false },
     simpleTips: { type: Boolean, default: true },
-    multiple: { type: Boolean, default: true }
+    showBtn: { type: Boolean, default: true },
+    multiple: { type: Boolean, default: true },
+    selectorParams: { type: Object, default: function _default() {} }
   },
   inheritAttrs: false,
   data: function data() {
@@ -21139,10 +21268,35 @@ var Circulatevue_type_script_lang_js_components;
       isHideCurrentOrg: 0,
       isOpinionRequired: 0,
       otherParams: { filid: 'other' },
-      loading: false
+      loading: false,
+      userModel: {}
     };
   },
+
+  watch: {
+    selectorParams: {
+      handler: function handler(val) {
+        this.params = val;
+      },
+
+      deep: true,
+      immediate: true
+    },
+    oldOption: {
+      handler: function handler(val) {
+        this.opinion = val;
+      },
+
+      deep: true,
+      immediate: true
+    }
+  },
   mounted: function mounted() {
+    var mainConfig = util["a" /* default */].getStorage('mainConfig');
+    if (mainConfig) {
+      this.userModel = JSON.parse(mainConfig).userModel;
+      this.params.filid = this.userModel.orgId;
+    }
     this.loading = true;
     this.newMultiple = this.multiple;
     this.opinion = this.oldOption;
@@ -21325,8 +21479,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_1012ba25_render,
+  Circulatevue_type_template_id_1012ba25_staticRenderFns,
   false,
   null,
   null,
@@ -22237,7 +22391,58 @@ function mainvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
 //
 //
 //
-
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
 
 
 
@@ -22270,7 +22475,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() {
@@ -22307,6 +22512,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, //自由发起流程弹窗
@@ -22454,19 +22662,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) {
@@ -22560,6 +22770,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;
 
@@ -22571,6 +22796,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;
         }
       });
@@ -23528,7 +23764,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 {
@@ -23567,6 +23806,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;

package/lib/form.js

@@ -4291,7 +4291,7 @@ var bankCard = { pattern: new RegExp('^([1-9]{1})(\\d{14}|\\d{18})$'), message:
 // 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/form/src/main.vue?vue&type=template&id=2158e4f3&
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/form/src/main.vue?vue&type=template&id=45a4048d&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -4424,14 +4424,17 @@ var render = function () {
                                             ],
                                             key: indexs,
                                             staticClass: "es-collapse-item",
-                                            class: {
-                                              "es-collapse-readonly":
-                                                _vm.accordion
-                                                  ? false
-                                                  : !_vm.collapse,
-                                              "es-collapse-caption":
-                                                items.caption,
-                                            },
+                                            class: [
+                                              {
+                                                "es-collapse-readonly":
+                                                  _vm.accordion
+                                                    ? false
+                                                    : !_vm.collapse,
+                                                "es-collapse-caption":
+                                                  items.caption,
+                                              },
+                                              items.class,
+                                            ],
                                             attrs: {
                                               "show-title": items.showTitle,
                                               name:
@@ -10306,7 +10309,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/form/src/main.vue?vue&type=template&id=2158e4f3&
+// CONCATENATED MODULE: ./packages/form/src/main.vue?vue&type=template&id=45a4048d&
 
 // EXTERNAL MODULE: external "babel-runtime/regenerator"
 var regenerator_ = __webpack_require__(4);