eoss-ui 0.7.13 → 0.7.15

package/lib/flow.js

@@ -4492,7 +4492,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=f8b78648&
+// 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=416e8ccb&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -4585,34 +4585,36 @@ var render = function () {
                       ]
                     ),
                   ]),
-                  _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,
-                      placeholder: _vm.pendingItemHandleDescription,
-                      pendingItemHandleDescription:
-                        _vm.pendingItemHandleDescription,
-                      required: _vm.isOpinionRequired == 1,
-                      isBanInputOpinion: _vm.isBanInputOpinion,
-                      nodeFixedOpinionSelectList:
-                        _vm.nodeFixedOpinionSelectList,
-                    },
-                    on: {
-                      change: function (val) {
-                        return (_vm.value = val)
-                      },
-                    },
-                  }),
+                  _vm.showOpinion
+                    ? _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,
+                          placeholder: _vm.pendingItemHandleDescription,
+                          pendingItemHandleDescription:
+                            _vm.pendingItemHandleDescription,
+                          required: _vm.isOpinionRequired == 1,
+                          isBanInputOpinion: _vm.isBanInputOpinion,
+                          nodeFixedOpinionSelectList:
+                            _vm.nodeFixedOpinionSelectList,
+                        },
+                        on: {
+                          change: function (val) {
+                            return (_vm.value = val)
+                          },
+                        },
+                      })
+                    : _vm._e(),
                   _c(
                     "div",
                     {
@@ -4763,6 +4765,7 @@ var render = function () {
                 attrs: {
                   appId: _vm.resetAppId,
                   params: _vm.param,
+                  showOther: _vm.showOther,
                   formLabelPosition: _vm.formLabelPosition,
                   simpleTips: _vm.simpleTips,
                 },
@@ -4910,34 +4913,36 @@ var render = function () {
                           ),
                         ]
                       ),
-                      _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,
-                          pendingItemHandleDescription:
-                            _vm.pendingItemHandleDescription,
-                          placeholder: _vm.pendingItemHandleDescription,
-                          required: _vm.isOpinionRequired == 1,
-                          isBanInputOpinion: _vm.isBanInputOpinion,
-                          nodeFixedOpinionSelectList:
-                            _vm.nodeFixedOpinionSelectList,
-                        },
-                        on: {
-                          change: function (val) {
-                            return (_vm.value = val)
-                          },
-                        },
-                      }),
+                      _vm.showOpinion
+                        ? _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,
+                              pendingItemHandleDescription:
+                                _vm.pendingItemHandleDescription,
+                              placeholder: _vm.pendingItemHandleDescription,
+                              required: _vm.isOpinionRequired == 1,
+                              isBanInputOpinion: _vm.isBanInputOpinion,
+                              nodeFixedOpinionSelectList:
+                                _vm.nodeFixedOpinionSelectList,
+                            },
+                            on: {
+                              change: function (val) {
+                                return (_vm.value = val)
+                              },
+                            },
+                          })
+                        : _vm._e(),
                     ],
                     1
                   ),
@@ -7396,14 +7401,14 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/flow/src/main.vue?vue&type=template&id=f8b78648&
+// CONCATENATED MODULE: ./packages/flow/src/main.vue?vue&type=template&id=416e8ccb&
 
 // EXTERNAL MODULE: external "babel-runtime/regenerator"
 var regenerator_ = __webpack_require__(4);
 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=19364a89&
-var CommonOpinionsvue_type_template_id_19364a89_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=4b7ad280&
+var CommonOpinionsvue_type_template_id_4b7ad280_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -7415,11 +7420,7 @@ var CommonOpinionsvue_type_template_id_19364a89_render = function () {
         "el-form",
         {
           ref: "ruleForm",
-          attrs: {
-            model: _vm.form,
-            rules: _vm.required ? _vm.rules : {},
-            "label-width": "0",
-          },
+          attrs: { model: _vm.form, rules: _vm.rules, "label-width": "0" },
         },
         [
           _c(
@@ -7614,11 +7615,11 @@ var CommonOpinionsvue_type_template_id_19364a89_render = function () {
     1
   )
 }
-var CommonOpinionsvue_type_template_id_19364a89_staticRenderFns = []
-CommonOpinionsvue_type_template_id_19364a89_render._withStripped = true
+var CommonOpinionsvue_type_template_id_4b7ad280_staticRenderFns = []
+CommonOpinionsvue_type_template_id_4b7ad280_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/flow/src/component/CommonOpinions.vue?vue&type=template&id=19364a89&
+// CONCATENATED MODULE: ./packages/flow/src/component/CommonOpinions.vue?vue&type=template&id=4b7ad280&
 
 // EXTERNAL MODULE: ./src/config/api.js
 var api = __webpack_require__(1);
@@ -8160,8 +8161,6 @@ var _components;
 //
 //
 //
-//
-//
 
 
 
@@ -8177,9 +8176,6 @@ var _components;
       form: {
         value: ''
       },
-      rules: {
-        value: [{ required: true, message: '请输入意见', trigger: 'blur' }]
-      },
       input3: '',
       selectValue: '',
       optionList: [],
@@ -8217,6 +8213,17 @@ var _components;
     },
     required: { type: Boolean, default: false }
   },
