eoss-mobiles 0.3.34 → 0.3.36

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.
package/lib/selector.js CHANGED
@@ -2264,8 +2264,8 @@ render._withStripped = true
2264
2264
 
2265
2265
  // CONCATENATED MODULE: ./packages/selector/src/main.vue?vue&type=template&id=17308961
2266
2266
 
2267
- // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/selector/src/selector-tree.vue?vue&type=template&id=ed62cd92
2268
- var selector_treevue_type_template_id_ed62cd92_render = function () {
2267
+ // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/selector/src/selector-tree.vue?vue&type=template&id=1c4984fc
2268
+ var selector_treevue_type_template_id_1c4984fc_render = function () {
2269
2269
  var _vm = this
2270
2270
  var _h = _vm.$createElement
2271
2271
  var _c = _vm._self._c || _h
@@ -2445,11 +2445,11 @@ var selector_treevue_type_template_id_ed62cd92_render = function () {
2445
2445
  1
2446
2446
  )
2447
2447
  }
2448
- var selector_treevue_type_template_id_ed62cd92_staticRenderFns = []
2449
- selector_treevue_type_template_id_ed62cd92_render._withStripped = true
2448
+ var selector_treevue_type_template_id_1c4984fc_staticRenderFns = []
2449
+ selector_treevue_type_template_id_1c4984fc_render._withStripped = true
2450
2450
 
2451
2451
 
2452
- // CONCATENATED MODULE: ./packages/selector/src/selector-tree.vue?vue&type=template&id=ed62cd92
2452
+ // CONCATENATED MODULE: ./packages/selector/src/selector-tree.vue?vue&type=template&id=1c4984fc
2453
2453
 
2454
2454
  // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/selector/src/tree.vue?vue&type=template&id=d9c99060
2455
2455
  var treevue_type_template_id_d9c99060_render = function () {
@@ -4020,10 +4020,14 @@ var _props, _methods;
4020
4020
  this.newParam = _extends({}, JSON.parse(JSON.stringify(this.param)));
4021
4021
  this.newParam.selecttype = this.newTabs[this.selectIndex].param.selecttype;
4022
4022
  if (this.newParam.selecttype === 'persongroup') {
4023
- this.newParam.pid = 'root';
4023
+ if (this.newParam[this.newTabs[this.selectIndex].name]) {
4024
+ this.newParam = _extends({}, this.newTabs[this.selectIndex].param, this.newParam[this.newTabs[this.selectIndex].name] ? this.newParam[this.newTabs[this.selectIndex].name] : {});
4025
+ } else {
4026
+ this.newParam.pid = 'root';
4027
+ }
4024
4028
  this.newParam.myUserid = this.newParam.myUserid || util["a" /* default */].getStorage('userId');
4025
4029
  } else {
4026
- this.newParam = _extends({}, this.newTabs[this.selectIndex].param, this.newParam);
4030
+ this.newParam = _extends({}, this.newTabs[this.selectIndex].param, this.newParam[this.newTabs[this.selectIndex].name] ? this.newParam[this.newTabs[this.selectIndex].name] : {});
4027
4031
  // this.newTabs[this.selectIndex].param.pid || this.param.pid || 'root';
4028
4032
  }
4029
4033
  delete this.newParam.department;
@@ -4348,8 +4352,8 @@ var _props, _methods;
4348
4352
 
4349
4353
  var selector_tree_component = Object(componentNormalizer["a" /* default */])(
4350
4354
  src_selector_treevue_type_script_lang_js,
4351
- selector_treevue_type_template_id_ed62cd92_render,
4352
- selector_treevue_type_template_id_ed62cd92_staticRenderFns,
4355
+ selector_treevue_type_template_id_1c4984fc_render,
4356
+ selector_treevue_type_template_id_1c4984fc_staticRenderFns,
4353
4357
  false,
4354
4358
  null,
4355
4359
  null,
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "eoss-mobiles",
3
- "version": "0.3.34",
3
+ "version": "0.3.36",
4
4
  "description": "eoss内部移动端业务组件",
5
5
  "main": "lib/eoss-mobile.common.js",
6
6
  "files": [
@@ -42,7 +42,9 @@
42
42
  isForceDisplayDefaultOptionForPrefix
43
43
  "
44
44
  :pendingItemHandleDescription="pendingItemHandleDescription"
45
- :placeholder="pendingItemHandleDescription || opinionHandleExplainText"
45
+ :placeholder="
46
+ pendingItemHandleDescription || opinionHandleExplainText
47
+ "
46
48
  :nodeDefaultSubmitOpinion="nodeDefaultSubmitOpinion"
47
49
  :nodeFixedOpinionSelectList="nodeFixedOpinionSelectList"
48
50
  :isHiddenOftenOpinion="isHiddenOftenOpinion == 1 ? false : true"
@@ -285,11 +287,8 @@
285
287
  :paddingTop="paddingTop"
286
288
  isDepartment
287
289
  :objType="'enterprise'"
288
- :tabs="'department,myemployee'"
289
- :param="{
290
- department: { pid: orgId, roleid: deptRoleCode },
291
- myemployee: { pid: orgId, roleid: deptRoleCode }
292
- }"
290
+ :tabs="currentOrgSelectorTabs"
291
+ :param="currentOrgSelectorParams"
293
292
  :disableds="currentOrgDisabledObjId"
294
293
  :baseUrl="apiBaseUrl"
295
294
  :isOtherUnit="false"
@@ -306,10 +305,8 @@
306
305
  :isAllCheck="isAllCheck"
307
306
  :paddingTop="paddingTop"
308
307
  :objType="'enterprise'"
309
- :param="{
310
- pid: 'root'
311
- }"
312
- :tabs="'enterprise'"
308
+ :param="foreignOrgSelectorParams"
309
+ :tabs="foreignOrgSelectorTabs"
313
310
  :baseUrl="apiBaseUrl"
314
311
  :disableds="otherOrgDisabledObjId"
315
312
  :isOtherUnit="true"
@@ -668,11 +665,15 @@ export default {
668
665
  { name: '前置加签', value: 'preAddSign' },
669
666
  { name: '后置加签', value: 'postAddSign' }
670
667
  ],
668
+ currentOrgSelectorParams: { pid: 'root' },
669
+ currentOrgSelectorTabs: 'employee, persongroup',
670
+ foreignOrgSelectorTabs: 'enterprise,filgroupobj',
671
+ foreignOrgSelectorParams: { pid: 'root', roleid: '' },
671
672
  otherOrgDisabledObjId: [],
672
673
  currentNodeEnableItemHandleDescription: false,
673
674
  pendingItemHandleDescription: '',
674
- taskOperationShiftedNodeList:null,
675
- oldNextOperate:'',
675
+ taskOperationShiftedNodeList: null,
676
+ oldNextOperate: '',
676
677
  processFormType: 'freeStart',
677
678
  currentOrgDisabledObjId: [],
678
679
  nextNodeDefault: 0,
@@ -1146,11 +1147,12 @@ export default {
1146
1147
  return;
1147
1148
  }
1148
1149
  if (
1149
- this.isHideCurrentOrg &&
1150
- !this.form.nextCurrentOrgObjJson &&
1150
+ (this.isHideCurrentOrg || this.isHideOtherOrg) &&
1151
+ !this.form.nextCurrentOrgObjJson && !this.form.nextOtherOrgObjJson &&
1151
1152
  this.form.isAddSign != '1'
1152
1153
  ) {
1153
- this.$toast(`请选择${this.currentOrgName || '本单位'}`);
1154
+ // this.$toast(`请选择${this.currentOrgName || '本单位'}`);
1155
+ this.$toast(`请选择办理对象`);
1154
1156
  return;
1155
1157
  }
1156
1158
  delete this.form.nextNodeName;
@@ -1219,10 +1221,16 @@ export default {
1219
1221
  // _that.form.userId = 'u3a0bc559d4cf4f6ea47106ed7e76cae6';
1220
1222
  _that.form.mobileKey = $.getStorage('deviceId') || '123';
1221
1223
  _that.form.nextNodeId =
1222
- _that.form.nextOperate == 0 || _that.form.nextOperate == 1 || _that.oldNextOperate === 0 || _that.oldNextOperate === 1
1224
+ _that.form.nextOperate == 0 ||
1225
+ _that.form.nextOperate == 1 ||
1226
+ _that.oldNextOperate === 0 ||
1227
+ _that.oldNextOperate === 1
1223
1228
  ? _that.form.nextNodeId || nodeInfoMapInfo.nodeExtAttr.defaultNextNode
1224
1229
  : '';
1225
- _that.form.nextOperate = _that.oldNextOperate !== '' ? _that.oldNextOperate : _that.form.nextOperate;
1230
+ _that.form.nextOperate =
1231
+ _that.oldNextOperate !== ''
1232
+ ? _that.oldNextOperate
1233
+ : _that.form.nextOperate;
1226
1234
  if (!_that.isCanPreAddSign || _that.form.isAddSign != '1') {
1227
1235
  delete _that.form.addSignMode;
1228
1236
  }
@@ -1391,26 +1399,28 @@ export default {
1391
1399
  } else {
1392
1400
  }
1393
1401
  }
1394
- if(this.taskOperationShiftedNodeList && !val.isNextNode){
1395
- this.nodeList = this.nodeList.filter(x => this.taskOperationShiftedNodeList.indexOf(x.nodeId) == -1)
1402
+ if (this.taskOperationShiftedNodeList && !val.isNextNode) {
1403
+ this.nodeList = this.nodeList.filter(
1404
+ (x) => this.taskOperationShiftedNodeList.indexOf(x.nodeId) == -1
1405
+ );
1396
1406
  }
1397
- if(val.isNextNode){
1398
- this.oldNextOperate = val.nextOperate
1399
- }else{
1400
- this.oldNextOperate = ''
1407
+ if (val.isNextNode) {
1408
+ this.oldNextOperate = val.nextOperate;
1409
+ } else {
1410
+ this.oldNextOperate = '';
1401
1411
  }
1402
- if(val.isNextNode){
1412
+ if (val.isNextNode) {
1403
1413
  this.nodeInfos = [];
1404
1414
  this.form.nextNodeId = val.key;
1405
1415
  this.form.nextNodeName = val.value;
1406
- this.$toast.loading({
1416
+ this.$toast.loading({
1407
1417
  message: '加载中...',
1408
1418
  forbidClick: true,
1409
1419
  loadingType: 'spinner',
1410
1420
  overlay: true,
1411
1421
  duration: 0
1412
1422
  });
1413
-
1423
+
1414
1424
  this.getNodeObj(this.form.nextNodeId);
1415
1425
  }
1416
1426
  if (this.nodeList && this.nodeList.length > 0) {
@@ -1424,7 +1434,7 @@ export default {
1424
1434
  this.form.nextNodeId = this.nodeList[0].nodeId;
1425
1435
  this.form.nextNodeName = this.nodeList[0].nodeName;
1426
1436
  }
1427
-
1437
+
1428
1438
  this.$toast.loading({
1429
1439
  message: '加载中...',
1430
1440
  forbidClick: true,
@@ -1432,7 +1442,7 @@ export default {
1432
1442
  overlay: true,
1433
1443
  duration: 0
1434
1444
  });
1435
-
1445
+
1436
1446
  if (isDef !== true) this.getNodeObj(this.form.nextNodeId);
1437
1447
  }
1438
1448
 
@@ -1575,6 +1585,7 @@ export default {
1575
1585
  taskExamine,
1576
1586
  customPresetHintMessage,
1577
1587
  currentOrgName,
1588
+ currentOrgSelectorParams,
1578
1589
  notificationMessageReadOnly,
1579
1590
  readOnlyNotificationType,
1580
1591
  otherOrgName,
@@ -1586,12 +1597,47 @@ export default {
1586
1597
  isCanPreAddSign
1587
1598
  }
1588
1599
  } = res;
1589
- if(taskOperationShiftedNodeList && taskOperationShiftedNodeList.length>0){
1590
- that.taskOperationShiftedNodeList = []
1591
- taskOperationShiftedNodeList.map(x =>{
1592
- that.taskOperationShiftedNodeList.push(x.nodeId)
1593
- that.taskOperations.push({key: x.nodeId, value: x.nodeName,isNextNode: true,nextOperate:x.nextOperate,})
1594
- })
1600
+ if (currentOrgSelectorParams.enableCurrentOrgConfig == 'true') {
1601
+ that.currentOrgSelectorTabs =
1602
+ currentOrgSelectorParams.currentOrgType.split(',');
1603
+ let currentOrgparams =
1604
+ currentOrgSelectorParams.currentOrgRange.split(',');
1605
+ that.currentOrgSelectorTabs.map((x, i) => {
1606
+ that.currentOrgSelectorParams[x] = {
1607
+ pid: currentOrgparams[i] == 'my' ? choiceOrgId : currentOrgparams[i]
1608
+ };
1609
+ });
1610
+ that.currentOrgSelectorTabs = that.currentOrgSelectorTabs.join(',')
1611
+ }
1612
+ if (currentOrgSelectorParams.enableForeignOrgConfig == 'true') {
1613
+ that.foreignOrgSelectorTabs =
1614
+ currentOrgSelectorParams.foreignOrgType.split(',');
1615
+ let foreignOrgparams =
1616
+ currentOrgSelectorParams.foreignOrgRange.split(',');
1617
+ that.foreignOrgSelectorTabs.map((x, i) => {
1618
+ that.foreignOrgSelectorParams[x] = {
1619
+ pid:
1620
+ foreignOrgparams[i] == 'my'
1621
+ ? choiceOrgId
1622
+ : foreignOrgparams[i]
1623
+ };
1624
+ });
1625
+ that.foreignOrgSelectorTabs = that.foreignOrgSelectorTabs.join(',')
1626
+ }
1627
+ if (
1628
+ taskOperationShiftedNodeList &&
1629
+ taskOperationShiftedNodeList.length > 0
1630
+ ) {
1631
+ that.taskOperationShiftedNodeList = [];
1632
+ taskOperationShiftedNodeList.map((x) => {
1633
+ that.taskOperationShiftedNodeList.push(x.nodeId);
1634
+ that.taskOperations.push({
1635
+ key: x.nodeId,
1636
+ value: x.nodeName,
1637
+ isNextNode: true,
1638
+ nextOperate: x.nextOperate
1639
+ });
1640
+ });
1595
1641
  }
1596
1642
  that.pendingItemHandleDescription = pendingItemHandleDescription;
1597
1643
  nextNodeCheckType && (that.nextNodeCheckType = nextNodeCheckType);
@@ -1630,7 +1676,10 @@ export default {
1630
1676
  }
1631
1677
  that.isSpecial = res.data.isSpecial;
1632
1678
  that.processObj = res.data;
1633
- that.taskOperations = [...res.data.taskOperations,...that.taskOperations];
1679
+ that.taskOperations = [
1680
+ ...res.data.taskOperations,
1681
+ ...that.taskOperations
1682
+ ];
1634
1683
  if (that.taskOperations && that.taskOperations.length > 0) {
1635
1684
  let isSelected = false;
1636
1685
  that.taskOperations.map((item) => {
@@ -26,7 +26,7 @@
26
26
  :placeholder="placeholder"
27
27
  v-model="opinion"
28
28
  ref="opinionInp"
29
- autofocus
29
+ :autofocus="pendingItemHandleDescription && showDescription"
30
30
  type="textarea"
31
31
  rows="3"
32
32
  @input="onInput"
@@ -54,7 +54,7 @@
54
54
  ref="opinionInp"
55
55
  type="textarea"
56
56
  rows="3"
57
- autofocus
57
+ :autofocus="pendingItemHandleDescription && showDescription"
58
58
  @focus="handleFocus"
59
59
  @blur="handleBlur"
60
60
  @input="onInput"
@@ -52,7 +52,7 @@
52
52
  label="下步节点"
53
53
  required
54
54
  show-toolbar
55
- v-model="form.nextNodeName"
55
+ v-model="form.nextNodeId"
56
56
  label-width="100%"
57
57
  :columns="nodeList"
58
58
  value-key="nodeId"
@@ -75,8 +75,8 @@
75
75
  onlyMyOrg: false
76
76
  }"
77
77
  :disabled="
78
- !isCustomUser || isCurrentNodeForbiddenChangeCandidate == 1
79
- "
78
+ !isCustomUser || isCurrentNodeForbiddenChangeCandidate == 1
79
+ "
80
80
  :baseUrl="apiBaseUrl"
81
81
  :paddingTop="paddingTop"
82
82
  :objType="objType"
@@ -86,59 +86,59 @@
86
86
  />
87
87
  </div>
88
88
  <div class="item" v-if="enableCustomLimitTimeSetting">
89
- <!-- <van-field
89
+ <!-- <van-field
90
90
  value="主办"
91
91
  label="主办"
92
92
  :disabled="true"
93
93
  placeholder="请选择"
94
94
  /> -->
95
- <em-picker
96
- v-model="form.customLimitTime"
97
- v-if="!showCustomLimitTimeText"
98
- label="限时办理"
99
- title="限时办理"
100
- placeholder="请选择"
101
- sysAppCode="bpm_custom_limit_time"
102
- show-toolbar
95
+ <em-picker
96
+ v-model="form.customLimitTime"
97
+ v-if="!showCustomLimitTimeText"
98
+ label="限时办理"
99
+ title="限时办理"
100
+ placeholder="请选择"
101
+ sysAppCode="bpm_custom_limit_time"
102
+ show-toolbar
103
+ >
104
+ <template slot="button">
105
+ <em-button
106
+ size="small"
107
+ type="primary"
108
+ @click="
109
+ () => {
110
+ form.customLimitTime = '';
111
+ showCustomLimitTimeText = !showCustomLimitTimeText;
112
+ }
113
+ "
114
+ >切换文本框</em-button
103
115
  >
104
- <template slot="button">
105
- <em-button
106
- size="small"
107
- type="primary"
108
- @click="
109
- () => {
110
- form.customLimitTime = '';
111
- showCustomLimitTimeText = !showCustomLimitTimeText;
112
- }
113
- "
114
- >切换文本框</em-button
115
- >
116
- </template>
117
- </em-picker>
118
- <em-input
119
- v-else
120
- v-model="form.customLimitTime"
121
- center
122
- label="限时办理"
123
- clearable
124
- @change="changeCustomLimitTime"
125
- placeholder="请输入限时办理天数"
116
+ </template>
117
+ </em-picker>
118
+ <em-input
119
+ v-else
120
+ v-model="form.customLimitTime"
121
+ center
122
+ label="限时办理"
123
+ clearable
124
+ @change="changeCustomLimitTime"
125
+ placeholder="请输入限时办理天数"
126
+ >
127
+ <template slot="button">
128
+ <em-button
129
+ size="small"
130
+ type="primary"
131
+ @click="
132
+ () => {
133
+ form.customLimitTime = '';
134
+ showCustomLimitTimeText = !showCustomLimitTimeText;
135
+ }
136
+ "
137
+ >切换选择框</em-button
126
138
  >
127
- <template slot="button">
128
- <em-button
129
- size="small"
130
- type="primary"
131
- @click="
132
- () => {
133
- form.customLimitTime = '';
134
- showCustomLimitTimeText = !showCustomLimitTimeText;
135
- }
136
- "
137
- >切换选择框</em-button
138
- >
139
- </template>
140
- </em-input>
141
- </div>
139
+ </template>
140
+ </em-input>
141
+ </div>
142
142
  <ProcessSetting
143
143
  v-if="processObj.isCustomPreset && isPreset"
144
144
  ref="processSetting"
@@ -259,7 +259,8 @@ export default {
259
259
  showOpinion: true,
260
260
  readOnlyNotificationType: '',
261
261
  notificationMessageReadOnly: false,
262
- isCustomUser:1,
262
+ defaultNextNode: '',
263
+ isCustomUser: 1,
263
264
  isCurrentNodeForbiddenChangeCandidate: 0,
264
265
  form: {
265
266
  nextNodeId: undefined, // 流程节点id
@@ -400,7 +401,10 @@ export default {
400
401
  ? ''
401
402
  : this.form.notificationType,
402
403
  opinion: this.form.opinion,
403
- customLimitTime :typeof this.form.customLimitTime === 'object' ? this.form.customLimitTime.cciValue : this.form.customLimitTime,
404
+ customLimitTime:
405
+ typeof this.form.customLimitTime === 'object'
406
+ ? this.form.customLimitTime.cciValue
407
+ : this.form.customLimitTime,
404
408
  nodeId: this.form.nodeId,
405
409
  notificationMsg: this.form.notificationMsg,
406
410
  loginType: 2, //登录方式
@@ -408,7 +412,7 @@ export default {
408
412
  userId: this.userId || $.getStorage('userId'),
409
413
  mobileKey: $.getStorage('deviceId') || '123'
410
414
  };
411
- if(!this.enableCustomLimitTimeSetting){
415
+ if (!this.enableCustomLimitTimeSetting) {
412
416
  delete info.customLimitTime;
413
417
  }
414
418
  if (this.processObj.isCustomPreset && this.isPreset) {
@@ -446,8 +450,8 @@ export default {
446
450
  }
447
451
  info = newParm;
448
452
  }
449
- if(this.formType == 'freeStart' && !this.isFreeStartFlow){
450
- info.businessId = this.businessId//this.businessId
453
+ if (this.formType == 'freeStart' && !this.isFreeStartFlow) {
454
+ info.businessId = this.businessId; //this.businessId
451
455
  }
452
456
  if (this.beforeSubmit) {
453
457
  this.beforeSubmit(info);
@@ -486,15 +490,15 @@ export default {
486
490
  format: false
487
491
  }).then((res) => {
488
492
  this.$toast.clear();
489
- if (res.rCode == 0 || res.status == "success") {
493
+ if (res.rCode == 0 || res.status == 'success') {
490
494
  this.$toast('操作成功');
491
- if(_that.formType == 'freeStart' && !_that.isFreeStartFlow){
492
- this.$emit('closePop')
493
- }else{
495
+ if (_that.formType == 'freeStart' && !_that.isFreeStartFlow) {
496
+ this.$emit('closePop');
497
+ } else {
494
498
  // if(_that.formType == 'freeStart'){
495
499
  // _that.$emit('success');
496
500
  // }else{
497
- _that.$parent.$emit('success');
501
+ _that.$parent.$emit('success');
498
502
  // }
499
503
  }
500
504
  } else {
@@ -563,10 +567,26 @@ export default {
563
567
  onConfirmNext(val) {
564
568
  this.form.nextName = val.itemName;
565
569
  this.nodeList = val.list;
566
- this.form.nextNodeId = val.list[0].nodeId;
567
- this.form.nextNodeName = val.list[0].nodeName;
568
- val.list[0].transactorInfos &&
570
+ if (
571
+ this.defaultNextNode &&
572
+ this.nodeList.filter((x) => x.nodeId == this.defaultNextNode).length > 0
573
+ ) {
574
+ let nodeInfo = this.nodeList.filter(
575
+ (x) => x.nodeId == this.defaultNextNode
576
+ );
577
+ this.form.nextNodeId = nodeInfo[0].nodeId;
578
+ this.form.nextNodeName = nodeInfo[0].nodeName;
579
+ nodeInfo[0].transactorInfos &&
580
+ (this.nextUserList = nodeInfo[0].transactorInfos);
581
+ } else {
582
+ this.form.nextNodeId = val.list[0].nodeId;
583
+ this.form.nextNodeName = val.list[0].nodeName;
584
+ val.list[0].transactorInfos &&
569
585
  (this.nextUserList = val.list[0].transactorInfos);
586
+ }
587
+
588
+
589
+ this.nextUserSelectList = [];
570
590
  this.showNextList = false;
571
591
  this.getPeopleObj(this.form.nextNodeId);
572
592
  },
@@ -575,6 +595,9 @@ export default {
575
595
  this.form.nextNodeId = val.nodeId;
576
596
  this.form.nextNodeName = val.nodeName;
577
597
  this.showNextNodeList = false;
598
+ val.transactorInfos &&
599
+ (this.nextUserList = val.transactorInfos);
600
+ this.nextUserSelectList = [];
578
601
  this.getPeopleObj(this.form.nextNodeId);
579
602
  },
580
603
  // 办理人选择完回调
@@ -621,7 +644,7 @@ export default {
621
644
  res.results.extendData.readOnlyNotificationType;
622
645
  }
623
646
  that.isCurrentNodeForbiddenChangeCandidate =
624
- res.results.nodeExtr.isCurrentNodeForbiddenChangeCandidate;
647
+ res.results.nodeExtr.isCurrentNodeForbiddenChangeCandidate;
625
648
  that.processObj = res.results;
626
649
  that.nextList = res.results.nodeList;
627
650
  that.isOpinionRequired = res.results.nodeExtr.isOpinionRequired;
@@ -633,17 +656,40 @@ export default {
633
656
  that.isBanInputOpinion = 0;
634
657
  }
635
658
  that.isChooseNextNode = res.results.nodeExtr.isChooseNextNode;
659
+ that.defaultNextNode = res.results.nodeExtr.defaultNextNode;
636
660
  that.nodeList = res.results.nodeList[0].list;
637
- that.form.nextName = that.nextList[0].itemName;
638
- that.form.nextNodeId = that.nextList[0].list[0].nodeId;
639
- that.form.nextNodeName = that.nextList[0].list[0].nodeName;
640
- that.nextList[0].list[0].transactorInfos &&
641
- (that.nextUserList = that.nextList[0].list[0].transactorInfos);
642
- if (that.nextUserList) {
643
- that.nextUserList.map((x) => {
644
- x.checked = false;
645
- });
661
+ if (
662
+ res.results.nodeExtr.defaultNextNode &&
663
+ that.nextList[0].list.filter(
664
+ (x) => x.nodeId == res.results.nodeExtr.defaultNextNode
665
+ ).length > 0
666
+ ) {
667
+ let nodeInfo = that.nextList[0].list.filter(
668
+ (x) => x.nodeId == res.results.nodeExtr.defaultNextNode
669
+ );
670
+
671
+ that.form.nextNodeId = nodeInfo[0].nodeId;
672
+ that.form.nextNodeName = nodeInfo[0].nodeName;
673
+ nodeInfo[0].transactorInfos &&
674
+ (that.nextUserList = nodeInfo[0].transactorInfos);
675
+ if (that.nextUserList) {
676
+ that.nextUserList.map((x) => {
677
+ x.checked = false;
678
+ });
679
+ }
680
+ } else {
681
+ that.form.nextNodeId = that.nextList[0].list[0].nodeId;
682
+ that.form.nextNodeName = that.nextList[0].list[0].nodeName;
683
+ that.nextList[0].list[0].transactorInfos &&
684
+ (that.nextUserList = that.nextList[0].list[0].transactorInfos);
685
+ if (that.nextUserList) {
686
+ that.nextUserList.map((x) => {
687
+ x.checked = false;
688
+ });
689
+ }
646
690
  }
691
+ that.form.nextName = that.nextList[0].itemName;
692
+
647
693
  that.form.notificationMsg = res.results.notificationMsg;
648
694
  that.form.nodeId = res.results.nodeId;
649
695
  let defaultNotificationTypes = [];
@@ -669,21 +715,29 @@ export default {
669
715
  // 获取节点信息(获取节点属性及办理人)
670
716
  getPeopleObj(res) {
671
717
  const _that = this;
718
+ // this.$toast.loading({
719
+ // message: '加载中...',
720
+ // forbidClick: true,
721
+ // loadingType: 'spinner',
722
+ // overlay: true,
723
+ // duration: 0
724
+ // });
672
725
  request({
673
726
  url: _that.apiBaseUrl ? _that.apiBaseUrl + getNodeInfo : getNodeInfo,
674
727
  params: {
675
728
  // params: {
676
- processDefinitionId: this.flowObj.processDefinitionId,
677
- nodeId: res,
678
- // taskId: this.processObj.taskId,
679
- userId: _that.userId
729
+ processDefinitionId: this.flowObj.processDefinitionId,
730
+ nodeId: res,
731
+ // taskId: this.processObj.taskId,
732
+ userId: _that.userId
680
733
  // }
681
734
  }
682
735
  }).then((res) => {
683
736
  this.$toast.clear();
684
737
  if (res.rCode == 0) {
685
738
  _that.isCustomUser = res.results.nodeExtr.isCustomUser;
686
- this.peopleObj = res.results.nodeExtr;
739
+ _that.peopleObj = res.results.nodeExtr;
740
+ // _that.nextUserList = res.results.transactorInfos || [];
687
741
  _that.enableCustomLimitTimeSetting =
688
742
  this.peopleObj.enableCustomLimitTimeSetting == 1;
689
743
  if (res.results.nodeExtr.userSelectionType) {
@@ -456,7 +456,6 @@ export default {
456
456
  this.selectPersonValue = res.data.selectPersonValue
457
457
  this.isMultiple()
458
458
  }
459
- console.log(res)
460
459
  })
461
460
  },
462
461
  getProcessObjNew() {
@@ -350,7 +350,6 @@ export default {
350
350
  });
351
351
  //获取流程发起信息后去获取节点信息和办理人信息
352
352
  Promise.all([this.getProcessObj(res)]).then(() => {
353
- console.log(res, this.form, 'asd');
354
353
  this.getPeopleObj(this.form.nextNodeId);
355
354
  });
356
355
  },
@@ -523,7 +522,6 @@ export default {
523
522
  },
524
523
  // 确认下一步操作
525
524
  onConfirmNext(val) {
526
- console.log(val, 'vaaav');
527
525
  this.form.nextName = val.itemName;
528
526
  this.nodeList = val.list;
529
527
  this.form.nextNodeId = val.list[0].nodeId;
@@ -489,7 +489,6 @@ export default {
489
489
  },
490
490
  // 通知消息回调
491
491
  onInputMsg(obj) {
492
- console.log(obj)
493
492
  this.infoList.noticeType = JSON.parse(JSON.stringify(obj.notificationType));
494
493
  this.infoList.noticeInfo = obj.notificationMsg;
495
494
  },
@@ -398,7 +398,7 @@
398
398
  >提交</em-button
399
399
  >
400
400
  <em-button
401
- v-else
401
+ v-show="btnList.length != 0"
402
402
  v-for="item in btnList[0].contents"
403
403
  :key="item.text"
404
404
  v-bind="item"