diff --git a/src/api/DesignForm/requestapi.ts b/src/api/DesignForm/requestapi.ts index 00de49b..ed2bab9 100644 --- a/src/api/DesignForm/requestapi.ts +++ b/src/api/DesignForm/requestapi.ts @@ -597,3 +597,11 @@ export function gainFormPageMapCont(data: any) { data: data }); } +//编辑APP菜单图标 +export function editAppMenusIcon(data: any) { + return request({ + url: '/systemapi/app/editAppMenusIcon', + method: 'post', + data: data + }); +} diff --git a/src/api/date/type.ts b/src/api/date/type.ts index 3fa1ded..83d9b91 100644 --- a/src/api/date/type.ts +++ b/src/api/date/type.ts @@ -277,6 +277,7 @@ export interface appNodeConfig{ sendBackNode: string; settype: number; type: number; + orgList: string; } //app工作流附件 export interface appMatrix{ diff --git a/src/components/IconSelect/appMenuSvgPage.vue b/src/components/IconSelect/appMenuSvgPage.vue index d6ac28c..571da0e 100644 --- a/src/components/IconSelect/appMenuSvgPage.vue +++ b/src/components/IconSelect/appMenuSvgPage.vue @@ -59,7 +59,7 @@ const handleClose = () => { @ 功能: 确定 */ const handleSelect = (svgName:string) => { - // console.log("确定",props.svgId) + console.log("确定",props.svgId,svgName) emits("update:svgName",svgName) handleClose() } diff --git a/src/components/workflow/drwer/approverDrawer.vue b/src/components/workflow/drwer/approverDrawer.vue index 5986621..599feea 100644 --- a/src/components/workflow/drwer/approverDrawer.vue +++ b/src/components/workflow/drwer/approverDrawer.vue @@ -9,6 +9,8 @@ import { setTypes, selectModes, selectRanges } from '@/utils/workflow/const' import { useStore } from '@/store/workflow/index' import { getAllParentNode,judgeOptionalNode,analysisForm,setFlowFormKeyPower } from '@/api/workflowapi/index' +import { govthree } from '@/api/opk/opk/api' + import PositionDialog from '@/components/workflow/dialog/positionDialog.vue' import FormWord from '@/components/workflow/dialog/formWord.vue' import MatrixPage from '@/components/workflow/dialog/matrix.vue' @@ -44,10 +46,17 @@ let props = defineProps({ } } }); +const flowOrgTree = ref() const isExecutor = ref(false) const nodeTitle = ref("审批人设置") const nodeOptional = ref() //审批线已经存在得节点 const nodeAllVerify = ref() +const orgList = ref() //行政组织 +const orgProps = { + value: 'id', + label: 'name', + children: 'child', +} const isLookAll = ref(false) const isEditAll = ref(false) @@ -385,6 +394,48 @@ const oneEditSet = (val: any) => { } } } + +//监听审批人设置选项 +watch(()=>approverConfig.value.settype,(val:any)=>{ + console.log("监听审批人设置选项",approverConfig.value) + switch (val) { + case 10: + let sendOrg = { + id: 313, + idstr: "313", + level: 4, + all: 1 + } + govthree(sendOrg) + .then(({data})=>{ + console.log("监听审批人设置选项",data) + orgList.value = data + }) + break; + + default: + break; + } +},{ + deep:true +}) +/** +@ 作者: 秦东 +@ 时间: 2024-08-08 15:54:07 +@ 功能: 选中的哪个行政组织 +*/ +const handleNodeClickOrg = (val:any) => { + console.log(val) +} +/** +@ 作者: 秦东 +@ 时间: 2024-08-08 16:07:49 +@ 功能: 设置选项 +*/ +const setOrgTree = (val:any) => { + console.log("设置选项",val) + flowOrgTree.value!.setCheckedKeys([val], true) +}