From 2df121072ba5274867324aae415c3735742711cd Mon Sep 17 00:00:00 2001
From: gssong <1742057357@qq.com>
Date: 星期五, 19 四月 2024 22:13:26 +0800
Subject: [PATCH] fix 修改默认没有候选人与候选组时点击选择出现tag标签选中全部问题
---
src/views/workflow/leave/index.vue | 34 ++++++++++++++++++++++++++--------
1 files changed, 26 insertions(+), 8 deletions(-)
diff --git a/src/views/workflow/leave/index.vue b/src/views/workflow/leave/index.vue
index c7baae2..2e8a9b7 100644
--- a/src/views/workflow/leave/index.vue
+++ b/src/views/workflow/leave/index.vue
@@ -2,7 +2,7 @@
<div class="p-2">
<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" label-width="68px">
+ <el-form ref="queryFormRef" :model="queryParams" :inline="true">
<el-form-item label="璇峰亣澶╂暟" prop="startLeaveDays">
<el-input v-model="queryParams.startLeaveDays" placeholder="璇疯緭鍏ヨ鍋囧ぉ鏁�" clearable @keyup.enter="handleQuery" />
</el-form-item>
@@ -51,9 +51,9 @@
</el-table-column>
<el-table-column label="璇峰亣澶╂暟" align="center" prop="leaveDays" />
<el-table-column label="璇峰亣鍘熷洜" align="center" prop="remark" />
- <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.processInstanceVo.businessStatusName }}</el-tag>
+ <dict-tag :options="wf_business_status" :value="scope.row.processInstanceVo.businessStatus"></dict-tag>
</template>
</el-table-column>
<el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
@@ -80,7 +80,7 @@
>
<el-button v-hasPermi="['demo:leave:remove']" link type="primary" icon="Delete" @click="handleDelete(scope.row)"></el-button>
</el-tooltip>
- <el-tooltip placement="top" content="鏌ョ湅" >
+ <el-tooltip placement="top" content="鏌ョ湅">
<el-button link type="primary" icon="View" @click="handleView(scope.row)"></el-button>
</el-tooltip>
<el-tooltip v-if="scope.row.processInstanceVo.businessStatus === 'waiting'" content="鎾ら攢" placement="top">
@@ -101,7 +101,7 @@
import { LeaveForm, LeaveQuery, LeaveVO } from '@/api/workflow/leave/types';
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-
+const { wf_business_status } = toRefs<any>(proxy?.useDict('wf_business_status'));
const leaveList = ref<LeaveVO[]>([]);
const loading = ref(true);
const showSearch = ref(true);
@@ -131,7 +131,7 @@
const queryFormRef = ref<ElFormInstance>();
const data = reactive<PageData<LeaveForm, LeaveQuery>>({
- form: { },
+ form: {},
queryParams: {
pageNum: 1,
pageSize: 10,
@@ -175,18 +175,36 @@
const handleAdd = () => {
proxy.$tab.closePage(proxy.$route);
proxy.$router.push(`/demo/leaveEdit/index/add/add`);
+ proxy.$router.push({
+ path: `/demo/leaveEdit/index`,
+ query: {
+ type: 'add'
+ }
+ });
};
/** 淇敼鎸夐挳鎿嶄綔 */
const handleUpdate = (row?: LeaveVO) => {
proxy.$tab.closePage(proxy.$route);
- proxy.$router.push(`/demo/leaveEdit/index/${row.id}/update`);;
+ proxy.$router.push({
+ path: `/demo/leaveEdit/index`,
+ query: {
+ id: row.id,
+ type: 'update'
+ }
+ });
};
/** 鏌ョ湅鎸夐挳鎿嶄綔 */
const handleView = (row?: LeaveVO) => {
proxy.$tab.closePage(proxy.$route);
- proxy.$router.push(`/demo/leaveEdit/index/${row.id}/view`);
+ proxy.$router.push({
+ path: `/demo/leaveEdit/index`,
+ query: {
+ id: row.id,
+ type: 'view'
+ }
+ });
};
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
--
Gitblit v1.9.3