Commit 4342c3ee by jason

【功能修改】 新审批界面气泡卡按钮功能

parent a4a4dcdf
...@@ -106,6 +106,11 @@ export const signDeleteTask = async (data: any) => { ...@@ -106,6 +106,11 @@ export const signDeleteTask = async (data: any) => {
return await request.delete({ url: '/bpm/task/delete-sign', data }) return await request.delete({ url: '/bpm/task/delete-sign', data })
} }
// 抄送
export const copyTask = async (data: any) => {
return await request.put({ url: '/bpm/task/copy', data })
}
// 获取减签任务列表 // 获取减签任务列表
export const getChildrenTaskList = async (id: string) => { export const getChildrenTaskList = async (id: string) => {
return await request.get({ url: '/bpm/task/list-by-parent-task-id?parentTaskId=' + id }) return await request.get({ url: '/bpm/task/list-by-parent-task-id?parentTaskId=' + id })
......
...@@ -362,7 +362,11 @@ export enum OperationButtonType { ...@@ -362,7 +362,11 @@ export enum OperationButtonType {
/** /**
* 回退 * 回退
*/ */
RETURN = 6 RETURN = 6,
/**
* 抄送
*/
COPY = 7
} }
/** /**
...@@ -504,6 +508,7 @@ OPERATION_BUTTON_NAME.set(OperationButtonType.TRANSFER, '转办') ...@@ -504,6 +508,7 @@ OPERATION_BUTTON_NAME.set(OperationButtonType.TRANSFER, '转办')
OPERATION_BUTTON_NAME.set(OperationButtonType.DELEGATE, '委派') OPERATION_BUTTON_NAME.set(OperationButtonType.DELEGATE, '委派')
OPERATION_BUTTON_NAME.set(OperationButtonType.ADD_SIGN, '加签') OPERATION_BUTTON_NAME.set(OperationButtonType.ADD_SIGN, '加签')
OPERATION_BUTTON_NAME.set(OperationButtonType.RETURN, '回退') OPERATION_BUTTON_NAME.set(OperationButtonType.RETURN, '回退')
OPERATION_BUTTON_NAME.set(OperationButtonType.COPY, '抄送')
// 默认的按钮权限设置 // 默认的按钮权限设置
export const DEFAULT_BUTTON_SETTING: ButtonSetting[] = [ export const DEFAULT_BUTTON_SETTING: ButtonSetting[] = [
......
...@@ -202,12 +202,18 @@ const getProcessInstance = async () => { ...@@ -202,12 +202,18 @@ const getProcessInstance = async () => {
activityId: props.activityId activityId: props.activityId
}) })
} }
if (detailForm.value.rule.length > 0) { // 避免刷新 form-create 表单不显示
detailForm.value.value = data.formVariables
} else {
setConfAndFields2( setConfAndFields2(
detailForm, detailForm,
processDefinition.formConf, processDefinition.formConf,
processDefinition.formFields, processDefinition.formFields,
data.formVariables data.formVariables
) )
}
nextTick().then(() => { nextTick().then(() => {
fApi.value?.btn.show(false) fApi.value?.btn.show(false)
fApi.value?.resetBtn.show(false) fApi.value?.resetBtn.show(false)
......
...@@ -55,6 +55,7 @@ ...@@ -55,6 +55,7 @@
/> />
<el-table-column align="center" label="抄送任务" prop="taskName" min-width="180" /> <el-table-column align="center" label="抄送任务" prop="taskName" min-width="180" />
<el-table-column align="center" label="抄送人" prop="creatorName" min-width="100" /> <el-table-column align="center" label="抄送人" prop="creatorName" min-width="100" />
<el-table-column align="center" label="抄送意见" prop="reason" width="150" />
<el-table-column <el-table-column
align="center" align="center"
label="抄送时间" label="抄送时间"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment