eoss-ui 0.4.56 → 0.4.58

package/lib/eoss-ui.common.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);
@@ -292,6 +294,7 @@ var ajax = function ajax(_ref) {
               return h('es-retrial-auth', {
                 ref: 'auth',
                 props: {
+                  reload: response.data.results.reload || response.data.results.refresh,
                   group: response.data.results.retrialAuthGroupIds,
                   type: response.data.results.retrialAuthType,
                   msgBox: msgBox
@@ -4639,8 +4642,8 @@ clients_src_main.install = function (Vue) {
 };
 
 /* harmony default export */ var clients = (clients_src_main);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/data-table/src/main.vue?vue&type=template&id=59cbc514&
-var mainvue_type_template_id_59cbc514_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/data-table/src/main.vue?vue&type=template&id=4aace4e3&
+var mainvue_type_template_id_4aace4e3_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -4974,11 +4977,11 @@ var mainvue_type_template_id_59cbc514_render = function () {
     1
   )
 }
-var mainvue_type_template_id_59cbc514_staticRenderFns = []
-mainvue_type_template_id_59cbc514_render._withStripped = true
+var mainvue_type_template_id_4aace4e3_staticRenderFns = []
+mainvue_type_template_id_4aace4e3_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/data-table/src/main.vue?vue&type=template&id=59cbc514&
+// CONCATENATED MODULE: ./packages/data-table/src/main.vue?vue&type=template&id=4aace4e3&
 
 // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/data-table/src/children.vue?vue&type=template&id=796433ee&
 var childrenvue_type_template_id_796433ee_render = function () {
@@ -8320,6 +8323,7 @@ var mainvue_type_script_lang_js_components;
       this.$emit('next', res);
     },
     hanleSearch: function hanleSearch(data) {
+      console.log(data);
       this.wheres = data;
       if (this.url) {
         if (this.response !== undefined) {
@@ -8463,8 +8467,8 @@ var mainvue_type_script_lang_js_components;
 
 var data_table_src_main_component = normalizeComponent(
   packages_data_table_src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_59cbc514_render,
-  mainvue_type_template_id_59cbc514_staticRenderFns,
+  mainvue_type_template_id_4aace4e3_render,
+  mainvue_type_template_id_4aace4e3_staticRenderFns,
   false,
   null,
   null,
@@ -12985,8 +12989,8 @@ error_page_src_main.install = function (Vue) {
 };
 
 /* harmony default export */ var error_page = (error_page_src_main);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/form/src/main.vue?vue&type=template&id=7011090d&
-var mainvue_type_template_id_7011090d_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/form/src/main.vue?vue&type=template&id=0312e450&
+var mainvue_type_template_id_0312e450_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -23272,11 +23276,11 @@ var mainvue_type_template_id_7011090d_render = function () {
       )
     : _vm._e()
 }
-var mainvue_type_template_id_7011090d_staticRenderFns = []
-mainvue_type_template_id_7011090d_render._withStripped = true
+var mainvue_type_template_id_0312e450_staticRenderFns = []
+mainvue_type_template_id_0312e450_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/form/src/main.vue?vue&type=template&id=7011090d&
+// CONCATENATED MODULE: ./packages/form/src/main.vue?vue&type=template&id=0312e450&
 
 // CONCATENATED MODULE: ./src/utils/rules.js
 // 手机号
@@ -27568,7 +27572,7 @@ function src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return function
                   switch (_context2.prev = _context2.next) {
                     case 0:
                       if (valid) {
-                        _this7.$emit('submit', _this7.models, res);
+                        _this7.$emit('submit', _this7.getNewValue(utils_util["a" /* default */].extend({}, _this7._value, _this7.models), res), res);
                       } else {
                         _this7.setScroll(valid, triggers, _this7.$refs.scrollbar);
                       }
@@ -27595,21 +27599,21 @@ function src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return function
       } else if (res.event === 'stepPrev') {
         this.stepActive -= 1;
         this.$emit('stepChange', this.stepActive);
-        this.$emit('stepPrev', res, this.models, this.getNewValue(this.models, res));
+        this.$emit('stepPrev', res, this.models, this.getNewValue(utils_util["a" /* default */].extend({}, this._value, this.models), res));
       } else if (res.event === 'stepNext') {
         this.$refs.esForm.validate(function (valid, fields, triggers) {
           if (valid) {
             _this7.stepActive += 1;
             _this7.$emit('stepChange', _this7.stepActive);
-            _this7.$emit('stepNext', res, _this7.models, _this7.getNewValue(_this7.models, res));
+            _this7.$emit('stepNext', res, _this7.models, _this7.getNewValue(utils_util["a" /* default */].extend({}, _this7._value, _this7.models), res));
           } else {
             _this7.setScroll(valid, triggers, _this7.$refs.scrollbar);
           }
         });
       } else if (res.verify === false) {
-        this.$emit('click', res, this.models, this.getNewValue(this.models, res));
+        this.$emit('click', res, this.models, this.getNewValue(utils_util["a" /* default */].extend({}, this._value, this.models), res));
       } else {
-        this.$emit('click', res, this.models, this.getNewValue(this.models, res));
+        this.$emit('click', res, this.models, this.getNewValue(utils_util["a" /* default */].extend({}, this._value, this.models), res));
       }
     },
     IdCardToInfo: function IdCardToInfo(id, res, type) {
@@ -27654,25 +27658,25 @@ function src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return function
       var _this8 = this;
 
       if (Object.prototype.hasOwnProperty.call(a, 'idCard')) {
-        var _obj = this.IdCardToInfo(b, a);
-        if (_obj) {
+        var obj = this.IdCardToInfo(b, a);
+        if (obj) {
           if (Array.isArray(a.idCard)) {
             a.idCard.forEach(function (item) {
               if ((typeof item === 'undefined' ? 'undefined' : mainvue_type_script_lang_js_typeof(item)) === 'object') {
                 for (var i in item) {
                   if (typeof item[i] === 'string') {
-                    _this8.$set(_this8.models, i, _obj[item[i]]);
+                    _this8.$set(_this8.models, i, obj[item[i]]);
                   } else {
-                    _this8.$set(_this8.models, i, item[i][_obj.sex]);
+                    _this8.$set(_this8.models, i, item[i][obj.sex]);
                   }
                 }
               } else {
-                _this8.$set(_this8.models, item, _obj[item]);
+                _this8.$set(_this8.models, item, obj[item]);
               }
             });
           } else {
-            this.$set(this.models, 'age', _obj.age);
-            this.$set(this.models, 'sex', _obj.sex);
+            this.$set(this.models, 'age', obj.age);
+            this.$set(this.models, 'sex', obj.sex);
           }
         }
       }
@@ -27999,7 +28003,7 @@ function src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return function
           models[handle.table] = handle.join ? ids.join(',') : ids;
         }
       }
-
+      var obj = JSON.parse(JSON.stringify(models));
       if (this.within) {
         //within:把提交数据装到指定属性中
         var newData = {};
@@ -28024,11 +28028,10 @@ function src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return function
       if (this.formatSubmit) {
         //formatSubmit:提交数据装到masterData或者指定属性中
         var masterData = {};
-        var _obj2 = JSON.parse(JSON.stringify(models));
         if (typeof this.formatSubmit === 'string') {
-          masterData[this.formatSubmit] = _obj2;
+          masterData[this.formatSubmit] = obj;
         } else {
-          masterData['masterData'] = _obj2;
+          masterData['masterData'] = obj;
         }
         models = masterData;
       }
@@ -28082,8 +28085,8 @@ function src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return function
 
 var form_src_main_component = normalizeComponent(
   packages_form_src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_7011090d_render,
-  mainvue_type_template_id_7011090d_staticRenderFns,
+  mainvue_type_template_id_0312e450_render,
+  mainvue_type_template_id_0312e450_staticRenderFns,
   false,
   null,
   null,
@@ -28100,8 +28103,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=88cb49c6&
-var mainvue_type_template_id_88cb49c6_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=fd0d2338&
+var mainvue_type_template_id_fd0d2338_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -28582,6 +28585,9 @@ var mainvue_type_template_id_88cb49c6_render = function () {
                                             {
                                               attrs: {
                                                 placeholder: "请选择下步操作",
+                                                disabled:
+                                                  _vm.operationList &&
+                                                  _vm.operationList.length == 1,
                                               },
                                               on: {
                                                 change: function ($event) {
@@ -28647,6 +28653,9 @@ var mainvue_type_template_id_88cb49c6_render = function () {
                                                   attrs: {
                                                     placeholder:
                                                       "请选择下步节点",
+                                                    disabled:
+                                                      _vm.nodeInfos &&
+                                                      _vm.nodeInfos.length == 1,
                                                   },
                                                   on: {
                                                     change: function ($event) {
@@ -28769,6 +28778,127 @@ var mainvue_type_template_id_88cb49c6_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", {
@@ -29473,11 +29603,11 @@ var mainvue_type_template_id_88cb49c6_render = function () {
       )
     : _vm._e()
 }
-var mainvue_type_template_id_88cb49c6_staticRenderFns = []
-mainvue_type_template_id_88cb49c6_render._withStripped = true
+var mainvue_type_template_id_fd0d2338_staticRenderFns = []
+mainvue_type_template_id_fd0d2338_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&
 
 // 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 () {
@@ -34678,8 +34808,8 @@ var processReject_component = normalizeComponent(
 )
 
 /* 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
@@ -35054,11 +35184,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; };
@@ -35236,7 +35366,7 @@ var startTaskReadvue_type_script_lang_js_components;
       },
       mixList: [],
       newSelectUserList: [],
-      orgId: 3,
+      orgId: '',
       noticeList: [],
       userOptions: [],
       selectCheck: [],
@@ -35255,18 +35385,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
             }
           }
         };
@@ -35276,6 +35406,9 @@ var startTaskReadvue_type_script_lang_js_components;
   },
   mounted: function mounted() {
     this.getFind();
+    if (utils_util["a" /* default */].getStorage('mainConfig')) {
+      this.orgId = JSON.parse(utils_util["a" /* default */].getStorage('mainConfig')).userModel.orgId;
+    }
   },
 
   methods: {
@@ -35325,14 +35458,14 @@ var startTaskReadvue_type_script_lang_js_components;
         this.multiple = false;
       }
       if (val == 1 || val == 2 || val == 5) {
-        this.params.filid = utils_util["a" /* default */].getStorage('orgId');
+        this.params.filid = this.orgId;
         if (choiceOrgId) {
           this.params.filid = choiceOrgId;
         }
       }
       if (val == 5 || val == 6) {
-        this.params.filid = utils_util["a" /* default */].getStorage('orgId');
-        this.params.deptid = utils_util["a" /* default */].getStorage('orgId');
+        this.params.filid = this.orgId;
+        this.params.deptid = this.orgId;
         if (choiceDeptId) {
           this.params.deptid = choiceDeptId;
         }
@@ -35341,14 +35474,14 @@ var startTaskReadvue_type_script_lang_js_components;
         }
       }
       if (val == 15 || val == 16) {
-        this.params.filid = utils_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;
@@ -35655,8 +35788,8 @@ var startTaskReadvue_type_script_lang_js_components;
 
 var startTaskRead_component = normalizeComponent(
   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,
@@ -36954,6 +37087,38 @@ function flow_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return func
 //
 //
 //
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
 
 
 
@@ -37001,6 +37166,9 @@ function flow_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return func
 
     return _ref = {
       userModel: {},
+      nextOtherOrgObjSelect: [],
+      subProcessColumns: [],
+      nextCurrentOrgObjSelect: [],
       loading: null, // 加载中
       newTypeCode: '',
       NodeName: '', // 当前节点值
@@ -37093,13 +37261,16 @@ function flow_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return func
       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: []
@@ -37177,6 +37348,36 @@ function flow_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return func
     }
   },
   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) {
@@ -37909,6 +38110,7 @@ function flow_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return func
       if (type) {
         this.isNextUser = false;
         this.isShowNode = false;
+        this.isMainSubProcess = false;
         this.nextNode.nextNodeId = '';
         this.nextNode.isReturnSubmitter = 0;
         this.nextNode.isUndertakeReply = 0;
@@ -38059,6 +38261,8 @@ function flow_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return func
               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,
@@ -38074,6 +38278,8 @@ function flow_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return func
               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;
@@ -38225,7 +38431,7 @@ function flow_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return func
               }
             });
           }
-          _this14.isMainSubProcess = res.data.isMainSubProcess === true;
+          _this14.isMainSubProcess = res.data.isMainSubProcess == 'true';
           _this14.isCustomPreset = isCustomPreset;
           _this14.isPreset = isPreset;
           _this14.presetTaskNodeMap = presetTaskNodeMap;
@@ -38417,7 +38623,7 @@ function flow_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return func
               switch (_context.prev = _context.next) {
                 case 0:
                   if (!valid) {
-                    _context.next = 56;
+                    _context.next = 59;
                     break;
                   }
 
@@ -38507,6 +38713,15 @@ function flow_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return func
                   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) {
@@ -38526,10 +38741,10 @@ function flow_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return func
                   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 = utils_util["a" /* default */].loading(_this18.$loading, '加载中...');
 
                   notificationType = '';
@@ -38591,10 +38806,10 @@ function flow_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return func
                     }
                   }));
 
-                case 56:
+                case 59:
                   return _context.abrupt('return', false);
 
-                case 57:
+                case 60:
                 case 'end':
                   return _context.stop();
               }
@@ -38606,6 +38821,38 @@ function flow_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return func
           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();
     }
   }
 });
