Skip to content

Commit 666fb16

Browse files
committed
【代码评审】BPM:办理人的逻辑
1 parent 575f603 commit 666fb16

File tree

5 files changed

+43
-9
lines changed

5 files changed

+43
-9
lines changed

build/vite/optimize.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,8 @@ const include = [
114114
'element-plus/es/components/segmented/style/css',
115115
'@element-plus/icons-vue',
116116
'element-plus/es/components/footer/style/css',
117-
'element-plus/es/components/empty/style/css'
117+
'element-plus/es/components/empty/style/css',
118+
'element-plus/es/components/mention/style/css'
118119
]
119120

120121
const exclude = ['@iconify/json']

src/components/SimpleProcessDesignerV2/src/NodeHandler.vue

+3-2
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
</div>
1616
<div class="handler-item-text">审批人</div>
1717
</div>
18+
<!-- TODO @lesan:办理人增加自定义 icon 哈,可以换 jason 怎么弄! -->
1819
<div class="handler-item" @click="addNode(NodeType.TRANSACTOR_NODE)">
1920
<div class="approve handler-item-icon">
2021
<span class="iconfont icon-approve icon-size"></span>
@@ -63,7 +64,7 @@
6364
</div>
6465
<div class="handler-item-text">触发器</div>
6566
</div>
66-
</div>
67+
</div>
6768
<template #reference>
6869
<div class="add-icon"><Icon icon="ep:plus" /></div>
6970
</template>
@@ -84,7 +85,7 @@ import {
8485
SimpleFlowNode,
8586
DEFAULT_CONDITION_GROUP_VALUE
8687
} from './consts'
87-
import {generateUUID} from '@/utils'
88+
import { generateUUID } from '@/utils'
8889
8990
defineOptions({
9091
name: 'NodeHandler'

src/components/SimpleProcessDesignerV2/src/nodes-config/UserTaskNodeConfig.vue

+35-5
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
<!-- TODO @lesan:涉及到“审批”关键字,需要换成“办理”,建议通过一个变量控制哈 -->
12
<template>
23
<el-drawer
34
:append-to-body="true"
@@ -61,7 +62,13 @@
6162
label="指定角色"
6263
prop="roleIds"
6364
>
64-
<el-select filterable v-model="configForm.roleIds" clearable multiple style="width: 100%">
65+
<el-select
66+
filterable
67+
v-model="configForm.roleIds"
68+
clearable
69+
multiple
70+
style="width: 100%"
71+
>
6572
<el-option
6673
v-for="item in roleOptions"
6774
:key="item.id"
@@ -99,7 +106,13 @@
99106
prop="postIds"
100107
span="24"
101108
>
102-
<el-select filterable v-model="configForm.postIds" clearable multiple style="width: 100%">
109+
<el-select
110+
filterable
111+
v-model="configForm.postIds"
112+
clearable
113+
multiple
114+
style="width: 100%"
115+
>
103116
<el-option
104117
v-for="item in postOptions"
105118
:key="item.id"
@@ -114,7 +127,13 @@
114127
prop="userIds"
115128
span="24"
116129
>
117-
<el-select filterable v-model="configForm.userIds" clearable multiple style="width: 100%">
130+
<el-select
131+
filterable
132+
v-model="configForm.userIds"
133+
clearable
134+
multiple
135+
style="width: 100%"
136+
>
118137
<el-option
119138
v-for="item in userOptions"
120139
:key="item.id"
@@ -128,7 +147,13 @@
128147
label="指定用户组"
129148
prop="userGroups"
130149
>
131-
<el-select filterable v-model="configForm.userGroups" clearable multiple style="width: 100%">
150+
<el-select
151+
filterable
152+
v-model="configForm.userGroups"
153+
clearable
154+
multiple
155+
style="width: 100%"
156+
>
132157
<el-option
133158
v-for="item in userGroupOptions"
134159
:key="item.id"
@@ -424,6 +449,7 @@
424449
</div>
425450
</div>
426451
</el-tab-pane>
452+
<!-- TODO @lesan:办理时,应该还是有字段权限 -->
427453
<el-tab-pane label="表单字段权限" name="fields" v-if="formType === 10">
428454
<div class="field-setting-pane">
429455
<div class="field-setting-desc">字段权限</div>
@@ -471,7 +497,11 @@
471497
</div>
472498
</el-tab-pane>
473499
<el-tab-pane label="监听器" name="listener">
474-
<UserTaskListener ref="userTaskListenerRef" v-model="configForm" :form-field-options="formFieldOptions" />
500+
<UserTaskListener
501+
ref="userTaskListenerRef"
502+
v-model="configForm"
503+
:form-field-options="formFieldOptions"
504+
/>
475505
</el-tab-pane>
476506
</el-tabs>
477507
<template #footer>

src/views/bpm/processInstance/detail/ProcessInstanceOperationButton.vue

+1
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
:rule="approveForm.rule"
3737
/>
3838
</el-card>
39+
<!-- TODO @lesan:需要分成“审批”和“办理”意见,包括 label、placeholder、rule 校验 -->
3940
<el-form-item label="审批意见" prop="reason">
4041
<el-input
4142
v-model="approveReasonForm.reason"

src/views/bpm/processInstance/detail/ProcessInstanceTimeline.vue

+2-1
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,7 @@
121121
"
122122
class="text-#a5a5a5 text-13px mt-1 w-full bg-#f8f8fa p2 rounded-md"
123123
>
124+
<!-- TODO lesan:这里如果是办理,需要是办理意见 -->
124125
审批意见:{{ task.reason }}
125126
</div>
126127
<div
@@ -240,7 +241,7 @@ const nodeTypeSvgMap = {
240241
[NodeType.START_USER_NODE]: { color: '#909398', svg: starterSvg },
241242
// 审批人节点
242243
[NodeType.USER_TASK_NODE]: { color: '#ff943e', svg: auditorSvg },
243-
// 办理人节点
244+
// 办理人节点 TODO @lesan:
244245
[NodeType.TRANSACTOR_NODE]: { color: '#ff943e', svg: auditorSvg },
245246
// 抄送人节点
246247
[NodeType.COPY_TASK_NODE]: { color: '#3296fb', svg: copySvg },

0 commit comments

Comments
 (0)