eoss-ui 0.8.16 → 0.8.18

package/lib/button-group.js

@@ -4439,7 +4439,7 @@ var getUrgencyLevelChangedNotificationType = '/bpm/bpmBackend/getUrgencyLevelCha
 // 自由发起传阅查询
 var toFreeTaskCircularRead = '/bpm/bpmBackend/toFreeTaskCircularRead';
 // 提交是否二次确认
-var isCancelSecondConfirmation = '/bpm/task/taskHandle/isCancelSecondConfirmation.dhtml';
+var isCancelSecondConfirmation = flowPendingPrefix + '/task/taskHandle/isCancelSecondConfirmation.dhtml';
 
 // 自由发起传阅提交
 var freeTaskCircularRead = '/bpm/bpmBackend/freeTaskCircularRead';

package/lib/button.js

@@ -4441,7 +4441,7 @@ var getUrgencyLevelChangedNotificationType = '/bpm/bpmBackend/getUrgencyLevelCha
 // 自由发起传阅查询
 var toFreeTaskCircularRead = '/bpm/bpmBackend/toFreeTaskCircularRead';
 // 提交是否二次确认
-var isCancelSecondConfirmation = '/bpm/task/taskHandle/isCancelSecondConfirmation.dhtml';
+var isCancelSecondConfirmation = flowPendingPrefix + '/task/taskHandle/isCancelSecondConfirmation.dhtml';
 
 // 自由发起传阅提交
 var freeTaskCircularRead = '/bpm/bpmBackend/freeTaskCircularRead';

package/lib/calogin.js

@@ -4439,7 +4439,7 @@ var getUrgencyLevelChangedNotificationType = '/bpm/bpmBackend/getUrgencyLevelCha
 // 自由发起传阅查询
 var toFreeTaskCircularRead = '/bpm/bpmBackend/toFreeTaskCircularRead';
 // 提交是否二次确认
-var isCancelSecondConfirmation = '/bpm/task/taskHandle/isCancelSecondConfirmation.dhtml';
+var isCancelSecondConfirmation = flowPendingPrefix + '/task/taskHandle/isCancelSecondConfirmation.dhtml';
 
 // 自由发起传阅提交
 var freeTaskCircularRead = '/bpm/bpmBackend/freeTaskCircularRead';

package/lib/checkbox-group.js

@@ -4439,7 +4439,7 @@ var getUrgencyLevelChangedNotificationType = '/bpm/bpmBackend/getUrgencyLevelCha
 // 自由发起传阅查询
 var toFreeTaskCircularRead = '/bpm/bpmBackend/toFreeTaskCircularRead';
 // 提交是否二次确认
-var isCancelSecondConfirmation = '/bpm/task/taskHandle/isCancelSecondConfirmation.dhtml';
+var isCancelSecondConfirmation = flowPendingPrefix + '/task/taskHandle/isCancelSecondConfirmation.dhtml';
 
 // 自由发起传阅提交
 var freeTaskCircularRead = '/bpm/bpmBackend/freeTaskCircularRead';

package/lib/config/api.js

@@ -274,7 +274,7 @@ var getUrgencyLevelChangedNotificationType = exports.getUrgencyLevelChangedNotif
 // 自由发起传阅查询
 var toFreeTaskCircularRead = exports.toFreeTaskCircularRead = '/bpm/bpmBackend/toFreeTaskCircularRead';
 // 提交是否二次确认
-var isCancelSecondConfirmation = exports.isCancelSecondConfirmation = '/bpm/task/taskHandle/isCancelSecondConfirmation.dhtml';
+var isCancelSecondConfirmation = exports.isCancelSecondConfirmation = flowPendingPrefix + '/task/taskHandle/isCancelSecondConfirmation.dhtml';
 
 // 自由发起传阅提交
 var freeTaskCircularRead = exports.freeTaskCircularRead = '/bpm/bpmBackend/freeTaskCircularRead';

package/lib/data-table-form.js

@@ -4439,7 +4439,7 @@ var getUrgencyLevelChangedNotificationType = '/bpm/bpmBackend/getUrgencyLevelCha
 // 自由发起传阅查询
 var toFreeTaskCircularRead = '/bpm/bpmBackend/toFreeTaskCircularRead';
 // 提交是否二次确认
