guoxiangbin
/
ocr-web
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

终审审批之后刷新

Browse Source
pull/87/head
Dragon 1 year ago
parent b281600df6
commit 9fa25d4614
6 changed files with 84 additions and 73 deletions
Show Stats Download Patch File Download Diff File

2
src/router/modules/final.ts
Unescape View File

@ -38,7 +38,7 @@ const routes: Array<RouteRecordRaw> = [
path: 'final-detail', path: 'final-detail',
name: 'final-detail', name: 'final-detail',
meta: { meta: {
title: '任务终审详情', title: '任务详情',
}, },
component: () => import('@/views/task/content/Content.vue'), component: () => import('@/views/task/content/Content.vue'),
}, },

4
src/views/final/comp/RepeatTaskTableModal.vue
Unescape View File

@ -68,6 +68,9 @@ const columns: DataTableColumns<RowData> = [
ellipsis: { ellipsis: {
tooltip: true, tooltip: true,
}, },
render(row: any) {
return row.fromtaskname
},
}, },
{ {
title: '任务名称', title: '任务名称',
@ -356,6 +359,7 @@ function showModal() {
function reload() { function reload() {
selectionIds.value = [] selectionIds.value = []
checkedRowKeys.value = [] checkedRowKeys.value = []
query(pagination.page, pagination.pageSize)
} }
function goDetail(row) { function goDetail(row) {

4
src/views/final/content/Content.vue
Unescape View File

@ -278,7 +278,7 @@ async function formatColumns() {
'text-color': '#507AFD', 'text-color': '#507AFD',
'onClick': () => goDetail(row), 'onClick': () => goDetail(row),
}, },
{ default: () => row.id }, { default: () => row.fromtaskname },
) )
}, },
} }
@ -471,7 +471,7 @@ async function query(page: number, pageSize: number, filterId?: any) {
sortorder: 'asc', sortorder: 'asc',
pageSize, pageSize,
currPage: page, currPage: page,
sortname: '', sortname: 'states',
...params, ...params,
}) })
const { data, pageCount, totalCount } = result const { data, pageCount, totalCount } = result

143
src/views/message/content/List.vue
Unescape View File

