Skip to content

Commit 82ee62c

Browse files
committed
feat: 审批意见
1 parent 506d87e commit 82ee62c

File tree

2 files changed

+37
-7
lines changed

2 files changed

+37
-7
lines changed

src/components/bpmnProcessDesigner/package/designer/plugins/descriptor/flowableDescriptor.json

+14
Original file line numberDiff line numberDiff line change
@@ -1463,6 +1463,20 @@
14631463
"type": "String"
14641464
}
14651465
]
1466+
},
1467+
{
1468+
"name": "ReasonRequire",
1469+
"superClass": ["Element"],
1470+
"meta": {
1471+
"allowedIn": ["bpmn:UserTask"]
1472+
},
1473+
"properties": [
1474+
{
1475+
"name": "value",
1476+
"type": "Boolean",
1477+
"isBody": true
1478+
}
1479+
]
14661480
}
14671481
],
14681482
"emumerations": []

src/components/bpmnProcessDesigner/package/penal/custom-config/components/UserTaskCustomConfig.vue

+23-7
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,11 @@
167167
<el-form-item prop="signEnable">
168168
<el-switch v-model="signEnable.value" active-text="是" inactive-text="否" />
169169
</el-form-item>
170+
171+
<el-divider content-position="left">审批意见</el-divider>
172+
<el-form-item prop="reasonRequire">
173+
<el-switch v-model="reasonRequire.value" active-text="必填" inactive-text="非必填" />
174+
</el-form-item>
170175
</div>
171176
</template>
172177

@@ -227,6 +232,9 @@ const approveType = ref({ value: ApproveType.USER })
227232
// 是否需要签名
228233
const signEnable = ref({ value: false })
229234

235+
// 审批意见
236+
const reasonRequire = ref({ value: false })
237+
230238
const elExtensionElements = ref()
231239
const otherExtensions = ref()
232240
const bpmnElement = ref()
@@ -320,6 +328,16 @@ const resetCustomConfigList = () => {
320328
})
321329
}
322330

331+
// 是否需要签名
332+
signEnable.value =
333+
elExtensionElements.value.values?.filter((ex) => ex.$type === `${prefix}:SignEnable`)?.[0] ||
334+
bpmnInstances().moddle.create(`${prefix}:SignEnable`, { value: false })
335+
336+
// 审批意见
337+
reasonRequire.value =
338+
elExtensionElements.value.values?.filter((ex) => ex.$type === `${prefix}:ReasonRequire`)?.[0] ||
339+
bpmnInstances().moddle.create(`${prefix}:ReasonRequire`, { value: false })
340+
323341
// 保留剩余扩展元素,便于后面更新该元素对应属性
324342
otherExtensions.value =
325343
elExtensionElements.value.values?.filter(
@@ -331,14 +349,11 @@ const resetCustomConfigList = () => {
331349
ex.$type !== `${prefix}:AssignEmptyUserIds` &&
332350
ex.$type !== `${prefix}:ButtonsSetting` &&
333351
ex.$type !== `${prefix}:FieldsPermission` &&
334-
ex.$type !== `${prefix}:ApproveType`
352+
ex.$type !== `${prefix}:ApproveType` &&
353+
ex.$type !== `${prefix}:SignEnable` &&
354+
ex.$type !== `${prefix}:ReasonRequire`
335355
) ?? []
336356

337-
// 是否需要签名
338-
signEnable.value =
339-
elExtensionElements.value.values?.filter((ex) => ex.$type === `${prefix}:SignEnable`)?.[0] ||
340-
bpmnInstances().moddle.create(`${prefix}:SignEnable`, { value: false })
341-
342357
// 更新元素扩展属性,避免后续报错
343358
updateElementExtensions()
344359
}
@@ -388,7 +403,8 @@ const updateElementExtensions = () => {
388403
approveType.value,
389404
...buttonsSettingEl.value,
390405
...fieldsPermissionEl.value,
391-
signEnable.value
406+
signEnable.value,
407+
reasonRequire.value
392408
]
393409
})
394410
bpmnInstances().modeling.updateProperties(toRaw(bpmnElement.value), {

0 commit comments

Comments
 (0)