eoss-ui 0.7.83 → 0.7.84
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 +144 -120
- package/lib/button.js +143 -120
- package/lib/calendar.js +2 -2
- package/lib/calogin.js +377 -353
- package/lib/card.js +2 -2
- package/lib/cascader.js +2 -2
- package/lib/checkbox-group.js +144 -120
- package/lib/clients.js +2 -2
- package/lib/config/api.js +7 -1
- package/lib/data-table-form.js +144 -120
- package/lib/data-table.js +144 -120
- package/lib/date-picker.js +143 -120
- package/lib/dialog.js +219 -214
- package/lib/enable-drag.js +2 -2
- package/lib/enterprise.js +2 -2
- package/lib/eoss-ui.common.js +1497 -872
- package/lib/error-page.js +2 -2
- package/lib/flow-group.js +147 -124
- package/lib/flow-list.js +162 -137
- package/lib/flow.js +1281 -657
- package/lib/form.js +243 -239
- package/lib/handle-user.js +144 -121
- package/lib/handler.js +144 -121
- package/lib/icon.js +144 -121
- package/lib/icons.js +4 -4
- package/lib/index.js +1 -1
- package/lib/input-number.js +143 -120
- package/lib/input.js +143 -120
- package/lib/label.js +2 -2
- package/lib/layout.js +2 -2
- package/lib/login.js +145 -121
- package/lib/main.js +185 -161
- package/lib/menu.js +2 -2
- package/lib/nav.js +150 -127
- package/lib/notify.js +86 -77
- package/lib/page.js +143 -120
- package/lib/pagination.js +143 -120
- package/lib/player.js +147 -124
- package/lib/qr-code.js +158 -135
- package/lib/radio-group.js +143 -120
- package/lib/retrial-auth.js +144 -121
- package/lib/select-ganged.js +143 -120
- package/lib/select.js +143 -120
- package/lib/selector-panel.js +147 -123
- package/lib/selector.js +145 -122
- package/lib/sizer.js +143 -120
- package/lib/steps.js +150 -127
- package/lib/switch.js +143 -120
- package/lib/table-form.js +143 -120
- package/lib/tabs-panel.js +2 -2
- package/lib/tabs.js +143 -120
- package/lib/theme-chalk/flow.css +1 -1
- package/lib/theme-chalk/index.css +1 -1
- package/lib/theme-chalk/login.css +1 -1
- package/lib/tips.js +143 -120
- package/lib/toolbar.js +2 -2
- package/lib/tree-group.js +143 -120
- package/lib/tree.js +143 -120
- package/lib/upload.js +154 -130
- package/lib/utils/util.js +60 -46
- package/lib/wujie.js +156 -122
- package/lib/wxlogin.js +143 -120
- package/package.json +2 -1
- package/packages/button/index.js +5 -5
- package/packages/button/src/main.vue +418 -418
- package/packages/button-group/index.js +5 -5
- package/packages/calendar/index.js +5 -5
- package/packages/calogin/index.js +5 -5
- package/packages/calogin/src/plugin.js +915 -915
- package/packages/card/index.js +5 -5
- package/packages/card/src/main.vue +156 -156
- package/packages/cascader/index.js +5 -5
- package/packages/cascader/src/main.vue +168 -168
- package/packages/checkbox-group/index.js +5 -5
- package/packages/checkbox-group/src/main.vue +333 -333
- package/packages/clients/index.js +5 -5
- package/packages/data-table/index.js +5 -5
- package/packages/data-table/src/children.vue +39 -39
- package/packages/data-table/src/sizer.vue +195 -195
- package/packages/data-table-form/index.js +5 -5
- package/packages/data-table-form/src/checkbox.vue +101 -101
- package/packages/data-table-form/src/colgroup.vue +17 -17
- package/packages/data-table-form/src/main.vue +181 -181
- package/packages/data-table-form/src/radio.vue +65 -65
- package/packages/data-table-form/src/table.vue +233 -233
- package/packages/data-table-form/src/tbody.vue +336 -336
- package/packages/data-table-form/src/thead.vue +68 -68
- package/packages/date-picker/index.js +5 -5
- package/packages/date-picker/src/main.vue +236 -236
- package/packages/dialog/index.js +5 -5
- package/packages/enable-drag/index.js +5 -5
- package/packages/enterprise/index.js +5 -5
- package/packages/enterprise/src/main.vue +66 -66
- package/packages/error-page/index.js +5 -5
- package/packages/error-page/src/main.vue +44 -44
- package/packages/flow/index.js +5 -5
- package/packages/flow/src/component/CustomPreset.vue +1 -1
- package/packages/flow/src/component/SortFlow.vue +110 -0
- package/packages/flow/src/component/TimeLimit.vue +190 -190
- package/packages/flow/src/main.vue +212 -25
- package/packages/flow/src/processForm.vue +153 -5
- package/packages/flow-group/index.js +5 -5
- package/packages/flow-group/src/main.vue +2 -2
- package/packages/flow-list/index.js +5 -5
- package/packages/flow-list/src/main.vue +8 -6
- package/packages/form/index.js +5 -5
- package/packages/form/src/main.vue +1 -1
- package/packages/handle-user/index.js +5 -5
- package/packages/handler/index.js +5 -5
- package/packages/icon/index.js +5 -5
- package/packages/icons/index.js +5 -5
- package/packages/icons/src/main.vue +81 -81
- package/packages/input/index.js +5 -5
- package/packages/input/src/main.vue +356 -356
- package/packages/input-number/index.js +5 -5
- package/packages/input-number/src/main.vue +106 -106
- package/packages/label/index.js +5 -5
- package/packages/label/src/main.vue +457 -457
- package/packages/layout/index.js +5 -5
- package/packages/layout/src/item.vue +152 -152
- package/packages/layout/src/main.vue +31 -31
- package/packages/login/index.js +5 -5
- package/packages/main/index.js +5 -5
- package/packages/main/src/default/message.vue +249 -249
- package/packages/main/src/default/notice.vue +157 -157
- package/packages/main/src/simplicity/lists.vue +84 -84
- package/packages/main/src/simplicity/router-page.vue +45 -45
- package/packages/menu/index.js +5 -5
- package/packages/nav/index.js +5 -5
- package/packages/notify/index.js +5 -5
- package/packages/notify/src/main.vue +538 -538
- package/packages/page/index.js +5 -5
- package/packages/page/src/main.vue +167 -167
- package/packages/pagination/index.js +5 -5
- package/packages/pagination/src/main.vue +96 -96
- package/packages/player/index.js +5 -5
- package/packages/player/src/main.vue +194 -194
- package/packages/qr-code/index.js +5 -5
- package/packages/qr-code/src/main.vue +170 -170
- package/packages/radio-group/index.js +6 -6
- package/packages/radio-group/src/main.vue +319 -319
- package/packages/retrial-auth/index.js +5 -5
- package/packages/retrial-auth/src/main.vue +280 -280
- package/packages/select/index.js +5 -5
- package/packages/select-ganged/index.js +5 -5
- package/packages/select-ganged/src/main.vue +724 -724
- package/packages/selector/index.js +5 -5
- package/packages/selector-panel/index.js +5 -5
- package/packages/selector-panel/src/tree.vue +129 -129
- package/packages/sizer/index.js +5 -5
- package/packages/sizer/src/main.vue +254 -254
- package/packages/steps/index.js +5 -5
- package/packages/steps/src/main.vue +181 -181
- package/packages/switch/index.js +5 -5
- package/packages/table-form/index.js +5 -5
- package/packages/tabs/index.js +5 -5
- package/packages/tabs/src/main.vue +788 -788
- package/packages/tabs-panel/index.js +5 -5
- package/packages/tabs-panel/src/main.vue +29 -29
- package/packages/theme-chalk/gulpfile.js +25 -0
- package/packages/theme-chalk/src/base.scss +261 -261
- package/packages/theme-chalk/src/button-group.scss +176 -176
- package/packages/theme-chalk/src/button.scss +24 -24
- package/packages/theme-chalk/src/calendar.scss +113 -113
- package/packages/theme-chalk/src/card.scss +99 -99
- package/packages/theme-chalk/src/checkbox-group.scss +8 -8
- package/packages/theme-chalk/src/clients.scss +87 -87
- package/packages/theme-chalk/src/data-table-form.scss +67 -67
- package/packages/theme-chalk/src/date-picker.scss +7 -7
- package/packages/theme-chalk/src/dialog.scss +77 -77
- package/packages/theme-chalk/src/enable-drag.scss +181 -181
- package/packages/theme-chalk/src/enterprise.scss +5 -5
- package/packages/theme-chalk/src/error-page.scss +18 -18
- package/packages/theme-chalk/src/flow-group.scss +110 -110
- package/packages/theme-chalk/src/flow-list.scss +39 -39
- package/packages/theme-chalk/src/flow.scss +14 -0
- package/packages/theme-chalk/src/handle-user.scss +40 -40
- package/packages/theme-chalk/src/icons.scss +99 -99
- package/packages/theme-chalk/src/input.scss +9 -9
- package/packages/theme-chalk/src/label.scss +24 -24
- package/packages/theme-chalk/src/layout.scss +46 -46
- package/packages/theme-chalk/src/mixins/color.scss +117 -117
- package/packages/theme-chalk/src/nav.scss +111 -111
- package/packages/theme-chalk/src/page.scss +3 -3
- package/packages/theme-chalk/src/pagination.scss +29 -29
- package/packages/theme-chalk/src/player.scss +9 -9
- package/packages/theme-chalk/src/qr-code.scss +17 -17
- package/packages/theme-chalk/src/radio-group.scss +9 -9
- package/packages/theme-chalk/src/retrial-auth.scss +38 -38
- package/packages/theme-chalk/src/select-ganged.scss +8 -8
- package/packages/theme-chalk/src/select.scss +8 -8
- package/packages/theme-chalk/src/selector-panel.scss +204 -204
- package/packages/theme-chalk/src/sizer.scss +36 -36
- package/packages/theme-chalk/src/steps.scss +88 -88
- package/packages/theme-chalk/src/switch.scss +3 -3
- package/packages/theme-chalk/src/table-form.scss +1 -1
- package/packages/theme-chalk/src/tabs.scss +87 -87
- package/packages/theme-chalk/src/tips.scss +7 -7
- package/packages/theme-chalk/src/toolbar.scss +179 -179
- package/packages/theme-chalk/src/tree-group.scss +72 -72
- package/packages/theme-chalk/src/wxlogin.scss +3 -3
- package/packages/tips/index.js +5 -5
- package/packages/toolbar/index.js +5 -5
- package/packages/tree/index.js +5 -5
- package/packages/tree-group/index.js +5 -5
- package/packages/upload/index.js +5 -5
- package/packages/upload/src/picture.js +15 -15
- package/packages/wujie/index.js +5 -5
- package/packages/wujie/src/main.vue +146 -145
- package/packages/wxlogin/index.js +5 -5
- package/packages/wxlogin/src/main.vue +128 -128
- package/src/config/api.js +7 -1
- package/src/config/image.js +2 -2
- package/src/index.js +1 -1
- package/src/utils/bus.js +3 -3
- package/src/utils/date-util.js +312 -312
- package/src/utils/http.js +50 -50
- package/src/utils/store.js +21 -21
- package/src/utils/util.js +42 -26
- package/src/utils/webSocket.js +107 -107
- package/packages/theme-chalk/lib/base.css +0 -1
- package/packages/theme-chalk/lib/button-group.css +0 -1
- package/packages/theme-chalk/lib/button.css +0 -1
- package/packages/theme-chalk/lib/calendar.css +0 -1
- package/packages/theme-chalk/lib/calogin.css +0 -0
- package/packages/theme-chalk/lib/card.css +0 -1
- package/packages/theme-chalk/lib/cascader.css +0 -0
- package/packages/theme-chalk/lib/checkbox-group.css +0 -1
- package/packages/theme-chalk/lib/clients.css +0 -1
- package/packages/theme-chalk/lib/data-table-form.css +0 -1
- package/packages/theme-chalk/lib/data-table.css +0 -1
- package/packages/theme-chalk/lib/date-picker.css +0 -1
- package/packages/theme-chalk/lib/dialog.css +0 -1
- package/packages/theme-chalk/lib/enable-drag.css +0 -1
- package/packages/theme-chalk/lib/enterprise.css +0 -1
- package/packages/theme-chalk/lib/error-page.css +0 -1
- package/packages/theme-chalk/lib/flow-chart.css +0 -0
- package/packages/theme-chalk/lib/flow-group.css +0 -1
- package/packages/theme-chalk/lib/flow-list.css +0 -1
- package/packages/theme-chalk/lib/flow.css +0 -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/form.css +0 -1
- package/packages/theme-chalk/lib/handle-user.css +0 -1
- package/packages/theme-chalk/lib/handler.css +0 -1
- package/packages/theme-chalk/lib/icon.css +0 -1
- package/packages/theme-chalk/lib/icons.css +0 -1
- package/packages/theme-chalk/lib/index.css +0 -1
- package/packages/theme-chalk/lib/input-number.css +0 -0
- package/packages/theme-chalk/lib/input.css +0 -1
- package/packages/theme-chalk/lib/label.css +0 -1
- package/packages/theme-chalk/lib/layout.css +0 -1
- package/packages/theme-chalk/lib/login.css +0 -1
- package/packages/theme-chalk/lib/main.css +0 -1
- package/packages/theme-chalk/lib/menu.css +0 -1
- package/packages/theme-chalk/lib/nav.css +0 -1
- package/packages/theme-chalk/lib/notify.css +0 -0
- package/packages/theme-chalk/lib/page.css +0 -1
- package/packages/theme-chalk/lib/pagination.css +0 -1
- package/packages/theme-chalk/lib/player.css +0 -1
- package/packages/theme-chalk/lib/qr-code.css +0 -1
- package/packages/theme-chalk/lib/radio-group.css +0 -1
- package/packages/theme-chalk/lib/retrial-auth.css +0 -1
- package/packages/theme-chalk/lib/select-ganged.css +0 -1
- package/packages/theme-chalk/lib/select.css +0 -1
- package/packages/theme-chalk/lib/selector-panel.css +0 -1
- package/packages/theme-chalk/lib/selector.css +0 -1
- package/packages/theme-chalk/lib/simplicity-top.css +0 -1
- package/packages/theme-chalk/lib/simplicity.css +0 -1
- package/packages/theme-chalk/lib/sizer.css +0 -1
- package/packages/theme-chalk/lib/steps.css +0 -1
- package/packages/theme-chalk/lib/switch.css +0 -1
- package/packages/theme-chalk/lib/table-form.css +0 -0
- package/packages/theme-chalk/lib/tabs-panel.css +0 -0
- package/packages/theme-chalk/lib/tabs.css +0 -1
- package/packages/theme-chalk/lib/tips.css +0 -1
- package/packages/theme-chalk/lib/toolbar.css +0 -1
- package/packages/theme-chalk/lib/tree-group.css +0 -1
- package/packages/theme-chalk/lib/tree.css +0 -1
- package/packages/theme-chalk/lib/upload.css +0 -1
- package/packages/theme-chalk/lib/wujie.css +0 -0
- package/packages/theme-chalk/lib/wxlogin.css +0 -1
|
@@ -288,16 +288,27 @@
|
|
|
288
288
|
:value="items.processDefId"
|
|
289
289
|
></el-option>
|
|
290
290
|
</el-select>
|
|
291
|
-
<
|
|
292
|
-
|
|
293
|
-
|
|
294
|
-
|
|
295
|
-
|
|
296
|
-
|
|
297
|
-
|
|
298
|
-
|
|
299
|
-
|
|
300
|
-
|
|
291
|
+
<div slot="append" v-show="isStartFlowChartView == 'true'">
|
|
292
|
+
<el-button
|
|
293
|
+
icon="es-icon-shu-jituan"
|
|
294
|
+
type="primary"
|
|
295
|
+
@click="
|
|
296
|
+
() => {
|
|
297
|
+
showFlowChart = true;
|
|
298
|
+
}
|
|
299
|
+
"
|
|
300
|
+
></el-button>
|
|
301
|
+
<el-button
|
|
302
|
+
v-show="activitiDefinitionSort"
|
|
303
|
+
icon="es-icon-paixu"
|
|
304
|
+
type="primary"
|
|
305
|
+
@click="
|
|
306
|
+
() => {
|
|
307
|
+
showSort = true;
|
|
308
|
+
}
|
|
309
|
+
"
|
|
310
|
+
></el-button>
|
|
311
|
+
</div>
|
|
301
312
|
</el-input>
|
|
302
313
|
</el-form-item>
|
|
303
314
|
<!-- el-icon-picture -->
|
|
@@ -385,10 +396,11 @@
|
|
|
385
396
|
isSpecial
|
|
386
397
|
"
|
|
387
398
|
>
|
|
399
|
+
<!-- isChooseNextNode == 1 -->
|
|
388
400
|
<el-form-item
|
|
389
401
|
prop="nextOperate"
|
|
390
402
|
label="下步操作"
|
|
391
|
-
v-if="
|
|
403
|
+
v-if="!isHideDefaultOperation"
|
|
392
404
|
:rules="[
|
|
393
405
|
{ required: true, message: `请选择下步操作`, trigger: 'blur' }
|
|
394
406
|
]"
|
|
@@ -708,6 +720,7 @@
|
|
|
708
720
|
!directCreateCircularReadWhenFlowStarted
|
|
709
721
|
"
|
|
710
722
|
ref="processFormIndex"
|
|
723
|
+
:isCancelSecondConfirmationType="isCancelSecondConfirmationType"
|
|
711
724
|
:id="freeStartFlowParams.startFlowBusinessId || businessIds"
|
|
712
725
|
:simpleTips="simpleTips"
|
|
713
726
|
:showTooltip="showTooltip"
|
|
@@ -761,7 +774,10 @@
|
|
|
761
774
|
<span :class="showNews ? 'show' : 'sj'"></span>
|
|
762
775
|
</div>
|
|
763
776
|
<div v-if="showNews" ref="messagebox" style="transition: 1s">
|
|
764
|
-
<el-checkbox-group
|
|
777
|
+
<el-checkbox-group
|
|
778
|
+
@change="handleChangeNotificationType"
|
|
779
|
+
v-model="nextNode.notificationType"
|
|
780
|
+
>
|
|
765
781
|
<el-checkbox
|
|
766
782
|
v-for="item of newsList"
|
|
767
783
|
:key="item.cciValue"
|
|
@@ -1010,6 +1026,7 @@
|
|
|
1010
1026
|
>
|
|
1011
1027
|
<ProcessForm
|
|
1012
1028
|
:id="freeStartFlowParams.startFlowBusinessId || businessIds"
|
|
1029
|
+
:isCancelSecondConfirmationType="isCancelSecondConfirmationType"
|
|
1013
1030
|
:pending-id="pendingId"
|
|
1014
1031
|
:showTooltip="showTooltip"
|
|
1015
1032
|
:simpleTips="simpleTips"
|
|
@@ -1099,6 +1116,21 @@
|
|
|
1099
1116
|
@changeFileNum="(val) => (fileNum = val)"
|
|
1100
1117
|
/>
|
|
1101
1118
|
</es-dialog>
|
|
1119
|
+
<es-dialog
|
|
1120
|
+
v-if="showSort"
|
|
1121
|
+
append-to-body
|
|
1122
|
+
title="流程定义调整排序"
|
|
1123
|
+
class="flow-dialog"
|
|
1124
|
+
:close-on-click-modal="false"
|
|
1125
|
+
:visible.sync="showSort"
|
|
1126
|
+
>
|
|
1127
|
+
<SortFlow
|
|
1128
|
+
:flowTypeCode="flowTypeCode"
|
|
1129
|
+
:defaultProcessKey="defaultProcessKey"
|
|
1130
|
+
@success="sortSuccess"
|
|
1131
|
+
@close="showSort = false"
|
|
1132
|
+
/>
|
|
1133
|
+
</es-dialog>
|
|
1102
1134
|
<es-dialog
|
|
1103
1135
|
v-if="showSendMsg"
|
|
1104
1136
|
append-to-body
|
|
@@ -1183,6 +1215,7 @@ import SelectUser from './selectUser.vue';
|
|
|
1183
1215
|
import Supervise from './supervise.vue';
|
|
1184
1216
|
import circulate from './component/Circulate.vue';
|
|
1185
1217
|
import FreeCirculation from './component/FreeCirculation.vue';
|
|
1218
|
+
import SortFlow from './component/SortFlow.vue';
|
|
1186
1219
|
import {
|
|
1187
1220
|
findSysCodes,
|
|
1188
1221
|
getHandleInfoHtml,
|
|
@@ -1203,6 +1236,7 @@ import {
|
|
|
1203
1236
|
checkBusinessIdStartedReadTransferHandle,
|
|
1204
1237
|
taskHandleHtml,
|
|
1205
1238
|
getNodeInfoForStart,
|
|
1239
|
+
isCancelSecondConfirmation,
|
|
1206
1240
|
getUrgencyLevelChangedNotificationType
|
|
1207
1241
|
} from 'eoss-ui/src/config/api';
|
|
1208
1242
|
import util from 'eoss-ui/src/utils/util';
|
|
@@ -1221,6 +1255,7 @@ export default {
|
|
|
1221
1255
|
[SelectUser.name]: SelectUser,
|
|
1222
1256
|
[TaskUnionExamine.name]: TaskUnionExamine,
|
|
1223
1257
|
[FreeStartFlow.name]: FreeStartFlow,
|
|
1258
|
+
[SortFlow.name]: SortFlow,
|
|
1224
1259
|
circulate,
|
|
1225
1260
|
Preset,
|
|
1226
1261
|
Reset,
|
|
@@ -1309,12 +1344,13 @@ export default {
|
|
|
1309
1344
|
oldNextOperate: '',
|
|
1310
1345
|
showOpinion: true,
|
|
1311
1346
|
submitButtonFunKey: '',
|
|
1347
|
+
activitiDefinitionSort: false,
|
|
1312
1348
|
taskNodeButtons: [],
|
|
1313
1349
|
taskOperationShiftedNodeList: null,
|
|
1314
1350
|
currentNodeEnableItemHandleDescription: false,
|
|
1315
1351
|
startFlowPageEmbeddedIntoStartFlowIndex: false,
|
|
1316
1352
|
pendingItemHandleDescription: '',
|
|
1317
|
-
currentOrgSelectorParams: { filid: '',only_filid:true },
|
|
1353
|
+
currentOrgSelectorParams: { filid: '', only_filid: true },
|
|
1318
1354
|
currentOrgSelectorTabs: ['employee', 'persongroup'],
|
|
1319
1355
|
foreignOrgSelectorTabs: ['enterprise', 'filgroupobj'],
|
|
1320
1356
|
foreignOrgSelectorParams: { filid: 'all', roleid: '' },
|
|
@@ -1329,6 +1365,7 @@ export default {
|
|
|
1329
1365
|
isCanReadTransferHandle: false,
|
|
1330
1366
|
readTransferHandleDisabled: true,
|
|
1331
1367
|
showCustomLimitTimeText: false,
|
|
1368
|
+
showSort: false,
|
|
1332
1369
|
currentOrgDisabledObjId: [],
|
|
1333
1370
|
nextNodeCheckType: 'select',
|
|
1334
1371
|
nextOperateCheckType: 'select',
|
|
@@ -1413,6 +1450,7 @@ export default {
|
|
|
1413
1450
|
showTaskRead: false, // 是否展示分阅按钮
|
|
1414
1451
|
taskReadType: '', //分阅类型
|
|
1415
1452
|
isChooseNextNode: 1, //是否展示下步操作
|
|
1453
|
+
isHideDefaultOperation: false, //是否隐藏默认操作
|
|
1416
1454
|
isHandleExplain: 0, //是否展示办理说明
|
|
1417
1455
|
handleVisible: false,
|
|
1418
1456
|
circulateVisible: false,
|
|
@@ -1420,7 +1458,7 @@ export default {
|
|
|
1420
1458
|
showFlowChart: false, // 展示流程图弹窗
|
|
1421
1459
|
isReject: false, // 是否驳回
|
|
1422
1460
|
showTaskUnionExamine: false, //展示联合审核弹窗
|
|
1423
|
-
charUrl:
|
|
1461
|
+
charUrl: util.win.location.origin, //util.win.location.origin,
|
|
1424
1462
|
endFlow: false, // 是否结束流程
|
|
1425
1463
|
isCurrentNodeForbiddenChangeCandidate: 0, //是否禁止选择办理人
|
|
1426
1464
|
isSubmitButtonShowAgreeAndDisagree: 0, //是否展示同意和不同意按钮
|
|
@@ -1463,6 +1501,7 @@ export default {
|
|
|
1463
1501
|
isShowNextUser: true, //是否展示下步办理人
|
|
1464
1502
|
nextUserTypes: ['employee', 'persongroup'], //下步办理人类型配置
|
|
1465
1503
|
nextUserTabs: {}, //下步办理人权限配置
|
|
1504
|
+
isCancelSecondConfirmationType: false,
|
|
1466
1505
|
presetReadUserId: [],
|
|
1467
1506
|
nextNode: {
|
|
1468
1507
|
nextNodeId: '', // 下步节点
|
|
@@ -1513,6 +1552,7 @@ export default {
|
|
|
1513
1552
|
this.currentOrgSelectorParams.filid = JSON.parse(
|
|
1514
1553
|
util.getStorage('mainConfig')
|
|
1515
1554
|
).userModel.orgId;
|
|
1555
|
+
this.getIsCancelSecondConfirmation();
|
|
1516
1556
|
this.foreignOrgSelectorParams.roleid =
|
|
1517
1557
|
this.currentOrgSelectorParams.roleid = this.selectorParams.roleid;
|
|
1518
1558
|
this.nextNode.nextNodeId = this.nextNodeId;
|
|
@@ -1650,6 +1690,21 @@ export default {
|
|
|
1650
1690
|
}
|
|
1651
1691
|
},
|
|
1652
1692
|
methods: {
|
|
1693
|
+
sortSuccess(list) {
|
|
1694
|
+
this.nodeInfo.option = list;
|
|
1695
|
+
if (this.defaultProcessKey == '') {
|
|
1696
|
+
this.nodeInfo.nextNode = this.nodeInfo.option[0].processDefId;
|
|
1697
|
+
}
|
|
1698
|
+
this.showSort = false;
|
|
1699
|
+
// this.$message.success('排序成功');
|
|
1700
|
+
},
|
|
1701
|
+
getIsCancelSecondConfirmation() {
|
|
1702
|
+
util.ajax({ url: isCancelSecondConfirmation }).then((res) => {
|
|
1703
|
+
if (res.status == 'success') {
|
|
1704
|
+
this.isCancelSecondConfirmationType = res.data === false;
|
|
1705
|
+
}
|
|
1706
|
+
});
|
|
1707
|
+
},
|
|
1653
1708
|
limitTimevalidate() {
|
|
1654
1709
|
let validSate = true;
|
|
1655
1710
|
this.$refs.nextNode.validate((valid) => {
|
|
@@ -1794,11 +1849,11 @@ export default {
|
|
|
1794
1849
|
this.processFormType = 'readTransfer';
|
|
1795
1850
|
this.handleVisible = true;
|
|
1796
1851
|
},
|
|
1797
|
-
handleChangeNotificationType(){
|
|
1798
|
-
if(this.nextNode.notificationType.length > 0){
|
|
1852
|
+
handleChangeNotificationType() {
|
|
1853
|
+
if (this.nextNode.notificationType.length > 0) {
|
|
1799
1854
|
this.$nextTick(() => {
|
|
1800
|
-
|
|
1801
|
-
|
|
1855
|
+
this.$refs.esContent.scrollTop += this.$refs.messagebox.clientHeight;
|
|
1856
|
+
});
|
|
1802
1857
|
}
|
|
1803
1858
|
},
|
|
1804
1859
|
showMessage() {
|
|
@@ -2686,7 +2741,7 @@ export default {
|
|
|
2686
2741
|
this.loading.close();
|
|
2687
2742
|
if (status === 'success') {
|
|
2688
2743
|
this.isCurrentNodeForbiddenChangeCandidate =
|
|
2689
|
-
|
|
2744
|
+
data.nodeExtAttr.isCurrentNodeForbiddenChangeCandidate;
|
|
2690
2745
|
this.currentNodeEnableItemHandleDescription =
|
|
2691
2746
|
data.nodeExtAttr.currentNodeEnableItemHandleDescription == 1;
|
|
2692
2747
|
this.enableCustomLimitTimeSetting =
|
|
@@ -3090,7 +3145,7 @@ export default {
|
|
|
3090
3145
|
currentOrgparams[i] == 'my'
|
|
3091
3146
|
? choiceOrgId
|
|
3092
3147
|
: currentOrgparams[i],
|
|
3093
|
-
only_filid:true
|
|
3148
|
+
only_filid: true
|
|
3094
3149
|
};
|
|
3095
3150
|
});
|
|
3096
3151
|
}
|
|
@@ -3104,7 +3159,9 @@ export default {
|
|
|
3104
3159
|
filid:
|
|
3105
3160
|
foreignOrgparams[i] == 'my'
|
|
3106
3161
|
? choiceOrgId
|
|
3107
|
-
:x == 'filgroup'
|
|
3162
|
+
: x == 'filgroup'
|
|
3163
|
+
? ''
|
|
3164
|
+
: foreignOrgparams[i] == 'nofilidorg' ||
|
|
3108
3165
|
foreignOrgparams[i] == 'nofiliddept'
|
|
3109
3166
|
? 'all'
|
|
3110
3167
|
: foreignOrgparams[i],
|
|
@@ -3208,7 +3265,7 @@ export default {
|
|
|
3208
3265
|
this.nodeFixedOpinionSelectList.push({ content: x });
|
|
3209
3266
|
});
|
|
3210
3267
|
}
|
|
3211
|
-
|
|
3268
|
+
|
|
3212
3269
|
this.value = opinion || '';
|
|
3213
3270
|
this.nodeDefaultSubmitOpinion =
|
|
3214
3271
|
nodeInfoMap.nodeExtAttr.nodeDefaultSubmitOpinion;
|
|
@@ -3220,7 +3277,9 @@ export default {
|
|
|
3220
3277
|
nodeInfoMap.nodeExtAttr.nodeDefaultRejectOpinion;
|
|
3221
3278
|
this.isOpinionRequired =
|
|
3222
3279
|
nodeInfoMap.nodeExtAttr.isOpinionRequired;
|
|
3223
|
-
|
|
3280
|
+
this.isChooseNextNode = nodeInfoMap.nodeExtAttr.isChooseNextNode;
|
|
3281
|
+
this.isHideDefaultOperation =
|
|
3282
|
+
nodeInfoMap.nodeExtAttr.isHideDefaultOperation == 1;
|
|
3224
3283
|
this.defaultNextNode = nodeInfoMap.nodeExtAttr.defaultNextNode;
|
|
3225
3284
|
if (nodeInfoMap.nodeExtAttr.defaultNextNode) {
|
|
3226
3285
|
let defaultNode = this.nodeInfos.filter(
|
|
@@ -3443,7 +3502,7 @@ export default {
|
|
|
3443
3502
|
} else {
|
|
3444
3503
|
this.startFlowPageEmbeddedIntoStartFlowIndex =
|
|
3445
3504
|
data.startFlowPageEmbeddedIntoStartFlowIndex;
|
|
3446
|
-
|
|
3505
|
+
this.activitiDefinitionSort = data.activitiDefinitionSort;
|
|
3447
3506
|
this.nodeInfo.option = data.definitionList;
|
|
3448
3507
|
this.nodeInfo.nextNode = data.definitionList.filter(
|
|
3449
3508
|
(item) => item.processDefKey == this.defaultProcessKey
|
|
@@ -3552,6 +3611,8 @@ export default {
|
|
|
3552
3611
|
this.sendData(type);
|
|
3553
3612
|
}
|
|
3554
3613
|
},
|
|
3614
|
+
// 提交流程前验证
|
|
3615
|
+
beforeSubProcess() {},
|
|
3555
3616
|
// 提交流程
|
|
3556
3617
|
/**
|
|
3557
3618
|
* subProcess
|
|
@@ -3713,7 +3774,10 @@ export default {
|
|
|
3713
3774
|
this.$refs['nextNode'].validate(async (valid) => {
|
|
3714
3775
|
if (valid) {
|
|
3715
3776
|
if (this.isFlow) {
|
|
3716
|
-
if (
|
|
3777
|
+
if (
|
|
3778
|
+
this.isOpinionRequired &&
|
|
3779
|
+
!this.$refs.commonOpinions.validate()
|
|
3780
|
+
) {
|
|
3717
3781
|
this.$message.warning('请输入审批意见');
|
|
3718
3782
|
return;
|
|
3719
3783
|
}
|
|
@@ -3767,6 +3831,129 @@ export default {
|
|
|
3767
3831
|
) {
|
|
3768
3832
|
delete this.nextNode.nextNodeId;
|
|
3769
3833
|
}
|
|
3834
|
+
if (this.isCancelSecondConfirmationType) {
|
|
3835
|
+
this.$confirm('确认提交吗?', '提示', {
|
|
3836
|
+
confirmButtonText: '确定',
|
|
3837
|
+
cancelButtonText: '取消',
|
|
3838
|
+
type: 'warning'
|
|
3839
|
+
}).then(async () => {
|
|
3840
|
+
if (freetype != 'multiInsMidwayWithSubmitScene') {
|
|
3841
|
+
await this.saveInfo('subMit');
|
|
3842
|
+
this.loading = util.loading(this.$loading, '加载中...');
|
|
3843
|
+
}
|
|
3844
|
+
|
|
3845
|
+
let notificationType = '';
|
|
3846
|
+
notificationType = this.nextNode.notificationType.join(',');
|
|
3847
|
+
addSignUserId = addSignUserId.join(',');
|
|
3848
|
+
removeSignUserId = removeSignUserId.join(',');
|
|
3849
|
+
if (!this.isCanPreAddSign || this.nextNode.isAddSign != '1') {
|
|
3850
|
+
delete this.nextNode.addSignMode;
|
|
3851
|
+
}
|
|
3852
|
+
|
|
3853
|
+
let params = {
|
|
3854
|
+
...this.nextNode,
|
|
3855
|
+
nextOperate:
|
|
3856
|
+
this.oldNextOperate !== ''
|
|
3857
|
+
? this.oldNextOperate
|
|
3858
|
+
: this.nextNode.nextOperate,
|
|
3859
|
+
pendingId: this.pendingId,
|
|
3860
|
+
opinion:
|
|
3861
|
+
this.isForceDisplayDefaultOptionForPrefix &&
|
|
3862
|
+
!this.value.startsWith(this.nodeDefaultSubmitOpinion)
|
|
3863
|
+
? this.nodeDefaultSubmitOpinion + this.value
|
|
3864
|
+
: this.value,
|
|
3865
|
+
userId: util.getStorage('userId'),
|
|
3866
|
+
nextUserId: this.multiple
|
|
3867
|
+
? nextUserId.join(',')
|
|
3868
|
+
: this.nextNode.nextUserId,
|
|
3869
|
+
addSignUserId,
|
|
3870
|
+
customPresetUserJson: JSON.stringify(this.presetList),
|
|
3871
|
+
presetUserJson: JSON.stringify(this.presetUserJson),
|
|
3872
|
+
removeSignUserId,
|
|
3873
|
+
nextReadUserId: this.readMultiple
|
|
3874
|
+
? this.mixReadList && this.mixReadList.join('|')
|
|
3875
|
+
: this.nextNode.nextReadUserId,
|
|
3876
|
+
nextOrgId: !this.isShowNextUser
|
|
3877
|
+
? this.multiple
|
|
3878
|
+
? this.mixOrgIdList && this.mixOrgIdList.join('|')
|
|
3879
|
+
: this.nextNode.nextOrgId
|
|
3880
|
+
: '',
|
|
3881
|
+
presetReadUserId:
|
|
3882
|
+
this.mixPresetList && this.mixPresetList.length > 0
|
|
3883
|
+
? this.mixPresetList.join('|')
|
|
3884
|
+
: this.nextNode.presetReadUserId.join(','),
|
|
3885
|
+
notificationType
|
|
3886
|
+
};
|
|
3887
|
+
if (this.activeNames != '1') delete params.customPresetUserJson;
|
|
3888
|
+
delete params.customLimitTimeText;
|
|
3889
|
+
if (this.nextNode.isRemoveSign != '1') {
|
|
3890
|
+
delete params.removeSignUserId;
|
|
3891
|
+
}
|
|
3892
|
+
if (this.nextNode.isAddSign != '1') {
|
|
3893
|
+
delete params.addSignUserId;
|
|
3894
|
+
}
|
|
3895
|
+
if (!this.isSpecial) {
|
|
3896
|
+
delete params.nextUserId;
|
|
3897
|
+
}
|
|
3898
|
+
if (freetype === 'multiInsMidwayWithSubmitScene') {
|
|
3899
|
+
params.isSubFlow = this.taskExamineInfo.isSubFlow;
|
|
3900
|
+
this.taskParams = params;
|
|
3901
|
+
return;
|
|
3902
|
+
}
|
|
3903
|
+
this.loading = util.loading(this.$loading, '提交中...');
|
|
3904
|
+
const {
|
|
3905
|
+
isEndUserTask,
|
|
3906
|
+
choiceOrgId,
|
|
3907
|
+
choiceDeptId,
|
|
3908
|
+
pOrgId,
|
|
3909
|
+
taskExamineInfo,
|
|
3910
|
+
currentNodeIsCircularReadNode,
|
|
3911
|
+
needRetrialAuth,
|
|
3912
|
+
circularReadParamsMap,
|
|
3913
|
+
currentNodeEnableItemHandleDescription
|
|
3914
|
+
} = this;
|
|
3915
|
+
params.isEndUserTask = isEndUserTask;
|
|
3916
|
+
params.choiceOrgId = choiceOrgId;
|
|
3917
|
+
params.choiceDeptId = choiceDeptId;
|
|
3918
|
+
params.pOrgId = pOrgId;
|
|
3919
|
+
params.processType = taskExamineInfo.processType;
|
|
3920
|
+
params.businessId = taskExamineInfo.businessId;
|
|
3921
|
+
params.appId = taskExamineInfo.appId;
|
|
3922
|
+
params.processDefinitionId = taskExamineInfo.processDefinitionId;
|
|
3923
|
+
params.isSubFlow = taskExamineInfo.isSubFlow;
|
|
3924
|
+
params.nodeId = taskExamineInfo.nodeId;
|
|
3925
|
+
params.needRetrialAuth = needRetrialAuth;
|
|
3926
|
+
params.taskHandleSubmitMode = currentNodeIsCircularReadNode
|
|
3927
|
+
? 'circularReadMode'
|
|
3928
|
+
: undefined;
|
|
3929
|
+
if (currentNodeIsCircularReadNode) {
|
|
3930
|
+
params.orgRoleCode =
|
|
3931
|
+
circularReadParamsMap.circularReadOrgRoleCode;
|
|
3932
|
+
}
|
|
3933
|
+
if (!currentNodeEnableItemHandleDescription) {
|
|
3934
|
+
delete params.nextItemHandleDescription;
|
|
3935
|
+
}
|
|
3936
|
+
return util
|
|
3937
|
+
.ajax({ url: taskHandleHtml, method: 'post', data: params })
|
|
3938
|
+
.then((res) => {
|
|
3939
|
+
const { status, message } = res;
|
|
3940
|
+
this.loading.close();
|
|
3941
|
+
if (status === 'success') {
|
|
3942
|
+
this.flowSuccess();
|
|
3943
|
+
} else {
|
|
3944
|
+
this.$message.error(message || '系统错误,请联系管理员!');
|
|
3945
|
+
this.$emit('error');
|
|
3946
|
+
}
|
|
3947
|
+
})
|
|
3948
|
+
.catch((err) => {
|
|
3949
|
+
this.loading.close();
|
|
3950
|
+
if (err.message && err.message !== 'canceled') {
|
|
3951
|
+
this.$message.error(err.message);
|
|
3952
|
+
}
|
|
3953
|
+
});
|
|
3954
|
+
});
|
|
3955
|
+
return;
|
|
3956
|
+
}
|
|
3770
3957
|
if (freetype != 'multiInsMidwayWithSubmitScene') {
|
|
3771
3958
|
await this.saveInfo('subMit');
|
|
3772
3959
|
this.loading = util.loading(this.$loading, '加载中...');
|
|
@@ -17,7 +17,7 @@
|
|
|
17
17
|
<div
|
|
18
18
|
:style="`height:${
|
|
19
19
|
showBtn ? '430px' : 'auto'
|
|
20
|
-
}; overflow-y:${showBtn ? 'auto' : 'hidden'} ; margin-bottom: 10px
|
|
20
|
+
}; overflow-y:${showBtn ? 'auto' : 'hidden'} ; margin-bottom: 10px;overflow-x: hidden;`"
|
|
21
21
|
>
|
|
22
22
|
<el-form-item
|
|
23
23
|
v-show="showBtn"
|
|
@@ -472,6 +472,10 @@ export default {
|
|
|
472
472
|
type: String,
|
|
473
473
|
default: ''
|
|
474
474
|
},
|
|
475
|
+
isCancelSecondConfirmationType:{
|
|
476
|
+
type: Boolean,
|
|
477
|
+
default: false
|
|
478
|
+
},
|
|
475
479
|
isFreeStartFlow: {
|
|
476
480
|
type: Boolean,
|
|
477
481
|
default: false
|
|
@@ -1031,6 +1035,147 @@ export default {
|
|
|
1031
1035
|
if((this.isHideOtherOrg || this.isHideCurrentOrg) && !nextCurrentOrgObj && !nextOtherOrgObj){
|
|
1032
1036
|
return this.$message.warning('请选择办理对象');
|
|
1033
1037
|
}
|
|
1038
|
+
if(this.isCancelSecondConfirmationType){
|
|
1039
|
+
this.$confirm('确认提交吗?', '提示', {
|
|
1040
|
+
confirmButtonText: '确定',
|
|
1041
|
+
cancelButtonText: '取消',
|
|
1042
|
+
type: 'warning'
|
|
1043
|
+
}).then( () => {
|
|
1044
|
+
if (this.showBtn) {
|
|
1045
|
+
this.loading = true;
|
|
1046
|
+
} else {
|
|
1047
|
+
this.allLoading = util.loading(this.$loading, '加载中...');
|
|
1048
|
+
}
|
|
1049
|
+
let newNextUser = [];
|
|
1050
|
+
if (this.multiple) {
|
|
1051
|
+
nextUser && nextUser.map((item) => newNextUser.push(item));
|
|
1052
|
+
}
|
|
1053
|
+
let newNoticeType = '';
|
|
1054
|
+
if (noticeType) {
|
|
1055
|
+
newNoticeType = noticeType.join(',');
|
|
1056
|
+
}
|
|
1057
|
+
let params = {
|
|
1058
|
+
processDefinitionId: this.processDefinitionId,
|
|
1059
|
+
nextUserId: this.multiple ? newNextUser.join(',') : nextUser,
|
|
1060
|
+
nextNodeId: nextNode,
|
|
1061
|
+
businessId: this.businessId,
|
|
1062
|
+
notificationType: newNoticeType,
|
|
1063
|
+
userId: util.getStorage('userId'),
|
|
1064
|
+
notificationMsg: noticeInfo,
|
|
1065
|
+
customPresetUserJson: JSON.stringify(this.presetList),
|
|
1066
|
+
presetUserJson: JSON.stringify(this.presetUserJson),
|
|
1067
|
+
nextReadUserId: this.readMultiple
|
|
1068
|
+
? this.mixReadList && this.mixReadList.join('|')
|
|
1069
|
+
: nextReadUserId,
|
|
1070
|
+
nextOrgId: !this.isShowNextUser
|
|
1071
|
+
? this.multiple
|
|
1072
|
+
? this.mixOrgIdList && this.mixOrgIdList.join('|')
|
|
1073
|
+
: nextOrgId
|
|
1074
|
+
: '',
|
|
1075
|
+
handleExplain: handleExplain,
|
|
1076
|
+
presetReadUserId:
|
|
1077
|
+
this.mixPresetList && this.mixPresetList.length > 0
|
|
1078
|
+
? this.mixPresetList.join('|')
|
|
1079
|
+
: presetReadUserId.join(','),
|
|
1080
|
+
opinion: this.newOpinion || newOpinion
|
|
1081
|
+
};
|
|
1082
|
+
if (this.enableCustomLimitTimeSetting) {
|
|
1083
|
+
params.customLimitTime = customLimitTime;
|
|
1084
|
+
if (!customLimitTime) {
|
|
1085
|
+
this.$message.warning('请选择或输入限时办理的天数');
|
|
1086
|
+
this.nextNode.customLimitTime = '';
|
|
1087
|
+
return;
|
|
1088
|
+
} else if (
|
|
1089
|
+
!Number(customLimitTime) ||
|
|
1090
|
+
customLimitTime.indexOf('.') != -1 ||
|
|
1091
|
+
Number(customLimitTime) < 0
|
|
1092
|
+
) {
|
|
1093
|
+
this.$message.warning('请输入正确的天数');
|
|
1094
|
+
this.nextNode.customLimitTime = '';
|
|
1095
|
+
return;
|
|
1096
|
+
}
|
|
1097
|
+
}
|
|
1098
|
+
if(this.isHideCurrentOrg){
|
|
1099
|
+
params.nextCurrentOrgObj = nextCurrentOrgObj
|
|
1100
|
+
}
|
|
1101
|
+
if(this.isHideOtherOrg){
|
|
1102
|
+
params.nextOtherOrgObj = nextOtherOrgObj
|
|
1103
|
+
}
|
|
1104
|
+
if (this.activeNames != '1') delete params.customPresetUserJson;
|
|
1105
|
+
if (this.isFreeStartFlow || this.formType === 'readTransfer') {
|
|
1106
|
+
let newParm = {};
|
|
1107
|
+
newParm.copyHistory = this.copyHistory === 'needCopyPendedHistory';
|
|
1108
|
+
newParm.startFlowParamJson = params;
|
|
1109
|
+
// newParm.startFlowParamJson.businessId = this.id; //this.id
|
|
1110
|
+
newParm.startFlowParamJson.taskExamineParam = {
|
|
1111
|
+
startFlowFirstNodeName: this.taskExamineParam
|
|
1112
|
+
};
|
|
1113
|
+
newParm.startFlowParamJson = JSON.stringify(
|
|
1114
|
+
newParm.startFlowParamJson
|
|
1115
|
+
);
|
|
1116
|
+
for (let key in this.taskParams) {
|
|
1117
|
+
if (Array.isArray(this.taskParams[key])) {
|
|
1118
|
+
this.taskParams[key] =
|
|
1119
|
+
this.taskParams[key].length > 0
|
|
1120
|
+
? this.taskParams[key].join(',')
|
|
1121
|
+
: '';
|
|
1122
|
+
}
|
|
1123
|
+
}
|
|
1124
|
+
|
|
1125
|
+
newParm.submitTaskParamJson = JSON.stringify(this.taskParams);
|
|
1126
|
+
if (this.formType == 'readTransfer') {
|
|
1127
|
+
newParm.readTransferHandleStartFlowParamJson =
|
|
1128
|
+
JSON.stringify(params);
|
|
1129
|
+
newParm.taskReadEndParamJson = JSON.stringify(this.taskParams);
|
|
1130
|
+
delete newParm.copyHistory;
|
|
1131
|
+
delete newParm.startFlowParamJson;
|
|
1132
|
+
delete newParm.submitTaskParamJson;
|
|
1133
|
+
}
|
|
1134
|
+
params = newParm;
|
|
1135
|
+
}
|
|
1136
|
+
if (this.copyHistory && !this.isFreeStartFlow) {
|
|
1137
|
+
params.pendingId = this.pendingId;
|
|
1138
|
+
delete params.businessId;
|
|
1139
|
+
}
|
|
1140
|
+
util
|
|
1141
|
+
.ajax({
|
|
1142
|
+
url: this.isFreeStartFlow
|
|
1143
|
+
? freeStartFlowWithSubmitTask
|
|
1144
|
+
: this.formType == 'readTransfer'
|
|
1145
|
+
? startReadTransferHandleFlowWithTaskReadEnd
|
|
1146
|
+
: this.copyHistory
|
|
1147
|
+
? freeStartFlow
|
|
1148
|
+
: register,
|
|
1149
|
+
method: 'post',
|
|
1150
|
+
data: params
|
|
1151
|
+
})
|
|
1152
|
+
.then((res) => {
|
|
1153
|
+
const { status, message } = res;
|
|
1154
|
+
if (this.showBtn) {
|
|
1155
|
+
this.loading = false;
|
|
1156
|
+
} else {
|
|
1157
|
+
this.allLoading.close();
|
|
1158
|
+
}
|
|
1159
|
+
if (status === 'success' || res.rCode == 0) {
|
|
1160
|
+
this.quit(true);
|
|
1161
|
+
this.simpleTips && this.$message.success('操作成功');
|
|
1162
|
+
} else {
|
|
1163
|
+
this.$message.error(message || '系统错误,请联系管理员!');
|
|
1164
|
+
}
|
|
1165
|
+
})
|
|
1166
|
+
.catch((err) => {
|
|
1167
|
+
if (this.showBtn) {
|
|
1168
|
+
this.loading = false;
|
|
1169
|
+
} else {
|
|
1170
|
+
this.allLoading.close();
|
|
1171
|
+
}
|
|
1172
|
+
if (err.message && err.message !== 'canceled') {
|
|
1173
|
+
this.$message.error(err.message);
|
|
1174
|
+
}
|
|
1175
|
+
});
|
|
1176
|
+
})
|
|
1177
|
+
return
|
|
1178
|
+
}
|
|
1034
1179
|
if (this.showBtn) {
|
|
1035
1180
|
this.loading = true;
|
|
1036
1181
|
} else {
|
|
@@ -1430,15 +1575,18 @@ export default {
|
|
|
1430
1575
|
this.isCdjxjTaskHandle = data.isCdjxjTaskHandle;
|
|
1431
1576
|
if (this.isChooseNextNode == 1) {
|
|
1432
1577
|
this.operationList = [
|
|
1433
|
-
{ key: 0, value: '默认', list: [] },
|
|
1578
|
+
// { key: 0, value: '默认', list: [] },
|
|
1434
1579
|
{ key: 1, value: '自定义', list: [] }
|
|
1435
1580
|
];
|
|
1581
|
+
if(data.nodeInfoMap.nodeExtAttr.isHideDefaultOperation != 1){
|
|
1582
|
+
this.operationList.unshift({ key: 0, value: '默认', list: [] });
|
|
1583
|
+
}
|
|
1436
1584
|
let arr = [];
|
|
1437
1585
|
for (let key in data.taskNodeMap) {
|
|
1438
1586
|
arr.push({ nodeName: data.taskNodeMap[key], nodeId: key });
|
|
1439
1587
|
}
|
|
1440
|
-
this.operationList[0].list = data.nextNodeList;
|
|
1441
|
-
this.operationList[
|
|
1588
|
+
// this.operationList[0].list = data.nextNodeList;
|
|
1589
|
+
this.operationList[0].list = arr;
|
|
1442
1590
|
if (this.isHideDefaultOperation != 1) {
|
|
1443
1591
|
this.nextNode.nextOperate = 0;
|
|
1444
1592
|
this.nextNode.nodeInfo = this.operationList[0].list;
|
|
@@ -1457,7 +1605,7 @@ export default {
|
|
|
1457
1605
|
) {
|
|
1458
1606
|
// this.nextNode.nodeInfo = data.nextNodeList
|
|
1459
1607
|
this.nextNode.nextOperate = 1;
|
|
1460
|
-
this.nextNode.nodeInfo = this.operationList[
|
|
1608
|
+
this.nextNode.nodeInfo = this.operationList[0].list;
|
|
1461
1609
|
if (this.nextNode.nodeInfo.length > 0) {
|
|
1462
1610
|
let defaultNodeData = data.nextNodeList.filter(
|
|
1463
1611
|
(x) => x.nodeId == this.defaultNextNode
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import EsFlowGroup from './src/main';
|
|
2
|
-
|
|
3
|
-
EsFlowGroup.install = Vue => Vue.component(EsFlowGroup.name, EsFlowGroup);
|
|
4
|
-
|
|
5
|
-
export default EsFlowGroup;
|
|
1
|
+
import EsFlowGroup from './src/main';
|
|
2
|
+
|
|
3
|
+
EsFlowGroup.install = Vue => Vue.component(EsFlowGroup.name, EsFlowGroup);
|
|
4
|
+
|
|
5
|
+
export default EsFlowGroup;
|
|
@@ -654,7 +654,7 @@ export default {
|
|
|
654
654
|
if (this.otherValidate) {
|
|
655
655
|
return new Promise((resolve, reject) => {
|
|
656
656
|
esFlowForm
|
|
657
|
-
.submitData(undefined, false,
|
|
657
|
+
.submitData(undefined, false, res, res === 1)
|
|
658
658
|
.then(() => {
|
|
659
659
|
// 如果submitData验证通过,则执行otherValidate验证
|
|
660
660
|
this.otherValidate(resolve, reject);
|
|
@@ -665,7 +665,7 @@ export default {
|
|
|
665
665
|
});
|
|
666
666
|
});
|
|
667
667
|
}
|
|
668
|
-
return esFlowForm.submitData(undefined, false,
|
|
668
|
+
return esFlowForm.submitData(undefined, false, res, res === 1);
|
|
669
669
|
},
|
|
670
670
|
handleTaskRead(res) {
|
|
671
671
|
if (res.data.taskExamine && res.data.taskExamine.appId) {
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import EsFlowList from './src/main';
|
|
2
|
-
|
|
3
|
-
EsFlowList.install = Vue => Vue.component(EsFlowList.name, EsFlowList);
|
|
4
|
-
|
|
5
|
-
export default EsFlowList;
|
|
1
|
+
import EsFlowList from './src/main';
|
|
2
|
+
|
|
3
|
+
EsFlowList.install = Vue => Vue.component(EsFlowList.name, EsFlowList);
|
|
4
|
+
|
|
5
|
+
export default EsFlowList;
|