From 63ae2b84a02755a8d0d5f7500b89508eca7de5e0 Mon Sep 17 00:00:00 2001 From: buaixuexideshitongxue <2936013465@qq.com> Date: Sat, 10 Oct 2026 17:19:51 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=9F=A5=E8=AF=A2=E6=80=A7=E8=83=BD?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/file/upload.vue | 2 ++ src/views/entryWindow/index.vue | 47 ++++++++++++++++++++++++-- src/views/report/edit/controlPrice.vue | 19 ++++------- 3 files changed, 53 insertions(+), 15 deletions(-) diff --git a/src/components/file/upload.vue b/src/components/file/upload.vue index d6739b7..bf122e6 100644 --- a/src/components/file/upload.vue +++ b/src/components/file/upload.vue @@ -191,6 +191,8 @@ function handleSuccess(data, file) { filterFiles[0].percent = 100; filterFiles[0].fileName = data.data.fileName; filterFiles[0].filePath = data.data.filePath; + filterFiles[0].uploadUser = data.data.uploadUser; + filterFiles[0].uploadTime = data.data.uploadTime; window.setTimeout(() => { filterFiles[0].loading = false; emit("update:files", files.value); diff --git a/src/views/entryWindow/index.vue b/src/views/entryWindow/index.vue index 244cb86..2e2b6ad 100644 --- a/src/views/entryWindow/index.vue +++ b/src/views/entryWindow/index.vue @@ -7,6 +7,7 @@ import useUserStore from "@/stores/modules/user"; import {FlowNodeEnum} from "@/enums/flowEnums"; import feedback from "@/utils/feedback"; import {getEntryWindowRecord} from '@/api/report/flow'; +import {getWorkList} from '@/api/work/index'; const catchStore = useCatchStore(); const userStore = useUserStore(); const uid = userStore.user.userName; @@ -15,6 +16,7 @@ const tableData = ref([]) const ressDialog =ref(false) const activeTab = ref('all') const exportLoading = ref(false) +const pendingWorkMap = ref(new Map()) const stageNodeMap = { pending: ['review'], auditing: ['first', 'second', 'third', 'Lead'], @@ -110,7 +112,7 @@ const handleClick =(tab)=>{ const tabName = tab.props.name; activeTab.value = tabName; query.value.current = 1; - query.value.code = tabName === 'recessed' ? '1' : 'all'; + query.value.code = tabName === 'all' ? 'all' : tabName === 'recessed' ? '1' : '0'; syncNodeListByTab() getList() } @@ -136,9 +138,15 @@ const inputGetList = (val) => { //查询数据 const getList =async ()=>{ loading.value=true - const res = await reportPage(query.value) + const [res, pendingWorks] = await Promise.all([ + reportPage(query.value), + getWorkList('first') + ]) tableData.value=res.records total.value=res.total + pendingWorkMap.value = new Map( + pendingWorks.map(item => [item.reportId, item]) + ) loading.value=false } @@ -164,6 +172,39 @@ getList() //查看详情 const router = useRouter(); +const handleWork = (row) => { + const work = pendingWorkMap.value.get(row.id) + if (!work) return + + if (work.isWarning) { + router.push({ + path: '/warning/business', + query: { + reportId: work.reportId, + flowId: work.flowId, + isAudit: true, + isLeader: true + } + }) + return + } + + const workQuery = { + isEnd: work.reportType === '结算项目', + id: work.reportId, + backPath: '/entryWindow' + } + if (work.flowCode === 'initial') { + workQuery.node = work.flowCode + } else { + workQuery.isAudit = true + } + router.push({ + path: '/report/edit/controlPrice', + query: workQuery + }) +} + const getDetail =(row,code)=>{ debugger //判断是否为报审人 @@ -564,8 +605,8 @@ const isAdminShow = ()=>{