From 5e440a7dc434c43eb828fa62cf9c12b0078b8565 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期一, 20 一月 2025 11:36:18 +0800
Subject: [PATCH] !173 发布 5.3.0-BETA 公测版本 Merge pull request !173 from 疯狂的狮子Li/dev
---
src/views/workflow/leave/index.vue | 68 +++++++++++++++------------------
1 files changed, 31 insertions(+), 37 deletions(-)
diff --git a/src/views/workflow/leave/index.vue b/src/views/workflow/leave/index.vue
index f413136..2c8da0e 100644
--- a/src/views/workflow/leave/index.vue
+++ b/src/views/workflow/leave/index.vue
@@ -27,11 +27,11 @@
<el-col :span="1.5">
<el-button v-hasPermi="['workflow:leave:export']" type="warning" plain icon="Download" @click="handleExport">瀵煎嚭</el-button>
</el-col>
- <right-toolbar v-model:showSearch="showSearch" @query-table="getList"></right-toolbar>
+ <right-toolbar v-model:show-search="showSearch" @query-table="getList"></right-toolbar>
</el-row>
</template>
- <el-table v-loading="loading" :data="leaveList" @selection-change="handleSelectionChange">
+ <el-table v-loading="loading" border :data="leaveList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column v-if="false" label="涓婚敭" align="center" prop="id" />
<el-table-column label="璇峰亣绫诲瀷" align="center">
@@ -41,12 +41,12 @@
</el-table-column>
<el-table-column label="寮�濮嬫椂闂�" align="center" prop="startDate">
<template #default="scope">
- <span>{{ parseTime(scope.row.startDate, '{y}-{m}-{d}') }}</span>
+ <span>{{ proxy.parseTime(scope.row.startDate, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="缁撴潫鏃堕棿" align="center" prop="endDate">
<template #default="scope">
- <span>{{ parseTime(scope.row.endDate, '{y}-{m}-{d}') }}</span>
+ <span>{{ proxy.parseTime(scope.row.endDate, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="璇峰亣澶╂暟" align="center" prop="leaveDays" />
@@ -56,38 +56,28 @@
<dict-tag :options="wf_business_status" :value="scope.row.status"></dict-tag>
</template>
</el-table-column>
- <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
+ <el-table-column label="鎿嶄綔" align="center" width="162">
<template #default="scope">
- <el-button
- v-if="scope.row.status === 'draft' || scope.row.status === 'cancel' || scope.row.status === 'back'"
- v-hasPermi="['workflow:leave:edit']"
- size="small"
- link
- type="primary"
- icon="Edit"
- @click="handleUpdate(scope.row)"
- >淇敼</el-button
- >
- <el-button
- v-if="scope.row.status === 'draft' || scope.row.status === 'cancel' || scope.row.status === 'back'"
- v-hasPermi="['workflow:leave:remove']"
- size="small"
- link
- type="primary"
- icon="Delete"
- @click="handleDelete(scope.row)"
- >鍒犻櫎</el-button
- >
- <el-button link type="primary" size="small" icon="View" @click="handleView(scope.row)">鏌ョ湅</el-button>
- <el-button
- v-if="scope.row.status === 'waiting'"
- link
- size="small"
- type="primary"
- icon="Notification"
- @click="handleCancelProcessApply(scope.row.id)"
- >鎾ら攢</el-button
- >
+ <el-row :gutter="10" class="mb8">
+ <el-col :span="1.5" v-if="scope.row.status === 'draft' || scope.row.status === 'cancel' || scope.row.status === 'back'">
+ <el-button v-hasPermi="['workflow:leave:edit']" size="small" type="primary" icon="Edit" @click="handleUpdate(scope.row)"
+ >淇敼</el-button
+ >
+ </el-col>
+ <el-col :span="1.5" v-if="scope.row.status === 'draft' || scope.row.status === 'cancel' || scope.row.status === 'back'">
+ <el-button v-hasPermi="['workflow:leave:remove']" size="small" type="primary" icon="Delete" @click="handleDelete(scope.row)"
+ >鍒犻櫎</el-button
+ >
+ </el-col>
+ </el-row>
+ <el-row :gutter="10" class="mb8">
+ <el-col :span="1.5">
+ <el-button type="primary" size="small" icon="View" @click="handleView(scope.row)">鏌ョ湅</el-button>
+ </el-col>
+ <el-col :span="1.5" v-if="scope.row.status === 'waiting'">
+ <el-button size="small" type="primary" icon="Notification" @click="handleCancelProcessApply(scope.row.id)">鎾ら攢</el-button>
+ </el-col>
+ </el-row>
</template>
</el-table-column>
</el-table>
@@ -99,7 +89,7 @@
<script setup name="Leave" lang="ts">
import { delLeave, listLeave } from '@/api/workflow/leave';
-import { cancelProcessApply } from '@/api/workflow/processInstance';
+import { cancelProcessApply } from '@/api/workflow/instance';
import { LeaveForm, LeaveQuery, LeaveVO } from '@/api/workflow/leave/types';
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
@@ -232,7 +222,11 @@
const handleCancelProcessApply = async (id: string) => {
await proxy?.$modal.confirm('鏄惁纭鎾ら攢褰撳墠鍗曟嵁锛�');
loading.value = true;
- await cancelProcessApply(id).finally(() => (loading.value = false));
+ let data = {
+ businessId: id,
+ message: '鐢宠浜烘挙閿�娴佺▼锛�'
+ };
+ await cancelProcessApply(data).finally(() => (loading.value = false));
await getList();
proxy?.$modal.msgSuccess('鎾ら攢鎴愬姛');
};
--
Gitblit v1.9.3