From 31bfd630990527fcfbb44fc0ebf2cf8a2382ecef Mon Sep 17 00:00:00 2001 From: herenshan112 Date: Thu, 18 Apr 2024 09:45:40 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E9=A1=B5=E9=9D=A2=E5=8F=91?= =?UTF-8?q?=E5=B8=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/DesignForm/tableButton.ts | 81 +++ src/api/taskapi/management.ts | 33 ++ src/api/taskapi/types.ts | 16 + .../workflow/dialog/employeesDialog.vue | 17 +- src/components/workflow/selectResult.vue | 2 +- src/types/components.d.ts | 1 + src/utils/request.ts | 2 + src/utils/requestfile.ts | 4 +- .../lowcodepage/lowCodeFormPage.vue | 2 +- .../sysworkflow/lowcodepage/pageList.vue | 4 +- .../lowcodepage/pageListHeadTools.vue | 4 +- .../sysworkflow/lowcodepage/setUpPage.vue | 500 +++++++++++++++++- 12 files changed, 637 insertions(+), 29 deletions(-) diff --git a/src/api/DesignForm/tableButton.ts b/src/api/DesignForm/tableButton.ts index d059536ce..ad6e533cc 100644 --- a/src/api/DesignForm/tableButton.ts +++ b/src/api/DesignForm/tableButton.ts @@ -208,3 +208,84 @@ export const submitAndCancelButton = { } ] }; + +export const tipMstClass = [ + { + value: 1, + label: '流程提醒', + }, + { + value: 2, + label: '表单提醒', + }, +] +export const tipMstTypeClass = [ + { + value: 1, + label: '只提醒一次', + }, + { + value: 2, + label: '周期性提醒', + }, +] +export const repetitionPeriodClass = [ + { + value: 1, + label: '每天', + }, + { + value: 2, + label: 'N天', + }, + { + value: 3, + label: '每小时', + }, + { + value: 4, + label: 'N小时', + }, + { + value: 5, + label: 'N分钟', + }, + { + value: 6, + label: '每星期', + }, + { + value: 7, + label: '每月', + } +] +export const weekForDay = [ + { + value: 1, + label: '周一', + }, + { + value: 2, + label: '周二', + }, + { + value: 3, + label: '周三', + }, + { + value: 4, + label: '周四', + }, + { + value: 5, + label: '周五', + }, + { + value: 6, + label: '周六', + }, + { + value: 7, + label: '周日', + } +] diff --git a/src/api/taskapi/management.ts b/src/api/taskapi/management.ts index 93cb8a472..4ee73418a 100644 --- a/src/api/taskapi/management.ts +++ b/src/api/taskapi/management.ts @@ -149,3 +149,36 @@ export function authorizeWorkflow(data?:any){ data: data }); } +//获取流程可见范围 +export function gainFlowLookSee(data?:any){ + return request({ + url: '/systemapi/task_flow/gainFlowLookSee', + method: 'post', + data: data + }); +} +//编辑可见范围 +export function editLookPowerView(data?:any){ + return request({ + url: '/systemapi/task_flow/editLookPowerView', + method: 'post', + data: data + }); +} + +//编辑消息提醒 +export function setUpMsg(data?:any){ + return request({ + url: '/systemapi/task_flow/setUpMsg', + method: 'post', + data: data + }); +} +//获取消息设置 +export function gainSetUpMsg(data?:any){ + return request({ + url: '/systemapi/task_flow/gainSetUpMsg', + method: 'post', + data: data + }); +} diff --git a/src/api/taskapi/types.ts b/src/api/taskapi/types.ts index 02dba6714..e5d114eab 100644 --- a/src/api/taskapi/types.ts +++ b/src/api/taskapi/types.ts @@ -93,3 +93,19 @@ export interface nodeUserInfo{ icon?:string; iconToBase64?:string; } + +//提醒设置表单 +export interface tipMsgInfo{ + types:number; //1：流程提醒；2：表单提醒 + tipClass:number; //1:只提醒一次；2：周期性提醒 + specifyTime?:number; //指定时间 + repetitionPeriod?:number; //重复周期 + tipMsg?:string; //提示语句 +} +//执行周期 +export interface runWeekInfo { + week:number; + day:number; + hour:number; + minute:number; +} diff --git a/src/components/workflow/dialog/employeesDialog.vue b/src/components/workflow/dialog/employeesDialog.vue index 32c014b62..32c2402d3 100644 --- a/src/components/workflow/dialog/employeesDialog.vue +++ b/src/components/workflow/dialog/employeesDialog.vue @@ -54,6 +54,7 @@ let list = computed(()=> { }] }) let resList = computed(()=>{ + console.log("checkedEmployessList.value",checkedEmployessList.value) let data = [{ type: 'employee', data: checkedEmployessList.value, @@ -76,7 +77,9 @@ let saveDialog = ()=> { ].map(item=>({ type: item.employeeName ? 1: 3, targetId: item.id, - name: item.employeeName || item.departmentName + name: item.employeeName || item.departmentName, + icon: item.icon || item.icon, + iconToBase64: item.iconToBase64 || item.iconToBase64 })) emits('change',checkedList) } @@ -90,13 +93,17 @@ watch(()=> props.visible, (val:any)=>{ searchVal.value = ""; // console.log("props.data:",props.data) if(props.data){ - checkedEmployessList.value = props.data.filter((item:any)=>item.type===1).map(({name,targetId})=>({ + checkedEmployessList.value = props.data.filter((item:any)=>item.type===1).map(({name,targetId,icon,iconToBase64})=>({ employeeName: name, - id: targetId + id: targetId, + icon:icon, + iconToBase64:iconToBase64 })); - checkedDepartmentList.value = props.data.filter((item:any)=>item.type===3).map(({name,targetId})=>({ + checkedDepartmentList.value = props.data.filter((item:any)=>item.type===3).map(({name,targetId,icon,iconToBase64})=>({ departmentName: name, - id: targetId + id: targetId, + icon:icon, + iconToBase64:iconToBase64 })); } diff --git a/src/components/workflow/selectResult.vue b/src/components/workflow/selectResult.vue index 3d5613bb1..dc14218e1 100644 --- a/src/components/workflow/selectResult.vue +++ b/src/components/workflow/selectResult.vue @@ -15,7 +15,7 @@ let props = defineProps({ } }) let emits = defineEmits(['del']) - +console.log("已选择得内容",props.list)