Skip to content

Commit bb88e3d

Browse files
committed
REVIEW 已完成的任务列表
1 parent 68564b7 commit bb88e3d

File tree

5 files changed

+49
-77
lines changed

5 files changed

+49
-77
lines changed

build/vite/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ export function createVitePlugins() {
9898
deleteOriginFile: false //压缩后是否删除源文件
9999
}),
100100
ViteEjsPlugin(),
101-
topLevelAwait({
101+
topLevelAwait({ // https://juejin.cn/post/7152191742513512485
102102
// The export name of top-level await promise for each chunk module
103103
promiseExportName: '__tla',
104104
// The function to generate import names of top-level await promise in each chunk module

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
"build:dev": "node --max_old_space_size=8000 ./node_modules/vite/bin/vite.js build --mode dev",
1414
"build:test": "node --max_old_space_size=8000 ./node_modules/vite/bin/vite.js build --mode test",
1515
"build:static": "node --max_old_space_size=8000 ./node_modules/vite/bin/vite.js build --mode static",
16+
"build:front": "node --max_old_space_size=8000 ./node_modules/vite/bin/vite.js build --mode front",
1617
"serve:pro": "vite preview --mode pro",
1718
"serve:dev": "vite preview --mode dev",
1819
"serve:test": "vite preview --mode test",

src/router/modules/remaining.ts

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -317,18 +317,6 @@ const remainingRouter: AppRouteRecordRaw[] = [
317317
title: '查看 OA 请假',
318318
activeMenu: 'bpm/oa/leave/detail'
319319
}
320-
},
321-
{
322-
path: '/bpm/task/done',
323-
component: () => import('@/views/bpm/task/done/index.vue'),
324-
name: 'TaskDone',
325-
meta: {
326-
noCache: true,
327-
hidden: true,
328-
canTo: true,
329-
title: '已办任务',
330-
activeMenu: 'bpm/task/done/index'
331-
}
332320
}
333321
]
334322
},

src/views/bpm/task/done/Taskdetail.vue renamed to src/views/bpm/task/done/TaskDetail.vue

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<template>
2-
<Dialog title="详情" v-model="dialogVisible" :scroll="true" :max-height="500" width="800">
2+
<Dialog title="详情" v-model="dialogVisible" :scroll="true" :max-height="500">
33
<el-descriptions border :column="1">
44
<el-descriptions-item label="任务编号" min-width="120">
55
{{ detailData.id }}
@@ -14,7 +14,7 @@
1414
{{ detailData.processInstance.startUserNickname }}
1515
</el-descriptions-item>
1616
<el-descriptions-item label="状态">
17-
{{ detailData.result }}
17+
<dict-tag :type="DICT_TYPE.BPM_PROCESS_INSTANCE_RESULT" :value="detailData.result" />
1818
</el-descriptions-item>
1919
<el-descriptions-item label="原因">
2020
{{ detailData.reason }}
@@ -26,14 +26,16 @@
2626
</Dialog>
2727
</template>
2828
<script setup lang="ts">
29+
import { DICT_TYPE } from '@/utils/dict'
2930
import { formatDate } from '@/utils/formatTime'
3031
import * as TaskApi from '@/api/bpm/task'
32+
3133
const dialogVisible = ref(false) // 弹窗的是否展示
3234
const detailLoading = ref(false) // 表单的加载中
3335
const detailData = ref() // 详情数据
3436
3537
/** 打开弹窗 */
36-
const openModal = async (data: TaskApi.TaskVO) => {
38+
const open = async (data: TaskApi.TaskVO) => {
3739
dialogVisible.value = true
3840
// 设置数据
3941
detailLoading.value = true
@@ -43,5 +45,5 @@ const openModal = async (data: TaskApi.TaskVO) => {
4345
detailLoading.value = false
4446
}
4547
}
46-
defineExpose({ openModal }) // 提供 openModal 方法,用于打开弹窗
48+
defineExpose({ open }) // 提供 open 方法,用于打开弹窗
4749
</script>

src/views/bpm/task/done/index.vue

Lines changed: 41 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -14,36 +14,30 @@
1414
placeholder="请输入任务名称"
1515
clearable
1616
@keyup.enter="handleQuery"
17+
class="!w-240px"
1718
/>
1819
</el-form-item>
19-
<el-form-item label="状态" prop="status">
20-
<el-select v-model="queryParams.status" placeholder="请选择状态" clearable>
21-
<el-option
22-
v-for="dict in getIntDictOptions(DICT_TYPE.BPM_PROCESS_INSTANCE_RESULT)"
23-
:key="dict.value"
24-
:label="dict.label"
25-
:value="dict.value"
26-
/>
27-
</el-select>
20+
<el-form-item label="创建时间" prop="createTime">
21+
<el-date-picker
22+
v-model="queryParams.createTime"
23+
value-format="YYYY-MM-DD HH:mm:ss"
24+
type="daterange"
25+
start-placeholder="开始日期"
26+
end-placeholder="结束日期"
27+
:default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
28+
class="!w-240px"
29+
/>
2830
</el-form-item>
2931
<el-form-item>
3032
<el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
3133
<el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
32-
<el-button
33-
type="success"
34-
plain
35-
@click="handleExport"
36-
:loading="exportLoading"
37-
v-hasPermi="['bpm:task:done:export']"
38-
>
39-
<Icon icon="ep:download" class="mr-5px" /> 导出
40-
</el-button>
4134
</el-form-item>
4235
</el-form>
4336
</ContentWrap>
37+
4438
<!-- 列表 -->
4539
<ContentWrap>
46-
<el-table v-loading="loading" :data="list" align="center">
40+
<el-table v-loading="loading" :data="list">
4741
<el-table-column label="任务编号" align="center" prop="id" width="300px" />
4842
<el-table-column label="任务名称" align="center" prop="name" />
4943
<el-table-column label="所属流程" align="center" prop="processInstance.name" />
@@ -63,8 +57,8 @@
6357
/>
6458
<el-table-column label="操作" align="center">
6559
<template #default="scope">
66-
<el-button link type="primary" @click="openModal(scope.row)"> 流程信息 </el-button>
67-
<el-button link type="primary" @click="handleAudit(scope.row)"> 流程详情 </el-button>
60+
<el-button link type="primary" @click="openDetail(scope.row)">详情</el-button>
61+
<el-button link type="primary" @click="handleAudit(scope.row)">流程</el-button>
6862
</template>
6963
</el-table-column>
7064
</el-table>
@@ -76,46 +70,28 @@
7670
@pagination="getList"
7771
/>
7872
</ContentWrap>
73+
7974
<!-- 表单弹窗:详情 -->
80-
<TaskDoneDetail ref="modalRef" @success="getList" />
75+
<TaskDetail ref="detailRef" @success="getList" />
8176
</template>
8277
<script setup lang="tsx">
78+
import { DICT_TYPE } from '@/utils/dict'
8379
import { dateFormatter } from '@/utils/formatTime'
84-
import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
8580
import * as TaskApi from '@/api/bpm/task'
86-
import download from '@/utils/download'
87-
import TaskDoneDetail from './Taskdetail.vue'
81+
import TaskDetail from './TaskDetail.vue'
82+
const { push } = useRouter() // 路由
8883
8984
const loading = ref(true) // 列表的加载中
9085
const total = ref(0) // 列表的总页数
9186
const list = ref([]) // 列表的数据
92-
const message = useMessage() // 消息弹窗
93-
const exportLoading = ref(false) // 导出的加载中
94-
const queryFormRef = ref() // 搜索的表单
9587
const queryParams = reactive({
9688
pageNo: 1,
9789
pageSize: 10,
9890
name: '',
99-
status: undefined,
10091
createTime: []
10192
})
93+
const queryFormRef = ref() // 搜索的表单
10294
103-
/** 搜索按钮操作 */
104-
const handleQuery = () => {
105-
queryParams.pageNo = 1
106-
getList()
107-
}
108-
/** 详情操作 */
109-
const modalRef = ref()
110-
const openModal = (data: TaskApi.TaskVO) => {
111-
modalRef.value.openModal(data)
112-
}
113-
114-
/** 重置按钮操作 */
115-
const resetQuery = () => {
116-
queryFormRef.value.resetFields()
117-
handleQuery()
118-
}
11995
/** 查询任务列表 */
12096
const getList = async () => {
12197
loading.value = true
@@ -127,22 +103,26 @@ const getList = async () => {
127103
loading.value = false
128104
}
129105
}
130-
/** 导出按钮操作 */
131-
const handleExport = async () => {
132-
try {
133-
// 导出的二次确认
134-
await message.exportConfirm()
135-
// 发起导出
136-
exportLoading.value = true
137-
const data = await TaskApi.exportTask(queryParams)
138-
download.excel(data, '任务列表.xls')
139-
} catch {
140-
} finally {
141-
exportLoading.value = false
142-
}
106+
107+
/** 搜索按钮操作 */
108+
const handleQuery = () => {
109+
queryParams.pageNo = 1
110+
getList()
143111
}
144-
const { push } = useRouter() // 路由
145-
// 处理审批按钮
112+
113+
/** 重置按钮操作 */
114+
const resetQuery = () => {
115+
queryFormRef.value.resetFields()
116+
handleQuery()
117+
}
118+
119+
/** 详情操作 */
120+
const detailRef = ref()
121+
const openDetail = (row: TaskApi.TaskVO) => {
122+
detailRef.value.open(row)
123+
}
124+
125+
/** 处理审批按钮 */
146126
const handleAudit = (row) => {
147127
push({
148128
name: 'BpmProcessInstanceDetail',
@@ -151,6 +131,7 @@ const handleAudit = (row) => {
151131
}
152132
})
153133
}
134+
154135
/** 初始化 **/
155136
onMounted(() => {
156137
getList()

0 commit comments

Comments
 (0)