From d4d7601bae99fe3a8f1534ba72a6f65182d2e2f4 Mon Sep 17 00:00:00 2001 From: odjbin <1042039504@qq.com> Date: Wed, 28 Aug 2024 22:55:40 +0800 Subject: [PATCH] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E5=AE=9E=E6=96=BD-=E5=BD=92=E6=A1=A3=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E9=A1=B5=E9=99=84=E4=BB=B6=E9=A1=B9=E7=9B=AE=E5=AE=9E=E6=96=BD?= =?UTF-8?q?/=E9=AA=8C=E6=94=B6=E5=B1=95=E7=A4=BA=E5=8F=8A=E4=B8=8A?= =?UTF-8?q?=E4=BC=A0=E9=99=84=E4=BB=B6=E5=8A=9F=E8=83=BD,=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E9=9C=80=E6=B1=82=E4=B8=8A=E6=8A=A5=E8=B5=84=E9=87=91?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=E4=BC=A0=E5=8F=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/DetailComponent/ProjectAttachment.vue | 2 +- src/components/SearchFilesByTag.vue | 8 ++++---- src/views/project-demand/summary/add.vue | 5 ++++- src/views/project-management/filing/attachment.vue | 10 +++++++--- src/views/project-management/filing/upload.vue | 2 +- src/views/project-management/implementation/phase.vue | 2 +- src/views/project-management/implementation/upload.vue | 5 +++-- vite.config.js | 6 +++--- 8 files changed, 24 insertions(+), 16 deletions(-) diff --git a/src/components/DetailComponent/ProjectAttachment.vue b/src/components/DetailComponent/ProjectAttachment.vue index 91bb019..20757d6 100644 --- a/src/components/DetailComponent/ProjectAttachment.vue +++ b/src/components/DetailComponent/ProjectAttachment.vue @@ -105,7 +105,7 @@ const handleSearch = () => { const loading = ElLoading.service({fullscreen: true}) let params = { targetId: route.query.projectId, - targetState: "40" + targetState: "30" } if (attachmentParam.tag) { tagsOption.value.forEach(item => { diff --git a/src/components/SearchFilesByTag.vue b/src/components/SearchFilesByTag.vue index a6730f6..2c5261e 100644 --- a/src/components/SearchFilesByTag.vue +++ b/src/components/SearchFilesByTag.vue @@ -4,8 +4,8 @@ - - + + props.fileList, (val) => { }) props.fileList = val }) -if (props.type === '40') { +if (props.type === '30') { getTagsOption() } onActivated(()=>{ - if (props.type === '40') { + if (props.type === '30') { getTagsOption() } handleSearch() diff --git a/src/views/project-demand/summary/add.vue b/src/views/project-demand/summary/add.vue index 314c703..37f3a04 100644 --- a/src/views/project-demand/summary/add.vue +++ b/src/views/project-demand/summary/add.vue @@ -489,6 +489,9 @@ const handleSubmit = debounce(async (instance) => { if (formData.value.singleFile !== undefined) { formData.value.singleFile = getFileParam(formData.value.singleFile) } + if (formData.value.isSpecialFund && !formData.value.specialFund) { + formData.value.specialFund = getFundName(formData.value.specialFundId) + } if (!attachment.value.isHaveOneFile) { attachment.value.validate() ElNotification({ @@ -539,7 +542,7 @@ const handleResubmit = debounce((instance) => { }) } formData.value.optionalChargeLeadership = optionalChargeLeadershipList.value - if (formData.value.isSpecialFund && formData.value.specialFund === null) { + if (formData.value.isSpecialFund && !formData.value.specialFund) { formData.value.specialFund = getFundName(formData.value.specialFundId) } if (!attachment.value.isHaveOneFile) { diff --git a/src/views/project-management/filing/attachment.vue b/src/views/project-management/filing/attachment.vue index 154f5a1..9ba852d 100644 --- a/src/views/project-management/filing/attachment.vue +++ b/src/views/project-management/filing/attachment.vue @@ -4,7 +4,7 @@ - @@ -247,6 +247,10 @@ const paneList = ref([ }, { label: '项目实施', + name: '30' + }, + { + label: '项目验收', name: '40' }, { @@ -318,13 +322,13 @@ const changeFileList = (res) => { } const upload = () => { - if (activeName.value === '40') { + if (activeName.value === '30') { router.push({ name: 'Implementation/upload', query: { projectId: route.query.id, requirementId: requirementId.value, - type: '40' + type: '30' } }) } else { diff --git a/src/views/project-management/filing/upload.vue b/src/views/project-management/filing/upload.vue index 2eb7ff3..3225998 100644 --- a/src/views/project-management/filing/upload.vue +++ b/src/views/project-management/filing/upload.vue @@ -371,7 +371,7 @@ const getName = () => { case '20': return '项目立项' case '40': - return '项目实施' + return '项目验收' case '50': return '项目归档' } diff --git a/src/views/project-management/implementation/phase.vue b/src/views/project-management/implementation/phase.vue index 0c55234..ed9eadd 100644 --- a/src/views/project-management/implementation/phase.vue +++ b/src/views/project-management/implementation/phase.vue @@ -79,7 +79,7 @@ const singleList = ref([]) const name = ref(router.currentRoute.value.name) const loading = ref(false) const formData = ref({ - changeState:'1' + changeState:'0' }) const file = ref({}) const deploymentId = ref() diff --git a/src/views/project-management/implementation/upload.vue b/src/views/project-management/implementation/upload.vue index 5b4d81f..cdbc994 100644 --- a/src/views/project-management/implementation/upload.vue +++ b/src/views/project-management/implementation/upload.vue @@ -449,7 +449,7 @@ const handleSubmit = async (instance) => { let params = { fileList: fileList.value, projectId: route.query.projectId, - targetState: "40" + targetState: "30" } let res = await uploadFileList(params) ElNotification({ @@ -459,12 +459,13 @@ const handleSubmit = async (instance) => { }) if (res.code === 1000) { tagsViewStore.delVisitedViews(router.currentRoute.value.path) - if (route.query.type === '40') { + if (route.query.type === '30') { console.log('归档实施') await router.push({ name: 'Filing/attachment', query: { id: route.query.projectId, + name:route.query.type, requirementId: route.query.requirementId } }) diff --git a/vite.config.js b/vite.config.js index dae4b9a..3697c3c 100644 --- a/vite.config.js +++ b/vite.config.js @@ -76,14 +76,14 @@ 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/, '') // }, '/api': { - // target: 'http://kyglweb.scgzjy.com:8080/', + // // target: 'http://kyglweb.scgzjy.com:8080/', target: 'http://mosr.feashow.cn', changeOrigin: true, // target: 'http://clay.frp.feashow.cn',