yudao-team/oa-ui
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
XaoLi717 2024-11-19 10:04:55 +08:00
commit b5040cf42c
3 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/bpm/knows/knowledge/KnowledgeCreate.vue
View File

@ -133,7 +133,7 @@ const getUserInfo = async () => {
} }
//flow begin++++++++++++++++++++ //flow begin++++++++++++++++++++
// 指定审批人 // 指定审批人
const processDefineKey = 'pch-qjgl-001' // 流程定义 Key const processDefineKey = 'pch-test-001' // 流程定义 Key
const startUserSelectTasks = ref([]) // 发起人需要选择审批人的用户任务列表 const startUserSelectTasks = ref([]) // 发起人需要选择审批人的用户任务列表
const startUserSelectAssignees = ref({}) // 发起人选择审批人的数据 const startUserSelectAssignees = ref({}) // 发起人选择审批人的数据
const startUserSelectAssigneesFormRef = ref() // 发起人选择审批人的表单 Ref const startUserSelectAssigneesFormRef = ref() // 发起人选择审批人的表单 Ref

2
src/views/bpm/knows/knowledge/KnowledgeForm.vue
View File

@ -319,7 +319,7 @@ const star = async () => {
defineExpose({ open }) // 提供 open 方法，用于打开弹窗 defineExpose({ open }) // 提供 open 方法，用于打开弹窗
//flow begin++++++++++++++++++++ //flow begin++++++++++++++++++++
// 指定审批人 // 指定审批人
const processDefineKey = 'pch-qjgl-001' // 流程定义 Key const processDefineKey = 'pch-test-001' // 流程定义 Key
const startUserSelectTasks = ref([]) // 发起人需要选择审批人的用户任务列表 const startUserSelectTasks = ref([]) // 发起人需要选择审批人的用户任务列表
const startUserSelectAssignees = ref({}) // 发起人选择审批人的数据 const startUserSelectAssignees = ref({}) // 发起人选择审批人的数据
const startUserSelectAssigneesFormRef = ref() // 发起人选择审批人的表单 Ref const startUserSelectAssigneesFormRef = ref() // 发起人选择审批人的表单 Ref

12
src/views/bpm/processInstance/detail/index.vue
View File

@ -278,15 +278,17 @@ const BusinessFormComponent = ref(null) // 异步组件
const getProcessInstance = async () => { const getProcessInstance = async () => {
try { try {
processInstanceLoading.value = true processInstanceLoading.value = true
console.log(id,"getProcessInstance_id")
const data = await ProcessInstanceApi.getProcessInstance(id) const data = await ProcessInstanceApi.getProcessInstance(id)
if (!data) { if (!data) {
message.error('查询不到流程信息！') message.error('查询不到流程信息！')
return return
} }
processInstance.value = data processInstance.value = data
console.log(data,"processInstance_data")
// 设置表单信息 // 设置表单信息
const processDefinition = data.processDefinition const processDefinition = data.processDefinition
console.log(processDefinition.formType,"processDefinition.formType")
if (processDefinition.formType === 10) { if (processDefinition.formType === 10) {
setConfAndFields2( setConfAndFields2(
detailForm, detailForm,
@ -301,7 +303,13 @@ const getProcessInstance = async () => {
}) })
} else { } else {
// 注意：data.processDefinition.formCustomViewPath 是组件的全路径，例如说：/crm/contract/detail/index.vue // 注意：data.processDefinition.formCustomViewPath 是组件的全路径，例如说：/crm/contract/detail/index.vue
BusinessFormComponent.value = registerComponent(data.processDefinition.formCustomViewPath) //console.log(data.processDefinition.formCustomViewPath,"formCustomViewPath")
if ( data.processDefinition.formCustomViewPath == "") {
const process_key = data.processDefinition.key
console.log(process_key,"process_key")
} else {
BusinessFormComponent.value = registerComponent(data.processDefinition.formCustomViewPath)
}
} }
// 加载流程图 // 加载流程图