eoss-ui 0.4.33 → 0.4.35

package/lib/flow.js

@@ -244,7 +244,7 @@ var ajax = function ajax(_ref) {
     }
     if (response.status === 200) {
       if (response.data.rCode === 64 || response.data.rCode === 65 || response.data.rCode === 67 || response.data.rCode === 69) {
-        removeStorage(['Authorization', 'token', 'ssId', 'userId', 'userName', 'deviceUnique', 'menus', 'menus', 'useCaseCodes', 'mainConfig']);
+        removeStorage(['Authorization', 'token', 'ssId', 'userId', 'userName', 'deviceUnique', 'menus', 'menus', 'useCaseCodes', 'mainConfig', 'jump']);
         if (win.top.location.href.indexOf('#/login') === -1 && win.top.location.href.indexOf('/login.html') === -1) {
           clearTimeout(loginMsg);
           loginMsg = setTimeout(function () {
@@ -2871,7 +2871,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=20854a8d&
+// 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=c058ba80&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -3841,37 +3841,41 @@ var render = function () {
                     1
                   )
                 : _vm._e(),
-              _c(
-                "div",
-                { staticClass: "es-user-defined" },
-                _vm._l(_vm.btnList, function (item) {
-                  return _c(
-                    "el-button",
-                    {
-                      directives: [
+              _vm.nodeInfo.option.length > 0
+                ? _c(
+                    "div",
+                    { staticClass: "es-user-defined" },
+                    _vm._l(_vm.btnList, function (item) {
+                      return _c(
+                        "el-button",
                         {
-                          name: "show",
-                          rawName: "v-show",
-                          value: _vm.isSubmitButtonShowAgreeAndDisagree != 1,
-                          expression: "isSubmitButtonShowAgreeAndDisagree != 1",
-                        },
-                      ],
-                      key: item.name,
-                      style: _vm.btnStyle,
-                      attrs: { type: item.type },
-                      on: {
-                        click: function ($event) {
-                          item.event === "sub"
-                            ? _vm.subProcess()
-                            : _vm.saveInfo(false, item)
+                          directives: [
+                            {
+                              name: "show",
+                              rawName: "v-show",
+                              value:
+                                _vm.isSubmitButtonShowAgreeAndDisagree != 1,
+                              expression:
+                                "isSubmitButtonShowAgreeAndDisagree != 1",
+                            },
+                          ],
+                          key: item.name,
+                          style: _vm.btnStyle,
+                          attrs: { type: item.type },
+                          on: {
+                            click: function ($event) {
+                              item.event === "sub"
+                                ? _vm.subProcess()
+                                : _vm.saveInfo(false, item)
+                            },
+                          },
                         },
-                      },
-                    },
-                    [_vm._v("\n        " + _vm._s(item.text) + "\n      ")]
+                        [_vm._v("\n        " + _vm._s(item.text) + "\n      ")]
+                      )
+                    }),
+                    1
                   )
-                }),
-                1
-              ),
+                : _vm._e(),
               !_vm.isFlow
                 ? _c(
                     "div",
@@ -4196,7 +4200,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/flow/src/main.vue?vue&type=template&id=20854a8d&
+// CONCATENATED MODULE: ./packages/flow/src/main.vue?vue&type=template&id=c058ba80&
 
 // EXTERNAL MODULE: external "babel-runtime/regenerator"
 var regenerator_ = __webpack_require__(9);
@@ -10171,8 +10175,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/component/taskUnionExamine.vue?vue&type=template&id=5c89b454&
-var taskUnionExaminevue_type_template_id_5c89b454_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/taskUnionExamine.vue?vue&type=template&id=23e0402f&
+var taskUnionExaminevue_type_template_id_23e0402f_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -10374,7 +10378,7 @@ var taskUnionExaminevue_type_template_id_5c89b454_render = function () {
                 _c(
                   "el-button",
                   { attrs: { size: "small" }, on: { click: _vm.quit } },
-                  [_vm._v("\n          取消\n        ")]
+                  [_vm._v(" 取消 ")]
                 ),
               ],
               1
@@ -10387,11 +10391,11 @@ var taskUnionExaminevue_type_template_id_5c89b454_render = function () {
     1
   )
 }
-var taskUnionExaminevue_type_template_id_5c89b454_staticRenderFns = []
-taskUnionExaminevue_type_template_id_5c89b454_render._withStripped = true
+var taskUnionExaminevue_type_template_id_23e0402f_staticRenderFns = []
+taskUnionExaminevue_type_template_id_23e0402f_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/flow/src/component/taskUnionExamine.vue?vue&type=template&id=5c89b454&
+// CONCATENATED MODULE: ./packages/flow/src/component/taskUnionExamine.vue?vue&type=template&id=23e0402f&
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow/src/component/taskUnionExamine.vue?vue&type=script&lang=js&
 var taskUnionExaminevue_type_script_lang_js_components;
@@ -10502,8 +10506,6 @@ var taskUnionExaminevue_type_script_lang_js_components;
 //
 //
 //
-//
-//
 
 
 
@@ -10561,7 +10563,7 @@ var taskUnionExaminevue_type_script_lang_js_components;
         this.newMultiple = false;
       }
       if (this.type == 'takeAdvice') {
-        this.params.filid = sessionStorage.getItem('orgId');
+        this.params.filid = JSON.parse(sessionStorage.getItem('mainConfig')).userModel.orgId;
       }
     },
     subTaskReview: function subTaskReview() {
@@ -10747,8 +10749,8 @@ var taskUnionExaminevue_type_script_lang_js_components;
         data: {
           opinion: opinion,
           pendingId: pendingId,
-          nextOtherOrgObj: nextOtherOrgObj.join(','),
-          nextCurrentOrgObj: nextCurrentOrgObj.join(','),
+          nextOtherOrgObj: Array.isArray(nextOtherOrgObj) ? nextOtherOrgObj.join(',') : nextOtherOrgObj,
+          nextCurrentOrgObj: Array.isArray(nextCurrentOrgObj) ? nextCurrentOrgObj.join(',') : nextCurrentOrgObj,
           notificationMsg: noticeInfo,
           notificationType: noticeType.join(','),
           choiceDeptId: choiceDeptId,
@@ -10793,6 +10795,7 @@ var taskUnionExaminevue_type_script_lang_js_components;
           newNextUser = item.stype + '-' + item.id;
         }
       });
+      //console.log(options, newNextUser, 'newNextUser');
       this.infoList[type] = newNextUser;
     },
     getNodeType: function getNodeType() {
@@ -10871,8 +10874,8 @@ var taskUnionExaminevue_type_script_lang_js_components;
 
 var taskUnionExamine_component = Object(componentNormalizer["a" /* default */])(
   component_taskUnionExaminevue_type_script_lang_js_,
-  taskUnionExaminevue_type_template_id_5c89b454_render,
-  taskUnionExaminevue_type_template_id_5c89b454_staticRenderFns,
+  taskUnionExaminevue_type_template_id_23e0402f_render,
+  taskUnionExaminevue_type_template_id_23e0402f_staticRenderFns,
   false,
   null,
   null,
@@ -12084,6 +12087,7 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
         this.flowMultiple = true;
         this.flowDisabled = false;
         this.flowTitle = res.value;
+
         this.toTakeAdvice(res);
       } else if (res.fun === 'toUnionExamine()') {
         //联合审核
@@ -12125,13 +12129,14 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
     toTakeAdvice: function toTakeAdvice(res) {
       var _this10 = this;
 
+      //console.log(res,this.taskExamineInfo,'this.taskExamineInfo')
       var params = {
         url: api["T" /* isCanStartSubFlow */],
-        params: {
+        data: {
           appId: this.taskExamineInfo.appId,
           inevitableNode: res.inevitableNode
         },
-        method: 'POST',
+        method: 'post',
         headers: { Accept: 'application/json,text/plain' }
       };
       this.loading = util["a" /* default */].loading(this.$loading, '加载中...');
@@ -12200,7 +12205,7 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
           url: api["fb" /* rejectAndEnd */],
           headers: { Accept: 'application/json,text/plain' },
           method: 'post',
-          params: {
+          data: {
             opinion: _this11.value,
             pendingId: _this11.pendingId,
             isSinglePage: false
@@ -12674,17 +12679,21 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
 
         _this15.loading.close();
         if (status === 'success') {
-          _this15.nodeInfo.option = data.definitionList;
-          _this15.nodeInfo.nextNode = data.definitionList.filter(function (item) {
-            return item.processDefKey == _this15.defaultProcessKey;
-          });
-          if (_this15.nodeInfo.nextNode.length) {
-            _this15.nodeInfo.nextNode = _this15.nodeInfo.nextNode[0].processDefId;
+          if (!Object.keys(data).length || data.definitionList && !data.definitionList.length) {
+            _this15.$message.error('流程不存在或未关联对应流程！');
           } else {
-            if (data.definitionList.length == 1) {
-              _this15.nodeInfo.nextNode = data.definitionList[0].processDefId;
+            _this15.nodeInfo.option = data.definitionList;
+            _this15.nodeInfo.nextNode = data.definitionList.filter(function (item) {
+              return item.processDefKey == _this15.defaultProcessKey;
+            });
+            if (_this15.nodeInfo.nextNode.length) {
+              _this15.nodeInfo.nextNode = _this15.nodeInfo.nextNode[0].processDefId;
             } else {
-              _this15.nodeInfo.nextNode = '';
+              if (data.definitionList.length == 1) {
+                _this15.nodeInfo.nextNode = data.definitionList[0].processDefId;
+              } else {
+                _this15.nodeInfo.nextNode = '';
+              }
             }
           }
         } else {

package/lib/form.js

@@ -245,7 +245,7 @@ var ajax = function ajax(_ref) {
     }
     if (response.status === 200) {
       if (response.data.rCode === 64 || response.data.rCode === 65 || response.data.rCode === 67 || response.data.rCode === 69) {
-        removeStorage(['Authorization', 'token', 'ssId', 'userId', 'userName', 'deviceUnique', 'menus', 'menus', 'useCaseCodes', 'mainConfig']);
+        removeStorage(['Authorization', 'token', 'ssId', 'userId', 'userName', 'deviceUnique', 'menus', 'menus', 'useCaseCodes', 'mainConfig', 'jump']);
         if (win.top.location.href.indexOf('#/login') === -1 && win.top.location.href.indexOf('/login.html') === -1) {
           clearTimeout(loginMsg);
           loginMsg = setTimeout(function () {

package/lib/handle-user.js

@@ -245,7 +245,7 @@ var ajax = function ajax(_ref) {
     }
     if (response.status === 200) {
       if (response.data.rCode === 64 || response.data.rCode === 65 || response.data.rCode === 67 || response.data.rCode === 69) {
-        removeStorage(['Authorization', 'token', 'ssId', 'userId', 'userName', 'deviceUnique', 'menus', 'menus', 'useCaseCodes', 'mainConfig']);
+        removeStorage(['Authorization', 'token', 'ssId', 'userId', 'userName', 'deviceUnique', 'menus', 'menus', 'useCaseCodes', 'mainConfig', 'jump']);
         if (win.top.location.href.indexOf('#/login') === -1 && win.top.location.href.indexOf('/login.html') === -1) {
           clearTimeout(loginMsg);
           loginMsg = setTimeout(function () {
@@ -2664,7 +2664,7 @@ module.exports = require("axios");
 // 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/handle-user/src/main.vue?vue&type=template&id=2c792e83&
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/handle-user/src/main.vue?vue&type=template&id=3c113ae4&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -2752,7 +2752,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/handle-user/src/main.vue?vue&type=template&id=2c792e83&
+// CONCATENATED MODULE: ./packages/handle-user/src/main.vue?vue&type=template&id=3c113ae4&
 
 // EXTERNAL MODULE: ./src/config/api.js
 var api = __webpack_require__(1);
@@ -2862,7 +2862,7 @@ var util = __webpack_require__(0);
               type: 'success',
               duration: 500,
               onClose: function onClose() {
-                util["a" /* default */].removeStorage('mainConfig');
+                util["a" /* default */].removeStorage(['mainConfig', 'jump']);
                 util["a" /* default */].win.top.location.reload();
               }
             });

package/lib/handler.js

@@ -245,7 +245,7 @@ var ajax = function ajax(_ref) {
     }
     if (response.status === 200) {
       if (response.data.rCode === 64 || response.data.rCode === 65 || response.data.rCode === 67 || response.data.rCode === 69) {
-        removeStorage(['Authorization', 'token', 'ssId', 'userId', 'userName', 'deviceUnique', 'menus', 'menus', 'useCaseCodes', 'mainConfig']);
+        removeStorage(['Authorization', 'token', 'ssId', 'userId', 'userName', 'deviceUnique', 'menus', 'menus', 'useCaseCodes', 'mainConfig', 'jump']);
         if (win.top.location.href.indexOf('#/login') === -1 && win.top.location.href.indexOf('/login.html') === -1) {
           clearTimeout(loginMsg);
           loginMsg = setTimeout(function () {
@@ -2664,7 +2664,7 @@ module.exports = require("axios");
 // 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/handler/src/main.vue?vue&type=template&id=3cf1aa9e&
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/handler/src/main.vue?vue&type=template&id=01f71c21&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -2839,7 +2839,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/handler/src/main.vue?vue&type=template&id=3cf1aa9e&
+// CONCATENATED MODULE: ./packages/handler/src/main.vue?vue&type=template&id=01f71c21&
 
 // EXTERNAL MODULE: ./src/config/api.js
 var api = __webpack_require__(1);
@@ -3108,7 +3108,7 @@ var util = __webpack_require__(0);
       }).then(function () {
         util["a" /* default */].ajax({ method: 'post', url: api["V" /* logout */] }).then(function (res) {
           if (res.rCode == 0) {
-            util["a" /* default */].removeStorage(['Authorization', 'token', 'ssId', 'userId', 'userName', 'auth', 'deviceUnique', 'menus', 'useCaseCodes', 'mainConfig']);
+            util["a" /* default */].removeStorage(['Authorization', 'token', 'ssId', 'userId', 'userName', 'auth', 'deviceUnique', 'menus', 'useCaseCodes', 'mainConfig', 'jump']);
             if (_this.onQuit && typeof _this.onQuit === 'function') {
               _this.onQuit();
             } else {