fix : 修复项目实施-归档列表页附件项目实施/验收展示及上传附件功能,修复需求上报资金名称传参

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 => {

src/components/SearchFilesByTag.vue

@@ -4,8 +4,8 @@
       <el-form-item label="名称" prop="fileName">
         <el-input v-model="attachment.fileName" placeholder="请输入文件名查询" clearable filterable style="width: 300px"/>
       </el-form-item>
-      <el-form-item label="标签" prop="tag" v-if="type==='40'">
+      <el-form-item label="标签" prop="tag" v-if="type==='30'">
-        <el-select v-model="attachment.tag" placeholder="请选择标签" clearable remote filterable style="width: 300px">
+        <el-select v-model="attachment.tag" placeholder="请选择标签" clearable  filterable style="width: 300px">
           <el-option
               v-for="item in tagsOption"
               :key="item.value"
@@ -179,12 +179,12 @@ watch(() => 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()

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) {

src/views/project-management/filing/attachment.vue

@@ -4,7 +4,7 @@
    <fvForm :schema="schema" @getInstance="(e)=>baseForm = e" label-position="left" label-width="left" style="margin-left: 15px"></fvForm>
    <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
      <el-tab-pane v-for="item in paneList" :label="item.label" :name="item.name">
-       <search-files-by-tag @search="search" @upload="upload" :type="item.name==='40'?'40':''"
+       <search-files-by-tag @search="search" @upload="upload" :type="item.name==='30'?'30':''"
                             :fileList="fileList" :uploadState="uploadState" v-model:loading="loading"/>
      </el-tab-pane>
    </el-tabs>
@@ -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 {

src/views/project-management/filing/upload.vue

@@ -371,7 +371,7 @@ const getName = () => {
     case '20':
       return '项目立项'
     case '40':
-      return '项目实施'
+      return '项目验收'
     case '50':
       return '项目归档'
   }

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()

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
           }
         })

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://frp.feashow.cn:31800/',
-      //   // target: 'http://clay.frp.feashow.cn/',
+      //   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',