From f4ad8718315745209486bfd2cc16dd501d7c7d7f Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Sat, 1 Jun 2024 00:45:13 +0800
Subject: [PATCH 1/3] =?UTF-8?q?fix=20:=20=E4=BF=AE=E6=94=B9=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E9=A1=B5=E6=95=B0=E6=8D=AE=E5=9B=9E=E6=98=BE=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E5=8F=8A=E7=AE=80=E5=8C=96=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DetailComponent/CollectionDetail.vue      |  31 +---
 .../DetailComponent/SummaryDetail.vue         | 141 ++++++++----------
 .../project-demand/requirement/detail.vue     |   4 +-
 src/views/project-demand/summary/detail.vue   |  40 +----
 .../project-management/filing/detail.vue      |  40 ++---
 src/views/project-management/filing/index.vue |   7 +-
 .../implementation/detail.vue                 |  46 ++----
 .../implementation/index.vue                  |   4 +-
 .../project-management/initiation/detail.vue  |  85 ++---------
 .../project-management/initiation/index.vue   |   4 +-
 10 files changed, 108 insertions(+), 294 deletions(-)

diff --git a/src/components/DetailComponent/CollectionDetail.vue b/src/components/DetailComponent/CollectionDetail.vue
index ffed32d..a5aebfa 100644
--- a/src/components/DetailComponent/CollectionDetail.vue
+++ b/src/components/DetailComponent/CollectionDetail.vue
@@ -7,17 +7,17 @@
             <span>{{ formData.requirementName }}</span>
           </el-form-item>
         </el-col>
-        <el-col :span="12">
-          <el-form-item label="所属公司">
-            <span>{{ formData.companyIds }}</span>
-          </el-form-item>
-        </el-col>
+<!--        <el-col :span="12">-->
+<!--          <el-form-item label="所属公司">-->
+<!--            <span>{{ formData.companyIds }}</span>-->
+<!--          </el-form-item>-->
+<!--        </el-col>-->
         <el-col :span="12">
           <el-form-item label="征集类型">
             <span>{{ formData.collectType }}</span>
           </el-form-item>
         </el-col>
-        <el-col :span="12">
+        <el-col :span="24">
           <el-form-item label="截止时间">
             <span>{{ formData.deadline }}</span>
           </el-form-item>
@@ -71,13 +71,11 @@
 <script setup lang="jsx">
 import OperationRender from '@/views/workflow/common/OperationRender.vue'
 import ProcessDiagramViewer from '@/views/workflow/common/ProcessDiagramViewer.vue'
-import {matterTree} from '@/utils/matterTree.js';
 import {downloadFile} from "@/api/project-demand";
 
 const emit = defineEmits(['getInfo',"update:formData"])
 const form = ref()
 const showTable = ref(false)
