eoss-ui 0.6.19 → 0.6.21
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 +575 -466
- package/lib/flow.js +492 -388
- package/lib/form.js +3 -3
- package/lib/index.js +1 -1
- package/lib/main.js +64 -59
- package/lib/theme-chalk/index.css +1 -1
- package/lib/theme-chalk/selector.css +1 -1
- package/package.json +1 -1
- package/packages/flow/src/component/CustomPreset.vue +1 -1
- package/packages/flow/src/component/Preset.vue +1 -1
- package/packages/flow/src/component/SendMsg.vue +3 -1
- package/packages/flow/src/component/taskUnionExamine.vue +38 -20
- package/packages/flow/src/main.vue +38 -18
- package/packages/flow/src/processForm.vue +13 -2
- package/packages/flow/src/processReject.vue +14 -3
- package/packages/flow/src/startTaskRead.vue +23 -5
- package/packages/form/src/main.vue +1 -1
- package/packages/main/src/main.vue +65 -57
- package/packages/theme-chalk/lib/index.css +1 -1
- package/packages/theme-chalk/lib/selector.css +1 -1
- package/packages/theme-chalk/src/selector.scss +1 -1
- package/src/index.js +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
@charset "UTF-8";.es-selector,.es-selector .es-selector-tags{position:relative}.es-selector{line-height:normal}.es-selector .el-select__tags{max-width:100%;padding-left:4px}.es-selector .el-select__tags
|
|
1
|
+
@charset "UTF-8";.es-selector,.es-selector .es-selector-tags{position:relative}.es-selector{line-height:normal}.es-selector .el-select__tags{max-width:100%;padding-left:4px}.es-selector .el-select__tags>span{padding-top:4px}.es-selector .el-select__tags .el-tag{margin-right:4px;margin-bottom:4px}.es-selector .es-selector-search .el-select__tags{max-width:calc(100% - 71px)}.es-selector .es-selector-tags.es-selector-more{padding-right:50px;width:100%}.es-selector .es-selector-tags.es-selector-more .el-tag{display:block}.es-selector .es-selector-tags.es-selector-more .es-tags-more{width:40px;padding:0 4px;position:absolute;top:0;right:6px;text-align:center}.es-selector .es-selector-tags-box{line-height:0}.es-selector .es-pointer .el-input__inner{cursor:pointer}.es-selector-dropdown-item.hover,.es-selector-dropdown-item:hover{background-color:#f5f7fa}.es-selector-popover{padding:0}.es-selector-popover .es-selector-dropdown__list{padding:12px}.es-selector-popover .es-selector-dropdown-item{font-size:14px;padding:0 20px;position:relative;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;color:#606266;height:34px;line-height:34px;-webkit-box-sizing:border-box;box-sizing:border-box;cursor:pointer}.es-selector-popover .es-selector-dropdown-item.es-selected{color:#1890ff}.es-zindex-2{z-index:2}.es-selector-dialog .el-dialog__header{padding:12px 20px 8px}.es-selector-dialog .el-dialog__header .el-dialog__title{font-size:14px}.es-selector-dialog .el-dialog__headerbtn{top:14px;right:16px}.es-selector-dialog .el-dialog__body{padding:4px}
|
package/package.json
CHANGED
|
@@ -21,7 +21,9 @@
|
|
|
21
21
|
v-for="item of notificationList"
|
|
22
22
|
:key="item.cciValue"
|
|
23
23
|
:label="item.cciValue"
|
|
24
|
-
:disabled="readOnlyNotificationType
|
|
24
|
+
:disabled="readOnlyNotificationType
|
|
25
|
+
? readOnlyNotificationType.indexOf(item.cciValue) != -1
|
|
26
|
+
: false"
|
|
25
27
|
>
|
|
26
28
|
{{ item.shortName }}
|
|
27
29
|
</el-checkbox>
|
|
@@ -75,12 +75,17 @@
|
|
|
75
75
|
{ required: false, message: `请选择通知方式`, trigger: 'blur' }
|
|
76
76
|
]"
|
|
77
77
|
>
|
|
78
|
-
<el-checkbox-group
|
|
78
|
+
<el-checkbox-group
|
|
79
|
+
v-model="infoList.noticeType"
|
|
80
|
+
style="display: contents"
|
|
81
|
+
>
|
|
79
82
|
<el-checkbox
|
|
80
83
|
v-for="item of infoList.noticeList"
|
|
81
84
|
:key="item.cciValue"
|
|
82
85
|
:label="item.cciValue"
|
|
83
|
-
:disabled="readOnlyNotificationType
|
|
86
|
+
:disabled="readOnlyNotificationType
|
|
87
|
+
? readOnlyNotificationType.indexOf(item.cciValue) != -1
|
|
88
|
+
: false"
|
|
84
89
|
>
|
|
85
90
|
{{ item.shortName }}
|
|
86
91
|
</el-checkbox>
|
|
@@ -91,17 +96,17 @@
|
|
|
91
96
|
prop="noticeInfo"
|
|
92
97
|
label="通知消息"
|
|
93
98
|
>
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
99
|
+
<es-input
|
|
100
|
+
style="
|
|
101
|
+
border-color: #ccc;
|
|
102
|
+
padding: 5px;
|
|
103
|
+
border-radius: 5px;
|
|
104
|
+
font-size: 13px;
|
|
105
|
+
"
|
|
106
|
+
type="textarea"
|
|
107
|
+
v-model="infoList.noticeInfo"
|
|
108
|
+
:readonly="notificationMessageReadOnly"
|
|
109
|
+
/>
|
|
105
110
|
<!-- <span>{{ infoList.noticeInfo }}</span> -->
|
|
106
111
|
</el-form-item>
|
|
107
112
|
<el-form-item>
|
|
@@ -154,8 +159,8 @@ export default {
|
|
|
154
159
|
data() {
|
|
155
160
|
return {
|
|
156
161
|
opinion: '', //办理意见
|
|
157
|
-
readOnlyNotificationType:'',
|
|
158
|
-
notificationMessageReadOnly:false,
|
|
162
|
+
readOnlyNotificationType: '',
|
|
163
|
+
notificationMessageReadOnly: false,
|
|
159
164
|
infoList: {
|
|
160
165
|
nextOtherOrgObj: [],
|
|
161
166
|
nextCurrentOrgObj: [],
|
|
@@ -184,6 +189,7 @@ export default {
|
|
|
184
189
|
mounted() {
|
|
185
190
|
this.loading = true;
|
|
186
191
|
this.newMultiple = this.multiple;
|
|
192
|
+
this.getNodeType();
|
|
187
193
|
if (this.type === 'taskReview') return this.getTaskReview();
|
|
188
194
|
this.getInfo();
|
|
189
195
|
},
|
|
@@ -262,7 +268,6 @@ export default {
|
|
|
262
268
|
this.currentOrgProcessKey = taskExamine.currentOrgProcessKey;
|
|
263
269
|
this.getFind();
|
|
264
270
|
this.getMessage();
|
|
265
|
-
this.getNodeType();
|
|
266
271
|
} else {
|
|
267
272
|
this.$message.error(message || '系统错误,请联系管理员!');
|
|
268
273
|
}
|
|
@@ -315,8 +320,9 @@ export default {
|
|
|
315
320
|
}
|
|
316
321
|
}
|
|
317
322
|
} = res;
|
|
318
|
-
this.readOnlyNotificationType = readOnlyNotificationType
|
|
319
|
-
this.notificationMessageReadOnly =
|
|
323
|
+
this.readOnlyNotificationType = readOnlyNotificationType;
|
|
324
|
+
this.notificationMessageReadOnly =
|
|
325
|
+
notificationMessageReadOnly == 'true';
|
|
320
326
|
this.isSinglePage = taskExamine.isSinglePage;
|
|
321
327
|
this.isSubFlow = taskExamine.isSubFlow;
|
|
322
328
|
this.opinion = taskExamine.opinion;
|
|
@@ -341,7 +347,6 @@ export default {
|
|
|
341
347
|
this.isMultiple(userSelectionType);
|
|
342
348
|
this.getFind();
|
|
343
349
|
this.getMessage();
|
|
344
|
-
this.getNodeType();
|
|
345
350
|
} else {
|
|
346
351
|
this.$message.error(message || '系统错误,请联系管理员!');
|
|
347
352
|
}
|
|
@@ -466,13 +471,17 @@ export default {
|
|
|
466
471
|
util
|
|
467
472
|
.ajax({
|
|
468
473
|
url: findCodeValues,
|
|
469
|
-
params: {
|
|
474
|
+
params: {
|
|
475
|
+
ccCode: 'notification_type',
|
|
476
|
+
userId: util.getStorage('userId')
|
|
477
|
+
}
|
|
470
478
|
})
|
|
471
479
|
.then((res) => {
|
|
472
480
|
const { status, data } = res;
|
|
473
481
|
this.loading = false;
|
|
474
482
|
if (status === 'success') {
|
|
475
483
|
this.infoList.noticeList = data;
|
|
484
|
+
|
|
476
485
|
}
|
|
477
486
|
})
|
|
478
487
|
.catch((err) => {
|
|
@@ -511,6 +520,15 @@ export default {
|
|
|
511
520
|
const { status, message } = res;
|
|
512
521
|
if (status === 'success') {
|
|
513
522
|
this.infoList.noticeType = message.split(',');
|
|
523
|
+
let arr = [];
|
|
524
|
+
this.infoList.noticeList.map((item) => {
|
|
525
|
+
this.infoList.noticeType.map((x) => {
|
|
526
|
+
if (x == item.cciValue) {
|
|
527
|
+
arr.push(x);
|
|
528
|
+
}
|
|
529
|
+
});
|
|
530
|
+
});
|
|
531
|
+
this.infoList.noticeType = arr;
|
|
514
532
|
} else {
|
|
515
533
|
this.$message.error(message || '系统错误,请联系管理员!');
|
|
516
534
|
}
|
|
@@ -62,7 +62,7 @@
|
|
|
62
62
|
<el-input
|
|
63
63
|
placeholder="请输入内容"
|
|
64
64
|
class="input-with-select select-process"
|
|
65
|
-
:class="{'hide-flow-char':isStartFlowChartView != 'true'}"
|
|
65
|
+
:class="{ 'hide-flow-char': isStartFlowChartView != 'true' }"
|
|
66
66
|
>
|
|
67
67
|
<el-select
|
|
68
68
|
slot="prepend"
|
|
@@ -407,7 +407,11 @@
|
|
|
407
407
|
v-for="item of newsList"
|
|
408
408
|
:key="item.cciValue"
|
|
409
409
|
:label="item.cciValue"
|
|
410
|
-
:disabled="
|
|
410
|
+
:disabled="
|
|
411
|
+
readOnlyNotificationType
|
|
412
|
+
? readOnlyNotificationType.indexOf(item.cciValue) != -1
|
|
413
|
+
: false
|
|
414
|
+
"
|
|
411
415
|
>
|
|
412
416
|
{{ item.shortName }}
|
|
413
417
|
</el-checkbox>
|
|
@@ -423,12 +427,18 @@
|
|
|
423
427
|
>
|
|
424
428
|
{{ nextNode.notificationMsg }}
|
|
425
429
|
</div> -->
|
|
426
|
-
<es-input
|
|
430
|
+
<es-input
|
|
431
|
+
style="
|
|
427
432
|
border-color: #ccc;
|
|
428
433
|
padding: 5px;
|
|
429
434
|
border-radius: 5px;
|
|
430
435
|
font-size: 13px;
|
|
431
|
-
"
|
|
436
|
+
"
|
|
437
|
+
v-show="showNews"
|
|
438
|
+
type="textarea"
|
|
439
|
+
v-model="nextNode.notificationMsg"
|
|
440
|
+
:readonly="notificationMessageReadOnly"
|
|
441
|
+
/>
|
|
432
442
|
</div>
|
|
433
443
|
</div>
|
|
434
444
|
</div>
|
|
@@ -623,8 +633,8 @@
|
|
|
623
633
|
<es-dialog
|
|
624
634
|
v-if="showTaskRead"
|
|
625
635
|
append-to-body
|
|
626
|
-
height="auto"
|
|
627
636
|
class="flow-dialog"
|
|
637
|
+
height="400px"
|
|
628
638
|
ref="showTaskRead"
|
|
629
639
|
:close-on-click-modal="false"
|
|
630
640
|
:title="taskReadType === 'transfer' ? '转办' : '分阅'"
|
|
@@ -771,10 +781,10 @@ export default {
|
|
|
771
781
|
return {
|
|
772
782
|
styles: {},
|
|
773
783
|
userModel: {},
|
|
774
|
-
readOnlyNotificationType:'',
|
|
775
|
-
notificationMessageReadOnly:false,
|
|
784
|
+
readOnlyNotificationType: '',
|
|
785
|
+
notificationMessageReadOnly: false,
|
|
776
786
|
isCanPreAddSign: false,
|
|
777
|
-
isStartFlowChartView:undefined,
|
|
787
|
+
isStartFlowChartView: undefined,
|
|
778
788
|
nextOtherOrgObjSelect: [],
|
|
779
789
|
subProcessColumns: [],
|
|
780
790
|
nextCurrentOrgObjSelect: [],
|
|
@@ -782,7 +792,7 @@ export default {
|
|
|
782
792
|
newTypeCode: '',
|
|
783
793
|
NodeName: '', // 当前节点值
|
|
784
794
|
radioList: [],
|
|
785
|
-
taskReadOpinionRequired:undefined,
|
|
795
|
+
taskReadOpinionRequired: undefined,
|
|
786
796
|
value: '',
|
|
787
797
|
nodeFixedOpinionSelectList: [],
|
|
788
798
|
customPresetHintMessage: '', //流程预设标题
|
|
@@ -936,6 +946,7 @@ export default {
|
|
|
936
946
|
mounted() {
|
|
937
947
|
this.businessIds = this.businessId;
|
|
938
948
|
this.nextNode.nextNodeId = this.nextNodeId;
|
|
949
|
+
this.getNodeType();
|
|
939
950
|
!this.isFlow &&
|
|
940
951
|
(this.newTypeCode = this.typeCode || this.$route.query.typecode);
|
|
941
952
|
if (this.isFlow) {
|
|
@@ -1141,7 +1152,7 @@ export default {
|
|
|
1141
1152
|
}
|
|
1142
1153
|
},
|
|
1143
1154
|
taskRead() {
|
|
1144
|
-
if(this.taskReadOpinionRequired == 'true' && !this.value){
|
|
1155
|
+
if (this.taskReadOpinionRequired == 'true' && !this.value) {
|
|
1145
1156
|
if (!this.$refs.commonOpinions.validate()) return;
|
|
1146
1157
|
}
|
|
1147
1158
|
this.$confirm('确认提交?', '提示', {
|
|
@@ -1202,11 +1213,11 @@ export default {
|
|
|
1202
1213
|
const {
|
|
1203
1214
|
status,
|
|
1204
1215
|
message,
|
|
1205
|
-
data: { isCanFenyue, taskExamine,taskReadOpinionRequired }
|
|
1216
|
+
data: { isCanFenyue, taskExamine, taskReadOpinionRequired }
|
|
1206
1217
|
} = res;
|
|
1207
1218
|
if (status === 'success') {
|
|
1208
1219
|
this.taskExamineInfo = taskExamine;
|
|
1209
|
-
this.taskReadOpinionRequired = taskReadOpinionRequired
|
|
1220
|
+
this.taskReadOpinionRequired = taskReadOpinionRequired;
|
|
1210
1221
|
this.isCanFenyue = isCanFenyue;
|
|
1211
1222
|
if (this.nodeName) {
|
|
1212
1223
|
this.NodeName = this.nodeName;
|
|
@@ -1422,6 +1433,15 @@ export default {
|
|
|
1422
1433
|
const { status, message } = res;
|
|
1423
1434
|
if (status === 'success') {
|
|
1424
1435
|
this.nextNode.notificationType = message.split(',');
|
|
1436
|
+
let arr = [];
|
|
1437
|
+
this.newsList.map((item) => {
|
|
1438
|
+
this.nextNode.notificationType.map((x) => {
|
|
1439
|
+
if (x == item.cciValue) {
|
|
1440
|
+
arr.push(x);
|
|
1441
|
+
}
|
|
1442
|
+
});
|
|
1443
|
+
});
|
|
1444
|
+
this.nextNode.notificationType = arr;
|
|
1425
1445
|
}
|
|
1426
1446
|
})
|
|
1427
1447
|
.catch((err) => {
|
|
@@ -1954,7 +1974,7 @@ export default {
|
|
|
1954
1974
|
} else {
|
|
1955
1975
|
this.isReject = false;
|
|
1956
1976
|
}
|
|
1957
|
-
if(this.isSpecial){
|
|
1977
|
+
if (this.isSpecial) {
|
|
1958
1978
|
if (val == -1) {
|
|
1959
1979
|
this.nextNode.isSerialSubmit = 1;
|
|
1960
1980
|
this.loading.close();
|
|
@@ -2090,9 +2110,10 @@ export default {
|
|
|
2090
2110
|
this.$emit('startTaskRead', res);
|
|
2091
2111
|
this.$emit('start-task-read', res);
|
|
2092
2112
|
this.currentOrgName = currentOrgName;
|
|
2093
|
-
this.readOnlyNotificationType = readOnlyNotificationType
|
|
2113
|
+
this.readOnlyNotificationType = readOnlyNotificationType;
|
|
2094
2114
|
this.isSpecial = isSpecial;
|
|
2095
|
-
this.notificationMessageReadOnly =
|
|
2115
|
+
this.notificationMessageReadOnly =
|
|
2116
|
+
notificationMessageReadOnly == 'true';
|
|
2096
2117
|
this.otherOrgName = otherOrgName;
|
|
2097
2118
|
this.isCanPreAddSign = isCanPreAddSign;
|
|
2098
2119
|
this.endFlowInfo.choiceOrgId = choiceOrgId;
|
|
@@ -2255,7 +2276,6 @@ export default {
|
|
|
2255
2276
|
if (this.isCanRemoveSign) {
|
|
2256
2277
|
this.nextNode.isRemoveSign = '2';
|
|
2257
2278
|
}
|
|
2258
|
-
|
|
2259
2279
|
|
|
2260
2280
|
if (!this.isOpinionRequired) {
|
|
2261
2281
|
this.isOpinionRequired = 0;
|
|
@@ -2280,7 +2300,7 @@ export default {
|
|
|
2280
2300
|
this.presetTaskNodeMap = presetTaskNodeMap;
|
|
2281
2301
|
this.presetTaskNodeKeyStr = presetTaskNodeKeyStr;
|
|
2282
2302
|
this.getFind();
|
|
2283
|
-
|
|
2303
|
+
|
|
2284
2304
|
this.getNodeInfo();
|
|
2285
2305
|
} else {
|
|
2286
2306
|
if (res.status === 'taskCompleted') {
|
|
@@ -2365,7 +2385,7 @@ export default {
|
|
|
2365
2385
|
const { status, message, data } = res;
|
|
2366
2386
|
this.loading.close();
|
|
2367
2387
|
if (status === 'success') {
|
|
2368
|
-
this.isStartFlowChartView = data.isStartFlowChartView
|
|
2388
|
+
this.isStartFlowChartView = data.isStartFlowChartView;
|
|
2369
2389
|
if (
|
|
2370
2390
|
!Object.keys(data).length ||
|
|
2371
2391
|
(data.definitionList && !data.definitionList.length)
|
|
@@ -190,7 +190,9 @@
|
|
|
190
190
|
v-for="item of nextNode.noticeList"
|
|
191
191
|
:key="item.cciValue"
|
|
192
192
|
:label="item.cciValue"
|
|
193
|
-
:disabled="readOnlyNotificationType
|
|
193
|
+
:disabled="readOnlyNotificationType
|
|
194
|
+
? readOnlyNotificationType.indexOf(item.cciValue) != -1
|
|
195
|
+
: false"
|
|
194
196
|
>
|
|
195
197
|
{{ item.shortName }}
|
|
196
198
|
</el-checkbox>
|
|
@@ -405,6 +407,7 @@ export default {
|
|
|
405
407
|
this.getUserInfo();
|
|
406
408
|
},
|
|
407
409
|
mounted() {
|
|
410
|
+
this.getNodeType();
|
|
408
411
|
this.getStartFlow(this.processDefinitionId);
|
|
409
412
|
this.newOpinion = this.opinion;
|
|
410
413
|
},
|
|
@@ -769,6 +772,15 @@ export default {
|
|
|
769
772
|
const { status, message } = res;
|
|
770
773
|
if (status === 'success') {
|
|
771
774
|
this.nextNode.noticeType = message.split(',');
|
|
775
|
+
let arr = [];
|
|
776
|
+
this.nextNode.noticeList.map((item) => {
|
|
777
|
+
this.nextNode.noticeType.map((x) => {
|
|
778
|
+
if (x == item.cciValue) {
|
|
779
|
+
arr.push(x);
|
|
780
|
+
}
|
|
781
|
+
});
|
|
782
|
+
});
|
|
783
|
+
this.nextNode.noticeType = arr;
|
|
772
784
|
} else {
|
|
773
785
|
this.$message.error(message || '系统错误,请联系管理员!');
|
|
774
786
|
}
|
|
@@ -926,7 +938,6 @@ export default {
|
|
|
926
938
|
this.$refs.customPreset.getPresetFlowInfo(this.nextNode.nextNode);
|
|
927
939
|
this.getFind();
|
|
928
940
|
this.getMessage();
|
|
929
|
-
this.getNodeType();
|
|
930
941
|
} else {
|
|
931
942
|
this.$message.error(message || '系统错误,请联系管理员!');
|
|
932
943
|
}
|
|
@@ -41,7 +41,9 @@
|
|
|
41
41
|
v-for="item of nextNode.noticeList"
|
|
42
42
|
:key="item.cciValue"
|
|
43
43
|
:label="item.cciValue"
|
|
44
|
-
:disabled="readOnlyNotificationType
|
|
44
|
+
:disabled="readOnlyNotificationType
|
|
45
|
+
? readOnlyNotificationType.indexOf(item.cciValue) != -1
|
|
46
|
+
: false"
|
|
45
47
|
>
|
|
46
48
|
{{ item.shortName }}
|
|
47
49
|
</el-checkbox>
|
|
@@ -130,7 +132,8 @@ export default {
|
|
|
130
132
|
},
|
|
131
133
|
mounted() {
|
|
132
134
|
this.newsInformation = this.newsInfo;
|
|
133
|
-
|
|
135
|
+
this.getNodeType();
|
|
136
|
+
this.getProcessReject();
|
|
134
137
|
},
|
|
135
138
|
methods: {
|
|
136
139
|
getNodeType() {
|
|
@@ -212,6 +215,15 @@ export default {
|
|
|
212
215
|
const { status, message } = res;
|
|
213
216
|
if (status === 'success') {
|
|
214
217
|
this.nextNode.noticeType = message.split(',');
|
|
218
|
+
let arr = [];
|
|
219
|
+
this.nextNode.noticeList.map((item) => {
|
|
220
|
+
this.nextNode.noticeType.map((x) => {
|
|
221
|
+
if (x == item.cciValue) {
|
|
222
|
+
arr.push(x);
|
|
223
|
+
}
|
|
224
|
+
});
|
|
225
|
+
});
|
|
226
|
+
this.nextNode.noticeType = arr;
|
|
215
227
|
}
|
|
216
228
|
})
|
|
217
229
|
.catch((err) => {
|
|
@@ -275,7 +287,6 @@ export default {
|
|
|
275
287
|
}
|
|
276
288
|
});
|
|
277
289
|
this.getFind();
|
|
278
|
-
this.getNodeType();
|
|
279
290
|
}
|
|
280
291
|
}
|
|
281
292
|
};
|
|
@@ -12,6 +12,7 @@
|
|
|
12
12
|
class="demo-dynamic"
|
|
13
13
|
label-width="110px"
|
|
14
14
|
>
|
|
15
|
+
<div style="max-height: 290px; overflow-y: auto; margin-bottom: 10px">
|
|
15
16
|
<el-form-item
|
|
16
17
|
prop="handleExplain"
|
|
17
18
|
label="当前步骤"
|
|
@@ -114,7 +115,9 @@
|
|
|
114
115
|
v-for="item of noticeList"
|
|
115
116
|
:key="item.cciValue"
|
|
116
117
|
:label="item.cciValue"
|
|
117
|
-
:disabled="
|
|
118
|
+
:disabled="readOnlyNotificationType
|
|
119
|
+
? readOnlyNotificationType.indexOf(item.cciValue) != -1
|
|
120
|
+
: false"
|
|
118
121
|
>
|
|
119
122
|
{{ item.shortName }}
|
|
120
123
|
</el-checkbox>
|
|
@@ -123,8 +126,7 @@
|
|
|
123
126
|
<el-form-item
|
|
124
127
|
v-show="
|
|
125
128
|
nextNode.noticeType.length != 0 &&
|
|
126
|
-
configInfo.isCdjxjTaskHandle != 'true'
|
|
127
|
-
type == 'transfer'
|
|
129
|
+
configInfo.isCdjxjTaskHandle != 'true'
|
|
128
130
|
"
|
|
129
131
|
prop="nextNode"
|
|
130
132
|
label="通知消息"
|
|
@@ -138,10 +140,11 @@
|
|
|
138
140
|
"
|
|
139
141
|
type="textarea"
|
|
140
142
|
v-model="newsNoice"
|
|
141
|
-
:readonly="
|
|
143
|
+
:readonly="notificationMessageReadOnly =='true'"
|
|
142
144
|
/>
|
|
143
145
|
<!-- <span>{{ newsInfo }}</span> -->
|
|
144
146
|
</el-form-item>
|
|
147
|
+
</div>
|
|
145
148
|
<el-form-item>
|
|
146
149
|
<div style="text-align: right">
|
|
147
150
|
<el-button type="primary" size="small" @click="submit('nextNode')">
|
|
@@ -181,6 +184,8 @@ export default {
|
|
|
181
184
|
return {
|
|
182
185
|
loading: false,
|
|
183
186
|
newsNoice:'',
|
|
187
|
+
readOnlyNotificationType:'',
|
|
188
|
+
notificationMessageReadOnly:false,
|
|
184
189
|
nextNode: {
|
|
185
190
|
nextUser: [],
|
|
186
191
|
userInfo: [],
|
|
@@ -404,6 +409,15 @@ export default {
|
|
|
404
409
|
const { status, data } = res;
|
|
405
410
|
if (status === 'success') {
|
|
406
411
|
this.noticeList = data;
|
|
412
|
+
let arr = [];
|
|
413
|
+
this.noticeList.map((item) => {
|
|
414
|
+
this.nextNode.noticeType.map((x) => {
|
|
415
|
+
if (x == item.cciValue) {
|
|
416
|
+
arr.push(x);
|
|
417
|
+
}
|
|
418
|
+
});
|
|
419
|
+
});
|
|
420
|
+
this.nextNode.noticeType = arr;
|
|
407
421
|
}
|
|
408
422
|
})
|
|
409
423
|
.catch((err) => {
|
|
@@ -552,10 +566,14 @@ export default {
|
|
|
552
566
|
url: findSysCodes
|
|
553
567
|
})
|
|
554
568
|
.then((res) => {
|
|
555
|
-
const { status, message } = res;
|
|
569
|
+
const { status, message,data } = res;
|
|
556
570
|
this.loading = false;
|
|
557
571
|
if (status === 'success') {
|
|
558
572
|
this.nextNode.noticeType = message.split(',');
|
|
573
|
+
if(data){
|
|
574
|
+
this.notificationMessageReadOnly = data.notificationMessageReadOnly
|
|
575
|
+
this.readOnlyNotificationType = data.readOnlyNotificationType
|
|
576
|
+
}
|
|
559
577
|
} else {
|
|
560
578
|
this.$message.error(message || '系统错误,请联系管理员!');
|
|
561
579
|
}
|
|
@@ -2999,7 +2999,7 @@ export default {
|
|
|
2999
2999
|
res.type === 'submit'
|
|
3000
3000
|
) {
|
|
3001
3001
|
if (this.action) {
|
|
3002
|
-
this.submitData(res);
|
|
3002
|
+
this.submitData(res).catch((err) => {});
|
|
3003
3003
|
} else {
|
|
3004
3004
|
this.$refs.esForm.validate(async (valid, fields, triggers) => {
|
|
3005
3005
|
if (valid) {
|
|
@@ -112,71 +112,79 @@ export default {
|
|
|
112
112
|
this.params = util.getParams() || {};
|
|
113
113
|
this.sysCode = this.params.sysCode;
|
|
114
114
|
this.appCode = this.params.appCode;
|
|
115
|
+
if (
|
|
116
|
+
this.params.cookie &&
|
|
117
|
+
(this.params.cookie == true || this.params.cookie == 1)
|
|
118
|
+
) {
|
|
119
|
+
this.isLogin = true;
|
|
120
|
+
}
|
|
115
121
|
this.getConfig(this.params);
|
|
116
122
|
// 主应用监听事件
|
|
117
123
|
},
|
|
118
124
|
mounted() {
|
|
119
|
-
if (
|
|
120
|
-
util.win.$wujie
|
|
121
|
-
util.
|
|
122
|
-
|
|
123
|
-
|
|
125
|
+
if (this.isLogin) {
|
|
126
|
+
if (util.win.$wujie) {
|
|
127
|
+
util.win.$wujie.bus.$on('changeTheme', (res) => {
|
|
128
|
+
util.updateTheme(res);
|
|
129
|
+
});
|
|
130
|
+
}
|
|
124
131
|
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
132
|
+
const bus = this.bus || this.$root.Bus;
|
|
133
|
+
if (bus) {
|
|
134
|
+
bus.$on('reLogin', this.handleReLogin);
|
|
135
|
+
bus.$on('refresh', this.$refs.main.handleRefresh);
|
|
136
|
+
bus.$on('jumpMenu', this.$refs.main.jumpMenu);
|
|
137
|
+
bus.$on('emit', function (method, args) {
|
|
138
|
+
// 主应用发送事件
|
|
139
|
+
bus.$emit(method, args);
|
|
140
|
+
});
|
|
141
|
+
}
|
|
142
|
+
util.win.reLogin = this.handleReLogin;
|
|
143
|
+
util.win.windowOpen = this.openPage;
|
|
144
|
+
util.win.refresh = this.$refs.main.handleRefresh;
|
|
145
|
+
util.win.jumpMenu = this.$refs.main.jumpMenu;
|
|
146
|
+
WujieVue.bus.$on('reLogin', this.handleReLogin);
|
|
147
|
+
WujieVue.bus.$on('refresh', this.$refs.main.handleRefresh);
|
|
148
|
+
WujieVue.bus.$on('jumpMenu', this.$refs.main.jumpMenu);
|
|
149
|
+
WujieVue.bus.$on('emit', function (method, args) {
|
|
131
150
|
// 主应用发送事件
|
|
132
|
-
bus.$emit(method, args);
|
|
151
|
+
WujieVue.bus.$emit(method, args);
|
|
133
152
|
});
|
|
134
|
-
}
|
|
135
|
-
util.win.reLogin = this.handleReLogin;
|
|
136
|
-
util.win.windowOpen = this.openPage;
|
|
137
|
-
util.win.refresh = this.$refs.main.handleRefresh;
|
|
138
|
-
util.win.jumpMenu = this.$refs.main.jumpMenu;
|
|
139
|
-
WujieVue.bus.$on('reLogin', this.handleReLogin);
|
|
140
|
-
WujieVue.bus.$on('refresh', this.$refs.main.handleRefresh);
|
|
141
|
-
WujieVue.bus.$on('jumpMenu', this.$refs.main.jumpMenu);
|
|
142
|
-
WujieVue.bus.$on('emit', function (method, args) {
|
|
143
|
-
// 主应用发送事件
|
|
144
|
-
WujieVue.bus.$emit(method, args);
|
|
145
|
-
});
|
|
146
153
|
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
154
|
+
window.addEventListener('message', (method, args) => {
|
|
155
|
+
switch (method) {
|
|
156
|
+
case 'reLogin':
|
|
157
|
+
this.handleReLogin(args);
|
|
158
|
+
break;
|
|
159
|
+
case 'refresh':
|
|
160
|
+
this.$refs.main.handleRefresh(args);
|
|
161
|
+
break;
|
|
162
|
+
case 'jumpMenu':
|
|
163
|
+
this.$refs.main.jumpMenu(args);
|
|
164
|
+
break;
|
|
165
|
+
case 'emit':
|
|
166
|
+
let origin = args.origin || '*';
|
|
167
|
+
window.postMessage(args, origin);
|
|
168
|
+
break;
|
|
169
|
+
case 'openDialog':
|
|
170
|
+
this.dialogs.push(args);
|
|
171
|
+
let index = this.visibles.length;
|
|
172
|
+
this.visibles.push(false);
|
|
173
|
+
this.$nextTick(() => {
|
|
174
|
+
this.$set(this.visibles, index, true);
|
|
175
|
+
});
|
|
176
|
+
break;
|
|
177
|
+
case 'closeDialog':
|
|
178
|
+
for (let i = 0; i < this.dialogs.length; i++) {
|
|
179
|
+
let item = this.dialogs[i];
|
|
180
|
+
if (item.url == args.url) {
|
|
181
|
+
this.$set(this.visibles, i, false);
|
|
182
|
+
}
|
|
175
183
|
}
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
}
|
|
179
|
-
}
|
|
184
|
+
break;
|
|
185
|
+
}
|
|
186
|
+
});
|
|
187
|
+
}
|
|
180
188
|
},
|
|
181
189
|
methods: {
|
|
182
190
|
/**
|
|
@@ -306,7 +314,7 @@ export default {
|
|
|
306
314
|
getConfig(query) {
|
|
307
315
|
const token =
|
|
308
316
|
util.getStorage('token') || util.getStorage('Authorization');
|
|
309
|
-
this.isLogin = token ? true :
|
|
317
|
+
this.isLogin = token ? true : this.isLogin;
|
|
310
318
|
if (
|
|
311
319
|
!token &&
|
|
312
320
|
Object.prototype.hasOwnProperty.call(query, 'serverId') &&
|