+  computed: {
+    rules: function rules() {
+      return {
+        value: [{
+          required: this.required,
+          message: '请输入意见',
+          trigger: 'blur'
+        }]
+      };
+    }
+  },
   mounted: function mounted() {
     if (this.nodeFixedOpinionSelectList.length > 0) {
       this.optionList = this.nodeFixedOpinionSelectList;
@@ -8439,8 +8446,8 @@ var _components;
 
 var CommonOpinions_component = Object(componentNormalizer["a" /* default */])(
   component_CommonOpinionsvue_type_script_lang_js_,
-  CommonOpinionsvue_type_template_id_19364a89_render,
-  CommonOpinionsvue_type_template_id_19364a89_staticRenderFns,
+  CommonOpinionsvue_type_template_id_4b7ad280_render,
+  CommonOpinionsvue_type_template_id_4b7ad280_staticRenderFns,
   false,
   null,
   null,
@@ -22623,8 +22630,8 @@ var Circulate_component = Object(componentNormalizer["a" /* default */])(
 )
 
 /* harmony default export */ var Circulate = (Circulate_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/FreeCirculation.vue?vue&type=template&id=521e2326&
-var FreeCirculationvue_type_template_id_521e2326_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/FreeCirculation.vue?vue&type=template&id=4ffe80dd&
+var FreeCirculationvue_type_template_id_4ffe80dd_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -22717,11 +22724,11 @@ var FreeCirculationvue_type_template_id_521e2326_render = function () {
     1
   )
 }
-var FreeCirculationvue_type_template_id_521e2326_staticRenderFns = []
-FreeCirculationvue_type_template_id_521e2326_render._withStripped = true
+var FreeCirculationvue_type_template_id_4ffe80dd_staticRenderFns = []
+FreeCirculationvue_type_template_id_4ffe80dd_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/flow/src/component/FreeCirculation.vue?vue&type=template&id=521e2326&
+// CONCATENATED MODULE: ./packages/flow/src/component/FreeCirculation.vue?vue&type=template&id=4ffe80dd&
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow/src/component/FreeCirculation.vue?vue&type=script&lang=js&
 //
@@ -22811,6 +22818,7 @@ FreeCirculationvue_type_template_id_521e2326_render._withStripped = true
   methods: {
     quit: function quit() {
       this.$emit('cancel');
+      this.$parent.$emit('cancel');
     },
     subMit: function subMit() {
       var _this = this;
@@ -22827,8 +22835,9 @@ FreeCirculationvue_type_template_id_521e2326_render._withStripped = true
       };
       this.loading = util["a" /* default */].loading(this.$loading, '加载中...');
       util["a" /* default */].ajax(param).then(function (res) {
+        _this.loading.close();
         if (res.rCode == 0 || res.status == 'success') {
-          _this.loading.close();
+
           if (!_this.simpleTips) {
             _this.$alert('提交成功', '', {
               confirmButtonText: '确定',
@@ -22840,6 +22849,8 @@ FreeCirculationvue_type_template_id_521e2326_render._withStripped = true
           } else {
             _this.$parent.$emit('success');
           }
+        } else {
+          _this.$message.error(res.message || res.msg || '系统错误，请联系管理员！');
         }
       });
     },
@@ -22936,8 +22947,8 @@ FreeCirculationvue_type_template_id_521e2326_render._withStripped = true
 
 var FreeCirculation_component = Object(componentNormalizer["a" /* default */])(
   component_FreeCirculationvue_type_script_lang_js_,
-  FreeCirculationvue_type_template_id_521e2326_render,
-  FreeCirculationvue_type_template_id_521e2326_staticRenderFns,
+  FreeCirculationvue_type_template_id_4ffe80dd_render,
+  FreeCirculationvue_type_template_id_4ffe80dd_staticRenderFns,
   false,
   null,
   null,
@@ -24081,6 +24092,9 @@ function mainvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
 //
 //
 //
+//
+//
+//
 
 
 
@@ -24163,6 +24177,10 @@ function mainvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
       type: [String, Number],
       default: 10
     },
+    showOther: {
+      type: Boolean,
+      default: true
+    },
     isEndMessage: { type: Boolean, default: false }
   },
   data: function data() {
@@ -24174,6 +24192,7 @@ function mainvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
       endMessage: '',
       isHideTemporarySave: false,
       oldNextOperate: '',
+      showOpinion: true,
       taskOperationShiftedNodeList: null,
       currentNodeEnableItemHandleDescription: false,
       startFlowPageEmbeddedIntoStartFlowIndex: false,
@@ -24405,7 +24424,8 @@ function mainvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
             }
           }
           if (this.nodeInfo.nextNode) {
-            this.handleChange(this.nodeInfo.nextNode);
+
+            this.handleChange(this.nodeInfo.nextNode, true);
           }
         }
       },
@@ -24533,6 +24553,10 @@ function mainvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
           // }
           _this3.optionsKey++;
           _this3.isOpinionRequired = res.data.nodeExtAttr.isOpinionRequired == 1;
+          _this3.showOpinion = false;
+          setTimeout(function () {
+            _this3.showOpinion = true;
+          }, 0);
         }
       });
     },