-var isCancelSecondConfirmation = '/bpm/task/taskHandle/isCancelSecondConfirmation.dhtml';
+var isCancelSecondConfirmation = flowPendingPrefix + '/task/taskHandle/isCancelSecondConfirmation.dhtml';
 
 // 自由发起传阅提交
 var freeTaskCircularRead = '/bpm/bpmBackend/freeTaskCircularRead';

package/lib/data-table.js

@@ -4439,7 +4439,7 @@ var getUrgencyLevelChangedNotificationType = '/bpm/bpmBackend/getUrgencyLevelCha
 // 自由发起传阅查询
 var toFreeTaskCircularRead = '/bpm/bpmBackend/toFreeTaskCircularRead';
 // 提交是否二次确认
-var isCancelSecondConfirmation = '/bpm/task/taskHandle/isCancelSecondConfirmation.dhtml';
+var isCancelSecondConfirmation = flowPendingPrefix + '/task/taskHandle/isCancelSecondConfirmation.dhtml';
 
 // 自由发起传阅提交
 var freeTaskCircularRead = '/bpm/bpmBackend/freeTaskCircularRead';

package/lib/date-picker.js

@@ -4441,7 +4441,7 @@ var getUrgencyLevelChangedNotificationType = '/bpm/bpmBackend/getUrgencyLevelCha
 // 自由发起传阅查询
 var toFreeTaskCircularRead = '/bpm/bpmBackend/toFreeTaskCircularRead';
 // 提交是否二次确认
-var isCancelSecondConfirmation = '/bpm/task/taskHandle/isCancelSecondConfirmation.dhtml';
+var isCancelSecondConfirmation = flowPendingPrefix + '/task/taskHandle/isCancelSecondConfirmation.dhtml';
 
 // 自由发起传阅提交
 var freeTaskCircularRead = '/bpm/bpmBackend/freeTaskCircularRead';

package/lib/dialog.js

@@ -4441,7 +4441,7 @@ var getUrgencyLevelChangedNotificationType = '/bpm/bpmBackend/getUrgencyLevelCha
 // 自由发起传阅查询
 var toFreeTaskCircularRead = '/bpm/bpmBackend/toFreeTaskCircularRead';
 // 提交是否二次确认
-var isCancelSecondConfirmation = '/bpm/task/taskHandle/isCancelSecondConfirmation.dhtml';
+var isCancelSecondConfirmation = flowPendingPrefix + '/task/taskHandle/isCancelSecondConfirmation.dhtml';
 
 // 自由发起传阅提交
 var freeTaskCircularRead = '/bpm/bpmBackend/freeTaskCircularRead';

package/lib/eoss-ui.common.js

@@ -1147,7 +1147,7 @@ var getUrgencyLevelChangedNotificationType = '/bpm/bpmBackend/getUrgencyLevelCha
 // 自由发起传阅查询
 var toFreeTaskCircularRead = '/bpm/bpmBackend/toFreeTaskCircularRead';
 // 提交是否二次确认
-var isCancelSecondConfirmation = '/bpm/task/taskHandle/isCancelSecondConfirmation.dhtml';
+var isCancelSecondConfirmation = flowPendingPrefix + '/task/taskHandle/isCancelSecondConfirmation.dhtml';
 
 // 自由发起传阅提交
 var freeTaskCircularRead = '/bpm/bpmBackend/freeTaskCircularRead';
@@ -28417,8 +28417,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=56a92ecc&
-var mainvue_type_template_id_56a92ecc_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=e6becc8e&
+var mainvue_type_template_id_e6becc8e_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -29842,6 +29842,8 @@ var mainvue_type_template_id_56a92ecc_render = function () {
                                                             _vm.showTooltip,
                                                           types:
                                                             _vm.currentOrgSelectorTabs,
+                                                          selectUserList:
+                                                            _vm.nextCurrentOrgselectUserList,
                                                           params:
                                                             _vm.currentOrgSelectorParams,
                                                         },
@@ -31495,11 +31497,11 @@ var mainvue_type_template_id_56a92ecc_render = function () {
       )
     : _vm._e()
 }
