From b0087d1a50b45c64669f15bd0996f858cb46b086 Mon Sep 17 00:00:00 2001
From: gssong <1742057357@qq.com>
Date: 星期一, 01 四月 2024 20:59:52 +0800
Subject: [PATCH] #I96DTG update 类型下拉框和java类名下拉框没有联动
---
src/views/workflow/task/taskWaiting.vue | 69 +++++++++++++---------------------
1 files changed, 27 insertions(+), 42 deletions(-)
diff --git a/src/views/workflow/task/taskWaiting.vue b/src/views/workflow/task/taskWaiting.vue
index a6443bd..5eb6d83 100644
--- a/src/views/workflow/task/taskWaiting.vue
+++ b/src/views/workflow/task/taskWaiting.vue
@@ -28,9 +28,9 @@
</el-row>
</template>
- <el-table v-loading="loading" :data="taskList" @selection-change="handleSelectionChange">
+ <el-table v-loading="loading" border :data="taskList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
- <el-table-column fixed align="center" type="index" label="搴忓彿" width="50"></el-table-column>
+ <el-table-column fixed align="center" type="index" label="搴忓彿" width="60"></el-table-column>
<el-table-column fixed align="center" prop="processDefinitionName" label="娴佺▼瀹氫箟鍚嶇О"></el-table-column>
<el-table-column fixed align="center" prop="processDefinitionKey" label="娴佺▼瀹氫箟KEY"></el-table-column>
<el-table-column fixed align="center" prop="name" label="浠诲姟鍚嶇О"></el-table-column>
@@ -43,33 +43,25 @@
</template>
<template v-else>
<el-tag type="success">
- {{ scope.row.assigneeName }}
+ {{ scope.row.assigneeName || '鏃�' }}
</el-tag>
</template>
</template>
</el-table-column>
- <el-table-column align="center" prop="businessStatusName" label="娴佺▼鐘舵��" min-width="70">
+ <el-table-column align="center" label="娴佺▼鐘舵��" min-width="70">
<template #default="scope">
- <el-tag type="success">{{ scope.row.businessStatusName }}</el-tag>
+ <dict-tag :options="wf_business_status" :value="scope.row.businessStatus"></dict-tag>
</template>
</el-table-column>
<el-table-column align="center" prop="createTime" label="鍒涘缓鏃堕棿" width="160"></el-table-column>
- <el-table-column label="鎿嶄綔" align="center" width="160" class-name="small-padding fixed-width">
+ <el-table-column label="鎿嶄綔" align="center" width="200">
<template #default="scope">
- <el-row :gutter="10" class="mb8">
- <el-col :span="1.5">
- <el-button link type="primary" size="small" icon="Document" @click="handleApprovalRecord(scope.row)">瀹℃壒璁板綍</el-button>
- </el-col>
- <el-col v-if="scope.row.participantVo && (scope.row.participantVo.claim === null || scope.row.participantVo.claim === true)" :span="1.5">
- <el-button link type="primary" size="small" icon="Edit" @click="submitVerifyOpen(scope.row.id)">鍔炵悊</el-button>
- </el-col>
- <el-col v-if="scope.row.participantVo && scope.row.participantVo.claim === true" :span="1.5">
- <el-button link type="primary" size="small" icon="Document" @click="handleReturnTask(scope.row.id)">褰掕繕</el-button>
- </el-col>
- <el-col v-if="scope.row.participantVo && scope.row.participantVo.claim === false" :span="1.5">
- <el-button link type="primary" size="small" icon="Document" @click="handleClaimTask(scope.row.id)">璁ら</el-button>
- </el-col>
- </el-row>
+ <el-button v-if="scope.row.participantVo && (scope.row.participantVo.claim === null || scope.row.participantVo.claim === true)"
+ type="primary" size="small" icon="Edit" @click="handleOpen(scope.row)">鍔炵悊</el-button>
+ <el-button v-if="scope.row.participantVo && scope.row.participantVo.claim === true"
+ type="primary" size="small" icon="Document" @click="handleReturnTask(scope.row.id)">褰掕繕</el-button>
+ <el-button v-if="scope.row.participantVo && scope.row.participantVo.claim === false"
+ type="primary" size="small" icon="Document" @click="handleClaimTask(scope.row.id)">璁ら</el-button>
</template>
</el-table-column>
</el-table>
@@ -81,24 +73,18 @@
@pagination="handleQuery"
/>
</el-card>
- <!-- 瀹℃壒璁板綍 -->
- <approvalRecord ref="approvalRecordRef" />
- <!-- 鎻愪氦缁勪欢 -->
- <submitVerify ref="submitVerifyRef" @submit-callback="handleQuery" />
</div>
</template>
<script lang="ts" setup>
import { getPageByTaskWait, claim, returnTask } from '@/api/workflow/task';
-import ApprovalRecord from '@/components/Process/approvalRecord.vue';
-import SubmitVerify from '@/components/Process/submitVerify.vue';
import { TaskQuery, TaskVO } from '@/api/workflow/task/types';
-//鎻愪氦缁勪欢
-const submitVerifyRef = ref<InstanceType<typeof SubmitVerify>>();
-//瀹℃壒璁板綍缁勪欢
-const approvalRecordRef = ref<InstanceType<typeof ApprovalRecord>>();
-const queryFormRef = ref<ElFormInstance>();
+import workflowCommon from '@/api/workflow/workflowCommon';
+import { RouterJumpVo } from '@/api/workflow/workflowCommon/types';
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { wf_business_status } = toRefs<any>(proxy?.useDict('wf_business_status'));
+//鎻愪氦缁勪欢
+const queryFormRef = ref<ElFormInstance>();
// 閬僵灞�
const loading = ref(true);
// 閫変腑鏁扮粍
@@ -124,12 +110,6 @@
onMounted(() => {
getWaitingList();
});
-//瀹℃壒璁板綍
-const handleApprovalRecord = (row: TaskVO) => {
- if (approvalRecordRef.value) {
- approvalRecordRef.value.init(row.processInstanceId);
- }
-};
/** 鎼滅储鎸夐挳鎿嶄綔 */
const handleQuery = () => {
getWaitingList();
@@ -156,11 +136,16 @@
loading.value = false;
});
};
-//鎻愪氦
-const submitVerifyOpen = async (id: string) => {
- if (submitVerifyRef.value) {
- submitVerifyRef.value.openDialog(id);
- }
+//鍔炵悊
+const handleOpen = async (row: TaskVO) => {
+ const routerJumpVo = reactive<RouterJumpVo>({
+ wfDefinitionConfigVo: row.wfDefinitionConfigVo,
+ wfNodeConfigVo: row.wfNodeConfigVo,
+ businessKey: row.businessKey,
+ taskId: row.id,
+ type: 'approval'
+ });
+ workflowCommon.routerJump(routerJumpVo,proxy)
};
/** 璁ら浠诲姟 */
--
Gitblit v1.9.3