eoss-ui 0.6.56 → 0.6.58
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/eoss-ui.common.js +336 -46
- package/lib/flow-list.js +9 -6
- package/lib/flow.js +286 -14
- package/lib/index.js +1 -1
- package/lib/main.js +28 -16
- package/lib/menu.js +5 -2
- package/lib/theme-chalk/flow.css +1 -1
- package/lib/theme-chalk/index.css +1 -1
- package/package.json +1 -1
- package/packages/.DS_Store +0 -0
- package/packages/flow/.DS_Store +0 -0
- package/packages/flow/src/main.vue +72 -31
- package/packages/flow/src/processForm.vue +89 -33
- package/packages/flow-list/.DS_Store +0 -0
- package/packages/flow-list/src/main.vue +12 -3
- package/packages/main/.DS_Store +0 -0
- package/packages/main/src/.DS_Store +0 -0
- package/packages/main/src/simplicity/index.vue +10 -0
- package/packages/main/src/simplicity/sub-menu.vue +1 -0
- package/packages/menu/.DS_Store +0 -0
- package/packages/menu/src/main.vue +7 -3
- package/packages/theme-chalk/lib/flow.css +1 -1
- package/packages/theme-chalk/lib/index.css +1 -1
- package/packages/theme-chalk/src/flow.scss +7 -0
- package/src/index.js +1 -1
package/package.json
CHANGED
package/packages/.DS_Store
CHANGED
|
Binary file
|
package/packages/flow/.DS_Store
CHANGED
|
Binary file
|
|
@@ -11,12 +11,16 @@
|
|
|
11
11
|
:opinion="value"
|
|
12
12
|
type="create"
|
|
13
13
|
:key="StartTaskReadKey"
|
|
14
|
-
typeCode=
|
|
14
|
+
typeCode="read"
|
|
15
15
|
:taskExamine="taskExamineInfo"
|
|
16
16
|
:news-info="nextNode.notificationMsg"
|
|
17
17
|
@cancel="closeProcess($event)"
|
|
18
18
|
/>
|
|
19
|
-
<Supervise
|
|
19
|
+
<Supervise
|
|
20
|
+
:businessId="businessId"
|
|
21
|
+
@cancel="closeProcess($event)"
|
|
22
|
+
v-else-if="typeCode == 'supervise'"
|
|
23
|
+
/>
|
|
20
24
|
<reset
|
|
21
25
|
style="height: 100%"
|
|
22
26
|
:type="newTypeCode"
|
|
@@ -340,6 +344,31 @@
|
|
|
340
344
|
:tabs="nextUserTabs"
|
|
341
345
|
/>
|
|
342
346
|
</el-form-item>
|
|
347
|
+
<el-form-item
|
|
348
|
+
v-if="enableCustomLimitTimeSetting"
|
|
349
|
+
prop="customLimitTime"
|
|
350
|
+
label="限时办理"
|
|
351
|
+
>
|
|
352
|
+
<el-input
|
|
353
|
+
v-model="nextNode.customLimitTime"
|
|
354
|
+
placeholder="请输入限时办理的天数"
|
|
355
|
+
@change="changeCustomLimitTime"
|
|
356
|
+
class="input-with-select custom-limit-time"
|
|
357
|
+
>
|
|
358
|
+
<es-select
|
|
359
|
+
v-if="!showCustomLimitTimeText"
|
|
360
|
+
v-model="nextNode.customLimitTime"
|
|
361
|
+
placeholder="请选择"
|
|
362
|
+
slot="prepend"
|
|
363
|
+
sysCode="bpm_custom_limit_time"
|
|
364
|
+
></es-select>
|
|
365
|
+
<es-button type="primary" slot="append" @click="() => {
|
|
366
|
+
nextNode.customLimitTime = ''
|
|
367
|
+
showCustomLimitTimeText = !showCustomLimitTimeText
|
|
368
|
+
}">切换{{showCustomLimitTimeText?'选择框' : '文本框'}}</es-button>
|
|
369
|
+
</el-input>
|
|
370
|
+
</el-form-item>
|
|
371
|
+
|
|
343
372
|
<el-form-item
|
|
344
373
|
v-if="isHideCurrentOrg"
|
|
345
374
|
prop="nextCurrentOrgObj"
|
|
@@ -929,6 +958,7 @@ export default {
|
|
|
929
958
|
otherOrgDisabledObjId: [],
|
|
930
959
|
isCanReadTransferHandle: false,
|
|
931
960
|
readTransferHandleDisabled: true,
|
|
961
|
+
showCustomLimitTimeText:false,
|
|
932
962
|
currentOrgDisabledObjId: [],
|
|
933
963
|
nextNodeCheckType: 'select',
|
|
934
964
|
readOnlyNotificationType: '',
|
|
@@ -953,6 +983,7 @@ export default {
|
|
|
953
983
|
flowDisabled: false,
|
|
954
984
|
activeNames: '',
|
|
955
985
|
isEndUserTask: true,
|
|
986
|
+
enableCustomLimitTimeSetting: false, //是否开启限时办理
|
|
956
987
|
isForceDisplayDefaultOptionForPrefix: false,
|
|
957
988
|
selectUserList: [],
|
|
958
989
|
selectNextCurrentOrgObjList: [],
|
|
@@ -987,7 +1018,7 @@ export default {
|
|
|
987
1018
|
isLimitedTimeHandling: 0, //是否支持发起子流程限时办理
|
|
988
1019
|
nodeType: 0, //节点类型, (普通节点0,承办节点1,会签节点2,阅办节点3)
|
|
989
1020
|
userOptions: [], //分阅用户
|
|
990
|
-
StartTaskReadKey:0,
|
|
1021
|
+
StartTaskReadKey: 0,
|
|
991
1022
|
mixReadList: [], //分阅混选
|
|
992
1023
|
mixCurrentOrg: [], //本单位混选
|
|
993
1024
|
isTaskread: 0, //是否展示分阅用户
|
|
@@ -1065,6 +1096,7 @@ export default {
|
|
|
1065
1096
|
addSignMode: 'postAddSign',
|
|
1066
1097
|
isAddSign: '', // 是否加签
|
|
1067
1098
|
isRemoveSign: '', // 是否减签
|
|
1099
|
+
customLimitTime:'',//限时天数
|
|
1068
1100
|
nextOperate: '', // 下步操作
|
|
1069
1101
|
notificationMsg: '', // 通知信息
|
|
1070
1102
|
addSignUserId: [], // 加签办理人
|
|
@@ -1134,34 +1166,34 @@ export default {
|
|
|
1134
1166
|
}
|
|
1135
1167
|
}
|
|
1136
1168
|
},
|
|
1137
|
-
flowTypeCode:{
|
|
1169
|
+
flowTypeCode: {
|
|
1138
1170
|
handler(val) {
|
|
1139
1171
|
this.isFlow && this.businessId && this.getProcess(val);
|
|
1140
1172
|
},
|
|
1141
|
-
deep:true,
|
|
1173
|
+
deep: true,
|
|
1142
1174
|
immediate: true
|
|
1143
1175
|
},
|
|
1144
|
-
defaultProcessKey:{
|
|
1176
|
+
defaultProcessKey: {
|
|
1145
1177
|
handler(val) {
|
|
1146
|
-
if(this.nodeInfo.option){
|
|
1178
|
+
if (this.nodeInfo.option) {
|
|
1147
1179
|
this.nodeInfo.nextNode = this.nodeInfo.option.filter(
|
|
1148
|
-
|
|
1149
|
-
|
|
1150
|
-
|
|
1151
|
-
|
|
1152
|
-
|
|
1153
|
-
|
|
1154
|
-
|
|
1155
|
-
|
|
1156
|
-
|
|
1157
|
-
|
|
1158
|
-
|
|
1159
|
-
|
|
1160
|
-
|
|
1161
|
-
|
|
1180
|
+
(item) => item.processDefKey == val
|
|
1181
|
+
);
|
|
1182
|
+
if (this.nodeInfo.nextNode.length) {
|
|
1183
|
+
this.nodeInfo.nextNode = this.nodeInfo.nextNode[0].processDefId;
|
|
1184
|
+
} else {
|
|
1185
|
+
if (this.nodeInfo.option.length != 0) {
|
|
1186
|
+
this.nodeInfo.nextNode = this.nodeInfo.option[0].processDefId;
|
|
1187
|
+
} else {
|
|
1188
|
+
this.nodeInfo.nextNode = '';
|
|
1189
|
+
}
|
|
1190
|
+
}
|
|
1191
|
+
if (this.nodeInfo.nextNode) {
|
|
1192
|
+
this.handleChange(this.nodeInfo.nextNode);
|
|
1193
|
+
}
|
|
1162
1194
|
}
|
|
1163
1195
|
},
|
|
1164
|
-
deep:true,
|
|
1196
|
+
deep: true,
|
|
1165
1197
|
immediate: true
|
|
1166
1198
|
}
|
|
1167
1199
|
},
|
|
@@ -1207,6 +1239,12 @@ export default {
|
|
|
1207
1239
|
}
|
|
1208
1240
|
},
|
|
1209
1241
|
methods: {
|
|
1242
|
+
changeCustomLimitTime(val){
|
|
1243
|
+
if(!Number(val) || val.indexOf('.') != -1 || Number(val) <0){
|
|
1244
|
+
this.$message.warning('请输入正确的天数');
|
|
1245
|
+
this.nextNode.customLimitTime = ''
|
|
1246
|
+
}
|
|
1247
|
+
},
|
|
1210
1248
|
taskReadTransferHandle() {
|
|
1211
1249
|
if (this.taskReadOpinionRequired == 'true' && !this.value) {
|
|
1212
1250
|
if (!this.$refs.commonOpinions.validate()) return;
|
|
@@ -1706,6 +1744,7 @@ export default {
|
|
|
1706
1744
|
params: {
|
|
1707
1745
|
businessId,
|
|
1708
1746
|
processDefinitionId,
|
|
1747
|
+
pendingId: this.pendingId,
|
|
1709
1748
|
nodeId
|
|
1710
1749
|
}
|
|
1711
1750
|
};
|
|
@@ -2088,6 +2127,8 @@ export default {
|
|
|
2088
2127
|
const { status, message, data } = res;
|
|
2089
2128
|
this.loading.close();
|
|
2090
2129
|
if (status === 'success') {
|
|
2130
|
+
this.enableCustomLimitTimeSetting =
|
|
2131
|
+
data.nodeExtAttr.enableCustomLimitTimeSetting == 1;
|
|
2091
2132
|
data.otherOrgDisabledObjId &&
|
|
2092
2133
|
(this.otherOrgDisabledObjId =
|
|
2093
2134
|
data.otherOrgDisabledObjId.split(','));
|
|
@@ -2607,7 +2648,7 @@ export default {
|
|
|
2607
2648
|
this.getFind();
|
|
2608
2649
|
|
|
2609
2650
|
this.getNodeInfo();
|
|
2610
|
-
this.StartTaskReadKey
|
|
2651
|
+
this.StartTaskReadKey++;
|
|
2611
2652
|
} else {
|
|
2612
2653
|
if (res.status === 'taskCompleted') {
|
|
2613
2654
|
this.$emit('shrink', true);
|
|
@@ -2685,7 +2726,7 @@ export default {
|
|
|
2685
2726
|
getProcess(val) {
|
|
2686
2727
|
let params = {
|
|
2687
2728
|
businessId: this.businessId,
|
|
2688
|
-
flowTypeCode:val || this.flowTypeCode,
|
|
2729
|
+
flowTypeCode: val || this.flowTypeCode,
|
|
2689
2730
|
// defaultProcessKey: this.defaultProcessKey,
|
|
2690
2731
|
isOnly: true,
|
|
2691
2732
|
hideTempSave: true,
|
|
@@ -2828,13 +2869,13 @@ export default {
|
|
|
2828
2869
|
} else {
|
|
2829
2870
|
this.freeValid = true;
|
|
2830
2871
|
}
|
|
2831
|
-
if (
|
|
2832
|
-
|
|
2833
|
-
|
|
2834
|
-
) {
|
|
2835
|
-
|
|
2836
|
-
|
|
2837
|
-
}
|
|
2872
|
+
// if (
|
|
2873
|
+
// this.currentNodeIsCircularReadNode &&
|
|
2874
|
+
// this.nextNode.nextOtherOrgObj.length != 0
|
|
2875
|
+
// ) {
|
|
2876
|
+
// this.reqCircularRead(type);
|
|
2877
|
+
// return;
|
|
2878
|
+
// }
|
|
2838
2879
|
if (type == 'multiInsMidwayWithSubmitScene') {
|
|
2839
2880
|
this.sendData(type);
|
|
2840
2881
|
return;
|
|
@@ -23,11 +23,17 @@
|
|
|
23
23
|
>
|
|
24
24
|
<el-input v-model="nextNode.nodeName" disabled />
|
|
25
25
|
</el-form-item>
|
|
26
|
-
<el-form-item
|
|
26
|
+
<el-form-item
|
|
27
|
+
v-if="isSinglePage || copyHistory || formType == 'readTransfer'"
|
|
28
|
+
prop="newOpinion"
|
|
29
|
+
:label="
|
|
30
|
+
copyHistory || formType == 'readTransfer' ? '填写意见' : '意见'
|
|
31
|
+
"
|
|
32
|
+
>
|
|
27
33
|
<CommonOpinions
|
|
28
34
|
class="opinions"
|
|
29
35
|
:opinion="nextNode.newOpinion"
|
|
30
|
-
:rows="copyHistory || formType == 'readTransfer'?2:5"
|
|
36
|
+
:rows="copyHistory || formType == 'readTransfer' ? 2 : 5"
|
|
31
37
|
@change="(val) => (nextNode.newOpinion = val)"
|
|
32
38
|
/>
|
|
33
39
|
</el-form-item>
|
|
@@ -184,6 +190,39 @@
|
|
|
184
190
|
:tabs="tabs"
|
|
185
191
|
/>
|
|
186
192
|
</el-form-item>
|
|
193
|
+
<el-form-item
|
|
194
|
+
v-if="enableCustomLimitTimeSetting"
|
|
195
|
+
prop="customLimitTime"
|
|
196
|
+
label="限时办理"
|
|
197
|
+
>
|
|
198
|
+
<el-input
|
|
199
|
+
v-model="nextNode.customLimitTime"
|
|
200
|
+
placeholder="请输入限时办理的天数"
|
|
201
|
+
@change="changeCustomLimitTime"
|
|
202
|
+
class="input-with-select custom-limit-time"
|
|
203
|
+
>
|
|
204
|
+
<es-select
|
|
205
|
+
v-if="!showCustomLimitTimeText"
|
|
206
|
+
v-model="nextNode.customLimitTime"
|
|
207
|
+
placeholder="请选择"
|
|
208
|
+
slot="prepend"
|
|
209
|
+
sysCode="bpm_custom_limit_time"
|
|
210
|
+
></es-select>
|
|
211
|
+
<es-button
|
|
212
|
+
type="primary"
|
|
213
|
+
slot="append"
|
|
214
|
+
@click="
|
|
215
|
+
() => {
|
|
216
|
+
nextNode.customLimitTime = '';
|
|
217
|
+
showCustomLimitTimeText = !showCustomLimitTimeText;
|
|
218
|
+
}
|
|
219
|
+
"
|
|
220
|
+
>切换{{
|
|
221
|
+
showCustomLimitTimeText ? '选择框' : '文本框'
|
|
222
|
+
}}</es-button
|
|
223
|
+
>
|
|
224
|
+
</el-input>
|
|
225
|
+
</el-form-item>
|
|
187
226
|
<el-form-item
|
|
188
227
|
v-if="isHandleExplain == 1"
|
|
189
228
|
prop="handleExplain"
|
|
@@ -312,9 +351,9 @@ export default {
|
|
|
312
351
|
type: String,
|
|
313
352
|
default: ''
|
|
314
353
|
},
|
|
315
|
-
formType:{
|
|
316
|
-
|
|
317
|
-
|
|
354
|
+
formType: {
|
|
355
|
+
type: String,
|
|
356
|
+
default: 'freeStart'
|
|
318
357
|
},
|
|
319
358
|
id: {
|
|
320
359
|
type: String,
|
|
@@ -345,7 +384,9 @@ export default {
|
|
|
345
384
|
notificationMessageReadOnly: false,
|
|
346
385
|
readOnlyNotificationType: '',
|
|
347
386
|
show: true,
|
|
387
|
+
enableCustomLimitTimeSetting: false,
|
|
348
388
|
radioList: [],
|
|
389
|
+
showCustomLimitTimeText:false,
|
|
349
390
|
activeNames: '',
|
|
350
391
|
selectUserList: [],
|
|
351
392
|
defaultNextNode: '',
|
|
@@ -378,15 +419,13 @@ export default {
|
|
|
378
419
|
tabs: {
|
|
379
420
|
employee: {
|
|
380
421
|
param: {
|
|
381
|
-
filid: JSON.parse(util.getStorage('mainConfig')).userModel
|
|
382
|
-
.orgId,
|
|
422
|
+
filid: JSON.parse(util.getStorage('mainConfig')).userModel.orgId,
|
|
383
423
|
name: '本单位用户'
|
|
384
424
|
}
|
|
385
425
|
},
|
|
386
426
|
department: {
|
|
387
427
|
param: {
|
|
388
|
-
filid: JSON.parse(util.getStorage('mainConfig')).userModel
|
|
389
|
-
.orgId
|
|
428
|
+
filid: JSON.parse(util.getStorage('mainConfig')).userModel.orgId
|
|
390
429
|
}
|
|
391
430
|
}
|
|
392
431
|
},
|
|
@@ -403,6 +442,7 @@ export default {
|
|
|
403
442
|
mixOrgIdList: [], //办理对象混选
|
|
404
443
|
nextNode: {
|
|
405
444
|
nodeName: '',
|
|
445
|
+
customLimitTime: '',
|
|
406
446
|
newOpinion: '',
|
|
407
447
|
countersignaturetypeText: '',
|
|
408
448
|
nextNode: '',
|
|
@@ -440,13 +480,19 @@ export default {
|
|
|
440
480
|
mounted() {
|
|
441
481
|
this.getNodeType();
|
|
442
482
|
this.getStartFlow(this.processDefinitionId);
|
|
443
|
-
if(this.copyHistory){
|
|
483
|
+
if (this.copyHistory) {
|
|
444
484
|
this.nextNode.newOpinion = this.opinion;
|
|
445
|
-
}else if(this.formType != 'readTransfer'){
|
|
485
|
+
} else if (this.formType != 'readTransfer') {
|
|
446
486
|
this.newOpinion = this.opinion;
|
|
447
487
|
}
|
|
448
488
|
},
|
|
449
489
|
methods: {
|
|
490
|
+
changeCustomLimitTime(val){
|
|
491
|
+
if(!Number(val) || val.indexOf('.') != -1 || Number(val) <0){
|
|
492
|
+
this.$message.warning('请输入正确的天数');
|
|
493
|
+
this.nextNode.customLimitTime = ''
|
|
494
|
+
}
|
|
495
|
+
},
|
|
450
496
|
getUserInfo() {
|
|
451
497
|
let mainConfig = util.getStorage('mainConfig');
|
|
452
498
|
if (mainConfig) {
|
|
@@ -487,8 +533,7 @@ export default {
|
|
|
487
533
|
this.nextUserTabs = {
|
|
488
534
|
department: {
|
|
489
535
|
param: {
|
|
490
|
-
filid: JSON.parse(util.getStorage('mainConfig'))
|
|
491
|
-
.userModel.orgId
|
|
536
|
+
filid: JSON.parse(util.getStorage('mainConfig')).userModel.orgId
|
|
492
537
|
}
|
|
493
538
|
}
|
|
494
539
|
};
|
|
@@ -503,8 +548,7 @@ export default {
|
|
|
503
548
|
enterprise: { param: { filid: 'other' } },
|
|
504
549
|
department: {
|
|
505
550
|
param: {
|
|
506
|
-
filid: JSON.parse(util.getStorage('mainConfig'))
|
|
507
|
-
.userModel.orgId
|
|
551
|
+
filid: JSON.parse(util.getStorage('mainConfig')).userModel.orgId
|
|
508
552
|
}
|
|
509
553
|
}
|
|
510
554
|
};
|
|
@@ -617,7 +661,8 @@ export default {
|
|
|
617
661
|
presetReadUserId,
|
|
618
662
|
nextReadUserId,
|
|
619
663
|
nextOrgId,
|
|
620
|
-
newOpinion
|
|
664
|
+
newOpinion,
|
|
665
|
+
customLimitTime
|
|
621
666
|
} = this.nextNode;
|
|
622
667
|
if (noticeType.length === 0) {
|
|
623
668
|
return this.$message.warning('请选择通知方式');
|
|
@@ -643,6 +688,7 @@ export default {
|
|
|
643
688
|
let params = {
|
|
644
689
|
processDefinitionId: this.processDefinitionId,
|
|
645
690
|
nextUserId: this.multiple ? newNextUser.join(',') : nextUser,
|
|
691
|
+
customLimitTime,
|
|
646
692
|
nextNodeId: nextNode,
|
|
647
693
|
businessId: this.businessId,
|
|
648
694
|
notificationType: newNoticeType,
|
|
@@ -666,25 +712,31 @@ export default {
|
|
|
666
712
|
opinion: this.newOpinion || newOpinion
|
|
667
713
|
};
|
|
668
714
|
if (this.activeNames != '1') delete params.customPresetUserJson;
|
|
669
|
-
if(this.isFreeStartFlow || this.formType === 'readTransfer'){
|
|
670
|
-
let newParm = {}
|
|
671
|
-
newParm.copyHistory = this.copyHistory === 'needCopyPendedHistory'
|
|
672
|
-
newParm.startFlowParamJson = params
|
|
673
|
-
newParm.startFlowParamJson.businessId = this.id //this.id
|
|
674
|
-
newParm.startFlowParamJson = JSON.stringify(
|
|
675
|
-
|
|
676
|
-
|
|
677
|
-
|
|
715
|
+
if (this.isFreeStartFlow || this.formType === 'readTransfer') {
|
|
716
|
+
let newParm = {};
|
|
717
|
+
newParm.copyHistory = this.copyHistory === 'needCopyPendedHistory';
|
|
718
|
+
newParm.startFlowParamJson = params;
|
|
719
|
+
newParm.startFlowParamJson.businessId = this.id; //this.id
|
|
720
|
+
newParm.startFlowParamJson = JSON.stringify(
|
|
721
|
+
newParm.startFlowParamJson
|
|
722
|
+
);
|
|
723
|
+
for (let key in this.taskParams) {
|
|
724
|
+
if (Array.isArray(this.taskParams[key])) {
|
|
725
|
+
this.taskParams[key] =
|
|
726
|
+
this.taskParams[key].length > 0
|
|
727
|
+
? this.taskParams[key].join(',')
|
|
728
|
+
: '';
|
|
678
729
|
}
|
|
679
730
|
}
|
|
680
|
-
|
|
731
|
+
|
|
681
732
|
newParm.submitTaskParamJson = JSON.stringify(this.taskParams);
|
|
682
|
-
if(this.formType == 'readTransfer'){
|
|
683
|
-
|
|
684
|
-
|
|
685
|
-
|
|
686
|
-
|
|
687
|
-
|
|
733
|
+
if (this.formType == 'readTransfer') {
|
|
734
|
+
newParm.readTransferHandleStartFlowParamJson =
|
|
735
|
+
JSON.stringify(params);
|
|
736
|
+
newParm.taskReadEndParamJson = JSON.stringify(this.taskParams);
|
|
737
|
+
delete newParm.copyHistory;
|
|
738
|
+
delete newParm.startFlowParamJson;
|
|
739
|
+
delete newParm.submitTaskParamJson;
|
|
688
740
|
}
|
|
689
741
|
params = newParm;
|
|
690
742
|
}
|
|
@@ -692,7 +744,9 @@ export default {
|
|
|
692
744
|
.ajax({
|
|
693
745
|
url: this.isFreeStartFlow
|
|
694
746
|
? freeStartFlowWithSubmitTask
|
|
695
|
-
:this.formType == 'readTransfer'
|
|
747
|
+
: this.formType == 'readTransfer'
|
|
748
|
+
? startReadTransferHandleFlowWithTaskReadEnd
|
|
749
|
+
: register,
|
|
696
750
|
method: 'post',
|
|
697
751
|
data: params
|
|
698
752
|
})
|
|
@@ -742,6 +796,8 @@ export default {
|
|
|
742
796
|
this.nextNode.userInfo = nextUserList;
|
|
743
797
|
this.countersignaturetypeCode = countersignaturetypeCode;
|
|
744
798
|
this.nextNode.countersignaturetypeText = countersignaturetypeText;
|
|
799
|
+
this.enableCustomLimitTimeSetting =
|
|
800
|
+
nodeExtAttr.enableCustomLimitTimeSetting == 1;
|
|
745
801
|
this.isTaskread = nodeExtAttr.isTaskread;
|
|
746
802
|
this.isHandleExplain = nodeExtAttr.isHandleExplain;
|
|
747
803
|
this.isCustomUser = nodeExtAttr.isCustomUser; //是否展示选人组件按钮
|
|
Binary file
|
|
@@ -356,7 +356,16 @@ export default {
|
|
|
356
356
|
align: 'center',
|
|
357
357
|
key: 'jbbm',
|
|
358
358
|
showOverflowTooltip: true,
|
|
359
|
-
width: this.theadWidth.deptid || 150
|
|
359
|
+
width: this.theadWidth.deptid || 150,
|
|
360
|
+
render: (h, params) => {
|
|
361
|
+
return h(
|
|
362
|
+
'span',
|
|
363
|
+
{},
|
|
364
|
+
params.row.doDeptName
|
|
365
|
+
? params.row.doDeptName
|
|
366
|
+
: params.row.deptName
|
|
367
|
+
);
|
|
368
|
+
}
|
|
360
369
|
},
|
|
361
370
|
{
|
|
362
371
|
label: '步骤',
|
|
@@ -863,10 +872,10 @@ export default {
|
|
|
863
872
|
if (headFiled.showDefault) {
|
|
864
873
|
_that.theads[item].map((theadItem) => {
|
|
865
874
|
if (theadItem.field === headFiled.field) {
|
|
866
|
-
data.push({...theadItem
|
|
875
|
+
data.push({ ...theadItem, ...headFiled });
|
|
867
876
|
}
|
|
868
877
|
});
|
|
869
|
-
}else{
|
|
878
|
+
} else {
|
|
870
879
|
data.push(headFiled);
|
|
871
880
|
}
|
|
872
881
|
});
|
package/packages/main/.DS_Store
CHANGED
|
Binary file
|
|
Binary file
|
|
@@ -1577,6 +1577,16 @@ export default {
|
|
|
1577
1577
|
.catch(() => {});
|
|
1578
1578
|
this.showMsg = false;
|
|
1579
1579
|
this.showSet = false;
|
|
1580
|
+
|
|
1581
|
+
if (res.url) {
|
|
1582
|
+
if (res.urlopenmode == 1 || res.openModel == 1) {
|
|
1583
|
+
util.win.open(res.url);
|
|
1584
|
+
return;
|
|
1585
|
+
} else if (res.urlopenmode == 2 || res.openModel == 2) {
|
|
1586
|
+
util.win.open(res.url, '_self');
|
|
1587
|
+
return;
|
|
1588
|
+
}
|
|
1589
|
+
}
|
|
1580
1590
|
let i = util.indexOfObj(this.tabs, res, 'id');
|
|
1581
1591
|
if (i == -1) {
|
|
1582
1592
|
let tab = this.setIframeType(res);
|
|
Binary file
|
|
@@ -55,7 +55,8 @@ export default {
|
|
|
55
55
|
showTitle: {
|
|
56
56
|
type: Boolean,
|
|
57
57
|
default: true
|
|
58
|
-
}
|
|
58
|
+
},
|
|
59
|
+
fourthTabs: Boolean
|
|
59
60
|
},
|
|
60
61
|
computed: {
|
|
61
62
|
maxHeight() {
|
|
@@ -351,6 +352,8 @@ export default {
|
|
|
351
352
|
let doms = [
|
|
352
353
|
h('template', { slot: 'title' }, this.titleIcons ? title : [title[1]])
|
|
353
354
|
];
|
|
355
|
+
if (this.fourthTabs) {
|
|
356
|
+
}
|
|
354
357
|
if (
|
|
355
358
|
this.deep &&
|
|
356
359
|
item.children &&
|
|
@@ -388,9 +391,10 @@ export default {
|
|
|
388
391
|
doms
|
|
389
392
|
)
|
|
390
393
|
];
|
|
391
|
-
}
|
|
394
|
+
}
|
|
395
|
+
if (
|
|
392
396
|
this.deep &&
|
|
393
|
-
this.mode === 'horizontal' &&
|
|
397
|
+
(this.mode === 'horizontal', this.fourthTabs) &&
|
|
394
398
|
item.fourthTabs &&
|
|
395
399
|
item.fourthTabs.length &&
|
|
396
400
|
(!item.extendData || item.extendData.businessStatus != 0)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
@charset "UTF-8";.commonOpinion-set,.es-fenyue-buttons,.es-flow-content,.es-reset-flow{-webkit-box-direction:normal}.es-common-opinions,.es-fenyue-buttons,.es-flow-buttons,.es-flow-title,.es-opinion{padding:0 12px}.es-fenyue-buttons{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-ms-flex-direction:row;flex-direction:row}.es-fenyue-buttons-yj{-webkit-box-flex:1;-ms-flex:1;flex:1}.es-user-defined{display:-webkit-box;display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap}.es-user-defined .el-button--primary{-webkit-box-flex:1;-ms-flex:1;flex:1}.required .el-textarea__inner::-webkit-input-placeholder{color:red}.required .el-textarea__inner::-moz-placeholder{color:red}.required .el-textarea__inner:-ms-input-placeholder{color:red}.required .el-textarea__inner::-ms-input-placeholder{color:red}.required .el-textarea__inner::placeholder{color:red}.no-checked .el-checkbox__input{display:none!important}.es-reset-flow{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-ms-flex-direction:column;flex-direction:column;height:100%}.es-reset-flow-form-box{-webkit-box-flex:1;-ms-flex:1;flex:1;overflow-y:auto;margin-bottom:10px}.es-flow-content{height:100%;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-ms-flex-direction:column;flex-direction:column;padding-bottom:12px;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;position:relative}.es-flow-index{height:100%}.es-flow-index .em-flow-more-btn{display:block;width:100%}.es-flow-index .el-checkbox-group{display:contents}.es-flow-index .es-eidt-title{font-size:13px;color:#333;line-height:20px}.es-flow-index .es-flow-top .es-flow-title{height:40px;line-height:40px}.es-flow-index .es-flow-top .es-flow-title .es-icon{position:absolute;right:8px;top:4px}.es-flow-index .es-flow-top .es-opinion{display:-webkit-box;display:-ms-flexbox;display:flex;margin:8px 0;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.es-flow-index .es-flow-top .es-opinion .es-opinion-file{cursor:pointer;position:relative}.es-flow-index .es-flow-top .es-opinion .es-opinion-file .es-file-num{color:red}.es-flow-index .es-button-agree{width:calc(43% - 15px)}.es-flow-index .es-button-agree-save{margin-top:10px}.commonOpinion-set{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-ms-flex-direction:column;flex-direction:column;height:100%}.commonOpinion-set .el-table__body-wrapper{-webkit-box-flex:1;-ms-flex:1;flex:1}.es-flow-index-shrink{width:24px}.es-flow-index-shrink img{cursor:pointer;width:24px;height:24px}.es-flow-btn:hover{background-color:#f5f5f5;color:#1890ff}.es-flow-btn:hover ::v-deep .el-popover{padding:12px 0!important}.es-flow-form .el-checkbox-group{display:contents}.es-flow-index .el-input-group--prepend>.el-input__inner,.es-flow-index .select-process>.el-input__inner{display:none!important}.es-flow-form .el-textarea:first-child,.es-flow-index .el-textarea{width:100%;margin-bottom:10px!important}.es-flow-form .es-opinions .el-select,.es-flow-index .el-select{width:calc(100% + 40px)!important}.es-flow-index .el-select .el-input{width:100%;height:40px}.es-flow-index .process .el-select{width:calc(100% + 40px)!important}.es-flow-index .input-with-select .el-input-group__prepend{background-color:#fff;width:100%}.es-flow-index .select-process .el-input-group__append{height:40px}.es-flow-index .hide-flow-char .el-input-group__append{padding:0}.es-flow-index button.el-button.sub.el-button--primary.el-button--medium{width:calc(100% - 85px)}.es-flow-index .el-input-group--prepend>.el-input-group__append{height:40px}.es-flow-index .demo-dynamic .el-select{width:100%!important}.es-flow-index .demo-dynamic .select-process .el-select,.es-flow-index .demo-dynamic .selectUser,.es-flow-index.task-union-examine .el-select{width:calc(100% + 40px)!important}.es-flow-index .el-input.el-input-group.el-input-group--append.el-input-group--prepend{margin:0!important}.es-flow-index .demo-dynamic{-webkit-box-flex:1;-ms-flex:1;flex:1;overflow-y:auto;overflow-x:hidden;margin-top:10px}.es-flow-index .es-footer-btn{margin-top:10px}.es-flow-index .es-footer-btn .el-button+.el-button{margin:10px 10px 0 0}.es-flow-index .el-input.is-disabled .el-input__inner{color:#606266}.es-flow-index .es-flow-btn{margin-right:10px}.es-flow-index .es-info{padding:0 8px;-webkit-box-flex:1;-ms-flex:1;flex:1;overflow-y:auto;overflow-x:hidden}.es-flow-index .es-info::-webkit-scrollbar{width:5px}.es-flow-index .news{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;cursor:pointer;padding:10px 0}.es-flow-index .news .sj,.show{width:10px;height:10px;border-right:1px solid #000;border-bottom:1px solid #000;margin-right:10px;-webkit-transform:rotate(-135deg);transform:rotate(-135deg);-webkit-transition:.5s;transition:.5s}.es-flow-index .news .show{-webkit-transform:rotate(45deg);transform:rotate(45deg)}.es-flow-index .el-checkbox{margin:0 10px 10px 0}.es-flow-index .info::-webkit-scrollbar-track{-webkit-box-shadow:inset006pxrgba(0,0,0,.3);border-radius:10px}::-webkit-scrollbar-thumb{border-radius:10px;background:rgba(0,0,0,.1);-webkit-box-shadow:inset006pxrgba(0,0,0,.5)}.el-select-dropdown.is-multiple .el-select-dropdown__item.selected::after{right:5px!important}.es-flow-form .input-with-select{width:100%;margin-top:0}.es-flow-form .el-select{width:100%}.es-flow-form .es-opinions .el-select{width:calc(100% + 40px)!important}.select-users .el-input-group__append .el-button span,.select-users .no-icon .el-input-group__append{display:none}.select-users .el-input-group__append{background-color:#1890ff}.select-users .el-input-group__append .el-button i{font-size:18px;color:#fff}.es-flow-form .input-with-select .el-input-group__prepend{background-color:#fff;width:100%}.es-flow-form .el-input-group--prepend>.el-input__inner{display:none!important}.es-flow-form button.el-button.sub.el-button--danger.el-button--medium{width:calc(100% - 85px)}.es-flow-form .el-input-group--prepend>.el-input-group__append{height:40px}.es-flow-form .el-form-item__label{font-weight:700}.es-flow-form .el-input.is-disabled .el-input__inner{color:#000}.select-user{display:-webkit-box;display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap}.select-user .left{width:30%}.select-user .right{padding:3px;width:69%}.select-user .el-checkbox{width:170px;margin-top:11px;margin-bottom:11px}.select-user .all{margin:0!important}.es-flow-index .el-checkbox__input.is-disabled.is-checked .el-checkbox__inner,.flow-dialog .el-checkbox__input.is-disabled.is-checked .el-checkbox__inner{background-color:#1890ff!important;border-color:#1890ff!important}.es-flow-index .el-checkbox__input.is-disabled.is-checked .el-checkbox__inner::after,.flow-dialog .el-checkbox__input.is-disabled.is-checked .el-checkbox__inner::after{border-color:#fff}.es-flow-index .el-checkbox__input.is-disabled+span.el-checkbox__label,.flow-dialog .el-checkbox__input.is-disabled+span.el-checkbox__label{color:rgba(0,0,0,.85)}
|
|
1
|
+
@charset "UTF-8";.commonOpinion-set,.es-fenyue-buttons,.es-flow-content,.es-reset-flow{-webkit-box-direction:normal}.es-common-opinions,.es-fenyue-buttons,.es-flow-buttons,.es-flow-title,.es-opinion{padding:0 12px}.es-fenyue-buttons{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-ms-flex-direction:row;flex-direction:row}.es-fenyue-buttons-yj{-webkit-box-flex:1;-ms-flex:1;flex:1}.es-user-defined{display:-webkit-box;display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap}.es-user-defined .el-button--primary{-webkit-box-flex:1;-ms-flex:1;flex:1}.required .el-textarea__inner::-webkit-input-placeholder{color:red}.required .el-textarea__inner::-moz-placeholder{color:red}.required .el-textarea__inner:-ms-input-placeholder{color:red}.required .el-textarea__inner::-ms-input-placeholder{color:red}.required .el-textarea__inner::placeholder{color:red}.no-checked .el-checkbox__input{display:none!important}.es-reset-flow{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-ms-flex-direction:column;flex-direction:column;height:100%}.es-reset-flow-form-box{-webkit-box-flex:1;-ms-flex:1;flex:1;overflow-y:auto;margin-bottom:10px}.es-flow-content{height:100%;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-ms-flex-direction:column;flex-direction:column;padding-bottom:12px;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;position:relative}.es-flow-index{height:100%}.es-flow-index .em-flow-more-btn{display:block;width:100%}.es-flow-index .el-checkbox-group{display:contents}.es-flow-index .es-eidt-title{font-size:13px;color:#333;line-height:20px}.es-flow-index .es-flow-top .es-flow-title{height:40px;line-height:40px}.es-flow-index .es-flow-top .es-flow-title .es-icon{position:absolute;right:8px;top:4px}.es-flow-index .es-flow-top .es-opinion{display:-webkit-box;display:-ms-flexbox;display:flex;margin:8px 0;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.es-flow-index .es-flow-top .es-opinion .es-opinion-file{cursor:pointer;position:relative}.es-flow-index .es-flow-top .es-opinion .es-opinion-file .es-file-num{color:red}.es-flow-index .es-button-agree{width:calc(43% - 15px)}.es-flow-index .es-button-agree-save{margin-top:10px}.commonOpinion-set{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-ms-flex-direction:column;flex-direction:column;height:100%}.commonOpinion-set .el-table__body-wrapper{-webkit-box-flex:1;-ms-flex:1;flex:1}.es-flow-index-shrink{width:24px}.es-flow-index-shrink img{cursor:pointer;width:24px;height:24px}.es-flow-btn:hover{background-color:#f5f5f5;color:#1890ff}.es-flow-btn:hover ::v-deep .el-popover{padding:12px 0!important}.es-flow-form .el-checkbox-group{display:contents}.es-flow-index .el-input-group--prepend>.el-input__inner,.es-flow-index .select-process>.el-input__inner{display:none!important}.es-flow-form .el-textarea:first-child,.es-flow-index .el-textarea{width:100%;margin-bottom:10px!important}.es-flow-form .es-opinions .el-select,.es-flow-index .el-select{width:calc(100% + 40px)!important}.es-flow-index .el-select .el-input{width:100%;height:40px}.es-flow-index .process .el-select{width:calc(100% + 40px)!important}.es-flow-index .input-with-select .el-input-group__prepend{background-color:#fff;width:100%}.es-flow-index .select-process .el-input-group__append{height:40px}.es-flow-index .hide-flow-char .el-input-group__append{padding:0}.es-flow-index button.el-button.sub.el-button--primary.el-button--medium{width:calc(100% - 85px)}.es-flow-index .el-input-group--prepend>.el-input-group__append{height:40px}.es-flow-index .demo-dynamic .el-select{width:100%!important}.es-flow-index .demo-dynamic .select-process .el-select,.es-flow-index .demo-dynamic .selectUser,.es-flow-index.task-union-examine .el-select{width:calc(100% + 40px)!important}.es-flow-index .el-input.el-input-group.el-input-group--append.el-input-group--prepend{margin:0!important}.es-flow-index .demo-dynamic{-webkit-box-flex:1;-ms-flex:1;flex:1;overflow-y:auto;overflow-x:hidden;margin-top:10px}.es-flow-index .es-footer-btn{margin-top:10px}.es-flow-index .es-footer-btn .el-button+.el-button{margin:10px 10px 0 0}.es-flow-index .el-input.is-disabled .el-input__inner{color:#606266}.es-flow-index .es-flow-btn{margin-right:10px}.es-flow-index .es-info{padding:0 8px;-webkit-box-flex:1;-ms-flex:1;flex:1;overflow-y:auto;overflow-x:hidden}.es-flow-index .es-info::-webkit-scrollbar{width:5px}.es-flow-index .news{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;cursor:pointer;padding:10px 0}.es-flow-index .news .sj,.show{width:10px;height:10px;border-right:1px solid #000;border-bottom:1px solid #000;margin-right:10px;-webkit-transform:rotate(-135deg);transform:rotate(-135deg);-webkit-transition:.5s;transition:.5s}.es-flow-index .news .show{-webkit-transform:rotate(45deg);transform:rotate(45deg)}.es-flow-index .el-checkbox{margin:0 10px 10px 0}.es-flow-index .info::-webkit-scrollbar-track{-webkit-box-shadow:inset006pxrgba(0,0,0,.3);border-radius:10px}::-webkit-scrollbar-thumb{border-radius:10px;background:rgba(0,0,0,.1);-webkit-box-shadow:inset006pxrgba(0,0,0,.5)}.el-select-dropdown.is-multiple .el-select-dropdown__item.selected::after{right:5px!important}.es-flow-form .input-with-select{width:100%;margin-top:0}.custom-limit-time .el-input.el-input--suffix{width:calc(100% + 40px)!important}.custom-limit-time .el-input-group__append{background-color:#1890ff!important;color:#fff!important}.es-flow-form .el-select{width:100%}.es-flow-form .es-opinions .el-select{width:calc(100% + 40px)!important}.select-users .el-input-group__append .el-button span,.select-users .no-icon .el-input-group__append{display:none}.select-users .el-input-group__append{background-color:#1890ff}.select-users .el-input-group__append .el-button i{font-size:18px;color:#fff}.es-flow-form .input-with-select .el-input-group__prepend{background-color:#fff;width:100%}.es-flow-form .el-input-group--prepend>.el-input__inner{display:none!important}.es-flow-form button.el-button.sub.el-button--danger.el-button--medium{width:calc(100% - 85px)}.es-flow-form .el-input-group--prepend>.el-input-group__append{height:40px}.es-flow-form .el-form-item__label{font-weight:700}.es-flow-form .el-input.is-disabled .el-input__inner{color:#000}.select-user{display:-webkit-box;display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap}.select-user .left{width:30%}.select-user .right{padding:3px;width:69%}.select-user .el-checkbox{width:170px;margin-top:11px;margin-bottom:11px}.select-user .all{margin:0!important}.es-flow-index .el-checkbox__input.is-disabled.is-checked .el-checkbox__inner,.flow-dialog .el-checkbox__input.is-disabled.is-checked .el-checkbox__inner{background-color:#1890ff!important;border-color:#1890ff!important}.es-flow-index .el-checkbox__input.is-disabled.is-checked .el-checkbox__inner::after,.flow-dialog .el-checkbox__input.is-disabled.is-checked .el-checkbox__inner::after{border-color:#fff}.es-flow-index .el-checkbox__input.is-disabled+span.el-checkbox__label,.flow-dialog .el-checkbox__input.is-disabled+span.el-checkbox__label{color:rgba(0,0,0,.85)}
|