-var mainvue_type_template_id_56a92ecc_staticRenderFns = []
-mainvue_type_template_id_56a92ecc_render._withStripped = true
+var mainvue_type_template_id_e6becc8e_staticRenderFns = []
+mainvue_type_template_id_e6becc8e_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/flow/src/main.vue?vue&type=template&id=56a92ecc&
+// CONCATENATED MODULE: ./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/component/CommonOpinions.vue?vue&type=template&id=7b4f1542&
 var CommonOpinionsvue_type_template_id_7b4f1542_render = function () {
@@ -33391,8 +33393,8 @@ processFormvue_type_template_id_5c2c1688_render._withStripped = true
 
 // CONCATENATED MODULE: ./packages/flow/src/processForm.vue?vue&type=template&id=5c2c1688&
 
-// 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=5424da0a&
-var selectUservue_type_template_id_5424da0a_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=24301b52&
+var selectUservue_type_template_id_24301b52_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -33553,11 +33555,11 @@ var selectUservue_type_template_id_5424da0a_render = function () {
     1
   )
 }
-var selectUservue_type_template_id_5424da0a_staticRenderFns = []
-selectUservue_type_template_id_5424da0a_render._withStripped = true
+var selectUservue_type_template_id_24301b52_staticRenderFns = []
+selectUservue_type_template_id_24301b52_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/flow/src/selectUser.vue?vue&type=template&id=5424da0a&
+// CONCATENATED MODULE: ./packages/flow/src/selectUser.vue?vue&type=template&id=24301b52&
 
 // 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; };
@@ -33870,6 +33872,7 @@ var selectUservue_type_script_lang_js_extends = Object.assign || function (targe
     }
   },
   mounted: function mounted() {
+    console.log(this.nextUser, 'nextUser');
     this.classify = utils_util.getStorage('classify') != undefined ? utils_util.getStorage('classify') : true;
   },
 
@@ -34087,8 +34090,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_5424da0a_render,
-  selectUservue_type_template_id_5424da0a_staticRenderFns,
+  selectUservue_type_template_id_24301b52_render,
+  selectUservue_type_template_id_24301b52_staticRenderFns,
   false,
   null,
   null,
@@ -49415,6 +49418,7 @@ function flow_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return func
 //
 //
 //
+//
 
 
 
@@ -49573,6 +49577,7 @@ function flow_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return func
       nextOtherOrgObjSelect: [],
       subProcessColumns: [],
       nextCurrentOrgObjSelect: [],
+      nextCurrentOrgselectUserList: [],
       loading: null, // 加载中
       newTypeCode: '',
       NodeName: '', // 当前节点值
@@ -50888,6 +50893,23 @@ 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 (data.nodeMoreInfo.currentOrgDefaultSelectObjectItems) {
+            if (data.nodeMoreInfo.currentOrgDefaultSelectObjectItems.deptIds.length > 0) {
+              data.nodeMoreInfo.currentOrgDefaultSelectObjectItems.deptIds.map(function (x, i) {
+                _this30.nextCurrentOrgselectUserList.push({ showname: data.nodeMoreInfo.currentOrgDefaultSelectObjectItems.deptNames[i], showid: x, stype: 'department' });
+              });
+            }
+            if (data.nodeMoreInfo.currentOrgDefaultSelectObjectItems.userIds.length > 0) {
+              data.nodeMoreInfo.currentOrgDefaultSelectObjectItems.userIds.map(function (x, i) {
+                _this30.nextCurrentOrgselectUserList.push({ showname: data.nodeMoreInfo.currentOrgDefaultSelectObjectItems.userNames[i], showid: x, stype: 'employee' });
+              });
+            }
+            if (data.nodeMoreInfo.currentOrgDefaultSelectObjectItems.orgIds.length > 0) {
+              data.nodeMoreInfo.currentOrgDefaultSelectObjectItems.orgIds.map(function (x, i) {
+                _this30.nextCurrentOrgselectUserList.push({ showname: data.nodeMoreInfo.currentOrgDefaultSelectObjectItems.orgNames[i], showid: x, stype: 'enterprise' });
+              });
+            }
+          }
           if (data.nodeMoreInfo.chooseCurrentOrgUserCandidateNeedForbiddenSubDept === true) {
             _this30.params.only_filid = true;
           }
@@ -52108,6 +52130,7 @@ 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);
@@ -52153,8 +52176,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_56a92ecc_render,
-  mainvue_type_template_id_56a92ecc_staticRenderFns,
+  mainvue_type_template_id_e6becc8e_render,
+  mainvue_type_template_id_e6becc8e_staticRenderFns,
   false,
   null,
   null,
@@ -90483,8 +90506,8 @@ selector_panel_src_main.install = function (Vue) {
 };
 
 /* harmony default export */ var selector_panel = (selector_panel_src_main);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/sizer/src/main.vue?vue&type=template&id=1eb537ec&