-const companyNameArray = ref([])
 
 const props = defineProps({
   formData: {
@@ -146,28 +144,11 @@ const handleDownload = (row) => {
     a.click()
   })
 }
-const getCompanyOptionItem = (val) => {
-  if (val instanceof Array) {
-    val.forEach(item => {
-      matterTree(companyNameArray.value, props.companyOption, item)
-    })
-  }
-  let uniqueArr = Array.from(new Set(companyNameArray.value));
-  return uniqueArr.join('，');
-}
 
 watch(() => props.loading, (newVal) => {
   props.loading = newVal
 }, {deep: true})
 
-watch(() => props.companyOption, (newVal) => {
-  props.companyOption = newVal
-}, {deep: true})
-watch(() => props.formData, (newVal) => {
-  if(newVal!=null){
-    props.formData.companyIds = getCompanyOptionItem(newVal.companyIds)
-  }
-}, {deep: true})
 watch(() => props.processViewer, (newVal) => {
   props.processViewer = newVal
 }, {deep: true})
diff --git a/src/components/DetailComponent/SummaryDetail.vue b/src/components/DetailComponent/SummaryDetail.vue
index 1d0cd33..32a2e35 100644
--- a/src/components/DetailComponent/SummaryDetail.vue
+++ b/src/components/DetailComponent/SummaryDetail.vue
@@ -8,8 +8,8 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="专项资金" prop="specialFund">
-            <span>{{ localFormData.specialFund }}</span>
+          <el-form-item label="专项资金" prop="specialFund" v-if="localFormData.specialFund">
+            <span>{{ changeName(fundOption, localFormData.specialFund) }}</span>
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -22,59 +22,54 @@
             <span>{{ formData.endTime }}</span>
           </el-form-item>
         </el-col>
-        <el-col :span="12">
-          <el-form-item label="所属公司" prop="affiliatedCompanyId">
-            <span>{{ localFormData.affiliatedCompanyId }}</span>
-          </el-form-item>
-        </el-col>
         <el-col :span="12">
           <el-form-item label="项目类型" prop="projectType">
-            <span>{{ localFormData.projectType }}</span>
+            <span>{{ filterDict(cacheStore.getDict('project_type'), localFormData.projectType) }}</span>
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="研发主体" prop="rdSubject">
-            <span>{{ localFormData.rdSubject }}</span>
+            <span>{{ filterDict(cacheStore.getDict('rd_subject'), localFormData.rdSubject) }}</span>
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="出资类型" prop="investmentType">
-            <span>{{ localFormData.investmentType }}</span>
+            <span>{{ filterDict(cacheStore.getDict('invest_type'), localFormData.investmentType) }}</span>
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="项目影响" prop="projectImpact">
-            <span>{{ localFormData.projectImpact }}</span>
+            <span>{{ filterDict(cacheStore.getDict('project_impact'), localFormData.projectImpact) }}</span>
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="所属业务板块" prop="businessSegment">
-            <span>{{ localFormData.businessSegment }}</span>
+            <span>{{ filterDict(cacheStore.getDict('business_segment'), localFormData.businessSegment) }}</span>
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="预期成果形式" prop="resultForm">
-            <span>{{ localFormData.resultForm }}</span>
+            <span>{{ filterDict(cacheStore.getDict('result_form'), localFormData.resultForm) }}</span>
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="预期技术标准制定" prop="technicalStandard">
-            <span>{{ localFormData.technicalStandard }}</span>
+            <span>{{ filterDict(cacheStore.getDict('technical_standard'), localFormData.technicalStandard)}}</span>
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="产学研联合" prop="industryUniversityResearch">
-            <span>{{ localFormData.industryUniversityResearch }}</span>
+            <span>{{ filterDict(cacheStore.getDict('industry_university'), localFormData.industryUniversityResearch) }}</span>
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="开展政府申报" prop="governmentDeclaration">
-            <span>{{ localFormData.governmentDeclaration }}</span>
+            <span>{{ filterDict(cacheStore.getDict('government_declaration'), localFormData.governmentDeclaration) }}</span>
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="知识产权状况" prop="intellectualProperty">
-            <span>{{ localFormData.intellectualProperty }}</span>
+            <span>{{ filterDict(cacheStore.getDict('intellectual_property'), localFormData.intellectualProperty)}}</span>
           </el-form-item>
         </el-col>
         <el-col :span="6">
@@ -139,32 +134,32 @@
             </fvTable>
           </el-form-item>
         </el-col>
-        <el-col :span="24">
-          <div v-if="data.taskId">
-            <baseTitle title="审核意见"></baseTitle>
-            <el-form-item prop="auditOpinion">
-              <el-input
-                  v-model="localFormData.auditOpinion"
-                  :rows="3"
-                  type="textarea"
-                  placeholder="请输入审核意见"
-              />
-            </el-form-item>
-          </div>
-        </el-col>
+        <!--        <el-col :span="24">-->
+        <!--          <div v-if="data.taskId">-->
+        <!--            <baseTitle title="审核意见"></baseTitle>-->
+        <!--            <el-form-item prop="auditOpinion">-->
+        <!--              <el-input-->
+        <!--                  v-model="localFormData.auditOpinion"-->
+        <!--                  :rows="3"-->
+        <!--                  type="textarea"-->
+        <!--                  placeholder="请输入审核意见"-->
+        <!--              />-->
+        <!--            </el-form-item>-->
+        <!--          </div>-->
+        <!--        </el-col>-->
       </el-row>
       <div class="approval-record">
         <baseTitle title="审批记录"></baseTitle>
         <div class="process">
           <operation-render v-if="processViewer" :operation-list="data.operationList"
                             :state="data.state"/>
-          <process-diagram-viewer  v-if="processViewer" id-name="summaryProcess"/>
+          <process-diagram-viewer v-if="processViewer" id-name="summaryProcess"/>
         </div>
       </div>
-<!--      <div class="oper-page-btn" v-if="data.state === '1' && data.taskId">-->
-<!--        <el-button @click="handleReject(summaryForm)">驳回</el-button>-->
-<!--        <el-button color="#DED0B2" @click="handleAgree">同意</el-button>-->
-<!--      </div>-->
+      <!--      <div class="oper-page-btn" v-if="data.state === '1' && data.taskId">-->
+      <!--        <el-button @click="handleReject(summaryForm)">驳回</el-button>-->
+      <!--        <el-button color="#DED0B2" @click="handleAgree">同意</el-button>-->
+      <!--      </div>-->
     </el-form>
   </div>
 </template>
@@ -173,11 +168,13 @@
 import {downloadFile} from "@/api/project-demand";
 import OperationRender from '@/views/workflow/common/OperationRender.vue'
 import ProcessDiagramViewer from '@/views/workflow/common/ProcessDiagramViewer.vue'
-import {ElMessage, ElNotification} from "element-plus";
-import {agreeTask, rejectTask} from "@/api/project-demand";
 import {useTagsView} from '@/stores/tagsview.js'
+import {getFundOption} from "@/api/special-fund";
+import {useCacheStore} from '@/stores/cache.js'
+import {getSubCompOpt} from "@/api/user/user";
 
 const tagsViewStore = useTagsView()
+const cacheStore = useCacheStore()
 const props = defineProps({
   formData: {
     type: Object,
@@ -234,52 +231,38 @@ const tableConfig = reactive({
   ]
 })
 const router = useRouter()
-const summaryForm = ref()
+const fundOption = ref([])
+const companyOption = ref([])
+const dictName = ref({})
 const rules = reactive({
   auditOpinion: [{required: true, message: '请输入审核意见', trigger: 'blur'}],
 })
-const handleReject = (instance) => {
-  if (!instance) return
-  instance.validate(async (valid) => {
-    if (!valid) return
-    let approve = {
-      taskId: props.data.taskId,
-      auditOpinion: localFormData.value.auditOpinion,
-    }
-    rejectTask(approve).then(res => {
-      ElNotification({
-        title: '提示',
-        message: res.msg,
-        type: res.code === 1000 ? 'success' : 'error'
-      })
-      if (res.code === 1000) {
-        tagsViewStore.delVisitedViews(router.currentRoute.value.path)
-        router.push({
-          name: 'Summary'
-        })
+const filterDict = (data, value) => {
+  if (data === undefined || value === undefined) return;
+  let label=''
+  if (data instanceof Array) {
+    data.find(item =>{
+      if( item.value == value){
+        label= item.label
       }
     })
-  })
-}
-const handleAgree = () => {
-  let approve = {
-    taskId: props.data.taskId,
-    auditOpinion: localFormData.value.auditOpinion,
-    formData: localFormData.value
   }
-  agreeTask(approve).then(res => {
-    ElNotification({
-      title: '提示',
-      message: res.msg,
-      type: res.code === 1000 ? 'success' : 'error'
-    })
-    if (res.code === 1000) {
-      tagsViewStore.delVisitedViews(router.currentRoute.value.path)
-      router.push({
-        name: 'Summary'
-      })
+  return label
+}
+const getFundOptions = async () => {
+  const resFund = await getFundOption()
+  fundOption.value = resFund.data
+  const res = await getSubCompOpt()
+  companyOption.value = res.data
+}
+const changeName = (option, value) => {
+  let name = ''
+  option.forEach(item => {
+    if (item.value == value) {
+      name = item.label
     }
   })
+  return name
 }
 const handleDownload = (row) => {
   downloadFile(row.fileId).then(res => {
@@ -291,11 +274,6 @@ const handleDownload = (row) => {
   })
 }
 
-watch(
-    () => props.formData,
-    (val) => {
-    }
-)
 watch(() => props.processViewer, (newVal) => {
   props.processViewer = newVal
 }, {deep: true})
@@ -304,8 +282,9 @@ watch(() => props.loading, (newVal) => {
 }, {deep: true})
 
 watchEffect(() => {
-  Object.keys(props.formData).length && (localFormData.value = props.formData)
+  return Object.keys(props.formData).length && (localFormData.value = props.formData)
 })
+getFundOptions()
 </script>
 
 <style scoped>
diff --git a/src/views/project-demand/requirement/detail.vue b/src/views/project-demand/requirement/detail.vue
index 9d42463..617f02d 100644
--- a/src/views/project-demand/requirement/detail.vue
+++ b/src/views/project-demand/requirement/detail.vue
@@ -211,7 +211,7 @@ const getFundOptions = async () => {
   specialFundOption.value = res.data
 }
 
-const getDataSourceOptionItem = (val) => {
+const getCompanyOptionItem = (val) => {
   if (val !== undefined) {
     val.forEach(item => {
       matterTree(companyNameArray.value, companyOption.value, item)
@@ -237,7 +237,7 @@ const init = async () => {
     loading.value = false
     let data = res.data
     formData.value = data.formData;
-    data.formData.companyIds = getDataSourceOptionItem(data.formData.companyIds)
+    data.formData.companyIds = getCompanyOptionItem(data.formData.companyIds)
     if(data.formData.specialFund){
       specialFundOption.value.forEach(item => {
         if(data.formData.specialFund==item.value){
diff --git a/src/views/project-demand/summary/detail.vue b/src/views/project-demand/summary/detail.vue
index c7c9e87..50f4fcd 100644
--- a/src/views/project-demand/summary/detail.vue
+++ b/src/views/project-demand/summary/detail.vue
@@ -2,7 +2,7 @@
   <steps :active="1" @setDetail="setDetail" @stepChange="stepChange">
     <template #content>
       <collection-detail v-show="showActive == '00'" :formData="summaryData.formData" :data="summaryData"
-                         :processViewer="summaryProcessViewer" :companyOption="companyOption" :loading="loading"/>
+                         :processViewer="summaryProcessViewer"  :loading="loading"/>
       <summary-detail v-show="showActive == '10'" :formData="summaryData.formData" :data="summaryData"
                       :processViewer="summaryProcessViewer" :loading="loading"/>
       <ApprovalDetail v-show="showActive == '20'" :formData="summaryData.formData" :data="summaryData" :processViewer="summaryProcessViewer" :loading="loading"></ApprovalDetail>
@@ -21,34 +21,20 @@ import SummaryDetail from '@/components/DetailComponent/SummaryDetail.vue';
 import {useProcessStore} from '@/stores/processStore.js';
 import {getMapProjectStateInfo} from '@/components/steps/api';
 import CollectionDetail from "@/components/DetailComponent/CollectionDetail.vue";
-import {getSubCompOpt} from "@/api/user/user";
 import {ElNotification} from "element-plus";
 
 const route = useRoute()
-const companyOption = ref([])
 const summaryData = ref({})
 const summaryProcessViewer = ref(true)
 const loading = ref(false)
 const processStore = useProcessStore()
 const active = ref(route.query.state)
 const showActive = ref()
-const getCompanyOption = async () => {
-  const res = await getSubCompOpt()
-  companyOption.value = res.data
-}
 const getInfo = async (state) => {
   const projectId = route.query.projectId
-  if(showActive == '00'){
-    await getCompanyOption()
-  }
   summaryProcessViewer.value = false
   loading.value = true
   const {code, data,msg} = await getMapProjectStateInfo(projectId, state)
-  ElNotification({
-    title: '提示',
-    message: msg,
-    type: code === 1000 ? 'success' : 'error'
-  })
   if(data===undefined)return;
   if(code===1000){
     summaryData.value = data;
@@ -62,24 +48,15 @@ const getInfo = async (state) => {
     nextTick(() => {
       summaryProcessViewer.value = true
     })
+  }else {
+    ElNotification({
+      title: '提示',
+      message: msg,
+      type:  'error'
+    })
   }
 }
-// const back = () => {
-//   switch (route.name) {
-//     case 'Summary/detail':
-//       setDetail('1')
-//       break;
-//     case 'Initiation/detail':
-//       setDetail('2')
-//       break;
-//     case 'Implementation/detail':
-//       setDetail('3')
-//       break;
-//     case 'Filing/detail':
-//       setDetail('4')
-//       break;
-//   }
-// }
+
 const setDetail = (active) => {
   showActive.value = active
   getInfo(active)
@@ -89,7 +66,6 @@ const stepChange = (data) => {
   showActive.value = data.active
   getInfo(data.active)
 }
-// back()
 </script>
 
 <style scoped>
diff --git a/src/views/project-management/filing/detail.vue b/src/views/project-management/filing/detail.vue
index b7f1460..b07c02d 100644
--- a/src/views/project-management/filing/detail.vue
+++ b/src/views/project-management/filing/detail.vue
@@ -5,7 +5,6 @@
           :formData="commonForm.formData"
           :data="commonForm"
           :processViewer="commonProvessViewer"
-          :companyOption="companyOption"
           v-show="showActive == '00'"
           :loading="loading"
       />
@@ -24,52 +23,35 @@
 </template>
 
 <script setup lang="jsx">
-import {getInfo} from "@/api/project-demand/index.js";
-import {getSubCompOpt} from '@/api/user/user.js'
 import {useProcessStore} from '@/stores/processStore.js';
 import CollectionDetail from "@/components/DetailComponent/CollectionDetail.vue";
 import SummaryDetail from "@/components/DetailComponent/SummaryDetail.vue";
 import ApprovalDetail from "@/components/DetailComponent/ApprovalDetail.vue";
 import {getMapProjectStateInfo} from '@/components/steps/api';
-import {ElLoading} from "element-plus";
+import {ElLoading, ElNotification} from "element-plus";
 
 const route = useRoute()
-const companyOption = ref([])
+const showActive = ref()
 const loading = ref(false)
-
 const processStore = useProcessStore()
 const activeName = ref('first')
-const handleClick = (tab, event) => {
-  console.log(tab, event)
-  if (tab.index.value === 0) {
-
-  }
-}
-
-
-const getCompanyOption = async () => {
-  const res = await getSubCompOpt()
-  companyOption.value = res.data
-}
-
-
 const commonForm = ref({})
 const commonProvessViewer = ref(true)
 
 const getAllInfo = async (state) => {
   const loading = ElLoading.service({fullscreen: true})
   try {
-    state == '00' && (await getCompanyOption())
     commonProvessViewer.value = false
     loading.value = true
-    const {data, code} = await getMapProjectStateInfo(route.query.projectId, state)
-    // if(state == '00') {
-    //   collectionData.value = data;
-    // } else if(state == '10') {
-    //   summaryData.value = data;
-    // }
+    const {data, code,msg} = await getMapProjectStateInfo(route.query.projectId, state)
     if(code===1000){
       loading.value = false
+    }else {
+      ElNotification({
+        title: '提示',
+        message: msg,
+        type:  'error'
+      })
     }
     if(data===undefined)return;
     commonForm.value = data
@@ -80,18 +62,14 @@ const getAllInfo = async (state) => {
     processStore.refuseList.value = data.refuseList;
     processStore.passList.value = data.passList;
     nextTick(() => {
-      // summaryProcessViewer.value = true
       commonProvessViewer.value = true
     })
     loading.close()
   } catch {
     loading.close()
   }
-
 }
 
-const showActive = ref()
-
 const setDetail = (active) => {
   showActive.value = active
   getAllInfo(active)
diff --git a/src/views/project-management/filing/index.vue b/src/views/project-management/filing/index.vue
index 8727303..4cb549a 100644
--- a/src/views/project-management/filing/index.vue
+++ b/src/views/project-management/filing/index.vue
@@ -208,12 +208,7 @@ const tableConfig = reactive({
           btn.push({label: '详情', prem: ['mosr:requirement:info'], func: () => handleDetail(row), type: 'primary'})
         }
         if (buttons.has("attachments")) {
-          btn.push({
-            label: '附件',
-            prem: ['mosr:requirement:resubmit'],
-            func: () => handleAttachment(row),
-            type: 'primary'
-          })
+          btn.push({label: '附件', prem: ['mosr:requirement:resubmit'], func: () => handleAttachment(row), type: 'primary'})
         }
         if (buttons.has("entry")) {
           btn.push({label: '结项', prem: ['mosr:requirement:del'], func: () => handleConclusion(row), type: 'primary'})
diff --git a/src/views/project-management/implementation/detail.vue b/src/views/project-management/implementation/detail.vue
index 210b912..13281b2 100644
--- a/src/views/project-management/implementation/detail.vue
+++ b/src/views/project-management/implementation/detail.vue
@@ -5,7 +5,6 @@
         :formData="commonForm.formData"
         :data="commonForm"
         :processViewer="commonProvessViewer"
-        :companyOption="companyOption"
         v-show="showActive == '00'"
         :loading="loading"
       />
@@ -21,65 +20,41 @@
 </template>
 
 <script setup lang="jsx">
-import {getInfo} from "@/api/project-demand/index.js";
-import {getSubCompOpt} from '@/api/user/user.js'
 import {useProcessStore} from '@/stores/processStore.js';
 import CollectionDetail from "@/components/DetailComponent/CollectionDetail.vue";
 import SummaryDetail from "@/components/DetailComponent/SummaryDetail.vue";
 import ApprovalDetail from "@/components/DetailComponent/ApprovalDetail.vue";
 import { getMapProjectStateInfo } from '@/components/steps/api';
-import { ElLoading } from "element-plus";
+import {ElLoading, ElNotification} from "element-plus";
 import Opinion from "@/components/DetailComponent/Opinion.vue";
 
-// const activeName = ref('first')
-const handleClick = (tab, event) => {
-  console.log(tab, event)
-  if(tab.index.value === 0){
-
-  }
-}
-
-
 const route = useRoute()
 const activeName = ref('first')
-const collectionData = ref({})
-const summaryData = ref({})
 const loading = ref(false)
-const collectionProcessViewer = ref(true)
-const summaryProcessViewer = ref(true)
 const processStore = useProcessStore()
-const companyOption = ref([])
 const cuurentStep = ref()
 route.query.step == '10' && (cuurentStep.value = 1)
 route.query.step == '20' && (cuurentStep.value = 2)
 route.query.step == '40' && (cuurentStep.value = 3)
 route.query.step == '50' && (cuurentStep.value = 4)
-const rules = reactive({
-  auditOpinion: [{required: true, message: '请输入审核意见', trigger: 'blur'}],
-})
-const getCompanyOption = async () => {
-  const res = await getSubCompOpt()
-  companyOption.value = res.data
-}
-
-
+const showActive = ref()
 const commonForm = ref({})
 const commonProvessViewer = ref(true)
 
 const getAllInfo = async (state) => {
   const loading = ElLoading.service({fullscreen: true})
   try {
-    state == '00' && ( await getCompanyOption() )
     commonProvessViewer.value = false
     loading.value = true
-    const { data, code } = await getMapProjectStateInfo(route.query.projectId, state)
-    if(state == '00') {
-      collectionData.value = data;
-    } else if(state == '10') {
-      summaryData.value = data;
-    }
+    const { data, code ,msg} = await getMapProjectStateInfo(route.query.projectId, state)
     if(code===1000){
       loading.value = false
+    }else {
+      ElNotification({
+        title: '提示',
+        message: msg,
+        type:  'error'
+      })
     }
     if(data===undefined)return;
     commonForm.value = data
@@ -90,17 +65,14 @@ const getAllInfo = async (state) => {
     processStore.refuseList.value = data.refuseList;
     processStore.passList.value = data.passList;
     nextTick(() => {
-      // summaryProcessViewer.value = true
       commonProvessViewer.value = true
     })
     loading.close()
   } catch {
     loading.close()
   }
-
 }
 
-const showActive = ref()
 
 const setDetail = (active) => {
   showActive.value = active
diff --git a/src/views/project-management/implementation/index.vue b/src/views/project-management/implementation/index.vue
index 0443dea..ee30715 100644
--- a/src/views/project-management/implementation/index.vue
+++ b/src/views/project-management/implementation/index.vue
@@ -218,9 +218,9 @@ const tableConfig = reactive({
         if (buttons.has("edit")) {
         btn.push({label: '编辑', prem: ['mosr:requirement:info'], func: () => handleEdit(row), type: 'primary'})
         }
-        // if (buttons.has("standing")) {
+        if (buttons.has("standing")) {
           btn.push({label: '台账', prem: ['mosr:requirement:info'], func: () => handleStandingBook(row), type: 'primary'})
-        // }
+        }
         // if (buttons.has("attachments")) {
         btn.push({label: '附件', prem: ['mosr:requirement:info'], func: () => handleAttachment(row), type: 'primary'})
         // }
diff --git a/src/views/project-management/initiation/detail.vue b/src/views/project-management/initiation/detail.vue
index e6b9776..f077fa6 100644
--- a/src/views/project-management/initiation/detail.vue
+++ b/src/views/project-management/initiation/detail.vue
@@ -5,7 +5,6 @@
         :formData="commonForm.formData"
         :data="commonForm"
         :processViewer="commonProvessViewer"
-        :companyOption="companyOption"
         v-show="showActive == '00'"
         :loading="loading"
       />
@@ -22,101 +21,38 @@
 </template>
 
 <script setup lang="jsx">
-import {getInfo} from "@/api/project-demand/index.js";
-import {getSubCompOpt} from '@/api/user/user.js'
 import {useProcessStore} from '@/stores/processStore.js';
 import CollectionDetail from "@/components/DetailComponent/CollectionDetail.vue";
-import {downloadFile} from "@/api/project-demand";
 import SummaryDetail from "@/components/DetailComponent/SummaryDetail.vue";
 import ApprovalDetail from "@/components/DetailComponent/ApprovalDetail.vue";
 import { getMapProjectStateInfo } from '@/components/steps/api';
-import { ElLoading } from "element-plus";
+import {ElLoading, ElNotification} from "element-plus";
 import Opinion from "@/components/DetailComponent/Opinion.vue";
 
 const route = useRoute()
 const activeName = ref('first')
-const collectionData = ref({})
-const summaryData = ref({})
-const collectionProcessViewer = ref(true)
 const loading = ref(false)
 const active = ref(route.query.state)
-const summaryProcessViewer = ref(true)
 const processStore = useProcessStore()
-const companyOption = ref([])
-const rules = reactive({
-  auditOpinion: [{required: true, message: '请输入审核意见', trigger: 'blur'}],
-})
-const getCompanyOption = async () => {
-  const res = await getSubCompOpt()
-  companyOption.value = res.data
-}
-
-const getDemandCollectionInfo = async () => {
-  if (!route.query.id) return
-  await getCompanyOption()
-  collectionProcessViewer.value = false
-  getInfo(route.query.id).then(res => {
-    let data = res.data
-    collectionData.value = data;
-    processStore.setDesign(data)
-    processStore.runningList.value = data.runningList;
-    processStore.endList.value = data.endList;
-    processStore.noTakeList.value = data.noTakeList;
-    processStore.refuseList.value = data.refuseList;
-    processStore.passList.value = data.passList;
-    nextTick(() => {
-      collectionProcessViewer.value = true
-    })
-  })
-}
-const getDemandSummaryInfo = async () => {
-  if (!route.query.id) return
-  // await getCompanyOption()
-  summaryProcessViewer.value = false
-  getInfo(route.query.id).then(res => {
-    let data = res.data
-    summaryData.value = data;
-    processStore.setDesign(data)
-    processStore.runningList.value = data.runningList;
-    processStore.endList.value = data.endList;
-    processStore.noTakeList.value = data.noTakeList;
-    processStore.refuseList.value = data.refuseList;
-    processStore.passList.value = data.passList;
-    nextTick(() => {
-      summaryProcessViewer.value = true
-    })
-  })
-}
-
-const handleClick = (tab, event) => {
-  console.log(tab, event)
-  if (tab.props.name === 'first') {
-    getDemandCollectionInfo()
-  } else if (tab.props.name === 'second') {
-    getDemandSummaryInfo()
-  }
-}
-// getDemandCollectionInfo()
-
+const showActive = ref()
 const commonForm = ref({})
 const commonProvessViewer = ref(true)
 
 const getAllInfo = async (state) => {
   const loading = ElLoading.service({fullscreen: true})
   try {
-    state == '00' && ( await getCompanyOption() )
     commonProvessViewer.value = false
     loading.value = true
-    const { data, code } = await getMapProjectStateInfo(route.query.projectId, state)
-    if(state == '00') {
-      collectionData.value = data;
-    } else if(state == '10') {
-      summaryData.value = data;
-    }
+    const { data, code,msg } = await getMapProjectStateInfo(route.query.projectId, state)
     if(code===1000){
       loading.value = false
+    }else {
+      ElNotification({
+        title: '提示',
+        message: msg,
+        type:  'error'
+      })
     }
-    console.log(data, 'data--22');
     if(data===undefined)return;
     commonForm.value = data
     processStore.setDesign(data)
@@ -126,17 +62,14 @@ const getAllInfo = async (state) => {
     processStore.refuseList.value = data.refuseList;
     processStore.passList.value = data.passList;
     nextTick(() => {
-      // summaryProcessViewer.value = true
       commonProvessViewer.value = true
     })
     loading.close()
   } catch {
     loading.close()
   }
-
 }
 
-const showActive = ref()
 
 const setDetail = (active) => {
   showActive.value = active
diff --git a/src/views/project-management/initiation/index.vue b/src/views/project-management/initiation/index.vue
index 84b968a..cbc61fe 100644
--- a/src/views/project-management/initiation/index.vue
+++ b/src/views/project-management/initiation/index.vue
@@ -212,9 +212,9 @@ const tableConfig = reactive({
         // if (buttons.has("delete")) {
         //   btn.push({label: '删除',prem: ['mosr:requirement:del'], func: () => handleDelete(row), type: 'primary'})
         // }
-        // if (buttons.has("apply")) {
+        if (buttons.has("apply")) {
           btn.push({label: '申请',prem: ['mosr:requirement:info'], func: () => handleApply(row), type: 'primary'})
-        // }
+        }
         return (
             <div style={{width: '100%'}}>
               {

From daf5ffe2c9c161b424f717a774887f6239271300 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Sat, 1 Jun 2024 00:46:00 +0800
Subject: [PATCH 2/3] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E5=AE=9E=E6=96=BD=E9=99=84=E4=BB=B6=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E5=8F=8A=E4=B8=8A=E4=BC=A0=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/project-manage/index.js               |  6 +--
 .../project-management/filing/attachment.vue  | 50 +++++++++++--------
 .../implementation/attachment.vue             | 25 +++++++---
 .../implementation/upload.vue                 | 27 +++++++---
 4 files changed, 68 insertions(+), 40 deletions(-)

diff --git a/src/api/project-manage/index.js b/src/api/project-manage/index.js
index 42a57b9..4ac08f9 100644
--- a/src/api/project-manage/index.js
+++ b/src/api/project-manage/index.js
@@ -77,13 +77,11 @@ export const addLedger = (data) => {
   });
 };
 
-export const getTags = (projectId) => {
+export const getTags = (params) => {
   return request({
     url: '/workflow/mosr/project/implementation/option',
     method: "get",
-    params:{
-      projectId:projectId
-    }
+    params:params
   });
 };
 //项目归档
diff --git a/src/views/project-management/filing/attachment.vue b/src/views/project-management/filing/attachment.vue
index 4c7788c..0752f87 100644
--- a/src/views/project-management/filing/attachment.vue
+++ b/src/views/project-management/filing/attachment.vue
@@ -1,23 +1,30 @@
 <template>
-  <el-form :model="attachment" inline class="query-form">
-    <el-form-item label="关键词" prop="tag">
-      <el-input v-model="attachment.tag" placeholder="请输入" clearable filterable style="width: 200px"/>
-    </el-form-item>
-    <el-form-item>
-      <el-button @click="handleSearch" color="#DED0B2">搜索</el-button>
-      <el-button color="#DED0B2" @click="handleUpload">上传附件</el-button>
-    </el-form-item>
-  </el-form>
-<!--  <fvSearchForm :searchConfig="searchConfig" @search="search"></fvSearchForm>-->
-  <el-card style="width: 100%">
-    <file-upload @getFile="getOtherFile" :showFileList="true"/>
-    <fvTable style="width: 100%;max-height: 250px" v-if="showTable" :tableConfig="tableConfig"
-             :data="otherFileList" :isSettingCol="false" :pagination="false">
-      <template #empty>
-        <el-empty :image-size="90" description="暂无数据" style="padding: 0"/>
-      </template>
-    </fvTable>
-  </el-card>
+  <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
+    <el-tab-pane label="需求征集" name="first">
+      <el-form :model="attachment" inline class="query-form">
+        <el-form-item label="关键词" prop="tag">
+          <el-input v-model="attachment.tag" placeholder="请输入" clearable filterable style="width: 200px"/>
+        </el-form-item>
+        <el-form-item>
+          <el-button @click="handleSearch" color="#DED0B2">搜索</el-button>
+          <el-button color="#DED0B2" @click="handleUpload">上传附件</el-button>
+        </el-form-item>
+      </el-form>
+      <!--  <fvSearchForm :searchConfig="searchConfig" @search="search"></fvSearchForm>-->
+      <el-card style="width: 100%">
+        <file-upload @getFile="getOtherFile" :showFileList="true"/>
+        <fvTable style="width: 100%;max-height: 250px" v-if="showTable" :tableConfig="tableConfig"
+                 :data="otherFileList" :isSettingCol="false" :pagination="false">
+          <template #empty>
+            <el-empty :image-size="90" description="暂无数据" style="padding: 0"/>
+          </template>
+        </fvTable>
+      </el-card>
+    </el-tab-pane>
+    <el-tab-pane label="分摊汇总" name="second">
+
+    </el-tab-pane>
+  </el-tabs>
 </template>
 
 <script setup lang="jsx">
@@ -25,6 +32,7 @@ import {downloadFile} from "@/api/project-demand";
 
 const route = useRoute()
 const router = useRouter()
+const activeName = ref('first')
 const attachment = reactive({
   tag: ''
 })
@@ -76,7 +84,7 @@ const tableConfig = reactive({
     }
   ]
 })
-const showTable=ref(true)
+const showTable = ref(true)
 const otherFileList = ref([])
 const handleUpload = () => {
   router.push({
@@ -91,7 +99,7 @@ const handleDownload = (row) => {
   downloadFile(row.fileId).then(res => {
     const blob = new Blob([res])
     let a = document.createElement('a')
-    a.href=URL.createObjectURL(blob)
+    a.href = URL.createObjectURL(blob)
     a.download = row.originalFileName
     a.click()
   })
diff --git a/src/views/project-management/implementation/attachment.vue b/src/views/project-management/implementation/attachment.vue
index 8548cb8..b0a6f48 100644
--- a/src/views/project-management/implementation/attachment.vue
+++ b/src/views/project-management/implementation/attachment.vue
@@ -4,9 +4,9 @@
       <el-select v-model="attachment.tag" placeholder="请选择标签" clearable filterable style="width: 200px">
         <el-option
             v-for="item in tagsOption"
-            :key="item.label"
-            :label="item.value"
-            :value="item.label"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
         />
       </el-select>
     </el-form-item>
@@ -27,7 +27,7 @@
 
 <script setup lang="jsx">
 import {downloadFile} from "@/api/project-demand";
-import {getImplementationAttachment,getTags} from "@/api/project-manage";
+import {getTags,getImplementationAttachment} from "@/api/project-manage";
 import {ElNotification} from "element-plus";
 
 const route = useRoute()
@@ -80,7 +80,10 @@ const showTable = ref(true)
 const otherFileList = ref([])
 const getTagsOption = () => {
   if (!route.query.id) return
-  getTags(route.query.id).then(res => {
+  let params={
+    projectId: route.query.id
+  }
+  getTags(params).then(res => {
     ElNotification({
       title: '提示',
       message: res.msg,
@@ -94,13 +97,18 @@ const getTagsOption = () => {
 const handleSearch = () => {
   let params
   if (attachment.tag) {
+    tagsOption.value.forEach(item => {
+      if (item.value === attachment.tag) {
+        attachment.tag = item.label
+      }
+    })
     params = {
-      projectId: route.query.id,
+      targetId: route.query.id,
       tag: attachment.tag
     }
   } else {
     params = {
-      projectId: route.query.id
+      targetId: route.query.id
     }
   }
   getImplementationAttachment(params).then(res => {
@@ -111,6 +119,7 @@ const handleSearch = () => {
     })
     showTable.value = false
     if (res.code === 1000) {
+      // tagsOption.value = res.data
       otherFileList.value = res.data
       nextTick(() => {
         showTable.value = true
@@ -136,7 +145,7 @@ const handleDownload = (row) => {
   })
 }
 getTagsOption()
-handleSearch()
+// handleSearch()
 </script>
 
 <style scoped>
diff --git a/src/views/project-management/implementation/upload.vue b/src/views/project-management/implementation/upload.vue
index 2740749..179b922 100644
--- a/src/views/project-management/implementation/upload.vue
+++ b/src/views/project-management/implementation/upload.vue
@@ -2,20 +2,21 @@
   <baseTitle title="标签名称"></baseTitle>
   <el-form :model="formData" ref="tagForm" label-width="auto" :rules="rules">
     <el-form-item label="标签名称" prop="tagName">
-      <el-input v-model="formData.tagName" placeholder="请输入标签名称" style="width: 400px" v-if="showInput"/>
-      <el-select v-model="formData.tagName" placeholder="请选择标签" clearable filterable style="width: 200px" v-else>
+      <el-input v-model="formData.tagName" placeholder="请输入标签名称" style="width: 300px" v-if="showInput"/>
+      <el-select v-model="formData.tagName" placeholder="请选择标签名称" clearable filterable style="width: 300px" v-else>
         <el-option
             v-for="item in tagsOption"
-            :key="item.label"
-            :label="item.value"
-            :value="item.label"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
         />
       </el-select>
+      <el-button type="primary" link  @click="changeInput">{{showInput? '选择': '输入'}}</el-button>
     </el-form-item>
   </el-form>
   <baseTitle title="其他文件"></baseTitle>
   <el-card style="width: 100%;margin: 15px 0">
-    <file-upload @getFile="getFile"/>
+    <file-upload @getFile="getFile" :disabled="!formData.tagName" :title="!formData.tagName?'请先选择/输入标签！':''"/>
     <fvTable style="width: 100%;max-height: 250px;height: 250px" v-if="showTable" :tableConfig="tableConfig"
              :data="fileList" :isSettingCol="false" :pagination="false">
       <template #empty>
@@ -86,9 +87,16 @@ const name = ref(router.currentRoute.value.name)
 const rules = reactive({
   tagName: [{required: true, message: '请输入标签名称', trigger: 'blur'}],
 })
+const changeInput=()=>{
+  showInput.value=!showInput.value;
+  formData.value.tagName='';
+}
 const getTagsOption = () => {
   if (!route.query.id) return
-  getTags(route.query.id).then(res => {
+  let params={
+    projectId: route.query.id
+  }
+  getTags(params).then(res => {
     ElNotification({
       title: '提示',
       message: res.msg,
@@ -102,6 +110,11 @@ const getTagsOption = () => {
 }
 
 const compositeParam = (item) => {
+  tagsOption.value.forEach(item => {
+    if (item.value == formData.value.tagName) {
+      formData.value.tagName = item.label
+    }
+  })
   return {
     fileId: item.id,
     size: item.size,

From 7501c37379d8619f41697a15137fda1fb71d9218 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Sat, 1 Jun 2024 13:34:12 +0800
Subject: [PATCH 3/3] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E5=AE=9E=E6=96=BD=E9=99=84=E4=BB=B6=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=8F=8A=E4=B8=8A=E4=BC=A0=E9=99=84=E4=BB=B6?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=88=9D=E5=A7=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/project-demand/index.js               |   8 +
 src/api/project-manage/index.js               |  14 +
 src/components/AttachmentUpload.vue           |   2 +-
 src/components/SearchFilesByTag.vue           | 148 ++++++++++
 src/components/TagAndFileUpload.vue           |   6 +-
 .../project-demand/requirement/index.vue      |   4 +-
 .../project-demand/requirement/upload.vue     |  11 +
 src/views/project-demand/summary/api/index.js |   8 +
 src/views/project-demand/summary/upload.vue   |  11 +
 .../project-management/filing/attachment.vue  | 265 ++++++++++++------
 src/views/project-management/filing/index.vue |   8 +-
 .../project-management/filing/upload.vue      |  11 +
 .../implementation/attachment.vue             |   7 +-
 .../project-management/initiation/upload.vue  |   2 +-
 14 files changed, 404 insertions(+), 101 deletions(-)
 create mode 100644 src/components/SearchFilesByTag.vue
 create mode 100644 src/views/project-demand/requirement/upload.vue
 create mode 100644 src/views/project-demand/summary/upload.vue
 create mode 100644 src/views/project-management/filing/upload.vue

diff --git a/src/api/project-demand/index.js b/src/api/project-demand/index.js
index 928514b..de4098d 100644
--- a/src/api/project-demand/index.js
+++ b/src/api/project-demand/index.js
@@ -82,3 +82,11 @@ export const deleteDemand = (id) => {
     method: "delete"
   });
 };
+//需求征集附件列表(归档)
+export const getRequirementAttachment = (params) => {
+  return request({
+    url: '/workflow/mosr/requirement/attachments',
+    method: "get",
+    params:params
+  });
+};
diff --git a/src/api/project-manage/index.js b/src/api/project-manage/index.js
index 4ac08f9..d746e48 100644
--- a/src/api/project-manage/index.js
+++ b/src/api/project-manage/index.js
@@ -27,6 +27,13 @@ export const resubmitApply = (data) => {
     data: data
   });
 };
+export const getInitiationAttachment = (params) => {
+  return request({
+    url: '/workflow/mosr/project/approval/attachments',
+    method: "get",
+    params:params
+  });
+};
 //项目实施
 export const getCheckDetail = (projectId) => {
   return request({
@@ -112,3 +119,10 @@ export const getProjectConclusionProcess = () => {
     method: "get"
   });
 };
+export const getFilingAttachment = (params) => {
+  return request({
+    url: '/workflow/mosr/project/filing/attachments',
+    method: "get",
+    params:params
+  });
+};
diff --git a/src/components/AttachmentUpload.vue b/src/components/AttachmentUpload.vue
index 765e88f..8709334 100644
--- a/src/components/AttachmentUpload.vue
+++ b/src/components/AttachmentUpload.vue
@@ -33,7 +33,7 @@
 
 <script setup lang="jsx">
 import FileUpload from '@/components/FileUpload.vue'
-import {deleteFile, downloadFile} from "../api/project-demand";
+import {deleteFile, downloadFile} from "@/api/project-demand";
 import {ElMessage, ElMessageBox, ElNotification} from "element-plus";
 
 const emit = defineEmits(["getAttachment", "getOtherFile"])
diff --git a/src/components/SearchFilesByTag.vue b/src/components/SearchFilesByTag.vue
new file mode 100644
index 0000000..0105888
--- /dev/null
+++ b/src/components/SearchFilesByTag.vue
@@ -0,0 +1,148 @@
+<template>
+  <el-form :model="attachment" inline>
+    <el-form-item label="关键词" prop="name">
+      <el-input v-model="attachment.name" placeholder="请输入" clearable filterable style="width: 300px"/>
+    </el-form-item>
+    <el-form-item label="标签" prop="tag"   v-if="type==='3'">
+      <el-select v-model="attachment.tag" placeholder="请选择标签" clearable filterable style="width: 300px">
+        <el-option
+            v-for="item in tagsOption"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+        />
+      </el-select>
+    </el-form-item>
+    <el-form-item>
+      <el-button @click="handleSearch" color="#DED0B2">搜索</el-button>
+      <el-button color="#DED0B2" @click="handleUpload">上传附件</el-button>
+    </el-form-item>
+  </el-form>
+  <el-card style="width: 100%">
+    <fvTable style="width: 100%;max-height: 250px" v-if="showTable" :tableConfig="tableConfig"
+             :data="otherFileList" :isSettingCol="false" :pagination="false">
+      <template #empty>
+        <el-empty :image-size="90" description="暂无数据" style="padding: 0"/>
+      </template>
+    </fvTable>
+  </el-card>
+</template>
+
+<script setup lang="jsx">
+import {downloadFile} from "@/api/project-demand";
+import {ElNotification} from "element-plus";
+import {getTags} from "@/api/project-manage";
+
+const route = useRoute()
+const router = useRouter()
+const attachment = reactive({
+  name: '',
+  tag: ''
+})
+const emit = defineEmits(['search'])
+const props = defineProps({
+  otherFileList: {
+    type: Array,
+    default: []
+  }, type: {
+    type: String,
+    default: '0'
+  }
+})
+const tagsOption = ref([])
+const tableConfig = reactive({
+  columns: [
+    {
+      prop: 'originalFileName',
+      label: '附件名称',
+      align: 'center',
+    },
+    {
+      prop: 'tag',
+      label: '自定义标签',
+      align: 'center'
+    },
+    {
+      prop: 'processNodeTag',
+      label: '内置标签',
+      align: 'center'
+    },
+    {
+      prop: 'size',
+      label: '上传时间',
+      align: 'center',
+    },
+    {
+      prop: 'oper',
+      label: '操作',
+      align: 'center',
+      showOverflowTooltip: false,
+      currentRender: ({row, index}) => {
+        return (
+            <div>
+              <el-button type="primary" link onClick={() => handleDownload(row)}>下载</el-button>
+            </div>
+        )
+      }
+    }
+  ]
+})
+const showTable = ref(true)
+const getTagsOption = () => {
+  if (!route.query.id) return
+  let params = {
+    projectId: route.query.id
+  }
+  getTags(params).then(res => {
+
+    if (res.code === 1000) {
+      tagsOption.value = res.data
+    } else {
+      ElNotification({
+        title: '提示',
+        message: res.msg,
+        type: 'error'
+      })
+    }
+  })
+}
+const handleSearch = () => {
+  emit('search', attachment)
+}
+const handleUpload = () => {
+  emit('upload')
+}
+const handleDownload = (row) => {
+  downloadFile(row.fileId).then(res => {
+    const blob = new Blob([res])
+    let a = document.createElement('a')
+    a.href = URL.createObjectURL(blob)
+    a.download = row.originalFileName
+    a.click()
+  })
+}
+watch(() => props.type, (val) => {
+  console.log('va四川省l',val)
+  props.type = val
+  if (val === '3') {
+    getTagsOption()
+  }
+})
+watch(() => props.otherFileList, (val) => {
+  showTable.value = false
+  nextTick(() => {
+    showTable.value = true
+  })
+  props.otherFileList = val
+})
+if (props.type === '3') {
+  getTagsOption()
+}
+defineExpose({
+  tagsOption
+})
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/components/TagAndFileUpload.vue b/src/components/TagAndFileUpload.vue
index 5b2289a..d29dac5 100644
--- a/src/components/TagAndFileUpload.vue
+++ b/src/components/TagAndFileUpload.vue
@@ -2,8 +2,8 @@
   <baseTitle title="标签名称"></baseTitle>
   <el-form :model="formData" ref="tagForm" label-width="auto" :rules="rules">
     <el-form-item label="标签名称" prop="tagName">
-      <el-input v-model="formData.tagName" placeholder="请输入标签名称" style="width: 400px" v-if="showInput"/>
-      <el-select v-model="formData.tagName" placeholder="请选择标签" clearable filterable style="width: 200px" v-else>
+      <el-input v-model="formData.tagName" placeholder="请输入标签名称" style="width: 300px" v-if="showInput"/>
+      <el-select v-model="formData.tagName" placeholder="请选择标签" clearable filterable style="width: 300px" v-else>
         <el-option
             v-for="item in tagsOption"
             :key="item.label"
@@ -38,7 +38,7 @@ const props = defineProps({
     default: []
   }, showInput: {
     type: Boolean,
-    default: false
+    default: true
   },
 })
 const rules = reactive({
diff --git a/src/views/project-demand/requirement/index.vue b/src/views/project-demand/requirement/index.vue
index 08de5d4..d9cca3c 100644
--- a/src/views/project-demand/requirement/index.vue
+++ b/src/views/project-demand/requirement/index.vue
@@ -115,9 +115,9 @@ const tableConfig = reactive({
         // if (buttons.has("delete")) {
         //   btn.push({label: '删除',prem: ['mosr:requirement:del'], func: () => handleDelete(row), type: 'primary'})
         // }
-        // if (buttons.has("report")) {
+        if (buttons.has("report")) {
           btn.push({label: '需求上报', prem: ['mosr:requirement:info'], func: () => handleReport(row), type: 'primary'})
-        // }
+        }
         return (
             <div style={{width: '100%'}}>
               {
diff --git a/src/views/project-demand/requirement/upload.vue b/src/views/project-demand/requirement/upload.vue
new file mode 100644
index 0000000..6c0bff8
--- /dev/null
+++ b/src/views/project-demand/requirement/upload.vue
@@ -0,0 +1,11 @@
+<template>
+<tag-and-file-upload />
+</template>
+
+<script setup lang="jsx">
+
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/project-demand/summary/api/index.js b/src/views/project-demand/summary/api/index.js
index 3baa2ef..531c4a4 100644
--- a/src/views/project-demand/summary/api/index.js
+++ b/src/views/project-demand/summary/api/index.js
@@ -38,3 +38,11 @@ export const resubmitReported = (data) => {
     data: data
   });
 };
+
+export const getCollectAttachment = (params) => {
+  return request({
+    url: '/workflow/mosr/requirement/collect/attachments',
+    method: "get",
+    params:params
+  });
+};
diff --git a/src/views/project-demand/summary/upload.vue b/src/views/project-demand/summary/upload.vue
new file mode 100644
index 0000000..6c0bff8
--- /dev/null
+++ b/src/views/project-demand/summary/upload.vue
@@ -0,0 +1,11 @@
+<template>
+<tag-and-file-upload />
+</template>
+
+<script setup lang="jsx">
+
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/project-management/filing/attachment.vue b/src/views/project-management/filing/attachment.vue
index 0752f87..ebda94b 100644
--- a/src/views/project-management/filing/attachment.vue
+++ b/src/views/project-management/filing/attachment.vue
@@ -1,111 +1,204 @@
 <template>
   <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
-    <el-tab-pane label="需求征集" name="first">
-      <el-form :model="attachment" inline class="query-form">
-        <el-form-item label="关键词" prop="tag">
-          <el-input v-model="attachment.tag" placeholder="请输入" clearable filterable style="width: 200px"/>
-        </el-form-item>
-        <el-form-item>
-          <el-button @click="handleSearch" color="#DED0B2">搜索</el-button>
-          <el-button color="#DED0B2" @click="handleUpload">上传附件</el-button>
-        </el-form-item>
-      </el-form>
-      <!--  <fvSearchForm :searchConfig="searchConfig" @search="search"></fvSearchForm>-->
-      <el-card style="width: 100%">
-        <file-upload @getFile="getOtherFile" :showFileList="true"/>
-        <fvTable style="width: 100%;max-height: 250px" v-if="showTable" :tableConfig="tableConfig"
-                 :data="otherFileList" :isSettingCol="false" :pagination="false">
-          <template #empty>
-            <el-empty :image-size="90" description="暂无数据" style="padding: 0"/>
-          </template>
-        </fvTable>
-      </el-card>
+    <el-tab-pane label="需求征集" name="0">
+      <search-files-by-tag @search="searchRequirement" @upload="upload"
+                           :otherFileList="otherFileList"/>
     </el-tab-pane>
-    <el-tab-pane label="分摊汇总" name="second">
-
+    <el-tab-pane label="需求上报" name="1">
+      <search-files-by-tag @search="searchReport" @upload="upload"
+                           :otherFileList="otherFileList"/>
+    </el-tab-pane>
+    <el-tab-pane label="项目立项" name="2">
+      <search-files-by-tag @search="searchInitiation" @upload="upload"
+                           :otherFileList="otherFileList"/>
+    </el-tab-pane>
+    <el-tab-pane label="项目实施" name="3">
+      <search-files-by-tag type="3" @search="searchImplementation" @upload="upload" ref="implementation"
+                           :otherFileList="otherFileList"/>
+    </el-tab-pane>
+    <el-tab-pane label="项目归档" name="4">
+      <search-files-by-tag @search="searchFiling" @upload="upload"
+                           :otherFileList="otherFileList"/>
     </el-tab-pane>
   </el-tabs>
 </template>
 
 <script setup lang="jsx">
-import {downloadFile} from "@/api/project-demand";
+import {ElNotification} from "element-plus";
+import {getImplementationAttachment} from "@/api/project-manage";
+import {getRequirementAttachment} from "@/api/project-demand";
+import {getCollectAttachment} from "@/views/project-demand/summary/api";
+import {getFilingAttachment, getInitiationAttachment} from "@/api/project-manage";
 
 const route = useRoute()
 const router = useRouter()
-const activeName = ref('first')
-const attachment = reactive({
-  tag: ''
-})
-const searchConfig = reactive([
-  {
-    label: '关键词',
-    prop: 'collectType',
-    component: 'el-input',
-    props: {
-      placeholder: '请输入',
-      clearable: true,
-      filterable: true,
+const activeName = ref('3')
+const attachment = ref({})
+const showTable = ref(true)
+const implementation = ref()
+const otherFileList = ref([])
+const handleClick = (tab) => {
+  let name = {}
+  switchSearch(name, tab.index)
+}
+const getParams = (param, type) => {
+  let targetId
+  let params
+  if (type === 1) {
+    targetId = route.query.requirementId
+    params = {
+      targetId: targetId,
+      ...param
     }
-  }
-])
-const tableConfig = reactive({
-  columns: [
-    {
-      prop: 'originalFileName',
-      label: '附件名称',
-      align: 'center',
-    },
-    {
-      prop: 'tag',
-      label: '自定义标签',
-      align: 'center'
-    },
-    {
-      prop: 'tag',
-      label: '内置标签',
-      align: 'center'
-    },
-    {
-      prop: 'tag',
-      label: '上传时间',
-      align: 'center'
-    },
-    {
-      prop: 'oper',
-      label: '操作',
-      align: 'center',
-      currentRender: ({row, index}) => {
-        return (
-            <div>
-              <el-button type="primary" link onClick={() => handleDownload(row)}>下载</el-button>
-            </div>
-        )
+  } else if (type === 2){
+    targetId = route.query.id
+    if(JSON.stringify(param) !== '{}'){
+      if (param.tag &&!param.name) {
+        implementation.value.tagsOption?.forEach(item => {
+          if (item.value === param.tag) {
+            param.tag = item.label
+          }
+        })
+        params = {
+          targetId: targetId,
+          tag:param.tag
+        }
+      }else if(!param.tag &&param.name){
+        params = {
+          targetId: targetId,
+          ...param
+        }
+      } else if (!param.tag &&!param.name) {
+        params = {
+          targetId: targetId,
+        }
+      }
+    }else {
+      params = {
+        targetId: targetId
       }
     }
-  ]
-})
-const showTable = ref(true)
-const otherFileList = ref([])
-const handleUpload = () => {
+  }else {
+    targetId = route.query.id
+    params = {
+      targetId: targetId,
+      ...param
+    }
+  }
+  return params;
+}
+
+const searchRequirement = async (param) => {
+  await search(param)
+}
+const search = async (param, type) => {
+  const res = await getRequirementAttachment(getParams(param, type))
+  changeFileList(res)
+}
+const searchReport = async (param) => {
+  const res = await getCollectAttachment(getParams(param))
+  changeFileList(res)
+}
+const searchInitiation = async (param) => {
+  const res = await getInitiationAttachment(getParams(param))
+  changeFileList(res)
+}
+const searchImplementation = async (param) => {
+  const res = await getImplementationAttachment(getParams(param,2))
+  changeFileList(res)
+}
+const searchFiling = async (param) => {
+  const res = await getFilingAttachment(getParams(param))
+  changeFileList(res)
+}
+const changeFileList = (res) => {
+  showTable.value = false
+  if (res.code === 1000) {
+    otherFileList.value = res.data
+    nextTick(() => {
+      showTable.value = true
+    })
+  } else {
+    ElNotification({
+      title: '提示',
+      message: res.msg,
+      type: 'error'
+    })
+  }
+}
+const upload = () => {
   router.push({
-    name: 'Filing/upload',
+    name: switchUpload(activeName.value),
     query: {
       id: route.query.id
     }
   })
 }
-
-const handleDownload = (row) => {
-  downloadFile(row.fileId).then(res => {
-    const blob = new Blob([res])
-    let a = document.createElement('a')
-    a.href = URL.createObjectURL(blob)
-    a.download = row.originalFileName
-    a.click()
-  })
+const switchUpload=(index)=>{
+  switch (index) {
+    case '0':
+      return 'Requirement/upload';
+    case '1':
+      return 'Summary/upload';
+    case '2':
+      return 'Initiation/upload';
+    case '3':
+      return 'Implementation/upload';
+    case '4':
+      return 'Filing/upload';
+  }
 }
+const switchSearch = (name, index) => {
+  switch (index) {
+    case '0':
+      search(name, 1)
+      break
+    case '1':
+      searchReport(name)
+      break
+    case '2':
+      searchInitiation(name)
+      break
+    case '3':
+      searchImplementation(name)
+      break
+    case '4':
+      searchFiling(name)
+      break
+  }
+}
+onMounted(() => {
+  if (activeName.value === '4') {
+    let name = {
+      name: ''
+    }
+    searchFiling(name)
+  }
+})
 </script>
 
-<style scoped>
+<style scoped lang="scss">
+:deep(.el-tabs__header) {
+  margin: 15px 0 30px 0;
+}
 
+:deep(.el-tabs__nav-scroll) {
+  width: 100%;
+  display: flex;
+
+  .el-tabs__nav {
+    display: flex;
+    flex: 1;
+
+    .el-tabs__item {
+      flex: 1;
+      font-size: 16px;
+    }
+
+    .is-active {
+      color: black;
+      //background-color: #DED0B2;
+    }
+  }
+}
 </style>
diff --git a/src/views/project-management/filing/index.vue b/src/views/project-management/filing/index.vue
index 4cb549a..d72753c 100644
--- a/src/views/project-management/filing/index.vue
+++ b/src/views/project-management/filing/index.vue
@@ -207,9 +207,9 @@ const tableConfig = reactive({
         if (buttons.has("details")) {
           btn.push({label: '详情', prem: ['mosr:requirement:info'], func: () => handleDetail(row), type: 'primary'})
         }
-        if (buttons.has("attachments")) {
+        // if (buttons.has("attachments")) {
           btn.push({label: '附件', prem: ['mosr:requirement:resubmit'], func: () => handleAttachment(row), type: 'primary'})
-        }
+        // }
         if (buttons.has("entry")) {
           btn.push({label: '结项', prem: ['mosr:requirement:del'], func: () => handleConclusion(row), type: 'primary'})
         }
@@ -265,8 +265,8 @@ const handleAttachment = (row) => {
   router.push({
     name: 'Filing/attachment',
     query: {
-      id: row.requirementId,
-      projectId: row.projectId
+      id: row.projectId,
+      requirementId:row.requirementId
     }
   })
 }
diff --git a/src/views/project-management/filing/upload.vue b/src/views/project-management/filing/upload.vue
new file mode 100644
index 0000000..6c0bff8
--- /dev/null
+++ b/src/views/project-management/filing/upload.vue
@@ -0,0 +1,11 @@
+<template>
+<tag-and-file-upload />
+</template>
+
+<script setup lang="jsx">
+
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/project-management/implementation/attachment.vue b/src/views/project-management/implementation/attachment.vue
index b0a6f48..88e2215 100644
--- a/src/views/project-management/implementation/attachment.vue
+++ b/src/views/project-management/implementation/attachment.vue
@@ -1,7 +1,7 @@
 <template>
-  <el-form :model="attachment" inline class="query-form">
+  <el-form :model="attachment" inline style="margin-top: 15px">
     <el-form-item label="标签" prop="tag">
-      <el-select v-model="attachment.tag" placeholder="请选择标签" clearable filterable style="width: 200px">
+      <el-select v-model="attachment.tag" placeholder="请选择标签" clearable filterable style="width: 300px">
         <el-option
             v-for="item in tagsOption"
             :key="item.value"
@@ -119,7 +119,6 @@ const handleSearch = () => {
     })
     showTable.value = false
     if (res.code === 1000) {
-      // tagsOption.value = res.data
       otherFileList.value = res.data
       nextTick(() => {
         showTable.value = true
@@ -145,7 +144,7 @@ const handleDownload = (row) => {
   })
 }
 getTagsOption()
-// handleSearch()
+handleSearch()
 </script>
 
 <style scoped>
diff --git a/src/views/project-management/initiation/upload.vue b/src/views/project-management/initiation/upload.vue
index be6471a..6c0bff8 100644
--- a/src/views/project-management/initiation/upload.vue
+++ b/src/views/project-management/initiation/upload.vue
@@ -1,5 +1,5 @@
 <template>
-<tag-and-file-upload :showInput="true"/>
+<tag-and-file-upload />
 </template>
 
 <script setup lang="jsx">