eoss-ui 0.6.89 → 0.6.90

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -27139,8 +27139,8 @@ form_src_main.install = function (Vue) {
27139
27139
  };
27140
27140
 
27141
27141
  /* harmony default export */ var packages_form = (form_src_main);
27142
- // 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=0805f936&
27143
- var mainvue_type_template_id_0805f936_render = function () {
27142
+ // 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=57bbb308&
27143
+ var mainvue_type_template_id_57bbb308_render = function () {
27144
27144
  var _vm = this
27145
27145
  var _h = _vm.$createElement
27146
27146
  var _c = _vm._self._c || _h
@@ -30014,11 +30014,11 @@ var mainvue_type_template_id_0805f936_render = function () {
30014
30014
  )
30015
30015
  : _vm._e()
30016
30016
  }
30017
- var mainvue_type_template_id_0805f936_staticRenderFns = []
30018
- mainvue_type_template_id_0805f936_render._withStripped = true
30017
+ var mainvue_type_template_id_57bbb308_staticRenderFns = []
30018
+ mainvue_type_template_id_57bbb308_render._withStripped = true
30019
30019
 
30020
30020
 
30021
- // CONCATENATED MODULE: ./packages/flow/src/main.vue?vue&type=template&id=0805f936&
30021
+ // CONCATENATED MODULE: ./packages/flow/src/main.vue?vue&type=template&id=57bbb308&
30022
30022
 
30023
30023
  // 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=19364a89&
30024
30024
  var CommonOpinionsvue_type_template_id_19364a89_render = function () {
@@ -37240,8 +37240,8 @@ var startTaskRead_component = normalizeComponent(
37240
37240
  )
37241
37241
 
37242
37242
  /* harmony default export */ var startTaskRead = (startTaskRead_component.exports);
37243
- // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow/src/reset.vue?vue&type=template&id=73aacad2&
37244
- var resetvue_type_template_id_73aacad2_render = function () {
37243
+ // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow/src/reset.vue?vue&type=template&id=56dca055&
37244
+ var resetvue_type_template_id_56dca055_render = function () {
37245
37245
  var _vm = this
37246
37246
  var _h = _vm.$createElement
37247
37247
  var _c = _vm._self._c || _h
@@ -37571,6 +37571,35 @@ var resetvue_type_template_id_73aacad2_render = function () {
37571
37571
  1
37572
37572
  )
37573
37573
  : _vm._e(),
37574
+ _vm.currentNodeEnableItemHandleDescription &&
37575
+ _vm.nextNode.nodeInfo.length != 0
37576
+ ? _c(
37577
+ "el-form-item",
37578
+ {
37579
+ attrs: {
37580
+ prop: "nextItemHandleDescription",
37581
+ label: "办理说明",
37582
+ },
37583
+ },
37584
+ [
37585
+ _c("el-input", {
37586
+ attrs: {
37587
+ placeholder: "请输入办理说明",
37588
+ type: "textarea",
37589
+ autosize: { minRows: 2 },
37590
+ },
37591
+ model: {
37592
+ value: _vm.nextItemHandleDescription,
37593
+ callback: function ($$v) {
37594
+ _vm.nextItemHandleDescription = $$v
37595
+ },
37596
+ expression: "nextItemHandleDescription",
37597
+ },
37598
+ }),
37599
+ ],
37600
+ 1
37601
+ )
37602
+ : _vm._e(),
37574
37603
  _c(
37575
37604
  "el-form-item",
37576
37605
  { attrs: { prop: "noticeType", label: "通知方式" } },
@@ -37688,11 +37717,11 @@ var resetvue_type_template_id_73aacad2_render = function () {
37688
37717
  1
37689
37718
  )
37690
37719
  }
37691
- var resetvue_type_template_id_73aacad2_staticRenderFns = []
37692
- resetvue_type_template_id_73aacad2_render._withStripped = true
37720
+ var resetvue_type_template_id_56dca055_staticRenderFns = []
37721
+ resetvue_type_template_id_56dca055_render._withStripped = true
37693
37722
 
37694
37723
 
37695
- // CONCATENATED MODULE: ./packages/flow/src/reset.vue?vue&type=template&id=73aacad2&
37724
+ // CONCATENATED MODULE: ./packages/flow/src/reset.vue?vue&type=template&id=56dca055&
37696
37725
 
37697
37726
  // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow/src/reset.vue?vue&type=script&lang=js&
37698
37727
  var resetvue_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; };
@@ -37920,6 +37949,21 @@ var resetvue_type_script_lang_js_components;
37920
37949
  //
37921
37950
  //
37922
37951
  //
37952
+ //
37953
+ //
37954
+ //
37955
+ //
37956
+ //
37957
+ //
37958
+ //
37959
+ //
37960
+ //
37961
+ //
37962
+ //
37963
+ //
37964
+ //
37965
+ //
37966
+ //
37923
37967
 
37924
37968
 
37925
37969
 
@@ -37949,7 +37993,9 @@ var resetvue_type_script_lang_js_components;
37949
37993
  loading: false,
37950
37994
  isCustomUser: 0,
37951
37995
  selectUser: false,
37996
+ nextItemHandleDescription: '',
37952
37997
  nextNodeCheckType: 'select',
37998
+ currentNodeEnableItemHandleDescription: false,
37953
37999
  multiple: false,
37954
38000
  showNoticeType: false,
37955
38001
  readMultiple: true,
@@ -38264,8 +38310,12 @@ var resetvue_type_script_lang_js_components;
38264
38310
  nextOrgId: !_this4.isShowNextUser ? _this4.multiple ? _this4.mixOrgIdList && _this4.mixOrgIdList.join('|') : nextOrgId : '',
38265
38311
  handleExplain: handleExplain,
38266
38312
  presetReadUserId: _this4.mixPresetList && _this4.mixPresetList.length > 0 ? _this4.mixPresetList.join('|') : presetReadUserId.join(','),
38267
- opinion: _this4.newOpinion || newOpinion
38313
+ opinion: _this4.newOpinion || newOpinion,
38314
+ nextItemHandleDescription: _this4.nextItemHandleDescription
38268
38315
  }, _this4.subParams);
38316
+ if (!_this4.currentNodeEnableItemHandleDescription) {
38317
+ delete params.nextItemHandleDescription;
38318
+ }
38269
38319
  if (_this4.activeNames != '1') delete params.customPresetUserJson;
38270
38320
  utils_util["a" /* default */].ajax({
38271
38321
  url: _this4.type == 'reset' ? api["Ab" /* resetProcess */] : api["Lb" /* taskContinuation */],
@@ -38313,6 +38363,9 @@ var resetvue_type_script_lang_js_components;
38313
38363
 
38314
38364
  _this5.loading = false;
38315
38365
  if (status === 'success') {
38366
+ if (_this5.type == 'reset') {
38367
+ _this5.currentNodeEnableItemHandleDescription = nodeExtAttr.currentNodeEnableItemHandleDescription == 1;
38368
+ }
38316
38369
  _this5.nextNode.userInfo = nextUserList;
38317
38370
  _this5.countersignaturetypeCode = countersignaturetypeCode;
38318
38371
  _this5.nextNode.countersignaturetypeText = countersignaturetypeText;
@@ -38569,8 +38622,8 @@ var resetvue_type_script_lang_js_components;
38569
38622
 
38570
38623
  var reset_component = normalizeComponent(
38571
38624
  src_resetvue_type_script_lang_js_,
38572
- resetvue_type_template_id_73aacad2_render,
38573
- resetvue_type_template_id_73aacad2_staticRenderFns,
38625
+ resetvue_type_template_id_56dca055_render,
38626
+ resetvue_type_template_id_56dca055_staticRenderFns,
38574
38627
  false,
38575
38628
  null,
38576
38629
  null,
@@ -46724,7 +46777,8 @@ function flow_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return func
46724
46777
  businessId = _taskExamineInfo.businessId,
46725
46778
  appId = _taskExamineInfo.appId,
46726
46779
  processDefinitionId = _taskExamineInfo.processDefinitionId,
46727
- pendingId = _taskExamineInfo.pendingId;
46780
+ pendingId = _taskExamineInfo.pendingId,
46781
+ isSubFlow = _taskExamineInfo.isSubFlow;
46728
46782
 
46729
46783
  var params = {
46730
46784
  businessId: businessId,
@@ -46732,6 +46786,7 @@ function flow_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return func
46732
46786
  processDefinitionId: processDefinitionId,
46733
46787
  pendingId: pendingId,
46734
46788
  opinion: this.value,
46789
+ isSubFlow: isSubFlow,
46735
46790
  taskAction: 'complete'
46736
46791
  };
46737
46792
  this.taskParams = params;
@@ -48449,7 +48504,7 @@ function flow_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return func
48449
48504
  switch (_context.prev = _context.next) {
48450
48505
  case 0:
48451
48506
  if (!valid) {
48452
- _context.next = 52;
48507
+ _context.next = 53;
48453
48508
  break;
48454
48509
  }
48455
48510
 
@@ -48556,14 +48611,15 @@ function flow_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return func
48556
48611
  }
48557
48612
 
48558
48613
  if (!(freetype === 'multiInsMidwayWithSubmitScene')) {
48559
- _context.next = 33;
48614
+ _context.next = 34;
48560
48615
  break;
48561
48616
  }
48562
48617
 
48618
+ params.isSubFlow = _this33.taskExamineInfo.isSubFlow;
48563
48619
  _this33.taskParams = params;
48564
48620
  return _context.abrupt('return');
48565
48621
 
48566
- case 33:
48622
+ case 34:
48567
48623
  _this33.loading = utils_util["a" /* default */].loading(_this33.$loading, '提交中...');
48568
48624
  isEndUserTask = _this33.isEndUserTask, choiceOrgId = _this33.choiceOrgId, choiceDeptId = _this33.choiceDeptId, pOrgId = _this33.pOrgId, taskExamineInfo = _this33.taskExamineInfo, currentNodeIsCircularReadNode = _this33.currentNodeIsCircularReadNode, needRetrialAuth = _this33.needRetrialAuth, circularReadParamsMap = _this33.circularReadParamsMap, currentNodeEnableItemHandleDescription = _this33.currentNodeEnableItemHandleDescription;
48569
48625
 
@@ -48603,10 +48659,10 @@ function flow_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return func
48603
48659
  }
48604
48660
  }));
48605
48661
 
48606
- case 52:
48662
+ case 53:
48607
48663
  return _context.abrupt('return', false);
48608
48664
 
48609
- case 53:
48665
+ case 54:
48610
48666
  case 'end':
48611
48667
  return _context.stop();
48612
48668
  }
