diff --git a/src/api/workflow/category/types.ts b/src/api/workflow/category/types.ts
index a093073..99a53a6 100644
--- a/src/api/workflow/category/types.ts
+++ b/src/api/workflow/category/types.ts
@@ -6,7 +6,6 @@ export interface CategoryTreeVO {
children: CategoryTreeVO[];
}
export interface CategoryVO {
-
/**
* 流程分类ID
*/
@@ -39,7 +38,6 @@ export interface CategoryVO {
}
export interface CategoryForm extends BaseEntity {
-
/**
* 流程分类ID
*/
@@ -59,14 +57,11 @@ export interface CategoryForm extends BaseEntity {
* 显示顺序
*/
orderNum?: number;
-
}
export interface CategoryQuery {
-
/**
* 流程分类名称
*/
categoryName?: string;
-
}
diff --git a/src/api/workflow/task/types.ts b/src/api/workflow/task/types.ts
index 8ea803b..902d84d 100644
--- a/src/api/workflow/task/types.ts
+++ b/src/api/workflow/task/types.ts
@@ -29,8 +29,13 @@ export interface FlowTaskVO {
nodeType: number;
nodeRatio: string | number;
version?: string;
+ buttonList?: buttonList[];
}
+export interface buttonList {
+ code: string;
+ show: boolean;
+}
export interface VariableVo {
key: string;
value: string;
diff --git a/src/components/Process/submitVerify.vue b/src/components/Process/submitVerify.vue
index 1c985de..6e0f548 100644
--- a/src/components/Process/submitVerify.vue
+++ b/src/components/Process/submitVerify.vue
@@ -11,7 +11,7 @@
-
+
{{ user.nickName }}
@@ -24,10 +24,14 @@
@@ -72,7 +85,11 @@
-
+
@@ -142,6 +159,10 @@ const backLoading = ref(true);
const backButtonDisabled = ref(true);
// 可驳回得任务节点
const taskNodeList = ref([]);
+const buttonObj = ref({
+ code: undefined,
+ show: false
+});
//任务
const task = ref({
id: undefined,
@@ -159,7 +180,8 @@ const task = ref({
formCustom: undefined,
formPath: undefined,
nodeType: undefined,
- nodeRatio: undefined
+ nodeRatio: undefined,
+ buttonList: []
});
const dialog = reactive({
visible: false,
@@ -181,6 +203,7 @@ const backForm = ref>({
variables: {},
messageType: ['1']
});
+
//打开弹窗
const openDialog = (id?: string) => {
selectCopyUserIds.value = undefined;
@@ -194,6 +217,10 @@ const openDialog = (id?: string) => {
nextTick(() => {
getTask(taskId.value).then((response) => {
task.value = response.data;
+ buttonObj.value = [];
+ task.value.buttonList.forEach((e) => {
+ buttonObj.value[e.code] = e.show;
+ });
loading.value = false;
buttonDisabled.value = false;
});
@@ -208,9 +235,9 @@ const handleCompleteTask = async () => {
form.value.taskId = taskId.value;
form.value.taskVariables = props.taskVariables;
if (selectCopyUserList.value && selectCopyUserList.value.length > 0) {
- let flowCopyList = [];
+ const flowCopyList = [];
selectCopyUserList.value.forEach((e) => {
- let copyUser = {
+ const copyUser = {
userId: e.userId,
userName: e.nickName
};
@@ -239,7 +266,7 @@ const handleBackProcessOpen = async () => {
backVisible.value = true;
backLoading.value = true;
backButtonDisabled.value = true;
- let data = await getBackTaskNode(task.value.definitionId, task.value.nodeCode);
+ const data = await getBackTaskNode(task.value.definitionId, task.value.nodeCode);
taskNodeList.value = data.data;
backLoading.value = false;
backButtonDisabled.value = false;
@@ -386,7 +413,7 @@ const handleDelegateTask = async (data) => {
};
//终止任务
const handleTerminationTask = async () => {
- let params = {
+ const params = {
taskId: taskId.value,
comment: form.value.message
};
@@ -402,7 +429,7 @@ const handleTerminationTask = async () => {
proxy?.$modal.msgSuccess('操作成功');
};
const handleTaskUser = async () => {
- let data = await currentTaskAllUser(taskId.value);
+ const data = await currentTaskAllUser(taskId.value);
deleteUserList.value = data.data;
if (deleteUserList.value && deleteUserList.value.length > 0) {
deleteUserList.value.forEach((e) => {