diff --git a/src/components/workflow/dialog/matrix.vue b/src/components/workflow/dialog/matrix.vue new file mode 100644 index 000000000..940c2f093 --- /dev/null +++ b/src/components/workflow/dialog/matrix.vue @@ -0,0 +1,79 @@ + + + + + + + + {{item.name}} + + + + + + + + + + + + + diff --git a/src/components/workflow/drwer/approverDrawer.vue b/src/components/workflow/drwer/approverDrawer.vue index 61a031c19..b586f3a74 100644 --- a/src/components/workflow/drwer/approverDrawer.vue +++ b/src/components/workflow/drwer/approverDrawer.vue @@ -11,6 +11,7 @@ import { getAllParentNode,judgeOptionalNode } from '@/api/workflowapi/index' import PositionDialog from '@/components/workflow/dialog/positionDialog.vue' import FormWord from '@/components/workflow/dialog/formWord.vue' +import MatrixPage from '@/components/workflow/dialog/matrix.vue' let props = defineProps({ nodeConfig:{ @@ -55,13 +56,15 @@ let visible = computed({ closeDrawer() } }) +const matrixIsShow = ref(false) watch(visible,(val:any)=>{ // if(val) }) watch(approverConfig1, (val:any)=>{ - // console.log("directormaxlevel",visible.value) + // console.log("directormaxlevel",visible.value)\ + matrixIsShow.value = false approverConfig.value = val.value if(val.type == 3){ nodeTitle.value = "执行人设置" @@ -95,14 +98,21 @@ watch(approverConfig1, (val:any)=>{ } }) } - - - + if(val.value.settype == 9){ + matrixIsShow.value = true + } }) let changeRange = ()=> { approverConfig.value.nodeUserList = []; } + +//权限矩阵 +const matrixList = ref() +const matrixCont = ref() +const matrixFieldList = ref() + const changeType = (val:any)=> { + matrixIsShow.value = false approverConfig.value.nodeUserList = []; approverConfig.value.examineMode = 1; approverConfig.value.noHanderAction = 2; @@ -113,7 +123,10 @@ const changeType = (val:any)=> { approverConfig.value.selectRange = 1; } else if (val == 7) { approverConfig.value.examineEndDirectorLevel = 1 - } + }else if (val == 9){ + matrixIsShow.value = true + } + } const addApprover = ()=> { approverVisible.value = true; @@ -170,6 +183,8 @@ const sureFormTableApprover = (data:any)=> { approverConfig.value.nodeUserList = data; appFormTableVisible.value = false; } +//更新审批人设置 +const updateMatrix = (val:any) =>{} @@ -283,6 +298,7 @@ const sureFormTableApprover = (data:any)=> { + 指定审批字段 添加/修改审批字段 @@ -291,8 +307,46 @@ const sureFormTableApprover = (data:any)=> { 清除 + + + + + + + 可用矩阵 + 矩阵选项 + + + + + + + + + + + + + + + + + - + 多人审批时采用的审批方式 依次审批 @@ -300,7 +354,7 @@ const sureFormTableApprover = (data:any)=> { 非会签(有一位审批人同意即可) - + 审批人为空时 自动审批通过/不允许发起 diff --git a/src/utils/workflow/const.ts b/src/utils/workflow/const.ts index d47179d0b..ffb1dce46 100644 --- a/src/utils/workflow/const.ts +++ b/src/utils/workflow/const.ts @@ -13,6 +13,7 @@ export let setTypes = [ {value: 6, label: '连续多级主管'}, {value: 7, label: '指定前置审批为本节点设置审批人'}, {value: 8, label: '表单字段'}, + {value: 9, label: '权限矩阵'} ] export let selectModes = [ diff --git a/src/views/sysworkflow/flow/flowDrawingBoard.vue b/src/views/sysworkflow/flow/flowDrawingBoard.vue index 2d7f4a4ad..223125425 100644 --- a/src/views/sysworkflow/flow/flowDrawingBoard.vue +++ b/src/views/sysworkflow/flow/flowDrawingBoard.vue @@ -87,9 +87,9 @@ const getFlowVerList = ()=>{ isRead.value = false } } - console.log("获取工作流版本列表---1-->",activeTabs.value); - console.log("获取工作流版本列表---2-->",enableFlow.value); - console.log("获取工作流版本列表---3-->",enableVersion.value); + // console.log("获取工作流版本列表---1-->",activeTabs.value); + // console.log("获取工作流版本列表---2-->",enableFlow.value); + // console.log("获取工作流版本列表---3-->",enableVersion.value); }) .finally(()=>{ if(isRead.value == true){ @@ -209,7 +209,7 @@ const zoomSize = (type:number) => { } }; //清空画布 -const clearCanvas = (isOk?:number) =>{ +const clearCanvas = (isOk?:any) =>{ if(isOk==1){ initWorkFlowData() setIsTried(false); @@ -246,7 +246,7 @@ watch(()=>props.openDrawer,(val)=>{ //选择工作流版本 const clickFormTable = (val:any) =>{ - console.log("切换表单",val,activeTabs.value) + // console.log("切换表单",val,activeTabs.value) enableVersion.value = val gainFlowCont(); clickOpenOrClose(); @@ -360,7 +360,7 @@ const setupState = (val:number) =>{ .finally(()=>{ clickOpenOrClose(); }) - console.log("enableFlow.version==activeTabs",enableFlow.version,activeTabs) + // console.log("enableFlow.version==activeTabs",enableFlow.version,activeTabs) } const openOfClise = ref(false) const clickOpenOrClose = () => { @@ -369,8 +369,8 @@ const clickOpenOrClose = () => { }else{ openOfClise.value = false } - console.log("openOfClise",openOfClise.value) - console.log("enableFlow.version=1=activeTabs",enableFlow.value,activeTabs.value) + // console.log("openOfClise",openOfClise.value) + // console.log("enableFlow.version=1=activeTabs",enableFlow.value,activeTabs.value) }
指定审批字段
多人审批时采用的审批方式
审批人为空时