From f95f6e8390c355bd601849de26b338bb64c97b90 Mon Sep 17 00:00:00 2001
From: gssong <1742057357@qq.com>
Date: 星期五, 07 六月 2024 21:38:17 +0800
Subject: [PATCH] update 优化审批按钮判断
---
src/views/workflow/leave/leaveEdit.vue | 47 +++++++++--------------
src/api/workflow/processInstance/index.ts | 2
src/components/Process/multiInstanceUser.vue | 60 +++++++++++++++++------------
src/components/Process/approvalRecord.vue | 2
4 files changed, 56 insertions(+), 55 deletions(-)
diff --git a/src/api/workflow/processInstance/index.ts b/src/api/workflow/processInstance/index.ts
index b949b51..6d5e53b 100644
--- a/src/api/workflow/processInstance/index.ts
+++ b/src/api/workflow/processInstance/index.ts
@@ -53,7 +53,7 @@
* @param businessKey 涓氬姟id
* @returns
*/
-export const getHistoryRecord = (businessKey: string) => {
+export const getHistoryRecord = (businessKey: string | number) => {
return request({
url: `/workflow/processInstance/getHistoryRecord/${businessKey}`,
method: 'get'
diff --git a/src/components/Process/approvalRecord.vue b/src/components/Process/approvalRecord.vue
index 37667ca..bb4ed91 100644
--- a/src/components/Process/approvalRecord.vue
+++ b/src/components/Process/approvalRecord.vue
@@ -67,7 +67,7 @@
const bpmnViewRef = ref<BpmnView>();
//鍒濆鍖栨煡璇㈠鎵硅褰�
-const init = async (businessKey: string) => {
+const init = async (businessKey: string | number) => {
visible.value = true;
loading.value = true;
tabActiveName.value = 'bpmn';
diff --git a/src/components/Process/multiInstanceUser.vue b/src/components/Process/multiInstanceUser.vue
index b2039b9..292b1b7 100644
--- a/src/components/Process/multiInstanceUser.vue
+++ b/src/components/Process/multiInstanceUser.vue
@@ -1,22 +1,28 @@
<template>
- <el-dialog v-model="visible" draggable :title="title" :width="width" :height="height" append-to-body
- :close-on-click-modal="false">
- <div class="p-2" v-if="multiInstance === 'add'">
+ <el-dialog v-model="visible" draggable :title="title" :width="width" :height="height" append-to-body :close-on-click-modal="false">
+ <div v-if="multiInstance === 'add'" class="p-2">
<el-row :gutter="20">
<!-- 閮ㄩ棬鏍� -->
<el-col :lg="4" :xs="24" style="">
<el-card shadow="hover">
<el-input v-model="deptName" placeholder="璇疯緭鍏ラ儴闂ㄥ悕绉�" prefix-icon="Search" clearable />
- <el-tree class="mt-2" ref="deptTreeRef" node-key="id" :data="deptOptions"
- :props="{ label: 'label', children: 'children' }" :expand-on-click-node="false"
- :filter-node-method="filterNode" highlight-current default-expand-all
- @node-click="handleNodeClick"></el-tree>
+ <el-tree
+ ref="deptTreeRef"
+ class="mt-2"
+ node-key="id"
+ :data="deptOptions"
+ :props="{ label: 'label', children: 'children' }"
+ :expand-on-click-node="false"
+ :filter-node-method="filterNode"
+ highlight-current
+ default-expand-all
+ @node-click="handleNodeClick"
+ ></el-tree>
</el-card>
</el-col>
<el-col :lg="20" :xs="24">
- <transition :enter-active-class="proxy?.animate.searchAnimate.enter"
- :leave-active-class="proxy?.animate.searchAnimate.leave">
- <div class="search" v-show="showSearch">
+ <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
+ <div v-show="showSearch" class="search">
<el-form ref="queryFormRef" :model="queryParams" :inline="true">
<el-form-item label="鐢ㄦ埛鍚嶇О" prop="userName">
<el-input v-model="queryParams.userName" placeholder="璇疯緭鍏ョ敤鎴峰悕绉�" clearable @keyup.enter="handleQuery" />
@@ -25,8 +31,8 @@
<el-input v-model="queryParams.phonenumber" placeholder="璇疯緭鍏ユ墜鏈哄彿鐮�" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item>
- <el-button type="primary" @click="handleQuery" icon="Search">鎼滅储</el-button>
- <el-button @click="resetQuery" icon="Refresh">閲嶇疆</el-button>
+ <el-button type="primary" icon="Search" @click="handleQuery">鎼滅储</el-button>
+ <el-button icon="Refresh" @click="resetQuery">閲嶇疆</el-button>
</el-form-item>
</el-form>
</div>
@@ -35,17 +41,16 @@
<el-card shadow="hover">
<template #header>
<el-row :gutter="10">
- <right-toolbar v-model:showSearch="showSearch" @queryTable="handleQuery" :search="true"></right-toolbar>
+ <right-toolbar v-model:showSearch="showSearch" :search="true" @query-table="handleQuery"></right-toolbar>
</el-row>
</template>
- <el-table v-loading="loading" :data="userList" ref="multipleTableRef" row-key="userId"
- @selection-change="handleSelectionChange">
+ <el-table ref="multipleTableRef" v-loading="loading" :data="userList" row-key="userId" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="50" align="center" />
- <el-table-column label="鐢ㄦ埛缂栧彿" align="center" key="userId" prop="userId" />
- <el-table-column label="鐢ㄦ埛鍚嶇О" align="center" key="userName" prop="userName" :show-overflow-tooltip="true" />
- <el-table-column label="鐢ㄦ埛鏄电О" align="center" key="nickName" prop="nickName" :show-overflow-tooltip="true" />
- <el-table-column label="鎵嬫満鍙风爜" align="center" key="phonenumber" prop="phonenumber" width="120" />
+ <el-table-column key="userId" label="鐢ㄦ埛缂栧彿" align="center" prop="userId" />
+ <el-table-column key="userName" label="鐢ㄦ埛鍚嶇О" align="center" prop="userName" :show-overflow-tooltip="true" />
+ <el-table-column key="nickName" label="鐢ㄦ埛鏄电О" align="center" prop="nickName" :show-overflow-tooltip="true" />
+ <el-table-column key="phonenumber" label="鎵嬫満鍙风爜" align="center" prop="phonenumber" width="120" />
<el-table-column label="鍒涘缓鏃堕棿" align="center" prop="createTime" width="160">
<template #default="scope">
<span>{{ scope.row.createTime }}</span>
@@ -53,18 +58,23 @@
</el-table-column>
</el-table>
- <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
- v-model:limit="queryParams.pageSize" @pagination="handleQuery" />
+ <pagination
+ v-show="total > 0"
+ v-model:page="queryParams.pageNum"
+ v-model:limit="queryParams.pageSize"
+ :total="total"
+ @pagination="handleQuery"
+ />
</el-card>
<el-card shadow="hover">
- <el-tag v-for="(user, index) in chooseUserList" :key="user.userId" style="margin:2px" closable
- @close="handleCloseTag(user, index)">{{ user.userName }}
+ <el-tag v-for="(user, index) in chooseUserList" :key="user.userId" style="margin: 2px" closable @close="handleCloseTag(user, index)"
+ >{{ user.userName }}
</el-tag>
</el-card>
</el-col>
</el-row>
</div>
- <div class="p-2" v-if="multiInstance === 'delete'">
+ <div v-if="multiInstance === 'delete'" class="p-2">
<el-table v-loading="loading" :data="taskList" @selection-change="handleTaskSelection">
<el-table-column type="selection" width="55" />
<el-table-column prop="name" label="浠诲姟鍚嶇О" />
@@ -285,7 +295,7 @@
//鍒犻櫎tag
const handleCloseTag = (user: UserVO, index: any) => {
if (multipleTableRef.value.selection && multipleTableRef.value.selection.length > 0) {
- multipleTableRef.value.selection.forEach((u: UserVO, i: Number) => {
+ multipleTableRef.value.selection.forEach((u: UserVO, i: number) => {
if (user.userId === u.userId) {
multipleTableRef.value.selection.splice(i, 1);
}
diff --git a/src/views/workflow/leave/leaveEdit.vue b/src/views/workflow/leave/leaveEdit.vue
index 28087ab..a4ed946 100644
--- a/src/views/workflow/leave/leaveEdit.vue
+++ b/src/views/workflow/leave/leaveEdit.vue
@@ -3,34 +3,10 @@
<el-card shadow="never">
<div style="display: flex; justify-content: space-between">
<div>
- <el-button
- v-if="
- routeParams.type === 'add' ||
- (routeParams.type === 'update' && form.status && (form.status === 'draft' || form.status === 'cancel' || form.status === 'back'))
- "
- :loading="buttonLoading"
- type="info"
- @click="submitForm('draft')"
- >鏆傚瓨</el-button
- >
- <el-button
- v-if="
- routeParams.type === 'add' ||
- (routeParams.type === 'update' && form.status && (form.status === 'draft' || form.status === 'cancel' || form.status === 'back'))
- "
- :loading="buttonLoading"
- type="primary"
- @click="submitForm('submit')"
- >鎻� 浜�</el-button
- >
- <el-button
- v-if="routeParams.type === 'approval' && form.status && form.status === 'waiting'"
- :loading="buttonLoading"
- type="primary"
- @click="approvalVerifyOpen"
- >瀹℃壒</el-button
- >
- <el-button v-if="form.status !== 'draft'" type="primary" @click="handleApprovalRecord">娴佺▼杩涘害</el-button>
+ <el-button v-if="submitButtonShow" :loading="buttonLoading" type="info" @click="submitForm('draft')">鏆傚瓨</el-button>
+ <el-button v-if="submitButtonShow" :loading="buttonLoading" type="primary" @click="submitForm('submit')">鎻� 浜�</el-button>
+ <el-button v-if="approvalButtonShow" :loading="buttonLoading" type="primary" @click="approvalVerifyOpen">瀹℃壒</el-button>
+ <el-button v-if="form && form.id && form.status !== 'draft'" type="primary" @click="handleApprovalRecord">娴佺▼杩涘害</el-button>
</div>
<div>
<el-button style="float: right" @click="goBack()">杩斿洖</el-button>
@@ -246,6 +222,21 @@
const approvalVerifyOpen = async () => {
submitVerifyRef.value.openDialog(routeParams.value.taskId);
};
+//鏍￠獙鎻愪氦鎸夐挳鏄惁鏄剧ず
+const submitButtonShow = computed(() => {
+ return (
+ routeParams.value.type === 'add' ||
+ (routeParams.value.type === 'update' &&
+ form.value.status &&
+ (form.value.status === 'draft' || form.value.status === 'cancel' || form.value.status === 'back'))
+ );
+});
+
+//鏍￠獙瀹℃壒鎸夐挳鏄惁鏄剧ず
+const approvalButtonShow = computed(() => {
+ return routeParams.value.type === 'approval' && form.value.status && form.value.status === 'waiting';
+});
+
onMounted(() => {
nextTick(async () => {
routeParams.value = proxy.$route.query;
--
Gitblit v1.9.3