eoss-ui 0.6.0 → 0.6.11
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/button-group.js +210 -198
- package/lib/button.js +2 -2
- package/lib/calendar.js +2 -2
- package/lib/card.js +2 -2
- package/lib/cascader.js +2 -2
- package/lib/checkbox-group.js +12 -30
- package/lib/clients.js +2 -2
- package/lib/data-table-form.js +2 -4
- package/lib/data-table.js +21 -36
- package/lib/date-picker.js +2 -2
- package/lib/dialog.js +16 -33
- package/lib/enterprise.js +2 -2
- package/lib/eoss-ui.common.js +1499 -938
- package/lib/error-page.js +2 -2
- package/lib/flow-group.js +2 -2
- package/lib/flow-list.js +4 -4
- package/lib/flow.js +476 -240
- package/lib/form.js +2 -4
- package/lib/handle-user.js +2 -2
- package/lib/handler.js +12 -12
- package/lib/icon.js +9 -9
- package/lib/icons.js +5 -5
- package/lib/index.js +1 -1
- package/lib/input-number.js +2 -2
- package/lib/input.js +2 -2
- package/lib/label.js +2 -2
- package/lib/layout.js +4 -4
- package/lib/login.js +728 -489
- package/lib/main.js +193 -114
- package/lib/menu.js +2 -2
- package/lib/nav.js +2 -2
- package/lib/notify.js +2 -2
- package/lib/page.js +2 -2
- package/lib/pagination.js +2 -2
- package/lib/player.js +11 -11
- package/lib/qr-code.js +4 -4
- package/lib/radio-group.js +10 -30
- package/lib/retrial-auth.js +9 -9
- package/lib/select-ganged.js +9 -9
- package/lib/select.js +8 -28
- package/lib/selector-panel.js +6 -8
- package/lib/selector.js +11 -11
- package/lib/sizer.js +2 -2
- package/lib/steps.js +2 -2
- package/lib/switch.js +9 -9
- package/lib/table-form.js +2 -2
- package/lib/tabs-panel.js +2 -2
- package/lib/tabs.js +2 -2
- package/lib/theme-chalk/base.css +1 -1
- package/lib/theme-chalk/flow.css +1 -1
- package/lib/theme-chalk/fonts/iconfont.ttf +0 -0
- package/lib/theme-chalk/fonts/iconfont.woff +0 -0
- package/lib/theme-chalk/icon.css +1 -1
- package/lib/theme-chalk/icons.css +1 -1
- package/lib/theme-chalk/index.css +1 -1
- package/lib/theme-chalk/login.css +1 -1
- package/lib/theme-chalk/main.css +1 -1
- package/lib/theme-chalk/menu.css +1 -1
- package/lib/theme-chalk/simplicity.css +1 -1
- package/lib/theme-chalk/sizer.css +1 -1
- package/lib/theme-chalk/upload.css +1 -1
- package/lib/tips.js +2 -2
- package/lib/toolbar.js +2 -2
- package/lib/tree-group.js +6 -5
- package/lib/tree.js +2 -2
- package/lib/upload.js +6 -8
- package/lib/wujie.js +145 -145
- package/lib/wxlogin.js +145 -145
- package/package.json +2 -2
- package/packages/.DS_Store +0 -0
- package/packages/checkbox-group/.DS_Store +0 -0
- package/packages/checkbox-group/src/main.vue +10 -7
- package/packages/data-table/src/main.vue +23 -15
- package/packages/dialog/.DS_Store +0 -0
- package/packages/dialog/src/main.vue +13 -8
- package/packages/flow/src/component/SendMsg.vue +7 -1
- package/packages/flow/src/component/taskUnionExamine.vue +19 -1
- package/packages/flow/src/main.vue +70 -48
- package/packages/flow/src/processForm.vue +21 -5
- package/packages/flow/src/processReject.vue +31 -14
- package/packages/flow/src/startTaskRead.vue +22 -8
- package/packages/handler/src/main.vue +1 -1
- package/packages/icons/src/icon.json +1 -1
- package/packages/login/.DS_Store +0 -0
- package/packages/login/src/main.vue +211 -115
- package/packages/main/.DS_Store +0 -0
- package/packages/main/src/.DS_Store +0 -0
- package/packages/main/src/default/index.vue +2 -10
- package/packages/main/src/default/message.vue +13 -1
- package/packages/main/src/default/notice.vue +16 -4
- package/packages/main/src/main.vue +41 -13
- package/packages/main/src/simplicity/index.vue +11 -17
- package/packages/main/src/simplicity/message.vue +14 -1
- package/packages/main/src/simplicity/notice.vue +13 -1
- package/packages/radio-group/src/main.vue +10 -7
- package/packages/select/src/main.vue +10 -7
- package/packages/theme-chalk/lib/base.css +1 -1
- package/packages/theme-chalk/lib/flow.css +1 -1
- package/packages/theme-chalk/lib/fonts/iconfont.ttf +0 -0
- package/packages/theme-chalk/lib/fonts/iconfont.woff +0 -0
- package/packages/theme-chalk/lib/icon.css +1 -1
- package/packages/theme-chalk/lib/icons.css +1 -1
- package/packages/theme-chalk/lib/index.css +1 -1
- package/packages/theme-chalk/lib/login.css +1 -1
- package/packages/theme-chalk/lib/main.css +1 -1
- package/packages/theme-chalk/lib/menu.css +1 -1
- package/packages/theme-chalk/lib/simplicity.css +1 -1
- package/packages/theme-chalk/lib/sizer.css +1 -1
- package/packages/theme-chalk/lib/upload.css +1 -1
- package/packages/theme-chalk/src/.DS_Store +0 -0
- package/packages/theme-chalk/src/common/var.scss +3 -1
- package/packages/theme-chalk/src/flow.scss +12 -0
- package/packages/theme-chalk/src/fonts/iconfont.ttf +0 -0
- package/packages/theme-chalk/src/fonts/iconfont.woff +0 -0
- package/packages/theme-chalk/src/icon.scss +16 -0
- package/packages/theme-chalk/src/icons.scss +1 -1
- package/packages/theme-chalk/src/login.scss +609 -760
- package/packages/tree-group/src/main.vue +5 -1
- package/src/index.js +1 -1
|
@@ -407,11 +407,12 @@
|
|
|
407
407
|
v-for="item of newsList"
|
|
408
408
|
:key="item.cciValue"
|
|
409
409
|
:label="item.cciValue"
|
|
410
|
+
:disabled="readOnlyNotificationType.indexOf(item.cciValue) != -1"
|
|
410
411
|
>
|
|
411
412
|
{{ item.shortName }}
|
|
412
413
|
</el-checkbox>
|
|
413
414
|
</el-checkbox-group>
|
|
414
|
-
<div
|
|
415
|
+
<!-- <div
|
|
415
416
|
v-show="showNews"
|
|
416
417
|
style="
|
|
417
418
|
border: 1px solid #ccc;
|
|
@@ -421,7 +422,13 @@
|
|
|
421
422
|
"
|
|
422
423
|
>
|
|
423
424
|
{{ nextNode.notificationMsg }}
|
|
424
|
-
</div>
|
|
425
|
+
</div> -->
|
|
426
|
+
<es-input style="
|
|
427
|
+
border-color: #ccc;
|
|
428
|
+
padding: 5px;
|
|
429
|
+
border-radius: 5px;
|
|
430
|
+
font-size: 13px;
|
|
431
|
+
" v-show="showNews" type="textarea" v-model="nextNode.notificationMsg" :readonly="notificationMessageReadOnly" />
|
|
425
432
|
</div>
|
|
426
433
|
</div>
|
|
427
434
|
</div>
|
|
@@ -567,6 +574,7 @@
|
|
|
567
574
|
v-if="handleVisible"
|
|
568
575
|
append-to-body
|
|
569
576
|
height="auto"
|
|
577
|
+
class="flow-dialog"
|
|
570
578
|
ref="handleVisible"
|
|
571
579
|
:title="title"
|
|
572
580
|
:close-on-click-modal="false"
|
|
@@ -597,7 +605,8 @@
|
|
|
597
605
|
<es-dialog
|
|
598
606
|
v-if="showReject"
|
|
599
607
|
append-to-body
|
|
600
|
-
|
|
608
|
+
class="flow-dialog"
|
|
609
|
+
height="400px"
|
|
601
610
|
title="驳回"
|
|
602
611
|
ref="showReject"
|
|
603
612
|
:close-on-click-modal="false"
|
|
@@ -615,6 +624,7 @@
|
|
|
615
624
|
v-if="showTaskRead"
|
|
616
625
|
append-to-body
|
|
617
626
|
height="auto"
|
|
627
|
+
class="flow-dialog"
|
|
618
628
|
ref="showTaskRead"
|
|
619
629
|
:close-on-click-modal="false"
|
|
620
630
|
:title="taskReadType === 'transfer' ? '转办' : '分阅'"
|
|
@@ -633,6 +643,7 @@
|
|
|
633
643
|
v-if="showFileList"
|
|
634
644
|
append-to-body
|
|
635
645
|
title="意见附件"
|
|
646
|
+
class="flow-dialog"
|
|
636
647
|
:close-on-click-modal="false"
|
|
637
648
|
:visible.sync="showFileList"
|
|
638
649
|
>
|
|
@@ -647,6 +658,7 @@
|
|
|
647
658
|
append-to-body
|
|
648
659
|
height="auto"
|
|
649
660
|
title="发送消息"
|
|
661
|
+
class="flow-dialog"
|
|
650
662
|
ref="showSendMsg"
|
|
651
663
|
:close-on-click-modal="false"
|
|
652
664
|
:visible.sync="showSendMsg"
|
|
@@ -661,6 +673,7 @@
|
|
|
661
673
|
v-if="showTaskUnionExamine"
|
|
662
674
|
append-to-body
|
|
663
675
|
height="auto"
|
|
676
|
+
class="flow-dialog"
|
|
664
677
|
ref="showTaskUnionExamine"
|
|
665
678
|
:close-on-click-modal="false"
|
|
666
679
|
:title="flowTitle"
|
|
@@ -758,6 +771,8 @@ export default {
|
|
|
758
771
|
return {
|
|
759
772
|
styles: {},
|
|
760
773
|
userModel: {},
|
|
774
|
+
readOnlyNotificationType:'',
|
|
775
|
+
notificationMessageReadOnly:false,
|
|
761
776
|
isCanPreAddSign: false,
|
|
762
777
|
isStartFlowChartView:undefined,
|
|
763
778
|
nextOtherOrgObjSelect: [],
|
|
@@ -1939,49 +1954,51 @@ export default {
|
|
|
1939
1954
|
} else {
|
|
1940
1955
|
this.isReject = false;
|
|
1941
1956
|
}
|
|
1942
|
-
if
|
|
1943
|
-
|
|
1944
|
-
|
|
1945
|
-
|
|
1946
|
-
|
|
1947
|
-
|
|
1948
|
-
|
|
1949
|
-
|
|
1950
|
-
|
|
1951
|
-
|
|
1952
|
-
|
|
1953
|
-
|
|
1954
|
-
|
|
1955
|
-
|
|
1956
|
-
|
|
1957
|
-
|
|
1958
|
-
|
|
1959
|
-
|
|
1960
|
-
|
|
1961
|
-
|
|
1962
|
-
|
|
1963
|
-
|
|
1964
|
-
|
|
1965
|
-
|
|
1966
|
-
|
|
1967
|
-
|
|
1968
|
-
|
|
1969
|
-
|
|
1970
|
-
|
|
1971
|
-
|
|
1972
|
-
|
|
1973
|
-
|
|
1974
|
-
|
|
1975
|
-
|
|
1976
|
-
|
|
1977
|
-
|
|
1978
|
-
|
|
1979
|
-
|
|
1980
|
-
|
|
1981
|
-
|
|
1982
|
-
|
|
1983
|
-
|
|
1984
|
-
|
|
1957
|
+
if(this.isSpecial){
|
|
1958
|
+
if (val == -1) {
|
|
1959
|
+
this.nextNode.isSerialSubmit = 1;
|
|
1960
|
+
this.loading.close();
|
|
1961
|
+
return;
|
|
1962
|
+
} else if (val == 0) {
|
|
1963
|
+
this.isNextUser = true;
|
|
1964
|
+
this.isShowNode = true;
|
|
1965
|
+
} else if (val == 1) {
|
|
1966
|
+
this.isNextUser = true;
|
|
1967
|
+
this.isShowNode = true;
|
|
1968
|
+
} else if (val == 2) {
|
|
1969
|
+
this.nextNode.isReturnSubmitter = 1;
|
|
1970
|
+
this.loading.close();
|
|
1971
|
+
return;
|
|
1972
|
+
} else if (val == 3) {
|
|
1973
|
+
this.nextNode.isUndertakeReply = 1;
|
|
1974
|
+
this.loading.close();
|
|
1975
|
+
return;
|
|
1976
|
+
} else if (val == 4) {
|
|
1977
|
+
this.nextNode.isTakeAdviceReply = 1;
|
|
1978
|
+
this.loading.close();
|
|
1979
|
+
return;
|
|
1980
|
+
} else if (val == 5) {
|
|
1981
|
+
this.nextNode.isUndertakeEnd = 1;
|
|
1982
|
+
this.loading.close();
|
|
1983
|
+
return;
|
|
1984
|
+
} else if (val == 6) {
|
|
1985
|
+
this.nextNode.isTakeAdviceEnd = 1;
|
|
1986
|
+
this.loading.close();
|
|
1987
|
+
return;
|
|
1988
|
+
} else if (val == 7) {
|
|
1989
|
+
this.nextNode.isReadDealReply = 1;
|
|
1990
|
+
this.loading.close();
|
|
1991
|
+
return;
|
|
1992
|
+
} else if (val == 8) {
|
|
1993
|
+
this.nextNode.isReadDealEnd = 1;
|
|
1994
|
+
this.loading.close();
|
|
1995
|
+
return;
|
|
1996
|
+
} else if (val == 9) {
|
|
1997
|
+
this.nextNode.isReturnRejectNode = 1;
|
|
1998
|
+
this.loading.close();
|
|
1999
|
+
return;
|
|
2000
|
+
} else {
|
|
2001
|
+
}
|
|
1985
2002
|
}
|
|
1986
2003
|
|
|
1987
2004
|
if (isDef !== true) this.getNodeInfo();
|
|
@@ -2050,6 +2067,8 @@ export default {
|
|
|
2050
2067
|
isPreset,
|
|
2051
2068
|
choiceOrgId,
|
|
2052
2069
|
choiceDeptId,
|
|
2070
|
+
readOnlyNotificationType,
|
|
2071
|
+
notificationMessageReadOnly,
|
|
2053
2072
|
pOrgId,
|
|
2054
2073
|
currentOrgName,
|
|
2055
2074
|
otherOrgName,
|
|
@@ -2071,6 +2090,9 @@ export default {
|
|
|
2071
2090
|
this.$emit('startTaskRead', res);
|
|
2072
2091
|
this.$emit('start-task-read', res);
|
|
2073
2092
|
this.currentOrgName = currentOrgName;
|
|
2093
|
+
this.readOnlyNotificationType = readOnlyNotificationType
|
|
2094
|
+
this.isSpecial = isSpecial;
|
|
2095
|
+
this.notificationMessageReadOnly = notificationMessageReadOnly == 'true'
|
|
2074
2096
|
this.otherOrgName = otherOrgName;
|
|
2075
2097
|
this.isCanPreAddSign = isCanPreAddSign;
|
|
2076
2098
|
this.endFlowInfo.choiceOrgId = choiceOrgId;
|
|
@@ -2233,7 +2255,7 @@ export default {
|
|
|
2233
2255
|
if (this.isCanRemoveSign) {
|
|
2234
2256
|
this.nextNode.isRemoveSign = '2';
|
|
2235
2257
|
}
|
|
2236
|
-
|
|
2258
|
+
|
|
2237
2259
|
|
|
2238
2260
|
if (!this.isOpinionRequired) {
|
|
2239
2261
|
this.isOpinionRequired = 0;
|
|
@@ -2544,7 +2566,7 @@ export default {
|
|
|
2544
2566
|
notificationType = this.nextNode.notificationType.join(',');
|
|
2545
2567
|
addSignUserId = addSignUserId.join(',');
|
|
2546
2568
|
removeSignUserId = removeSignUserId.join(',');
|
|
2547
|
-
if (!this.isCanPreAddSign) {
|
|
2569
|
+
if (!this.isCanPreAddSign || this.nextNode.isAddSign != '1') {
|
|
2548
2570
|
delete this.nextNode.addSignMode;
|
|
2549
2571
|
}
|
|
2550
2572
|
let params = {
|
|
@@ -10,7 +10,8 @@
|
|
|
10
10
|
ref="nextNode"
|
|
11
11
|
:model="nextNode"
|
|
12
12
|
class="demo-dynamic"
|
|
13
|
-
label-width="
|
|
13
|
+
label-width="100px"
|
|
14
|
+
label-position="left"
|
|
14
15
|
>
|
|
15
16
|
<div style="height: 430px; overflow-y: auto; margin-bottom: 10px">
|
|
16
17
|
<el-form-item
|
|
@@ -189,6 +190,7 @@
|
|
|
189
190
|
v-for="item of nextNode.noticeList"
|
|
190
191
|
:key="item.cciValue"
|
|
191
192
|
:label="item.cciValue"
|
|
193
|
+
:disabled="readOnlyNotificationType.indexOf(item.cciValue) != -1"
|
|
192
194
|
>
|
|
193
195
|
{{ item.shortName }}
|
|
194
196
|
</el-checkbox>
|
|
@@ -199,7 +201,17 @@
|
|
|
199
201
|
prop="nextNode"
|
|
200
202
|
label="通知消息"
|
|
201
203
|
>
|
|
202
|
-
<
|
|
204
|
+
<es-input
|
|
205
|
+
style="
|
|
206
|
+
border-color: #ccc;
|
|
207
|
+
padding: 5px;
|
|
208
|
+
border-radius: 5px;
|
|
209
|
+
font-size: 13px;
|
|
210
|
+
"
|
|
211
|
+
type="textarea"
|
|
212
|
+
v-model="nextNode.noticeInfo"
|
|
213
|
+
:readonly="notificationMessageReadOnly"
|
|
214
|
+
/>
|
|
203
215
|
</el-form-item>
|
|
204
216
|
<CustomPreset
|
|
205
217
|
v-show="isCustomPreset"
|
|
@@ -297,6 +309,8 @@ export default {
|
|
|
297
309
|
multiple: false,
|
|
298
310
|
readMultiple: true,
|
|
299
311
|
customPresetHintMessage: '', //流程预设标题
|
|
312
|
+
notificationMessageReadOnly: false,
|
|
313
|
+
readOnlyNotificationType: '',
|
|
300
314
|
show: true,
|
|
301
315
|
radioList: [],
|
|
302
316
|
activeNames: '',
|
|
@@ -343,7 +357,7 @@ export default {
|
|
|
343
357
|
}
|
|
344
358
|
}
|
|
345
359
|
},
|
|
346
|
-
userModel:{},
|
|
360
|
+
userModel: {},
|
|
347
361
|
nextUserTabs: {},
|
|
348
362
|
selectPresetUserList: [],
|
|
349
363
|
presetOptions: [],
|
|
@@ -387,7 +401,7 @@ export default {
|
|
|
387
401
|
}
|
|
388
402
|
}
|
|
389
403
|
},
|
|
390
|
-
|
|
404
|
+
created() {
|
|
391
405
|
this.getUserInfo();
|
|
392
406
|
},
|
|
393
407
|
mounted() {
|
|
@@ -395,7 +409,7 @@ export default {
|
|
|
395
409
|
this.newOpinion = this.opinion;
|
|
396
410
|
},
|
|
397
411
|
methods: {
|
|
398
|
-
|
|
412
|
+
getUserInfo() {
|
|
399
413
|
let mainConfig = util.getStorage('mainConfig');
|
|
400
414
|
if (mainConfig) {
|
|
401
415
|
this.userModel = JSON.parse(mainConfig).userModel;
|
|
@@ -836,6 +850,8 @@ export default {
|
|
|
836
850
|
this.quit();
|
|
837
851
|
});
|
|
838
852
|
this.customPresetHintMessage = data.customPresetHintMessage;
|
|
853
|
+
this.readOnlyNotificationType = data.readOnlyNotificationType;
|
|
854
|
+
this.notificationMessageReadOnly = data.notificationMessageReadOnly == 'true';
|
|
839
855
|
this.nextNode.nodeInfo = data.nextNodeList;
|
|
840
856
|
this.nextNode.nextNode = data.nextNodeList[0].nodeId;
|
|
841
857
|
this.isPreset = data.isPreset;
|
|
@@ -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 prop="nodeName" label="当前节点">
|
|
16
17
|
<el-input v-model="nodeName" disabled />
|
|
17
18
|
</el-form-item>
|
|
@@ -35,11 +36,12 @@
|
|
|
35
36
|
{ required: false, message: `请选择通知方式`, trigger: 'blur' }
|
|
36
37
|
]"
|
|
37
38
|
>
|
|
38
|
-
<el-checkbox-group v-model="nextNode.noticeType"
|
|
39
|
+
<el-checkbox-group v-model="nextNode.noticeType">
|
|
39
40
|
<el-checkbox
|
|
40
41
|
v-for="item of nextNode.noticeList"
|
|
41
42
|
:key="item.cciValue"
|
|
42
43
|
:label="item.cciValue"
|
|
44
|
+
:disabled="readOnlyNotificationType.indexOf(item.cciValue) != -1"
|
|
43
45
|
>
|
|
44
46
|
{{ item.shortName }}
|
|
45
47
|
</el-checkbox>
|
|
@@ -56,11 +58,13 @@
|
|
|
56
58
|
:rows="4"
|
|
57
59
|
placeholder="请输入内容"
|
|
58
60
|
v-model="newsInformation"
|
|
61
|
+
:readonly="notificationMessageReadOnly"
|
|
59
62
|
>
|
|
60
63
|
</es-input>
|
|
61
64
|
</el-form-item>
|
|
65
|
+
</div>
|
|
62
66
|
<el-form-item>
|
|
63
|
-
<div style="text-align:right">
|
|
67
|
+
<div style="text-align: right">
|
|
64
68
|
<el-button
|
|
65
69
|
type="primary"
|
|
66
70
|
size="small"
|
|
@@ -96,6 +100,8 @@ export default {
|
|
|
96
100
|
data() {
|
|
97
101
|
return {
|
|
98
102
|
loading: false,
|
|
103
|
+
notificationMessageReadOnly: false,
|
|
104
|
+
readOnlyNotificationType: '',
|
|
99
105
|
nextNode: {
|
|
100
106
|
noticeType: [],
|
|
101
107
|
opinion: undefined, // 审批意见
|
|
@@ -131,15 +137,18 @@ export default {
|
|
|
131
137
|
util
|
|
132
138
|
.ajax({
|
|
133
139
|
url: findCodeValues,
|
|
134
|
-
params: {
|
|
140
|
+
params: {
|
|
141
|
+
ccCode: 'notification_type',
|
|
142
|
+
userId: util.getStorage('userId')
|
|
143
|
+
}
|
|
135
144
|
})
|
|
136
|
-
.then(res => {
|
|
145
|
+
.then((res) => {
|
|
137
146
|
const { status, data } = res;
|
|
138
147
|
if (status === 'success') {
|
|
139
148
|
this.nextNode.noticeList = data;
|
|
140
149
|
}
|
|
141
150
|
})
|
|
142
|
-
.catch(err => {
|
|
151
|
+
.catch((err) => {
|
|
143
152
|
this.loading = false;
|
|
144
153
|
if (err.message && err.message !== 'canceled') {
|
|
145
154
|
this.$message.error(err.message);
|
|
@@ -150,8 +159,8 @@ export default {
|
|
|
150
159
|
subProcess(formName) {
|
|
151
160
|
this.saveProcess(formName);
|
|
152
161
|
},
|
|
153
|
-
saveProcess(formName){
|
|
154
|
-
|
|
162
|
+
saveProcess(formName) {
|
|
163
|
+
this.$refs[formName].validate((valid) => {
|
|
155
164
|
if (valid) {
|
|
156
165
|
if (!this.option && this.isOpinionRequired === 1) {
|
|
157
166
|
this.$message.warning('请选择输入审批意见');
|
|
@@ -169,7 +178,7 @@ export default {
|
|
|
169
178
|
};
|
|
170
179
|
util
|
|
171
180
|
.ajax({ url: taskRejectHtml, method: 'post', data: params })
|
|
172
|
-
.then(res => {
|
|
181
|
+
.then((res) => {
|
|
173
182
|
const { status, message } = res;
|
|
174
183
|
this.loading = false;
|
|
175
184
|
if (status === 'success') {
|
|
@@ -179,7 +188,7 @@ export default {
|
|
|
179
188
|
this.$message.error(message || '系统错误,请联系管理员!');
|
|
180
189
|
}
|
|
181
190
|
})
|
|
182
|
-
.catch(err => {
|
|
191
|
+
.catch((err) => {
|
|
183
192
|
this.loading = false;
|
|
184
193
|
if (err.message && err.message !== 'canceled') {
|
|
185
194
|
this.$message.error(err.message);
|
|
@@ -199,13 +208,13 @@ export default {
|
|
|
199
208
|
.ajax({
|
|
200
209
|
url: findSysCodes
|
|
201
210
|
})
|
|
202
|
-
.then(res => {
|
|
211
|
+
.then((res) => {
|
|
203
212
|
const { status, message } = res;
|
|
204
213
|
if (status === 'success') {
|
|
205
214
|
this.nextNode.noticeType = message.split(',');
|
|
206
215
|
}
|
|
207
216
|
})
|
|
208
|
-
.catch(err => {
|
|
217
|
+
.catch((err) => {
|
|
209
218
|
this.loading = false;
|
|
210
219
|
if (err.message && err.message !== 'canceled') {
|
|
211
220
|
this.$message.error(err.message);
|
|
@@ -221,15 +230,23 @@ export default {
|
|
|
221
230
|
};
|
|
222
231
|
util
|
|
223
232
|
.ajax({ url: toTaskRejectHtml, params })
|
|
224
|
-
.then(res => {
|
|
233
|
+
.then((res) => {
|
|
225
234
|
const {
|
|
226
235
|
status,
|
|
227
236
|
message,
|
|
228
|
-
data: {
|
|
237
|
+
data: {
|
|
238
|
+
rejectTaskNodes,
|
|
239
|
+
taskExamine,
|
|
240
|
+
nodeInfoMap,
|
|
241
|
+
notificationMessageReadOnly,
|
|
242
|
+
readOnlyNotificationType
|
|
243
|
+
}
|
|
229
244
|
} = res;
|
|
230
245
|
this.loading = false;
|
|
231
246
|
if (status === 'success') {
|
|
232
247
|
this.isOpinionRequired = nodeInfoMap.nodeExtAttr.isOpinionRequired;
|
|
248
|
+
this.readOnlyNotificationType = readOnlyNotificationType;
|
|
249
|
+
this.notificationMessageReadOnly = notificationMessageReadOnly == 'true';
|
|
233
250
|
if (!this.isOpinionRequired) {
|
|
234
251
|
this.isOpinionRequired = 0;
|
|
235
252
|
}
|
|
@@ -251,7 +268,7 @@ export default {
|
|
|
251
268
|
this.$message.error(message || '系统错误,请联系管理员!');
|
|
252
269
|
}
|
|
253
270
|
})
|
|
254
|
-
.catch(err => {
|
|
271
|
+
.catch((err) => {
|
|
255
272
|
this.loading = false;
|
|
256
273
|
if (err.message && err.message !== 'canceled') {
|
|
257
274
|
this.$message.error(err.message);
|
|
@@ -114,21 +114,33 @@
|
|
|
114
114
|
v-for="item of noticeList"
|
|
115
115
|
:key="item.cciValue"
|
|
116
116
|
:label="item.cciValue"
|
|
117
|
+
:disabled="configInfo.readOnlyNotificationType.indexOf(item.cciValue) != -1"
|
|
117
118
|
>
|
|
118
119
|
{{ item.shortName }}
|
|
119
120
|
</el-checkbox>
|
|
120
121
|
</el-checkbox-group>
|
|
121
122
|
</el-form-item>
|
|
122
123
|
<el-form-item
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
124
|
+
v-show="
|
|
125
|
+
nextNode.noticeType.length != 0 &&
|
|
126
|
+
configInfo.isCdjxjTaskHandle != 'true' &&
|
|
127
|
+
type == 'transfer'
|
|
128
|
+
"
|
|
128
129
|
prop="nextNode"
|
|
129
130
|
label="通知消息"
|
|
130
131
|
>
|
|
131
|
-
|
|
132
|
+
<es-input
|
|
133
|
+
style="
|
|
134
|
+
border-color: #ccc;
|
|
135
|
+
padding: 5px;
|
|
136
|
+
border-radius: 5px;
|
|
137
|
+
font-size: 13px;
|
|
138
|
+
"
|
|
139
|
+
type="textarea"
|
|
140
|
+
v-model="newsNoice"
|
|
141
|
+
:readonly="configInfo.notificationMessageReadOnly =='true'"
|
|
142
|
+
/>
|
|
143
|
+
<!-- <span>{{ newsInfo }}</span> -->
|
|
132
144
|
</el-form-item>
|
|
133
145
|
<el-form-item>
|
|
134
146
|
<div style="text-align: right">
|
|
@@ -168,6 +180,7 @@ export default {
|
|
|
168
180
|
data() {
|
|
169
181
|
return {
|
|
170
182
|
loading: false,
|
|
183
|
+
newsNoice:'',
|
|
171
184
|
nextNode: {
|
|
172
185
|
nextUser: [],
|
|
173
186
|
userInfo: [],
|
|
@@ -217,6 +230,7 @@ export default {
|
|
|
217
230
|
}
|
|
218
231
|
},
|
|
219
232
|
mounted() {
|
|
233
|
+
this.newsNoice = this.newsInfo
|
|
220
234
|
this.getFind();
|
|
221
235
|
if(util.getStorage('mainConfig')){
|
|
222
236
|
this.orgId = JSON.parse(util.getStorage('mainConfig')).userModel.orgId
|
|
@@ -402,7 +416,7 @@ export default {
|
|
|
402
416
|
// 转办提交
|
|
403
417
|
subTaskTransfer() {
|
|
404
418
|
const { choiceDeptId, choiceOrgId, bCode, bName } = this.taskExamine;
|
|
405
|
-
const { opinion, pendingId, nextNode,
|
|
419
|
+
const { opinion, pendingId, nextNode, newsNoice, multiple,type } = this;
|
|
406
420
|
let params = {
|
|
407
421
|
url: taskTransfer,
|
|
408
422
|
data: {
|
|
@@ -416,7 +430,7 @@ export default {
|
|
|
416
430
|
opinion,
|
|
417
431
|
pendingId,
|
|
418
432
|
notificationType: nextNode.noticeType.join(','),
|
|
419
|
-
notificationMsg:
|
|
433
|
+
notificationMsg: newsNoice
|
|
420
434
|
},
|
|
421
435
|
headers: { Accept: 'application/json,text/plain' },
|
|
422
436
|
method: 'post'
|
|
@@ -1 +1 @@
|
|
|
1
|
-
["zuomian","monitor","maximize","pointer-up","pointer-left","pointer-down","tri-down","retrograde","rainfall","caveat","print","alarm","table","duigouquan","bumen","mm","accelerate","quanping","password","qing","kaifa","daoru","piaochongicon","instructions","notice","wifi","tishicuo","minganciguanli","switch-off","switch-on","narrow","yidongduan","web","upload","message","go-back","close","shujutongji","folder","edit","enter","dian","wendu","shangwu","shenbao","magnifier","project-add","xiexian","caidan","tupian","yinyu","wenhao","template","daiban","set","zhengwen","cuowu","chenggong","indent","increase","ziliaoku","tuichu","quit","leaf","refresh","statistic","gengduo","lvyou","mail","user","zhishi","weizhi","jinggao","zuzhijigou","xue","fenxiang","jinrong","shanchu","jianhao","jiahao","yinzhang","renyuanqiehuan","gouxuanzhong1","circle","fuxuankuang1","fangkuang","application","wenjianjia","jiaren","xiugai","duanxinguanli","workbench","rizhi","gongwen","qingshi","shiwu","official","baogao","document","wodeyouxiang","ziliaojiaohuan","denglu","podium","fangkuai","xuewei","duoyun","pm","xiajia","huanbao","dunpai","shu","gongzuozheng","more","fenlei","delete","fengsu","bar","yuanqu","duomeiti","youjian","qiye","zuixinzixun","biaoge","omit","diaotou","jiantou-left","jiantou-right","jiantou-up","roles","jiantou-next","chijiuhuacunchu","zhuanhuan","cloudy","form","wuye","tri-up","pointer-right","bianji","tri-right","tri-left","daimaguanli","jiankong","kaifazhong","fujian","bingtu","zhuzhuangtu","lose","rmb","move","xiazai","yiban","laoshi","clear","jinyong","yunxing","weihu","chakan","pifu","ren","gouwuche","loading2","yulan","ziliao","yidong","fenxiang11","kaoqin","change","shidu","portfolio","info","yanjing","laba","camera","xitongxiaoxi","xitongguanli","webduan","wagnz","group","shengqian","jiantou-prev","attention","look","guanzhu","daikuan","tubiao","duigou","star","dayin","xinzeng","reduce","goup","calendar","tree","yingyong","caution","zhuanfa","add","zongtiqixian","daochu","gongwu","ihouse","chilun","weixiu","chengguo","trophy","duiwu","qiehuanjiaose","door","shebei","fangjian","microscope","huaxue","shiyanshianquan","shiyan","qiyexinxi","yewuxinxi","lab","shiyanguanli","yuqing","big-screen","signal-search","database","star-mark","cng","professor","informatization","code","science","price","xunhuan","savings","administration","aid","biao","line","xietong","jingzheng","enterprise","datatable","toubiao","bingdu","keji2","qiyeku5","touzi5","zijinliu","zhishichanquan3","kejifuwu2","zhishichanquan2","zijinanquan","kejifuwu1","geju","yiqingfangkong","kejifuwu","anquanfangkong","shujufuwu","shujuceng","shujugongxiang","flows","setup","shujulian","caiwujianguan","caiwuliushui","mubiaogeju","juxing","fuwuqi","touzijigou","xiezilou","jianzhu","logo","touzhi","zijin","fintech","touzixiangmu","library","touziguanli","zhongda","ziyuan","shujutai","shujudongtai","bank","shujuzhongxin","zhongyaomubiao","touzishijian","caiwuguanli","mingzhong","touzishenpi","jingzhenggeju","property","keji","qiyeku","zhongyaojihui","touzilicai","zhishichanquan","touzi","tzz","menu","xiangmushu","pdf","jiazai","gongsi","rise","jbxx","zwxx","jypx","jcgl","ndkh","grjl","shgx","gou","shijian","fukuan","guoji","shoukuan","down","gongzuotai","gaigedongtai","xitongshezhi","relation","zuzhirenshi","kaohepingjia","caiwujiandu","sanzhongyida","mima","xianshi","zhanghao","bangongshi","checked","checke","help","kuoda","banli","xiaoxi","shouqicaidan","shouqicaidan-right","smile","tongzhi","guanji","shuaxin","guiji","tianjiawenjianjia","yunxiazai","del","touzifangan","zongheguanli","sanzhongyida_mian","gongwenguanli1","heguiguanli","jingyingfenxi","txl","diannao","renliziyuan","caiwuxitong","shiwuguanli","shouye","bangongyongpin","sidebar","zhidulashi","log","fawenguanli","huiyiguanli","zuzhishishi","gongwenqianshou","jinxiupeixun","gongwenbao","jiaohuan","daibanshixiang","richeng","tongxunlu","yongche","yanzheng","daibanxinxi","shuben","fanfu","guangbo","shuzhuangtu","bengqiye","tongguo","dengdai","cross","daichuli","zhenggai","shouli","shujuhecha","guanli","paper-file","wenjian","dakaiwenjian","yewu","jiance","jiheguanli","jinru","arrow-right","lingdao","rencai","prev","next","jianpan","qrcode","bohui","homepage","download","gantanhao","dingding","weixin","pad","ios","android","txt","doc","audioo","video","zip","shuru","duanxin","saoma","youxiang","word","excel","fileword","picture","ppt","ca","usb-key","wenjianjiadakai","yingyonglan","home","tiyanxinban","shiyongjiuban"]
|
|
1
|
+
["zuomian","monitor","maximize","pointer-up","pointer-left","pointer-down","tri-down","retrograde","rainfall","caveat","print","alarm","table","duigouquan","bumen","mm","accelerate","quanping","password","qing","kaifa","daoru","piaochongicon","instructions","notice","wifi","tishicuo","minganciguanli","switch-off","switch-on","narrow","yidongduan","web","upload","message","go-back","close","shujutongji","folder","edit","enter","dian","wendu","shangwu","shenbao","magnifier","project-add","xiexian","caidan","tupian","yinyu","wenhao","template","daiban","set","zhengwen","cuowu","chenggong","indent","increase","ziliaoku","tuichu","quit","leaf","refresh","statistic","gengduo","lvyou","mail","user","zhishi","weizhi","jinggao","zuzhijigou","xue","fenxiang","jinrong","shanchu","jianhao","jiahao","yinzhang","renyuanqiehuan","gouxuanzhong1","circle","fuxuankuang1","fangkuang","application","wenjianjia","jiaren","xiugai","duanxinguanli","workbench","rizhi","gongwen","qingshi","shiwu","official","baogao","document","wodeyouxiang","ziliaojiaohuan","denglu","podium","fangkuai","xuewei","duoyun","pm","xiajia","huanbao","dunpai","shu","gongzuozheng","more","fenlei","delete","fengsu","bar","yuanqu","duomeiti","youjian","qiye","zuixinzixun","biaoge","omit","diaotou","jiantou-left","jiantou-right","jiantou-up","roles","jiantou-next","chijiuhuacunchu","zhuanhuan","cloudy","form","wuye","tri-up","pointer-right","bianji","tri-right","tri-left","daimaguanli","jiankong","kaifazhong","fujian","bingtu","zhuzhuangtu","lose","rmb","move","xiazai","yiban","laoshi","clear","jinyong","yunxing","weihu","chakan","pifu","ren","gouwuche","loading2","yulan","ziliao","yidong","fenxiang11","kaoqin","change","shidu","portfolio","info","yanjing","laba","camera","xitongxiaoxi","xitongguanli","webduan","wagnz","group","shengqian","jiantou-prev","attention","look","guanzhu","daikuan","tubiao","duigou","star","dayin","xinzeng","reduce","goup","calendar","tree","yingyong","caution","zhuanfa","add","zongtiqixian","daochu","gongwu","ihouse","chilun","weixiu","chengguo","trophy","duiwu","qiehuanjiaose","door","shebei","fangjian","microscope","huaxue","shiyanshianquan","shiyan","qiyexinxi","yewuxinxi","lab","shiyanguanli","yuqing","big-screen","signal-search","database","star-mark","cng","professor","informatization","code","science","price","xunhuan","savings","administration","aid","biao","line","xietong","jingzheng","enterprise","datatable","toubiao","bingdu","keji2","qiyeku5","touzi5","zijinliu","zhishichanquan3","kejifuwu2","zhishichanquan2","zijinanquan","kejifuwu1","geju","yiqingfangkong","kejifuwu","anquanfangkong","shujufuwu","shujuceng","shujugongxiang","flows","setup","shujulian","caiwujianguan","caiwuliushui","mubiaogeju","juxing","fuwuqi","touzijigou","xiezilou","jianzhu","logo","touzhi","zijin","fintech","touzixiangmu","library","touziguanli","zhongda","ziyuan","shujutai","shujudongtai","bank","shujuzhongxin","zhongyaomubiao","touzishijian","caiwuguanli","mingzhong","touzishenpi","jingzhenggeju","property","keji","qiyeku","zhongyaojihui","touzilicai","zhishichanquan","touzi","tzz","menu","xiangmushu","pdf","jiazai","gongsi","rise","jbxx","zwxx","jypx","jcgl","ndkh","grjl","shgx","gou","shijian","fukuan","guoji","shoukuan","down","gongzuotai","gaigedongtai","xitongshezhi","relation","zuzhirenshi","kaohepingjia","caiwujiandu","sanzhongyida","mima","xianshi","zhanghao","bangongshi","checked","checke","help","kuoda","banli","xiaoxi","shouqicaidan","shouqicaidan-right","smile","tongzhi","guanji","shuaxin","guiji","tianjiawenjianjia","yunxiazai","del","touzifangan","zongheguanli","sanzhongyida_mian","gongwenguanli1","heguiguanli","jingyingfenxi","txl","diannao","renliziyuan","caiwuxitong","shiwuguanli","shouye","bangongyongpin","sidebar","zhidulashi","log","fawenguanli","huiyiguanli","zuzhishishi","gongwenqianshou","jinxiupeixun","gongwenbao","jiaohuan","daibanshixiang","richeng","tongxunlu","yongche","yanzheng","daibanxinxi","shuben","fanfu","guangbo","shuzhuangtu","bengqiye","tongguo","dengdai","cross","daichuli","zhenggai","shouli","shujuhecha","guanli","paper-file","wenjian","dakaiwenjian","yewu","jiance","jiheguanli","jinru","arrow-right","lingdao","rencai","prev","next","jianpan","qrcode","bohui","homepage","download","gantanhao","dingding","weixin","pad","ios","android","txt","doc","audioo","video","zip","shuru","duanxin","saoma","youxiang","word","excel","fileword","picture","ppt","ca","usb-key","wenjianjiadakai","yingyonglan","home","tiyanxinban","shiyongjiuban","zhuomian","scan","youbian","zuobian"]
|
package/packages/login/.DS_Store
CHANGED
|
Binary file
|