diff --git a/src/api/DesignForm/type.ts b/src/api/DesignForm/type.ts index 0a3b008ca..ca7500ce4 100644 --- a/src/api/DesignForm/type.ts +++ b/src/api/DesignForm/type.ts @@ -12,6 +12,7 @@ export interface customerFormCont{ classify:number; creatername:string; creatertime:string; + flowkey:any; } export type CustomerFormPageResult = PageResult; diff --git a/src/components/workflow/addNode.vue b/src/components/workflow/addNode.vue index 84d4e026e..208939263 100644 --- a/src/components/workflow/addNode.vue +++ b/src/components/workflow/addNode.vue @@ -51,10 +51,10 @@ const addType = (type:any)=> { var data; if (type == 1) { data = { - "nodeNumber":onlyNumber, - "nodeName": "审核人", - "error": true, - "type": 1, + "nodeNumber":onlyNumber, //节点标识 + "nodeName": "审核人", //节点名称 + "error": true, //当前审批是否通过校验 + "type": 1, // 0 发起人 1审批 2抄送 3执行人 4条件 5路由 "settype": 1, "selectMode": 0, "selectRange": 0, @@ -123,7 +123,7 @@ const addType = (type:any)=> { "nodeNumber":snowflake1, "nodeName": "条件1", "error": true, - "type": 3, + "type": 4, "priorityLevel": 1, "conditionList": [], "nodeUserList": [], @@ -133,7 +133,7 @@ const addType = (type:any)=> { }, { "nodeNumber":snowflake2, "nodeName": "条件2", - "type": 3, + "type": 4, "priorityLevel": 2, "conditionList": [], "nodeUserList": [], diff --git a/src/components/workflow/nodeWrap.vue b/src/components/workflow/nodeWrap.vue index 081f41bf1..9dfc2fb12 100644 --- a/src/components/workflow/nodeWrap.vue +++ b/src/components/workflow/nodeWrap.vue @@ -62,7 +62,7 @@ const resetConditionNodesErr = () => { } }; -const clickEvent = (index: any) => { +const clickEvent = (index?: any) => { if (index || index === 0) { isInputList.value[index] = true; } else { @@ -172,12 +172,13 @@ const arrTransfer = (index: any, type = 1) => { //向左-1,向右1 // eslint-disable-next-line vue/no-mutating-props props.nodeConfig.conditionNodes[index] = + // eslint-disable-next-line vue/no-mutating-props props.nodeConfig.conditionNodes.splice( index + type, 1, props.nodeConfig.conditionNodes[index] )[0]; - props.nodeConfig.conditionNodes.map((item, index) => { + props.nodeConfig.conditionNodes.map((item:any, index:any) => { item.priorityLevel = index + 1; }); resetConditionNodesErr(); @@ -246,15 +247,7 @@ onMounted(() => { > - + {{ nodeConfig.nodeName @@ -278,10 +271,7 @@ onMounted(() => { - +
@@ -361,18 +351,12 @@ onMounted(() => {
- + - + diff --git a/src/components/workflow/selectBoxs.vue b/src/components/workflow/selectBoxs.vue index 4a963bba7..a8000ba08 100644 --- a/src/components/workflow/selectBoxs.vue +++ b/src/components/workflow/selectBoxs.vue @@ -7,7 +7,7 @@ defineProps({ list: { type: Array, - default: () => [] + default: () => [{ type: 'role', data:any, cancel:()=>{} }] } }) diff --git a/src/views/sysworkflow/flow/flowDrawingBoard.vue b/src/views/sysworkflow/flow/flowDrawingBoard.vue index 258d10400..0aa85d544 100644 --- a/src/views/sysworkflow/flow/flowDrawingBoard.vue +++ b/src/views/sysworkflow/flow/flowDrawingBoard.vue @@ -7,7 +7,7 @@ import '@/styles/workflowcss/workflow.scss' import { useStore } from '@/store/workflow/index' -import { tipListStrucr,flowversion } from '@/api/workflowapi/types' +import { flowversion } from '@/api/workflowapi/types' import { initializeWorkFlow,setWorkFlowData,gainFlowVersionList } from '@/api/workflowapi/index' //引入页面 diff --git a/src/views/sysworkflow/flow/flowcanvas.vue b/src/views/sysworkflow/flow/flowcanvas.vue index d45cd7b97..af5f7b41c 100644 --- a/src/views/sysworkflow/flow/flowcanvas.vue +++ b/src/views/sysworkflow/flow/flowcanvas.vue @@ -7,7 +7,7 @@ import '@/styles/workflowcss/workflow.scss' import { useStore } from '@/store/workflow/index' -import { tipListStrucr } from '@/api/workflowapi/types' + import { initializeWorkFlow,setWorkFlowData } from '@/api/workflowapi/index' let { setTableId, setIsTried } = useStore()