Skip to content

Commit 2bef7f7

Browse files
author
puhui999
committed
修改没必要的lang="tsx"
1 parent b934915 commit 2bef7f7

File tree

2 files changed

+59
-45
lines changed

2 files changed

+59
-45
lines changed

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

Lines changed: 29 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -2,60 +2,66 @@
22
<ContentWrap>
33
<!-- 搜索工作栏 -->
44
<el-form
5-
class="-mb-15px"
6-
:model="queryParams"
75
ref="queryFormRef"
86
:inline="true"
7+
:model="queryParams"
8+
class="-mb-15px"
99
label-width="68px"
1010
>
1111
<el-form-item label="任务名称" prop="name">
1212
<el-input
1313
v-model="queryParams.name"
14-
placeholder="请输入任务名称"
14+
class="!w-240px"
1515
clearable
16+
placeholder="请输入任务名称"
1617
@keyup.enter="handleQuery"
17-
class="!w-240px"
1818
/>
1919
</el-form-item>
2020
<el-form-item label="创建时间" prop="createTime">
2121
<el-date-picker
2222
v-model="queryParams.createTime"
23-
value-format="YYYY-MM-DD HH:mm:ss"
24-
type="daterange"
25-
start-placeholder="开始日期"
26-
end-placeholder="结束日期"
2723
:default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
2824
class="!w-240px"
25+
end-placeholder="结束日期"
26+
start-placeholder="开始日期"
27+
type="daterange"
28+
value-format="YYYY-MM-DD HH:mm:ss"
2929
/>
3030
</el-form-item>
3131
<el-form-item>
32-
<el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
33-
<el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
32+
<el-button @click="handleQuery">
33+
<Icon class="mr-5px" icon="ep:search" />
34+
搜索
35+
</el-button>
36+
<el-button @click="resetQuery">
37+
<Icon class="mr-5px" icon="ep:refresh" />
38+
重置
39+
</el-button>
3440
</el-form-item>
3541
</el-form>
3642
</ContentWrap>
3743

3844
<!-- 列表 -->
3945
<ContentWrap>
4046
<el-table v-loading="loading" :data="list">
41-
<el-table-column label="任务编号" align="center" prop="id" width="300px" />
42-
<el-table-column label="任务名称" align="center" prop="name" />
43-
<el-table-column label="所属流程" align="center" prop="processInstance.name" />
44-
<el-table-column label="流程发起人" align="center" prop="processInstance.startUserNickname" />
45-
<el-table-column label="状态" align="center" prop="result">
47+
<el-table-column align="center" label="任务编号" prop="id" width="300px" />
48+
<el-table-column align="center" label="任务名称" prop="name" />
49+
<el-table-column align="center" label="所属流程" prop="processInstance.name" />
50+
<el-table-column align="center" label="流程发起人" prop="processInstance.startUserNickname" />
51+
<el-table-column align="center" label="状态" prop="result">
4652
<template #default="scope">
4753
<dict-tag :type="DICT_TYPE.BPM_PROCESS_INSTANCE_RESULT" :value="scope.row.result" />
4854
</template>
4955
</el-table-column>
50-
<el-table-column label="原因" align="center" prop="reason" />
56+
<el-table-column align="center" label="原因" prop="reason" />
5157
<el-table-column
52-
label="创建时间"
58+
:formatter="dateFormatter"
5359
align="center"
60+
label="创建时间"
5461
prop="createTime"
5562
width="180"
56-
:formatter="dateFormatter"
5763
/>
58-
<el-table-column label="操作" align="center">
64+
<el-table-column align="center" label="操作">
5965
<template #default="scope">
6066
<el-button link type="primary" @click="openDetail(scope.row)">详情</el-button>
6167
<el-button link type="primary" @click="handleAudit(scope.row)">流程</el-button>
@@ -64,21 +70,22 @@
6470
</el-table>
6571
<!-- 分页 -->
6672
<Pagination
67-
:total="total"
68-
v-model:page="queryParams.pageNo"
6973
v-model:limit="queryParams.pageSize"
74+
v-model:page="queryParams.pageNo"
75+
:total="total"
7076
@pagination="getList"
7177
/>
7278
</ContentWrap>
7379

7480
<!-- 表单弹窗：详情 -->
7581
<TaskDetail ref="detailRef" @success="getList" />
7682
</template>
77-
<script setup lang="tsx" name="BpmTodoTask">
83+
<script lang="ts" name="BpmTodoTask" setup>
7884
import { DICT_TYPE } from '@/utils/dict'
7985
import { dateFormatter } from '@/utils/formatTime'
8086
import * as TaskApi from '@/api/bpm/task'
8187
import TaskDetail from './TaskDetail.vue'
88+
8289
const { push } = useRouter() // 路由
8390
8491
const loading = ref(true) // 列表的加载中

