eoss-ui 0.4.56 → 0.4.57

package/lib/flow-group.js

@@ -249,7 +249,9 @@ var ajax = function ajax(_ref) {
         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 () {
+          var remind = sessionStorage.getItem('remind');
+          !remind && (loginMsg = setTimeout(function () {
+            sessionStorage.setItem('remind', 1);
             eoss_element__WEBPACK_IMPORTED_MODULE_4__["MessageBox"].confirm(response.data.rCode === 69 ? '该账号在其他地方已登陆!' : '登录已过期，请重新登录!', '提示', response.data.rCode === 69 ? {
               confirmButtonText: '确定',
               closeOnClickModal: false,
@@ -276,7 +278,7 @@ var ajax = function ajax(_ref) {
                 }
               }
             }).catch(function (e) {});
-          }, 1000);
+          }, 1000));
         }
       } else if (response.data.rCode === 61) {
         clearTimeout(initAuth);

package/lib/flow-list.js

@@ -249,7 +249,9 @@ var ajax = function ajax(_ref) {
         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 () {
+          var remind = sessionStorage.getItem('remind');
+          !remind && (loginMsg = setTimeout(function () {
+            sessionStorage.setItem('remind', 1);
             eoss_element__WEBPACK_IMPORTED_MODULE_4__["MessageBox"].confirm(response.data.rCode === 69 ? '该账号在其他地方已登陆!' : '登录已过期，请重新登录!', '提示', response.data.rCode === 69 ? {
               confirmButtonText: '确定',
               closeOnClickModal: false,
@@ -276,7 +278,7 @@ var ajax = function ajax(_ref) {
                 }
               }
             }).catch(function (e) {});
-          }, 1000);
+          }, 1000));
         }
       } else if (response.data.rCode === 61) {
         clearTimeout(initAuth);

package/lib/flow.js

@@ -248,7 +248,9 @@ var ajax = function ajax(_ref) {
         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 () {
+          var remind = sessionStorage.getItem('remind');
+          !remind && (loginMsg = setTimeout(function () {
+            sessionStorage.setItem('remind', 1);
             eoss_element__WEBPACK_IMPORTED_MODULE_4__["MessageBox"].confirm(response.data.rCode === 69 ? '该账号在其他地方已登陆!' : '登录已过期，请重新登录!', '提示', response.data.rCode === 69 ? {
               confirmButtonText: '确定',
               closeOnClickModal: false,
@@ -275,7 +277,7 @@ var ajax = function ajax(_ref) {
                 }
               }
             }).catch(function (e) {});
-          }, 1000);
+          }, 1000));
         }
       } else if (response.data.rCode === 61) {
         clearTimeout(initAuth);
@@ -3046,7 +3048,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=88cb49c6&
+// 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=fd0d2338&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -3528,6 +3530,9 @@ var render = function () {
                                             {
                                               attrs: {
                                                 placeholder: "请选择下步操作",
+                                                disabled:
+                                                  _vm.operationList &&
+                                                  _vm.operationList.length == 1,
                                               },
                                               on: {
                                                 change: function ($event) {
@@ -3593,6 +3598,9 @@ var render = function () {
                                                   attrs: {
                                                     placeholder:
                                                       "请选择下步节点",
+                                                    disabled:
+                                                      _vm.nodeInfos &&
+                                                      _vm.nodeInfos.length == 1,
                                                   },
                                                   on: {
                                                     change: function ($event) {
@@ -3715,6 +3723,127 @@ var render = function () {
                                             1
                                           )
                                         : _vm._e(),
+                                      _vm.isHideCurrentOrg
+                                        ? _c(
+                                            "el-form-item",
+                                            {
+                                              attrs: {
+                                                prop: "nextCurrentOrgObj",
+                                                label: _vm.currentOrgName
+                                                  ? _vm.currentOrgName
+                                                  : "本单位",
+                                              },
+                                            },
+                                            [
+                                              _c("SelectUser", {
+                                                attrs: {
+                                                  nextUser:
+                                                    _vm.nextCurrentOrgObjSelect,
+                                                  multiple: "",
+                                                  mix: "",
+                                                  types: [
+                                                    "department",
+                                                    "employee",
+                                                  ],
+                                                  params: {
+                                                    filid: _vm.userModel.orgId,
+                                                  },
+                                                },
+                                                on: {
+                                                  change: function ($event) {
+                                                    _vm.disposeAppUnit(
+                                                      $event,
+                                                      "nextCurrentOrgObjSelect"
+                                                    )
+                                                  },
+                                                },
+                                              }),
+                                            ],
+                                            1
+                                          )
+                                        : _vm._e(),
+                                      _vm.isHideOtherOrg
+                                        ? _c(
+                                            "el-form-item",
+                                            {
+                                              attrs: {
+                                                prop: "nextOtherOrgObj",
+                                                label: _vm.otherOrgName
+                                                  ? _vm.otherOrgName
+                                                  : "外单位",
+                                              },
+                                            },
+                                            [
+                                              _c("SelectUser", {
+                                                attrs: {
+                                                  nextUser:
+                                                    _vm.nextOtherOrgObjSelect,
+                                                  multiple: "",
+                                                  mix: "",
+                                                  types: ["enterprise"],
+                                                  params: { filid: "all" },
+                                                },
+                                                on: {
+                                                  change: function ($event) {
+                                                    _vm.disposeAppUnit(
+                                                      $event,
+                                                      "nextOtherOrgObjSelect"
+                                                    )
+                                                  },
+                                                },
+                                              }),
+                                            ],
+                                            1
+                                          )
+                                        : _vm._e(),
+                                      _vm.isMainSubProcess
+                                        ? _c(
+                                            "el-form-item",
+                                            {
+                                              attrs: {
+                                                prop: "mainSubId",
+                                                label: "主办",
+                                              },
+                                            },
+                                            [
+                                              _c(
+                                                "el-select",
+                                                {
+                                                  attrs: {
+                                                    placeholder: "请选择主办",
+                                                  },
+                                                  model: {
+                                                    value:
+                                                      _vm.nextNode.mainSubId,
+                                                    callback: function ($$v) {
+                                                      _vm.$set(
+                                                        _vm.nextNode,
+                                                        "mainSubId",
+                                                        $$v
+                                                      )
+                                                    },
+                                                    expression:
+                                                      "nextNode.mainSubId",
+                                                  },
+                                                },
+                                                _vm._l(
+                                                  _vm.subProcessColumns,
+                                                  function (items) {
+                                                    return _c("el-option", {
+                                                      key: items.id,
+                                                      attrs: {
+                                                        label: items.name,
+                                                        value: items.value,
+                                                      },
+                                                    })
+                                                  }
+                                                ),
+                                                1
+                                              ),
+                                            ],
+                                            1
+                                          )
+                                        : _vm._e(),
                                       _vm.nodeType !== 0 &&
                                       _vm.isLimitedTimeHandling === 1
                                         ? _c("TimeLimit", {
@@ -4423,7 +4552,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/flow/src/main.vue?vue&type=template&id=88cb49c6&
+// CONCATENATED MODULE: ./packages/flow/src/main.vue?vue&type=template&id=fd0d2338&
 
 // EXTERNAL MODULE: external "babel-runtime/regenerator"
 var regenerator_ = __webpack_require__(9);
@@ -9482,8 +9611,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=31232218&
-var startTaskReadvue_type_template_id_31232218_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=503131e8&
+var startTaskReadvue_type_template_id_503131e8_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -9858,11 +9987,11 @@ var startTaskReadvue_type_template_id_31232218_render = function () {
     1
   )
 }
-var startTaskReadvue_type_template_id_31232218_staticRenderFns = []
-startTaskReadvue_type_template_id_31232218_render._withStripped = true
+var startTaskReadvue_type_template_id_503131e8_staticRenderFns = []
+startTaskReadvue_type_template_id_503131e8_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/flow/src/startTaskRead.vue?vue&type=template&id=31232218&
+// CONCATENATED MODULE: ./packages/flow/src/startTaskRead.vue?vue&type=template&id=503131e8&
 
 // 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; };
@@ -10040,7 +10169,7 @@ var startTaskReadvue_type_script_lang_js_components;
       },
       mixList: [],
       newSelectUserList: [],
-      orgId: 3,
+      orgId: '',
       noticeList: [],
       userOptions: [],
       selectCheck: [],
@@ -10059,18 +10188,18 @@ var startTaskReadvue_type_script_lang_js_components;
         tab = {
           employee: {
             param: {
-              filid: sessionStorage.getItem('orgId'),
+              filid: this.orgId,
               name: '本单位用户'
             }
           },
-          department: { param: { filid: sessionStorage.getItem('orgId') } },
+          department: { param: { filid: this.orgId } },
           enterprise: {}
         };
       } else {
         tab = {
           employee: {
             param: {
-              filid: sessionStorage.getItem('orgId')
+              filid: this.orgId
             }
           }
         };
@@ -10080,6 +10209,9 @@ var startTaskReadvue_type_script_lang_js_components;
   },
   mounted: function mounted() {
     this.getFind();
+    if (util["a" /* default */].getStorage('mainConfig')) {
+      this.orgId = JSON.parse(util["a" /* default */].getStorage('mainConfig')).userModel.orgId;
+    }
   },
 
   methods: {
@@ -10129,14 +10261,14 @@ var startTaskReadvue_type_script_lang_js_components;
         this.multiple = false;
       }
       if (val == 1 || val == 2 || val == 5) {
-        this.params.filid = util["a" /* default */].getStorage('orgId');
+        this.params.filid = this.orgId;
         if (choiceOrgId) {
           this.params.filid = choiceOrgId;
         }
       }
       if (val == 5 || val == 6) {
-        this.params.filid = util["a" /* default */].getStorage('orgId');
-        this.params.deptid = util["a" /* default */].getStorage('orgId');
+        this.params.filid = this.orgId;
+        this.params.deptid = this.orgId;
         if (choiceDeptId) {
           this.params.deptid = choiceDeptId;
         }
@@ -10145,14 +10277,14 @@ var startTaskReadvue_type_script_lang_js_components;
         }
       }
       if (val == 15 || val == 16) {
-        this.params.filid = util["a" /* default */].getStorage('orgId');
+        this.params.filid = this.orgId;
         if (pOrgId) {
           this.params.filid = pOrgId;
         }
       }
     },
     isMultiple: function isMultiple() {
-      var orgId = sessionStorage.getItem('orgId');
+      var orgId = this.orgId;
       if (this.configInfo.selectPersonValue == 1) {
         this.multiple = false;
         this.params.filid = orgId;
@@ -10459,8 +10591,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_31232218_render,
-  startTaskReadvue_type_template_id_31232218_staticRenderFns,
+  startTaskReadvue_type_template_id_503131e8_render,
+  startTaskReadvue_type_template_id_503131e8_staticRenderFns,
   false,
   null,
   null,
@@ -11758,6 +11890,38 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
 //
 //
 //
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
 
 
 
@@ -11805,6 +11969,9 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
 
     return _ref = {
       userModel: {},
+      nextOtherOrgObjSelect: [],
+      subProcessColumns: [],
+      nextCurrentOrgObjSelect: [],
       loading: null, // 加载中
       newTypeCode: '',
       NodeName: '', // 当前节点值
@@ -11897,13 +12064,16 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
       removeSignUserId: [], // 减签办理人
       nextUserId: [], // 下步办理人
       nextOrgId: [], //办理对象
+      nextCurrentOrgObj: [],
       nextCurrentOrgObjSerialId: [], //本单位用户
+      nextOtherOrgObj: [], //外单位
       nextReadUserId: [], //分阅用户
       presetReadUserId: [], //自动分阅
       handleExplain: '', //办理意见
       notificationType: [], // 通知方式
-      isLimitedTime: '2' // 是否限时办理
-    }, _ref.nodeInfos = [], _ref.nextFlowNode = '', _ref.nodeInfo = {
+      isLimitedTime: '2', // 是否限时办理
+      mainSubId: ''
+    }, _ref.nodeInfos = [], _ref.nextFlowNode = '', _ref.currentOrgName = '', _ref.otherOrgName = '', _ref.nodeInfo = {
       nextNode: '',
       nextUser: '',
       option: []
@@ -11981,6 +12151,36 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
     }
   },
   methods: {
+    getsubProcessColumns: function getsubProcessColumns() {
+      if (!this.isMainSubProcess) return [];
+      var data = [];
+      var obj = { name: '[部门员工]-' };
+      if (this.nextCurrentOrgObjSelect.length > 0) {
+        this.nextCurrentOrgObjSelect.map(function (x) {
+          if (x.stype == 'employee') {
+            obj.name = !obj.value ? obj.name + x.showname : obj.name + ',' + x.showname;
+            obj.value = obj.value ? obj.value + ',' + x.showid : 'employee-' + x.showid;
+          } else {
+            data.push({
+              name: '[部门]' + x.showname,
+              value: 'department-' + x.showid
+            });
+          }
+        });
+      }
+      obj.value && data.push(obj);
+      if (this.nextOtherOrgObjSelect.length > 0) {
+        this.nextOtherOrgObjSelect.map(function (x) {
+          data.push({
+            name: '[企业]' + x.showname,
+            value: 'enterprise-' + x.showid
+          });
+        });
+      }
+      this.subProcessColumns = data;
+      // return data;
+    },
+
     // 分阅是否多选
     isReadMultiple: function isReadMultiple(nextReadUserSelectType) {
       if (nextReadUserSelectType == 1) {
@@ -12713,6 +12913,7 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
       if (type) {
         this.isNextUser = false;
         this.isShowNode = false;
+        this.isMainSubProcess = false;
         this.nextNode.nextNodeId = '';
         this.nextNode.isReturnSubmitter = 0;
         this.nextNode.isUndertakeReply = 0;
@@ -12863,6 +13064,8 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
               choiceOrgId = _res$data2.choiceOrgId,
               choiceDeptId = _res$data2.choiceDeptId,
               pOrgId = _res$data2.pOrgId,
+              currentOrgName = _res$data2.currentOrgName,
+              otherOrgName = _res$data2.otherOrgName,
               taskExamine = _res$data2.taskExamine,
               nodeInfoMap = _res$data2.nodeInfoMap,
               canRemoveSignUserList = _res$data2.canRemoveSignUserList,
@@ -12878,6 +13081,8 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
               taskButtonList = _res$data2.taskButtonList;
 
           _this14.$emit('startTaskRead', res);
+          _this14.currentOrgName = currentOrgName;
+          _this14.otherOrgName = otherOrgName;
           _this14.endFlowInfo.choiceOrgId = choiceOrgId;
           _this14.endFlowInfo.choiceDeptId = choiceDeptId;
           _this14.endFlowInfo.pendingId = _this14.pendingId;
@@ -13029,7 +13234,7 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
               }
             });
           }
-          _this14.isMainSubProcess = res.data.isMainSubProcess === true;
+          _this14.isMainSubProcess = res.data.isMainSubProcess == 'true';
           _this14.isCustomPreset = isCustomPreset;
           _this14.isPreset = isPreset;
           _this14.presetTaskNodeMap = presetTaskNodeMap;
@@ -13221,7 +13426,7 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
               switch (_context.prev = _context.next) {
                 case 0:
                   if (!valid) {
-                    _context.next = 56;
+                    _context.next = 59;
                     break;
                   }
 
@@ -13311,6 +13516,15 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
                   return _context.abrupt('return');
 
                 case 24:
+                  if (!(_this18.isHideCurrentOrg && !_this18.nextNode.nextCurrentOrgObjJson)) {
+                    _context.next = 27;
+                    break;
+                  }
+
+                  _this18.$message.warning('\u8BF7\u9009\u62E9' + (_this18.currentOrgName || '本单位'));
+                  return _context.abrupt('return');
+
+                case 27:
                   str = '';
 
                   if (_this18.value) {
@@ -13330,10 +13544,10 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
                   if (_this18.nextNode.nextOperate != 0 && _this18.nextNode.nextOperate != 1) {
                     delete _this18.nextNode.nextNodeId;
                   }
-                  _context.next = 32;
+                  _context.next = 35;
                   return _this18.saveInfo('subMit');
 
-                case 32:
+                case 35:
                   _this18.loading = util["a" /* default */].loading(_this18.$loading, '加载中...');
 
                   notificationType = '';
@@ -13395,10 +13609,10 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
                     }
                   }));
 
-                case 56:
+                case 59:
                   return _context.abrupt('return', false);
 
-                case 57:
+                case 60:
                 case 'end':
                   return _context.stop();
               }
@@ -13410,6 +13624,38 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
           return _ref2.apply(this, arguments);
         };
       }());