@ -1,32 +1,32 @@
<script lang="ts" setup> <script lang="ts" setup>
import { reactive, ref, toRefs } from "vue"; import { reactive, ref, toRefs } from 'vue'
import { format } from "date-fns"; import { format } from 'date-fns'
import { useRoute, useRouter } from "vue-router"; import { useRoute, useRouter } from 'vue-router'
import { getMessageList, readAllMsg, readMsg } from "@/api/message/message"; import { getMessageList, readAllMsg, readMsg } from '@/api/message/message'
import iconApproveActive from "@/assets/images/message/approve-active.png"; import iconApproveActive from '@/assets/images/message/approve-active.png'
import iconApprove from "@/assets/images/message/approve.png"; import iconApprove from '@/assets/images/message/approve.png'
import iconSystemActive from "@/assets/images/message/system-active.png"; import iconSystemActive from '@/assets/images/message/system-active.png'
import iconSystem from "@/assets/images/message/system.png"; import iconSystem from '@/assets/images/message/system.png'
import iconArrowActive from "@/assets/images/message/arrow-active.png"; import iconArrowActive from '@/assets/images/message/arrow-active.png'
import iconArrow from "@/assets/images/message/arrow.png"; import iconArrow from '@/assets/images/message/arrow.png'
import iconClear from "@/assets/images/message/clear.png"; import iconClear from '@/assets/images/message/clear.png'
import iconArrowDown from "@/assets/images/message/arrow-down.png"; import iconArrowDown from '@/assets/images/message/arrow-down.png'
const emit = defineEmits(["goDetail"]); const emit = defineEmits(['goDetail'])
const router = useRouter(); const router = useRouter()
const route = useRoute(); const route = useRoute()
const hasNextPage = ref(false); const hasNextPage = ref(false)
const state = reactive({ const state = reactive({
tabList: [ tabList: [
{ {
name: "审批通知", name: '审批通知',
icon: iconApprove, icon: iconApprove,
activeIcon: iconApproveActive, activeIcon: iconApproveActive,
value: 1, value: 1,
}, },
{ {
name: "系统消息", name: '系统消息',
icon: iconSystem, icon: iconSystem,
activeIcon: iconSystemActive, activeIcon: iconSystemActive,
value: 2, value: 2,
@ -34,102 +34,105 @@ const state = reactive({
], ],
list: [] as any, list: [] as any,
pageNo: 1, pageNo: 1,
}); })
const { list, tabList } = toRefs(state); const { list, tabList } = toRefs(state)
const tab = ref(1); const tab = ref(1)
async function getList(type = "") { async function getList(type = '') {
let res = await getMessageList({ let res = await getMessageList({
pageNo: state.pageNo, pageNo: state.pageNo,
pageSize: "7", pageSize: '7',
msgCategory: tab.value, msgCategory: tab.value,
}); })
if (type == "more") { if (type == 'more') {
while (res.data.endRow > 0) { while (res.data.endRow > 0) {
if (res.code == "OK") { if (res.code == 'OK') {
if (tab.value === 1) { if (tab.value === 1) {
res.data.list.forEach((item) => { res.data.list.forEach((item) => {
item.tag = JSON.parse(item.busJson); item.tag = JSON.parse(item.busJson)
}); })
} }
state.list = state.list.concat(res.data.list); state.list = state.list.concat(res.data.list)
state.pageNo++; state.pageNo++
res = await getMessageList({ res = await getMessageList({
pageNo: state.pageNo, pageNo: state.pageNo,
pageSize: "7", pageSize: '7',
msgCategory: tab.value, msgCategory: tab.value,
}); })
} }
} }
hasNextPage.value = res.data.hasNextPage; hasNextPage.value = res.data.hasNextPage
} else { }
if (res.code === "OK") { else {
hasNextPage.value = res.data.hasNextPage; if (res.code === 'OK') {
hasNextPage.value = res.data.hasNextPage
if (tab.value === 1) { if (tab.value === 1) {
res.data.list.forEach((item) => { res.data.list.forEach((item) => {
item.tag = JSON.parse(item.busJson); item.tag = JSON.parse(item.busJson)
}); })
} }
state.list = state.list.concat(res.data.list); state.list = state.list.concat(res.data.list)
} }
} }
} }
getList(); getList()
async function clearMsg() { async function clearMsg() {
const res = await readAllMsg({ msgCategory: tab.value }); const res = await readAllMsg({ msgCategory: tab.value })
if (res.code === "OK") { if (res.code === 'OK') {
state.list = []; state.list = []
state.pageNo = 1; state.pageNo = 1
getList(); getList()
} }
} }
function switchTab(type: number) { function switchTab(type: number) {
tab.value = type; tab.value = type
state.list = []; state.list = []
state.pageNo = 1; state.pageNo = 1
getList(); getList()
} }
function goFinalDetail(row) { function goFinalDetail(row) {
console.log(row); console.log(row)
router.push({ router.push({
name: "final-detail", name: 'final-detail',
query: { id: row.tag.taskId, packageid: row.packageid }, query: { id: row.tag.fromId, packageid: row.packageid },
}); })
} }
function goDetail(item) { function goDetail(item) {
if (tab.value === 1) { if (tab.value === 1) {
clearMsgOne(item.id); clearMsgOne(item.id)
goFinalDetail(item); goFinalDetail(item)
} }
// emit('goDetail', item.id) // emit('goDetail', item.id)
else { else {
router.push({ name: "message-detail", query: { id: item.id } }); router.push({ name: 'message-detail', query: { id: item.id } })
} }
} }
async function clearMsgOne(id) { async function clearMsgOne(id) {
const res = await readMsg({ msgid: id }); const res = await readMsg({ msgid: id })
} }
function getMore() { function getMore() {
state.pageNo += 1; state.pageNo += 1
getList("more"); getList('more')
} }
</script> </script>
<template> <template>
<div class="wrapper-message"> <div class="wrapper-message">
<div class="flex justify-between header"> <div class="flex justify-between header">
<div class="header-title">消息通知</div> <div class="header-title">
消息通知
</div>
<div class="clear" @click="clearMsg"> <div class="clear" @click="clearMsg">
<img class="icon-clear" :src="iconClear" alt="" /> <img class="icon-clear" :src="iconClear" alt="">
清除未读 清除未读
</div> </div>
</div> </div>
@ -147,7 +150,7 @@ function getMore() {
class="icon" class="icon"
:src="tab === item.value ? item.activeIcon : item.icon" :src="tab === item.value ? item.activeIcon : item.icon"
alt="" alt=""
/> >
<div :class="{ 'text-active': tab === item.value }" class="text"> <div :class="{ 'text-active': tab === item.value }" class="text">
{{ item.name }} {{ item.name }}
</div> </div>
@ -156,7 +159,7 @@ function getMore() {
class="icon-arrow" class="icon-arrow"
:src="tab === item.value ? iconArrowActive : iconArrow" :src="tab === item.value ? iconArrowActive : iconArrow"
alt="" alt=""
/> >
<div v-if="tab === item.value" class="line" /> <div v-if="tab === item.value" class="line" />
</div> </div>
</div> </div>
@ -164,7 +167,7 @@ function getMore() {
<div <div
v-for="(item, index) in list" v-for="(item, index) in list"
:key="item.id" :key="item.id"
:class="{ pt0: index === 0, 'item-disabled': item.readFlag }" :class="{ 'pt0': index === 0, 'item-disabled': item.readFlag }"
class="item" class="item"
@click="goDetail(item)" @click="goDetail(item)"
> >
@ -185,7 +188,9 @@ function getMore() {
{{ item.titile }} {{ item.titile }}
</div> </div>
<div v-if="tab === 1" class="status"> <div v-if="tab === 1" class="status">
<div class="tag tag-blue">审批节点：{{ item.tag.nodeName }}</div> <div class="tag tag-blue">
审批节点：{{ item.tag.nodeName }}
</div>
<div :class="item.tag.states === 5 ? 'tag-red' : 'tag-green'" class="tag"> <div :class="item.tag.states === 5 ? 'tag-red' : 'tag-green'" class="tag">
审批状态：{{ item.tag.states }} 审批状态：{{ item.tag.states }}
</div> </div>
@ -199,11 +204,13 @@ function getMore() {
<span class="time">{{ format(item.sendTime, "yyyy-MM-dd HH:mm:ss") }}</span> <span class="time">{{ format(item.sendTime, "yyyy-MM-dd HH:mm:ss") }}</span>
</div> </div>
</div> </div>
<div class="look">查看</div> <div class="look">
查看
</div>
</div> </div>
<div v-if="hasNextPage" class="more" @click="getMore"> <div v-if="hasNextPage" class="more" @click="getMore">
查看更多<img class="icon-more" :src="iconArrowDown" alt="" /> 查看更多<img class="icon-more" :src="iconArrowDown" alt="">
</div> </div>
</div> </div>
</div> </div>

2
src/views/task/content/Content.vue
Unescape View File

@ -581,7 +581,7 @@ function switchBatch() {
<div <div
draggable="true" draggable="true"
class="img-wrapper" class="img-wrapper"
:style="{ 'background-image': `url(${item.imgUrl})` }" :style="{ 'background-image': `url(${item.serverThumbnailUrl})` }"
@dragend=" @dragend="
(event) => { (event) => {
handleDragEnd(event, item); handleDragEnd(event, item);

2
src/views/task/modal/BatchModal.vue
Unescape View File

@ -543,7 +543,7 @@ defineExpose({
'img-full': viewMode === '3:4' || viewMode === 'verticalVersion', 'img-full': viewMode === '3:4' || viewMode === 'verticalVersion',
}" }"
:src="item.serverThumbnailUrl || item.imgUrl" :src="item.serverThumbnailUrl"
/> />
<div class="small-mark" /> <div class="small-mark" />
<div class="time"> <div class="time">

Write Preview
Loading…
Cancel
Save