From eabf9cb3d6788a9e3ee4e3554bcb680501655478 Mon Sep 17 00:00:00 2001 From: dj <1042039504@qq.com> Date: Sun, 6 Apr 2025 16:47:23 +0800 Subject: [PATCH 1/2] =?UTF-8?q?refactor(project):=20=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=9B=B8=E5=85=B3=E9=A1=B5=E9=9D=A2=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 修改项目需求、总结、立项、实施、归档页面中的编号标签 - 更新项目申请组件，根据项目类型动态显示实际专项资金输入框 -调整 API 代理配置 --- src/components/DetailComponent/ProjectApply.vue | 17 +++++++++-------- src/views/project-demand/requirement/index.vue | 2 +- src/views/project-demand/summary/index.vue | 2 +- src/views/project-management/filing/index.vue | 2 +- .../project-management/implementation/index.vue | 2 +- .../project-management/initiation/index.vue | 2 +- vite.config.js | 4 ++-- 7 files changed, 16 insertions(+), 15 deletions(-) diff --git a/src/components/DetailComponent/ProjectApply.vue b/src/components/DetailComponent/ProjectApply.vue index a1ef965..070dfb5 100644 --- a/src/components/DetailComponent/ProjectApply.vue +++ b/src/components/DetailComponent/ProjectApply.vue @@ -10,20 +10,13 @@ - + - - - - - - - @@ -180,6 +173,7 @@ import {useProcessStore} from '@/stores/processStore.js'; import {useTagsView} from '@/stores/tagsview.js' import Paging from "@/components/pagination/index.vue"; import UserPicker from "@/views/workflow/process/common/UserPicker.vue"; +import {getBaseInfoApi} from "@/components/steps/api"; const router = useRouter() const route = useRoute() @@ -267,6 +261,7 @@ const selectRows = ref([]) const projectId = ref(route.query.projectId) const sessionParams = ref({}) const optionalChargeLeadershipPickerRef = ref() +const detail = ref(false) const optionalChargeLeadershipList = ref([]) const filePreviewParam = ref({ fileUrl: '', @@ -274,7 +269,13 @@ const filePreviewParam = ref({ fileType: 'pdf' }) const filePreviewShow = ref(false) +const getInfo=async ()=>{ + const {code, data} = await getBaseInfoApi(route.query.projectId) + console.log('data',code,data) + detail.value=data.isSpecialFund +} +getInfo() const getTemplateName=(type)=>{ switch (type) { case 'apply': diff --git a/src/views/project-demand/requirement/index.vue b/src/views/project-demand/requirement/index.vue index 7f10059..eb3561e 100644 --- a/src/views/project-demand/requirement/index.vue +++ b/src/views/project-demand/requirement/index.vue @@ -48,7 +48,7 @@ const tableConfig = reactive({ }, { prop: 'processNumber', - label: '编号', + label: '征集编号', align: 'center', }, { diff --git a/src/views/project-demand/summary/index.vue b/src/views/project-demand/summary/index.vue index 240a2ae..0f61432 100644 --- a/src/views/project-demand/summary/index.vue +++ b/src/views/project-demand/summary/index.vue @@ -220,7 +220,7 @@ const tableConfig = reactive({ }, { prop: 'processNumber', - label: '编号', + label: '项目编号', align: 'center', }, { diff --git a/src/views/project-management/filing/index.vue b/src/views/project-management/filing/index.vue index a16caa3..40815cf 100644 --- a/src/views/project-management/filing/index.vue +++ b/src/views/project-management/filing/index.vue @@ -219,7 +219,7 @@ const tableConfig = reactive({ { prop: 'processNumber', - label: '编号', + label: '项目编号', align: 'center', }, { diff --git a/src/views/project-management/implementation/index.vue b/src/views/project-management/implementation/index.vue index cb440d3..e0d86b7 100644 --- a/src/views/project-management/implementation/index.vue +++ b/src/views/project-management/implementation/index.vue @@ -222,7 +222,7 @@ const tableConfig = reactive({ { prop: 'processNumber', - label: '编号', + label: '项目编号', align: 'center', }, { diff --git a/src/views/project-management/initiation/index.vue b/src/views/project-management/initiation/index.vue index 8089ba1..4cd83d2 100644 --- a/src/views/project-management/initiation/index.vue +++ b/src/views/project-management/initiation/index.vue @@ -216,7 +216,7 @@ const tableConfig = reactive({ }, { prop: 'processNumber', - label: '编号', + label: '项目编号', align: 'center', }, { diff --git a/vite.config.js b/vite.config.js index 0bb55cf..fcfcb8f 100644 --- a/vite.config.js +++ b/vite.config.js @@ -76,8 +76,8 @@ export default defineConfig({ // rewrite: (path) => path.replace(/^\/api/, '') // }, // '/api/admin': { - // // target: 'http://frp.feashow.cn:31800/', - // target: 'http://clay.frp.feashow.cn/', + // target: 'http://frp.feashow.cn:31800/', + // // target: 'http://clay.frp.feashow.cn/', // // target: 'http://192.168.31.175:8000', // changeOrigin: true, // rewrite: (path) => path.replace(/^\/api/, '') From d3c0b36657f47e10070cb70910196b3c005a2141 Mon Sep 17 00:00:00 2001 From: dj <1042039504@qq.com> Date: Sun, 6 Apr 2025 17:10:08 +0800 Subject: [PATCH 2/2] =?UTF-8?q?refactor(views/components):=20=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E9=A6=96=E9=A1=B5=E9=80=9A=E7=9F=A5=E5=85=AC=E5=91=8A?= =?UTF-8?q?=E5=B1=95=E7=A4=BA=E5=92=8C=E9=A1=B9=E7=9B=AE=E9=99=84=E4=BB=B6?= =?UTF-8?q?=E6=90=9C=E7=B4=A2=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 首页通知公告：调整公告列表的序号显示逻辑 - 项目附件：改进附件搜索功能，支持按全部文件搜索 - 搜索组件：更新搜索界面文本，根据搜索范围动态显示标签或项目阶段 --- .../DetailComponent/ProjectAttachment.vue | 25 ++++++++++++++----- src/components/SearchFilesByTag.vue | 6 ++--- src/views/home/index.vue | 3 ++- 3 files changed, 24 insertions(+), 10 deletions(-) diff --git a/src/components/DetailComponent/ProjectAttachment.vue b/src/components/DetailComponent/ProjectAttachment.vue index 3192b5a..e2ad801 100644 --- a/src/components/DetailComponent/ProjectAttachment.vue +++ b/src/components/DetailComponent/ProjectAttachment.vue @@ -241,7 +241,11 @@ const handleTabClick = (item) => { isEdit.value = false } if (item.props.name != 'plus') { - changeFileList(getTagName(item.props.name)) + if(item.props.name == 'all'){ + changeFileList('all') + }else{ + changeFileList(getTagName(item.props.name)) + } // if (item.props.name == 'all') { // otherAttachmentList.value = allFiles.value // } else { @@ -300,12 +304,21 @@ const clickToPreview = (row) => { }) } const changeFileList=(tag)=>{ - showAttachmentTable.value = false - let params = { - targetId: route.query.projectId, - targetState: "30", - tag:tag + let params = {} + if(tag=='all'){ + params = { + targetId: route.query.projectId, + targetState: "30", + } + }else{ + params = { + targetId: route.query.projectId, + targetState: "30", + tag:tag + } } + showAttachmentTable.value = false + searchImplementationFileList(params).then(res => { if (res.code === 1000) { otherAttachmentList.value = res.data.fileList diff --git a/src/components/SearchFilesByTag.vue b/src/components/SearchFilesByTag.vue index 44200da..6b85097 100644 --- a/src/components/SearchFilesByTag.vue +++ b/src/components/SearchFilesByTag.vue @@ -4,8 +4,8 @@ - - + +
- {{ index > 8 ? '' : 0 }}{{ index + 1 }}{{ item.articleTitle }} + {{ index > 8 ? '' : 0 }}{{ index + 1 }} + {{ item.articleTitle }}