+    },
+
+    // 单位选择完回调
+    disposeAppUnit: function disposeAppUnit(res, type) {
+      var label = type.substring(0, type.lastIndexOf('Select'));
+      this.nextNode[label + 'Name'] = '';
+      res.options && (this[type] = res.options);
+      var obj = {};
+      // if (typeof res.mixList == 'array')
+      res.mixList && (this.nextNode[label] = res.mixList.join('|'));
+      res.options.map(function (item) {
+        if (obj[item.stype]) {
+          obj[item.stype].push(item.showname);
+        } else {
+          obj[item.stype] = [item.showname];
+        }
+      });
+      for (var key in obj) {
+        if (key === 'enterprise' && this.nextNode[label + 'Name'].indexOf('[企业]') == -1) {
+          this.nextNode[label + 'Name'] = this.nextNode[label + 'Name'] ? this.nextNode[label + 'Name'] + '|' + '[企业]-' + obj[key].join(',') : '' + '[企业]-' + obj[key].join(',');
+        }
+        if (key === 'department' && this.nextNode[label + 'Name'].indexOf('[部门]') == -1) {
+          this.nextNode[label + 'Name'] = this.nextNode[label + 'Name'] ? this.nextNode[label + 'Name'] + '|' + '[部门]-' + obj[key].join(',') : '' + '[部门]-' + obj[key].join(',');
+        }
+        if (key === 'employee' && this.nextNode[label + 'Name'].indexOf('[部门员工]') == -1) {
+          this.nextNode[label + 'Name'] = this.nextNode[label + 'Name'] ? this.nextNode[label + 'Name'] + '|' + '[部门员工]-' + obj[key].join(',') : '' + '[部门员工]-' + obj[key].join(',');
+        }
+      }
+      // this.nextNode[label + 'Name'] = obj.enterprise?;
+      this.nextNode[label + 'SerialId'] = res.nextUser.join(',');
+      this.nextNode[label + 'Json'] = JSON.stringify(res.options);
+      this.getsubProcessColumns();
     }
   }
 });