@@ -38621,8 +38868,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_88cb49c6_render,
-  mainvue_type_template_id_88cb49c6_staticRenderFns,
+  mainvue_type_template_id_fd0d2338_render,
+  mainvue_type_template_id_fd0d2338_staticRenderFns,
   false,
   null,
   null,
@@ -43339,8 +43586,8 @@ label_src_main.install = function (Vue) {
 };
 
 /* harmony default export */ var packages_label = (label_src_main);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/login/src/main.vue?vue&type=template&id=cca116b4&
-var mainvue_type_template_id_cca116b4_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/login/src/main.vue?vue&type=template&id=49ebf1b6&
+var mainvue_type_template_id_49ebf1b6_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -44185,11 +44432,11 @@ var mainvue_type_template_id_cca116b4_render = function () {
       )
     : _vm._e()
 }
-var mainvue_type_template_id_cca116b4_staticRenderFns = []
-mainvue_type_template_id_cca116b4_render._withStripped = true
+var mainvue_type_template_id_49ebf1b6_staticRenderFns = []
+mainvue_type_template_id_49ebf1b6_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/login/src/main.vue?vue&type=template&id=cca116b4&
+// CONCATENATED MODULE: ./packages/login/src/main.vue?vue&type=template&id=49ebf1b6&
 
 // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/login/src/resetPassword.vue?vue&type=template&id=4f5da52e&
 var resetPasswordvue_type_template_id_4f5da52e_render = function () {
@@ -45785,6 +46032,7 @@ var login_src_mainvue_type_script_lang_js_extends = Object.assign || function (t
             type: 'success',
             duration: 1500,
             onClose: function onClose() {
+              sessionStorage.removeItem('remind');
               if (_this10.toUrl) {
                 window.location.href = _this10.toUrl;
               } else if (results.doorIndex && _this10.doorIndex) {
@@ -45875,8 +46123,8 @@ var login_src_mainvue_type_script_lang_js_extends = Object.assign || function (t
 
 var login_src_main_component = normalizeComponent(
   packages_login_src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_cca116b4_render,
-  mainvue_type_template_id_cca116b4_staticRenderFns,
+  mainvue_type_template_id_49ebf1b6_render,
+  mainvue_type_template_id_49ebf1b6_staticRenderFns,
   false,
   null,
   null,
@@ -45893,8 +46141,8 @@ login_src_main.install = function (Vue) {
 };
 
 /* harmony default export */ var login = (login_src_main);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/main.vue?vue&type=template&id=c4a4a110&
-var mainvue_type_template_id_c4a4a110_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/main.vue?vue&type=template&id=558be874&
+var mainvue_type_template_id_558be874_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -46317,11 +46565,11 @@ var mainvue_type_template_id_c4a4a110_render = function () {
     1
   )
 }
-var mainvue_type_template_id_c4a4a110_staticRenderFns = []
-mainvue_type_template_id_c4a4a110_render._withStripped = true
+var mainvue_type_template_id_558be874_staticRenderFns = []
+mainvue_type_template_id_558be874_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/main/src/main.vue?vue&type=template&id=c4a4a110&
+// CONCATENATED MODULE: ./packages/main/src/main.vue?vue&type=template&id=558be874&
 
 // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/userinfo.vue?vue&type=template&id=327101d6&
 var userinfovue_type_template_id_327101d6_render = function () {
@@ -49390,12 +49638,14 @@ var log = utils_util["a" /* default */].getParams('console');
           }
           break;
         case 'sys':
-          this.navIds = [node.id];
-          this.tabs = [];
-          this.menu = node.children;
-          this.title = node.text;
-          this.active = this.getFirst(node.children[0]).id;
-          this.isSide = true;
+          if (Number(node.urlopenmode) !== 1) {
+            this.navIds = [node.id];
+            this.tabs = [];
+            this.menu = node.children;
+            this.title = node.text;
+            this.active = this.getFirst(node.children[0]).id;
+            this.isSide = true;
+          }
           break;
         case 'sub':
           this.navIds = [node.id];
@@ -49845,8 +50095,8 @@ var log = utils_util["a" /* default */].getParams('console');
 
 var main_src_main_component = normalizeComponent(
   packages_main_src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_c4a4a110_render,
-  mainvue_type_template_id_c4a4a110_staticRenderFns,
+  mainvue_type_template_id_558be874_render,
+  mainvue_type_template_id_558be874_staticRenderFns,
   false,
   null,
   null,
@@ -56473,8 +56723,8 @@ radio_group_src_main.install = function (Vue) {
 };
 
 /* harmony default export */ var radio_group = (radio_group_src_main);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/retrial-auth/src/main.vue?vue&type=template&id=9a7a652e&
-var mainvue_type_template_id_9a7a652e_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/retrial-auth/src/main.vue?vue&type=template&id=74d02fd0&
+var mainvue_type_template_id_74d02fd0_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -56623,11 +56873,11 @@ var mainvue_type_template_id_9a7a652e_render = function () {
     1
   )
 }
-var mainvue_type_template_id_9a7a652e_staticRenderFns = []
-mainvue_type_template_id_9a7a652e_render._withStripped = true
+var mainvue_type_template_id_74d02fd0_staticRenderFns = []
+mainvue_type_template_id_74d02fd0_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/retrial-auth/src/main.vue?vue&type=template&id=9a7a652e&
+// CONCATENATED MODULE: ./packages/retrial-auth/src/main.vue?vue&type=template&id=74d02fd0&
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/retrial-auth/src/main.vue?vue&type=script&lang=js&
 //
@@ -56695,6 +56945,7 @@ mainvue_type_template_id_9a7a652e_render._withStripped = true
   name: 'EsRetrialAuth',
   inheritAttrs: false,
   props: {
+    reload: Boolean,
     group: String,
     type: Array,
     msgBox: {}
@@ -56803,7 +57054,7 @@ mainvue_type_template_id_9a7a652e_render._withStripped = true
                 type: 'success'
               });
               _this3.msgBox.handleClose();
-              utils_util["a" /* default */].win.top.location.reload();
+              _this3.reload && utils_util["a" /* default */].win.top.location.reload();
             } else {
               _this3.$message({
                 message: msg,
@@ -56879,7 +57130,7 @@ mainvue_type_template_id_9a7a652e_render._withStripped = true
               type: 'success'
             });
             _this5.msgBox.handleClose();
-            utils_util["a" /* default */].win.top.location.reload();
+            _this5.reload && utils_util["a" /* default */].win.top.location.reload();
           } else {
             _this5.scanCode = setTimeout(function () {
               _this5.handleScanCodeRetrialAuth();
@@ -56910,8 +57161,8 @@ mainvue_type_template_id_9a7a652e_render._withStripped = true
 
 var retrial_auth_src_main_component = normalizeComponent(
   packages_retrial_auth_src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_9a7a652e_render,
-  mainvue_type_template_id_9a7a652e_staticRenderFns,
+  mainvue_type_template_id_74d02fd0_render,
+  mainvue_type_template_id_74d02fd0_staticRenderFns,
   false,
   null,
   null,
@@ -66467,27 +66718,29 @@ var toolbar_src_mainvue_type_script_lang_js_extends = Object.assign || function
         }))]);
       }
       if (items.type === 'search') {
-        var _props;
-
         var itemClass = {
           radio: 'es-toolbar-item-radio',
           checkbox: 'es-toolbar-item-checkbox',
           switch: 'es-toolbar-item-switch'
         };
+        console.log();
         search = [h('es-form', {
           class: ['es-form-search', _this2.small ? 'es-form-search-small' : '', _this2.showFormBtn ? '' : 'es-form-search-nobtn'],
-          props: (_props = {
+          props: toolbar_src_mainvue_type_script_lang_js_extends({
+            showButton: items.showButton,
+            formatSubmit: items.formatSubmit
+          }, items.config || {}, {
             size: 'medium',
             showLabel: false,
             closeDialog: false,
             model: _this2.searchData,
             contents: items.contents,
-            showButton: items.showButton,
             itemClass: itemClass,
             inline: true,
             search: true,
-            isReset: items.reset
-          }, _props['showButton'] = _this2.showFormBtn, _props),
+            isReset: items.reset,
+            showButton: _this2.showFormBtn
+          }),
           on: {
             submit: function submit(data) {
               _this2.hanleSearch(data, items.multiCondition);
@@ -66531,12 +66784,14 @@ var toolbar_src_mainvue_type_script_lang_js_extends = Object.assign || function
         }, [h('es-form', {
           class: 'es-form-search',
           ref: 'filter',
-          props: {
+          props: toolbar_src_mainvue_type_script_lang_js_extends({
+            formatSubmit: items.formatSubmit
+          }, items.config || {}, {
             size: 'medium',
             closeDialog: false,
             model: _this2.advancedData,
             contents: items.contents
-          },
+          }),
           on: {
             submit: _this2.hanleSubmit,
             reset: _this2.hanleCancel
@@ -70416,8 +70671,8 @@ form_src_table.install = function (Vue) {
 };
 
 /* harmony default export */ var table_form = (form_src_table);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/upload/src/main.vue?vue&type=template&id=a73af130&
-var mainvue_type_template_id_a73af130_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/upload/src/main.vue?vue&type=template&id=3df48687&
+var mainvue_type_template_id_3df48687_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -70430,7 +70685,7 @@ var mainvue_type_template_id_a73af130_render = function () {
         class: [
           {
             "es-avatar-uploader": _vm.portrait,
-            "es-upload-readonly": _vm.isDisabled,
+            "es-upload-readonly": _vm.isReadonly,
           },
           "es-upload-" + _vm.listType,
         ],
@@ -70443,7 +70698,8 @@ var mainvue_type_template_id_a73af130_render = function () {
           "show-file-list": _vm.showList,
           "file-list": _vm.lists,
           "result-file": _vm.resultFile,
-          disabled: _vm.isDisabled,
+          disabled: _vm.isDisabled || _vm.isReadonly,
+          readonly: _vm.isReadonly,
           previewAdjunct: _vm.host + _vm.previewAdjunct,
           headers: _vm.headers,
           data: _vm.datas,
@@ -70543,7 +70799,10 @@ var mainvue_type_template_id_a73af130_render = function () {
                         })
                       : _c("i", {
                           staticClass: "avatar-uploader-icon",
-                          class: { "el-icon-plus": !_vm.isDisabled },
+                          class: {
+                            "el-icon-plus": !_vm.isReadonly,
+                            "is-disabled": _vm.isDisabled,
+                          },
                           style: {
                             width: _vm.width,
                             height: _vm.height,
@@ -70552,11 +70811,12 @@ var mainvue_type_template_id_a73af130_render = function () {
                         }),
                   ]
                 : [
-                    !_vm.isDisabled
+                    !_vm.isReadonly
                       ? [
                           _vm.selectType === "icon-plus"
                             ? _c("i", {
                                 staticClass: "el-icon-plus es-uploader-icon",
+                                class: { "is-disabled": _vm.isDisabled },
                               })
                             : _c(
                                 "el-button",
@@ -70566,6 +70826,7 @@ var mainvue_type_template_id_a73af130_render = function () {
                                   attrs: {
                                     type: _vm.selectType,
                                     size: _vm.btnSize,
+                                    disabled: _vm.isDisabled,
                                   },
                                 },
                                 [
@@ -70588,6 +70849,7 @@ var mainvue_type_template_id_a73af130_render = function () {
                                   attrs: {
                                     type: _vm.uploadType,
                                     size: _vm.btnSize,
+                                    disabled: _vm.isDisabled,
                                   },
                                   on: {
                                     click: function ($event) {
@@ -70760,11 +71022,11 @@ var mainvue_type_template_id_a73af130_render = function () {
     2
   )
 }
-var mainvue_type_template_id_a73af130_staticRenderFns = []
-mainvue_type_template_id_a73af130_render._withStripped = true
+var mainvue_type_template_id_3df48687_staticRenderFns = []
+mainvue_type_template_id_3df48687_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/upload/src/main.vue?vue&type=template&id=a73af130&
+// CONCATENATED MODULE: ./packages/upload/src/main.vue?vue&type=template&id=3df48687&
 
 // CONCATENATED MODULE: ./packages/upload/src/picture.js
 /* harmony default export */ var picture = ({
@@ -70953,6 +71215,10 @@ var mainvue_type_script_lang_js_props;
 //
 //
 //
+//
+//
+//
+//
 
 
 
@@ -71247,11 +71513,10 @@ var mainvue_type_script_lang_js_props;
       return false;
     },
     isDisabled: function isDisabled() {
-      if (this.readonly || this.disabled) {
-        return true;
-      } else {
-        return false;
-      }
+      return this.disabled || (this.elForm || {}).disabled;
+    },
+    isReadonly: function isReadonly() {
+      return this.readonly || (this.elForm || {}).readonly;
     },
     isRemove: function isRemove() {
       if (this.remove || this.deleted) {
@@ -71260,7 +71525,7 @@ var mainvue_type_script_lang_js_props;
       return false;
     },
     isSort: function isSort() {
-      return this.dragSort && !this.isDisabled;
+      return this.dragSort && !this.isDisabled && this.isReadonly;
     },
     datas: function datas() {
       if (this.data) {
@@ -71781,8 +72046,8 @@ var mainvue_type_script_lang_js_props;
 
 var upload_src_main_component = normalizeComponent(
   packages_upload_src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_a73af130_render,
-  mainvue_type_template_id_a73af130_staticRenderFns,
+  mainvue_type_template_id_3df48687_render,
+  mainvue_type_template_id_3df48687_staticRenderFns,
   false,
   null,
   null,
@@ -72262,7 +72527,7 @@ if (typeof window !== 'undefined' && window.Vue) {
 }
 
 /* harmony default export */ var src_0 = __webpack_exports__["default"] = ({
-  version: '0.4.56',
+  version: '0.4.58',
   install: install,
   Button: packages_button,
   ButtonGroup: button_group,