eoss-ui 0.8.16 → 0.8.18

package/lib/input-number.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/input.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/login.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/main.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/nav.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/notify.js

@@ -531,7 +531,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/page.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/pagination.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/player.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/qr-code.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/radio-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/retrial-auth.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/select-ganged.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/select.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/selector-panel.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/selector.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/sizer.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';
@@ -4626,7 +4626,7 @@ module.exports = require("axios");
 // ESM COMPAT FLAG
 __webpack_require__.r(__webpack_exports__);
 
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/sizer/src/main.vue?vue&type=template&id=1eb537ec&
+// 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 render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -4656,6 +4656,7 @@ var render = function () {
         attrs: {
           param: _vm.params,
           parseParams: _vm.handleParams,
+          url: _vm.url,
           "show-search": "",
           "show-checkbox": "",
           "check-strictly": "",
@@ -4732,7 +4733,7 @@ var staticRenderFns = []
 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&
 
 // EXTERNAL MODULE: external "babel-runtime/regenerator"
 var regenerator_ = __webpack_require__(4);
@@ -4793,6 +4794,7 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
 //
 //
 //
+//
 
 
 
@@ -4937,7 +4939,8 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
       var _this = this;
 
       return _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) {
@@ -4962,9 +4965,9 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
                   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);
@@ -5010,12 +5013,9 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
 
               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();
                 }
 

package/lib/steps.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/switch.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/table-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/tabs.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/tips.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/tree-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/tree.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/upload.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/wujie.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/wxlogin.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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eoss-ui",
-  "version": "0.8.16",
+  "version": "0.8.18",
   "description": "eoss内部业务组件",
   "main": "lib/eoss-ui.common.js",
   "files": [

package/packages/flow/src/main.vue

@@ -535,6 +535,7 @@
                     @change="disposeAppUnit($event, 'nextCurrentOrgObjSelect')"
                     :showTooltip="showTooltip"
                     :types="currentOrgSelectorTabs"
+                    :selectUserList="nextCurrentOrgselectUserList"
                     :params="currentOrgSelectorParams"
                   />
                 </el-form-item>
@@ -1427,6 +1428,7 @@ export default {
       nextOtherOrgObjSelect: [],
       subProcessColumns: [],
       nextCurrentOrgObjSelect: [],
+      nextCurrentOrgselectUserList: [],
       loading: null, // 加载中
       newTypeCode: '',
       NodeName: '', // 当前节点值
@@ -2811,6 +2813,24 @@ this.$confirm('确认提交?', '提示', {
                 this.nextNode.customLimitTimeText =
                   data.nodeMoreInfo.defaultCustomLimitDays + '';
             }
+            if(data.nodeMoreInfo.currentOrgDefaultSelectObjectItems){
+              if(data.nodeMoreInfo.currentOrgDefaultSelectObjectItems.deptIds.length > 0){
+                data.nodeMoreInfo.currentOrgDefaultSelectObjectItems.deptIds.map((x,i) => {
+                  this.nextCurrentOrgselectUserList.push({showname:data.nodeMoreInfo.currentOrgDefaultSelectObjectItems.deptNames[i],showid:x,stype:'department'})
+                })
+            }
+             if(data.nodeMoreInfo.currentOrgDefaultSelectObjectItems.userIds.length > 0){
+                data.nodeMoreInfo.currentOrgDefaultSelectObjectItems.userIds.map((x,i) => {
+                  this.nextCurrentOrgselectUserList.push({showname:data.nodeMoreInfo.currentOrgDefaultSelectObjectItems.userNames[i],showid:x,stype:'employee'})
+                })
+            }
+            if(data.nodeMoreInfo.currentOrgDefaultSelectObjectItems.orgIds.length > 0){
+                data.nodeMoreInfo.currentOrgDefaultSelectObjectItems.orgIds.map((x,i) => {
+                  this.nextCurrentOrgselectUserList.push({showname:data.nodeMoreInfo.currentOrgDefaultSelectObjectItems.orgNames[i],showid:x,stype:'enterprise'})
+                })
+            }
+            
+          }
             if (
               data.nodeMoreInfo
                 .chooseCurrentOrgUserCandidateNeedForbiddenSubDept === true
@@ -4164,6 +4184,7 @@ this.$confirm('确认提交?', '提示', {
     },
     // 单位选择完回调
     disposeAppUnit(res, type) {
+      console.log(res, '选完了');
       let label = type.substring(0, type.lastIndexOf('Select'));
       this.nextNode[label + 'Name'] = '';
       res.options && (this[type] = res.options);

package/packages/flow/src/selectUser.vue

@@ -283,6 +283,7 @@ export default {
     }
   },
   mounted() {
+    console.log(this.nextUser,'nextUser')
     this.classify =
       util.getStorage('classify') != undefined
         ? util.getStorage('classify')

package/packages/sizer/src/main.vue

@@ -10,6 +10,7 @@
     <es-tree
       :param="params"
       :parseParams="handleParams"
+      :url="url"
       ref="sizerTree"
       show-search
       show-checkbox
@@ -190,9 +191,11 @@ export default {
           ids = ['all'];
         } else {
           this.checkeds.forEach((item) => {
-            let data = JSON.parse(item.data.objdata);
-            if (data.creditCode && data.creditCode !== 'undefined') {
-              creditCodes.push(data.creditCode);
+            let 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);
@@ -237,7 +240,7 @@ export default {
         if (carry) {
           this.$emit('confirm', {
             checkeds: this.checkeds,
-            creditCode: creditCodes.join(','),
+            [this.selectField]: creditCodes.join(','),
             selectIds: ids,
             count: creditCodes.length
           });

package/src/config/api.js

@@ -280,9 +280,11 @@ export const fyListJson = '/bpm/pendedhistoryManager/fyListJson.dhtml';
 // 获取重设记录列表
 export const resetJson = '/bpm/wfResetRecord/listJson.dhtml';
 // 获取删除记录列表
-export const deletedListJson = '/bpm/pendedhistoryManager/deletedListJson.dhtml';
+export const deletedListJson =
+  '/bpm/pendedhistoryManager/deletedListJson.dhtml';
 // 恢复删除记录
-export const restoredHistory = '/bpm/pendedhistoryManager/restoredHistory.dhtml';
+export const restoredHistory =
+  '/bpm/pendedhistoryManager/restoredHistory.dhtml';
 // 批量删除
 export const batchDelete = '/bpm/pendedhistoryManager/batchDelete.dhtml';
 
@@ -321,7 +323,8 @@ export const getUrgencyLevelChangedNotificationType =
 // 自由发起传阅查询
 export const toFreeTaskCircularRead = '/bpm/bpmBackend/toFreeTaskCircularRead';
 // 提交是否二次确认
-export const isCancelSecondConfirmation = '/bpm/task/taskHandle/isCancelSecondConfirmation.dhtml';
+export const isCancelSecondConfirmation =
+  flowPendingPrefix + '/task/taskHandle/isCancelSecondConfirmation.dhtml';
 
 // 自由发起传阅提交
 export const freeTaskCircularRead = '/bpm/bpmBackend/freeTaskCircularRead';

package/src/index.js

@@ -125,7 +125,7 @@ if (typeof window !== 'undefined' && window.Vue) {
 }
 
 export default {
-  version: '0.8.16',
+  version: '0.8.18',
   install,
   Button,
   ButtonGroup,