@@ -24582,8 +24606,8 @@ function mainvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
       this.flowSuccess(true);
       // this.$emit('success');
     },
-    handleChange: function handleChange(val) {
-      this.getNodeInfoForStartFlow(val);
+    handleChange: function handleChange(val, isForStartFlow) {
+      this.getNodeInfoForStartFlow(val, isForStartFlow);
       this.$parent.$emit('flowChange', val);
     },
     getsubProcessColumns: function getsubProcessColumns() {
@@ -26077,7 +26101,7 @@ function mainvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
               }
             }
             if (_this30.nodeInfo.nextNode) {
-              _this30.handleChange(_this30.nodeInfo.nextNode);
+              _this30.handleChange(_this30.nodeInfo.nextNode, true);
             }
             if (_this30.showCirculate != undefined && !_this30.showCirculate && _this30.urgencyLevel) {
               _this30.getAdminMsgType();
@@ -26285,15 +26309,23 @@ function mainvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
               switch (_context.prev = _context.next) {
                 case 0:
                   if (!valid) {
-                    _context.next = 53;
+                    _context.next = 55;
                     break;
                   }
 
                   if (!_this35.isFlow) {
+                    _context.next = 6;
+                    break;
+                  }
+
+                  if (!(_this35.isOpinionRequired && !_this35.$refs.commonOpinions.validate())) {
                     _context.next = 4;
                     break;
                   }
 
+                  return _context.abrupt('return');
+
+                case 4:
                   if (_this35.directCreateCircularReadWhenFlowStarted) {
                     _this35.circulateVisible = true;
                   } else {
@@ -26301,7 +26333,7 @@ function mainvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
                   }
                   return _context.abrupt('return');
 
-                case 4:
+                case 6:
                   nextUserId = [];
 
                   if (_this35.multiple) {
@@ -26344,17 +26376,17 @@ function mainvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
                   }
 
                   if (!(freetype != 'multiInsMidwayWithSubmitScene')) {
-                    _context.next = 20;
+                    _context.next = 22;
                     break;
                   }
 
-                  _context.next = 19;
+                  _context.next = 21;
                   return _this35.saveInfo('subMit');
 
-                case 19:
+                case 21:
                   _this35.loading = util["a" /* default */].loading(_this35.$loading, '加载中...');
 
-                case 20:
+                case 22:
                   notificationType = '';
 
                   notificationType = _this35.nextNode.notificationType.join(',');
@@ -26392,7 +26424,7 @@ function mainvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
                   }
 
                   if (!(freetype === 'multiInsMidwayWithSubmitScene')) {
-                    _context.next = 34;
+                    _context.next = 36;
                     break;
                   }
 
@@ -26400,7 +26432,7 @@ function mainvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
                   _this35.taskParams = params;
                   return _context.abrupt('return');
 
-                case 34:
+                case 36:
                   _this35.loading = util["a" /* default */].loading(_this35.$loading, '提交中...');
                   isEndUserTask = _this35.isEndUserTask, choiceOrgId = _this35.choiceOrgId, choiceDeptId = _this35.choiceDeptId, pOrgId = _this35.pOrgId, taskExamineInfo = _this35.taskExamineInfo, currentNodeIsCircularReadNode = _this35.currentNodeIsCircularReadNode, needRetrialAuth = _this35.needRetrialAuth, circularReadParamsMap = _this35.circularReadParamsMap, currentNodeEnableItemHandleDescription = _this35.currentNodeEnableItemHandleDescription;
 
@@ -26440,10 +26472,10 @@ function mainvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
                     }
                   }));
 
-                case 53:
+                case 55:
                   return _context.abrupt('return', false);
 
-                case 54:
+                case 56:
                 case 'end':
                   return _context.stop();
               }