eoss-ui 0.8.18 → 0.8.19

package/lib/eoss-ui.common.js

@@ -18249,8 +18249,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=e13b4ef2&
-var mainvue_type_template_id_e13b4ef2_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=26e121c2&
+var mainvue_type_template_id_26e121c2_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -22903,7 +22903,7 @@ var mainvue_type_template_id_e13b4ef2_render = function () {
                                                             event
                                                           ) {
                                                             _vm.handleBlur(
-                                                              item.name,
+                                                              item,
                                                               event
                                                             )
                                                           },
@@ -22911,7 +22911,7 @@ var mainvue_type_template_id_e13b4ef2_render = function () {
                                                             event
                                                           ) {
                                                             _vm.handleFocus(
-                                                              item.name,
+                                                              item,
                                                               event
                                                             )
                                                           },
@@ -22919,7 +22919,7 @@ var mainvue_type_template_id_e13b4ef2_render = function () {
                                                             val
                                                           ) {
                                                             _vm.handleInput(
-                                                              item.name,
+                                                              item,
                                                               val
                                                             )
                                                           },
@@ -22927,7 +22927,7 @@ var mainvue_type_template_id_e13b4ef2_render = function () {
                                                             $event
                                                           ) {
                                                             _vm.handleClear(
-                                                              item.name
+                                                              item
                                                             )
                                                           },
                                                           change: function (
@@ -24532,11 +24532,11 @@ var mainvue_type_template_id_e13b4ef2_render = function () {
       )
     : _vm._e()
 }
-var mainvue_type_template_id_e13b4ef2_staticRenderFns = []
-mainvue_type_template_id_e13b4ef2_render._withStripped = true
+var mainvue_type_template_id_26e121c2_staticRenderFns = []
+mainvue_type_template_id_26e121c2_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/form/src/main.vue?vue&type=template&id=e13b4ef2&
+// CONCATENATED MODULE: ./packages/form/src/main.vue?vue&type=template&id=26e121c2&
 
 // CONCATENATED MODULE: ./src/utils/rules.js
 // 手机号
