eoss-ui 0.8.37 → 0.8.38

package/lib/flow.js

@@ -4878,7 +4878,7 @@ module.exports = require("vuedraggable");
 // 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=791d3fbc&
+// 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=723b9982&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -8038,7 +8038,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/flow/src/main.vue?vue&type=template&id=791d3fbc&
+// CONCATENATED MODULE: ./packages/flow/src/main.vue?vue&type=template&id=723b9982&
 
 // EXTERNAL MODULE: external "babel-runtime/regenerator"
 var regenerator_ = __webpack_require__(4);
@@ -9102,8 +9102,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/flow.vue?vue&type=template&id=160c0322&
-var flowvue_type_template_id_160c0322_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/flow.vue?vue&type=template&id=f7d7c7c6&
+var flowvue_type_template_id_f7d7c7c6_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -11335,9 +11335,10 @@ var flowvue_type_template_id_160c0322_render = function () {
                           },
                         },
                       })
-                    : _vm.btnType === "toStartTaskRead"
+                    : _vm.btnType === "toStartTaskRead" ||
+                      _vm.btnType === "toTaskReadAndEnd"
                     ? _c("StartTaskRead", {
-                        ref: "toStartTaskRead",
+                        ref: _vm.btnType,
                         staticClass: "es-info",
                         attrs: {
                           "pending-id": _vm.pendingId,
@@ -12016,11 +12017,11 @@ var flowvue_type_template_id_160c0322_render = function () {
       )
     : _vm._e()
 }
-var flowvue_type_template_id_160c0322_staticRenderFns = []
-flowvue_type_template_id_160c0322_render._withStripped = true
+var flowvue_type_template_id_f7d7c7c6_staticRenderFns = []
+flowvue_type_template_id_f7d7c7c6_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/flow/src/flow.vue?vue&type=template&id=160c0322&
+// CONCATENATED MODULE: ./packages/flow/src/flow.vue?vue&type=template&id=f7d7c7c6&
 
 // 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/Opinions.vue?vue&type=template&id=5f07a050&
 var Opinionsvue_type_template_id_5f07a050_render = function () {
@@ -12732,8 +12733,8 @@ var Opinions_component = Object(componentNormalizer["a" /* default */])(
 )
 
 /* harmony default export */ var Opinions = (Opinions_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=20fb5670&
-var processFormvue_type_template_id_20fb5670_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=2860b038&
+var processFormvue_type_template_id_2860b038_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -13687,11 +13688,11 @@ var processFormvue_type_template_id_20fb5670_render = function () {
     1
   )
 }
-var processFormvue_type_template_id_20fb5670_staticRenderFns = []
-processFormvue_type_template_id_20fb5670_render._withStripped = true
+var processFormvue_type_template_id_2860b038_staticRenderFns = []
+processFormvue_type_template_id_2860b038_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/flow/src/processForm.vue?vue&type=template&id=20fb5670&
+// CONCATENATED MODULE: ./packages/flow/src/processForm.vue?vue&type=template&id=2860b038&
 
 // 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=3a5614a4&
 var selectUservue_type_template_id_3a5614a4_render = function () {
@@ -16440,7 +16441,6 @@ var processFormvue_type_script_lang_js_components;
           if (_this8.isCustomPreset && _this8.activeNames == '1') {
             for (var i = 0; i < _this8.presetList.length; i++) {
               if (_this8.presetList[i].name && _this8.presetList[i].name != '1' && _this8.presetList[i].name != 'endEvent' && (!_this8.presetList[i].value || _this8.presetList[i].value.length == 0)) {
-
                 return _this8.$message.warning('\u9884\u8BBE\u8282\u70B9<\u8282\u70B9' + _this8.presetList[i].sequence + '-' + _this8.presetList[i].label + '>\u5FC5\u987B\u9009\u62E9\u529E\u7406\u4EBA\uFF01');
               } else {
                 delete _this8.presetList[i].label;
@@ -16521,6 +16521,8 @@ var processFormvue_type_script_lang_js_components;
 
                 newParm.submitTaskParamJson = JSON.stringify(_this8.taskParams);
                 if (_this8.formType == 'readTransfer') {
+                  newParm.customPresetUserJson = params.customPresetUserJson;
+                  delete params.customPresetUserJson;
                   newParm.readTransferHandleStartFlowParamJson = JSON.stringify(params);
                   newParm.taskReadEndParamJson = JSON.stringify(_this8.taskParams);
                   delete newParm.copyHistory;
@@ -16632,12 +16634,16 @@ var processFormvue_type_script_lang_js_components;
 
             newParm.submitTaskParamJson = JSON.stringify(_this8.taskParams);
             if (_this8.formType == 'readTransfer') {
-              newParm.readTransferHandleStartFlowParamJson = JSON.stringify(params);
+              newParm.customPresetUserJson = params.customPresetUserJson;
               newParm.taskReadEndParamJson = JSON.stringify(_this8.taskParams);
+              delete params.customPresetUserJson;
+              newParm.readTransferHandleStartFlowParamJson = JSON.stringify(params);
+
               delete newParm.copyHistory;
               delete newParm.startFlowParamJson;
               delete newParm.submitTaskParamJson;
             }
+
             params = newParm;
           }
           if (_this8.copyHistory && !_this8.isFreeStartFlow) {
@@ -16647,6 +16653,7 @@ var processFormvue_type_script_lang_js_components;
           util["a" /* default */].ajax({
             url: _this8.isFreeStartFlow ? api["M" /* freeStartFlowWithSubmitTask */] : _this8.formType == 'readTransfer' ? api["ec" /* startReadTransferHandleFlowWithTaskReadEnd */] : _this8.copyHistory ? api["L" /* freeStartFlow */] : api["Rb" /* register */],
             method: 'post',
+
             data: params
           }).then(function (res) {
             var status = res.status,
@@ -17062,8 +17069,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_20fb5670_render,
-  processFormvue_type_template_id_20fb5670_staticRenderFns,
+  processFormvue_type_template_id_2860b038_render,
+  processFormvue_type_template_id_2860b038_staticRenderFns,
   false,
   null,
   null,
@@ -18548,8 +18555,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=d6b2d084&
-var startTaskReadvue_type_template_id_d6b2d084_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=fffcbc42&
+var startTaskReadvue_type_template_id_fffcbc42_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -18980,11 +18987,11 @@ var startTaskReadvue_type_template_id_d6b2d084_render = function () {
     1
   )
 }
-var startTaskReadvue_type_template_id_d6b2d084_staticRenderFns = []
-startTaskReadvue_type_template_id_d6b2d084_render._withStripped = true
+var startTaskReadvue_type_template_id_fffcbc42_staticRenderFns = []
+startTaskReadvue_type_template_id_fffcbc42_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/flow/src/startTaskRead.vue?vue&type=template&id=d6b2d084&
+// CONCATENATED MODULE: ./packages/flow/src/startTaskRead.vue?vue&type=template&id=fffcbc42&
 
 // 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; };
@@ -19226,6 +19233,7 @@ var startTaskReadvue_type_script_lang_js_components;
     };
   },
 
+
   computed: {
     tabs: function tabs() {
       var tab = {};
@@ -19579,6 +19587,7 @@ var startTaskReadvue_type_script_lang_js_components;
 
     // 提交表单
     subProcess: function subProcess(formName) {
+
       this.submit(formName);
     },
 
@@ -19592,7 +19601,6 @@ var startTaskReadvue_type_script_lang_js_components;
             _this8.$message.warning('请选择输入审批意见');
             return;
           }
-          console.log(_this8.mixList, 'this.mixList');
           // let nextUser = [];
           // this.nextNode.nextUser.map(item => {
           //   nextUser.push(item);
@@ -19735,8 +19743,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_d6b2d084_render,
-  startTaskReadvue_type_template_id_d6b2d084_staticRenderFns,
+  startTaskReadvue_type_template_id_fffcbc42_render,
+  startTaskReadvue_type_template_id_fffcbc42_staticRenderFns,
   false,
   null,
   null,
@@ -31088,20 +31096,22 @@ function flowvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
       var _this17 = this;
 
       // return this.$message.warning('暂未开放！敬请期待');
-
-      if (this.beforeSubmit != undefined) {
-        this.beforeSubmit().then(function (next) {
+      this.btnType = '';
+      setTimeout(function () {
+        if (_this17.beforeSubmit != undefined) {
+          _this17.beforeSubmit().then(function (next) {
+            if (_this17.value === '') _this17.value = _this17.nodeDefaultRejectOpinion;
+            _this17.taskReadType = 'create';
+            // this.showTaskRead = true;
+            _this17.btnType = _this17.btnFunValue(res.fun);
+          }).catch(function (e) {});
+        } else {
           if (_this17.value === '') _this17.value = _this17.nodeDefaultRejectOpinion;
           _this17.taskReadType = 'create';
           // this.showTaskRead = true;
           _this17.btnType = _this17.btnFunValue(res.fun);
-        }).catch(function (e) {});
-      } else {
-        if (this.value === '') this.value = this.nodeDefaultRejectOpinion;
-        this.taskReadType = 'create';
-        // this.showTaskRead = true;
-        this.btnType = this.btnFunValue(res.fun);
-      }
+        }
+      }, 0);
     },
 
     /**
@@ -31261,6 +31271,8 @@ function flowvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
       // 驳回：taskRejectHtml
       // 直接办结：endFlowHtml
       // 自由发起子流程：toFreeStartFlow
+
+
       if (res.type == 4) {
         this.$emit('buttonClick', { fun: res.fun, opinion: this.value }, this.sendData);
       } else if (res.fun === 'toStartTaskRead()') {
@@ -31444,17 +31456,23 @@ function flowvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
     toTaskReadAndEnd: function toTaskReadAndEnd(res) {
       var _this26 = this;
 
-      if (this.beforeSubmit != undefined) {
-        this.beforeSubmit().then(function (next) {
+      this.btnType = '';
+      setTimeout(function () {
+        if (_this26.beforeSubmit != undefined) {
+          _this26.beforeSubmit().then(function (next) {
+            if (_this26.value === '') _this26.value = _this26.nodeDefaultRejectOpinion;
+            _this26.taskReadType = 'taskReadAndEnd';
+            _this26.btnType = _this26.btnFunValue(res.fun);
+
+            // this.showTaskRead = true;
+          }).catch(function (e) {});
+        } else {
           if (_this26.value === '') _this26.value = _this26.nodeDefaultRejectOpinion;
           _this26.taskReadType = 'taskReadAndEnd';
-          _this26.showTaskRead = true;
-        }).catch(function (e) {});
-      } else {
-        if (this.value === '') this.value = this.nodeDefaultRejectOpinion;
-        this.taskReadType = 'taskReadAndEnd';
-        this.showTaskRead = true;
-      }
+          _this26.btnType = _this26.btnFunValue(res.fun);
+          // this.showTaskRead = true;
+        }
+      }, 0);
     },
 
     /**
@@ -32219,7 +32237,12 @@ function flowvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
         this.flowSuccess(true);
         // this.$emit('success');
       } else {
-        this.$emit('cancel');
+        if (type == 'showTaskRead') {
+          !this.simpleTips && this.$message.success('分阅成功');
+          this.$emit('success', 'taskRead');
+        } else {
+          this.$emit('cancel');
+        }
       }
     },
 
@@ -32684,7 +32707,7 @@ function flowvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
                               customPresetUserJson: JSON.stringify(_this39.presetList),
                               presetUserJson: JSON.stringify(_this39.presetUserJson),
                               removeSignUserId: removeSignUserId,
-                              nextReadUserId: _this39.readMultiple ? _this39.mixReadList && _this39.mixReadList.join('|') : _this39.nextNode.nextReadUserId,
+                              nextReadUserId: _this39.readMultiple ? _this39.mixReadList ? _this39.mixReadList.join('|') : '' : _this39.nextNode.nextReadUserId.join(','),
                               nextOrgId: !_this39.isShowNextUser ? _this39.multiple ? _this39.mixOrgIdList && _this39.mixOrgIdList.join('|') : _this39.nextNode.nextOrgId : '',
                               presetReadUserId: _this39.mixPresetList && _this39.mixPresetList.length > 0 ? _this39.mixPresetList.join('|') : _this39.nextNode.presetReadUserId.join(','),
                               notificationType: notificationType
@@ -32792,7 +32815,7 @@ function flowvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
                     customPresetUserJson: JSON.stringify(_this39.presetList),
                     presetUserJson: JSON.stringify(_this39.presetUserJson),
                     removeSignUserId: removeSignUserId,
-                    nextReadUserId: _this39.readMultiple ? _this39.mixReadList && _this39.mixReadList.join('|') : _this39.nextNode.nextReadUserId,
+                    nextReadUserId: _this39.readMultiple ? _this39.mixReadList ? _this39.mixReadList.join('|') : '' : _this39.nextNode.nextReadUserId.join(','),
                     nextOrgId: !_this39.isShowNextUser ? _this39.multiple ? _this39.mixOrgIdList && _this39.mixOrgIdList.join('|') : _this39.nextNode.nextOrgId : '',
                     presetReadUserId: _this39.mixPresetList && _this39.mixPresetList.length > 0 ? _this39.mixPresetList.join('|') : _this39.nextNode.presetReadUserId.join(','),
                     notificationType: notificationType
@@ -32923,8 +32946,8 @@ function flowvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
 
 var flow_component = Object(componentNormalizer["a" /* default */])(
   src_flowvue_type_script_lang_js_,
-  flowvue_type_template_id_160c0322_render,
-  flowvue_type_template_id_160c0322_staticRenderFns,
+  flowvue_type_template_id_f7d7c7c6_render,
+  flowvue_type_template_id_f7d7c7c6_staticRenderFns,
   false,
   null,
   null,
@@ -34768,7 +34791,6 @@ function mainvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
     getNodeInfoForStartFlow: function getNodeInfoForStartFlow(processDefinitionId) {
       var _this4 = this;
 
-      console.log('processDefinitionId', processDefinitionId);
       var params = {
         url: api["bb" /* getNodeInfoForStart */],
         params: { processDefinitionId: processDefinitionId }
@@ -34850,8 +34872,12 @@ function mainvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
         _this6.$refs.esContent.scrollTop += _this6.$refs.messagebox.clientHeight;
       });
     },
-    handleNewFlowSuccess: function handleNewFlowSuccess() {
-      this.$emit('success');
+    handleNewFlowSuccess: function handleNewFlowSuccess(type) {
+      if (type == 'taskRead') {
+        this.$emit('successRead', type);
+      } else {
+        this.$emit('success');
+      }
     },
     freeStartFlowSuccess: function freeStartFlowSuccess() {
       this.showFreeStartFlow = false;
@@ -34859,7 +34885,6 @@ function mainvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
       // this.$emit('success');
     },
     handleChange: function handleChange(val, isForStartFlow) {
-      console.log('handleChange val', val);
       this.getNodeInfoForStartFlow(val, isForStartFlow);
       this.$parent.$emit('flowChange', val);
     },
@@ -36829,7 +36854,7 @@ function mainvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
                               customPresetUserJson: JSON.stringify(_this38.presetList),
                               presetUserJson: JSON.stringify(_this38.presetUserJson),
                               removeSignUserId: removeSignUserId,
-                              nextReadUserId: _this38.readMultiple ? _this38.mixReadList && _this38.mixReadList.join('|') : _this38.nextNode.nextReadUserId,
+                              nextReadUserId: _this38.readMultiple ? _this38.mixReadList ? _this38.mixReadList.join('|') : '' : _this38.nextNode.nextReadUserId.join(','),
                               nextOrgId: !_this38.isShowNextUser ? _this38.multiple ? _this38.mixOrgIdList && _this38.mixOrgIdList.join('|') : _this38.nextNode.nextOrgId : '',
                               presetReadUserId: _this38.mixPresetList && _this38.mixPresetList.length > 0 ? _this38.mixPresetList.join('|') : _this38.nextNode.presetReadUserId.join(','),
                               notificationType: notificationType
@@ -36937,7 +36962,7 @@ function mainvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
                     customPresetUserJson: JSON.stringify(_this38.presetList),
                     presetUserJson: JSON.stringify(_this38.presetUserJson),
                     removeSignUserId: removeSignUserId,
-                    nextReadUserId: _this38.readMultiple ? _this38.mixReadList && _this38.mixReadList.join('|') : _this38.nextNode.nextReadUserId,
+                    nextReadUserId: _this38.readMultiple ? _this38.mixReadList ? _this38.mixReadList.join('|') : '' : _this38.nextNode.nextReadUserId.join(','),
                     nextOrgId: !_this38.isShowNextUser ? _this38.multiple ? _this38.mixOrgIdList && _this38.mixOrgIdList.join('|') : _this38.nextNode.nextOrgId : '',
                     presetReadUserId: _this38.mixPresetList && _this38.mixPresetList.length > 0 ? _this38.mixPresetList.join('|') : _this38.nextNode.presetReadUserId.join(','),
                     notificationType: notificationType