Compare commits

..

No commits in common. "31ab38670493d60d009d11565ec4278cde82d933" and "d74cc29f74d63fc101a4f287e01258aab6f4fffe" have entirely different histories.

2 changed files with 14 additions and 33 deletions

View File

@ -9,7 +9,7 @@
<el-link
type="primary"
:underline="false"
@click.prevent="moreNews"
@click.prevent="more"
target="_blank"
style="margin-top: 10px"
>
@ -18,9 +18,9 @@
</div>
</template>
<el-skeleton :loading="loading" animated>
<el-card shadow="never" style="margin-bottom: 5px;height: 280px">
<el-carousel :interval="4000" height="240px" motion-blur @change="handleCarouselChange">
<el-carousel-item v-for="item in filteredList" :key="item.id">
<el-card shadow="never" style="margin-bottom: 5px;height: 330px">
<el-carousel :interval="4000" height="300px" motion-blur @change="handleCarouselChange">
<el-carousel-item v-for="item in filteredList" :key="item.Id">
<el-image style="width: 100%; height: 100%" :src="imgUrl+item.newsImg" alt="无图片" :title="item.newsName"/>
</el-carousel-item>
</el-carousel>
@ -95,7 +95,6 @@
type="primary"
:underline="false"
target="_blank"
@click.prevent="more"
style="margin-top: 10px"
>
更多>>
@ -103,9 +102,9 @@
</div>
</template>
<el-skeleton :loading="loading" animated>
<el-tabs type="border-card" class="demo-tabs" @tab-click="moreName">
<el-tabs type="border-card" class="demo-tabs">
<el-tab-pane label="待办">
<el-table v-loading="loading" :data="TodoList" height="250">
<el-table v-loading="loading" :data="TodoList">
<el-table-column align="center" label="流程" prop="processInstance.name" style="width: 20%;" />
<el-table-column
align="center"
@ -131,8 +130,8 @@
<!-- <span style="display: inline-block; margin-bottom: 10px;font-size: 15px;" >* {{item.processInstance.name}}</span>-->
<!-- </el-col>-->
</el-tab-pane>
<el-tab-pane label="已办" name="BpmDoneTask">
<el-table v-loading="loading" :data="DoneList" height="250">
<el-tab-pane label="已办">
<el-table v-loading="loading" :data="DoneList">
<el-table-column align="center" label="流程" prop="processInstance.name" style="width: 20%;" />
<el-table-column
align="center"
@ -153,8 +152,8 @@
</el-table-column>
</el-table>
</el-tab-pane>
<el-tab-pane label="抄送" name="BpmProcessInstanceCopy">
<el-table v-loading="loading" :data="CopyList" height="250">
<el-tab-pane label="抄送">
<el-table v-loading="loading" :data="CopyList">
<el-table-column align="center" label="流程名" prop="processInstanceName" style="width: 20%;" />
<el-table-column align="center" label="流程发起人" prop="startUserName" style="width: 20%;" />
<el-table-column align="center" label="抄送任务" prop="taskName" style="width: 20%;" />
@ -232,7 +231,7 @@
type="primary"
:underline="false"
target="_blank"
@click.prevent="moreNews"
@click.prevent="more"
style="margin-top: 10px"
>
更多>>
@ -365,28 +364,10 @@ const handleCarouselChange = async (currentIndex:number) => {
pageNo.value=currentIndex+1
}
/** 利用路由实现新闻跳转 */
const moreNews = async () => {
//
const more = async () => {
await push({name: 'Homeimg'})
}
/** 动态切换路由的参数 */
const bpmRouterNames = ref('BpmTodoTask')
/** 流程模块需要切换路由 */
const moreName = async (tab:any) => {
const name = tab.props?.name
if (name !== undefined){
bpmRouterNames.value = name
}
}
/** 利用路由实现流程跳转 */
const more = async () => {
await push({name: `${bpmRouterNames.value}`})
}
/** 处理审批按钮 */
const handleAudit = (row: any) => {
console.log("processInstanceId",row.processInstanceId.id)

View File

@ -114,7 +114,7 @@ import { DICT_TYPE } from '@/utils/dict'
import { dateFormatter, formatPast2 } from '@/utils/formatTime'
import * as TaskApi from '@/api/bpm/task'
defineOptions({ name: 'BpmDoneTask' })
defineOptions({ name: 'BpmTodoTask' })
const { push } = useRouter() //