- 请选择{{defaultText}}
- {{showText}}
-
-
-
+
+
+
+ {{ currentNode.name }}
+
+
+
+
+
+
+ 其它条件不满足进入此分支（该分支不可编辑和删除）
+
+
+
+
+
+ {{ dict.label }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 条件组关系
+
+
+
+
+
+
+
+ 条件组
+
+
+ 规则关系
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 确 定
+ 取 消
+
+
+
+
+
+
+
+ {{ nodeName }}
+
+
+
+
+
+
+ {{ dict.label }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 字段权限
+
+
+ 字段名称
+
+ 只读
+ 可编辑
+ 隐藏
+
+
+
+
+
+ {{ item.title }}
+
+
+
+
+
+
+
+ 确 定
+ 取 消
+
+
+
+
+
+
+
+ {{ nodeName }}
+
+ 待实现
+
+
+ 字段权限
+
+
+ 字段名称
+
+ 只读
+ 可编辑
+ 隐藏
+
+
+
+
+
+ {{ item.title }}
+
+
+
+
+
+
+
+ 确 定
+ 取 消
+
+
+
+
+
+
+
+ {{ nodeName }}
+
+
+ 审批类型 :
+
+
+ {{ item.label }}
+
+
+
+
+
+
+
+
+ {{ dict.label }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 审批人拒绝时
+
+
+
+
+
+
+
+
+
+ 审批人超时未处理时
+
+
+
+
+
+
+
+ 当超过
+
+
+
+
+ 未处理
+
+
+
+
+ 审批人为空时
+
+
+
+
+
+
+
+
+
+ 审批人与提交人为同一人时
+
+
+
+
+
+
+
+
+
+
+ {{ item.label }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 字段权限
+
+
+ 字段名称
+
+ 只读
+ 可编辑
+ 隐藏
+
+
+
+
+
+ {{ item.title }}
+
+
+
+
+
+
+
+ 确 定
+ 取 消
+
+
+
+
+
+
+
+
diff --git a/src/components/SimpleProcessDesignerV2/src/nodes/EndEventNode.vue b/src/components/SimpleProcessDesignerV2/src/nodes/EndEventNode.vue
new file mode 100644
index 0000000000000000000000000000000000000000..3278e7b8c98d50213b8a781633122e35b578626e
--- /dev/null
+++ b/src/components/SimpleProcessDesignerV2/src/nodes/EndEventNode.vue
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ currentNode.name }}
+
+
+
+
+
+ {{ currentNode.showText }}
+
+
+ {{ NODE_DEFAULT_TEXT.get(NodeType.COPY_TASK_NODE) }}
+
+
+
+
+
+
diff --git a/src/components/SimpleProcessDesignerV2/src/nodes/ExclusiveNode.vue b/src/components/SimpleProcessDesignerV2/src/nodes/ExclusiveNode.vue
new file mode 100644
index 0000000000000000000000000000000000000000..385a81ff0646c834d577d124cf505e912f3d1979
--- /dev/null
+++ b/src/components/SimpleProcessDesignerV2/src/nodes/ExclusiveNode.vue
@@ -0,0 +1,207 @@
+
+
+ 结束
+
+
+
+
+
+
+
+
diff --git a/src/components/SimpleProcessDesignerV2/src/nodes/ParallelNode.vue b/src/components/SimpleProcessDesignerV2/src/nodes/ParallelNode.vue
new file mode 100644
index 0000000000000000000000000000000000000000..3cdd8f8fe5555969e1d315072f37c71825e7b001
--- /dev/null
+++ b/src/components/SimpleProcessDesignerV2/src/nodes/ParallelNode.vue
@@ -0,0 +1,181 @@
+
+
+
+ 添加条件
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.name }}
+ 优先级{{ index + 1 }}
+
+
+
+
+ {{ item.showText }}
+
+
+ {{ NODE_DEFAULT_TEXT.get(NodeType.CONDITION_NODE) }}
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/components/SimpleProcessDesignerV2/src/nodes/StartUserNode.vue b/src/components/SimpleProcessDesignerV2/src/nodes/StartUserNode.vue
new file mode 100644
index 0000000000000000000000000000000000000000..5111678161302e6a1cbf55818d215dbf942fea1c
--- /dev/null
+++ b/src/components/SimpleProcessDesignerV2/src/nodes/StartUserNode.vue
@@ -0,0 +1,69 @@
+
+
+
+ 添加分支
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.name }}
+ 无优先级
+
+
+
+
+
+
+
+ {{ item.showText }}
+
+
+ {{ NODE_DEFAULT_TEXT.get(NodeType.CONDITION_NODE) }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ currentNode.name }}
+
+
+
+
+ {{ currentNode.showText }}
+
+
+ {{ NODE_DEFAULT_TEXT.get(NodeType.START_USER_NODE) }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ currentNode.name }}
+
+
+
+
+
+ {{ currentNode.showText }}
+
+
+ {{ NODE_DEFAULT_TEXT.get(NodeType.USER_TASK_NODE) }}
+
+
-
-
-
- {{ dict.label }}
-
-
-
-
-
-
-
-
+
+
+ {{ dict.label }}
+
+
+
+
+
+
+ {{ dict.label }}
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
-
+
+ {{ activity.name }}
- {{ activity.assigneeUser.nickname }}
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ task.assigneeUser.nickname.substring(0, 1) }}
+
+
+ {{ task.ownerUser.nickname.substring(0, 1) }}
+
+
+
+
+
+
+
+
+
+ {{ task.assigneeUser.nickname }}
+
+
+ {{ task.ownerUser.nickname }}
+
+
+
+
+
+
+
+
+
+
+ {{ user.nickname.substring(0, 1) }}
+
+
+
+
+
+
+
+
+
+ {{ user.nickname }}
+
+
+
+ {{ getApprovalNodeTime(activity) }}
+
+
+
+
- 
-
-
-
-
-
-
+
+
-
+
-
+
-
+
-
+
-
+
@@ -147,6 +191,10 @@ import TaskSignCreateForm from './dialog/TaskSignCreateForm.vue'
import { registerComponent } from '@/utils/routerHelper'
import { isEmpty } from '@/utils/is'
import * as UserApi from '@/api/system/user'
+import {
+ OperationButtonType,
+ OPERATION_BUTTON_NAME
+} from '@/components/SimpleProcessDesignerV2/src/consts'
defineOptions({ name: 'BpmProcessInstanceDetail' })
@@ -200,7 +248,11 @@ const handleAudit = async (task, pass) => {
// 1.2 校验表单
const elForm = unref(auditFormRef)
if (!elForm) return
- const valid = await elForm.validate()
+ let valid = await elForm.validate()
+ if (!valid) return
+ // 校验申请表单
+ if (!fApi.value) return
+ valid = await fApi.value.validate()
if (!valid) return
// 2.1 提交审批
@@ -216,6 +268,9 @@ const handleAudit = async (task, pass) => {
await formCreateApi.validate()
data.variables = approveForms.value[index].value
}
+ // 获取表单可编辑字段的值
+ data.variables = getWritableValueOfForm(task.fieldsPermission)
+
await TaskApi.approveTask(data)
message.success('审批通过成功')
} else {
@@ -251,11 +306,11 @@ const handleSign = async (task: any) => {
}
/** 获得详情 */
-const getDetail = () => {
- // 1. 获得流程实例相关
+const getDetail = async () => {
+ // 1. 获得流程任务列表（审批记录）。 需要先获取任务，表单的权限设置需要根据任务来设置
+ await getTaskList()
+ // 2. 获得流程实例相关
getProcessInstance()
- // 2. 获得流程任务列表（审批记录）
- getTaskList()
}
/** 加载流程实例 */
@@ -273,16 +328,29 @@ const getProcessInstance = async () => {
// 设置表单信息
const processDefinition = data.processDefinition
if (processDefinition.formType === 10) {
- setConfAndFields2(
- detailForm,
- processDefinition.formConf,
- processDefinition.formFields,
- data.formVariables
- )
+ if (detailForm.value.rule.length > 0) {
+ detailForm.value.value = data.formVariables
+ } else {
+ setConfAndFields2(
+ detailForm,
+ processDefinition.formConf,
+ processDefinition.formFields,
+ data.formVariables
+ )
+ }
nextTick().then(() => {
fApi.value?.btn.show(false)
fApi.value?.resetBtn.show(false)
fApi.value?.disabled(true)
+ // 设置表单权限。后续需要改造成。只处理一个运行中的任务
+ if (runningTasks.value.length > 0) {
+ const task = runningTasks.value.at(0)
+ if (task.fieldsPermission) {
+ Object.keys(task.fieldsPermission).forEach((item) => {
+ setFieldPermission(item, task.fieldsPermission[item])
+ })
+ }
+ }
})
} else {
// 注意：data.processDefinition.formCustomViewPath 是组件的全路径，例如说：/crm/contract/detail/index.vue
@@ -353,6 +421,7 @@ const loadRunningTask = (tasks) => {
if (!task.assigneeUser || task.assigneeUser.id !== userId) {
return
}
+
// 2.3 添加到处理任务
runningTasks.value.push({ ...task })
auditForms.value.push({
@@ -371,6 +440,35 @@ const loadRunningTask = (tasks) => {
})
}
+/**
+ * 设置表单权限
+ */
+const setFieldPermission = (field: string, permission: string) => {
+ if (permission === '1') {
+ fApi.value?.disabled(true, field)
+ }
+ if (permission === '2') {
+ fApi.value?.disabled(false, field)
+ }
+ if (permission === '3') {
+ fApi.value?.hidden(true, field)
+ }
+}
+/**
+ * 获取可以编辑字段的值
+ */
+const getWritableValueOfForm = (fieldsPermission: Object) => {
+ const fieldsValue = {}
+ if (fieldsPermission && fApi.value) {
+ Object.keys(fieldsPermission).forEach((item) => {
+ if (fieldsPermission[item] === '2') {
+ fieldsValue[item] = fApi.value.getValue(item)
+ }
+ })
+ }
+ return fieldsValue
+}
+
/** 初始化 */
const userOptions = ref编号：{{ id }}
-
-
+ {{ processInstance.name }}
-
+
+ ![]()
+
-
-
-
-
-
-
编号：{{ id }}
+
+
- {{ processInstance.name }}
+
-
+
-
- {{ processInstance?.startUser?.nickname }}
-
-
- {{ processInstance?.startUser?.nickname }}
- {{ formatDate(processInstance.startTime) }} 提交
-
+
-
+
+ {{ processInstance?.startUser?.nickname }}
+
+
+ {{ processInstance?.startUser?.nickname }}
+ {{ formatDate(processInstance.startTime) }} 提交
+
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
- 流转评论
-
+
+
+
+
+
+ 流转评论
+
+
+
\ No newline at end of file
+
diff --git a/src/views/bpm/task/copy/index.vue b/src/views/bpm/task/copy/index.vue
index 93f55c6824ab31a7948f11b579fce6daf7743ce1..045e2074660be02de3679eceef4a013394362007 100644
--- a/src/views/bpm/task/copy/index.vue
+++ b/src/views/bpm/task/copy/index.vue
@@ -111,11 +111,16 @@ const getList = async () => {
/** 处理审批按钮 */
const handleAudit = (row: any) => {
+ const query = {
+ id: row.processInstanceId,
+ activityId: undefined
+ }
+ if (row.activityId) {
+ query.activityId = row.activityId
+ }
push({
name: 'BpmProcessInstanceDetail',
- query: {
- id: row.processInstanceId
- }
+ query: query
})
}
diff --git a/src/views/bpm/task/done/index.vue b/src/views/bpm/task/done/index.vue
index a51371997751b1cf03e1e0f81c853546b3a1cebd..987682120cf4a57cc4757e09ed2e4a742778311c 100644
--- a/src/views/bpm/task/done/index.vue
+++ b/src/views/bpm/task/done/index.vue
@@ -158,7 +158,8 @@ const handleAudit = (row: any) => {
push({
name: 'BpmProcessInstanceDetail',
query: {
- id: row.processInstance.id
+ id: row.processInstance.id,
+ taskId: row.id
}
})
}
diff --git a/src/views/bpm/task/todo/index.vue b/src/views/bpm/task/todo/index.vue
index 670fc683e7adc2548eb46edd576aec2c444e3082..bf32ecb16a709e91811149141ca2ba2c32186346 100644
--- a/src/views/bpm/task/todo/index.vue
+++ b/src/views/bpm/task/todo/index.vue
@@ -140,7 +140,8 @@ const handleAudit = (row: any) => {
push({
name: 'BpmProcessInstanceDetail',
query: {
- id: row.processInstance.id
+ id: row.processInstance.id,
+ taskId: row.id
}
})
}
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+