eoss-ui 0.5.50 → 0.5.52

package/lib/eoss-ui.common.js

@@ -29441,8 +29441,8 @@ form_src_main.install = function (Vue) {
 };
 
 /* harmony default export */ var packages_form = (form_src_main);
-// 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=5512ddf8&
-var mainvue_type_template_id_5512ddf8_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/main.vue?vue&type=template&id=4dbe5794&
+var mainvue_type_template_id_4dbe5794_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -29451,7 +29451,7 @@ var mainvue_type_template_id_5512ddf8_render = function () {
         "div",
         {
           staticClass: "es-flow-index",
-          class: { "es-flow-narrow": _vm.shrink, required: this.requiredValue },
+          class: { "es-flow-narrow": _vm.shrink },
           style: _vm.styles,
         },
         [
@@ -29641,6 +29641,7 @@ var mainvue_type_template_id_5512ddf8_render = function () {
                                     slot: "prepend",
                                     placeholder: "请选择流程",
                                   },
+                                  on: { change: _vm.handleChange },
                                   slot: "prepend",
                                   model: {
                                     value: _vm.nodeInfo.nextNode,
@@ -31161,14 +31162,14 @@ var mainvue_type_template_id_5512ddf8_render = function () {
       )
     : _vm._e()
 }
-var mainvue_type_template_id_5512ddf8_staticRenderFns = []
-mainvue_type_template_id_5512ddf8_render._withStripped = true
+var mainvue_type_template_id_4dbe5794_staticRenderFns = []
+mainvue_type_template_id_4dbe5794_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/flow/src/main.vue?vue&type=template&id=5512ddf8&
+// CONCATENATED MODULE: ./packages/flow/src/main.vue?vue&type=template&id=4dbe5794&
 
-// 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 () {
+// 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=2f580d06&
+var CommonOpinionsvue_type_template_id_2f580d06_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -31176,23 +31177,40 @@ var CommonOpinionsvue_type_template_id_4e1f4030_render = function () {
     "div",
     { staticClass: "commonOpinion" },
     [
-      _c("el-input", {
-        attrs: {
-          disabled: _vm.isBanInputOpinion == "1" || _vm.disabled,
-          type: "textarea",
-          clear: "inp",
-          placeholder: "请输入意见",
-          rows: 10,
-        },
-        on: { change: _vm.changeOpinion },
-        model: {
-          value: _vm.value,
-          callback: function ($$v) {
-            _vm.value = $$v
-          },
-          expression: "value",
+      _c(
+        "el-form",
+        {
+          ref: "ruleForm",
+          attrs: { model: _vm.form, rules: _vm.rules, "label-width": "0" },
         },
-      }),
+        [
+          _c(
+            "el-form-item",
+            { attrs: { label: "", prop: "value" } },
+            [
+              _c("el-input", {
+                attrs: {
+                  disabled: _vm.isBanInputOpinion == "1" || _vm.disabled,
+                  type: "textarea",
+                  clear: "inp",
+                  placeholder: "请输入意见",
+                  rows: 10,
+                },
+                on: { change: _vm.changeOpinion },
+                model: {
+                  value: _vm.form.value,
+                  callback: function ($$v) {
+                    _vm.$set(_vm.form, "value", $$v)
+                  },
+                  expression: "form.value",
+                },
+              }),
+            ],
+            1
+          ),
+        ],
+        1
+      ),
       _c(
         "el-input",
         {
@@ -31337,11 +31355,11 @@ var CommonOpinionsvue_type_template_id_4e1f4030_render = function () {
     1
   )
 }
-var CommonOpinionsvue_type_template_id_4e1f4030_staticRenderFns = []
-CommonOpinionsvue_type_template_id_4e1f4030_render._withStripped = true
+var CommonOpinionsvue_type_template_id_2f580d06_staticRenderFns = []
+CommonOpinionsvue_type_template_id_2f580d06_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/flow/src/component/CommonOpinions.vue?vue&type=template&id=4e1f4030&
+// CONCATENATED MODULE: ./packages/flow/src/component/CommonOpinions.vue?vue&type=template&id=2f580d06&
 
 // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow/src/table.vue?vue&type=template&id=67f38db6&
 var tablevue_type_template_id_67f38db6_render = function () {
@@ -31862,6 +31880,15 @@ var CommonOpinionsvue_type_script_lang_js_components;
 //
 //
 //
+//
+//
+//
+//
+//
+//
+//
+//
+//
 
 
 
@@ -31873,6 +31900,12 @@ var CommonOpinionsvue_type_script_lang_js_components;
   data: function data() {
     return {
       value: '',
+      form: {
+        value: ''
+      },
+      rules: {
+        value: [{ required: true, message: '请输入意见', trigger: 'blur' }]
+      },
       input3: '',
       selectValue: '',
       optionList: [],
@@ -31917,6 +31950,18 @@ var CommonOpinionsvue_type_script_lang_js_components;
     }
   },
   methods: {
+    validate: function validate() {
+      var validSate = true;
+      this.$refs.ruleForm.validate(function (valid) {
+        if (valid) {
+          validSate = true;
+        } else {
+          validSate = false;
+        }
+      });
+      return validSate;
+    },
+
     /**
      * changeOpinion
      * @desc:监听意见变化
@@ -32103,8 +32148,8 @@ var CommonOpinionsvue_type_script_lang_js_components;
 
 var CommonOpinions_component = normalizeComponent(
   component_CommonOpinionsvue_type_script_lang_js_,
-  CommonOpinionsvue_type_template_id_4e1f4030_render,
-  CommonOpinionsvue_type_template_id_4e1f4030_staticRenderFns,
+  CommonOpinionsvue_type_template_id_2f580d06_render,
+  CommonOpinionsvue_type_template_id_2f580d06_staticRenderFns,
   false,
   null,
   null,
@@ -38766,6 +38811,7 @@ function flow_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return func
 //
 //
 //
+//
 
 
 
@@ -38823,7 +38869,6 @@ function flow_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return func
       nextCurrentOrgObjSelect: [],
       loading: null, // 加载中
       newTypeCode: '',
-      requiredValue: false,
       NodeName: '', // 当前节点值
       radioList: [],
       value: '',
@@ -39011,6 +39056,9 @@ function flow_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return func
     }
   },
   methods: {
+    handleChange: function handleChange(val) {
+      this.$parent.$emit('flowChange', val);
+    },
     getsubProcessColumns: function getsubProcessColumns() {
       if (!this.isMainSubProcess || !this.isNodeShowProcess) return [];
       var data = [];
@@ -39357,19 +39405,16 @@ function flow_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return func
       var _this8 = this;
 
       if (this.value === '') this.value = this.nodeDefaultRejectOpinion;
+      if (!this.value) {
+        if (!this.$refs.commonOpinions.validate()) return;
+      }
       if (this.beforeSubmit != undefined) {
         this.beforeSubmit().then(function (next) {
-          if (!_this8.value) {
-            // return this.$message.warning('请填写意见');
-            return _this8.requiredValue = true;
-          }
+
           _this8.showReject = true;
         }).catch(function (e) {});
       } else {
-        if (!this.value) {
-          // return this.$message.warning('请填写意见');
-          return this.requiredValue = true;
-        }
+
         this.showReject = true;
       }
     },
@@ -39678,7 +39723,11 @@ function flow_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return func
     rejectAndEnd: function rejectAndEnd(res) {
       var _this18 = this;
 
+      if (this.isOpinionRequired == 1 && (this.value == '' || !this.value)) {
+        if (!this.$refs.commonOpinions.validate()) return;
+      }
       if (this.beforeSubmit != undefined) {
+
         this.beforeSubmit().then(function (next) {
           _this18.saveRejectAndEnd(res);
         }).catch(function (e) {});
@@ -39690,7 +39739,7 @@ function flow_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return func
       var _this19 = this;
 
       this.$confirm('确认' + res.value + '?').then(function () {
-        if (_this19.isOpinionRequired == 1 && (_this19.value == '' || !_this19.value)) return _this19.requiredValue = true;
+
         // return this.$message.warning('请填写意见');
         var params = {
           url: api["mb" /* rejectAndEnd */],
@@ -40308,6 +40357,9 @@ function flow_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return func
                 _this24.nodeInfo.nextNode = '';
               }
             }
+            if (_this24.nodeInfo.nextNode) {
+              _this24.handleChange(_this24.nodeInfo.nextNode);
+            }
           }
         } else {
           _this24.$message.error(message || '系统错误，请联系管理员！');
@@ -40608,8 +40660,8 @@ function flow_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return func
 
 var flow_src_main_component = normalizeComponent(
   packages_flow_src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_5512ddf8_render,
-  mainvue_type_template_id_5512ddf8_staticRenderFns,
+  mainvue_type_template_id_4dbe5794_render,
+  mainvue_type_template_id_4dbe5794_staticRenderFns,
   false,
   null,
   null,
@@ -72600,7 +72652,7 @@ if (typeof window !== 'undefined' && window.Vue) {
 }
 
 /* harmony default export */ var src_0 = __webpack_exports__["default"] = ({
-  version: '0.5.50',
+  version: '0.5.52',
   install: install,
   Button: packages_button,
   ButtonGroup: button_group,

package/lib/flow.js

@@ -3920,7 +3920,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=5512ddf8&
+// 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=4dbe5794&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -3930,7 +3930,7 @@ var render = function () {
         "div",
         {
           staticClass: "es-flow-index",
-          class: { "es-flow-narrow": _vm.shrink, required: this.requiredValue },
+          class: { "es-flow-narrow": _vm.shrink },
           style: _vm.styles,
         },
         [
@@ -4120,6 +4120,7 @@ var render = function () {
                                     slot: "prepend",
                                     placeholder: "请选择流程",
                                   },
+                                  on: { change: _vm.handleChange },
                                   slot: "prepend",
                                   model: {
                                     value: _vm.nodeInfo.nextNode,
@@ -5644,14 +5645,14 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/flow/src/main.vue?vue&type=template&id=5512ddf8&
+// CONCATENATED MODULE: ./packages/flow/src/main.vue?vue&type=template&id=4dbe5794&
 
 // EXTERNAL MODULE: external "babel-runtime/regenerator"
 var regenerator_ = __webpack_require__(12);
 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=4e1f4030&
-var CommonOpinionsvue_type_template_id_4e1f4030_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=2f580d06&
+var CommonOpinionsvue_type_template_id_2f580d06_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -5659,23 +5660,40 @@ var CommonOpinionsvue_type_template_id_4e1f4030_render = function () {
     "div",
     { staticClass: "commonOpinion" },
     [
-      _c("el-input", {
-        attrs: {
-          disabled: _vm.isBanInputOpinion == "1" || _vm.disabled,
-          type: "textarea",
-          clear: "inp",
-          placeholder: "请输入意见",
-          rows: 10,
-        },
-        on: { change: _vm.changeOpinion },
-        model: {
-          value: _vm.value,
-          callback: function ($$v) {
-            _vm.value = $$v
-          },
-          expression: "value",
+      _c(
+        "el-form",
+        {
+          ref: "ruleForm",
+          attrs: { model: _vm.form, rules: _vm.rules, "label-width": "0" },
         },
-      }),
+        [
+          _c(
+            "el-form-item",
+            { attrs: { label: "", prop: "value" } },
+            [
+              _c("el-input", {
+                attrs: {
+                  disabled: _vm.isBanInputOpinion == "1" || _vm.disabled,
+                  type: "textarea",
+                  clear: "inp",
+                  placeholder: "请输入意见",
+                  rows: 10,
+                },
+                on: { change: _vm.changeOpinion },
+                model: {
+                  value: _vm.form.value,
+                  callback: function ($$v) {
+                    _vm.$set(_vm.form, "value", $$v)
+                  },
+                  expression: "form.value",
+                },
+              }),
+            ],
+            1
+          ),
+        ],
+        1
+      ),
       _c(
         "el-input",
         {
@@ -5820,11 +5838,11 @@ var CommonOpinionsvue_type_template_id_4e1f4030_render = function () {
     1
   )
 }
-var CommonOpinionsvue_type_template_id_4e1f4030_staticRenderFns = []
-CommonOpinionsvue_type_template_id_4e1f4030_render._withStripped = true
+var CommonOpinionsvue_type_template_id_2f580d06_staticRenderFns = []
+CommonOpinionsvue_type_template_id_2f580d06_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/flow/src/component/CommonOpinions.vue?vue&type=template&id=4e1f4030&
+// CONCATENATED MODULE: ./packages/flow/src/component/CommonOpinions.vue?vue&type=template&id=2f580d06&
 
 // EXTERNAL MODULE: ./src/config/api.js
 var api = __webpack_require__(1);
@@ -6354,6 +6372,15 @@ var _components;
 //
 //
 //
+//
+//
+//
+//
+//
+//
+//
+//
+//
 
 
 
@@ -6365,6 +6392,12 @@ var _components;
   data: function data() {
     return {
       value: '',
+      form: {
+        value: ''
+      },
+      rules: {
+        value: [{ required: true, message: '请输入意见', trigger: 'blur' }]
+      },
       input3: '',
       selectValue: '',
       optionList: [],
@@ -6409,6 +6442,18 @@ var _components;
     }
   },
   methods: {
+    validate: function validate() {
+      var validSate = true;
+      this.$refs.ruleForm.validate(function (valid) {
+        if (valid) {
+          validSate = true;
+        } else {
+          validSate = false;
+        }
+      });
+      return validSate;
+    },
+
     /**
      * changeOpinion
      * @desc:监听意见变化
@@ -6595,8 +6640,8 @@ var _components;
 
 var CommonOpinions_component = Object(componentNormalizer["a" /* default */])(
   component_CommonOpinionsvue_type_script_lang_js_,
-  CommonOpinionsvue_type_template_id_4e1f4030_render,
-  CommonOpinionsvue_type_template_id_4e1f4030_staticRenderFns,
+  CommonOpinionsvue_type_template_id_2f580d06_render,
+  CommonOpinionsvue_type_template_id_2f580d06_staticRenderFns,
   false,
   null,
   null,
@@ -13101,6 +13146,7 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
 //
 //
 //
+//
 
 
 
@@ -13158,7 +13204,6 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
       nextCurrentOrgObjSelect: [],
       loading: null, // 加载中
       newTypeCode: '',
-      requiredValue: false,
       NodeName: '', // 当前节点值
       radioList: [],
       value: '',
@@ -13346,6 +13391,9 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
     }
   },
   methods: {
+    handleChange: function handleChange(val) {
+      this.$parent.$emit('flowChange', val);
+    },
     getsubProcessColumns: function getsubProcessColumns() {
       if (!this.isMainSubProcess || !this.isNodeShowProcess) return [];
       var data = [];
@@ -13692,19 +13740,16 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
       var _this8 = this;
 
       if (this.value === '') this.value = this.nodeDefaultRejectOpinion;
+      if (!this.value) {
+        if (!this.$refs.commonOpinions.validate()) return;
+      }
       if (this.beforeSubmit != undefined) {
         this.beforeSubmit().then(function (next) {
-          if (!_this8.value) {
-            // return this.$message.warning('请填写意见');
-            return _this8.requiredValue = true;
-          }
+
           _this8.showReject = true;
         }).catch(function (e) {});
       } else {
-        if (!this.value) {
-          // return this.$message.warning('请填写意见');
-          return this.requiredValue = true;
-        }
+
         this.showReject = true;
       }
     },
@@ -14013,7 +14058,11 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
     rejectAndEnd: function rejectAndEnd(res) {
       var _this18 = this;
 
+      if (this.isOpinionRequired == 1 && (this.value == '' || !this.value)) {
+        if (!this.$refs.commonOpinions.validate()) return;
+      }
       if (this.beforeSubmit != undefined) {
+
         this.beforeSubmit().then(function (next) {
           _this18.saveRejectAndEnd(res);
         }).catch(function (e) {});
@@ -14025,7 +14074,7 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
       var _this19 = this;
 
       this.$confirm('确认' + res.value + '?').then(function () {
-        if (_this19.isOpinionRequired == 1 && (_this19.value == '' || !_this19.value)) return _this19.requiredValue = true;
+
         // return this.$message.warning('请填写意见');
         var params = {
           url: api["mb" /* rejectAndEnd */],
@@ -14643,6 +14692,9 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
                 _this24.nodeInfo.nextNode = '';
               }
             }
+            if (_this24.nodeInfo.nextNode) {
+              _this24.handleChange(_this24.nodeInfo.nextNode);
+            }
           }
         } else {
           _this24.$message.error(message || '系统错误，请联系管理员！');