From 8d4cad6867628a181d5b80ae22b4c26930d6c8f0 Mon Sep 17 00:00:00 2001 From: herenshan112 Date: Thu, 30 May 2024 13:26:47 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E9=99=A4=E9=9B=86=E6=88=90?= =?UTF-8?q?=E8=87=AA=E5=8A=A8=E5=8C=96=E4=BB=A5=E5=A4=96=E7=9A=84=E5=BC=80?= =?UTF-8?q?=E5=8F=91=E5=B7=A5=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/DesignForm/requestapi.ts | 24 ++ src/api/hr/people/index.ts | 52 ++++ src/types/components.d.ts | 8 + src/views/hr/orgUserRole/org.vue | 57 ++++- src/views/hr/orgUserRole/orgrole.vue | 167 +++++++++++- src/views/hr/orgUserRole/rolePage.vue | 242 ++++++++++++++++++ src/views/hr/userBox.vue | 36 ++- .../codepage/datatablestructure.vue | 5 +- .../sysworkflow/lowcodepage/appFormList.vue | 62 ++++- .../lowcodepage/appPage/appMenus.vue | 4 +- .../appPage/appPageForm/openAppFormPage.vue | 4 + .../appPage/appSetUp/appDevOps.vue | 143 +++++++++++ .../appPage/appSetUp/appManager.vue | 163 ++++++++++++ .../lowcodepage/appPage/appSetUp/appPower.vue | 36 +-- .../appPage/appSetUp/dataManagement.vue | 190 ++++++++++++++ .../appPage/appSetUp/devops/appinfo.vue | 14 + .../appPage/appSetUp/devops/tableForm.vue | 38 +++ .../lowcodepage/appPage/appSetUp/index.vue | 8 +- .../lowcodepage/appPage/appSetUp/looksee.vue | 80 +++++- .../lowcodepage/appPage/createAppFormPage.vue | 30 ++- .../sysworkflow/lowcodepage/appPage/index.vue | 13 +- .../lowcodepage/appPage/releaseApp/index.vue | 148 +++++++++++ .../sysworkflow/lowcodepage/runApp/index.vue | 188 ++++++++++++++ 23 files changed, 1631 insertions(+), 81 deletions(-) create mode 100644 src/views/hr/orgUserRole/rolePage.vue create mode 100644 src/views/sysworkflow/lowcodepage/appPage/appSetUp/appDevOps.vue create mode 100644 src/views/sysworkflow/lowcodepage/appPage/appSetUp/appManager.vue create mode 100644 src/views/sysworkflow/lowcodepage/appPage/appSetUp/dataManagement.vue create mode 100644 src/views/sysworkflow/lowcodepage/appPage/appSetUp/devops/appinfo.vue create mode 100644 src/views/sysworkflow/lowcodepage/appPage/appSetUp/devops/tableForm.vue create mode 100644 src/views/sysworkflow/lowcodepage/appPage/releaseApp/index.vue create mode 100644 src/views/sysworkflow/lowcodepage/runApp/index.vue diff --git a/src/api/DesignForm/requestapi.ts b/src/api/DesignForm/requestapi.ts index 166c5278b..cbbf48561 100644 --- a/src/api/DesignForm/requestapi.ts +++ b/src/api/DesignForm/requestapi.ts @@ -464,3 +464,27 @@ export function appBasicSettings(data: any) { data: data }); } +//获取应用下属表单 +export function gianAppFormTable(data: any) { + return request({ + url: '/systemapi/app/gianAppFormTable', + method: 'post', + data: data + }); +} +//获取应用下属表单 +export function setCustomerFormState(data: any) { + return request({ + url: '/systemapi/app/setCustomerFormState', + method: 'post', + data: data + }); +} +//鉴定当权人员是否有权限使用 +export function appJwtPower(data: any) { + return request({ + url: '/systemapi/app/appJwtPower', + method: 'post', + data: data + }); +} diff --git a/src/api/hr/people/index.ts b/src/api/hr/people/index.ts index 525a0b22a..3e22054a9 100644 --- a/src/api/hr/people/index.ts +++ b/src/api/hr/people/index.ts @@ -377,6 +377,16 @@ import { data: data }); } +/** + * 搜索组织和人员 + */ +export function searchOrgUser(data: any) { + return request({ + url: '/hrapi/staff/searchOrgUser', + method: 'post', + data: data + }); +} /** * 获取角色列表 */ @@ -387,3 +397,45 @@ import { data: data }); } + +/** + * 设置可见范围 + */ + export function setLookViews(data: any) { + return request({ + url: '/systemapi/app/setLookViews', + method: 'post', + data: data + }); +} + +/** + * 设置管理使用人员 + */ + export function setAppManagerInfo(data: any) { + return request({ + url: '/systemapi/app/setAppManagerInfo', + method: 'post', + data: data + }); +} +/** + * 获取可见范围数据及应用管理 + */ + export function gainLookViews(data: any) { + return request({ + url: '/systemapi/app/gainLookViews', + method: 'post', + data: data + }); +} +/** + * 获取应用下属表单 + */ + export function gianAppFormTable(data: any) { + return request({ + url: '/systemapi/app/gianAppFormTable', + method: 'post', + data: data + }); +} diff --git a/src/types/components.d.ts b/src/types/components.d.ts index d33f62fbb..9ba9dc018 100644 --- a/src/types/components.d.ts +++ b/src/types/components.d.ts @@ -34,6 +34,7 @@ declare module '@vue/runtime-core' { ElCard: typeof import('element-plus/es')['ElCard'] ElCarousel: typeof import('element-plus/es')['ElCarousel'] ElCarouselItem: typeof import('element-plus/es')['ElCarouselItem'] + ElCascader: typeof import('element-plus/es')['ElCascader'] ElCheckbox: typeof import('element-plus/es')['ElCheckbox'] ElCheckboxGroup: typeof import('element-plus/es')['ElCheckboxGroup'] ElCol: typeof import('element-plus/es')['ElCol'] @@ -116,6 +117,13 @@ declare module '@vue/runtime-core' { IconSelect: typeof import('./../components/IconSelect/index.vue')['default'] IEpCaretBottom: typeof import('~icons/ep/caret-bottom')['default'] IEpClose: typeof import('~icons/ep/close')['default'] + IEpDelete: typeof import('~icons/ep/delete')['default'] + IEpEdit: typeof import('~icons/ep/edit')['default'] + IEpMessageBox: typeof import('~icons/ep/message-box')['default'] + IEpOperation: typeof import('~icons/ep/operation')['default'] + IEpPlus: typeof import('~icons/ep/plus')['default'] + IEpRefresh: typeof import('~icons/ep/refresh')['default'] + IEpSearch: typeof import('~icons/ep/search')['default'] IEpSetting: typeof import('~icons/ep/setting')['default'] LangSelect: typeof import('./../components/LangSelect/index.vue')['default'] LayoutPage: typeof import('./../components/DesignForm/layoutPage/index.vue')['default'] diff --git a/src/views/hr/orgUserRole/org.vue b/src/views/hr/orgUserRole/org.vue index ad595d718..10b79ea8c 100644 --- a/src/views/hr/orgUserRole/org.vue +++ b/src/views/hr/orgUserRole/org.vue @@ -7,7 +7,7 @@ import { Search,ArrowRight } from '@element-plus/icons-vue' //搜索图标 import { userOrgRole,crumb } from '@/api/hr/search/types' -import { gainSunOrgAndUser } from '@/api/hr/people/index' +import { gainSunOrgAndUser,searchOrgUser } from '@/api/hr/people/index' const props = defineProps({ pickList:{ @@ -15,6 +15,10 @@ const props = defineProps({ default(){ return {} } + }, + orgTrue:{ + type:Number, + default:1 } }) @@ -59,12 +63,12 @@ const dataLoading = (orgId?:string) => { let isTrue = true pickLists.value.forEach((itemVal:userOrgRole)=>{ if(item.id == itemVal.id){ - item.isPick = true; + item.isPick = 1; isTrue = false; } }) if(isTrue){ - item.isPick = false; + item.isPick = 2; } }) } @@ -73,7 +77,15 @@ const dataLoading = (orgId?:string) => { //初始加载 onMounted(()=>{ - dataLoading() + if(props.pickList.value.length > 0){ + pickLists.value = props.pickList.value + nextTick(() => { + dataLoading() + }) + }else{ + dataLoading() + } + }) /** @ 作者: 秦东 @@ -122,12 +134,12 @@ watch(() => props.pickList, (val:userOrgRole[])=>{ let isTrue = true val.forEach((itemVal:userOrgRole)=>{ if(item.id == itemVal.id){ - item.isPick = true; + item.isPick = 1; isTrue = false; } }) if(isTrue){ - item.isPick = false; + item.isPick = 2; } }) },{ @@ -142,7 +154,22 @@ const pickSunCont = (orgId?:string) => { console.log("选择下一级-------->",orgId) dataLoading(orgId) } - +/** +@ 作者: 秦东 +@ 时间: 2024-05-27 15:14:57 +@ 功能: 搜索组织和人员 +*/ +const searchOrgUs = (val:any) => { + searchOrgUser({name:val}) + .then((data) =>{ + console.log("搜索组织和人员",data) + listAry.value = data.data.orgUserList + // console.log("获取角色",listRoleAry) + }) +} +defineExpose({ + searchOrgUs +})