@@ -48667,8 +48723,8 @@ function flow_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return func
48667
48723
 
48668
48724
  var flow_src_main_component = normalizeComponent(
48669
48725
  packages_flow_src_mainvue_type_script_lang_js_,
48670
- mainvue_type_template_id_0805f936_render,
48671
- mainvue_type_template_id_0805f936_staticRenderFns,
48726
+ mainvue_type_template_id_57bbb308_render,
48727
+ mainvue_type_template_id_57bbb308_staticRenderFns,
48672
48728
  false,
48673
48729
  null,
48674
48730
  null,
@@ -92130,7 +92186,7 @@ if (typeof window !== 'undefined' && window.Vue) {
92130
92186
  }
92131
92187
 
92132
92188
  /* harmony default export */ var src_0 = __webpack_exports__["default"] = ({
92133
- version: '0.6.89',
92189
+ version: '0.6.90',
92134
92190
  install: install,
92135
92191
  Button: packages_button,
92136
92192
  ButtonGroup: button_group,
package/lib/flow.js CHANGED
@@ -4481,7 +4481,7 @@ var component = Object(componentNormalizer["a" /* default */])(
4481
4481
  // ESM COMPAT FLAG
4482
4482
  __webpack_require__.r(__webpack_exports__);
4483
4483
 
4484
- // 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=0805f936&
4484
+ // 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=57bbb308&
4485
4485
  var render = function () {
4486
4486
  var _vm = this
4487
4487
  var _h = _vm.$createElement
@@ -7360,7 +7360,7 @@ var staticRenderFns = []
7360
7360
  render._withStripped = true
7361
7361
 
7362
7362
 
7363
- // CONCATENATED MODULE: ./packages/flow/src/main.vue?vue&type=template&id=0805f936&
7363
+ // CONCATENATED MODULE: ./packages/flow/src/main.vue?vue&type=template&id=57bbb308&
7364
7364
 
7365
7365
  // EXTERNAL MODULE: external "babel-runtime/regenerator"
7366
7366
  var regenerator_ = __webpack_require__(4);
@@ -14438,8 +14438,8 @@ var startTaskRead_component = Object(componentNormalizer["a" /* default */])(
14438
14438
  )
14439
14439
 
14440
14440
  /* harmony default export */ var startTaskRead = (startTaskRead_component.exports);
14441
- // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow/src/reset.vue?vue&type=template&id=73aacad2&
14442
- var resetvue_type_template_id_73aacad2_render = function () {
14441
+ // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow/src/reset.vue?vue&type=template&id=56dca055&
14442
+ var resetvue_type_template_id_56dca055_render = function () {
14443
14443
  var _vm = this
14444
14444
  var _h = _vm.$createElement
14445
14445
  var _c = _vm._self._c || _h
@@ -14769,6 +14769,35 @@ var resetvue_type_template_id_73aacad2_render = function () {
14769
14769
  1
14770
14770
  )
14771
14771
  : _vm._e(),
14772
+ _vm.currentNodeEnableItemHandleDescription &&
14773
+ _vm.nextNode.nodeInfo.length != 0
14774
+ ? _c(
14775
+ "el-form-item",
14776
+ {
14777
+ attrs: {
14778
+ prop: "nextItemHandleDescription",
14779
+ label: "办理说明",
14780
+ },
14781
+ },
14782
+ [
14783
+ _c("el-input", {
14784
+ attrs: {
14785
+ placeholder: "请输入办理说明",
14786
+ type: "textarea",
14787
+ autosize: { minRows: 2 },
14788
+ },
14789
+ model: {
14790
+ value: _vm.nextItemHandleDescription,
14791
+ callback: function ($$v) {
14792
+ _vm.nextItemHandleDescription = $$v
14793
+ },
14794
+ expression: "nextItemHandleDescription",
14795
+ },
14796
+ }),
14797
+ ],
14798
+ 1
14799
+ )
14800
+ : _vm._e(),
14772
14801
  _c(
14773
14802
  "el-form-item",
14774
14803
  { attrs: { prop: "noticeType", label: "通知方式" } },
@@ -14886,11 +14915,11 @@ var resetvue_type_template_id_73aacad2_render = function () {
14886
14915
  1
14887
14916
  )
14888
14917
  }
14889
- var resetvue_type_template_id_73aacad2_staticRenderFns = []
14890
- resetvue_type_template_id_73aacad2_render._withStripped = true
14918
+ var resetvue_type_template_id_56dca055_staticRenderFns = []
14919
+ resetvue_type_template_id_56dca055_render._withStripped = true
14891
14920
 
14892
14921
 
14893
- // CONCATENATED MODULE: ./packages/flow/src/reset.vue?vue&type=template&id=73aacad2&
14922
+ // CONCATENATED MODULE: ./packages/flow/src/reset.vue?vue&type=template&id=56dca055&
14894
14923
 
14895
14924
  // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow/src/reset.vue?vue&type=script&lang=js&
14896
14925
  var resetvue_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; };
@@ -15118,6 +15147,21 @@ var resetvue_type_script_lang_js_components;
15118
15147
  //
15119
15148
  //
15120
15149
  //
15150
+ //
15151
+ //
15152
+ //
15153
+ //
15154
+ //
15155
+ //
15156
+ //
15157
+ //
15158
+ //
15159
+ //
15160
+ //
15161
+ //
15162
+ //
15163
+ //
15164
+ //
15121
15165
 
15122
15166
 
15123
15167
 
@@ -15147,7 +15191,9 @@ var resetvue_type_script_lang_js_components;
15147
15191
  loading: false,
15148
15192
  isCustomUser: 0,
15149
15193
  selectUser: false,
15194
+ nextItemHandleDescription: '',
15150
15195
  nextNodeCheckType: 'select',
15196
+ currentNodeEnableItemHandleDescription: false,
15151
15197
  multiple: false,
15152
15198
  showNoticeType: false,
15153
15199
  readMultiple: true,
@@ -15462,8 +15508,12 @@ var resetvue_type_script_lang_js_components;
15462
15508
  nextOrgId: !_this4.isShowNextUser ? _this4.multiple ? _this4.mixOrgIdList && _this4.mixOrgIdList.join('|') : nextOrgId : '',
15463
15509
  handleExplain: handleExplain,
15464
15510
  presetReadUserId: _this4.mixPresetList && _this4.mixPresetList.length > 0 ? _this4.mixPresetList.join('|') : presetReadUserId.join(','),
15465
- opinion: _this4.newOpinion || newOpinion
15511
+ opinion: _this4.newOpinion || newOpinion,
15512
+ nextItemHandleDescription: _this4.nextItemHandleDescription
15466
15513
  }, _this4.subParams);
15514
+ if (!_this4.currentNodeEnableItemHandleDescription) {
15515
+ delete params.nextItemHandleDescription;
15516
+ }
15467
15517
  if (_this4.activeNames != '1') delete params.customPresetUserJson;
15468
15518
  util["a" /* default */].ajax({
15469
15519
  url: _this4.type == 'reset' ? api["Ab" /* resetProcess */] : api["Lb" /* taskContinuation */],
@@ -15511,6 +15561,9 @@ var resetvue_type_script_lang_js_components;
15511
15561
 
15512
15562
  _this5.loading = false;
15513
15563
  if (status === 'success') {
15564
+ if (_this5.type == 'reset') {
15565
+ _this5.currentNodeEnableItemHandleDescription = nodeExtAttr.currentNodeEnableItemHandleDescription == 1;
15566
+ }
15514
15567
  _this5.nextNode.userInfo = nextUserList;
15515
15568
  _this5.countersignaturetypeCode = countersignaturetypeCode;
15516
15569
  _this5.nextNode.countersignaturetypeText = countersignaturetypeText;
@@ -15767,8 +15820,8 @@ var resetvue_type_script_lang_js_components;
15767
15820
 
15768
15821
  var reset_component = Object(componentNormalizer["a" /* default */])(
15769
15822
  src_resetvue_type_script_lang_js_,
15770
- resetvue_type_template_id_73aacad2_render,
15771
- resetvue_type_template_id_73aacad2_staticRenderFns,
15823
+ resetvue_type_template_id_56dca055_render,
15824
+ resetvue_type_template_id_56dca055_staticRenderFns,
15772
15825
  false,
15773
15826
  null,
15774
15827
  null,
@@ -23922,7 +23975,8 @@ function mainvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
23922
23975
  businessId = _taskExamineInfo.businessId,
23923
23976
  appId = _taskExamineInfo.appId,
23924
23977
  processDefinitionId = _taskExamineInfo.processDefinitionId,
23925
- pendingId = _taskExamineInfo.pendingId;
23978
+ pendingId = _taskExamineInfo.pendingId,
23979
+ isSubFlow = _taskExamineInfo.isSubFlow;
23926
23980
 
23927
23981
  var params = {
23928
23982
  businessId: businessId,
@@ -23930,6 +23984,7 @@ function mainvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
23930
23984
  processDefinitionId: processDefinitionId,
23931
23985
  pendingId: pendingId,
23932
23986
  opinion: this.value,
23987
+ isSubFlow: isSubFlow,
23933
23988
  taskAction: 'complete'
23934
23989
  };
23935
23990
  this.taskParams = params;
@@ -25647,7 +25702,7 @@ function mainvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
25647
25702
  switch (_context.prev = _context.next) {
25648
25703
  case 0:
25649
25704
  if (!valid) {
25650
- _context.next = 52;
25705
+ _context.next = 53;
25651
25706
  break;
25652
25707
  }
25653
25708
 
@@ -25754,14 +25809,15 @@ function mainvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
25754
25809
  }
25755
25810
 
25756
25811
  if (!(freetype === 'multiInsMidwayWithSubmitScene')) {
25757
- _context.next = 33;
25812
+ _context.next = 34;
25758
25813
  break;
25759
25814
  }
25760
25815
 
25816
+ params.isSubFlow = _this33.taskExamineInfo.isSubFlow;
25761
25817
  _this33.taskParams = params;
25762
25818
  return _context.abrupt('return');
25763
25819
 
25764
- case 33:
25820
+ case 34:
25765
25821
  _this33.loading = util["a" /* default */].loading(_this33.$loading, '提交中...');
25766
25822
  isEndUserTask = _this33.isEndUserTask, choiceOrgId = _this33.choiceOrgId, choiceDeptId = _this33.choiceDeptId, pOrgId = _this33.pOrgId, taskExamineInfo = _this33.taskExamineInfo, currentNodeIsCircularReadNode = _this33.currentNodeIsCircularReadNode, needRetrialAuth = _this33.needRetrialAuth, circularReadParamsMap = _this33.circularReadParamsMap, currentNodeEnableItemHandleDescription = _this33.currentNodeEnableItemHandleDescription;
25767
25823
 
@@ -25801,10 +25857,10 @@ function mainvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
25801
25857
  }
25802
25858
  }));
25803
25859
 
25804
- case 52:
25860
+ case 53:
25805
25861
  return _context.abrupt('return', false);
25806
25862
 
25807
- case 53:
25863
+ case 54:
25808
25864
  case 'end':
25809
25865
  return _context.stop();
25810
25866
  }