-var mainvue_type_template_id_1eb537ec_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/sizer/src/main.vue?vue&type=template&id=1cf37159&
+var mainvue_type_template_id_1cf37159_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -90513,6 +90536,7 @@ var mainvue_type_template_id_1eb537ec_render = function () {
         attrs: {
           param: _vm.params,
           parseParams: _vm.handleParams,
+          url: _vm.url,
           "show-search": "",
           "show-checkbox": "",
           "check-strictly": "",
@@ -90585,11 +90609,11 @@ var mainvue_type_template_id_1eb537ec_render = function () {
     1
   )
 }
-var mainvue_type_template_id_1eb537ec_staticRenderFns = []
-mainvue_type_template_id_1eb537ec_render._withStripped = true
+var mainvue_type_template_id_1cf37159_staticRenderFns = []
+mainvue_type_template_id_1cf37159_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/sizer/src/main.vue?vue&type=template&id=1eb537ec&
+// CONCATENATED MODULE: ./packages/sizer/src/main.vue?vue&type=template&id=1cf37159&
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/sizer/src/main.vue?vue&type=script&lang=js&
 
@@ -90640,6 +90664,7 @@ function sizer_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return fun
 //
 //
 //
+//
 
 
 
@@ -90784,7 +90809,8 @@ function sizer_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return fun
       var _this = this;
 
       return sizer_src_mainvue_type_script_lang_js_asyncToGenerator( /*#__PURE__*/regenerator_default.a.mark(function _callee() {
-        var ids, creditCodes, carry, params;
+        var ids, creditCodes, carry, params, _this$$emit;
+
         return regenerator_default.a.wrap(function _callee$(_context) {
           while (1) {
             switch (_context.prev = _context.next) {
@@ -90809,9 +90835,9 @@ function sizer_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return fun
                   ids = ['all'];
                 } else {
                   _this.checkeds.forEach(function (item) {
-                    var data = JSON.parse(item.data.objdata);
-                    if (data.creditCode && data.creditCode !== 'undefined') {
-                      creditCodes.push(data.creditCode);
+                    var data = item.data.objdata ? JSON.parse(item.data.objdata) : item.data;
+                    if (data[_this.selectField] && data[_this.selectField] !== 'undefined') {
+                      creditCodes.push(data[_this.selectField]);
                     }
                     if (item.isParent && item.children) {
                       ids.push(item.id);
@@ -90857,12 +90883,9 @@ function sizer_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return fun
 
               case 13:
                 if (carry) {
-                  _this.$emit('confirm', {
-                    checkeds: _this.checkeds,
-                    creditCode: creditCodes.join(','),
-                    selectIds: ids,
-                    count: creditCodes.length
-                  });
+                  _this.$emit('confirm', (_this$$emit = {
+                    checkeds: _this.checkeds
+                  }, _this$$emit[_this.selectField] = creditCodes.join(','), _this$$emit.selectIds = ids, _this$$emit.count = creditCodes.length, _this$$emit));
                   _this.esDialog && _this.esDialog.handleClose();
                 }
 
@@ -90892,8 +90915,8 @@ function sizer_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return fun
 
 var sizer_src_main_component = normalizeComponent(
   packages_sizer_src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_1eb537ec_render,
-  mainvue_type_template_id_1eb537ec_staticRenderFns,
+  mainvue_type_template_id_1cf37159_render,
+  mainvue_type_template_id_1cf37159_staticRenderFns,
   false,
   null,
   null,
@@ -102997,7 +103020,7 @@ if (typeof window !== 'undefined' && window.Vue) {
 }
 
 /* harmony default export */ var src_0 = __webpack_exports__["default"] = ({
-  version: '0.8.16',
+  version: '0.8.18',
   install: install,
   Button: packages_button,
   ButtonGroup: button_group,

package/lib/flow-group.js

@@ -4441,7 +4441,7 @@ var getUrgencyLevelChangedNotificationType = '/bpm/bpmBackend/getUrgencyLevelCha
 // 自由发起传阅查询
 var toFreeTaskCircularRead = '/bpm/bpmBackend/toFreeTaskCircularRead';
 // 提交是否二次确认
-var isCancelSecondConfirmation = '/bpm/task/taskHandle/isCancelSecondConfirmation.dhtml';
+var isCancelSecondConfirmation = flowPendingPrefix + '/task/taskHandle/isCancelSecondConfirmation.dhtml';
 
 // 自由发起传阅提交
 var freeTaskCircularRead = '/bpm/bpmBackend/freeTaskCircularRead';

package/lib/flow-list.js

@@ -4441,7 +4441,7 @@ var getUrgencyLevelChangedNotificationType = '/bpm/bpmBackend/getUrgencyLevelCha
 // 自由发起传阅查询
 var toFreeTaskCircularRead = '/bpm/bpmBackend/toFreeTaskCircularRead';
 // 提交是否二次确认
-var isCancelSecondConfirmation = '/bpm/task/taskHandle/isCancelSecondConfirmation.dhtml';
+var isCancelSecondConfirmation = flowPendingPrefix + '/task/taskHandle/isCancelSecondConfirmation.dhtml';
 
 // 自由发起传阅提交
 var freeTaskCircularRead = '/bpm/bpmBackend/freeTaskCircularRead';

package/lib/flow.js

@@ -4439,7 +4439,7 @@ var getUrgencyLevelChangedNotificationType = '/bpm/bpmBackend/getUrgencyLevelCha
 // 自由发起传阅查询
 var toFreeTaskCircularRead = '/bpm/bpmBackend/toFreeTaskCircularRead';
 // 提交是否二次确认
-var isCancelSecondConfirmation = '/bpm/task/taskHandle/isCancelSecondConfirmation.dhtml';
+var isCancelSecondConfirmation = flowPendingPrefix + '/task/taskHandle/isCancelSecondConfirmation.dhtml';
 
 // 自由发起传阅提交
 var freeTaskCircularRead = '/bpm/bpmBackend/freeTaskCircularRead';
@@ -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=56a92ecc&
+// 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 render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -6259,6 +6259,8 @@ var render = function () {
                                                             _vm.showTooltip,
                                                           types:
                                                             _vm.currentOrgSelectorTabs,
+                                                          selectUserList:
+                                                            _vm.nextCurrentOrgselectUserList,
                                                           params:
                                                             _vm.currentOrgSelectorParams,
                                                         },
@@ -7916,7 +7918,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/flow/src/main.vue?vue&type=template&id=56a92ecc&
+// CONCATENATED MODULE: ./packages/flow/src/main.vue?vue&type=template&id=e6becc8e&
 
 // EXTERNAL MODULE: external "babel-runtime/regenerator"
 var regenerator_ = __webpack_require__(4);
@@ -9821,8 +9823,8 @@ processFormvue_type_template_id_5c2c1688_render._withStripped = true
 
 // CONCATENATED MODULE: ./packages/flow/src/processForm.vue?vue&type=template&id=5c2c1688&
 
-// 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=5424da0a&
-var selectUservue_type_template_id_5424da0a_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=24301b52&
+var selectUservue_type_template_id_24301b52_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -9983,11 +9985,11 @@ var selectUservue_type_template_id_5424da0a_render = function () {
     1
   )
 }
-var selectUservue_type_template_id_5424da0a_staticRenderFns = []
-selectUservue_type_template_id_5424da0a_render._withStripped = true
+var selectUservue_type_template_id_24301b52_staticRenderFns = []
+selectUservue_type_template_id_24301b52_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/flow/src/selectUser.vue?vue&type=template&id=5424da0a&
+// CONCATENATED MODULE: ./packages/flow/src/selectUser.vue?vue&type=template&id=24301b52&
 
 // 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; };
@@ -10300,6 +10302,7 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
     }
   },
   mounted: function mounted() {
+    console.log(this.nextUser, 'nextUser');
     this.classify = util["a" /* default */].getStorage('classify') != undefined ? util["a" /* default */].getStorage('classify') : true;
   },
 
@@ -10517,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_5424da0a_render,
-  selectUservue_type_template_id_5424da0a_staticRenderFns,
+  selectUservue_type_template_id_24301b52_render,
+  selectUservue_type_template_id_24301b52_staticRenderFns,
   false,
   null,
   null,
@@ -25690,6 +25693,7 @@ function mainvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
 //
 //
 //
+//
 
 
 
@@ -25848,6 +25852,7 @@ function mainvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
       nextOtherOrgObjSelect: [],
       subProcessColumns: [],
       nextCurrentOrgObjSelect: [],
+      nextCurrentOrgselectUserList: [],
       loading: null, // 加载中
       newTypeCode: '',
       NodeName: '', // 当前节点值
@@ -27163,6 +27168,23 @@ 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 (data.nodeMoreInfo.currentOrgDefaultSelectObjectItems) {
+            if (data.nodeMoreInfo.currentOrgDefaultSelectObjectItems.deptIds.length > 0) {
+              data.nodeMoreInfo.currentOrgDefaultSelectObjectItems.deptIds.map(function (x, i) {
+                _this30.nextCurrentOrgselectUserList.push({ showname: data.nodeMoreInfo.currentOrgDefaultSelectObjectItems.deptNames[i], showid: x, stype: 'department' });
+              });
+            }
+            if (data.nodeMoreInfo.currentOrgDefaultSelectObjectItems.userIds.length > 0) {
+              data.nodeMoreInfo.currentOrgDefaultSelectObjectItems.userIds.map(function (x, i) {
+                _this30.nextCurrentOrgselectUserList.push({ showname: data.nodeMoreInfo.currentOrgDefaultSelectObjectItems.userNames[i], showid: x, stype: 'employee' });
+              });
+            }
+            if (data.nodeMoreInfo.currentOrgDefaultSelectObjectItems.orgIds.length > 0) {
+              data.nodeMoreInfo.currentOrgDefaultSelectObjectItems.orgIds.map(function (x, i) {
+                _this30.nextCurrentOrgselectUserList.push({ showname: data.nodeMoreInfo.currentOrgDefaultSelectObjectItems.orgNames[i], showid: x, stype: 'enterprise' });
+              });
+            }
+          }
           if (data.nodeMoreInfo.chooseCurrentOrgUserCandidateNeedForbiddenSubDept === true) {
             _this30.params.only_filid = true;
           }
@@ -28383,6 +28405,7 @@ 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

@@ -4441,7 +4441,7 @@ var getUrgencyLevelChangedNotificationType = '/bpm/bpmBackend/getUrgencyLevelCha
 // 自由发起传阅查询
 var toFreeTaskCircularRead = '/bpm/bpmBackend/toFreeTaskCircularRead';
 // 提交是否二次确认
-var isCancelSecondConfirmation = '/bpm/task/taskHandle/isCancelSecondConfirmation.dhtml';
+var isCancelSecondConfirmation = flowPendingPrefix + '/task/taskHandle/isCancelSecondConfirmation.dhtml';
 
 // 自由发起传阅提交
 var freeTaskCircularRead = '/bpm/bpmBackend/freeTaskCircularRead';

package/lib/handle-user.js

@@ -4441,7 +4441,7 @@ var getUrgencyLevelChangedNotificationType = '/bpm/bpmBackend/getUrgencyLevelCha
 // 自由发起传阅查询
 var toFreeTaskCircularRead = '/bpm/bpmBackend/toFreeTaskCircularRead';
 // 提交是否二次确认
-var isCancelSecondConfirmation = '/bpm/task/taskHandle/isCancelSecondConfirmation.dhtml';
+var isCancelSecondConfirmation = flowPendingPrefix + '/task/taskHandle/isCancelSecondConfirmation.dhtml';
 
 // 自由发起传阅提交
 var freeTaskCircularRead = '/bpm/bpmBackend/freeTaskCircularRead';

package/lib/handler.js

@@ -4441,7 +4441,7 @@ var getUrgencyLevelChangedNotificationType = '/bpm/bpmBackend/getUrgencyLevelCha
 // 自由发起传阅查询
 var toFreeTaskCircularRead = '/bpm/bpmBackend/toFreeTaskCircularRead';
 // 提交是否二次确认
-var isCancelSecondConfirmation = '/bpm/task/taskHandle/isCancelSecondConfirmation.dhtml';
+var isCancelSecondConfirmation = flowPendingPrefix + '/task/taskHandle/isCancelSecondConfirmation.dhtml';
 
 // 自由发起传阅提交
 var freeTaskCircularRead = '/bpm/bpmBackend/freeTaskCircularRead';

package/lib/icon.js

@@ -4441,7 +4441,7 @@ var getUrgencyLevelChangedNotificationType = '/bpm/bpmBackend/getUrgencyLevelCha
 // 自由发起传阅查询
 var toFreeTaskCircularRead = '/bpm/bpmBackend/toFreeTaskCircularRead';
 // 提交是否二次确认
-var isCancelSecondConfirmation = '/bpm/task/taskHandle/isCancelSecondConfirmation.dhtml';
+var isCancelSecondConfirmation = flowPendingPrefix + '/task/taskHandle/isCancelSecondConfirmation.dhtml';
 
 // 自由发起传阅提交
 var freeTaskCircularRead = '/bpm/bpmBackend/freeTaskCircularRead';