cloud-web-corejs 1.0.149 → 1.0.151
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/package.json +1 -1
- package/src/api/user.js +8 -0
- package/src/components/VabUpload/mixins.js +2 -2
- package/src/components/VabUpload/view.vue +2 -0
- package/src/components/wf/mixins/setCandidateDialog2.js +1 -1
- package/src/components/wf/setCandidateDialog2.vue +76 -66
- package/src/components/wf/wfStartDialog.vue +2 -6
|
@@ -1,68 +1,80 @@
|
|
|
1
1
|
<template>
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
}}
|
|
18
|
-
</span>
|
|
19
|
-
</template>
|
|
20
|
-
<div class="cont" style="height: 450px">
|
|
21
|
-
<vxe-grid
|
|
22
|
-
ref="table-m1"
|
|
23
|
-
:data="tableData"
|
|
24
|
-
v-bind="vxeOption"
|
|
25
|
-
@resizable-change="$vxeTableUtil.onColumnWitchChange"
|
|
26
|
-
@custom="$vxeTableUtil.customHandle"
|
|
27
|
-
>
|
|
28
|
-
<template #wfTaskCandidates="{ row }">
|
|
29
|
-
{{ getUsernames(row) }}
|
|
30
|
-
</template>
|
|
31
|
-
<template #operate="{ row, rowIndex }">
|
|
32
|
-
<a
|
|
33
|
-
@click="openUserDialig(row, rowIndex)"
|
|
34
|
-
class="a-link"
|
|
35
|
-
v-if="row.modifyCandidates"
|
|
36
|
-
>
|
|
37
|
-
<el-tooltip
|
|
38
|
-
:enterable="false"
|
|
39
|
-
effect="dark"
|
|
40
|
-
:content="$t2('设置候选人', 'components.wf.modifyCandidate')"
|
|
41
|
-
placement="top"
|
|
42
|
-
popper-class="tooltip-skin"
|
|
43
|
-
>
|
|
44
|
-
<div>
|
|
45
|
-
<i class="el-icon-edit"></i
|
|
46
|
-
><span>{{
|
|
47
|
-
$t2("设置候选人", "components.wf.modifyCandidate")
|
|
48
|
-
}}</span>
|
|
49
|
-
</div>
|
|
50
|
-
</el-tooltip>
|
|
51
|
-
</a>
|
|
52
|
-
</template>
|
|
53
|
-
</vxe-grid>
|
|
54
|
-
</div>
|
|
55
|
-
<span slot="footer" class="dialog-footer">
|
|
56
|
-
<el-button type="primary" plain class="button-sty" @click="closeWin">
|
|
57
|
-
<i class="el-icon-close el-icon"></i>
|
|
58
|
-
{{ $t2("取 消", "system.button.cancel2") }}
|
|
59
|
-
</el-button>
|
|
60
|
-
<el-button type="primary" @click="confirmDialog" class="button-sty">
|
|
61
|
-
<i class="el-icon-check el-icon"></i>
|
|
62
|
-
{{ $t2("确 定", "system.button.confirm2") }}
|
|
63
|
-
</el-button>
|
|
2
|
+
<el-dialog
|
|
3
|
+
:title="$t2('查看候选人', 'components.wf.setCandidateTitle')"
|
|
4
|
+
:close-on-click-modal="falseValue"
|
|
5
|
+
:visible.sync="showDialog"
|
|
6
|
+
:modal="falseValue"
|
|
7
|
+
custom-class="dialog-style list-dialog dialog-checkbox pd_0"
|
|
8
|
+
width="1200px"
|
|
9
|
+
@close="closeWin"
|
|
10
|
+
v-el-drag-dialog
|
|
11
|
+
v-el-dialog-center
|
|
12
|
+
:append-to-body="true"
|
|
13
|
+
>
|
|
14
|
+
<template #title>
|
|
15
|
+
<span class="el-dialog__title">
|
|
16
|
+
{{ $t2("查看候选人", "components.wf.setCandidateTitle") }}
|
|
64
17
|
</span>
|
|
65
|
-
|
|
18
|
+
</template>
|
|
19
|
+
<div class="cont" style="height: 450px">
|
|
20
|
+
<vxe-grid
|
|
21
|
+
ref="table-m1"
|
|
22
|
+
:data="tableData"
|
|
23
|
+
v-bind="vxeOption"
|
|
24
|
+
@resizable-change="$vxeTableUtil.onColumnWitchChange"
|
|
25
|
+
@custom="$vxeTableUtil.customHandle"
|
|
26
|
+
>
|
|
27
|
+
<template #form>
|
|
28
|
+
<div class="clearfix screen-btns" v-show="showPreWfNodesButton && showModifyButton">
|
|
29
|
+
<div class="fl" v-show="showModifyButton">
|
|
30
|
+
<vxe-button
|
|
31
|
+
icon="el-icon-user"
|
|
32
|
+
class="button-sty"
|
|
33
|
+
@click="fillCandidates()"
|
|
34
|
+
type="text"
|
|
35
|
+
status="primary"
|
|
36
|
+
plain
|
|
37
|
+
>{{ $t1("获取上次候选人") }}
|
|
38
|
+
</vxe-button>
|
|
39
|
+
</div>
|
|
40
|
+
</div>
|
|
41
|
+
</template>
|
|
42
|
+
<template #wfTaskCandidates="{ row }">
|
|
43
|
+
{{ getUsernames(row) }}
|
|
44
|
+
</template>
|
|
45
|
+
<template #operate="{ row, rowIndex }">
|
|
46
|
+
<a
|
|
47
|
+
@click="openUserDialig(row, rowIndex)"
|
|
48
|
+
class="a-link"
|
|
49
|
+
v-if="row.modifyCandidates"
|
|
50
|
+
>
|
|
51
|
+
<el-tooltip
|
|
52
|
+
:enterable="false"
|
|
53
|
+
effect="dark"
|
|
54
|
+
:content="$t2('设置候选人', 'components.wf.modifyCandidate')"
|
|
55
|
+
placement="top"
|
|
56
|
+
popper-class="tooltip-skin"
|
|
57
|
+
>
|
|
58
|
+
<div>
|
|
59
|
+
<i class="el-icon-edit"></i
|
|
60
|
+
><span>{{ $t2("设置候选人", "components.wf.modifyCandidate") }}</span>
|
|
61
|
+
</div>
|
|
62
|
+
</el-tooltip>
|
|
63
|
+
</a>
|
|
64
|
+
</template>
|
|
65
|
+
</vxe-grid>
|
|
66
|
+
</div>
|
|
67
|
+
<span slot="footer" class="dialog-footer">
|
|
68
|
+
<el-button type="primary" plain class="button-sty" @click="closeWin">
|
|
69
|
+
<i class="el-icon-close el-icon"></i>
|
|
70
|
+
{{ $t2("取 消", "system.button.cancel2") }}
|
|
71
|
+
</el-button>
|
|
72
|
+
<el-button type="primary" @click="confirmDialog" class="button-sty">
|
|
73
|
+
<i class="el-icon-check el-icon"></i>
|
|
74
|
+
{{ $t2("确 定", "system.button.confirm2") }}
|
|
75
|
+
</el-button>
|
|
76
|
+
</span>
|
|
77
|
+
<user-dialog
|
|
66
78
|
v-if="showUserDialog"
|
|
67
79
|
:visiable.sync="showUserDialog"
|
|
68
80
|
@close="showUserDialog = false"
|
|
@@ -80,9 +92,7 @@
|
|
|
80
92
|
:rangeTableDatas="rangeTableDatas"
|
|
81
93
|
:current_prefix="current_prefix"
|
|
82
94
|
></wfTaskUserRangeDialog>
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
95
|
+
</el-dialog>
|
|
86
96
|
</template>
|
|
87
97
|
|
|
88
98
|
<script>
|
|
@@ -39,12 +39,7 @@
|
|
|
39
39
|
</div>
|
|
40
40
|
</el-form>
|
|
41
41
|
<span slot="footer" class="dialog-footer">
|
|
42
|
-
<el-button
|
|
43
|
-
type="primary"
|
|
44
|
-
plain
|
|
45
|
-
class="button-sty"
|
|
46
|
-
@click="showDialog = false"
|
|
47
|
-
>
|
|
42
|
+
<el-button type="primary" plain class="button-sty" @click="showDialog = false">
|
|
48
43
|
<i class="el-icon-close el-icon"></i>
|
|
49
44
|
{{ $t2("取 消", "system.button.cancel2") }}
|
|
50
45
|
</el-button>
|
|
@@ -60,6 +55,7 @@
|
|
|
60
55
|
:current_prefix="current_prefix"
|
|
61
56
|
:rows="preStartResult"
|
|
62
57
|
:modelId="startFormData.modelId"
|
|
58
|
+
:objTypeCode="code"
|
|
63
59
|
@confirm="confirmSetCandidateDialog"
|
|
64
60
|
></setCandidateDialog2>
|
|
65
61
|
</div>
|