@@ -27964,6 +27964,7 @@ var mainvue_type_script_lang_js_pageView = utils_util.getParams('pageView');
       }
     },
     handleFocus: function handleFocus(a, b, c) {
+      console.log('handleFocus focus', a);
       if (a.events && a.events.focus) {
         a.events.focus(a.name, b, c, this.models);
       } else if (this.events[a.name] && this.events[a.name].focus) {
@@ -28399,8 +28400,8 @@ var mainvue_type_script_lang_js_pageView = utils_util.getParams('pageView');
 
 var form_src_main_component = normalizeComponent(
   packages_form_src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_e13b4ef2_render,
-  mainvue_type_template_id_e13b4ef2_staticRenderFns,
+  mainvue_type_template_id_26e121c2_render,
+  mainvue_type_template_id_26e121c2_staticRenderFns,
   false,
   null,
   null,
@@ -28417,8 +28418,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=e6becc8e&
-var mainvue_type_template_id_e6becc8e_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=3f77c73e&
+var mainvue_type_template_id_3f77c73e_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -31497,11 +31498,11 @@ var mainvue_type_template_id_e6becc8e_render = function () {
       )
     : _vm._e()
 }
-var mainvue_type_template_id_e6becc8e_staticRenderFns = []
-mainvue_type_template_id_e6becc8e_render._withStripped = true
+var mainvue_type_template_id_3f77c73e_staticRenderFns = []
+mainvue_type_template_id_3f77c73e_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/flow/src/main.vue?vue&type=template&id=e6becc8e&
+// CONCATENATED MODULE: ./packages/flow/src/main.vue?vue&type=template&id=3f77c73e&
 
 // 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=7b4f1542&
 var CommonOpinionsvue_type_template_id_7b4f1542_render = function () {
@@ -32552,8 +32553,8 @@ var CommonOpinions_component = normalizeComponent(
 )
 
 /* harmony default export */ var CommonOpinions = (CommonOpinions_component.exports);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow/src/processForm.vue?vue&type=template&id=5c2c1688&
-var processFormvue_type_template_id_5c2c1688_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow/src/processForm.vue?vue&type=template&id=ac123c98&
+var processFormvue_type_template_id_ac123c98_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -32835,7 +32836,8 @@ var processFormvue_type_template_id_5c2c1688_render = function () {
                           multiple: "",
                           mix: "",
                           showTooltip: _vm.showTooltip,
-                          types: ["employee", "persongroup"],
+                          selectUserList: _vm.nextCurrentOrgselectUserList,
+                          types: _vm.currentOrgSelectorTabs,
                           params: _vm.currentOrgSelectorParams,
                         },
                         on: {
@@ -33387,14 +33389,14 @@ var processFormvue_type_template_id_5c2c1688_render = function () {
     1
   )
 }
-var processFormvue_type_template_id_5c2c1688_staticRenderFns = []
-processFormvue_type_template_id_5c2c1688_render._withStripped = true
+var processFormvue_type_template_id_ac123c98_staticRenderFns = []
+processFormvue_type_template_id_ac123c98_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/flow/src/processForm.vue?vue&type=template&id=5c2c1688&
+// CONCATENATED MODULE: ./packages/flow/src/processForm.vue?vue&type=template&id=ac123c98&
 
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow/src/selectUser.vue?vue&type=template&id=24301b52&
-var selectUservue_type_template_id_24301b52_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/selectUser.vue?vue&type=template&id=e270ebde&
+var selectUservue_type_template_id_e270ebde_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -33555,11 +33557,11 @@ var selectUservue_type_template_id_24301b52_render = function () {
     1
   )
 }
-var selectUservue_type_template_id_24301b52_staticRenderFns = []
-selectUservue_type_template_id_24301b52_render._withStripped = true
+var selectUservue_type_template_id_e270ebde_staticRenderFns = []
+selectUservue_type_template_id_e270ebde_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/flow/src/selectUser.vue?vue&type=template&id=24301b52&
+// CONCATENATED MODULE: ./packages/flow/src/selectUser.vue?vue&type=template&id=e270ebde&
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow/src/selectUser.vue?vue&type=script&lang=js&
 var selectUservue_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; };
@@ -33976,7 +33978,6 @@ var selectUservue_type_script_lang_js_extends = Object.assign || function (targe
       if (this.mix) data = this.getMixList();
       if (this.newMultiple) {
         this.newNextUser = [];
-
         this.newSelectUserList.map(function (item) {
           if (_this4.mix) {
             _this4.newOptions.push(selectUservue_type_script_lang_js_extends({}, item, {
@@ -34090,8 +34091,8 @@ var selectUservue_type_script_lang_js_extends = Object.assign || function (targe
 
 var selectUser_component = normalizeComponent(
   src_selectUservue_type_script_lang_js_,
-  selectUservue_type_template_id_24301b52_render,
-  selectUservue_type_template_id_24301b52_staticRenderFns,
+  selectUservue_type_template_id_e270ebde_render,
+  selectUservue_type_template_id_e270ebde_staticRenderFns,
   false,
   null,
   null,
@@ -35348,6 +35349,11 @@ var processFormvue_type_script_lang_js_components;
 //
 //
 //
+//
+//
+//
+//
+//
 
 
 
@@ -35446,6 +35452,7 @@ var processFormvue_type_script_lang_js_components;
       selectUser: false,
       multiple: false,
       readMultiple: true,
+      currentOrgSelectorTabs: ['employee', 'persongroup'],
       customPresetHintMessage: '', //流程预设标题
       nextNodeCheckType: 'select',
       nextOperateCheckType: 'select',
@@ -35456,6 +35463,7 @@ var processFormvue_type_script_lang_js_components;
       show: true,
       enableCustomLimitTimeSetting: false,
       radioList: [],
+      nextCurrentOrgselectUserList: [],
       showCustomLimitTimeText: false,
       activeNames: '',
       selectUserList: [],
@@ -36199,11 +36207,45 @@ var processFormvue_type_script_lang_js_components;
           _this7.allLoading.close();
         }
         if (status === 'success') {
+          if (_this7.currentOrgSelectorParams.department && !_this7.currentOrgSelectorParams.department.roleid && _this7.selectorParams.roleid && nodeExtAttr.deptRoleCode) {
+            _this7.currentOrgSelectorParams.department.roleid = nodeExtAttr.deptRoleCode;
+          }
           _this7.isCurrentNodeForbiddenChangeCandidate = nodeExtAttr.isCurrentNodeForbiddenChangeCandidate;
           _this7.nextNode.userInfo = nextUserList;
           _this7.countersignaturetypeCode = countersignaturetypeCode;
           _this7.nextNode.countersignaturetypeText = countersignaturetypeText;
           _this7.enableCustomLimitTimeSetting = nodeExtAttr.enableCustomLimitTimeSetting == 1;
+          if (nodeMoreInfo.currentOrgDefaultSelectObjectItems) {
+            _this7.nextCurrentOrgselectUserList = [];
+            if (nodeMoreInfo.currentOrgDefaultSelectObjectItems.deptIds.length > 0) {
+              nodeMoreInfo.currentOrgDefaultSelectObjectItems.deptIds.map(function (x, i) {
+                _this7.nextCurrentOrgselectUserList.push({
+                  showname: nodeMoreInfo.currentOrgDefaultSelectObjectItems.deptNames[i],
+                  showid: x,
+                  stype: 'department'
+                });
+              });
+            }
+            if (nodeMoreInfo.currentOrgDefaultSelectObjectItems.userIds.length > 0) {
+              nodeMoreInfo.currentOrgDefaultSelectObjectItems.userIds.map(function (x, i) {
+                _this7.nextCurrentOrgselectUserList.push({
+                  showname: nodeMoreInfo.currentOrgDefaultSelectObjectItems.userNames[i],
+                  showid: x,
+                  stype: 'employee'
+                });
+              });
+            }
+            if (nodeMoreInfo.currentOrgDefaultSelectObjectItems.orgIds.length > 0) {
+              nodeMoreInfo.currentOrgDefaultSelectObjectItems.orgIds.map(function (x, i) {
+                _this7.nextCurrentOrgselectUserList.push({
+                  showname: nodeMoreInfo.currentOrgDefaultSelectObjectItems.orgNames[i],
+                  showid: x,
+                  stype: 'enterprise'
+                });
+              });
+            }
+            _this7.nextNode.nextCurrentOrgObj = nodeMoreInfo.currentOrgDefaultSelectObjects;
+          }
           if (_this7.enableCustomLimitTimeSetting && nodeMoreInfo.defaultCustomLimitDays) {
             _this7.nextNode.customLimitTime = _this7.nextNode.customLimitTimeText = nodeMoreInfo.defaultCustomLimitDays + '';
           }
@@ -36400,6 +36442,18 @@ var processFormvue_type_script_lang_js_components;
           });
           data.nextNodeCheckType && (_this9.nextNodeCheckType = data.nextNodeCheckType);
           data.nextOperateCheckType && (_this9.nextOperateCheckType = data.nextOperateCheckType);
+          if (data.currentOrgSelectorParams) {
+            if (data.currentOrgSelectorParams.enableCurrentOrgConfig == 'true') {
+              _this9.currentOrgSelectorTabs = data.currentOrgSelectorParams.currentOrgType.split(',');
+              var currentOrgparams = data.currentOrgSelectorParams.currentOrgRange.split(',');
+              _this9.currentOrgSelectorTabs.map(function (x, i) {
+                _this9.currentOrgSelectorParams[x] = {
+                  filid: currentOrgparams[i] == 'my' ? JSON.parse(utils_util.getStorage('mainConfig')).userModel.orgId : currentOrgparams[i],
+                  only_filid: true
+                };
+              });
+            }
+          }
           _this9.customPresetHintMessage = data.customPresetHintMessage;
           _this9.readOnlyNotificationType = data.readOnlyNotificationType;
           _this9.notificationMessageReadOnly = data.notificationMessageReadOnly == 'true';
@@ -36506,8 +36560,8 @@ var processFormvue_type_script_lang_js_components;
 
 var processForm_component = normalizeComponent(
   src_processFormvue_type_script_lang_js_,
-  processFormvue_type_template_id_5c2c1688_render,
-  processFormvue_type_template_id_5c2c1688_staticRenderFns,
+  processFormvue_type_template_id_ac123c98_render,
+  processFormvue_type_template_id_ac123c98_staticRenderFns,
   false,
   null,
   null,
@@ -50893,6 +50947,9 @@ function flow_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return func
           if (_this30.enableCustomLimitTimeSetting && data.nodeMoreInfo.defaultCustomLimitDays) {
             _this30.nextNode.customLimitTime = _this30.nextNode.customLimitTimeText = data.nodeMoreInfo.defaultCustomLimitDays + '';
           }
+          if (_this30.currentOrgSelectorParams.department && !_this30.currentOrgSelectorParams.department.roleid && _this30.selectorParams.roleid && data.nodeExtAttr.deptRoleCode) {
+            _this30.currentOrgSelectorParams.department.roleid = data.nodeExtAttr.deptRoleCode;
+          }
           if (data.nodeMoreInfo.currentOrgDefaultSelectObjectItems) {
             if (data.nodeMoreInfo.currentOrgDefaultSelectObjectItems.deptIds.length > 0) {
               data.nodeMoreInfo.currentOrgDefaultSelectObjectItems.deptIds.map(function (x, i) {
@@ -51262,7 +51319,8 @@ function flow_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return func
             _this32.currentOrgSelectorTabs.map(function (x, i) {
               _this32.currentOrgSelectorParams[x] = {
                 filid: currentOrgparams[i] == 'my' ? choiceOrgId : currentOrgparams[i],
-                only_filid: true
+                only_filid: true,
+                roleid: _this32.selectorParams.roleid
               };
             });
           }
@@ -52130,7 +52188,6 @@ function flow_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return func
 
     // 单位选择完回调
     disposeAppUnit: function disposeAppUnit(res, type) {
-      console.log(res, '选完了');
       var label = type.substring(0, type.lastIndexOf('Select'));
       this.nextNode[label + 'Name'] = '';
       res.options && (this[type] = res.options);
@@ -52176,8 +52233,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_e6becc8e_render,
-  mainvue_type_template_id_e6becc8e_staticRenderFns,
+  mainvue_type_template_id_3f77c73e_render,
+  mainvue_type_template_id_3f77c73e_staticRenderFns,
   false,
   null,
   null,
@@ -103020,7 +103077,7 @@ if (typeof window !== 'undefined' && window.Vue) {
 }
 
 /* harmony default export */ var src_0 = __webpack_exports__["default"] = ({
-  version: '0.8.18',
+  version: '0.8.19',
   install: install,
   Button: packages_button,
   ButtonGroup: button_group,

package/lib/flow.js

@@ -4834,7 +4834,7 @@ module.exports = require("vuedraggable");
 // ESM COMPAT FLAG
 __webpack_require__.r(__webpack_exports__);
 
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow/src/main.vue?vue&type=template&id=e6becc8e&
+// 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=3f77c73e&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -7918,7 +7918,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/flow/src/main.vue?vue&type=template&id=e6becc8e&
+// CONCATENATED MODULE: ./packages/flow/src/main.vue?vue&type=template&id=3f77c73e&
 
 // EXTERNAL MODULE: external "babel-runtime/regenerator"
 var regenerator_ = __webpack_require__(4);
@@ -8982,8 +8982,8 @@ var CommonOpinions_component = Object(componentNormalizer["a" /* default */])(
 )
 
 /* harmony default export */ var CommonOpinions = (CommonOpinions_component.exports);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow/src/processForm.vue?vue&type=template&id=5c2c1688&
-var processFormvue_type_template_id_5c2c1688_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow/src/processForm.vue?vue&type=template&id=ac123c98&
+var processFormvue_type_template_id_ac123c98_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -9265,7 +9265,8 @@ var processFormvue_type_template_id_5c2c1688_render = function () {
                           multiple: "",
                           mix: "",
                           showTooltip: _vm.showTooltip,
-                          types: ["employee", "persongroup"],
+                          selectUserList: _vm.nextCurrentOrgselectUserList,
+                          types: _vm.currentOrgSelectorTabs,
                           params: _vm.currentOrgSelectorParams,
                         },
                         on: {
@@ -9817,14 +9818,14 @@ var processFormvue_type_template_id_5c2c1688_render = function () {
     1
   )
 }
-var processFormvue_type_template_id_5c2c1688_staticRenderFns = []
-processFormvue_type_template_id_5c2c1688_render._withStripped = true
+var processFormvue_type_template_id_ac123c98_staticRenderFns = []
+processFormvue_type_template_id_ac123c98_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/flow/src/processForm.vue?vue&type=template&id=5c2c1688&
+// CONCATENATED MODULE: ./packages/flow/src/processForm.vue?vue&type=template&id=ac123c98&
 
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow/src/selectUser.vue?vue&type=template&id=24301b52&
-var selectUservue_type_template_id_24301b52_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/selectUser.vue?vue&type=template&id=e270ebde&
+var selectUservue_type_template_id_e270ebde_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -9985,11 +9986,11 @@ var selectUservue_type_template_id_24301b52_render = function () {
     1
   )
 }
-var selectUservue_type_template_id_24301b52_staticRenderFns = []
-selectUservue_type_template_id_24301b52_render._withStripped = true
+var selectUservue_type_template_id_e270ebde_staticRenderFns = []
+selectUservue_type_template_id_e270ebde_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/flow/src/selectUser.vue?vue&type=template&id=24301b52&
+// CONCATENATED MODULE: ./packages/flow/src/selectUser.vue?vue&type=template&id=e270ebde&
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow/src/selectUser.vue?vue&type=script&lang=js&
 var _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; };
@@ -10406,7 +10407,6 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
       if (this.mix) data = this.getMixList();
       if (this.newMultiple) {
         this.newNextUser = [];
-
         this.newSelectUserList.map(function (item) {
           if (_this4.mix) {
             _this4.newOptions.push(_extends({}, item, {
@@ -10520,8 +10520,8 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
 
 var selectUser_component = Object(componentNormalizer["a" /* default */])(
   src_selectUservue_type_script_lang_js_,
-  selectUservue_type_template_id_24301b52_render,
-  selectUservue_type_template_id_24301b52_staticRenderFns,
+  selectUservue_type_template_id_e270ebde_render,
+  selectUservue_type_template_id_e270ebde_staticRenderFns,
   false,
   null,
   null,
@@ -11778,6 +11778,11 @@ var processFormvue_type_script_lang_js_components;
 //
 //
 //
+//
+//
+//
+//
+//
 
 
 
@@ -11876,6 +11881,7 @@ var processFormvue_type_script_lang_js_components;
       selectUser: false,
       multiple: false,
       readMultiple: true,
+      currentOrgSelectorTabs: ['employee', 'persongroup'],
       customPresetHintMessage: '', //流程预设标题
       nextNodeCheckType: 'select',
       nextOperateCheckType: 'select',
@@ -11886,6 +11892,7 @@ var processFormvue_type_script_lang_js_components;
       show: true,
       enableCustomLimitTimeSetting: false,
       radioList: [],
+      nextCurrentOrgselectUserList: [],
       showCustomLimitTimeText: false,
       activeNames: '',
       selectUserList: [],
@@ -12629,11 +12636,45 @@ var processFormvue_type_script_lang_js_components;
           _this7.allLoading.close();
         }
         if (status === 'success') {
+          if (_this7.currentOrgSelectorParams.department && !_this7.currentOrgSelectorParams.department.roleid && _this7.selectorParams.roleid && nodeExtAttr.deptRoleCode) {
+            _this7.currentOrgSelectorParams.department.roleid = nodeExtAttr.deptRoleCode;
+          }
           _this7.isCurrentNodeForbiddenChangeCandidate = nodeExtAttr.isCurrentNodeForbiddenChangeCandidate;
           _this7.nextNode.userInfo = nextUserList;
           _this7.countersignaturetypeCode = countersignaturetypeCode;
           _this7.nextNode.countersignaturetypeText = countersignaturetypeText;
           _this7.enableCustomLimitTimeSetting = nodeExtAttr.enableCustomLimitTimeSetting == 1;
+          if (nodeMoreInfo.currentOrgDefaultSelectObjectItems) {
+            _this7.nextCurrentOrgselectUserList = [];
+            if (nodeMoreInfo.currentOrgDefaultSelectObjectItems.deptIds.length > 0) {
+              nodeMoreInfo.currentOrgDefaultSelectObjectItems.deptIds.map(function (x, i) {
+                _this7.nextCurrentOrgselectUserList.push({
+                  showname: nodeMoreInfo.currentOrgDefaultSelectObjectItems.deptNames[i],
+                  showid: x,
+                  stype: 'department'
+                });
+              });
+            }
+            if (nodeMoreInfo.currentOrgDefaultSelectObjectItems.userIds.length > 0) {
+              nodeMoreInfo.currentOrgDefaultSelectObjectItems.userIds.map(function (x, i) {
+                _this7.nextCurrentOrgselectUserList.push({
+                  showname: nodeMoreInfo.currentOrgDefaultSelectObjectItems.userNames[i],
+                  showid: x,
+                  stype: 'employee'
+                });
+              });
+            }
+            if (nodeMoreInfo.currentOrgDefaultSelectObjectItems.orgIds.length > 0) {
+              nodeMoreInfo.currentOrgDefaultSelectObjectItems.orgIds.map(function (x, i) {
+                _this7.nextCurrentOrgselectUserList.push({
+                  showname: nodeMoreInfo.currentOrgDefaultSelectObjectItems.orgNames[i],
+                  showid: x,
+                  stype: 'enterprise'
+                });
+              });
+            }
+            _this7.nextNode.nextCurrentOrgObj = nodeMoreInfo.currentOrgDefaultSelectObjects;
+          }
           if (_this7.enableCustomLimitTimeSetting && nodeMoreInfo.defaultCustomLimitDays) {
             _this7.nextNode.customLimitTime = _this7.nextNode.customLimitTimeText = nodeMoreInfo.defaultCustomLimitDays + '';
           }
@@ -12830,6 +12871,18 @@ var processFormvue_type_script_lang_js_components;
           });
           data.nextNodeCheckType && (_this9.nextNodeCheckType = data.nextNodeCheckType);
           data.nextOperateCheckType && (_this9.nextOperateCheckType = data.nextOperateCheckType);
+          if (data.currentOrgSelectorParams) {
+            if (data.currentOrgSelectorParams.enableCurrentOrgConfig == 'true') {
+              _this9.currentOrgSelectorTabs = data.currentOrgSelectorParams.currentOrgType.split(',');
+              var currentOrgparams = data.currentOrgSelectorParams.currentOrgRange.split(',');
+              _this9.currentOrgSelectorTabs.map(function (x, i) {
+                _this9.currentOrgSelectorParams[x] = {
+                  filid: currentOrgparams[i] == 'my' ? JSON.parse(util["a" /* default */].getStorage('mainConfig')).userModel.orgId : currentOrgparams[i],
+                  only_filid: true
+                };
+              });
+            }
+          }
           _this9.customPresetHintMessage = data.customPresetHintMessage;
           _this9.readOnlyNotificationType = data.readOnlyNotificationType;
           _this9.notificationMessageReadOnly = data.notificationMessageReadOnly == 'true';
@@ -12936,8 +12989,8 @@ var processFormvue_type_script_lang_js_components;
 
 var processForm_component = Object(componentNormalizer["a" /* default */])(
   src_processFormvue_type_script_lang_js_,
-  processFormvue_type_template_id_5c2c1688_render,
-  processFormvue_type_template_id_5c2c1688_staticRenderFns,
+  processFormvue_type_template_id_ac123c98_render,
+  processFormvue_type_template_id_ac123c98_staticRenderFns,
   false,
   null,
   null,
@@ -27168,6 +27221,9 @@ function mainvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
           if (_this30.enableCustomLimitTimeSetting && data.nodeMoreInfo.defaultCustomLimitDays) {
             _this30.nextNode.customLimitTime = _this30.nextNode.customLimitTimeText = data.nodeMoreInfo.defaultCustomLimitDays + '';
           }
+          if (_this30.currentOrgSelectorParams.department && !_this30.currentOrgSelectorParams.department.roleid && _this30.selectorParams.roleid && data.nodeExtAttr.deptRoleCode) {
+            _this30.currentOrgSelectorParams.department.roleid = data.nodeExtAttr.deptRoleCode;
+          }
           if (data.nodeMoreInfo.currentOrgDefaultSelectObjectItems) {
             if (data.nodeMoreInfo.currentOrgDefaultSelectObjectItems.deptIds.length > 0) {
               data.nodeMoreInfo.currentOrgDefaultSelectObjectItems.deptIds.map(function (x, i) {
@@ -27537,7 +27593,8 @@ function mainvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
             _this32.currentOrgSelectorTabs.map(function (x, i) {
               _this32.currentOrgSelectorParams[x] = {
                 filid: currentOrgparams[i] == 'my' ? choiceOrgId : currentOrgparams[i],
-                only_filid: true
+                only_filid: true,
+                roleid: _this32.selectorParams.roleid
               };
             });
           }
@@ -28405,7 +28462,6 @@ function mainvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
 
     // 单位选择完回调
     disposeAppUnit: function disposeAppUnit(res, type) {
-      console.log(res, '选完了');
       var label = type.substring(0, type.lastIndexOf('Select'));
       this.nextNode[label + 'Name'] = '';
       res.options && (this[type] = res.options);

package/lib/form.js

@@ -4651,7 +4651,7 @@ module.exports = require("qs");
 // 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/form/src/main.vue?vue&type=template&id=e13b4ef2&
+// 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=26e121c2&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -9305,7 +9305,7 @@ var render = function () {
                                                             event
                                                           ) {
                                                             _vm.handleBlur(
-                                                              item.name,
+                                                              item,
                                                               event
                                                             )
                                                           },
@@ -9313,7 +9313,7 @@ var render = function () {
                                                             event
                                                           ) {
                                                             _vm.handleFocus(
-                                                              item.name,
+                                                              item,
                                                               event
                                                             )
                                                           },
@@ -9321,7 +9321,7 @@ var render = function () {
                                                             val
                                                           ) {
                                                             _vm.handleInput(
-                                                              item.name,
+                                                              item,
                                                               val
                                                             )
                                                           },
@@ -9329,7 +9329,7 @@ var render = function () {
                                                             $event
                                                           ) {
                                                             _vm.handleClear(
-                                                              item.name
+                                                              item
                                                             )
                                                           },
                                                           change: function (
@@ -10938,7 +10938,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/form/src/main.vue?vue&type=template&id=e13b4ef2&
+// CONCATENATED MODULE: ./packages/form/src/main.vue?vue&type=template&id=26e121c2&
 
 // EXTERNAL MODULE: external "babel-runtime/regenerator"
 var regenerator_ = __webpack_require__(4);
@@ -14363,6 +14363,7 @@ var pageView = util["a" /* default */].getParams('pageView');
       }
     },
     handleFocus: function handleFocus(a, b, c) {
+      console.log('handleFocus focus', a);
       if (a.events && a.events.focus) {
         a.events.focus(a.name, b, c, this.models);
       } else if (this.events[a.name] && this.events[a.name].focus) {