‎src/views/bpm/task/todo/index.vue

Lines changed: 30 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -2,80 +2,87 @@
22
<ContentWrap>
33
<!-- 搜索工作栏 -->
44
<el-form
5-
class="-mb-15px"
6-
:model="queryParams"
75
ref="queryFormRef"
86
:inline="true"
7+
:model="queryParams"
8+
class="-mb-15px"
99
label-width="68px"
1010
>
1111
<el-form-item label="任务名称" prop="name">
1212
<el-input
1313
v-model="queryParams.name"
14-
placeholder="请输入任务名称"
14+
class="!w-240px"
1515
clearable
16+
placeholder="请输入任务名称"
1617
@keyup.enter="handleQuery"
17-
class="!w-240px"
1818
/>
1919
</el-form-item>
2020
<el-form-item label="创建时间" prop="createTime">
2121
<el-date-picker
2222
v-model="queryParams.createTime"
23-
value-format="YYYY-MM-DD HH:mm:ss"
24-
type="daterange"
25-
start-placeholder="开始日期"
26-
end-placeholder="结束日期"
2723
:default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
2824
class="!w-240px"
25+
end-placeholder="结束日期"
26+
start-placeholder="开始日期"
27+
type="daterange"
28+
value-format="YYYY-MM-DD HH:mm:ss"
2929
/>
3030
</el-form-item>
3131
<el-form-item>
32-
<el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
33-
<el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
32+
<el-button @click="handleQuery">
33+
<Icon class="mr-5px" icon="ep:search" />
34+
搜索
35+
</el-button>
36+
<el-button @click="resetQuery">
37+
<Icon class="mr-5px" icon="ep:refresh" />
38+
重置
39+
</el-button>
3440
</el-form-item>
3541
</el-form>
3642
</ContentWrap>
3743

3844
<!-- 列表 -->
3945
<ContentWrap>
4046
<el-table v-loading="loading" :data="list">
41-
<el-table-column label="任务编号" align="center" prop="id" width="300px" />
42-
<el-table-column label="任务名称" align="center" prop="name" />
43-
<el-table-column label="所属流程" align="center" prop="processInstance.name" />
44-
<el-table-column label="流程发起人" align="center" prop="processInstance.startUserNickname" />
47+
<el-table-column align="center" label="任务编号" prop="id" width="300px" />
48+
<el-table-column align="center" label="任务名称" prop="name" />
49+
<el-table-column align="center" label="所属流程" prop="processInstance.name" />
50+
<el-table-column align="center" label="流程发起人" prop="processInstance.startUserNickname" />
4551
<el-table-column
46-
label="创建时间"
52+
:formatter="dateFormatter"
4753
align="center"
54+
label="创建时间"
4855
prop="createTime"
4956
width="180"
50-
:formatter="dateFormatter"
5157
/>
5258
<el-table-column label="任务状态" prop="suspensionState">
5359
<template #default="scope">
54-
<el-tag type="success" v-if="scope.row.suspensionState === 1">激活</el-tag>
55-
<el-tag type="warning" v-if="scope.row.suspensionState === 2">挂起</el-tag>
60+
<el-tag v-if="scope.row.suspensionState === 1" type="success">激活</el-tag>
61+
<el-tag v-if="scope.row.suspensionState === 2" type="warning">挂起</el-tag>
5662
</template>
5763
</el-table-column>
58-
<el-table-column label="操作" align="center">
64+
<el-table-column align="center" label="操作">
5965
<template #default="scope">
6066
<el-button link type="primary" @click="handleAudit(scope.row)">审批进度</el-button>
6167
</template>
6268
</el-table-column>
6369
</el-table>
6470
<!-- 分页 -->
6571
<Pagination
66-
:total="total"
67-
v-model:page="queryParams.pageNo"
6872
v-model:limit="queryParams.pageSize"
73+
v-model:page="queryParams.pageNo"
74+
:total="total"
6975
@pagination="getList"
7076
/>
7177
</ContentWrap>
7278
</template>
7379

74-
<script setup lang="tsx" name="BpmDoneTask">
80+
<script lang="ts" name="BpmDoneTask" setup>
7581
import { dateFormatter } from '@/utils/formatTime'
76-
const { push } = useRouter() // 路由
7782
import * as TaskApi from '@/api/bpm/task'
7883
84+
const { push } = useRouter() // 路由
85+
7986
const loading = ref(true) // 列表的加载中
8087
const total = ref(0) // 列表的总页数
8188
const list = ref([]) // 列表的数据

0 commit comments

Comments
 (0)