diff --git a/src/api/bpm/simple/index.ts b/src/api/bpm/simple/index.ts index 93307f56..b977dea0 100644 --- a/src/api/bpm/simple/index.ts +++ b/src/api/bpm/simple/index.ts @@ -6,4 +6,10 @@ export const saveBpmSimpleModel = async (data) => { url: '/bpm/simple/save', data: data }) +} + +export const getBpmSimpleModel = async (modelId) => { + return await request.get({ + url: '/bpm/simple/get?modelId=' + modelId + }) } \ No newline at end of file diff --git a/src/components/SimpleProcessDesigner/src/addNode.vue b/src/components/SimpleProcessDesigner/src/addNode.vue index ec5baf16..d11ead29 100644 --- a/src/components/SimpleProcessDesigner/src/addNode.vue +++ b/src/components/SimpleProcessDesigner/src/addNode.vue @@ -71,9 +71,9 @@ const addType = (type) => { attributes : { approveMethod : undefined, candidateStrategy: undefined, - candidateParam: [] + candidateParam: undefined }, - // childNode: props.childNodeP + childNode: props.childNodeP } } else if (type == 2) { data = { diff --git a/src/components/SimpleProcessDesigner/src/drawer/approverDrawer.vue b/src/components/SimpleProcessDesigner/src/drawer/approverDrawer.vue index b5c32cbb..66a557f7 100644 --- a/src/components/SimpleProcessDesigner/src/drawer/approverDrawer.vue +++ b/src/components/SimpleProcessDesigner/src/drawer/approverDrawer.vue @@ -202,7 +202,19 @@ let visible = computed({ }) watch(userTaskConfig, (val) => { if (val.value.attributes) { - candidateConfig.value = val.value.attributes + console.log('val.value.attributes', val.value.attributes); + candidateConfig.value.approveMethod = val.value.attributes.approveMethod + candidateConfig.value.candidateStrategy = val.value.attributes.candidateStrategy + const candidateParamStr = val.value.attributes.candidateParam; + if(val.value.attributes.candidateStrategy === 60) { + candidateConfig.value.candidateParam = [candidateParamStr] + } else { + if(candidateParamStr){ + candidateConfig.value.candidateParam = candidateParamStr.split(',').map((item) => +item) + } + } + + // candidateConfig.value = val.value.attributes } }) watch(approverConfig1, (val) => { @@ -250,9 +262,14 @@ const saveApprover = () => { closeDrawer() } const saveConfig = () => { - const rawConfig = toRaw(userTaskConfig.value) - rawConfig.value.attributes = toRaw(candidateConfig.value) + const { approveMethod, candidateStrategy , candidateParam} = toRaw(candidateConfig.value); + const candidateParamStr = candidateParam.join(',') + rawConfig.value.attributes = { + approveMethod, + candidateStrategy, + candidateParam: candidateParamStr + } rawConfig.flag = true // TODO 进行校验 // setApproverConfig({ diff --git a/src/components/SimpleProcessDesigner/src/nodeWrap.vue b/src/components/SimpleProcessDesigner/src/nodeWrap.vue index 210cb84f..e48de2ef 100644 --- a/src/components/SimpleProcessDesigner/src/nodeWrap.vue +++ b/src/components/SimpleProcessDesigner/src/nodeWrap.vue @@ -6,14 +6,19 @@ * @FilePath: /Workflow-Vue3/src/components/nodeWrap.vue -->